Merge remote-tracking branch 'origin/master'

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

@@ -13,10 +13,7 @@ import com.glxp.api.entity.basic.BasicUdiProductEntity;
 import com.glxp.api.entity.basic.ProductInfoEntity;
 import com.glxp.api.entity.basic.UdiCompanyEntity;
 import com.glxp.api.entity.basic.UdiEntity;
-import com.glxp.api.req.basic.BasicDictSelectRequest;
+import com.glxp.api.req.basic.*;
-import com.glxp.api.req.basic.FilterUdiRelRequest;
-import com.glxp.api.req.basic.ProductInfoFilterRequest;
-import com.glxp.api.req.basic.UdiCompanyRequest;
 import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.trace.TraceManuCodeRellResponse;
@@ -143,39 +140,52 @@ public class UdiProductController extends BaseController {
         return ResultVOUtils.success("更新成功！");
     }
 
+
+    @AuthRuleAnnotation("")
+    @GetMapping("udi/basic/dict/filterylqxzcrbarmc")
+    public BaseResponse filterylqxzcrbarmc(BasicUdiProductRequest basicUdiProductRequest) {
+
+        List<BasicUdiProductEntity> basicUdiProductEntities = basicUdiProductService.filterYlqxzcrbarmc(basicUdiProductRequest);
+        PageInfo<BasicUdiProductEntity> pageInfo = new PageInfo<>(basicUdiProductEntities);
+        PageSimpleResponse<BasicUdiProductEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(basicUdiProductEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
     @AuthRuleAnnotation("")
     @GetMapping("udi/basic/dict/filterCpmctymc")
-    public BaseResponse filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest) {
+    public BaseResponse filterCpmctymc(BasicUdiProductRequest basicUdiProductRequest) {
 
-        List<ProductInfoEntity> productInfoEntities = productInfoService.filterCpmctymc(productInfoFilterRequest);
+        List<BasicUdiProductEntity> basicUdiProductEntities = basicUdiProductService.filterCpmctymc(basicUdiProductRequest);
-        PageInfo<ProductInfoEntity> pageInfo = new PageInfo<>(productInfoEntities);
+        PageInfo<BasicUdiProductEntity> pageInfo = new PageInfo<>(basicUdiProductEntities);
-        PageSimpleResponse<ProductInfoEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        PageSimpleResponse<BasicUdiProductEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
-        pageSimpleResponse.setList(productInfoEntities);
+        pageSimpleResponse.setList(basicUdiProductEntities);
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
     @AuthRuleAnnotation("")
     @GetMapping("udi/basic/dict/filterGgxh")
-    public BaseResponse filterGgxh(ProductInfoFilterRequest productInfoFilterRequest) {
+    public BaseResponse filterGgxh(BasicUdiProductRequest basicUdiProductRequest) {
 
-        List<ProductInfoEntity> productInfoEntities = productInfoService.filterGgxh(productInfoFilterRequest);
+        List<BasicUdiProductEntity> basicUdiProductEntities = basicUdiProductService.filterGgxh(basicUdiProductRequest);
-        PageInfo<ProductInfoEntity> pageInfo = new PageInfo<>(productInfoEntities);
+        PageInfo<BasicUdiProductEntity> pageInfo = new PageInfo<>(basicUdiProductEntities);
-        PageSimpleResponse<ProductInfoEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        PageSimpleResponse<BasicUdiProductEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
-        pageSimpleResponse.setList(productInfoEntities);
+        pageSimpleResponse.setList(basicUdiProductEntities);
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
     @AuthRuleAnnotation("")
     @GetMapping("udi/basic/dict/filterNameCode")
-    public BaseResponse filterNameCode(ProductInfoFilterRequest productInfoFilterRequest) {
+    public BaseResponse filterNameCode(BasicUdiProductRequest basicUdiProductRequest) {
 
-        List<ProductInfoEntity> productInfoEntities = productInfoService.filterNameCode(productInfoFilterRequest);
+        List<BasicUdiProductEntity> basicUdiProductEntities = basicUdiProductService.filterNameCode(basicUdiProductRequest);
-        PageInfo<ProductInfoEntity> pageInfo = new PageInfo<>(productInfoEntities);
+        PageInfo<BasicUdiProductEntity> pageInfo = new PageInfo<>(basicUdiProductEntities);
-        PageSimpleResponse<ProductInfoEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        PageSimpleResponse<BasicUdiProductEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
-        pageSimpleResponse.setList(productInfoEntities);
+        pageSimpleResponse.setList(basicUdiProductEntities);
         return ResultVOUtils.success(pageSimpleResponse);
     }
 

src/main/java/com/glxp/api/dao/basic/BasicUdiProductMapper.java

@@ -2,7 +2,10 @@ package com.glxp.api.dao.basic;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.entity.basic.BasicUdiProductEntity;
+import com.glxp.api.entity.basic.ProductInfoEntity;
+import com.glxp.api.req.basic.BasicUdiProductRequest;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
+import com.glxp.api.req.basic.ProductInfoFilterRequest;
 import com.glxp.api.res.basic.BasicUdiRelResponse;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -12,4 +15,12 @@ import java.util.List;
 public interface BasicUdiProductMapper extends BaseMapper<BasicUdiProductEntity> {
 
     List<BasicUdiProductEntity> filterList(FilterUdiRelRequest filterUdiRelRequest);
+
+    List<BasicUdiProductEntity> filterYlqxzcrbarmc(BasicUdiProductRequest basicUdiProductRequest);
+
+    List<BasicUdiProductEntity> filterCpmctymc(BasicUdiProductRequest basicUdiProductRequest);
+
+    List<BasicUdiProductEntity> filterGgxh(BasicUdiProductRequest basicUdiProductRequest);
+
+    List<BasicUdiProductEntity> filterNameCode(BasicUdiProductRequest basicUdiProductRequest);
 }

src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java

@@ -15,12 +15,6 @@ public interface ProductInfoDao {
 
     List<ProductInfoEntity> filterProductGroup(ProductInfoFilterRequest productInfoFilterRequest);
 
-    List<ProductInfoEntity> filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest);
-
-    List<ProductInfoEntity> filterGgxh(ProductInfoFilterRequest productInfoFilterRequest);
-
-    List<ProductInfoEntity> filterNameCode(ProductInfoFilterRequest productInfoFilterRequest);
-
     List<ProductInfoEntity> filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest);
 
     List<ProductInfoEntity> filterUdiByCreditNo(ProductInfoFilterRequest productInfoFilterRequest);

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

@@ -0,0 +1,261 @@
+package com.glxp.api.req.basic;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class BasicUdiProductRequest extends ListPageRequest {
+
+    private Long id;
+
+    /**
+     * 标识
+     */
+    private String nameCode;
+
+    /**
+     * 包装比例
+     */
+    private String packRatio;
+
+    /**
+     * 包装级别
+     */
+    private String packLevel;
+
+    /**
+     * 包含下级数量
+     */
+    private Integer bhxjsl;
+
+    /**
+     * 包含最小销售包装数量
+     */
+    private Integer bhzxxsbzsl;
+
+    /**
+     * 最小包装单元内包含使用单元数量:
+     * 最小销售标识包含使用单元数量
+     */
+    private Integer zxxsbzbhsydysl;
+
+    /**
+     * 包含下级产品编码
+     */
+    private String bhxjcpbm;
+
+    /**
+     * 包装层级
+     */
+    private String bzcj;
+
+    /**
+     * ERPID
+     */
+    private String thirdProductNo;
+
+    /**
+     * 1.器械，2，药品
+     */
+    private Integer addType;
+
+    /**
+     * 国家库key
+     */
+    private String deviceRecordKey;
+
+    /**
+     * 以使用单元数量入库
+     */
+    private Integer isUseDy;
+
+    /**
+     * ERP产品名
+     */
+    private String thirdProductName;
+
+    /**
+     * 产品名称，通用名称
+     */
+    private String cpmctymc;
+
+    /**
+     * 产品类别
+     */
+    private String cplb;
+
+    /**
+     * 分类编码
+     */
+    private String flbm;
+
+    /**
+     * 规格型号
+     */
+    private String ggxh;
+
+    /**
+     * 器械类别
+     */
+    private String qxlb;
+
+    /**
+     * 统一社会信用代码证号
+     */
+    private String tyshxydm;
+
+    /**
+     * 注册/备案人名称
+     */
+    private String ylqxzcrbarmc;
+
+    /**
+     * "注册/备案证号，
+     */
+    private String zczbhhzbapzbh;
+
+    /**
+     * 注册/备案人名称英文名称
+     */
+    private String ylqxzcrbarywmc;
+
+    /**
+     * 使用单元产品标识
+     */
+    private String sydycpbs;
+
+    /**
+     * UUID主键
+     */
+    private String uuid;
+
+    /**
+     * 上级产品标识
+     */
+    private String sjcpbm;
+
+    /**
+     * 历史版本号，最高为最新
+     */
+    private Integer versionNumber;
+
+    /**
+     * 表示类型：1.主标识，2，使用单元标识，3.本体标识，4，包装标识
+     */
+    private Integer diType;
+
+    /**
+     * 生产标识是否包含批号
+     */
+    private String scbssfbhph;
+
+    /**
+     * 生产标识是否包含序列号
+     */
+    private String scbssfbhxlh;
+
+    /**
+     * 生产标识是否包含生产日期
+     */
+    private String scbssfbhscrq;
+
+    /**
+     * 生产标识是否包含失效日期
+     */
+    private String scbssfbhsxrq;
+
+    /**
+     * 医保编码
+     */
+    private String ybbm;
+
+    /**
+     * 商品名称
+     */
+    private String spmc;
+
+    private String cphhhbh;
+
+    private String cpms;
+
+    private String cpbsbmtxmc;
+
+    /**
+     * 是否是最新记录
+     */
+    private Boolean isNewest;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 产品类型
+     */
+    private String cplx;
+
+    /**
+     * 耗材或者设备
+     */
+    private String hchzsb;
+
+    /**
+     * 是否为包类产品/组套类产品； 1 是 0 否
+     */
+    private String sfwblztlcp;
+
+    /**
+     * 共振（MR） 安全相关信息； 0 安全 ， 1 条件安全， 28
+     * 不安全 ， 3 说明书或标签上面不包括 MR 安全信息
+     */
+    private String cgzmraqxgxx;
+
+    /**
+     * 标记为一次性使用:0 否， 1 是
+     */
+    private String sfbjwycxsy;
+
+    /**
+     * 最大重复使用次数
+     */
+    private String zdcfsycs;
+
+    /**
+     * 是否为已灭菌产品:1 是 0 否
+     */
+    private String sfwwjbz;
+
+    /**
+     * 使用前是否需要进行灭菌:1 是 0 否
+     */
+    private String syqsfxyjxmj;
+
+    /**
+     * 灭菌方式
+     */
+    private String mjfs;
+
+    /**
+     * 其他信息的网址链接
+     */
+    private String qtxxdwzlj;
+
+    /**
+     * 分类编码对应分类名称
+     */
+    private String categoryName;
+
+    private String manufactory;
+
+    private String measname;
+
+    private String remark;
+
+    private Long updateUser;
+}

src/main/java/com/glxp/api/service/basic/BasicUdiProductService.java

@@ -1,9 +1,17 @@
 package com.glxp.api.service.basic;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.entity.basic.BasicUdiProductEntity;
+import com.glxp.api.entity.basic.ProductInfoEntity;
+import com.glxp.api.entity.basic.UdiCompanyEntity;
+import com.glxp.api.req.basic.BasicUdiProductRequest;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
+import com.glxp.api.req.basic.ProductInfoFilterRequest;
+import com.glxp.api.req.basic.UdiCompanyRequest;
 
+import javax.validation.Valid;
 import java.util.List;
 
 public interface BasicUdiProductService extends IService<BasicUdiProductEntity> {
@@ -13,5 +21,14 @@ public interface BasicUdiProductService extends IService<BasicUdiProductEntity>
     public List<BasicUdiProductEntity> filterList(FilterUdiRelRequest filterUdiRelRequest);
 
     boolean updateByUuid(BasicUdiProductEntity basicUdiProductEntity);
+
+    List<BasicUdiProductEntity> filterYlqxzcrbarmc(BasicUdiProductRequest basicUdiProductRequest);
+
+    List<BasicUdiProductEntity> filterCpmctymc(BasicUdiProductRequest basicUdiProductRequest);
+
+    List<BasicUdiProductEntity> filterGgxh(BasicUdiProductRequest basicUdiProductRequest);
+
+    List<BasicUdiProductEntity> filterNameCode(BasicUdiProductRequest basicUdiProductRequest);
+
 }
 

src/main/java/com/glxp/api/service/basic/ProductInfoService.java

@@ -11,11 +11,6 @@ public interface ProductInfoService {
 
     //赋码用
     //获取产品名称通用名称
-    List<ProductInfoEntity> filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest);
-
-    List<ProductInfoEntity> filterGgxh(ProductInfoFilterRequest productInfoFilterRequest);
-
-    List<ProductInfoEntity> filterNameCode(ProductInfoFilterRequest productInfoFilterRequest);
 
     List<ProductInfoEntity> filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest);
 

src/main/java/com/glxp/api/service/basic/impl/BasicUdiProductServiceImpl.java

@@ -3,7 +3,10 @@ package com.glxp.api.service.basic.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.entity.basic.BasicUdiRelEntity;
+import com.glxp.api.entity.basic.ProductInfoEntity;
+import com.glxp.api.req.basic.BasicUdiProductRequest;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
+import com.glxp.api.req.basic.ProductInfoFilterRequest;
 import com.glxp.api.service.basic.BasicUdiProductService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -11,6 +14,7 @@ import com.glxp.api.dao.basic.BasicUdiProductMapper;
 import com.glxp.api.entity.basic.BasicUdiProductEntity;
 
 import javax.annotation.Resource;
+import java.util.Collections;
 import java.util.List;
 
 @Service
@@ -35,4 +39,48 @@ public class BasicUdiProductServiceImpl extends ServiceImpl<BasicUdiProductMappe
     public boolean updateByUuid(BasicUdiProductEntity basicUdiProductEntity) {
         return basicUdiProductMapper.update(basicUdiProductEntity, new QueryWrapper<BasicUdiProductEntity>().eq("uuid", basicUdiProductEntity.getUuid())) > 0;
     }
+
+    @Override
+    public List<BasicUdiProductEntity> filterYlqxzcrbarmc(BasicUdiProductRequest basicUdiProductRequest) {
+        if (basicUdiProductRequest == null) {
+            return Collections.emptyList();
+        }
+        int offset = (basicUdiProductRequest.getPage() - 1) * basicUdiProductRequest.getLimit();
+        PageHelper.offsetPage(offset, basicUdiProductRequest.getLimit());
+        List<BasicUdiProductEntity> data = basicUdiProductMapper.filterYlqxzcrbarmc(basicUdiProductRequest);
+        return data;
+    }
+
+    @Override
+    public List<BasicUdiProductEntity> filterCpmctymc(BasicUdiProductRequest basicUdiProductRequest) {
+        if (basicUdiProductRequest == null) {
+            return Collections.emptyList();
+        }
+        int offset = (basicUdiProductRequest.getPage() - 1) * basicUdiProductRequest.getLimit();
+        PageHelper.offsetPage(offset, basicUdiProductRequest.getLimit());
+        List<BasicUdiProductEntity> data = basicUdiProductMapper.filterCpmctymc(basicUdiProductRequest);
+        return data;
+    }
+
+    @Override
+    public List<BasicUdiProductEntity> filterGgxh(BasicUdiProductRequest basicUdiProductRequest) {
+        if (basicUdiProductRequest == null) {
+            return Collections.emptyList();
+        }
+        int offset = (basicUdiProductRequest.getPage() - 1) * basicUdiProductRequest.getLimit();
+        PageHelper.offsetPage(offset, basicUdiProductRequest.getLimit());
+        List<BasicUdiProductEntity> data = basicUdiProductMapper.filterGgxh(basicUdiProductRequest);
+        return data;
+    }
+
+    @Override
+    public List<BasicUdiProductEntity> filterNameCode(BasicUdiProductRequest basicUdiProductRequest) {
+        if (basicUdiProductRequest == null) {
+            return Collections.emptyList();
+        }
+        int offset = (basicUdiProductRequest.getPage() - 1) * basicUdiProductRequest.getLimit();
+        PageHelper.offsetPage(offset, basicUdiProductRequest.getLimit());
+        List<BasicUdiProductEntity> data = basicUdiProductMapper.filterNameCode(basicUdiProductRequest);
+        return data;
+    }
 }

src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java

@@ -20,39 +20,6 @@ public class ProductInfoServiceImpl implements ProductInfoService {
     @Resource
     ProductInfoDao productInfoDao;
 
-    @Override
-    public List<ProductInfoEntity> filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest) {
-        if (productInfoFilterRequest == null) {
-            return Collections.emptyList();
-        }
-        int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
-        PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
-        List<ProductInfoEntity> data = productInfoDao.filterCpmctymc(productInfoFilterRequest);
-        return data;
-    }
-
-    @Override
-    public List<ProductInfoEntity> filterGgxh(ProductInfoFilterRequest productInfoFilterRequest) {
-        if (productInfoFilterRequest == null) {
-            return Collections.emptyList();
-        }
-        int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
-        PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
-        List<ProductInfoEntity> data = productInfoDao.filterGgxh(productInfoFilterRequest);
-        return data;
-    }
-
-    @Override
-    public List<ProductInfoEntity> filterNameCode(ProductInfoFilterRequest productInfoFilterRequest) {
-        if (productInfoFilterRequest == null) {
-            return Collections.emptyList();
-        }
-        int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
-        PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
-        List<ProductInfoEntity> data = productInfoDao.filterNameCode(productInfoFilterRequest);
-        return data;
-    }
-
     @Override
     public List<ProductInfoEntity> filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest) {
         if (productInfoFilterRequest == null) {

src/main/resources/mybatis/mapper/basic/BasicUdiProductMapper.xml

@@ -45,4 +45,124 @@
         </where>
         ORDER BY updateTime DESC
     </select>
+    <select id="filterYlqxzcrbarmc" parameterType="com.glxp.api.req.basic.BasicUdiProductRequest"
+            resultType="com.glxp.api.entity.basic.BasicUdiProductEntity">
+        select ylqxzcrbarmc
+        from basic_udi_product
+        <where>
+            <if test="tyshxydm != '' and tyshxydm != null">
+                AND tyshxydm = #{tyshxydm}
+            </if>
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+                AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat('%',#{cpmctymc},'%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode}, '%')
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND uuid = #{uuid}
+            </if>
+            <if test="updateTime != null and updateTime != ''">
+                <![CDATA[
+                and updateTime >= DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')
+                ]]>
+            </if>
+        </where>
+        GROUP BY ylqxzcrbarmc
+    </select>
+    <select id="filterCpmctymc" parameterType="com.glxp.api.req.basic.BasicUdiProductRequest"
+            resultType="com.glxp.api.entity.basic.BasicUdiProductEntity">
+        select cpmctymc
+        from basic_udi_product
+        <where>
+            <if test="tyshxydm != '' and tyshxydm != null">
+                AND tyshxydm = #{tyshxydm}
+            </if>
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+                AND ylqxzcrbarmc = #{ylqxzcrbarmc}
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat('%',#{cpmctymc},'%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode}, '%')
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND uuid = #{uuid}
+            </if>
+            <if test="updateTime != null and updateTime != ''">
+                <![CDATA[
+                and updateTime >= DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')
+                ]]>
+            </if>
+        </where>
+        GROUP BY cpmctymc
+    </select>
+
+    <select id="filterGgxh" parameterType="com.glxp.api.req.basic.BasicUdiProductRequest"
+            resultType="com.glxp.api.entity.basic.BasicUdiProductEntity">
+        select ggxh
+        from basic_udi_product
+        <where>
+            <if test="tyshxydm != '' and tyshxydm != null">
+                AND tyshxydm = #{tyshxydm}
+            </if>
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+                AND ylqxzcrbarmc = #{ylqxzcrbarmc}
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc = #{cpmctymc}
+            </if>
+            <if test="ggxh != '' and ggxh != null">
+                AND ggxh LIKE concat('%',#{ggxh},'%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode}, '%')
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND uuid = #{uuid}
+            </if>
+            <if test="updateTime != null and updateTime != ''">
+                <![CDATA[
+                and updateTime >= DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')
+                ]]>
+            </if>
+        </where>
+        GROUP BY ggxh
+    </select>
+
+    <select id="filterNameCode" parameterType="com.glxp.api.req.basic.BasicUdiProductRequest"
+            resultType="com.glxp.api.entity.basic.BasicUdiProductEntity">
+        select nameCode
+        from basic_udi_product
+        <where>
+            <if test="tyshxydm != '' and tyshxydm != null">
+                AND tyshxydm = #{tyshxydm}
+            </if>
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+                AND ylqxzcrbarmc = #{ylqxzcrbarmc}
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc = #{cpmctymc}
+            </if>
+            <if test="ggxh != '' and ggxh != null">
+                AND ggxh = #{ggxh}
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat('%',#{nameCode}, '%')
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND uuid = #{uuid}
+            </if>
+            <if test="updateTime != null and updateTime != ''">
+                <![CDATA[
+                and updateTime >= DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')
+                ]]>
+            </if>
+        </where>
+        GROUP BY nameCode
+    </select>
 </mapper>

src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml

@@ -70,98 +70,7 @@
         GROUP BY uuid
     </select>
 
-    <select id="filterCpmctymc" parameterType="com.glxp.api.req.basic.ProductInfoFilterRequest"
-            resultType="com.glxp.api.entity.basic.ProductInfoEntity">
-        select cpmctymc
-        from productinfo
-        <where>
-            <if test="tyshxydm != '' and tyshxydm != null">
-                AND tyshxydm = #{tyshxydm}
-            </if>
-            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
-                AND ylqxzcrbarmc = #{ylqxzcrbarmc}
-            </if>
-            <if test="cpmctymc != '' and cpmctymc != null">
-                AND cpmctymc LIKE concat('%',#{cpmctymc},'%')
-            </if>
-            <if test="nameCode != '' and nameCode != null">
-                AND nameCode LIKE concat(#{nameCode}, '%')
-            </if>
-            <if test="uuid != '' and uuid != null">
-                AND uuid = #{uuid}
-            </if>
-            <if test="updateTime != null and updateTime != ''">
-                <![CDATA[
-                and updateTime >= DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')
-                ]]>
-            </if>
-        </where>
-        GROUP BY cpmctymc
-    </select>
 
-    <select id="filterGgxh" parameterType="com.glxp.api.req.basic.ProductInfoFilterRequest"
-            resultType="com.glxp.api.entity.basic.ProductInfoEntity">
-        select ggxh
-        from productinfo
-        <where>
-            <if test="tyshxydm != '' and tyshxydm != null">
-                AND tyshxydm = #{tyshxydm}
-            </if>
-            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
-                AND ylqxzcrbarmc = #{ylqxzcrbarmc}
-            </if>
-            <if test="cpmctymc != '' and cpmctymc != null">
-                AND cpmctymc = #{cpmctymc}
-            </if>
-            <if test="ggxh != '' and ggxh != null">
-                AND ggxh LIKE concat('%',#{ggxh},'%')
-            </if>
-            <if test="nameCode != '' and nameCode != null">
-                AND nameCode LIKE concat(#{nameCode}, '%')
-            </if>
-            <if test="uuid != '' and uuid != null">
-                AND uuid = #{uuid}
-            </if>
-            <if test="updateTime != null and updateTime != ''">
-                <![CDATA[
-                and updateTime >= DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')
-                ]]>
-            </if>
-        </where>
-        GROUP BY ggxh
-    </select>
-
-    <select id="filterNameCode" parameterType="com.glxp.api.req.basic.ProductInfoFilterRequest"
-            resultType="com.glxp.api.entity.basic.ProductInfoEntity">
-        select nameCode
-        from productinfo
-        <where>
-            <if test="tyshxydm != '' and tyshxydm != null">
-                AND tyshxydm = #{tyshxydm}
-            </if>
-            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
-                AND ylqxzcrbarmc = #{ylqxzcrbarmc}
-            </if>
-            <if test="cpmctymc != '' and cpmctymc != null">
-                AND cpmctymc = #{cpmctymc}
-            </if>
-            <if test="ggxh != '' and ggxh != null">
-                AND ggxh = #{ggxh}
-            </if>
-            <if test="nameCode != '' and nameCode != null">
-                AND nameCode LIKE concat('%',#{nameCode}, '%')
-            </if>
-            <if test="uuid != '' and uuid != null">
-                AND uuid = #{uuid}
-            </if>
-            <if test="updateTime != null and updateTime != ''">
-                <![CDATA[
-                and updateTime >= DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')
-                ]]>
-            </if>
-        </where>
-        GROUP BY nameCode
-    </select>
 
 
     <select id="filterUdiByTyshxydm" parameterType="com.glxp.api.req.basic.ProductInfoFilterRequest"

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

@@ -6,12 +6,14 @@
         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
+        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.recordIdFk = tr.id) mid ON mid.recordCode = tmo.recordCode
+        LEFT JOIN trace_product_record trd ON trd.id = tr.traceProductIdFk
+        ) mid ON mid.recordCode = tmo.recordCode
         <where>
             <if test="recordCode != '' and recordCode != null">
-                and recordCode = #{recordCode}
+                and mid.recordCode = #{recordCode}
             </if>
             <if test="companyName != '' and companyName != null">
                 AND companyName LIKE CONCAT('%', #{companyName}, '%')

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

@@ -3,13 +3,9 @@
 <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, trd.*, mid.*
+        SELECT tr.recordCode, tr.remark, trd.*
         FROM trace_record_log tr
                      LEFT JOIN trace_product_record trd ON trd.id = tr.traceProductIdFk
-                     LEFT JOIN (SELECT tor.billNo, tor.fromCorp, tor.toCorp, tor.createUser, uc.companyName
-                                FROM trace_order tor
-                                             LEFT JOIN user_company uc ON uc.id = tor.companyIdFk) mid
-                ON mid.billNo = tr.recordCode
         <where>
             <if test="recordCode != '' and recordCode != null">
                 and recordCode = #{recordCode}