Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseTaskMapper.java

@@ -298,4 +298,6 @@ public interface LeaseTaskMapper {
      * @return
      */
     int insertBackRecordByMaId(LeaseApplyDetails bean);
+
+    WorkApplyInfo getInformationById(WorkApplyInfo workApplyInfo);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowRecordHistoryMapper.java

@@ -15,4 +15,6 @@ public interface SysWorkflowRecordHistoryMapper {
     SysWorkflowRecordHistory getWorkflowRecordHistoryByRecordId(Integer recordId);
 
     SysWorkflowRecordHistory getWorkFlowRecordNodeInfoByTaskId(Integer taskId);
+
+    SysWorkflowRecordHistory getWorkflowRecordHistory(Integer recordId);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java

@@ -17,6 +17,7 @@ import com.bonus.common.security.utils.SecurityUtils;
 import com.bonus.material.back.domain.BackApplyDetails;
 import com.bonus.material.back.domain.BackApplyInfo;
 import com.bonus.material.back.mapper.BackApplyInfoMapper;
+import com.bonus.material.common.annotation.PreventRepeatSubmit;
 import com.bonus.material.event.InsertWorkflowEvent;
 import com.bonus.material.lease.domain.LeaseApplyDetails;
 import com.bonus.material.lease.mapper.LeaseApplyDetailsMapper;
@@ -117,7 +118,7 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis
      * 审批
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
+//    @Transactional(rollbackFor = Exception.class)
     public int updateSysWorkflowRecordHistory(@NotNull(message = "审批方法参数不能为空") SysWorkflowRecordHistory sysWorkflowRecordHistory) {
         SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
         Long userId = sysUser.getUserId();
@@ -134,7 +135,12 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis
             String projectName = sysWorkflowRecordHistory.getProjectName();
             Integer nextNodeId = sysWorkflowRecordHistory.getNextNodeId();
             sysWorkflowRecordHistory.setCreateBy(userId.toString());
+            //判断表中有没有这条数据
+            SysWorkflowRecordHistory workflowRecordHistory = sysWorkflowRecordHistoryMapper.getWorkflowRecordHistory(recordId);
+            if(workflowRecordHistory == null){
                 sysWorkflowRecordHistoryMapper.addSysWorkflowRecordHistory(sysWorkflowRecordHistory);
+            }
+
 
             if (sysWorkflowRecordHistory.getIsAccept() == null) {
                 throw new ServiceException("请选择是否接受审批");
@@ -748,7 +754,9 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis
         workApplyInfo.setFlowState(null);
         workApplyInfo.setWebUrl(webUrlBase + queryParams);
         workApplyInfo.setRout(webUrlBase + queryParams);
-
+        //判断表中是否已经有该条information数据
+        WorkApplyInfo information = lMapper.getInformationById(workApplyInfo);
+        if(information == null){
             int countWork = lMapper.insertWorkOrder(workApplyInfo);
             if (countWork > 0) {
 
@@ -758,6 +766,12 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis
 
                 List<WorkPeopleInfo> workPeopleInfoList = new ArrayList<>();
                 workPeopleInfoList = lMapper.selectWorkPeopleInfoList(info.getFlowId());
+                // 过滤掉nextNodeId为null的数据
+                if (workPeopleInfoList != null) {
+                    workPeopleInfoList = workPeopleInfoList.stream()
+                            .filter(person -> person.getNextNodeId() != null) // 过滤条件：nextNodeId不为null
+                            .collect(Collectors.toList());
+                }
                 if(workPeopleInfoList != null && workPeopleInfoList.size() > 0){
                     WorkPeopleInfo person = workPeopleInfoList.get(0);
                     String roleIds = person.getRoleIds();
@@ -786,6 +800,7 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis
                 }
             }
         }
+    }
 
     private void createWorkOrderAndPeopleDirect(SysUser sysUser, int leaseAgreementId, int taskId,String taskCode, int newId,int nodeId) {
         //获取工程名称

bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml

@@ -992,7 +992,7 @@
         </trim>
     </insert>
 
-    <select id="selectWorkPeopleInfoList" resultMap="WorkPeopleInfoResult">
+    <select id="selectWorkPeopleInfoList" resultType="com.bonus.common.biz.domain.lease.WorkPeopleInfo">
         SELECT
             wh.id as id,
             wh.next_node_id as nextNodeId,
@@ -1231,4 +1231,51 @@
         WHERE
             parent_id = #{parentId}
     </select>
+    <select id="getInformationById" resultType="com.bonus.common.biz.domain.lease.WorkApplyInfo">
+        SELECT
+            id,
+            create_time as createTime,
+            create_user_name as createUserName,
+            title,
+            content,
+            type,
+            web_app_id as webAppId,
+            send_user_name as sendUserName,
+            web_url as webUrl,
+            type_id as typeId,
+            business_id as businessId,
+            rout,
+            next_status as nextStatus,
+            extend_name as extendName
+        FROM
+            uni_org.sys_information
+        <where>
+
+        <if test="createUserName != null and createUserName != '' ">
+            AND create_user_name = #{createUserName}
+        </if>
+        <if test="title != null and title != '' ">
+            AND title = #{title}
+        </if>
+        <if test="content != null and content != ''">
+            AND content = #{content}
+        </if>
+        <if test="webAppId != null and webAppId != ''">
+            AND web_app_id = #{webAppId}
+        </if>
+        <if test="typeId != null ">
+            AND type_id = #{typeId}
+        </if>
+        <if test="businessId != null">
+            AND business_id = #{businessId}
+        </if>
+        <if test="webUrl != null and webUrl != '' ">
+            AND web_url = #{webUrl}
+        </if>
+        <if test="rout != null and rout != '' ">
+            AND rout = #{rout}
+        </if>
+        </where>
+
+    </select>
 </mapper>

bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml

@@ -279,6 +279,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectRepairDetails" resultType="com.bonus.common.biz.domain.repair.RepairInputDetails">
         SELECT
             rd.task_id AS taskId,
+            tt.`code` as inputCode,
             rd.type_id AS typeId,
             rd.repair_num AS repairNum,
             rd.input_num AS inputNum,
@@ -289,6 +290,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             GROUP_CONCAT( mm.ma_code ) AS maCode
         FROM
             repair_input_details rd
+        LEFT JOIN tm_task tt on tt.task_id=rd.task_id
                 LEFT JOIN ma_type mt ON rd.type_id = mt.type_id
                 AND mt.del_flag = '0'
                 LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id

bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordhistoryMapper.xml

@@ -59,4 +59,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ) h ON r.id = h.record_id
         WHERE r.task_id = #{taskId}
     </select>
+    <select id="getWorkflowRecordHistory" resultType="com.bonus.material.work.domain.SysWorkflowRecordHistory">
+        SELECT  swrh.id as id,swrh.create_time as createTime,swrh.next_node_id as nextNodeId,
+                swrh.node_id as nodeId
+        FROM sys_workflow_record_history swrh
+        WHERE swrh.record_id = #{recordId} and swrh.node_id = #{nodeId} and swrh.next_node_id = #{nextNodeId}
+        limit 1
+    </select>
 </mapper>