1

olive-console/src/main/java/com/zrqx/olive/ttask/dao/TaskDao.java

@@ -39,38 +39,38 @@ public interface TaskDao extends BaseMapper<Task> {
 			+ " AND code = like concat(#{request.code},'%') "
 			+ "</if>"
 			+ "<if test = 'request.taskName!=null'> "
-			+ " AND taskName = #{request.taskName} "
+			+ " AND task_name = #{request.taskName} "
 			+ "</if>"
 			+ "<if test = 'request.taskType!=null'> "
-			+ " AND taskType = #{request.taskType} "
+			+ " AND task_type = #{request.taskType} "
 			+ "</if>"
 		
 			+ "<if test = 'request.id!=null'> "
 			+ " AND id = #{request.id} "
 			+ "</if>"
 			+ "<if test = 'request.projectId!=null'> "
-			+ " AND projectId = #{request.projectId} "
+			+ " AND a.project_id = #{request.projectId} "
 			+ "</if>"
 			+ "<if test = 'request.taskStatus == 4'> "
-			+ " AND taskStatus != 0 "
+			+ " AND task_status != 0 "
 			+ "</if>"
 			+ "<if test = 'request.taskStatus == 5'> "
 			+ " AND now() &gt; #{request.endTime} "
 			+ "</if>"
 			+ "<if test = 'request.taskStatus == 1'> "
-			+ " AND taskStatus = #{request.taskStatus} "
+			+ " AND task_status = #{request.taskStatus} "
 			+ "</if>"
 			+ "<if test = 'request.taskStatus == 2'> "
-			+ " AND taskStatus = #{request.taskStatus} "
+			+ " AND task_status = #{request.taskStatus} "
 			+ "</if>"
 			+ "<if test = 'request.taskStatus == 0'> "
-			+ " AND taskStatus = #{request.taskStatus} "
+			+ " AND task_status = #{request.taskStatus} "
 			+ "</if>"
 			+ "<if test = 'request.userId!=null'> "
-			+ " AND userId = #{request.userId} "
+			+ " AND a.user_id = #{request.userId} "
 			+ "</if>"
 			+ "<if test = 'request.taskDescription!=null'> "
-			+ " AND taskDescription  like concat('%',#{request.taskDescription},'%')  "
+			+ " AND task_description  like concat('%',#{request.taskDescription},'%')  "
 			+ "</if>"
 			+ "<if test='request.ids != null and request.ids.size > 0'>"  
 			+ "and a.id  in "
@@ -80,7 +80,7 @@ public interface TaskDao extends BaseMapper<Task> {
 			+ "</if>" 
 			+ " ) tt"
 			+ "<if test = 'request.userName!=null'> "
-			+ " AND tt.userName = like concat('%',#{request.userName},'%') "
+			+ " AND tt.user_name = like concat('%',#{request.userName},'%') "
 			+ "</if>"
 			+ "</script>")
 	List<TaskVo> page(@Param("request")TaskRequest request);