From 1fad55d44ef9215985ea473566257791b1b435ee Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 22 Aug 2024 13:44:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E6=8A=A5=E5=BA=9F=E8=BD=AC?= =?UTF-8?q?=E5=88=B0=E7=BB=B4=E4=BF=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/app/service/BackReceiveService.java | 6 +++ .../service/impl/BackReceiveServiceImpl.java | 6 +-- .../impl/ScrapApplyDetailsServiceImpl.java | 53 ++++++++++--------- 3 files changed, 36 insertions(+), 29 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java index fcef2b9..5fc3e4f 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java @@ -99,4 +99,10 @@ public interface BackReceiveService { List backReceiveRecordWeb(BackApplyInfo record); List backReceiveRecordWebPt(BackApplyInfo record); + + int insertRad(int taskId, List wxList); + + int insertTt(List hgList, Integer taskType, String createBy); + + int insertTta(int taskId, List list); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java index 49d16ef..1caf9e0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java @@ -392,7 +392,7 @@ public class BackReceiveServiceImpl implements BackReceiveService { return backApplyInfoList; } - private int insertRad(int taskId, List wxList) { + public int insertRad(int taskId, List wxList) { int result = 0; if (wxList != null) { for (BackApplyInfo wx : wxList) { @@ -414,14 +414,14 @@ public class BackReceiveServiceImpl implements BackReceiveService { return result; } - private int insertTta(int taskId, List list) { + public int insertTta(int taskId, List list) { int res; String agreementId = String.valueOf(list.get(0).getAgreementId()); res = backReceiveMapper.insertTta(taskId, agreementId); return res; } - private int insertTt(List hgList, Integer taskType, String createBy) { + public int insertTt(List hgList, Integer taskType, String createBy) { int newTask; //生成单号 String code = genCodeRule(taskType); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java index b209505..ffb5d33 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java @@ -8,6 +8,8 @@ import java.util.List; import java.util.stream.Collectors; import cn.hutool.core.bean.BeanUtil; +import com.bonus.sgzb.app.mapper.BackReceiveMapper; +import com.bonus.sgzb.app.service.BackReceiveService; import com.bonus.sgzb.base.api.domain.BackApplyInfo; import com.bonus.sgzb.common.core.constant.TaskTypeConstants; import com.bonus.sgzb.common.core.enums.ReviewStatusEnum; @@ -56,6 +58,9 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { @Resource private ScrapAuditorSetMapper scrapAuditorSetMapper; + @Resource + BackReceiveService backReceiveService; + /** * 查询报废任务详细scrap_apply_details * @@ -490,11 +495,11 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { if (notScrapList.size() == scrapApplyDetailsList.size()) { task.setTaskStatus(59); } - } else - { + } else { status = "2"; List backList = new ArrayList<>(); List repairList = new ArrayList<>(); + List wxList = new ArrayList<>(); if (scrapApplyDetailsList.size() > 0) { for (ScrapApplyDetails bean : scrapApplyDetailsList) { if ("1".equals(bean.getScrapSource())) { @@ -502,33 +507,29 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { } else if ("2".equals(bean.getScrapSource())) { repairList.add(bean); } + BackApplyInfo backApplyInfo = new BackApplyInfo(); + backApplyInfo.setAgreementId(tmTaskAgreement.getAgreementId().intValue()); + backApplyInfo.setMaId(bean.getMaId().intValue()); + backApplyInfo.setTypeId(String.valueOf(bean.getTypeId())); + backApplyInfo.setCompanyId(String.valueOf(bean.getCompanyId())); + backApplyInfo.setBackNum(bean.getScrapNum().intValue()); + backApplyInfo.setId(bean.getParentId()); + backApplyInfo.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + backApplyInfo.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + wxList.add(backApplyInfo); } } - if (backList.size() > 0) { - if (backList.get(0).getCompanyId() != null) { - companyId = Math.toIntExact(backList.get(0).getCompanyId()); - } - if (backList.get(0).getParentId() != null) { - parentId = Math.toIntExact(backList.get(0).getParentId()); - } - taskCode = purchaseCodeRule("T", 36); - taskStatus = 38; - taskType = 36; - long backTaskId = genTask(taskCode, taskType, taskStatus, tmTaskAgreement, companyId); - BackApplyInfo backApplyInfo = scrapApplyDetailsMapper.getBackApplyInfo(parentId); - backApplyInfo.setCode(taskCode); - backApplyInfo.setTaskId((int) backTaskId); - backApplyInfo.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - backApplyInfo.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - scrapApplyDetailsMapper.addBackInfo(backApplyInfo); - for (ScrapApplyDetails bean : backList) { - bean.setParentId(backApplyInfo.getId()); - bean.setStatus("1"); - bean.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - bean.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - scrapApplyDetailsMapper.addBackDetails(bean); - } + + //维修的创建维修任务，插入任务协议表 + if (wxList != null && wxList.size() > 0) { + //插入任务表tm_task + int newTaskId = backReceiveService.insertTt(wxList, TaskTypeEnum.MAINTENANCE_TASK.getCode(), SecurityUtils.getLoginUser().getUsername()); + //插入协议任务表tm_task_agreement + backReceiveService.insertTta(newTaskId, wxList); + //插入维修记录表repair_apply_details + backReceiveService.insertRad(newTaskId, wxList); } + if (repairList.size() > 0) { if (repairList.get(0).getCompanyId() != null) { companyId = Math.toIntExact(repairList.get(0).getCompanyId());