From d98daff25cd0d2f41c3b1994bc944b83409bdc5e Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 11 Apr 2024 13:06:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=8C=E5=88=86=E9=A1=B5=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/base/MaHouseSetMapper.xml | 5 +++++ .../controller/PurchaseCheckInfoController.java | 4 +++- .../sgzb/material/domain/PlanManagementDto.java | 12 ++++++++++++ .../mapper/material/PlanManagementMapper.xml | 3 ++- .../mapper/material/PurchaseMacodeInfoMapper.xml | 1 + .../mapper/material/RepairTestInputMapper.xml | 2 +- 6 files changed, 24 insertions(+), 3 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseSetMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseSetMapper.xml index 10af974e..95925ce6 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseSetMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseSetMapper.xml @@ -102,6 +102,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND mhs.house_id = #{houseId} + + AND (mt.type_name like concat('%', #{houseName}, '%') or + mt1.type_name like concat('%', #{houseName}, '%') or + mt2.type_name like concat('%', #{houseName}, '%')) + AND mhs.type_id = #{typeId} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java index b1d1e7b0..1513bde0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java @@ -44,14 +44,16 @@ public class PurchaseCheckInfoController extends BaseController @ApiOperation("查询新购入库任务列表") @GetMapping("/putInList") public TableDataInfo putInList(PurchaseCheckInfo purchaseCheckInfo) { - startPage(); List list = new ArrayList<>(); //判断该组织是否开启综合服务中心审核 Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); int re = purchaseCheckServiceCenterService.selectExamineType(companyId); if (re > 0) { + //若依框架多个查询会导致分页失效，需分批处理 + startPage(); list = purchaseCheckInfoService.selectPutInListExamine(purchaseCheckInfo); }else { + startPage(); list = purchaseCheckInfoService.selectPutInListList(purchaseCheckInfo); } return getDataTable(list); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PlanManagementDto.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PlanManagementDto.java index 5146bab5..1f611040 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PlanManagementDto.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PlanManagementDto.java @@ -25,6 +25,18 @@ public class PlanManagementDto { @ApiModelProperty(value = "计划ID") private Integer planId; + /** 借调计划ID */ + @ApiModelProperty(value = "借调计划ID") + private Long borrowId; + + /** 需求单位ID */ + @ApiModelProperty(value = "需求单位ID") + private Integer needUnitId; + + /** 借出单位ID */ + @ApiModelProperty(value = "借出单位ID") + private Integer borrowUnitId; + /** 备注 */ @ApiModelProperty(value = "备注") private String remark; diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PlanManagementMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PlanManagementMapper.xml index 99cd5bd2..1ec1c76f 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PlanManagementMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PlanManagementMapper.xml @@ -66,7 +66,8 @@ WHERE 1=1 - and (bu.unit_name like concat('%', #{name}, '%') or + and (bu.unit_id = #{name} or + bu.unit_name like concat('%', #{name}, '%') or mt2.type_name like concat('%',#{name},'%') or mt.type_name like concat('%',#{name},'%')) diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml index d5e8f0b8..2a572e28 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml @@ -409,6 +409,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pmi.fix_code fixCode, pcd.type_id typeId, pcd.task_id taskId, + pcd.remark remark, mt.CODE specsCode, mt.unit_name unitName, mt1.CODE typeCode, diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml index d9d67f96..e6435cf4 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml @@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) b - INSTR(b.typeId2,#{deviceTypeId}) > 0 + b.typeId2 = #{deviceTypeId} AND b.wxTime BETWEEN CONCAT(#{wxTime},' 00:00:00') AND CONCAT(#{wxTime},' 23:59:59')