任务列表修改

src/main/java/com/glxp/api/res/trace/TraceTaskDlResponse.java

@@ -110,5 +110,6 @@ public class TraceTaskDlResponse {
     @ApiModelProperty(value = "任务更新时间")
     private Date updateTime;
 
+    private String companyName;
 
 }

src/main/resources/mybatis/mapper/trace/TraceTaskNoticeMapper.xml

@@ -9,26 +9,27 @@
 
     <select id="queryTraceTaskList" parameterType="com.glxp.api.req.trace.TraceTaskDetailRequest"
             resultMap="TraceTaskDlResult">
-        SELECT *
-        FROM trace_task_notice
+        SELECT ttn.*, uc.companyName
+        FROM trace_task_notice ttn
+                     left join user_company uc on ttn.companyIdFk = uc.id
         <where>
             <if test="taskType != '' and taskType != null">
-                and taskType = #{taskType}
+                and ttn.taskType = #{taskType}
             </if>
             <if test="status != '' and status != null">
-                and status = #{status}
+                and ttn.status = #{status}
             </if>
             <if test="cpmctymc != '' and cpmctymc != null">
-                and cpmctymc LIKE CONCAT('%', #{cpmctymc}, '%')
+                and ttn.cpmctymc LIKE CONCAT('%', #{cpmctymc}, '%')
             </if>
             <if test="ggxh != '' and ggxh != null">
-                and ggxh LIKE CONCAT('%', #{ggxh}, '%')
+                and ttn.ggxh LIKE CONCAT('%', #{ggxh}, '%')
             </if>
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
-                and ylqxzcrbarmc = #{ylqxzcrbarmc}
+                and ttn.ylqxzcrbarmc = #{ylqxzcrbarmc}
             </if>
             <if test="batchNo != '' and batchNo != null">
-                and batchNo = #{batchNo}
+                and ttn.batchNo = #{batchNo}
             </if>
         </where>
     </select>