From dcdf35762c408ef428399ac959103cab11e8f7bd Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Thu, 16 Jan 2025 18:06:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E7=AE=A1=E7=90=86=E9=A2=86?=
 =?UTF-8?q?=E6=96=99=E5=8D=95=E5=AE=A1=E6=A0=B8=E7=AD=BE=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/biz/domain/lease/LeaseApplyInfo.java  |  2 ++
 .../lease/mapper/LeaseApplyInfoMapper.java       |  6 ++++++
 .../service/impl/LeaseApplyInfoServiceImpl.java  | 10 ++++++++++
 .../material/lease/LeaseApplyInfoMapper.xml      | 16 ++++++++++++++++
 4 files changed, 34 insertions(+)

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 1169b620..6e383416 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
@@ -225,4 +225,6 @@ public class LeaseApplyInfo extends BaseEntity{
     @ApiModelProperty(value = "任务状态列表")
     private List<Integer> statusList;
 
+    @ApiModelProperty(value = "审批人人签名URL")
+    private String directAuditSignUrl;
 }
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 19793ca2..79336de0 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
@@ -64,4 +64,10 @@ public interface LeaseApplyInfoMapper {
     int deleteLeaseApplyInfoByIds(Long[] ids);
 
     String getTaskId(Long parentId);
+
+    /** 设置审批人为默认的董班长 --防止代码冲突 **/
+    Long getDirectAuditBy();
+
+    /** 设置审批人签名url  防止代码冲突  **/
+    String getDirectAuditUrl(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 64e66b02..6da8c6a5 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
@@ -85,6 +85,10 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
             LeaseApplyRequestVo leaseApplyRequestVo = new LeaseApplyRequestVo();
 
             optionalInfo.ifPresent(info -> {
+                /** 设置审批人签名url  防止代码冲突  **/
+                String directAuditUrl =   leaseApplyInfoMapper.getDirectAuditUrl(info);
+                info.setDirectAuditSignUrl(directAuditUrl);
+                /** 设置审批人签名url  防止代码冲突  **/
                 leaseApplyRequestVo.setLeaseApplyInfo(info);
                 // 获取领料单详情
                 List<LeaseApplyDetails> details = leaseApplyDetailsMapper.selectLeaseApplyDetailsList(new LeaseApplyDetails(info.getId(), keyword, userId));
@@ -153,6 +157,12 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
             tmTaskAgreementMapper.insertTmTaskAgreement(tmTaskAgreement);
             leaseApplyRequestVo.getLeaseApplyInfo().setTaskId(tmTask.getTaskId());
             leaseApplyRequestVo.getLeaseApplyInfo().setCode(taskCode);
+
+            /** 设置审批人为默认的董班长 --防止代码冲突 **/
+            Long peopleId = leaseApplyInfoMapper.getDirectAuditBy();
+            leaseApplyRequestVo.getLeaseApplyInfo().setDirectAuditBy(peopleId);
+            /** 设置审批人为默认的董班长 --防止代码冲突 **/
+
             int count = leaseApplyInfoMapper.insertLeaseApplyInfo(leaseApplyRequestVo.getLeaseApplyInfo());
             if (count > 0) {
                 return insertPurchaseCheckDetails(leaseApplyRequestVo.getLeaseApplyDetailsList(), leaseApplyRequestVo.getLeaseApplyInfo().getId());
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 45d5d9f1..e6c335d8 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
@@ -232,4 +232,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where id = #{id}
     </update>
+
+<!--   设置审批人为默认的董班长 防止代码冲突-->
+    <select id="getDirectAuditBy"  resultType="Long">
+        select
+        sc.people_id as peopleId
+        from sign_config sc
+        where sc.process_id = 0 and sc.sign_type = 0 and sc.del_flag = 0
+    </select>
+
+    <!--   设置审批人签名url  防止代码冲突-->
+    <select id="getDirectAuditUrl"  resultType="java.lang.String">
+        select
+        su.sign_url as directAuditSignUrl
+        from sys_user su
+        where su.user_id = #{directAuditBy} and su.del_flag = 0
+    </select>
 </mapper>
\ No newline at end of file