查询等相关bug修改

src/main/java/com/glxp/api/controller/trace/TraceTaskController.java

@@ -113,7 +113,4 @@ public class TraceTaskController {
     }
 
 
-
-
-
 }

src/main/java/com/glxp/api/controller/trace/UdiTraceController.java

@@ -215,6 +215,10 @@ public class UdiTraceController extends BaseController {
         UdiEntity udiEntity = null;
         UserCompanyEntity userCompanyEntity = null;
 
+        if (traceRecordRequest.getCompanyId() == null) {
+            return ResultVOUtils.error(500, "请先选择当前所在企业！");
+        }
+
         if (StrUtil.isNotEmpty(traceRecordRequest.getUdiCode())) {
             traceRecordRequest.setTraceType(Constant.UDI_TRACE);
         }

src/main/resources/application-dev.yml

@@ -4,9 +4,9 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_cpt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_cpt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: Glxp@6066
+    password: 123456
     hikari:
       connection-timeout: 60000
       maximum-pool-size: 20

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

@@ -38,8 +38,7 @@
 
     <select id="filterJoin" parameterType="com.glxp.api.req.trace.TraceOrderDetailRequest"
             resultType="com.glxp.api.res.trace.TraceOrderResponse">
-        SELECT trace_order.*,
-               trace_product_record.udiCode,
+        SELECT trace_product_record.udiCode,
                trace_product_record.ylqxzcrbarmc,
                trace_product_record.creditNum,
                trace_product_record.cpmctymc,
@@ -50,6 +49,7 @@
                trace_product_record.expireDate,
                trace_product_record.serialNo,
                trace_product_record.zczbhhzbapzbh,
+               trace_order.*,
                uc.companyName
         FROM trace_order
                      left join trace_product_record
@@ -103,10 +103,9 @@
     </select>
     <select id="filterOrder" parameterType="com.glxp.api.req.trace.TraceOrderRequest"
             resultType="com.glxp.api.res.trace.TraceOrderResponse">
-        SELECT tpr.cpmctymc,tpr.ggxh,tpr.ylqxzcrbarmc,tpr.creditNum,tpr.batchNo,tr.*
-        FROM
-        trace_order AS tr
-        LEFT JOIN trace_product_record tpr ON tr.traceProductIdFk = tpr.id
+        SELECT tpr.cpmctymc, tpr.ggxh, tpr.ylqxzcrbarmc, tpr.creditNum, tpr.batchNo, tr.*
+        FROM trace_order AS tr
+                     LEFT JOIN trace_product_record tpr ON tr.traceProductIdFk = tpr.id
         <where>
             <if test="recordCode != '' and recordCode != null">
                 and recordCode = #{recordCode}

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.glxp.api.dao.trace.TraceRecordMapper">
     <select id="filterTraces" parameterType="com.glxp.api.req.trace.TraceRecordRequest"
             resultType="com.glxp.api.res.trace.TraceRecordResponse">
-        SELECT tr.recordCode, tr.remark,tr.createUser, trd.*
+        SELECT tr.recordCode, tr.remark, tr.createUser, tr.updateTime, trd.*
         FROM trace_record_log tr
                      LEFT JOIN trace_product_record trd ON trd.id = tr.traceProductIdFk
         <where>

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

@@ -32,5 +32,7 @@
                 and ttn.batchNo = #{batchNo}
             </if>
         </where>
+
+        order by ttn.updateTime desc
     </select>
 </mapper>