From 73b3c492ca4611187ecc82f51f27d77bf526e94d Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Thu, 20 Feb 2025 23:40:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/biz/enums/TmTaskTypeEnum.java | 2 +- .../impl/PurchaseNoticePersonServiceImpl.java | 20 ++++++++- .../SltAgreementReduceController.java | 4 +- .../impl/SltAgreementReduceServiceImpl.java | 44 +++++++++++-------- .../impl/SysWorkflowRecordServiceImpl.java | 4 +- .../work/SysWorkflowRecordhistoryMapper.xml | 3 +- 6 files changed, 50 insertions(+), 27 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/TmTaskTypeEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/TmTaskTypeEnum.java index 33ed3290..75028c96 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/TmTaskTypeEnum.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/TmTaskTypeEnum.java @@ -18,7 +18,7 @@ public enum TmTaskTypeEnum { TM_TASK_AGREEMENT_MANAGEMENT(10, "新增协议任务"), TM_TASK_REPAIR_INPUT(11, "修饰后入库任务"), TM_TASK_PART_LEASE(12, "配件领料任务"), - TM_TASK_PART_TYPE(13, "配件新购"), + TM_TASK_PART_TYPE(13, "费用减免任务"), TM_TASK_REPAIR_NUM(14, "数量维修人员信息附件"), //盘点报废 TM_TASK_PART_SCRAP(15, "盘点报废"); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseNoticePersonServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseNoticePersonServiceImpl.java index 8c0bad4b..dd396230 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseNoticePersonServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseNoticePersonServiceImpl.java @@ -1,10 +1,13 @@ package com.bonus.material.purchase.service.impl; import java.util.List; +import java.util.Objects; + import com.bonus.common.biz.enums.PurchaseTaskStatusEnum; import com.bonus.common.biz.enums.TmTaskTypeEnum; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; +import com.bonus.common.core.utils.encryption.AesCbcUtils; import com.bonus.common.core.utils.encryption.Sm4Utils; import com.bonus.common.core.utils.sms.SmsUtils; import com.bonus.common.core.web.domain.AjaxResult; @@ -60,7 +63,14 @@ public class PurchaseNoticePersonServiceImpl implements IPurchaseNoticePersonSer */ @Override public List selectPurchaseNoticePersonList(PurchaseNoticePerson purchaseNoticePerson) { - return purchaseNoticePersonMapper.selectPurchaseNoticePersonList(purchaseNoticePerson); + List list = purchaseNoticePersonMapper.selectPurchaseNoticePersonList(purchaseNoticePerson); + list.removeIf(Objects::isNull); + list.forEach(item -> { + if (null != item.getTelphone() && 11 < item.getTelphone().length()) { + item.setTelphone(Sm4Utils.decrypt(item.getTelphone())); + } + }); + return list; } /** @@ -70,7 +80,13 @@ public class PurchaseNoticePersonServiceImpl implements IPurchaseNoticePersonSer */ @Override public List getUnSelectedUserList() { - return purchaseNoticePersonMapper.getUnSelectedUserList(); + List userList = purchaseNoticePersonMapper.getUnSelectedUserList(); + for (PurchaseNoticePerson user : userList) { + if (null != user.getTelphone() && 11 < user.getTelphone().length()) { + user.setTelphone(Sm4Utils.decrypt(user.getTelphone())); + } + } + return userList; } @Override diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementReduceController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementReduceController.java index eee807eb..6a313c16 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementReduceController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementReduceController.java @@ -96,9 +96,9 @@ public class SltAgreementReduceController extends BaseController { } /** - * 查询协议申请减免明细 + * 新增申请减免数据 */ - @ApiOperation(value = "查询协议申请减免明细") + @ApiOperation(value = "新增申请减免数据") // @RequiresPermissions("settlement:apply:list") @SysLog(title = "申请减免", businessType = OperaType.INSERT, logType = 1,module = "结算关联->申请减免") @PostMapping("/addApply") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementReduceServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementReduceServiceImpl.java index 9fda72ba..2a5e25db 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementReduceServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementReduceServiceImpl.java @@ -1,5 +1,6 @@ package com.bonus.material.settlement.service.impl; +import com.bonus.common.biz.enums.TmTaskTypeEnum; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; @@ -7,6 +8,7 @@ import com.bonus.material.basic.mapper.BmFileInfoMapper; import com.bonus.material.settlement.domain.SltAgreementReduce; import com.bonus.material.settlement.mapper.SltAgreementReduceMapper; import com.bonus.material.settlement.service.ISltAgreementReduceService; +import com.bonus.material.work.service.SysWorkflowRecordService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; @@ -33,9 +35,13 @@ import java.util.stream.Collectors; public class SltAgreementReduceServiceImpl implements ISltAgreementReduceService { @Autowired private SltAgreementReduceMapper sltAgreementRecudceMapper; + @Autowired private BmFileInfoMapper bmFileInfoMapper; + @Autowired + private SysWorkflowRecordService workflowRecordService; + @Override public List selectSltAgreementReduceList(SltAgreementReduce sltAgreement) { return sltAgreementRecudceMapper.selectSltAgreementReduceList(sltAgreement); @@ -49,49 +55,49 @@ public class SltAgreementReduceServiceImpl implements ISltAgreementReduceService @Override @Transactional(rollbackFor = Exception.class) // 对所有异常回滚 public AjaxResult addApply(SltAgreementReduce sltAgreement) { + List list; try { - List list = sltAgreement.getDetailList(); - //bmFileInfoMapper.insertBmFileInfo() // 初始化 SltAgreementReduce 对象 initSltAgreement(sltAgreement); - + // 计算减免区间 List applyReduction = applyReduction(sltAgreement); - if (applyReduction.size() > 0 && applyReduction!= null) { + if (!applyReduction.isEmpty()) { list = applyReduction; - }else{ + } else { list = null; } - if(list != null){ + if (null != list) { sltAgreement.setCreator(SecurityUtils.getUserId().toString()); + // 插入外层任务信息 Long rs = sltAgreementRecudceMapper.insertReduce(sltAgreement); - Long id = sltAgreement.getId(); + Long taskId = sltAgreement.getId(); + if (null != rs && rs > 0 && null != taskId && taskId > 0) { + workflowRecordService.addSysWorkflowRecord(Math.toIntExact(taskId), sltAgreement.getCode(), TmTaskTypeEnum.TM_TASK_PART_TYPE.getTaskTypeId()); + } else { + throw new RuntimeException("新增失败"); + } AtomicBoolean addFileInfoResult = new AtomicBoolean(false); - - if(sltAgreement.getBmFileInfos()!=null){ + if (sltAgreement.getBmFileInfos() != null) { sltAgreement.getBmFileInfos().forEach(bmFileInfo -> { - bmFileInfo.setModelId(id); + bmFileInfo.setModelId(taskId); bmFileInfo.setCreateTime(DateUtils.getNowDate()); addFileInfoResult.set(bmFileInfoMapper.insertBmFileInfo(bmFileInfo) > 0); }); } - - - if (rs > 0 && list != null) { + if (rs > 0) { // 批量插入明细 List detailList = list.stream() - .peek(detail -> detail.setId(id)) + .peek(detail -> detail.setId(taskId)) .collect(Collectors.toList()); sltAgreementRecudceMapper.insertBatchReduceDetail(detailList); } - }else{ - return AjaxResult.warn("检索历史申请减免区间数据，已申请减免，请勿在提交申请单！"); + } else { + return AjaxResult.warn("检索历史申请减免区间数据，已申请减免，请勿在提交申请单！"); } - - return AjaxResult.success(); } catch (DataAccessException e) { // 记录详细的数据库操作异常日志 @@ -187,7 +193,7 @@ public class SltAgreementReduceServiceImpl implements ISltAgreementReduceService // 查询与当前区间有重叠的历史减免记录 List historyReductions = sltAgreementRecudceMapper.findOverlappingReductions(current); - if(historyReductions !=null && historyReductions.size()>0){ + if (null != historyReductions && !historyReductions.isEmpty()) { // 对比并去掉重叠部分 for (SltAgreementReduce history : historyReductions) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordServiceImpl.java index d1177be7..d189dee0 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordServiceImpl.java @@ -41,14 +41,14 @@ public class SysWorkflowRecordServiceImpl implements SysWorkflowRecordService { sysWorkflowType.setTaskType(taskType); sysWorkflowType.setIsEnable(1); List sysWorkflowTypeList =sysWorkflowTypeMapper.selectSysWorkflowTypeList(sysWorkflowType); - if (sysWorkflowTypeList.size()<1){ + if (sysWorkflowTypeList.isEmpty()){ throw new ServiceException("新增任务失败,请创建审核流程"); } sysWorkflowType = sysWorkflowTypeList.get(0); SysWorkflowRecord sysWorkflowRecord = new SysWorkflowRecord(); sysWorkflowRecord.setWorkflowId(sysWorkflowType.getId()); sysWorkflowRecord.setTaskId(taskId); - sysWorkflowRecord.setTaskType(2); + sysWorkflowRecord.setTaskType(taskType); sysWorkflowRecord.setTaskCode(taskCode); //创建审批任务 int count = sysWorkflowRecordMapper.addSysWorkflowRecord(sysWorkflowRecord); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordhistoryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordhistoryMapper.xml index 97fb9982..efb7dfdc 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordhistoryMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordhistoryMapper.xml @@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" next_node_id, is_accept, create_by, - create_time, + create_time, remark, @@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{nextNodeId}, #{isAccept}, #{createBy}, + now(), remark,