diff --git a/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java b/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java index 741c8d5c5..0c14a2e69 100644 --- a/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java +++ b/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java @@ -35,7 +35,7 @@ public class AlihealthBusController extends BaseController { @Log(title = "获取阿里药品的采购单码明细", businessType = BusinessType.OTHER) public BaseResponse getAliCode() { - List list = ioCollectCodeBackMapper.filterNotRelCode(new IoCollectCodeRequest()); + List list = ioCollectCodeBackMapper.filterNotRelCode(); if(CollUtil.isNotEmpty(list)){ AlihealthGetRelCodeReqeust alihealthGetRelCodeReqeust = new AlihealthGetRelCodeReqeust(); alihealthGetRelCodeReqeust.setIoCollectCodeBackupList(list); diff --git a/src/main/java/com/glxp/api/task/AliRelCodeDetailTask.java b/src/main/java/com/glxp/api/task/AliRelCodeDetailTask.java index ebd00c762..f5bcf230a 100644 --- a/src/main/java/com/glxp/api/task/AliRelCodeDetailTask.java +++ b/src/main/java/com/glxp/api/task/AliRelCodeDetailTask.java @@ -60,7 +60,7 @@ public class AliRelCodeDetailTask implements SchedulingConfigurer { private void process() { String paramValue = systemParamConfigService.selectValueByParamKey("aliRelCodeDetail"); if (StrUtil.isNotEmpty(paramValue) && paramValue.equals("1")) { - List list = ioCollectCodeBackMapper.filterNotRelCode(new IoCollectCodeRequest()); + List list = ioCollectCodeBackMapper.filterNotRelCode(); List ioOrderEntityList = new ArrayList<>(); log.error("开始补救上传和拉取关联关系列表==="+list); if (CollectionUtil.isNotEmpty(list)) { diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectCodeBackMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectCodeBackMapper.xml index e20b8306b..da3972637 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectCodeBackMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectCodeBackMapper.xml @@ -28,19 +28,19 @@ AND iccb.workPlaceCode LIKE concat('%', #{workPlaceCode}, '%') - AND iccb.code LIKE concat('%', #{code}, '%') + AND iccb.code LIKE concat( #{code}, '%') - AND iccb.billNo LIKE concat('%', #{billNo}, '%') + AND iccb.billNo LIKE concat(#{billNo}, '%') AND iccb.relId = #{relId} - AND iccb.fromType LIKE concat('%', #{fromType}, '%') + AND iccb.fromType LIKE concat( #{fromType}, '%') - AND iccb.fromCorp LIKE concat('%', #{fromCorp}, '%') + AND iccb.fromCorp LIKE concat( #{fromCorp}, '%') group by iccb.id @@ -48,17 +48,32 @@ diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectCodeMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectCodeMapper.xml index 0ed91383b..e34533a73 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectCodeMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectCodeMapper.xml @@ -21,16 +21,16 @@ AND iccb.workPlaceCode LIKE concat('%', #{workPlaceCode}, '%') - AND iccb.code LIKE concat('%', #{code}, '%') + AND iccb.code LIKE concat( #{code}, '%') - AND iccb.billNo LIKE concat('%', #{billNo}, '%') + AND iccb.billNo LIKE concat( #{billNo}, '%') - AND iccb.fromType LIKE concat('%', #{fromType}, '%') + AND iccb.fromType LIKE concat( #{fromType}, '%') - AND iccb.fromCorp LIKE concat('%', #{fromCorp}, '%') + AND iccb.fromCorp LIKE concat( #{fromCorp}, '%') group by iccb.id diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml index 65d0fee4d..f5e35850f 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml @@ -4,7 +4,8 @@