bug修改，层级，阿里产品等

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

@@ -128,7 +128,6 @@ public class UdiRelevanceController extends BaseController {
     }
 
 
-
     //基础信息-耗材字典-查询页面、业务单据-选入耗材字典-查询页面
     @AuthRuleAnnotation("")
     @GetMapping("/udi/udirel/filterUdi")
@@ -245,6 +244,18 @@ public class UdiRelevanceController extends BaseController {
             tempRequest.setNameCode(filterUdiRelRequest.getNameCode());
         }
         List<UdiProductEntity> udiInfoEntities = udiProductService.filterAllUdiInfo(tempRequest);
+
+        //移除层级为空的数据
+        if (CollUtil.isNotEmpty(udiInfoEntities) && udiInfoEntities.size() > 1) {
+            for (int i = 0; i < udiInfoEntities.size(); i++) {
+                if (StrUtil.isEmpty(udiInfoEntities.get(i).getNameCode())) {
+                    udiProductService.deleteById(udiInfoEntities.get(i).getId() + "");
+                    udiInfoEntities.remove(i);
+                    break;
+                }
+            }
+        }
+
         List<UdiRelevanceResponse> udiRelevanceResponses = new ArrayList<>();
         if (CollUtil.isNotEmpty(udiInfoEntities)) {
             for (UdiProductEntity udiProductEntity : udiInfoEntities) {
@@ -400,9 +411,9 @@ public class UdiRelevanceController extends BaseController {
 
         try {
             CodeRel codeRel = new CodeRel();
-            if(udiProductEntity.getProductsType() == null || udiProductEntity.getProductsType() == 1){
+            if (udiProductEntity.getProductsType() == null || udiProductEntity.getProductsType() == 1) {
                 codeRel.setDiNameCode(udiRelevanceSaveRequest.getNameCode());
-            }else {
+            } else {
                 codeRel.setDrugCode(udiRelevanceSaveRequest.getNameCode());
             }
             codeRel.setYbbm(udiRelevanceSaveRequest.getYbbm());
@@ -410,8 +421,8 @@ public class UdiRelevanceController extends BaseController {
             codeRel.setTyshxyh(udiRelevanceSaveRequest.getTyshxydm());
             codeRel.setUpdateTime(new Date());
             erpBasicClient.updateCodeRelDetail(codeRel);
-        }catch (Exception e){
+        } catch (Exception e) {
-            System.out.println("上传多码融合:"+e);
+            System.out.println("上传多码融合:" + e);
         }
 
         return ResultVOUtils.success("更新成功");

src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java

@@ -54,6 +54,13 @@ public class ThirdAliDrugController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
+
+
+        if (StrUtil.isEmpty(thirdAliDrug.getApprovalNum()) && StrUtil.isEmpty(thirdAliDrug.getNameCode()) &&
+                StrUtil.isEmpty(thirdAliDrug.getCpmctymc())
+        ) {
+            return ResultVOUtils.success("查询参数不能为空");
+        }
         List<ThirdAliDrug> list = thirdAliDrugService.filterList(thirdAliDrug);
         PageInfo<ThirdAliDrug> pageInfo = new PageInfo<>(list);
         PageSimpleResponse<ThirdAliDrug> pageSimpleResponse = new PageSimpleResponse<>();
@@ -65,7 +72,7 @@ public class ThirdAliDrugController extends BaseController {
     @GetMapping("/udiwms/aliDrug/getDrugLevelListBycode")
     public BaseResponse getDrugLevelListBycode(ThirdAliDrugRequest thirdAliDrug, BindingResult bindingResult) {
         String nameCode = thirdAliDrug.getNameCode();
-        if (StrUtil.isEmpty(nameCode)){
+        if (StrUtil.isEmpty(nameCode)) {
             return ResultVOUtils.error("标识参数不能为空");
         }
         ThirdAliDrug one = thirdAliDrugService.getOne(new LambdaQueryWrapper<ThirdAliDrug>().eq(ThirdAliDrug::getNameCode, nameCode));
@@ -74,8 +81,10 @@ public class ThirdAliDrugController extends BaseController {
         }
 
         List<ThirdAliDrug> list = thirdAliDrugService.list(new LambdaQueryWrapper<ThirdAliDrug>()
+                .eq(ThirdAliDrug::getApprovalNum, one.getApprovalNum())
+                .eq(ThirdAliDrug::getCpmctymc, one.getCpmctymc())
                 .eq(ThirdAliDrug::getForm, one.getForm())
-                .eq(ThirdAliDrug::getFormSpec, one.getFormSpec())
+                .eq(ThirdAliDrug::getBzgg, one.getBzgg())
                 .eq(ThirdAliDrug::getPackRatio, one.getPackRatio()));
 
         return ResultVOUtils.success(list);

src/main/resources/mybatis/mapper/thrsys/ThirdAliDrugMapper.xml

@@ -38,53 +38,53 @@
     </sql>
 
     <select id="selectDrugsByNameCodes" resultType="int">
-        SELECT count(1) FROM third_ali_drug WHERE nameCode =  #{nameCode}
+        SELECT count(1)
+        FROM third_ali_drug
+        WHERE nameCode = #{nameCode}
     </select>
 
     <!-- 自定义saveOrUpdateBatch方法 -->
     <insert id="saveOrUpdateBatch" parameterType="com.glxp.api.entity.thrsys.ThirdAliDrug">
         replace INTO third_ali_drug (`type`, manufacturer, cpmctymc, form, formSpec, bzgg, spmc, nameCode, packRatio,
-        packLevel, createTime, updateTime, erpId, approvalNum)
+                                     packLevel, createTime, updateTime, erpId, approvalNum)
         VALUES
         <foreach collection="list" item="item" separator="," index="index">
             (#{item.type}, #{item.manufacturer}, #{item.cpmctymc}, #{item.form}, #{item.formSpec}, #{item.bzgg},
-            #{item.spmc}, #{item.nameCode},
+             #{item.spmc}, #{item.nameCode},
-            #{item.packRatio}, #{item.packLevel}, #{item.createTime}, #{item.updateTime}, #{item.erpId},
+             #{item.packRatio}, #{item.packLevel}, #{item.createTime}, #{item.updateTime}, #{item.erpId},
-            #{item.approvalNum})
+             #{item.approvalNum})
         </foreach>
     </insert>
 
 
-
+    <select id="filterList" parameterType="com.glxp.api.req.thrsys.ThirdAliDrugRequest"
-      <select id="filterList" parameterType="com.glxp.api.req.thrsys.ThirdAliDrugRequest" resultType="com.glxp.api.entity.thrsys.ThirdAliDrug">
+            resultType="com.glxp.api.entity.thrsys.ThirdAliDrug">
-    select
+        select id,
-        id,
+               `type`,
-        `type`,
+               manufacturer,
-        manufacturer,
+               cpmctymc,
-        cpmctymc,
+               form,
-        form,
+               formSpec,
-        formSpec,
+               bzgg,
-        bzgg,
+               spmc,
-        spmc,
+               nameCode,
-        nameCode,
+               packRatio,
-        packRatio,
+               packLevel,
-        packLevel,
+               createTime,
-        createTime,
+               erpId,
-        erpId,
+               updateTime,
-        updateTime,
+               approvalNum
-    approvalNum
+        from third_ali_drug
-    from third_ali_drug
+        <where>
-    <where>
+            <if test="cpmctymc != '' and cpmctymc != null">
-      <if test="cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
-        AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
+            </if>
-      </if>
+            <if test="nameCode != '' and nameCode != null">
-      <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat('%', #{nameCode}, '%')
-        AND nameCode LIKE concat('%', #{nameCode}, '%')
+            </if>
-      </if>
+            <if test="approvalNum != '' and approvalNum != null">
-        <if test="approvalNum != '' and approvalNum != null">
+                AND approvalNum = #{approvalNum}
-            AND approvalNum = #{approvalNum}
+            </if>
-        </if>
+        </where>
-    </where>
+    </select>
-  </select>
-
 </mapper>