0412更新

src/main/java/com/heai/modules/production/entity/TaskTypeList.java

@@ -1,5 +1,6 @@
 package com.heai.modules.production.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import org.apache.ibatis.type.Alias;
@@ -18,11 +19,13 @@ public class TaskTypeList implements Serializable {
     /**
      *
      */
+    @TableField("taskType")
     private String taskType;
 
     /**
      *
      */
+    @TableField("[order]")
     private Integer order;
 
     public Integer getId() {

src/main/java/com/heai/modules/taskmanage/service/impl/TaskTypeListServiceImpl.java

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 public class TaskTypeListServiceImpl extends ServiceImpl<TaskTypeListMapper, TaskTypeList> implements TaskTypeListService{
     @Override
     public void saveTaskType(TaskTypeList taskTypeList){
+        taskTypeList.setId(null);
         this.save(taskTypeList);
     }
 

src/main/java/com/heai/modules/taskmanage/vo/TaskDetailVo.java

@@ -38,6 +38,9 @@ public class TaskDetailVo {
     private String orderRefType;
     private String orderRef4;
     private String allowCloseByHand;
+    private String taskType;
+    private String oldSpec;
+    private String newSpec;
 
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")

src/main/resources/mapper/taskmanage/TaskDatailDao.xml

@@ -107,7 +107,7 @@
         , td.task_id
         , dbo.Get_chat_LastType(td.site,td.id,td.created_by) chatLastType
         ,tl.AllowCloseByHand,tl.OrderRef1,tl.OrderRef2,
-        tl.OrderRef3,tl.OrderRefType,tl.OrderRef4
+        tl.OrderRef3,tl.OrderRefType,tl.OrderRef4,tl.taskType,tl.oldSpec,tl.newSpec
         from task_detail td
         left join task_list tl on td.task_id = tl.id AND td.site = tl.site
         left join users u on td.site = u.site and u.userId = td.responsible_person
@@ -127,6 +127,15 @@
             </if>
             <if test="customer != null and customer != ''">
                 and tl.customer like #{customer}
+            </if>
+               <if test="taskType != null and taskType != ''">
+                and tl.taskType like #{taskType}
+            </if>
+               <if test="oldSpec != null and oldSpec != ''">
+                and tl.oldSpec like #{oldSpec}
+            </if>
+               <if test="newSpec != null and newSpec != ''">
+                and tl.newSpec like #{newSpec}
             </if>
             <if test="project != null and project != ''">
                 and tl.project like #{project}

src/main/resources/mapper/taskmanage/TaskListDao.xml

@@ -38,7 +38,7 @@
         ,updated_by
         ,task_header
         ,responsible_person,AllowCloseByHand,OrderRef1,OrderRef2,
-        OrderRef3,OrderRefType,OrderRef4
+        OrderRef3,OrderRefType,OrderRef4,taskType,oldSpec,newSpec
         from task_list
         <where>
             site = #{site}
@@ -62,6 +62,15 @@
             </if>
             <if test="endDate !=null ">
                 and task_start_date <![CDATA[ <= ]]> #{endDate}
+            </if>
+              <if test="taskType != null and taskType != ''">
+                and taskType like #{taskType}
+            </if>
+               <if test="oldSpec != null and oldSpec != ''">
+                and oldSpec like #{oldSpec}
+            </if>
+               <if test="newSpec != null and newSpec != ''">
+                and newSpec like #{newSpec}
             </if>
             <if test="finishStartDate != null ">
                 and required_completion_date  <![CDATA[ >= ]]> #{finishStartDate}