追溯相关功能，企业信息编辑

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

@@ -85,14 +85,27 @@ public class UdiTraceController extends BaseController {
             traceRecordLogEntity.setFromType(traceRecordRequest.getFromType());
             traceRecordLogEntity.setTraceType(traceRecordRequest.getTraceType());
 
-
             //4.创建查询详情记录，若存在相同查询记录则直接获取
+            TraceProductDetailEntity traceProductDetailEntity = null;
             if (traceRecordRequest.getTraceType() == 1) {//按UDI码查询
-                TraceProductDetailEntity traceProductDetailEntity = traceProductDetailService.findUniqueByCode(1, traceRecordRequest.getUdiCode());
+                traceProductDetailEntity = traceProductDetailService.findUniqueByCode(1, traceRecordRequest.getUdiCode());
                 if (traceProductDetailEntity == null) {
-
+                    traceProductDetailEntity.setId(IdUtil.getSnowflakeNextId());
+                    traceProductDetailEntity.setTraceSource(1);
+                    traceProductDetailEntity.setTraceType(traceRecordRequest.getTraceType());
+                    traceProductDetailEntity.setUdiCode(traceRecordRequest.getUdiCode());
+                    traceProductDetailEntity.setYlqxzcrbarmc(basicUdiRelResponse.getYlqxzcrbarmc());
+                    traceProductDetailEntity.setCreditNum(basicUdiRelResponse.getTyshxydm());
+                    traceProductDetailEntity.setCpmctymc(basicUdiRelResponse.getCpmctymc());
+                    traceProductDetailEntity.setGgxh(basicUdiRelResponse.getGgxh());
+                    traceProductDetailEntity.setNameCode(basicUdiRelResponse.getNameCode());
+                    traceProductDetailEntity.setBatchNo(udiEntity.getBatchNo());
+                    traceProductDetailEntity.setProduceDate(udiEntity.getProduceDate());
+                    traceProductDetailEntity.setExpireDate(udiEntity.getExpireDate());
+                    traceProductDetailEntity.setSerialNo(udiEntity.getSerialNo());
+                    traceProductDetailEntity.setStatus(1);
+                    traceProductDetailService.save(traceProductDetailEntity);
                 }
-
             } else {    //按批次号查询
 
             }

src/main/java/com/glxp/api/entity/basic/BasicUdiRelEntity.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 @Data
@@ -53,10 +54,17 @@ public class BasicUdiRelEntity implements Serializable {
      */
     @TableField(value = "companyType")
     private Integer companyType;
-
+    /**
+     * 代理起始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @TableField(value = "agengtStartDate")
     private Date agengtStartDate;
 
+    /**
+     * 代理结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @TableField(value = "agengtEndDate")
     private Date agengtEndDate;
 

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

@@ -17,7 +17,6 @@ import lombok.Data;
 public class TraceProductDetailEntity implements Serializable {
     @TableId(value = "id", type = IdType.INPUT)
     private Long id;
-
     /**
      * 查询方式（1:源头查询；2：现在检查查询)
      */
@@ -35,13 +34,6 @@ public class TraceProductDetailEntity implements Serializable {
      */
     @TableField(value = "udiCode")
     private String udiCode;
-
-    /**
-     * 社会信用号
-     */
-    @TableField(value = "creditNum")
-    private String creditNum;
-
     /**
      * 注册备案人
      */
@@ -49,10 +41,10 @@ public class TraceProductDetailEntity implements Serializable {
     private String ylqxzcrbarmc;
 
     /**
-     * 产品主DI标识
+     * 社会信用号
      */
-    @TableField(value = "nameCode")
-    private String nameCode;
+    @TableField(value = "creditNum")
+    private String creditNum;
 
     /**
      * 产品通用名
@@ -66,6 +58,13 @@ public class TraceProductDetailEntity implements Serializable {
     @TableField(value = "ggxh")
     private String ggxh;
 
+    /**
+     * 产品主DI标识
+     */
+    @TableField(value = "nameCode")
+    private String nameCode;
+
+
     /**
      * 生产批次号
      */

src/main/java/com/glxp/api/req/basic/BasicUdiRelRequest.java

@@ -1,6 +1,7 @@
 package com.glxp.api.req.basic;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -42,8 +43,9 @@ public class BasicUdiRelRequest {
      */
     private Integer companyType;
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date agengtStartDate;
-
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date agengtEndDate;
 
 

src/main/java/com/glxp/api/req/basic/UdiSelectRequest.java

@@ -10,5 +10,8 @@ public class UdiSelectRequest {
     List<BasicUdiRelRequest> products;
     private Long companyId;
 
+    private String key;
+    private List<String> keys;
+
 
 }

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

@@ -7,7 +7,7 @@
         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 tr
+                            FROM trace_record_log tr
                                      LEFT JOIN trace_record_detail trd ON trd.recordIdFk = tr.id) mid ON mid.recordCode = tmo.recordCode
         <where>
             <if test="recordCode != '' and recordCode != null">

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

@@ -4,12 +4,13 @@
     <select id="queryTraceOrderList" parameterType="com.glxp.api.req.trace.TraceOrderDetailRequest"
             resultType="com.glxp.api.res.trace.TraceOrderResponse">
         SELECT tor.*
-             ,uc.companyName
+             , uc.companyName
         FROM trace_order tor
-        LEFT JOIN user_company uc ON uc.id = tor.companyIdFk
-        LEFT JOIN (SELECT tr.recordCode,trd.*
-        FROM trace_record tr
-        LEFT JOIN trace_record_detail trd ON trd.recordIdFk = tr.id) trmid ON trmid.recordCode = tor.recordCode
+                     LEFT JOIN user_company uc ON uc.id = tor.companyIdFk
+                     LEFT JOIN (SELECT tr.recordCode, trd.*
+                                FROM trace_record_log tr
+                                             LEFT JOIN trace_record_detail trd ON trd.recordIdFk = tr.id) trmid
+                ON trmid.recordCode = tor.recordCode
         <where>
             <if test="udiCode != '' and udiCode != null">
                 and udiCode = #{udiCode}

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

@@ -4,7 +4,7 @@
     <select id="filterTraces" parameterType="com.glxp.api.req.trace.TraceRecordRequest"
             resultType="com.glxp.api.res.trace.TraceRecordResponse">
         SELECT tr.recordCode, tr.remark, trd.*, mid.*
-        FROM trace_record tr
+        FROM trace_record_log tr
                      LEFT JOIN trace_record_detail trd ON trd.recordIdFk = tr.id
                      LEFT JOIN (SELECT tor.billNo, tor.fromCorp, tor.toCorp, tor.createUser, uc.companyName
                                 FROM trace_order tor