From df0df7d7c1fb8f02d0afe16afb163fbcf8183644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Fri, 10 Mar 2023 13:36:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=99=A2=E5=86=85=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicHospTypeController.java | 10 ------- .../glxp/api/dao/basic/UdiRelevanceDao.java | 2 ++ .../api/entity/basic/UdiRelevanceEntity.java | 1 + .../api/req/basic/FilterUdiRelRequest.java | 4 +-- .../basic/impl/BasicHospTypeServiceImpl.java | 26 ++++++++++++------- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 22 ++++++++++++---- 6 files changed, 38 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java index 9d2338a9f..4413d679f 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java @@ -133,16 +133,6 @@ public class BasicHospTypeController { filterUdiRelRequest.setDiType(1); List udiRelevanceResponses = basicHospTypeService.filterUdiGp(filterUdiRelRequest); - //查询分类关联表，存在的制灰 - List 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 pageInfo = new PageInfo<>(udiRelevanceResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); diff --git a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java index 3efde2655..0f82d34f3 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java @@ -85,4 +85,6 @@ public interface UdiRelevanceDao extends BaseMapperPlus list); } diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java index 82cd5c1ba..ebeec73ae 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/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; } diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java index 4d9aed4c9..043503cbf 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/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 bindId;//在绑定时为了不错乱填写的是code + private String relCode; + private String bindType; } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java index 881133629..0f0faeb76 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java +++ b/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 basicHospTypeRelEntityList=new ArrayList<>(); + List udiRelevanceEntityList=new ArrayList<>(); for (String obj:basicHospTypeRequest.getIds()){ - BasicHospTypeRelEntity basicHospTypeRelEntity=new BasicHospTypeRelEntity(); - basicHospTypeRelEntity.setCode(basicHospTypeRequest.getCode()); - basicHospTypeRelEntity.setRelId(obj); - basicHospTypeRelEntityList.add(basicHospTypeRelEntity); + UdiRelevanceEntity udiRelevanceEntity=new UdiRelevanceEntity(); + udiRelevanceEntity.setId(Long.valueOf(obj)); + udiRelevanceEntity.setRelCode(basicHospTypeRequest.getCode()); + udiRelevanceEntityList.add(udiRelevanceEntity); } - basicHospTypeRelDao.batchInsert(basicHospTypeRelEntityList); + udiRelevanceDao.updateBatchById(udiRelevanceEntityList); + return true; } @Override public boolean unbindHospProduct(BasicHospTypeRequest basicHospTypeRequest) { - QueryWrapper ew=new QueryWrapper<>(); - ew.eq("code",basicHospTypeRequest.getCode()); - ew.in("relId",basicHospTypeRequest.getIds()); - basicHospTypeRelDao.delete(ew); + List udiRelevanceEntityList=new ArrayList<>(); + for (String obj:basicHospTypeRequest.getIds()){ + UdiRelevanceEntity udiRelevanceEntity=new UdiRelevanceEntity(); + udiRelevanceEntity.setId(Long.valueOf(obj)); + udiRelevanceEntity.setRelCode(""); + udiRelevanceEntityList.add(udiRelevanceEntity); + } + udiRelevanceDao.updateBatchById(udiRelevanceEntityList); return true; } diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 734958c14..fa162fb3e 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/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 - - right JOIN basic_hosp_type_rel on basic_hosp_type_rel.relId = basic_udirel.id - AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%') - - AND basic_hosp_type_rel.code = #{bindCode} + + AND relCode = #{relCode} + + + AND relCode is null or trim(relCode)='' 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} + + + + update + basic_udirel + set + `relCode` = #{item.relCode} + where + id = #{item.id} + + +