bug修改

src/main/java/com/glxp/api/controller/basic/UdiRelController.java

@@ -114,7 +114,6 @@ public class UdiRelController extends BaseController {
                     List<ProductInfoEntity> productInfoEntities = productInfoService.selectByUuid(basicUdiRelRequest.getUuid());
                     if (CollUtil.isNotEmpty(productInfoEntities)) {
                         for (ProductInfoEntity productInfoEntity : productInfoEntities) {
-//                            basicUdiProductService
                             BasicUdiProductEntity basicUdiProductEntity = new BasicUdiProductEntity();
                             BeanUtils.copyProperties(productInfoEntity, basicUdiProductEntity);
                             basicUdiProductEntity.setId(IdUtil.getSnowflakeNextId());

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

@@ -103,6 +103,10 @@ public class TraceProductDetailEntity implements Serializable {
     @TableField(value = "manuStatus")
     private Integer manuStatus;
 
-
+    /**
+     * 注册/备案号
+     */
+    @TableField(value = "zczbhhzbapzbh")
+    private String zczbhhzbapzbh;
     private static final long serialVersionUID = 1L;
 }

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

@@ -167,4 +167,5 @@ public class TraceOrderResponse {
     private String serialNo;
     @ApiModelProperty(value = "查询UDI码")
     private String udiCode;
+    private String zczbhhzbapzbh;
 }

src/main/java/com/glxp/api/service/trace/UdiTraceService.java

@@ -85,7 +85,7 @@ public class UdiTraceService {
             traceProductDetailEntity.setProduceDate(udiEntity.getProduceDate());
             traceProductDetailEntity.setExpireDate(udiEntity.getExpireDate());
             traceProductDetailEntity.setSerialNo(udiEntity.getSerialNo());
-
+            traceProductDetailEntity.setZczbhhzbapzbh(basicUdiRelResponse.getZczbhhzbapzbh());
             traceProductDetailEntity.setStatus(1);
             traceProductDetailService.save(traceProductDetailEntity);
             return traceProductDetailEntity;

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

@@ -1,46 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.trace.TraceManuOrderMapper">
-    <select id="filterTraces2" parameterType="com.glxp.api.req.trace.TraceManuOrderRequest"
-            resultType="com.glxp.api.res.trace.TraceManuOrderResponse">
---         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 trace_record_log tr ON tr.recordCode = tmo.recordCode
-        LEFT JOIN trace_product_record trd ON trd.id = tr.traceProductIdFk
-        <where>
-            <if test="recordCode != '' and recordCode != null">
-                and mid.recordCode = #{recordCode}
-            </if>
-            <if test="companyName != '' and companyName != null">
-                AND companyName LIKE CONCAT('%', #{companyName}, '%')
-            </if>
-            <if test="nameCode != '' and nameCode != null">
-                and nameCode = #{nameCode}
-            </if>
-            <if test="cpmctymc != '' and cpmctymc != null">
-                and cpmctymc = #{cpmctymc}
-            </if>
-            <if test="ggxh != '' and ggxh != null">
-                and ggxh = #{ggxh}
-            </if>
-            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
-                and ylqxzcrbarmc = #{ylqxzcrbarmc}
-            </if>
-            <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
-                and zczbhhzbapzbh = #{zczbhhzbapzbh}
-            </if>
-        </where>
-        AND trd.batchNo IS NOT NULL
-    </select>
+
     <select id="filterTraces" parameterType="com.glxp.api.req.trace.TraceManuOrderRequest"
             resultType="com.glxp.api.res.trace.TraceManuOrderResponse">
         SELECT *

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

@@ -48,10 +48,13 @@
                trace_product_record.batchNo,
                trace_product_record.produceDate,
                trace_product_record.expireDate,
-               trace_product_record.serialNo
+               trace_product_record.serialNo,
+               trace_product_record.zczbhhzbapzbh,
+               uc.companyName
         FROM trace_order
                      left join trace_product_record
                 on trace_order.traceProductIdFk = trace_product_record.id
+                     left join user_company uc on trace_order.companyIdFk = uc.id
         <where>
             <if test="traceProductIdFk != '' and traceProductIdFk != null">
                 and traceProductIdFk = #{traceProductIdFk}