修改院内分类功能代码

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

@@ -133,16 +133,6 @@ public class BasicHospTypeController {
 
         filterUdiRelRequest.setDiType(1);
         List<UdiRelevanceResponse> udiRelevanceResponses = basicHospTypeService.filterUdiGp(filterUdiRelRequest);
-        //查询分类关联表，存在的制灰
-        List<BasicHospTypeRelEntity> basicHospTypeRelEntityList=basicHospTypeRelService.getBasicHospTypeRelList(filterUdiRelRequest.getBindId());
-        for (UdiRelevanceResponse obj:udiRelevanceResponses){
-            for (BasicHospTypeRelEntity obj2:basicHospTypeRelEntityList){
-                if(obj2.getRelId().equals(String.valueOf(obj.getId()))){
-                    obj.setBindCheck(true);
-                    break;
-                }
-            }
-        }
         PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponses);
         PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());

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

@@ -85,4 +85,6 @@ public interface UdiRelevanceDao extends BaseMapperPlus<UdiRelevanceDao, UdiRele
      * @return
      */
     String selectProductNameByRelId(@Param("relId") Long relId);
+
+    Boolean updateBatchById(@Param("list") List<UdiRelevanceEntity> list);
 }

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

@@ -37,4 +37,5 @@ public class UdiRelevanceEntity {
     private Integer lowStockNum;
     private Integer overStockNum;
     private Integer recentDateTime;
+    private String relCode;
 }

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

@@ -61,7 +61,7 @@ public class FilterUdiRelRequest extends ListPageRequest {
     private String companyName;
 
     private String bindRlIds;
-    private String bindCode;
+    private String relCode;
-    private String bindId;//在绑定时为了不错乱填写的是code
+    private String bindType;
 
 }

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

@@ -9,6 +9,7 @@ import com.glxp.api.dao.basic.UdiRelevanceDao;
 import com.glxp.api.entity.basic.BasicCorpEntity;
 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;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
@@ -141,24 +142,29 @@ public class BasicHospTypeServiceImpl implements BasicHospTypeService {
     @Override
     public boolean bindHospProduct(BasicHospTypeRequest basicHospTypeRequest) {
 
-        List<BasicHospTypeRelEntity> basicHospTypeRelEntityList=new ArrayList<>();
+        List<UdiRelevanceEntity> udiRelevanceEntityList=new ArrayList<>();
         for (String obj:basicHospTypeRequest.getIds()){
-            BasicHospTypeRelEntity basicHospTypeRelEntity=new BasicHospTypeRelEntity();
+            UdiRelevanceEntity udiRelevanceEntity=new UdiRelevanceEntity();
-            basicHospTypeRelEntity.setCode(basicHospTypeRequest.getCode());
+            udiRelevanceEntity.setId(Long.valueOf(obj));
-            basicHospTypeRelEntity.setRelId(obj);
+            udiRelevanceEntity.setRelCode(basicHospTypeRequest.getCode());
-            basicHospTypeRelEntityList.add(basicHospTypeRelEntity);
+            udiRelevanceEntityList.add(udiRelevanceEntity);
         }
-       basicHospTypeRelDao.batchInsert(basicHospTypeRelEntityList);
+        udiRelevanceDao.updateBatchById(udiRelevanceEntityList);
+
         return true;
     }
 
     @Override
     public boolean unbindHospProduct(BasicHospTypeRequest basicHospTypeRequest) {
 
-        QueryWrapper<BasicHospTypeRelEntity> ew=new QueryWrapper<>();
+        List<UdiRelevanceEntity> udiRelevanceEntityList=new ArrayList<>();
-        ew.eq("code",basicHospTypeRequest.getCode());
+        for (String obj:basicHospTypeRequest.getIds()){
-        ew.in("relId",basicHospTypeRequest.getIds());
+            UdiRelevanceEntity udiRelevanceEntity=new UdiRelevanceEntity();
-        basicHospTypeRelDao.delete(ew);
+            udiRelevanceEntity.setId(Long.valueOf(obj));
+            udiRelevanceEntity.setRelCode("");
+            udiRelevanceEntityList.add(udiRelevanceEntity);
+        }
+        udiRelevanceDao.updateBatchById(udiRelevanceEntityList);
         return true;
     }
 

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

@@ -304,15 +304,15 @@
                 FROM basic_products
                 inner JOIN basic_udirel
                 ON basic_products.uuid = basic_udirel.uuid
-        <if test="bindCode != '' and bindCode != null">
-            right JOIN basic_hosp_type_rel on basic_hosp_type_rel.relId = basic_udirel.id
-        </if>
         <where>
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
                 AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
             </if>
-            <if test="bindCode != '' and bindCode != null">
+            <if test="relCode != '' and relCode != null">
-                AND basic_hosp_type_rel.code = #{bindCode}
+                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}, '%')
@@ -874,4 +874,16 @@
                      left join basic_products on basic_udirel.uuid = basic_products.uuid
         where basic_udirel.id = #{relId}
     </select>
+
+    <update id="updateBatchById" parameterType="java.util.List">
+        <foreach collection="list" item="item" separator=";">
+            update
+            basic_udirel
+            set
+            `relCode` = #{item.relCode}
+            where
+            id = #{item.id}
+        </foreach>
+    </update>
+
 </mapper>