From b1fee78651a361af04630a1130f9424337a86b33 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Sat, 20 Apr 2024 17:29:05 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/base/api/domain/SltAgreementInfo.java | 1 + .../main/java/com/bonus/sgzb/app/domain/TmTask.java | 2 ++ .../sgzb/app/service/impl/BackReceiveServiceImpl.java | 2 +- .../sgzb/app/service/impl/TmTaskServiceImpl.java | 11 +++++------ .../controller/WorkSiteDirectManageController.java | 10 +++++----- .../material/mapper/WorkSiteDirectManageMapper.java | 8 ++++---- .../material/service/WorkSiteDirectManageService.java | 4 ++-- .../service/impl/WorkSiteDirectManageImpl.java | 10 +++++----- .../mapper/material/WorkSiteDirectManageMapper.xml | 8 ++++++++ 9 files changed, 33 insertions(+), 23 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java index f7c2789b..168f4828 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java @@ -117,6 +117,7 @@ public class SltAgreementInfo { */ private String sltType; private String applyId; + private String keyWord; } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java index 9cffc323..749bb742 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java @@ -264,4 +264,6 @@ public class TmTask implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date estimateLeaseTime; + private Integer souceByRefuse; + } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java index 4678e1fc..e55457d6 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java @@ -307,7 +307,7 @@ public class BackReceiveServiceImpl implements BackReceiveService { //删除back_check_details int res = deleteBcd(record); if (res == 0) { - throw new RuntimeException("删除back_check_details异常"); + throw new RuntimeException("该机具未领用，撤回失败"); } return res; } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index d142a9b5..151df2a8 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -500,12 +500,6 @@ public class TmTaskServiceImpl implements TmTaskService { for (TmTask tmTask : tmTaskList) { int count = 0; if (tmTask != null) { - if (tmTask.getTaskStatus() == 31) { - tmTask.setTaskName("机具分公司审核"); - } - if (tmTask.getTaskStatus() == 32) { - tmTask.setTaskName("施工部审核"); - } // 去查询任务分单表 List collect = tmTaskMapper.getAuditManageListByLeaseInfo(tmTask); // 对领料任务集合查询具体详情 @@ -1099,6 +1093,11 @@ public class TmTaskServiceImpl implements TmTaskService { leaseApplyInfo.setCode(task.getLeaseApplyInfoList().get(0).getCode()); leaseApplyInfo.setLeasePerson(leasePerson); leaseApplyInfo.setPhone(phone); + if (task.getTaskStatus() == 32 && task.getSouceByRefuse() == 1) { + leaseApplyInfo.setDeptAuditBy(task.getLeaseApplyInfoList().get(0).getDeptAuditBy()); + leaseApplyInfo.setDeptAuditTime(task.getLeaseApplyInfoList().get(0).getDeptAuditTime()); + leaseApplyInfo.setDeptAuditRemark(task.getLeaseApplyInfoList().get(0).getDeptAuditRemark()); + } leaseApplyInfo.setRemark(remark); leaseApplyInfo.setType(task.getLeaseApplyInfoList().get(0).getType()); leaseApplyInfo.setCompanyId(leaseApplyDetail.getCompanyId()); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java index 19f533f7..648517ea 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java @@ -63,9 +63,9 @@ public class WorkSiteDirectManageController extends BaseController { */ @ApiOperation(value = "根据协议Id查询在用数据") @GetMapping("/getUseringData") - public TableDataInfo getUseringData(String agreementId) { + public TableDataInfo getUseringData(SltAgreementInfo sltAgreementInfo) { startPage(); - List useringData = workSiteDirectManageService.getUseringData(agreementId); + List useringData = workSiteDirectManageService.getUseringData(sltAgreementInfo); return getDataTable(useringData); } @@ -127,7 +127,7 @@ public class WorkSiteDirectManageController extends BaseController { if (directApplyInfo != null) { directApplyInfo.setStatus("2"); directApplyInfo.setAuditor(SecurityUtils.getLoginUser().getUsername()); - directApplyInfo.setAuditTime(DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")); + directApplyInfo.setAuditTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")); workSiteDirectManageService.refuseDirectApplyInfo(directApplyInfo); } else { return AjaxResult.error("参数为空，审核失败"); @@ -137,8 +137,8 @@ public class WorkSiteDirectManageController extends BaseController { @ApiOperation(value = "查看详情") @GetMapping("/getInfo") - public AjaxResult getInfo(String id) { - return AjaxResult.success(workSiteDirectManageService.getInfoById(id)); + public AjaxResult getInfo(SltAgreementInfo sltAgreementInfo) { + return AjaxResult.success(workSiteDirectManageService.getInfoById(sltAgreementInfo)); } } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java index 4eb4b1d2..1b6f6ab2 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java @@ -21,10 +21,10 @@ public interface WorkSiteDirectManageMapper { /** * 根据协议id查询在用数据 * - * @param agreementId + * @param * @return */ - List getUseringData(String agreementId); + List getUseringData(SltAgreementInfo sltAgreementInfo); int saveDirectApplyInfo(DirectApplyInfo directApplyInfo); @@ -58,9 +58,9 @@ public interface WorkSiteDirectManageMapper { int insertBackApplyInfo(TmTask task); - DirectApplyInfo getInfoById(String id); + DirectApplyInfo getInfoById(SltAgreementInfo sltAgreementInfo); - List getDetailById(String id); + List getDetailById(SltAgreementInfo sltAgreementInfo); List getListAll(); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java index 625ab61a..9f8c133e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java @@ -14,7 +14,7 @@ import java.util.List; */ public interface WorkSiteDirectManageService { - List getUseringData(String agreementId); + List getUseringData(SltAgreementInfo sltAgreementInfo); int saveDirectApplyInfo(DirectApplyInfo directApplyInfos); int saveDirectApplyDetails(DirectApplyDetails directApplyInfos); @@ -42,7 +42,7 @@ public interface WorkSiteDirectManageService { int insertBackCheckDetails(List backApplyDetails); - DirectApplyInfo getInfoById(String id); + DirectApplyInfo getInfoById(SltAgreementInfo sltAgreementInfo); int passDirectApplyInfoDetails(DirectPassApplyInfoDetails directApplyInfoDetails); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java index e3557fe7..f6652566 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java @@ -51,8 +51,8 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { @Override - public List getUseringData(String agreementId) { - return workSiteDirectManageMapper.getUseringData(agreementId); + public List getUseringData(SltAgreementInfo sltAgreementInfo) { + return workSiteDirectManageMapper.getUseringData(sltAgreementInfo); } @Override @@ -331,9 +331,9 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { } @Override - public DirectApplyInfo getInfoById(String id) { - DirectApplyInfo directApplyInfo = workSiteDirectManageMapper.getInfoById(id); - List detailById = workSiteDirectManageMapper.getDetailById(id); + public DirectApplyInfo getInfoById(SltAgreementInfo sltAgreementInfo) { + DirectApplyInfo directApplyInfo = workSiteDirectManageMapper.getInfoById(sltAgreementInfo); + List detailById = workSiteDirectManageMapper.getDetailById(sltAgreementInfo); directApplyInfo.setDirectApplyDetails(detailById); return directApplyInfo; } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml index bf2d6cb8..41808474 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml @@ -380,6 +380,10 @@ LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id LEFT JOIN ma_machine mm on sai.ma_id = mm.ma_id where sai.agreement_id = #{agreementId} and sai.status = '0' + + and (mt2.type_name like concat('%', #{keyWord}, '%') or + mt.type_name like concat('%', #{keyWord}, '%')) + GROUP BY sai.ma_id,sai.type_id @@ -491,6 +495,10 @@ WHERE dai.id = #{id} AND sai.STATUS = '0' + + and (mt2.type_name like concat('%', #{keyWord}, '%') or + mt.type_name like concat('%', #{keyWord}, '%')) + GROUP BY dad.id,sai.type_id