Merge remote-tracking branch 'origin/zmlDev' into zmlDev

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

@@ -38,7 +38,6 @@ public class BasicProductCategoryController {
     @Resource
     BasicProductCategoryService basicProductCategoryService;
 
-
     @GetMapping("/udiwms/basic/product/category/filter")
     public BaseResponse filterBasicUnitMaintain(BasicHospTypeFilterRequest basicHospTypeFilterRequest, BindingResult bindingResult) {
 
@@ -170,18 +169,25 @@ public class BasicProductCategoryController {
     @GetMapping("/udiwms/basic/product/category/bindList")
     public BaseResponse bindList(FilterUdiProductRequest filterUdiProductRequest) {
 
-        if (StrUtil.isNotEmpty(filterUdiProductRequest.getUdiCode()) && StrUtil.isEmpty(filterUdiProductRequest.getUnionCode())) {
+        if (StrUtil.isNotEmpty(filterUdiProductRequest.getUdiCode())) {
-            if (StrUtil.isNotEmpty(filterUdiProductRequest.getUdiCode())) {
+            UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiProductRequest.getUdiCode());
-                UdiEntity udi = FilterUdiUtils.getUdi(filterUdiProductRequest.getUdiCode());
+            if (udiEntity != null) {
-                filterUdiProductRequest.setNameCode(udi.getUdi());
+                filterUdiProductRequest.setNameCode(udiEntity.getUdi());
+                filterUdiProductRequest.setUnionCode(udiEntity.getUdi());
             }
-            List<UdiRelevanceResponse> udiRelevanceResponses = basicProductCategoryService.selectAll(filterUdiProductRequest);
+        }
-                if(udiRelevanceResponses != null && udiRelevanceResponses.size()>0){
+        //如果输入DI标识，精确找到不同层级对应的产品信息
-                    filterUdiProductRequest.setOriginUuid(udiRelevanceResponses.get(0).getOriginUuid());
+        if (StrUtil.isNotEmpty(filterUdiProductRequest.getUnionCode())) {
-                    filterUdiProductRequest.setNameCode(null);
+            FilterUdiRelRequest filterUdiInfoRequest = new FilterUdiRelRequest();
-                }
+            filterUdiInfoRequest.setNameCode(filterUdiProductRequest.getUnionCode());
-
+            List<UdiRelevanceResponse> temps = basicHospTypeService.filterUdiGp(filterUdiInfoRequest);
-        }else{
+            if (temps != null && temps.size() > 0) {
+                filterUdiProductRequest.setOriginUuid(temps.get(0).getOriginUuid());
+                filterUdiProductRequest.setNameCode(filterUdiInfoRequest.getNameCode());
+                filterUdiProductRequest.setUnionCode(null);
+            }
+        } else {
+            //只查找主标识产品信息
             filterUdiProductRequest.setDiType(1);
         }
 
@@ -198,7 +204,19 @@ public class BasicProductCategoryController {
 
         //是否是一级分类
         BasicProductCategory category = basicProductCategoryService.checkCode(filterUdiRelRequest.getParentCode());
-
+        //过滤已被选入的产品
+        FilterUdiProductRequest request = new FilterUdiProductRequest();
+        if("10000".equals(category.getParentCode())) {
+            request.setCode(filterUdiRelRequest.getParentCode());
+        }else{
+            request.setCode(category.getCode());
+        }
+        List<UdiRelevanceResponse> udiRelevanceResponses1 = basicProductCategoryService.selectAll(request);
+        ArrayList<Long> list = new ArrayList<>();
+        for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses1) {
+            list.add(udiRelevanceResponse.getId());
+        }
+        filterUdiRelRequest.setExistid(list);
         List<UdiRelevanceResponse> udiRelevanceResponses=null;
 
 
@@ -213,7 +231,7 @@ public class BasicProductCategoryController {
             if (StrUtil.isNotEmpty(filterUdiRelRequest.getUnionCode())) {
                 FilterUdiRelRequest filterUdiInfoRequest = new FilterUdiRelRequest();
                 filterUdiInfoRequest.setNameCode(filterUdiRelRequest.getUnionCode());
-                List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
+                List<UdiRelevanceResponse> temps = basicHospTypeService.filterUdiGp(filterUdiInfoRequest);
                 if (temps != null && temps.size() > 0) {
                     filterUdiRelRequest.setOriginUuid(temps.get(0).getOriginUuid());
                     filterUdiRelRequest.setNameCode(filterUdiInfoRequest.getNameCode());
@@ -225,7 +243,8 @@ public class BasicProductCategoryController {
             }
         if("10000".equals(category.getParentCode())) {
             //查全部
-            udiRelevanceResponses= basicHospTypeService.filterUdiGp(filterUdiRelRequest);
+            udiRelevanceResponses=  basicHospTypeService.filterUdiGpexist(filterUdiRelRequest);
+
         }else{
             // 查上级
             FilterUdiProductRequest filterUdiProductRequest = new FilterUdiProductRequest();
@@ -235,10 +254,12 @@ public class BasicProductCategoryController {
             filterUdiProductRequest.setYlqxzcrbarmc(filterUdiRelRequest.getYlqxzcrbarmc());
             filterUdiProductRequest.setUnionCode(filterUdiRelRequest.getUnionCode());
             filterUdiProductRequest.setThrPiId(filterUdiRelRequest.getThrPiId());
-
+            filterUdiProductRequest.setNameCode(filterUdiRelRequest.getNameCode());
+            filterUdiProductRequest.setExistid(list);
             udiRelevanceResponses= basicProductCategoryService.selectAll(filterUdiProductRequest);
 
         }
+
         PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponses);
         PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
@@ -251,8 +272,7 @@ public class BasicProductCategoryController {
     @GetMapping("/udiwms/basic/product/category/SelcetproductList")
     public BaseResponse SelectproductList(FilterUdiRelRequest filterUdiRelRequest) {
 
-        //是否是一级分类
+
-        BasicProductCategory category = basicProductCategoryService.checkCode(filterUdiRelRequest.getParentCode());
 
         List<UdiRelevanceResponse> udiRelevanceResponses=null;
 
@@ -278,6 +298,8 @@ public class BasicProductCategoryController {
                 //只查找主标识产品信息
                 filterUdiRelRequest.setDiType(1);
             }
+        //是否是一级分类
+        BasicProductCategory category = basicProductCategoryService.checkCode(filterUdiRelRequest.getParentCode());
         if("10000".equals(category.getParentCode())) {
             //查全部
             udiRelevanceResponses= basicHospTypeService.filterUdiGp(filterUdiRelRequest);
@@ -290,6 +312,7 @@ public class BasicProductCategoryController {
             filterUdiProductRequest.setYlqxzcrbarmc(filterUdiRelRequest.getYlqxzcrbarmc());
             filterUdiProductRequest.setUnionCode(filterUdiRelRequest.getUnionCode());
             filterUdiProductRequest.setThrPiId(filterUdiRelRequest.getThrPiId());
+            filterUdiProductRequest.setNameCode(filterUdiRelRequest.getNameCode());
 
             udiRelevanceResponses= basicProductCategoryService.selectAll(filterUdiProductRequest);
 

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

@@ -21,6 +21,8 @@ public interface UdiRelevanceDao extends BaseMapperPlus<UdiRelevanceDao, UdiRele
 
     List<UdiRelevanceResponse> filterUdiGp(FilterUdiRelRequest filterUdiRelRequest);
 
+    List<UdiRelevanceResponse> filterUdiGpexist(FilterUdiRelRequest filterUdiRelRequest);
+
     //    UdiRelevanceResponse selectUdiByUUid
     List<UdiRelevanceEntity> selectByUuid(@Param("uuid") String uuid);
 

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

@@ -3,6 +3,8 @@ package com.glxp.api.req.basic;
 import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class FilterUdiProductRequest extends ListPageRequest {
 
@@ -19,6 +21,7 @@ public class FilterUdiProductRequest extends ListPageRequest {
     private String thrPiId;
     private String originUuid;
     private Integer diType;
+    private List<Long> existid;
 
 
 

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

@@ -77,5 +77,6 @@ public class FilterUdiRelRequest extends ListPageRequest {
     private List<Long> ids;
     private String flbm;
     private String parentCode;
+    private List<Long> existid;
 
 }

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

@@ -35,6 +35,8 @@ public interface BasicHospTypeService extends IService<BasicHospTypeEntity> {
 
     List<UdiRelevanceResponse> filterUdiGp(FilterUdiRelRequest filterUdiRelRequest);
 
+    List<UdiRelevanceResponse> filterUdiGpexist(FilterUdiRelRequest filterUdiRelRequest);
+
     Boolean checkName(BasicHospTypeRequest basicHospTypeRequest, Integer type);
 
 

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

@@ -8,7 +8,6 @@ import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.basic.BasicHospTypeDao;
 import com.glxp.api.dao.basic.UdiRelevanceDao;
 import com.glxp.api.entity.basic.BasicHospTypeEntity;
-import com.glxp.api.entity.basic.BasicHospTypeRelEntity;
 import com.glxp.api.entity.basic.UdiRelevanceEntity;
 import com.glxp.api.req.basic.BasicHospTypeFilterRequest;
 import com.glxp.api.req.basic.BasicHospTypeRequest;
@@ -203,6 +202,20 @@ public class BasicHospTypeServiceImpl extends ServiceImpl<BasicHospTypeDao, Basi
         return data;
     }
 
+    @Override
+    public List<UdiRelevanceResponse> filterUdiGpexist(FilterUdiRelRequest filterUdiRelRequest) {
+        if (filterUdiRelRequest == null) {
+            return Collections.emptyList();
+        }
+        if (filterUdiRelRequest.getPage() != null) {
+            int offset = (filterUdiRelRequest.getPage() - 1) * filterUdiRelRequest.getLimit();
+            PageHelper.offsetPage(offset, filterUdiRelRequest.getLimit());
+        }
+
+        List<UdiRelevanceResponse> data = udiRelevanceDao.filterUdiGpexist(filterUdiRelRequest);
+        return data;
+    }
+
     @Override
     public Boolean checkName(BasicHospTypeRequest basicHospTypeRequest, Integer type) {
         Long sum = null;

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

@@ -67,6 +67,12 @@
           <if test="originUuid != null and originUuid != ''">
             and basic_products.originUuid = #{originUuid}
           </if>
+          <if test="existid != null and existid.size() != 0">
+            and basic_udirel.id not in
+            <foreach collection="existid" item="item" open="(" separator="," close=")">
+              #{item}
+            </foreach>
+          </if>
 
         </where>
 

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

@@ -461,6 +461,188 @@
         ORDER BY modifyTime DESC
     </select>
 
+
+    <select id="filterUdiGpexist" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
+            resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
+        select basic_udirel.*,
+        bht.name classifyName,
+        basic_products.originUuid,
+        basic_products.nameCode,
+        basic_products.deviceRecordKey,
+        basic_products.packRatio,
+        basic_products.packUnit,
+        basic_products.packLevel,
+        basic_products.bhxjsl,
+        basic_products.bhzxxsbzsl,
+        basic_products.zxxsbzbhsydysl,
+        basic_products.bhxjcpbm,
+        basic_products.bzcj,
+        basic_products.cpmctymc,
+        basic_products.cplb,
+        basic_products.flbm,
+        basic_products.ggxh,
+        basic_products.qxlb,
+        basic_products.tyshxydm,
+        basic_products.ylqxzcrbarmc,
+        basic_products.zczbhhzbapzbh,
+        basic_products.ylqxzcrbarywmc,
+        basic_products.sydycpbs,
+        basic_products.sjcpbm,
+        basic_products.versionNumber,
+        basic_products.diType,
+        basic_products.ybbm,
+        basic_products.sptm,
+        basic_products.manufactory,
+        basic_products.measname,
+        basic_products.productType,
+        basic_products.scbssfbhph,
+        basic_products.scbssfbhxlh,
+        basic_products.scbssfbhscrq,
+        basic_products.scbssfbhsxrq,
+        basic_products.cpms,
+        basic_products.allowNoBatch,
+        basic_products.allowNoExpire,
+        basic_products.allowNoProduct,
+        basic_products.allowNoSerial,
+        basic_products.spmc,
+        basic_products.cplx,
+        basic_products.hchzsb,
+        basic_products.cpdls,
+        basic_products.price,
+        basic_products.basicPrductRemak1,
+        basic_products.basicPrductRemak2,
+        basic_products.basicPrductRemak3,
+        basic_products.basicPrductRemak4,
+        basic_products.basicPrductRemak5,
+        basic_products.basicPrductRemak6,
+        basic_products.basicPrductRemak7,
+        basic_products.basicPrductRemak8
+        FROM basic_products
+        inner JOIN basic_udirel
+        ON basic_products.uuid = basic_udirel.uuid
+        left join basic_hosp_type bht on basic_udirel.relCode = bht.code
+        <where>
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+                AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
+            </if>
+            <if test="relCode != '' and relCode != null">
+                AND relCode = #{relCode}
+            </if>
+            <if test="bindType != '' and bindType != null">
+                AND (relCode is null
+                or trim(relCode) = '')
+            </if>
+            <if test="supName != '' and supName != null">
+                AND supName LIKE concat('%', #{supName}, '%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode}, '%')
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                AND basic_products.cpmctymc LIKE concat('%', #{cpmctymc}, '%')
+            </if>
+            <if test="entireCpmctymc != '' and entireCpmctymc != null">
+                AND basic_products.cpmctymc = #{entireCpmctymc}
+            </if>
+            <if test="ggxh != '' and ggxh != null">
+                AND basic_products.ggxh LIKE concat('%', #{ggxh}, '%')
+            </if>
+            <if test="unionCode != '' and unionCode != null">
+                and (
+                nameCode LIKE concat('%', #{unionCode}, '%')
+                or ybbm LIKE concat('%', #{unionCode}, '%')
+                or sptm LIKE concat('%', #{unionCode}, '%'))
+            </if>
+            <if test="isDisable == false">
+                AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false)
+            </if>
+            <if test="isDisable == true">
+                AND basic_udirel.isDisable = true
+            </if>
+            <if test="thrPiId != '' and thrPiId != null">
+                and (thirdId LIKE concat('%', #{thrPiId}, '%')
+                or thirdId1 LIKE concat('%', #{thrPiId}, '%')
+                or thirdId2 LIKE concat('%', #{thrPiId}, '%')
+                or thirdId3 LIKE concat('%', #{thrPiId}, '%')
+                or thirdId4 LIKE concat('%', #{thrPiId}, '%'))
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND basic_udirel.uuid = #{uuid}
+            </if>
+            <if test="thirdId != '' and thirdId != null">
+                AND thirdId = #{thirdId}
+            </if>
+            <if test="udplatCode != '' and udplatCode != null">
+                AND udplatCode = #{udplatCode}
+            </if>
+            <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
+                AND basic_products.zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
+            </if>
+            <if test="diType != '' and diType != null">
+                AND diType = #{diType}
+            </if>
+            <if test="filterType != null and filterType == 1">
+                AND (thirdId <![CDATA[<>]]> '' or thirdId1 <![CDATA[<>]]> '' or thirdId2 <![CDATA[<>]]> '' or
+                thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '')
+                and basic_products.originUuid <![CDATA[<>]]> ''
+            </if>
+            <if test="filterType != null and filterType == 2">
+                AND basic_products.originUuid is NULL
+            </if>
+            <if test="filterType != null and filterType == 3">
+                AND (mainId is NULL or mainId = '')
+                and basic_products.originUuid <![CDATA[<>]]> ''
+            </if>
+            <if test="filterType != null and filterType == 4">
+                AND thirdId1 is NULL
+                and basic_products.originUuid <![CDATA[<>]]> ''
+            </if>
+            <if test="filterType != null and filterType == 5">
+                AND thirdId2 is NULL
+                and basic_products.originUuid <![CDATA[<>]]> ''
+            </if>
+            <if test="filterType != null and filterType == 6">
+                AND thirdId3 is NULL
+                and basic_products.originUuid <![CDATA[<>]]> ''
+            </if>
+            <if test="filterType != null and filterType == 7">
+                AND thirdId4 is NULL
+                and basic_products.originUuid <![CDATA[<>]]> ''
+            </if>
+            <if test="filterType != null and filterType == 10">
+                AND basic_udirel.updateTime is NULL
+            </if>
+            <if test="lockStatus != '' and lockStatus != null">
+                AND basic_udirel.lockStatus = #{lockStatus}
+            </if>
+            <if test="mainId != '' and mainId != null">
+                AND mainId = #{mainId}
+            </if>
+            <if test="id != '' and id != null">
+                AND basic_udirel.id = #{id}
+            </if>
+            <if test="originUuid != null and originUuid != ''">
+                and originUuid = #{originUuid}
+            </if>
+            <if test="manufactory != null and manufactory != ''">
+                and basic_products.manufactory LIKE concat('%', #{manufactory}, '%')
+            </if>
+            <if test="dispatch != null">
+                and basic_udirel.dispatch = #{dispatch}
+            </if>
+            <if test="groupBuy != null">
+                and basic_udirel.groupBuy = #{groupBuy}
+            </if>
+            <if test="existid != null and existid.size() != 0">
+                and basic_udirel.id not in
+                <foreach collection="existid" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        ORDER BY modifyTime DESC
+    </select>
+
     <!--    资质证书选入产品分组查询-->
     <select id="filterCertUdi" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
             resultType="com.glxp.api.res.basic.UdiRelevanceResponse">