Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/entity/trace/TraceTaskNoticeEntity.java

@@ -110,7 +110,7 @@ public class TraceTaskNoticeEntity implements Serializable {
     @TableField(value = "updateTime")
     private Date updateTime;
 
-    @TableField(value = "diList",typeHandler = FastjsonTypeHandler.class)
+    @TableField(value = "diList", typeHandler = FastjsonTypeHandler.class)
     private List<String> diList;
 
 

src/main/resources/application-pro.yml

@@ -30,6 +30,13 @@ spring:
       max-file-size: 500MB
       max-request-size: 500MB
 
+  rabbitmq:
+    host: 192.168.0.66
+    port: 5672
+    virtual-host: dev
+    username: glxp
+    password: glxp1234
+
 ok:
   http:
     connect-timeout: 3000

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

@@ -3,14 +3,21 @@
 <mapper namespace="com.glxp.api.dao.trace.TraceManuOrderMapper">
     <select id="filterTraces" parameterType="com.glxp.api.req.trace.TraceManuOrderRequest"
             resultType="com.glxp.api.res.trace.TraceManuOrderResponse">
-        SELECT tmo.*, mid.*, uc.companyName
+--         SELECT tmo.*, mid.*, uc.companyName
+--         FROM trace_manu_order tmo
+--         LEFT JOIN user_company uc ON uc.id = tmo.companyIdFk
+--         LEFT JOIN (
+--         SELECT tr.recordCode, tr.createUser, tr.remark, trd.batchNo, trd.traceType
+--         FROM trace_record_log tr
+--         LEFT JOIN trace_product_record trd ON trd.id = tr.traceProductIdFk
+--         ) mid ON mid.recordCode = tmo.recordCode
+        SELECT tmo.*, trd.batchNo, trd.traceType, tr.createUser, tr.remark, uc.companyName
         FROM trace_manu_order tmo
         LEFT JOIN user_company uc ON uc.id = tmo.companyIdFk
-        LEFT JOIN (
-        SELECT tr.recordCode, tr.createUser, tr.remark, trd.batchNo, trd.traceType
-        FROM trace_record_log tr
+        LEFT JOIN trace_record_log tr ON tr.recordCode = tmo.recordCode
         LEFT JOIN trace_product_record trd ON trd.id = tr.traceProductIdFk
-        ) mid ON mid.recordCode = tmo.recordCode
+        WHERE trd.batchNo IS NOT NULL
+
         <where>
             <if test="recordCode != '' and recordCode != null">
                 and mid.recordCode = #{recordCode}