From ffe7c67c6f0be91ce30cf70fc8ed4e7bcd0b7e11 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Tue, 30 Apr 2024 11:23:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=BA=86=E9=A2=86=E6=96=99=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E4=BF=AE=E6=94=B9=E5=90=8E=E6=97=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/app/controller/TmTaskController.java | 20 ++- .../sgzb/app/mapper/LeaseApplyInfoMapper.java | 4 +- .../bonus/sgzb/app/mapper/TmTaskMapper.java | 4 + .../bonus/sgzb/app/service/TmTaskService.java | 1 + .../app/service/impl/TmTaskServiceImpl.java | 117 ++++++++++++++++-- .../mapper/app/LeaseApplyInfoMapper.xml | 9 ++ .../resources/mapper/app/TmTaskMapper.xml | 69 +++++++++++ 7 files changed, 211 insertions(+), 13 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index 503f00b7..96579ee5 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -527,9 +527,9 @@ public class TmTaskController extends BaseController { } /** - * 修改任务信息 + * 宁夏修改任务信息 */ - @Log(title = "修改任务信息", businessType = BusinessType.UPDATE) + @Log(title = "宁夏修改任务信息", businessType = BusinessType.UPDATE) @PostMapping("/edit") public AjaxResult edit(@RequestBody TmTask task) { try { @@ -543,7 +543,23 @@ public class TmTaskController extends BaseController { } } + /** + * 重庆修改任务信息 + */ + @Log(title = "重庆修改任务信息", businessType = BusinessType.UPDATE) + @PostMapping("/editCq") + public AjaxResult editCq(@RequestBody TmTask task) { + try { + if (StringUtils.isNull(task)) { + return AjaxResult.error("参数错误,传入信息为空!"); + } + tmTaskService.editCq(task); + return AjaxResult.success("修改成功"); + } catch (Exception e) { + return AjaxResult.error("修改失败"); + } + } /** * 通过主键查询单条数据 diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyInfoMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyInfoMapper.java index d6693379..0060ec8b 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyInfoMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyInfoMapper.java @@ -18,7 +18,7 @@ public interface LeaseApplyInfoMapper { int deleteByPrimaryKey(Integer id); int insert(LeaseApplyInfo record); - LeaseApplyInfo selectByTaskIdAndCompId(@Param("taskId") String taskId, @Param("companyId") String companyId); + LeaseApplyInfo selectByTaskIdAndCompId(@Param("taskId") String taskId, @Param("companyId") Integer companyId); int insertOrUpdate(LeaseApplyInfo record); @@ -37,4 +37,6 @@ public interface LeaseApplyInfoMapper { int updateBatchSelective(List list); int batchInsert(@Param("list") List list); + + LeaseApplyInfo selectByTaskIdAndCompIdCq(@Param("taskId") String taskId); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java index 7930eab4..73a04675 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java @@ -138,4 +138,8 @@ public interface TmTaskMapper { * @return */ int deleteTaskAgreementByTaskId(@Param("taskId") String taskId); + + int updateLeaseApplyInfoRejectInfoCq(@Param("record") LeaseApplyInfo leaseApplyInfo); + + int updateLeaseApplyInfoAuditInfoCq(@Param("record") LeaseApplyInfo leaseApplyInfo); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java index 5bf836c4..e7359a8b 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java @@ -70,6 +70,7 @@ public interface TmTaskService{ int updateByPrimaryKeySelective(TmTask record); int edit(TmTask tmTask); + int editCq(TmTask tmTask); Integer getAgreementIdByUnit(TmTask task); 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 7cd0ef4e..f59c3111 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 @@ -205,8 +205,11 @@ public class TmTaskServiceImpl implements TmTaskService { if (CollUtil.isNotEmpty(leaseApplyInfoList)) { for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) { if (leaseApplyInfo != null) { - //leaseApplyInfo.setExamineStatusId(record.getExamineStatusId()); - result += tmTaskMapper.updateLeaseApplyInfoAuditInfo(leaseApplyInfo); + if (leaseApplyInfo.getCompanyId() == null) { + result += tmTaskMapper.updateLeaseApplyInfoAuditInfoCq(leaseApplyInfo); + } else { + result += tmTaskMapper.updateLeaseApplyInfoAuditInfo(leaseApplyInfo); + } } } } @@ -904,8 +907,11 @@ public class TmTaskServiceImpl implements TmTaskService { if (CollUtil.isNotEmpty(leaseApplyInfoList)) { for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) { if (leaseApplyInfo != null) { - //leaseApplyInfo.setExamineStatusId(record.getExamineStatusId()); - result += tmTaskMapper.updateLeaseApplyInfoRejectInfo(leaseApplyInfo); + if (leaseApplyInfo.getCompanyId() == null) { + result += tmTaskMapper.updateLeaseApplyInfoRejectInfoCq(leaseApplyInfo); + } else { + result += tmTaskMapper.updateLeaseApplyInfoRejectInfo(leaseApplyInfo); + } } } } @@ -1025,12 +1031,12 @@ public class TmTaskServiceImpl implements TmTaskService { @Override @Transactional(rollbackFor = Exception.class) public int edit(TmTask tmTask) { - int flag = 0; int res = 0; - int taskResult = this.updateByPrimaryKeySelective(tmTask); + //修改任务信息（tm_task） + this.updateByPrimaryKeySelective(tmTask); try { if (CollUtil.isEmpty(tmTask.getLeaseApplyInfoList())) { - flag = 1; + throw new RuntimeException("参数异常"); } // 修改任务关联的协议 this.updateAgreementByTask(tmTask); @@ -1056,7 +1062,44 @@ public class TmTaskServiceImpl implements TmTaskService { } } catch (Exception e) { log.error(e.getMessage(), e); + } + return res; + } + @Override + @Transactional(rollbackFor = Exception.class) + public int editCq(TmTask tmTask) { + int res = 0; + //修改任务信息（tm_task） + this.updateByPrimaryKeySelective(tmTask); + try { + if (CollUtil.isEmpty(tmTask.getLeaseApplyInfoList())) { + throw new RuntimeException("参数异常"); + } + // 修改任务关联的协议 + this.updateAgreementByTask(tmTask); + //先删除leaseApplyDetail + res = deletePreDetailData(tmTask); + if (res == 0) { + throw new RuntimeException("删除leaseApplyDetail异常"); + } + //再删除leaseApplyInfo + res = deletePreData(tmTask); + if (res == 0) { + throw new RuntimeException("删除leaseApplyInfo异常"); + } + // 先查询lease apply info，根据task id,company id,不存在则插入，领料任务，领料单号，领料人，联系电话，备注，存在则不插入 + res = insertNewDataCq(tmTask); + if (res == 0) { + throw new RuntimeException("insertNewData异常"); + } + // 再插入lease apply detail + res = insertNewDetailData(tmTask); + if (res == 0) { + throw new RuntimeException("insertNewDetailData异常"); + } + } catch (Exception e) { + log.error(e.getMessage(), e); } return res; } @@ -1085,7 +1128,53 @@ public class TmTaskServiceImpl implements TmTaskService { Long taskId = task.getTaskId(); if (CollUtil.isNotEmpty(leaseApplyDetails)) { for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) { - LeaseApplyInfo leaseApplyInfos = leaseApplyInfoMapper.selectByTaskIdAndCompId(String.valueOf(taskId), String.valueOf(leaseApplyDetail.getCompanyId())); + LeaseApplyInfo leaseApplyInfos = new LeaseApplyInfo(); + if (leaseApplyDetail.getCompanyId() == null) { + leaseApplyInfos = leaseApplyInfoMapper.selectByTaskIdAndCompIdCq(String.valueOf(taskId)); + } else { + leaseApplyInfos = leaseApplyInfoMapper.selectByTaskIdAndCompId(String.valueOf(taskId), leaseApplyDetail.getCompanyId()); + } + if (leaseApplyInfos == null) { + LeaseApplyInfo leaseApplyInfo = new LeaseApplyInfo(); + String code = this.genderLeaseCode(); + leaseApplyInfo.setCode(code); + leaseApplyInfo.setTaskId(task.getTaskId().intValue()); + 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()); + leaseApplyInfo.setEstimateLeaseTime(task.getEstimateLeaseTime()); + leaseApplyInfo.setLeaseType(task.getLeaseType()); + res = leaseApplyInfoMapper.insert(leaseApplyInfo); + } + } + } + return res; + } + + private int insertNewDataCq(TmTask task) { + int res = 0; + LeaseApplyInfo leaseApplyInfo1 = task.getLeaseApplyInfo(); + String leasePerson = ""; + String remark = ""; + String phone = ""; + if (leaseApplyInfo1 != null) { + leasePerson = leaseApplyInfo1.getLeasePerson(); + remark = leaseApplyInfo1.getRemark(); + phone = leaseApplyInfo1.getPhone(); + } + List leaseApplyDetails = task.getLeaseApplyDetails(); + Long taskId = task.getTaskId(); + if (CollUtil.isNotEmpty(leaseApplyDetails)) { + for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) { + LeaseApplyInfo leaseApplyInfos = leaseApplyInfoMapper.selectByTaskIdAndCompIdCq(String.valueOf(taskId)); if (leaseApplyInfos == null) { LeaseApplyInfo leaseApplyInfo = new LeaseApplyInfo(); String code = this.genderLeaseCode(); @@ -1117,9 +1206,17 @@ public class TmTaskServiceImpl implements TmTaskService { Long taskId = task.getTaskId(); if (CollUtil.isNotEmpty(leaseApplyDetails)) { for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) { - LeaseApplyInfo leaseApplyInfos = leaseApplyInfoMapper.selectByTaskIdAndCompId(String.valueOf(taskId), String.valueOf(leaseApplyDetail.getCompanyId())); + LeaseApplyInfo leaseApplyInfos = new LeaseApplyInfo(); + if (leaseApplyDetail.getCompanyId() == null) { + leaseApplyInfos = leaseApplyInfoMapper.selectByTaskIdAndCompIdCq(String.valueOf(taskId)); + } else { + leaseApplyInfos = leaseApplyInfoMapper.selectByTaskIdAndCompId(String.valueOf(taskId), leaseApplyDetail.getCompanyId()); + } Integer id = leaseApplyInfos.getId(); - if (leaseApplyDetail.getCompanyId().equals(leaseApplyInfos.getCompanyId())) { + if (leaseApplyDetail.getCompanyId() == null && leaseApplyInfos.getCompanyId() == null) { + leaseApplyDetail.setParenntId(id); + res = leaseApplyDetailsMapper.insert(leaseApplyDetail); + } else if (leaseApplyDetail.getCompanyId().equals(leaseApplyInfos.getCompanyId())) { leaseApplyDetail.setParenntId(id); res = leaseApplyDetailsMapper.insert(leaseApplyDetail); } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml index 715c5070..238b663c 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml @@ -44,6 +44,15 @@ where task_id = #{taskId} and company_id = #{companyId} + diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index d83cb258..383e9b35 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -810,6 +810,75 @@ UPDATE lease_apply_info SET lease_person = #{leasePerson}, phone = #{phone}, remark = #{remark} WHERE task_id = #{taskId} + + UPDATE + lease_apply_info + set + + + company_audit_by = #{record.companyAuditBy}, + company_audit_time = now(), + company_audit_remark = #{record.companyAuditRemark}, + status = #{record.status}, + + + dept_audit_by = #{record.companyAuditBy}, + dept_audit_time = now(), + dept_audit_remark = #{record.companyAuditRemark}, + status = #{record.status}, + + + direct_audit_by = #{record.companyAuditBy}, + direct_audit_time = now(), + direct_audit_remark = #{record.companyAuditRemark}, + status = #{record.status}, + + + WHERE + task_id = #{record.taskId} and company_id is null + + + UPDATE + lease_apply_info + set + + + company_audit_by = #{record.companyAuditBy}, + company_audit_time = now(), + company_audit_remark = #{record.companyAuditRemark}, + + + dept_audit_by = #{record.companyAuditBy}, + dept_audit_time = now(), + dept_audit_remark = #{record.companyAuditRemark}, + status = #{record.status}, + + + direct_audit_by = #{record.companyAuditBy}, + direct_audit_time = now(), + direct_audit_remark = #{record.companyAuditRemark}, + status = #{record.status}, + + + update_by = #{record.companyAuditBy}, + update_time = now(), + + + update_by = #{record.companyAuditBy}, + update_time = now(), + + + update_by = #{record.companyAuditBy}, + update_time = now(), + + + update_by = #{record.companyAuditBy}, + update_time = now(), + + + WHERE + task_id = #{record.taskId} and company_id is null +