From 53b3d571db9c7c489cb2ee6e00926fe6589f7689 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Wed, 25 Dec 2024 18:19:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=A0=87=E5=87=86=E7=AE=B1=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=E3=80=81=E7=BB=B4?= =?UTF-8?q?=E4=BF=AE=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=E3=80=81QRCODE?= =?UTF-8?q?=E6=96=B0=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/controller/BmQrBoxController.java | 9 ++ .../material/basic/mapper/BmQrBoxMapper.java | 5 + .../basic/service/BmQrBoxService.java | 6 ++ .../service/impl/BmQrBoxServiceImpl.java | 34 +++++-- .../controller/PurchaseBindController.java | 2 +- .../controller/PurchaseStorageController.java | 1 - .../purchase/domain/vo/PurchaseVo.java | 6 +- .../purchase/mapper/PurchaseBindMapper.java | 6 +- .../mapper/PurchaseStorageMapper.java | 10 +- .../service/impl/PurchaseBindServiceImpl.java | 60 ++++++------ .../impl/PurchaseStorageServiceImpl.java | 28 +++--- .../service/impl/RepairServiceImpl.java | 8 +- .../mapper/material/basic/BmQrBoxMapper.xml | 26 ++++-- .../material/purchase/PurchaseBindMapper.xml | 93 ++++++++++--------- .../purchase/PurchaseCheckDetailsMapper.xml | 2 +- .../purchase/PurchaseStorageMapper.xml | 26 ++---- .../repair/RepairAuditDetailsMapper.xml | 8 +- .../mapper/material/repair/RepairMapper.xml | 22 ++--- 18 files changed, 196 insertions(+), 156 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmQrBoxController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmQrBoxController.java index 026b0d24..eca3bf2e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmQrBoxController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmQrBoxController.java @@ -111,6 +111,15 @@ public class BmQrBoxController extends BaseController { return qrBoxService.updateBmQrcodeInfoByCode(bmQrBoxInfo); } + /** + * 二维码管理 -- 扫码获取绑定物资信息 + */ + @ApiOperation(value = "二维码管理 -- 扫码获取绑定物资信息") + @GetMapping("/get_ma_info_by_qrcode") + public AjaxResult appCreateByCode(@RequestParam(value = "qrCode") String qrCode) { + return qrBoxService.getMaInfoByQrCode(qrCode); + } + /** * APP -- 新购入库扫码 -- BoxCode查询标准箱信息 */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmQrBoxMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmQrBoxMapper.java index abc645ad..da8b136a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmQrBoxMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmQrBoxMapper.java @@ -37,6 +37,11 @@ public interface BmQrBoxMapper { */ int updateBmQrcodeInfoByCode(BmQrBoxInfo bmQrBoxInfo); + /** + * 根据二维码QR编码查询绑定的物资信息 + */ + BmQrBoxInfo getMaInfoByQrCode(String qrCode); + /** * 修改标准箱状态 -- 增加绑定编码时调用 */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/BmQrBoxService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/BmQrBoxService.java index e4618cfa..8c0b6a75 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/BmQrBoxService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/BmQrBoxService.java @@ -66,6 +66,12 @@ public interface BmQrBoxService { */ AjaxResult updateBmQrcodeInfoByCode(BmQrBoxInfo bmQrBoxInfo); + /** + * 通过QR_CODE 查询物资信息 + * @param qrCode 二维码编码 + */ + AjaxResult getMaInfoByQrCode(String qrCode); + /** * APP - 扫码绑定物资 */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java index 839697aa..064c8313 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java @@ -10,6 +10,7 @@ import com.bonus.common.biz.enums.MaMachineStatusEnum; import com.bonus.common.biz.enums.PurchaseTaskStatusEnum; import com.bonus.common.biz.enums.QrBoxStatusEnum; import com.bonus.common.core.utils.DateUtils; +import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.basic.domain.BmQrBoxInfo; @@ -149,7 +150,11 @@ public class BmQrBoxServiceImpl implements BmQrBoxService { List boxBindList = bmQrBoxMapper.getBoxBindList(boxBindWarehouseDto.getBoxId()); boxBindList.removeIf(Objects::isNull); boxBindList.removeIf(item -> item.getMaStatus() == null); - boxBindList.removeIf(item -> !item.getMaStatus().equals(MaMachineStatusEnum.NEW_PURCHASE.getStatusName())); + boxBindList.removeIf(item -> + !item.getMaStatus().equals(MaMachineStatusEnum.NEW_PURCHASE.getStatusName()) && + !item.getMaStatus().equals(MaMachineStatusEnum.REPAIR_TO_STORE.getStatusName()) && + !item.getMaStatus().equals(MaMachineStatusEnum.BACK_TO_STORE.getStatusName()) + ); boxBindList.removeIf(item -> item.getMaTypeId() == null || !Objects.equals(item.getMaTypeId(), boxBindWarehouseDto.getMaTypeId())); @@ -159,19 +164,16 @@ public class BmQrBoxServiceImpl implements BmQrBoxService { return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "新购任务不存在此物资类型，请确认录入是否正确"); } // 更新入库数量 - purchaseStorageMapper.updateNum(String.valueOf(purchaseDetailId), BigDecimal.valueOf(boxBindList.size())); + purchaseStorageMapper.updateNum(purchaseDetailId, BigDecimal.valueOf(boxBindList.size())); // 更新物资类型库存数量 purchaseStorageMapper.updateStorageNum(BigDecimal.valueOf(boxBindList.size()), Math.toIntExact(boxBindWarehouseDto.getMaTypeId())); // 更新物资设备状态 boxBindList.forEach(item -> { item.setMaStatus(MaMachineStatusEnum.IN_STORE.getStatus().toString()); - purchaseStorageMapper.updateMachineByCode(new PurchaseDto() - .setMaCode(item.getMaCode()) - .setTypeId(Math.toIntExact(boxBindWarehouseDto.getMaTypeId())) - ); + purchaseStorageMapper.updateMachineByCode(new PurchaseDto().setMaCode(item.getMaCode()).setTypeId(Math.toIntExact(boxBindWarehouseDto.getMaTypeId()))); }); // 更新新购验收明细状态 - purchaseStorageMapper.updateStatusById(PurchaseTaskStatusEnum.IN_STORE.getStatus(), Math.toIntExact(purchaseDetailId)); + purchaseStorageMapper.updateInputStatusById(PurchaseTaskStatusEnum.IN_STORE.getStatus(), Math.toIntExact(purchaseDetailId)); // TODO 缺少修改TmTask表状态 // ---------------- 返回前端 ------------------------------------- @@ -318,6 +320,19 @@ public class BmQrBoxServiceImpl implements BmQrBoxService { return result > 0 ? AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg()) : AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); } + /** + * 通过QR_CODE 查询物资信息 + * + * @param qrCode 二维码编码 + */ + @Override + public AjaxResult getMaInfoByQrCode(String qrCode) { + if (StringUtils.isBlank(qrCode)) { + return AjaxResult.error("二维码编码为空，请完善后重试!"); + } + return AjaxResult.success(bmQrBoxMapper.getMaInfoByQrCode(qrCode)); + } + /** * APP - 扫码绑定物资 * @@ -325,9 +340,8 @@ public class BmQrBoxServiceImpl implements BmQrBoxService { */ @Override public AjaxResult addQrcodeBoxBind(BmQrBoxInfo bmQrBoxInfo) { - if (bmQrBoxInfo.getBoxId() == null || bmQrBoxInfo.getQrCode() == null) { - return AjaxResult.error("标准箱ID或QR编码为空，请完善后重试!"); - } + if (bmQrBoxInfo.getBoxId() == null) {return AjaxResult.error("标准箱ID为空，请完善后重试!");} + if (bmQrBoxInfo.getQrCode() == null) {return AjaxResult.error("QR编码为空，请完善后重试!");} try { // 物资状态要求是待入库、在库状态 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java index 5c8222f9..68cb0307 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java @@ -42,7 +42,7 @@ public class PurchaseBindController extends BaseController { @PreventRepeatSubmit @RequiresPermissions("purchase:bind:add") @PostMapping("/bind") - public AjaxResult bind(@RequestBody PurchaseDto dto) { + public AjaxResult bind(@RequestBody @NotNull(message = "参数不能为空") PurchaseDto dto) { return purchaseBindService.bind(dto); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseStorageController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseStorageController.java index fb3b5098..ff0e8e27 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseStorageController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseStorageController.java @@ -47,7 +47,6 @@ public class PurchaseStorageController extends BaseController { @ApiOperation(value = "查询待绑定编号机具详情") - @PreventRepeatSubmit // @RequiresPermissions("purchase:storage:query") @PostMapping("/getMachineById") public AjaxResult getMachineById(@RequestBody PurchaseDto dto) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/vo/PurchaseVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/vo/PurchaseVo.java index b336dab0..46902392 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/vo/PurchaseVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/vo/PurchaseVo.java @@ -1,5 +1,6 @@ package com.bonus.material.purchase.domain.vo; +import com.alibaba.druid.sql.visitor.functions.Char; import com.bonus.common.core.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; @@ -19,7 +20,7 @@ public class PurchaseVo { private Integer taskId; @ApiModelProperty(value = "二级明细id") - private String purchaseId; + private Long purchaseId; @ApiModelProperty(value="typeId") private Integer typeId; @@ -112,6 +113,9 @@ public class PurchaseVo { @ApiModelProperty(value = "二维码路径") private String qrUrl; + @ApiModelProperty(value = "是否绑定") + private Char isBind; + @ApiModelProperty(value = "异常数量") private BigDecimal exceptionNum; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseBindMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseBindMapper.java index f45f73b9..51b3ebf9 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseBindMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseBindMapper.java @@ -48,6 +48,8 @@ public interface PurchaseBindMapper { */ int add(PurchaseDto purchaseDto); + int bindMaCodeByQrCode(PurchaseDto purchaseDto); + /** * 查询二维码code * @param genMonth @@ -80,7 +82,7 @@ public interface PurchaseBindMapper { * @param updatedStatus * @param purchaseId */ - int updateStatusById(@Param("updatedStatus") Integer updatedStatus, @Param("id") String purchaseId); + int updateStatusById(@Param("updatedStatus") Integer updatedStatus, @Param("id") Long purchaseId); /** * 更新数量 @@ -90,6 +92,8 @@ public interface PurchaseBindMapper { */ int updateNum(@Param("dto") PurchaseDto dto, @Param("num") int num); + int updateStatusWhereNum(@Param("dto") PurchaseDto dto); + /** * 根据id查询详情 * @param purchaseDto diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseStorageMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseStorageMapper.java index f20fb1a8..290538d7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseStorageMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseStorageMapper.java @@ -34,7 +34,7 @@ public interface PurchaseStorageMapper { * @param bindNum * @return */ - int updateNum(@Param("id") String purchaseId, @Param("bindNum") BigDecimal bindNum); + int updateNum(@Param("id") Long purchaseId, @Param("bindNum") BigDecimal bindNum); /** * 更新状态 @@ -44,6 +44,14 @@ public interface PurchaseStorageMapper { */ int updateStatusById(@Param("updatedStatus") Integer updatedStatus, @Param("id") Integer id); + /** + * 更新入库状态 + * @param updatedStatus 要修改的状态 + * @param id 要修改的details表id + * @return 修改条数 + */ + int updateInputStatusById(@Param("updatedStatus") Integer updatedStatus, @Param("id") Integer id); + /** * 新增机具入库记录 * @param dto diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java index 4c02fe43..fa6d16a5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java @@ -12,7 +12,9 @@ import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.purchase.config.RemoteConfig; import com.bonus.common.biz.domain.purchase.PurchaseDto; +import com.bonus.material.purchase.domain.PurchaseCheckDetails; import com.bonus.material.purchase.mapper.PurchaseBindMapper; +import com.bonus.material.purchase.mapper.PurchaseCheckDetailsMapper; import com.bonus.material.purchase.mapper.PurchaseStorageMapper; import com.bonus.material.purchase.service.IPurchaseBindService; import com.bonus.material.purchase.domain.vo.PurchaseVo; @@ -48,6 +50,9 @@ public class PurchaseBindServiceImpl implements IPurchaseBindService { @Resource private PurchaseStorageMapper purchaseStorageMapper; + @Resource + private PurchaseCheckDetailsMapper purchaseCheckDetailsMapper; + /** * 查询所有绑定信息 @@ -119,7 +124,7 @@ public class PurchaseBindServiceImpl implements IPurchaseBindService { /** * 绑定 - * @param dto + * @param dto 绑定物资信息 * @return */ @Override @@ -137,45 +142,40 @@ public class PurchaseBindServiceImpl implements IPurchaseBindService { return AjaxResult.error(1114,"设备编码与库中重复，请勿重复添加"); } } - int result = 0; for (PurchaseDto purchaseDto : dto.getDtoList()) { - purchaseDto.setCreateBy(SecurityUtils.getUserId().toString()); - purchaseDto.setCreateTime(DateUtils.getNowDate()); - purchaseDto.setTaskId(dto.getTaskId()); - purchaseDto.setTypeId(dto.getTypeId()); - purchaseDto.setStatus(0); - result += purchaseBindMapper.add(purchaseDto); - result += purchaseStorageMapper.insertMachine(purchaseDto); + purchaseDto.setCreateBy(SecurityUtils.getUserId().toString()).setCreateTime(DateUtils.getNowDate()); + purchaseDto.setTaskId(dto.getTaskId()).setTypeId(dto.getTypeId()).setStatus(0); + if (purchaseDto.getQrCode() != null) { + if (purchaseBindMapper.bindMaCodeByQrCode(purchaseDto) != 1) { + return AjaxResult.error(1115,"绑定maCode时SQL执行失败!"); + } + } + if (purchaseStorageMapper.insertMachine(purchaseDto) != 1) { + return AjaxResult.error(1116,"插入maMachine时SQL执行失败!"); + } } - //根据前端传参更新绑定数量 - result += purchaseBindMapper.updateNum(dto, dto.getDtoList().size()); + // 更新绑定数量，并刷新状态 + if (purchaseBindMapper.updateNum(dto, dto.getDtoList().size()) < 1) { + return AjaxResult.error(1117,"更新绑定数量时SQL执行失败!"); + } else { + purchaseBindMapper.updateStatusWhereNum(dto); + } + //根据任务id和类型id查询状态 List voList = purchaseBindMapper.selectPurchaseCheckInfoById(dto); if (CollectionUtils.isNotEmpty(voList)) { for (PurchaseVo purchaseVo : voList) { - if (purchaseVo.getBindNum().equals(purchaseVo.getCheckNum())) { + if (purchaseVo.getBindNum().compareTo(purchaseVo.getCheckNum()) == 0) { purchaseBindMapper.updateStatusById(PurchaseTaskStatusEnum.TO_STORE.getStatus(), purchaseVo.getPurchaseId()); - } - if (purchaseVo.getBindNum().compareTo(purchaseVo.getCheckNum()) <0 ) { + } else if (purchaseVo.getBindNum().compareTo(purchaseVo.getCheckNum()) < 0) { purchaseBindMapper.updateStatusById(PurchaseTaskStatusEnum.TO_BIND.getStatus(), purchaseVo.getPurchaseId()); + } else { + // 抛出异常 执行回滚 + throw new RuntimeException("绑定数量大于验收数量，请重新绑定!"); } } } -// PurchaseDto purchaseDto = new PurchaseDto(); -// purchaseDto.setTaskId(dto.getTaskId()); -// List list = purchaseBindMapper.getDetails(purchaseDto); -// Map> groupedByIdStatus = list.stream() -// .collect(Collectors.groupingBy( -// PurchaseVo::getTaskId, -// Collectors.mapping(PurchaseVo::getStatus, Collectors.toList()) -// )); -// result += groupedByIdStatus.entrySet().stream() -// .mapToInt(entry -> updateTaskStatus(entry.getKey(), entry.getValue())) -// .sum(); - if (result > 0) { - return AjaxResult.success("绑定成功"); - } - return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); + return AjaxResult.success("绑定成功"); } /** @@ -249,7 +249,7 @@ public class PurchaseBindServiceImpl implements IPurchaseBindService { // 二级页面驳回 String[] idList = dto.getPurchaseId().split(","); for (String purchaseId : idList) { - result += purchaseBindMapper.updateStatusById(PurchaseTaskStatusEnum.TO_BIND_AFTER_REJECT.getStatus(), purchaseId); + result += purchaseBindMapper.updateStatusById(PurchaseTaskStatusEnum.TO_BIND_AFTER_REJECT.getStatus(), Long.valueOf(purchaseId)); } } if (result > 0) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java index 846da9ed..75438efa 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java @@ -23,10 +23,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; import java.util.stream.Collectors; /** @@ -100,10 +97,6 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService { public AjaxResult warehouse(PurchaseDto dto) { //内层入库 return processByPurchaseIds(dto); - /*if (dto.getTaskId() != null) { - //外层入库 - return processByTaskIds(dto); - }*/ } /** @@ -187,7 +180,7 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService { details = purchaseBindMapper.getDetails(dto); for (PurchaseVo purchaseVo : details) { if (purchaseVo.getStatus().equals(PurchaseTaskStatusEnum.TO_STORE_AFTER_REJECT.getStatus()) || purchaseVo.getStatus().equals(PurchaseTaskStatusEnum.TO_STORE.getStatus())) { - result += purchaseStorageMapper.updateStatusById(PurchaseTaskStatusEnum.TO_STORE_AFTER_REJECT.getStatus(), Integer.parseInt(purchaseVo.getPurchaseId())); + result += purchaseStorageMapper.updateStatusById(PurchaseTaskStatusEnum.TO_STORE_AFTER_REJECT.getStatus(), Math.toIntExact(purchaseVo.getPurchaseId())); } } details = purchaseBindMapper.getDetails(dto); @@ -222,7 +215,10 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService { } else { //编码入库 List purchaseVoList = purchaseBindMapper.selectPurchaseCheckInfoById(purchaseDto); - result += purchaseStorageMapper.updateNum(purchaseDto.getPurchaseId(), BigDecimal.valueOf(purchaseDto.getInPutList().size())); + if (CollectionUtils.isEmpty(purchaseDto.getInPutList())) { + purchaseDto.setInPutList(new ArrayList<>()); + } + result += purchaseStorageMapper.updateNum(Long.valueOf(purchaseDto.getPurchaseId()), BigDecimal.valueOf(purchaseDto.getInPutList().size())); for (PurchaseDto dto : purchaseDto.getInPutList()) { if (CollectionUtils.isNotEmpty(purchaseVoList)) { for (PurchaseVo purchaseVo : purchaseVoList) { @@ -233,13 +229,13 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService { } } dto.setTypeId(purchaseDto.getTypeId()); - result += purchaseStorageMapper.updateMachineByCode(dto); - purchaseStorageMapper.updateStorageNum(BigDecimal.ONE, dto.getTypeId()); - List list = purchaseBindMapper.getMachineById(purchaseDto); - if (CollectionUtils.isNotEmpty(list)) { + if (purchaseStorageMapper.updateMachineByCode(dto) < 1) {throw new RuntimeException("入库失败,更新物资入库状态0条");} + if (purchaseStorageMapper.updateStorageNum(BigDecimal.ONE, dto.getTypeId()) < 1) {throw new RuntimeException("入库失败,库存增加0");} + List bindMaList = purchaseBindMapper.getMachineById(purchaseDto); + if (CollectionUtils.isNotEmpty(bindMaList)) { result += purchaseStorageMapper.updateStatusById(PurchaseTaskStatusEnum.TO_STORE.getStatus(), Integer.parseInt(purchaseDto.getPurchaseId())); } else { - result += purchaseStorageMapper.updateStatusById(PurchaseTaskStatusEnum.IN_STORE.getStatus(), Integer.parseInt(purchaseDto.getPurchaseId())); + result += purchaseStorageMapper.updateInputStatusById(PurchaseTaskStatusEnum.IN_STORE.getStatus(), Integer.parseInt(purchaseDto.getPurchaseId())); } } } @@ -325,7 +321,7 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService { return details.stream() .mapToInt(detail -> { int result = purchaseStorageMapper.updateNum(detail.getPurchaseId(), detail.getBindNum()); - result += purchaseStorageMapper.updateStatusById(PurchaseTaskStatusEnum.IN_STORE.getStatus(), Integer.parseInt(detail.getPurchaseId())); + result += purchaseStorageMapper.updateStatusById(PurchaseTaskStatusEnum.IN_STORE.getStatus(), Math.toIntExact(detail.getPurchaseId())); if (MaTypeManageTypeEnum.CODE_DEVICE.getTypeId().equals(Integer.valueOf(detail.getManageType()))) { //根据类型id获取设备详情信息 //result += purchaseStorageMapper.insertMachine(detail); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index d6645e06..d01565a1 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -427,14 +427,10 @@ public class RepairServiceImpl implements RepairService { repairDeviceVOList.removeIf(Objects::isNull); for (RepairDeviceVO bean : repairDeviceVOList) { - if (bean.getManageType() == null) { - throw new ServiceException("请选择物资管理方式"); - } + if (bean.getManageType() == null) {throw new ServiceException("请选择物资管理方式");} if (Objects.equals(MaTypeManageTypeEnum.CODE_DEVICE.getTypeId(), bean.getManageType())) { // 物资管理方式--编码管理 - if (bean.getRepairType() == null) { - continue; - } + if (bean.getRepairType() == null) {continue;} // 根据维修方式，更新维修数量、报废数量 switch (bean.getRepairType()) { case INNER_REPAIR: { diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml index 2b8f1595..f4fe6597 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml @@ -128,22 +128,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete - from bm_qrcode_box - where box_id = #{boxId} + delete from bm_qrcode_box where box_id = #{boxId} - delete - from bm_qrcode_box_bind - where id = #{id} + delete from bm_qrcode_box_bind where id = #{id} - delete - from bm_qrcode_box_bind - where box_id = #{boxId} - and ma_id = #{maId} + delete from bm_qrcode_box_bind where box_id = #{boxId} and ma_id = #{maId} @@ -218,4 +211,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bqb.box_code = #{boxCode} AND mt.type_id = #{maTypeId} + + \ No newline at end of file diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml index 65d44c9f..79cd87b3 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml @@ -88,10 +88,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" UPDATE purchase_check_details - SET bind_num = COALESCE(bind_num, 0) + COALESCE(#{num}, 0) - WHERE task_id = #{dto.taskId} - AND type_id = #{dto.typeId} - AND #{num} IS NOT NULL + SET bind_num = IFNULL(bind_num, 0) + IFNULL(#{num}, 0) + WHERE task_id = #{dto.taskId} AND type_id = #{dto.typeId} AND #{num} IS NOT NULL + + + + UPDATE purchase_check_details + SET `status` = IF(IFNULL(check_num, 0) = IFNULL(bind_num, 0), '4', `status`) + WHERE task_id = #{dto.taskId} AND type_id = #{dto.typeId} @@ -175,12 +179,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pcd.status AS status FROM bm_qrcode_info pm - LEFT JOIN purchase_check_details pcd ON pm.task_id = pcd.task_id - AND pm.type_id = pcd.type_id - LEFT JOIN ma_type mt ON pcd.type_id = mt.type_id - LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id + LEFT JOIN purchase_check_details pcd ON pm.task_id = pcd.task_id AND pm.type_id = pcd.type_id + LEFT JOIN ma_type mt ON pcd.type_id = mt.type_id + LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id WHERE - 1=1 and pm.qr_code IS NULL + pm.qr_code IS NULL AND pm.task_id = #{taskId} @@ -313,24 +316,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT - pm.task_id AS taskId, - pcd.id AS purchaseId, - mt1.type_name AS materialName, - mt.type_name AS materialModel, - pm.ma_code AS maCode, - pm.create_by AS createBy, - pm.create_time AS createTime, - pm.type_id AS typeId, - pm.out_fac_code AS outFacCode, - pcd.production_time AS productDate, - pm.qr_code AS qrCode, - pm.qr_url AS qrUrl, - pcd.check_num AS purchaseNum, - pcd.check_num AS checkNum, - pcd.bind_num AS bindNum, - pcd.status AS status + pm.task_id AS taskId, + pcd.id AS purchaseId, + mt1.type_name AS materialName, + mt.type_name AS materialModel, + pm.ma_code AS maCode, + pm.create_by AS createBy, + pm.create_time AS createTime, + pm.type_id AS typeId, + pm.out_fac_code AS outFacCode, + pcd.production_time AS productDate, + pm.qr_code AS qrCode, + pm.qr_url AS qrUrl, + pcd.check_num AS purchaseNum, + pcd.check_num AS checkNum, + pcd.bind_num AS bindNum, + pcd.status AS status FROM - bm_qrcode_info pm - LEFT JOIN purchase_check_details pcd ON pm.task_id = pcd.task_id - AND pm.type_id = pcd.type_id + bm_qrcode_info pm + LEFT JOIN purchase_check_details pcd ON pm.task_id = pcd.task_id AND pm.type_id = pcd.type_id LEFT JOIN ma_type mt ON pcd.type_id = mt.type_id LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id WHERE - 1=1 and pm.qr_code IS NOT NULL - - AND pcd.id = #{purchaseId} - + pm.qr_code IS NOT NULL + + AND pcd.id = #{purchaseId} + + + + update bm_qrcode_info set ma_code = #{maCode}, is_bind = 1 + where + qr_code = #{qrCode} + and status != '1' + and is_bind != '1' + and ma_code is null + and del_flag = '0' + diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml index b3799bf7..605e4c4e 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml @@ -203,7 +203,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bind_num = #{bindNum}, check_result = #{checkResult}, supplier_id = #{supplierId}, - status = #{status}, + `status` = #{status}, create_by = #{createBy}, production_time = #{productionTime}, create_time = #{createTime}, diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseStorageMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseStorageMapper.xml index 74e76281..63913410 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseStorageMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseStorageMapper.xml @@ -28,32 +28,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" UPDATE purchase_check_details - SET input_num = COALESCE(input_num, 0) + #{bindNum}, - input_time = now() - WHERE - id = #{id} + SET input_num = ifnull(input_num, 0) + ifnull(#{bindNum},0),input_time = now() + WHERE id = #{id} UPDATE purchase_check_details - SET `status` = #{updatedStatus} - WHERE - id = #{id} + SET `status` = #{updatedStatus} + WHERE id = #{id} + + + + UPDATE purchase_check_details SET `status` = if(bind_num = input_num, #{updatedStatus}, `status`) WHERE id = #{id} - UPDATE ma_type - SET storage_num = #{inputNum} + IFNULL(storage_num, 0) - WHERE - type_id = #{typeId} + UPDATE ma_type SET storage_num = ifnull(#{inputNum},0) + ifnull(storage_num, 0) WHERE type_id = #{typeId} - UPDATE ma_machine - SET ma_status = 1 - WHERE - ma_code = #{maCode} - and type_id = #{typeId} + UPDATE ma_machine SET ma_status = 1 WHERE ma_code = #{maCode} and type_id = #{typeId} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml index 60e75274..db272a64 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml @@ -62,29 +62,25 @@ update repair_apply_details - set repaired_num = #{repairNum}, - status = #{status}, - repairer = #{repairer}, - update_by = #{userId}, - update_time = now() - where id = #{id} + set repaired_num = ifnull(repaired_num,0) + #{repairNum}, + status = #{status},repairer = #{repairer},update_by = #{userId},update_time = now() + where + id = #{id} + and (ifnull(repaired_num,0) + #{repairNum}) <= repair_num update repair_apply_details - set repaired_num = #{repairNum}, - update_by = #{userId}, - update_time = now() + set repaired_num = ifnull(repaired_num,0) + #{repairNum},update_by = #{userId},update_time = now() where id = #{id} + and (ifnull(repaired_num,0) + #{repairNum}) <= repair_num update repair_apply_details - set repaired_num = #{repairNum}, - status = #{status}, - update_by = #{userId}, - update_time = now() + set repaired_num = #{repairNum},status = #{status},update_by = #{userId},update_time = now() where id = #{id} + and (ifnull(repaired_num,0) + #{repairNum}) <= repair_num From 44493ddc669f002ac30b6f8aeb0a8c6d540c5fad Mon Sep 17 00:00:00 2001 From: mashuai Date: Wed, 25 Dec 2024 18:33:19 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/common/biz/config/PoiOutPage.java | 84 ++++++++++++++++++- .../controller/ComplexQueryController.java | 10 +-- .../material/basic/domain/BmQrBoxInfo.java | 3 + .../basic/domain/PurchaseInputInfo.java | 4 +- .../basic/domain/RepairInputRecord.java | 2 +- .../material/basic/domain/UseStorageInfo.java | 2 +- .../service/impl/ComplexQueryServiceImpl.java | 66 +++++++++------ .../material/lease/domain/vo/LeaseOutVo.java | 9 +- .../impl/LeaseApplyInfoServiceImpl.java | 5 +- .../impl/RepairAuditDetailsServiceImpl.java | 4 +- .../mapper/material/basic/BmQrBoxMapper.xml | 9 ++ .../material/basic/ComplexQueryMapper.xml | 10 ++- .../lease/LeaseApplyDetailsMapper.xml | 4 +- 13 files changed, 161 insertions(+), 51 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/config/PoiOutPage.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/config/PoiOutPage.java index f7e1e3a7..e8d64caa 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/config/PoiOutPage.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/config/PoiOutPage.java @@ -3,6 +3,7 @@ package com.bonus.common.biz.config; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.ss.usermodel.BorderStyle; import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.usermodel.IndexedColors; import org.apache.poi.ss.usermodel.VerticalAlignment; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.ss.util.RegionUtil; @@ -52,6 +53,14 @@ public class PoiOutPage { return workbook; } + /** + * 创建标题行 + * @param sheet + * @param titleStyle + * @param filename + * @param nColumn + * @return + */ private static int createTitleRow(HSSFSheet sheet, HSSFCellStyle titleStyle, String filename, int nColumn) { HSSFRow row = sheet.createRow(0); row.setHeightInPoints(30); @@ -62,6 +71,14 @@ public class PoiOutPage { return 1; // 下一行是表头 } + /** + * 创建表头行 + * @param sheet + * @param headerStyle + * @param list + * @param rowNum + * @return + */ private static int createHeaderRow(HSSFSheet sheet, HSSFCellStyle headerStyle, List list, int rowNum) { HSSFRow row = sheet.createRow(rowNum); row.setHeightInPoints(20); @@ -74,6 +91,14 @@ public class PoiOutPage { return rowNum + 1; } + /** + * 填充数据行 + * @param sheet + * @param result + * @param contentStyle + * @param nColumn + * @param rowNum + */ private static void createDataRows(HSSFSheet sheet, List> result, HSSFCellStyle contentStyle, int nColumn, int rowNum) { for (Map resultRow : result) { List rowData = map2List(resultRow); @@ -104,6 +129,12 @@ public class PoiOutPage { } } + /** + * 设置单元格数据 + * @param cell + * @param contentStyle + * @param data + */ private static void setCellValue(HSSFCell cell, HSSFCellStyle contentStyle, Object data) { if (isNumeric(data)) { contentStyle.setDataFormat(HSSFDataFormat.getBuiltinFormat("0.00")); @@ -115,6 +146,14 @@ public class PoiOutPage { } } + /** + * 创建一个空的工作表 + * @param sheet + * @param list + * @param titleStyle + * @param headerStyle + * @param filename + */ private static void createEmptySheet(HSSFSheet sheet, List list, HSSFCellStyle titleStyle, HSSFCellStyle headerStyle, String filename) { int nColumn = list.size(); int rowNum = createTitleRow(sheet, titleStyle, filename, nColumn); @@ -275,8 +314,12 @@ public class PoiOutPage { return list; } - // 以下是创建样式的方法（可根据需要调整） + /** + * 创建标题样式 + * @param workbook + * @return + */ private static HSSFCellStyle createTitleStyle(HSSFWorkbook workbook) { HSSFCellStyle style = workbook.createCellStyle(); style.setAlignment(HorizontalAlignment.CENTER); @@ -288,24 +331,61 @@ public class PoiOutPage { return style; } + /** + * 创建表头样式 + * @param workbook + * @return + */ private static HSSFCellStyle createHeaderStyle(HSSFWorkbook workbook) { HSSFCellStyle style = workbook.createCellStyle(); style.setAlignment(HorizontalAlignment.CENTER); style.setVerticalAlignment(VerticalAlignment.CENTER); HSSFFont font = workbook.createFont(); font.setBold(true); - font.setFontHeightInPoints((short) 12); + font.setFontHeightInPoints((short) 10); style.setFont(font); + + // 设置边框 + style.setBorderTop(BorderStyle.THIN); + style.setBorderBottom(BorderStyle.THIN); + style.setBorderLeft(BorderStyle.THIN); + style.setBorderRight(BorderStyle.THIN); + + // 设置边框颜色为黑色 + style.setTopBorderColor(IndexedColors.BLACK.getIndex()); + style.setBottomBorderColor(IndexedColors.BLACK.getIndex()); + style.setLeftBorderColor(IndexedColors.BLACK.getIndex()); + style.setRightBorderColor(IndexedColors.BLACK.getIndex()); + return style; } + /** + * 创建内容样式 + * @param workbook + * @return + */ private static HSSFCellStyle createCellStyle(HSSFWorkbook workbook) { + HSSFCellStyle style = workbook.createCellStyle(); style.setAlignment(HorizontalAlignment.CENTER); style.setVerticalAlignment(VerticalAlignment.CENTER); HSSFFont font = workbook.createFont(); font.setFontHeightInPoints((short) 10); style.setFont(font); + + // 设置边框 + style.setBorderTop(BorderStyle.THIN); + style.setBorderBottom(BorderStyle.THIN); + style.setBorderLeft(BorderStyle.THIN); + style.setBorderRight(BorderStyle.THIN); + + // 设置边框颜色为黑色 + style.setTopBorderColor(IndexedColors.BLACK.getIndex()); + style.setBottomBorderColor(IndexedColors.BLACK.getIndex()); + style.setLeftBorderColor(IndexedColors.BLACK.getIndex()); + style.setRightBorderColor(IndexedColors.BLACK.getIndex()); + return style; } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java index 7a760d02..b0ead26d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java @@ -101,7 +101,7 @@ public class ComplexQueryController extends BaseController { * @return */ @ApiOperation(value = "综合查询--查询在库机具设备详情") - @GetMapping("/exportStorageInfoList") + @PostMapping("/exportStorageInfoList") public void exportStorageInfoList(HttpServletResponse response, StorageInfo bean) { List list = complexQueryService.getMaCodeList(bean); ExcelUtil util = new ExcelUtil<>(StorageInfo.class); @@ -127,7 +127,7 @@ public class ComplexQueryController extends BaseController { * @param bean */ @ApiOperation(value = "综合查询--导出在用设备详情") - @GetMapping("/exportUserRecordList") + @PostMapping("/exportUserRecordList") public void exportUserRecordList(HttpServletResponse response, UseStorageInfo bean) { List list = complexQueryService.getUserRecords(bean); ExcelUtil util = new ExcelUtil<>(UseStorageInfo.class); @@ -153,7 +153,7 @@ public class ComplexQueryController extends BaseController { * @param bean */ @ApiOperation(value = "综合查询--导出在修设备详情") - @GetMapping("/exportRepairRecordList") + @PostMapping("/exportRepairRecordList") public void exportRepairRecordList(HttpServletResponse response, RepairStorageInfo bean) { List list = complexQueryService.getRepairRecordList(bean); ExcelUtil util = new ExcelUtil<>(RepairStorageInfo.class); @@ -179,7 +179,7 @@ public class ComplexQueryController extends BaseController { * @param bean */ @ApiOperation(value = "综合查询--导出新购待入库详情") - @GetMapping("/exportPurchaseRecordList") + @PostMapping("/exportPurchaseRecordList") public void exportPurchaseRecordList(HttpServletResponse response, PurchaseInputInfo bean) { List list = complexQueryService.getPurchaseRecordList(bean); ExcelUtil util = new ExcelUtil<>(PurchaseInputInfo.class); @@ -205,7 +205,7 @@ public class ComplexQueryController extends BaseController { * @param bean */ @ApiOperation(value = "综合查询--导出修饰待入库详情") - @GetMapping("/exportRepairInputList") + @PostMapping("/exportRepairInputList") public void exportRepairInputList(HttpServletResponse response, RepairInputRecord bean) { List list = complexQueryService.getRepairInputList(bean); ExcelUtil util = new ExcelUtil<>(RepairInputRecord.class); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmQrBoxInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmQrBoxInfo.java index 06647e3b..993b91dc 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmQrBoxInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmQrBoxInfo.java @@ -88,6 +88,9 @@ public class BmQrBoxInfo extends BaseEntity @ApiModelProperty(value = "状态--DTO请求参数，用作多状态查询拼接") private String status; + @ApiModelProperty(value = "状态名称") + private String statusName; + @ApiModelProperty(value = "移交人用户ID,") private Long transferUser; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/PurchaseInputInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/PurchaseInputInfo.java index ef975cf3..e3eec745 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/PurchaseInputInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/PurchaseInputInfo.java @@ -58,8 +58,10 @@ public class PurchaseInputInfo { @ApiModelProperty(value = "新购待入库单号") @Excel(name = "新购待入库单号") - private String purchaseCode; + private String code; @ApiModelProperty(value = "关键字") private String keyWord; + + private String manageType; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RepairInputRecord.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RepairInputRecord.java index 75026e21..8d0459b1 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RepairInputRecord.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/RepairInputRecord.java @@ -59,7 +59,7 @@ public class RepairInputRecord { @ApiModelProperty(value = "修饰待入库单号") @Excel(name = "修饰待入库单号") - private String repairInputCode; + private String inputCode; @ApiModelProperty(value = "关键字") private String keyWord; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/UseStorageInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/UseStorageInfo.java index b0426469..bc6e5298 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/UseStorageInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/UseStorageInfo.java @@ -59,7 +59,7 @@ public class UseStorageInfo { @ApiModelProperty(value = "领料单号") @Excel(name = "领料单号") - private String leaseCode; + private String code; @ApiModelProperty(value = "关键字") private String keyWord; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java index 65174f5e..c048037f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java @@ -2,6 +2,7 @@ package com.bonus.material.basic.service.impl; import com.alibaba.nacos.common.utils.CollectionUtils; import com.alibaba.nacos.common.utils.StringUtils; +import com.bonus.common.biz.enums.MaTypeManageTypeEnum; import com.bonus.material.basic.domain.*; import com.bonus.material.basic.mapper.ComplexQueryMapper; import com.bonus.material.basic.service.ComplexQueryService; @@ -321,32 +322,46 @@ public class ComplexQueryServiceImpl implements ComplexQueryService { public List getPurchaseRecordList(PurchaseInputInfo bean) { List recordList = complexQueryMapper.getPurchaseRecordList(bean); List tempList = new ArrayList<>(); - - Iterator iterator = recordList.iterator(); - while (iterator.hasNext()) { - PurchaseInputInfo purchaseInputInfo = iterator.next(); - // 根据任务id和类型id查询未入库编码信息 - List maCodeList = complexQueryMapper.selectMaCodeByTaskIdAndTypeId(purchaseInputInfo.getTaskId(), bean.getTypeId()); - if (CollectionUtils.isNotEmpty(maCodeList)) { - boolean addedPurchaseInputInfo = false; - for (PurchaseInputInfo info : maCodeList) { - if (purchaseInputInfo.getInputNum().compareTo(BigDecimal.valueOf(maCodeList.size())) > 0) { - purchaseInputInfo.setInputNum(purchaseInputInfo.getInputNum().subtract(BigDecimal.valueOf(maCodeList.size()))); - String maCode = info.getMaCode(); - BeanUtils.copyProperties(purchaseInputInfo, info); - info.setMaCode(maCode); - info.setInputNum(BigDecimal.ONE); - tempList.add(info); - if (!addedPurchaseInputInfo) { - tempList.add(purchaseInputInfo); - addedPurchaseInputInfo = true; + if (CollectionUtils.isNotEmpty(recordList)) { + if (MaTypeManageTypeEnum.NUMBER_DEVICE.getTypeId().toString().equals(recordList.get(0).getManageType())) { + if (StringUtils.isNotBlank(bean.getKeyWord())) { + String keyword = bean.getKeyWord(); + return recordList.stream().filter(item -> { + return (StringUtils.isNotBlank(item.getCode()) && item.getCode().contains(keyword)) || + (StringUtils.isNotBlank(item.getTypeName()) && item.getTypeName().contains(keyword)) || + (StringUtils.isNotBlank(item.getTypeModelName()) && item.getTypeModelName().contains(keyword)) || + (StringUtils.isNotBlank(item.getMaKeeper()) && item.getMaKeeper().contains(keyword)); + }).collect(Collectors.toList()); + } + return recordList; + } else { + Iterator iterator = recordList.iterator(); + while (iterator.hasNext()) { + PurchaseInputInfo purchaseInputInfo = iterator.next(); + // 根据任务id和类型id查询未入库编码信息 + List maCodeList = complexQueryMapper.selectMaCodeByTaskIdAndTypeId(purchaseInputInfo.getTaskId(), bean.getTypeId()); + if (CollectionUtils.isNotEmpty(maCodeList)) { + boolean addedPurchaseInputInfo = false; + for (PurchaseInputInfo info : maCodeList) { + if (purchaseInputInfo.getInputNum().compareTo(BigDecimal.valueOf(maCodeList.size())) > 0) { + purchaseInputInfo.setInputNum(purchaseInputInfo.getInputNum().subtract(BigDecimal.valueOf(maCodeList.size()))); + String maCode = info.getMaCode(); + BeanUtils.copyProperties(purchaseInputInfo, info); + info.setMaCode(maCode); + info.setInputNum(BigDecimal.ONE); + tempList.add(info); + if (!addedPurchaseInputInfo) { + tempList.add(purchaseInputInfo); + addedPurchaseInputInfo = true; + } + } else if (purchaseInputInfo.getInputNum().compareTo(BigDecimal.valueOf(maCodeList.size())) == 0) { + String maCode = info.getMaCode(); + BeanUtils.copyProperties(purchaseInputInfo, info); + info.setMaCode(maCode); + info.setInputNum(BigDecimal.ONE); + tempList.add(info); + } } - } else if (purchaseInputInfo.getInputNum().compareTo(BigDecimal.valueOf(maCodeList.size())) == 0) { - String maCode = info.getMaCode(); - BeanUtils.copyProperties(purchaseInputInfo, info); - info.setMaCode(maCode); - info.setInputNum(BigDecimal.ONE); - tempList.add(info); } } } @@ -357,6 +372,7 @@ public class ComplexQueryServiceImpl implements ComplexQueryService { return (StringUtils.isNotBlank(item.getMaCode()) && item.getMaCode().contains(keyword)) || (StringUtils.isNotBlank(item.getTypeName()) && item.getTypeName().contains(keyword)) || (StringUtils.isNotBlank(item.getTypeModelName()) && item.getTypeModelName().contains(keyword)) || + (StringUtils.isNotBlank(item.getCode()) && item.getCode().contains(keyword)) || (StringUtils.isNotBlank(item.getMaKeeper()) && item.getMaKeeper().contains(keyword)); }).collect(Collectors.toList()); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/vo/LeaseOutVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/vo/LeaseOutVo.java index 6f9d755c..a5bdeecc 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/vo/LeaseOutVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/vo/LeaseOutVo.java @@ -1,12 +1,9 @@ package com.bonus.material.lease.domain.vo; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; -import java.util.Date; /** * @Author ma_sh @@ -49,12 +46,10 @@ public class LeaseOutVo { private String holdingTime; @ApiModelProperty("试验日期") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date testTime; + private String testTime; @ApiModelProperty("下次试验日期") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date nextTestTime; + private String nextTestTime; @ApiModelProperty("验收结论") private String checkResult; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java index c0e5d5df..d7139fad 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java @@ -375,11 +375,12 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { String fileName = "施工机具设备出库检验记录表"; String projectName = ""; String unit = ""; + List list = new ArrayList<>(); if (leaseApplyRequestVo != null && leaseApplyRequestVo.getLeaseApplyInfo() != null) { - projectName ="领用工程：" + leaseApplyRequestVo.getLeaseApplyInfo().getProjectName(); + projectName ="领用工程：" + leaseApplyRequestVo.getLeaseApplyInfo().getLeaseProject(); unit ="使用单位：" + leaseApplyRequestVo.getLeaseApplyInfo().getLeaseUnit(); + list = leaseApplyRequestVo.getLeaseOutVoList(); } - List list = leaseApplyRequestVo.getLeaseOutVoList(); expOutExcel(response,list,fileName,projectName,unit); } catch (Exception e) { log.error(e.toString(), e); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java index 25179b0b..3670c119 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java @@ -562,7 +562,9 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService List inputList = new ArrayList<>(); for (RepairAuditDetails details : repairAuditDetailsByQuery) { //修改机具状态 - repairAuditDetailsMapper.updateMachine(details); + if (details.getMaId() != null) { + repairAuditDetailsMapper.updateMachine(details); + } RepairInputDetails inputVo = new RepairInputDetails(); BeanUtils.copyProperties(details, inputVo); inputVo.setRepairNum(details.getRepairedNum()); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml index f4fe6597..701c963f 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml @@ -20,6 +20,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bqb.box_code as boxCode, bqb.box_type as boxType, bqb.box_status as status, + case bqb.box_status + when '0' then '待创建' + when '1' then '待录入' + when '2' then '待移交' + when '3' then '待接收' + when '4' then '已接收' + when '5' then '移交被驳回' + else '' + end as statusName, bqb.create_by as createBy, bqb.create_time as createTime, bqb.update_by as updateBy, diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml index 6f7ec276..214b0cdb 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml @@ -489,6 +489,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id WHERE IFNULL(pcd.check_num, 0) - IFNULL(pcd.input_num, 0) > 0 + and pcd.status in (3,4, 13,14) GROUP BY mt.type_id) AS subquery4 ON subquery4.type_id = mt.type_id LEFT JOIN ( @@ -571,7 +572,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt.buy_price AS buyPrice, sai.num AS usNum, mm.ma_code AS maCode, - lai.`code` AS leaseCode, + lai.`code` AS code, GROUP_CONCAT(DISTINCT su.nick_name ORDER BY su.nick_name SEPARATOR ', ') AS maKeeper, lod.create_by AS creator, lod.create_time AS outTime @@ -648,9 +649,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt.type_name AS typeModelName, mt.buy_price AS buyPrice, IFNULL( pcd.check_num, 0 ) - IFNULL( pcd.input_num, 0 ) AS inputNum, - tt.`code` AS purchaseCode, + tt.`code` AS code, GROUP_CONCAT( DISTINCT su.nick_name ORDER BY su.nick_name SEPARATOR ', ' ) AS maKeeper, - pcd.check_time AS checkTime + pcd.check_time AS checkTime, + mt.manage_type as manageType FROM purchase_check_details pcd LEFT JOIN ma_type mt ON mt.type_id = pcd.type_id @@ -673,7 +675,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt.type_name AS typeModelName, mt.buy_price AS buyPrice, IFNULL(rid.repair_num, 0) - IFNULL(rid.input_num, 0) AS repairInputNum, - tt.`code` AS repairInputCode, + tt.`code` AS inputCode, GROUP_CONCAT(DISTINCT su.nick_name ORDER BY su.nick_name SEPARATOR ', ') AS maKeeper, GROUP_CONCAT(DISTINCT su2.nick_name ORDER BY su2.nick_name SEPARATOR ', ') AS repairer, rid.create_time as repairInputTime, diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml index 25ef3fed..e6ca4cb2 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml @@ -280,10 +280,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt.rated_load AS ratedLoad, mt.test_load AS testLoad, mt.holding_time AS holdingTime, - lod.create_time AS testTime, + DATE(lod.create_time) AS testTime, pcd.check_result AS checkResult, lad.remark AS remark, - DATE_SUB(DATE_ADD(lod.create_time, INTERVAL 1 YEAR), INTERVAL 1 DAY) AS nextTestTime -- 计算 nextTestTime + DATE(DATE_SUB(DATE_ADD(lod.create_time, INTERVAL 1 YEAR), INTERVAL 1 DAY)) AS nextTestTime -- 计算 nextTestTime FROM lease_out_details lod LEFT JOIN ma_type mt ON lod.type_id = mt.type_id AND mt.del_flag = '0' From 71678dded4210aee67c62440ab781258718340c8 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Wed, 25 Dec 2024 19:01:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/service/impl/PurchaseBindServiceImpl.java | 5 +++++ .../mapper/material/purchase/PurchaseBindMapper.xml | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java index fa6d16a5..ae2d63f8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java @@ -149,6 +149,11 @@ public class PurchaseBindServiceImpl implements IPurchaseBindService { if (purchaseBindMapper.bindMaCodeByQrCode(purchaseDto) != 1) { return AjaxResult.error(1115,"绑定maCode时SQL执行失败!"); } + } else { + if (dto.getTypeId() != null) { + purchaseDto.setTypeId(dto.getTypeId()); + } + purchaseBindMapper.insert(purchaseDto); } if (purchaseStorageMapper.insertMachine(purchaseDto) != 1) { return AjaxResult.error(1116,"插入maMachine时SQL执行失败!"); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml index 79cd87b3..4354ab13 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml @@ -51,6 +51,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" type_id, + + ma_code, + qr_url, @@ -71,6 +74,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{typeId}, + + #{maCode}, + #{qrUrl}, From 57bade227a2244bbe7e7091b7838cf4349356d96 Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 26 Dec 2024 12:41:39 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/basic/domain/UseStorageInfo.java | 5 +++- .../basic/mapper/ComplexQueryMapper.java | 8 +++++++ .../service/impl/ComplexQueryServiceImpl.java | 14 +++++++++++ .../material/basic/ComplexQueryMapper.xml | 24 ++++++++++++------- 4 files changed, 41 insertions(+), 10 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/UseStorageInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/UseStorageInfo.java index bc6e5298..0d7b79c5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/UseStorageInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/UseStorageInfo.java @@ -58,9 +58,12 @@ public class UseStorageInfo { private Date outTime; @ApiModelProperty(value = "领料单号") - @Excel(name = "领料单号") private String code; + @ApiModelProperty(value = "工程名称") + @Excel(name = "工程名称") + private String projectName; + @ApiModelProperty(value = "关键字") private String keyWord; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/ComplexQueryMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/ComplexQueryMapper.java index 9da4e220..766e71d4 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/ComplexQueryMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/ComplexQueryMapper.java @@ -88,4 +88,12 @@ public interface ComplexQueryMapper { * @return */ List selectMaCodeByTaskIdAndTypeId(@Param("taskId") Long taskId, @Param("typeId") Integer typeId); + + /** + * 查询机具编码 + * @param bean + * @return + */ + List selectMaCodeByTypeId(StorageInfo bean); + } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java index c048037f..44848598 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java @@ -1,5 +1,6 @@ package com.bonus.material.basic.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.alibaba.nacos.common.utils.CollectionUtils; import com.alibaba.nacos.common.utils.StringUtils; import com.bonus.common.biz.enums.MaTypeManageTypeEnum; @@ -279,6 +280,19 @@ public class ComplexQueryServiceImpl implements ComplexQueryService { } } } + // 查询在库具体编码code + List codeList = complexQueryMapper.selectMaCodeByTypeId(bean); + // 1. 创建一个 Set 存储 codeList 中的 typeId 和 maCode 的组合键 + Set validCodes = codeList.stream() + .filter(code -> code.getTypeId() != null && code.getMaCode() != null) + .map(code -> code.getTypeId() + "-" + code.getMaCode()) + .collect(Collectors.toSet()); + + if (CollectionUtil.isNotEmpty(codeList) && CollectionUtil.isNotEmpty(list)) { + list = list.stream() + .filter(item -> validCodes.contains(item.getTypeId() + "-" + item.getMaCode())) + .collect(Collectors.toList()); + } if (StringUtils.isNotBlank(bean.getKeyWord())) { String keyword = bean.getKeyWord(); return list.stream().filter(item -> { diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml index 214b0cdb..7d69ade1 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml @@ -553,14 +553,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND bs.type_id = #{typeId} - - AND ( - mt1.type_name like concat('%',#{keyWord},'%') or - mt.type_name like concat('%',#{keyWord},'%') or - bs.creator like concat('%',#{keyWord},'%') or - su.nick_name like concat('%',#{keyWord},'%') - ) - GROUP BY bs.ma_code, mt.type_id, mt1.type_name, mt.type_name, bs.ma_code, bs.in_num, bs.creator, bs.create_time, tt.CODE, mt.buy_price @@ -573,6 +565,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sai.num AS usNum, mm.ma_code AS maCode, lai.`code` AS code, + bp.pro_name AS projectName, GROUP_CONCAT(DISTINCT su.nick_name ORDER BY su.nick_name SEPARATOR ', ') AS maKeeper, lod.create_by AS creator, lod.create_time AS outTime @@ -584,6 +577,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN sys_user su ON mtk.user_id = su.user_id LEFT JOIN ma_machine mm ON mm.ma_id = sai.ma_id LEFT JOIN lease_apply_info lai ON lai.id = sai.lease_id + LEFT JOIN bm_agreement_info bai ON bai.agreement_id = sai.agreement_id + LEFT JOIN bm_project bp ON bai.project_id = bp.pro_id LEFT JOIN ( SELECT parent_id, create_time, create_by FROM lease_out_details GROUP BY parent_id, create_by ) AS lod ON lod.parent_id = lai.id WHERE sai.end_time IS NULL @@ -598,7 +593,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mm.ma_code like concat('%',#{keyWord},'%') or lai.`code` like concat('%',#{keyWord},'%') or lod.create_by like concat('%',#{keyWord},'%') or - su.nick_name like concat('%',#{keyWord},'%') + su.nick_name like concat('%',#{keyWord},'%') or + bp.pro_name like concat('%',#{keyWord},'%') ) GROUP BY mm.ma_code,lai.`code`,mt.type_id @@ -725,4 +721,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND pmi.ma_code IS NOT NULL + +