From e51cbaf4bcc57aa012ffaebd86bfd175ec5a0e98 Mon Sep 17 00:00:00 2001 From: mashuai Date: Sun, 15 Jun 2025 13:52:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/domain/lease/LeaseApplyInfo.java | 3 ++ .../lease/mapper/LeaseApplyInfoMapper.java | 7 ++++ .../impl/LeaseApplyInfoServiceImpl.java | 13 +++++- .../service/impl/LeaseTaskServiceImpl.java | 4 +- .../impl/IPartCheckInfoServiceImpl.java | 10 ++++- .../service/impl/PartArrivedServiceImpl.java | 3 +- .../impl/PurchaseCheckInfoServiceImpl.java | 4 +- .../material/lease/LeaseApplyInfoMapper.xml | 40 ++++++++++++++++++- 8 files changed, 74 insertions(+), 10 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java index 51cbc158..01dbdc27 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java @@ -290,4 +290,7 @@ public class LeaseApplyInfo extends BaseEntity{ @ApiModelProperty(value = "发布批次") private String publishTask; + + @ApiModelProperty(value = "有无电子签名 0 否，1 是") + private Integer hasSign; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java index 92a54f0f..c11cfc95 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java @@ -80,4 +80,11 @@ public interface LeaseApplyInfoMapper { * @return */ List selectPublishList(LeaseApplyInfo leaseApplyInfo); + + /** + * 查询待签名的领料单 + * @param leaseApplyInfo + * @return + */ + List getNoSignList(LeaseApplyInfo leaseApplyInfo); } 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 6fb9ff24..3ed646c3 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 @@ -175,7 +175,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { */ @Override public List selectLeaseApplyInfoList(LeaseApplyInfo leaseApplyInfo) { - leaseApplyInfo.setUserId(SecurityUtils.getUserId()); + leaseApplyInfo.setUserId(SecurityUtils.getLoginUser().getUserid()); List list = leaseApplyInfoMapper.selectLeaseApplyInfoList(leaseApplyInfo); // 如果statusList包含3、4、5，则为领料出库查询，需查询领用出库数据，进行拼接 if (!CollectionUtils.isEmpty(leaseApplyInfo.getStatusList())) { @@ -196,6 +196,17 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { } } } + if (!CollectionUtils.isEmpty(list)) { + if (leaseApplyInfo.getHasSign() != null && leaseApplyInfo.getHasSign() == 1) { + // 将list集合中leaseSignUrl不为null的数据过滤出来 + list = list.stream() + .filter(info -> StringUtils.isNotBlank(info.getLeaseSignUrl())) + .collect(Collectors.toList()); + } else if (leaseApplyInfo.getHasSign() != null && leaseApplyInfo.getHasSign() == 0) { + // 查询待签名的领料单 + list = leaseApplyInfoMapper.getNoSignList(leaseApplyInfo); + } + } // 使用 Stream API 进行降序排序 List sortedList = list.stream() .sorted(Comparator.comparing(LeaseApplyInfo::getCreateTime).reversed()) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java index 2459ddd9..9dfd2ef3 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java @@ -104,7 +104,7 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService { } leaseApplyRequestVo.getLeaseApplyInfo().setCreateTime(DateUtils.getNowDate()); leaseApplyRequestVo.getLeaseApplyInfo().setCreateBy(SecurityUtils.getUsername()); - Long userId = SecurityUtils.getUserId(); + Long userId = SecurityUtils.getLoginUser().getUserid(); Long deptId = mapper.getDeptIdByUserId(userId); LeaseDeptInfo leaseDeptInfo = new LeaseDeptInfo(); leaseDeptInfo = mapper.getDeptIdByParentId(deptId); @@ -321,7 +321,7 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService { @Override public LeaseDeptInfo getCode() { try { - Long userId = SecurityUtils.getUserId(); + Long userId = SecurityUtils.getLoginUser().getUserid(); Long deptId = mapper.getDeptIdByUserId(userId); LeaseDeptInfo leaseDeptInfo = new LeaseDeptInfo(); leaseDeptInfo = mapper.getDeptIdByParentId(deptId); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/IPartCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/IPartCheckInfoServiceImpl.java index 00711342..91b0f7dc 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/IPartCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/IPartCheckInfoServiceImpl.java @@ -172,10 +172,16 @@ public class IPartCheckInfoServiceImpl implements IPartCheckInfoService { boolean notContainsNoFinished =!statusList.contains(publishedStatus); boolean allReject = statusList.stream() .allMatch(status -> status.equals(inProgressStatus)); + int res = 0; if (notContainsNoFinished && !allReject) { - partArrivedMapper.updateTaskStatus(taskId, PurchaseTaskStatusEnum.TO_STORE.getStatus()); + res = partArrivedMapper.updateTaskStatus(taskId, PurchaseTaskStatusEnum.TO_STORE.getStatus()); } else if (notContainsNoFinished && allReject) { - partArrivedMapper.updateTaskStatus(taskId, PurchaseTaskStatusEnum.TO_CHECK_AFTER_REJECT.getStatus()); + res = partArrivedMapper.updateTaskStatus(taskId, PurchaseTaskStatusEnum.TO_CHECK_AFTER_REJECT.getStatus()); + } + if (res < 1) { + return AjaxResult.error("会签驳回失败"); + } else { + return AjaxResult.success("会签驳回成功"); } } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartArrivedServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartArrivedServiceImpl.java index a2f90972..441a3110 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartArrivedServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartArrivedServiceImpl.java @@ -186,8 +186,7 @@ public class PartArrivedServiceImpl implements IPartArrivedService switch (partTypeQueryDto.getTaskStage()) { case PURCHASE_TASK_STAGE_MANAGE: // 新购管理阶段展示全部任务、不进行过滤 - if (partTypeCheckInfos.get(i).getTaskStatus().equals(PurchaseTaskStatusEnum.TO_NOTICE.getStatus()) || - partTypeCheckInfos.get(i).getTaskStatus().equals(PurchaseTaskStatusEnum.TO_CHECK_AFTER_REJECT.getStatus())) { + if (partTypeCheckInfos.get(i).getTaskStatus().equals(PurchaseTaskStatusEnum.TO_NOTICE.getStatus())) { partTypeCheckInfos.get(i).setTaskStatusName("未完成"); } else { partTypeCheckInfos.get(i).setTaskStatusName("已完成"); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index 4da50af7..5364a09b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -328,8 +328,6 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { List purchaseSignRecordList = signProcessMapper.getPurchaseSignRecordByTask(purchaseCheckInfo.getTaskId()); // 查询需要进行会签的org_id集合 List signProcessVoList = signProcessMapper.getList(new SignProcessVo()); - // 获取当前登录人组织id - Long loginUserDeptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); if (!CollectionUtils.isEmpty(purchaseSignRecordList) && !CollectionUtils.isEmpty(signProcessVoList)) { // 查询出配置需要会签的org_id集合 Set configSignOrgSet = signProcessVoList.stream().map(SignProcessVo::getOrgId).collect(Collectors.toSet()); @@ -613,6 +611,8 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { int addPurchaseSignResult = signProcessMapper.insertPurchaseSignRecord(purchaseSignRecord); if (addPurchaseSignResult < 1) { return AjaxResult.error("会签失败，purchase_audit_record表插入0条数据"); + } else { + return AjaxResult.success("验收驳回成功"); } } } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml index c097da4c..457646b2 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml @@ -267,7 +267,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" IFNULL(lod.num, 0) AS alNum, GROUP_CONCAT( DISTINCT mt1.type_name ) AS maTypeNames, lpd.publish_task AS publishTask, - lai.task_id AS taskId + lai.task_id AS taskId, + lai.lease_sign_url AS leaseSignUrl FROM lease_publish_details lpd LEFT JOIN lease_apply_info lai ON lai.id = lpd.parent_id @@ -302,4 +303,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY lpd.create_time DESC + + \ No newline at end of file