Merge remote-tracking branch 'origin/master'

bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java

@@ -265,4 +265,13 @@ public class LeaseApplyInfo extends BaseEntity{
 
     @ApiModelProperty(value = "公司名称")
     private String companyName;
+
+    @ApiModelProperty(value = "本流程节点id")
+    private Integer nodeId;
+
+    @ApiModelProperty(value = "流程配置值")
+    private String configValue;
+
+    @ApiModelProperty(value = "所属记录")
+    private Integer recordId;
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java

@@ -29,7 +29,10 @@ import com.bonus.material.task.domain.TmTaskAgreement;
 import com.bonus.material.task.mapper.TmTaskAgreementMapper;
 import com.bonus.material.task.mapper.TmTaskMapper;
 import com.bonus.material.work.domain.SysWorkflowRecord;
+import com.bonus.material.work.domain.SysWorkflowRecordHistory;
 import com.bonus.material.work.domain.SysWorkflowType;
+import com.bonus.material.work.mapper.SysWorkflowConfigMapper;
+import com.bonus.material.work.mapper.SysWorkflowRecordHistoryMapper;
 import com.bonus.material.work.mapper.SysWorkflowRecordMapper;
 import com.bonus.material.work.mapper.SysWorkflowTypeMapper;
 import com.bonus.material.work.service.SysWorkflowRecordService;
@@ -73,6 +76,12 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService {
 
     @Resource
     private SysWorkflowRecordService sysWorkflowRecordService;
+
+    @Resource
+    private SysWorkflowConfigMapper sysWorkflowConfigMapper;
+
+    @Resource
+    private SysWorkflowRecordHistoryMapper sysWorkflowRecordHistoryMapper;
     /**
      * 新增领用任务
      *
@@ -368,6 +377,7 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService {
     public List<LeaseApplyInfo> selectAuditLeaseApplyInfoList(LeaseApplyInfo leaseApplyInfo) {
         Long userId = SecurityUtils.getUserId();
         leaseApplyInfo.setUserId(userId == 0 ? null : userId);
+        log.info("用户id为{}",userId);
         List<LeaseApplyInfo> list = mapper.selectAuditLeaseApplyInfoList(leaseApplyInfo);
         if (!CollectionUtils.isEmpty(list)) {
             String keyWord = leaseApplyInfo.getKeyWord();
@@ -378,6 +388,45 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService {
                         .collect(Collectors.toList());
             }
         }
+        for (LeaseApplyInfo leaseApplyInfoNew : list) {
+            //获取当前节点，并根据当前节点获取审核人审核的角色信息
+            if (leaseApplyInfoNew.getNodeId()!=null){
+                log.info("当前节点为{}",leaseApplyInfoNew.getNodeId());
+                String configValue = sysWorkflowConfigMapper.selectConfigValueByNodeId(leaseApplyInfoNew.getNodeId());
+                leaseApplyInfoNew.setConfigValue(configValue);
+                //判断当前节点是否审核
+                SysWorkflowRecordHistory sysWorkflowRecordHistory = new SysWorkflowRecordHistory();
+                sysWorkflowRecordHistory.setRecordId(leaseApplyInfoNew.getRecordId());
+                sysWorkflowRecordHistory.setNodeId(leaseApplyInfoNew.getNodeId());
+                List<SysWorkflowRecordHistory> SysWorkflowRecordHistoryList  = sysWorkflowRecordHistoryMapper.seleteSysWorkflowRecordHistory(sysWorkflowRecordHistory);
+                //判断是或签还是会签0:或签  1:会签
+                if (0==leaseApplyInfoNew.getLeaseSignType().intValue()){
+                       //当前节点已经审核需要修改节点值
+                    if (SysWorkflowRecordHistoryList.get(0)!=null){
+                        String configValueNew = sysWorkflowConfigMapper.selectConfigValueByNodeId(SysWorkflowRecordHistoryList.get(0).getNextNodeId());
+                        leaseApplyInfoNew.setNodeId(SysWorkflowRecordHistoryList.get(0).getNextNodeId());
+                        leaseApplyInfoNew.setConfigValue(configValueNew);
+                    }
+                }else {
+                    String[] ConfigValue =  configValue.split(",");
+                    for (SysWorkflowRecordHistory sysWorkflowRecordHistoryNew : SysWorkflowRecordHistoryList) {
+                        if (sysWorkflowRecordHistoryNew!=null){
+                            // 过滤数组元素
+                            List<String> filteredList = Arrays.stream(ConfigValue)
+                                    .filter(value -> value.equals(sysWorkflowRecordHistoryNew.getCreateBy()))
+                                    .collect(Collectors.toList());
+                            leaseApplyInfoNew.setConfigValue(filteredList.toString());
+                            //判断是否这个节点的所有人都审核
+                            if (filteredList.size()==0){
+                                String configValueNew = sysWorkflowConfigMapper.selectConfigValueByNodeId(SysWorkflowRecordHistoryList.get(0).getNextNodeId());
+                                leaseApplyInfoNew.setNodeId(SysWorkflowRecordHistoryList.get(0).getNextNodeId());
+                                leaseApplyInfoNew.setConfigValue(configValueNew);
+                            }
+                        }
+                    }
+                }
+            }
+        }
         return list;
     }
 

bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowConfig.java

@@ -29,7 +29,7 @@ public class SysWorkflowConfig {
     /**
      * 配置值
      */
-    private Integer configValue;
+    private String configValue;
 
     /**
      * 0关闭 1启用

bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowNode.java

@@ -78,7 +78,7 @@ public class SysWorkflowNode {
     private String remark;
 
     /**
-     * 审批结果，0拒绝 1通过
+     * 审批结果，0待审批 1通过 2已驳回
      */
     private int isAccept;
 

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

@@ -11,4 +11,6 @@ public interface SysWorkflowConfigMapper {
     int addSysWorkflowConfig(SysWorkflowConfig sysWorkflowConfig);
 
     int deleteSysWorkflowConfig(SysWorkflowConfig sysWorkflowConfig);
+
+    String selectConfigValueByNodeId(Integer nodeId);
 }

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

@@ -3,10 +3,12 @@ package com.bonus.material.work.mapper;
 import com.bonus.material.work.domain.SysWorkflowRecord;
 import com.bonus.material.work.domain.SysWorkflowRecordHistory;
 
+import java.util.List;
+
 public interface SysWorkflowRecordHistoryMapper {
 
 
     int addSysWorkflowRecordHistory(SysWorkflowRecordHistory sysWorkflowRecordHistory);
 
-    SysWorkflowRecordHistory seleteSysWorkflowRecordHistory(SysWorkflowRecordHistory sysWorkflowRecordHistory);
+    List<SysWorkflowRecordHistory> seleteSysWorkflowRecordHistory(SysWorkflowRecordHistory sysWorkflowRecordHistory);
 }

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

@@ -2,6 +2,7 @@ package com.bonus.material.work.mapper;
 
 import com.bonus.material.work.domain.SysWorkflowRecord;
 import com.bonus.material.work.domain.dto.SysWorkflowAuditDto;
+import org.apache.ibatis.annotations.Param;
 
 public interface SysWorkflowRecordMapper {
 
@@ -11,6 +12,8 @@ public interface SysWorkflowRecordMapper {
     // 修改审批流任务信息
     int updateSysWorkflowRecord(SysWorkflowRecord sysWorkflowRecord);
 
+
+
     // 根据任务id，查询审批流任务信息
-    SysWorkflowAuditDto getSysWorkflowRecodeByTaskId(Integer taskId);
+    SysWorkflowAuditDto getSysWorkflowRecodeByTaskId(@Param("taskId") Integer taskId);
 }

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

@@ -48,19 +48,17 @@ public class SysWorkflowNodeServiceImpl implements SysWorkflowNodeService {
         sysWorkflowNode.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString());
         //保存创建时间
         sysWorkflowNode.setCreateTime(DateUtils.getNowDate());
-        String[] ConfigValue =  sysWorkflowNode.getConfigValues().split(",");
+
         if (sysWorkflowNode.getConfigValues().isEmpty()){
             throw new ServiceException("请选择审核人员");
         }
         int count = sysWorkflowNodeMapper.addSysWorkflowNode(sysWorkflowNode);
-        for (int i = 0; i < ConfigValue.length; i++) {
         SysWorkflowConfig sysWorkflowConfig = new SysWorkflowConfig();
         sysWorkflowConfig.setNodeId(sysWorkflowNode.getId());
         sysWorkflowConfig.setConfigType(sysWorkflowNode.getNodeSignType());
-            sysWorkflowConfig.setConfigValue(Integer.valueOf(ConfigValue[i]));
+        sysWorkflowConfig.setConfigValue(sysWorkflowNode.getConfigValues());
         //新增审核详情表信息
         sysWorkflowConfigMapper.addSysWorkflowConfig(sysWorkflowConfig);
-        }
         return count;
     }
 
@@ -85,39 +83,65 @@ public class SysWorkflowNodeServiceImpl implements SysWorkflowNodeService {
     @Transactional
     public int updateSysWorkflowNode(SysWorkflowNode sysWorkflowNode) {
         int count = sysWorkflowNodeMapper.updateSysWorkflowNode(sysWorkflowNode);
-        String[] ConfigValue =  sysWorkflowNode.getConfigValues().split(",");
         if (sysWorkflowNode.getConfigValues().isEmpty()){
             throw new ServiceException("请选择审核人员");
         }
         SysWorkflowConfig sysWorkflowConfig = new SysWorkflowConfig();
         sysWorkflowConfig.setNodeId(sysWorkflowNode.getId());
         sysWorkflowConfigMapper.deleteSysWorkflowConfig(sysWorkflowConfig);
-        for (int i = 0; i < ConfigValue.length; i++) {
         sysWorkflowConfig.setNodeId(sysWorkflowNode.getId());
         sysWorkflowConfig.setConfigType(sysWorkflowNode.getNodeSignType());
-            sysWorkflowConfig.setConfigValue(Integer.valueOf(ConfigValue[i]));
+        sysWorkflowConfig.setConfigValue(sysWorkflowNode.getConfigValues());
         //新增审核详情表信息
         sysWorkflowConfigMapper.addSysWorkflowConfig(sysWorkflowConfig);
-        }
         return count;
     }
 
     @Override
     public List<SysWorkflowNode> listByTaskId(SysWorkflowNode sysWorkflowNode) {
+        Long userId = SecurityUtils.getUserId();
         List<SysWorkflowNode> sysWorkflowNodeList = sysWorkflowNodeMapper.listByTaskId(sysWorkflowNode);
         for (SysWorkflowNode SysWorkflowNode: sysWorkflowNodeList) {
             SysWorkflowRecordHistory sysWorkflowRecordHistory = new SysWorkflowRecordHistory();
             sysWorkflowRecordHistory.setRecordId(SysWorkflowNode.getRecordId());
             sysWorkflowRecordHistory.setNodeId(SysWorkflowNode.getNodeId());
-            System.out.println(sysWorkflowRecordHistory);
+            List<SysWorkflowRecordHistory> sysWorkflowRecordHistoryList = sysWorkflowRecordHistoryMapper.seleteSysWorkflowRecordHistory(sysWorkflowRecordHistory);
-            SysWorkflowRecordHistory sysWorkflowRecordHistoryNew = sysWorkflowRecordHistoryMapper.seleteSysWorkflowRecordHistory(sysWorkflowRecordHistory);
+            if (StringUtils.isNotNull(sysWorkflowRecordHistoryList)){
-            if (StringUtils.isNotNull(sysWorkflowRecordHistoryNew)){
+                //判断是或签还是会签0:或签  1:会签
+                if (0==SysWorkflowNode.getNodeSignType()){
+                    SysWorkflowNode.setIsAccept(sysWorkflowRecordHistoryList.get(0).getIsAccept());
+                    SysWorkflowNode.setCreateTime(sysWorkflowRecordHistoryList.get(0).getCreateTime());
+                    SysWorkflowNode.setRemark(sysWorkflowRecordHistoryList.get(0).getRemark());
+                    }else {
+                    String[] ConfigValue =SysWorkflowNode.getConfigValues().split(",");
+                    // 过滤数组元素
+                    for (SysWorkflowRecordHistory sysWorkflowRecordHistoryNew : sysWorkflowRecordHistoryList) {
+                        /*List<String> filteredList = Arrays.stream(ConfigValue)
+                                .filter(value -> value.equals(sysWorkflowRecordHistoryNew.getCreateBy()))
+                                .collect(Collectors.toList());
+                        //判断是不是所有人都审核完成
+                        if(filteredList.size()==0){
+
+                        }*/
+                        //查看当前人是否审核
+                        if(userId.toString().equals(sysWorkflowRecordHistoryNew.getCreateBy())){
+                            SysWorkflowNode.setIsAccept(sysWorkflowRecordHistoryNew.getIsAccept());
+                            SysWorkflowNode.setCreateTime(sysWorkflowRecordHistoryNew.getCreateTime());
+                            SysWorkflowNode.setRemark(sysWorkflowRecordHistoryNew.getRemark());
+                        }
+                        //查看别人审核是否有驳回的
+                        if (sysWorkflowRecordHistoryNew.getIsAccept().equals(2)){
                             SysWorkflowNode.setIsAccept(sysWorkflowRecordHistoryNew.getIsAccept());
                             SysWorkflowNode.setCreateTime(sysWorkflowRecordHistoryNew.getCreateTime());
                             SysWorkflowNode.setRemark(sysWorkflowRecordHistoryNew.getRemark());
                         }
                     }
 
+                    }
+                }
+            }
+
+
         return sysWorkflowNodeList;
     }
 }

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

@@ -17,12 +17,14 @@ import com.bonus.material.work.mapper.SysWorkflowRecordMapper;
 import com.bonus.material.work.mapper.SysWorkflowTypeMapper;
 import com.bonus.material.work.service.SysWorkflowRecordHistoryService;
 import com.bonus.material.work.service.SysWorkflowRecordService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
 
+@Slf4j
 @Service
 public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHistoryService {
 
@@ -50,6 +52,9 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis
     @Override
     @Transactional
     public int updateSysWorkflowRecordHistory(SysWorkflowRecordHistory sysWorkflowRecordHistory) {
+        //保存审核人信息
+        Long userId = SecurityUtils.getUserId();
+        sysWorkflowRecordHistory.setCreateBy(userId.toString());
         sysWorkflowRecordHistoryMapper.addSysWorkflowRecordHistory(sysWorkflowRecordHistory);
         //根据当前审批状态，修改流程状态
         if (sysWorkflowRecordHistory.getIsAccept()==1){
@@ -80,12 +85,10 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis
                 sysWorkflowRecord.setWorkflowStatus(2);
                 sysWorkflowRecordMapper.updateSysWorkflowRecord(sysWorkflowRecord);
                 System.out.println("-------------节点更新任务信息为完成-------------");
-
                 SysWorkflowAuditDto sysWorkflowRecodeInfo = sysWorkflowRecordMapper.getSysWorkflowRecodeByTaskId(sysWorkflowRecordHistory.getTaskId());
                 if (sysWorkflowRecodeInfo == null) {
                     throw new ServiceException("任务类型为空");
                 }
-
                 // 根据任务类型修改业务状态
                 switch (sysWorkflowRecodeInfo.getTaskType()) {
                     // 领料任务:2

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

@@ -38,6 +38,8 @@
         <result property="leaseSignUrl" column="lease_sign_url"/>
         <result property="leaseSignType" column="lease_sign_type"/>
         <result property="applyCode" column="apply_code"/>
+        <result property="nodeId" column="next_node_id"/>
+        <result property="recordId" column="record_id"/>
     </resultMap>
 
     <resultMap type="com.bonus.material.lease.domain.LeaseApplyDetails" id="LeaseApplyDetailsResult">
@@ -503,14 +505,15 @@
         lai.dept_audit_remark, lai.direct_audit_by, lai.direct_audit_time, lai.direct_audit_remark,
         lai.create_by, lai.create_time, lai.update_by, lai.update_time, lai.remark, lai.company_id,
         lai.direct_id, lai.lease_type, lai.estimate_lease_time, lai.cost_bearing_party, lai.lease_sign_url,
-        lai.lease_sign_type,tt.task_id as taskId,
+        lai.lease_sign_type,tt.task_id as taskId,swn.node_sign_type as leaseSignType,
-        bai.unit_id,bai.project_id,bu.unit_name, bp.pro_name,bai.agreement_id, bai.agreement_code, swr.workflow_status as taskStatus,
+        lai.unit_id,lai.project_id,bu.unit_name, bp.pro_name, swr.workflow_status as taskStatus,bai.agreement_code,
-
+        swrs.next_node_id,swrs.record_id,
         case tt.task_status
         when 0 then '待审核'
-        when 1 then '执行中'
+        when 1 then '待审核'
-        when 2 then '执行完成'
+        when 2 then '审核中'
-        when 3 then '执行中断'
+        when 3 then '已完成'
+        when 4 then '已完成'
         end as taskStatusName,
         IFNULL(sum(lad.pre_num),0) as preCountNum,
         IFNULL(sum(lad.al_num),0) as alNum,
@@ -523,8 +526,8 @@
         left join lease_apply_details lad on lai.id = lad.parent_id
         left join tm_task_agreement tta on lai.task_id = tta.task_id
         left join bm_agreement_info bai on tta.agreement_id = bai.agreement_id
-        left join bm_unit bu on bu.unit_id = bai.unit_id
+        left join bm_unit bu on bu.unit_id = lai.unit_id
-        left join bm_project bp on bp.pro_id = bai.project_id
+        left join bm_project bp on bp.pro_id = lai.project_id
         left join sys_dept sd on sd.dept_id = bp.imp_unit
         left join sys_dict_data sda on tt.task_status = sda.dict_value
         and sda.dict_type = 'lease_task_status'
@@ -534,8 +537,9 @@
         left join sys_workflow_type swt on swr.workflow_id = swt.id
         left join sys_workflow_node swn on swt.id = swn.type_id
         left join sys_workflow_config swc on swn.id = swc.node_id
+        left join sys_workflow_record_history  swrs on swr.id = swrs.record_id
         where 1=1
-        <if test="userId != null  and userId != ''">and swc.config_value = #{userId}</if>
+        <if test="userId != null  and userId != ''">and swc.config_value  LIKE CONCAT('%', #{userId}, '%')</if>
         <if test="code != null  and code != ''">and lai.code = #{code}</if>
         <if test="taskId != null ">and lai.task_id = #{taskId}</if>
         <if test="leasePerson != null  and leasePerson != ''">and lai.lease_person = #{leasePerson}</if>
@@ -583,7 +587,6 @@
         <if test="costBearingParty != null  and costBearingParty != ''">and lai.cost_bearing_party =
             #{costBearingParty}
         </if>
-        and lai.apply_code is not null
         <if test="isApp != null and taskStatus==1">and (tt.task_status = 0 or tt.task_status = 1 or tt.task_status = 2) </if>
         <if test="isApp != null and taskStatus==3">and (tt.task_status = 3 or tt.task_status = 4)</if>
         GROUP BY lai.id

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

@@ -24,4 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <delete id="deleteSysWorkflowConfig">
         delete  from  sys_workflow_config where node_id=#{nodeId}
     </delete>
+    <select id="selectConfigValueByNodeId" resultType="java.lang.String">
+        select config_value from sys_workflow_config where node_id = #{nodeId}
+    </select>
 </mapper>

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

@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="listByTaskId" resultType="com.bonus.material.work.domain.SysWorkflowNode">
         select swn.id as id, swn.type_id typeId, swn.node_name as nodeName, swn.node_sort as nodeSort,
         swn.node_sign_type as nodeSignType, swn.node_sign_config as nodeSignConfig,swn.id as nodeId,
-        swrh.create_by as createBy,swn.is_enable as isEnable,
+        swrh.create_by as createBy,swn.is_enable as isEnable,sec.config_value as configValues,
         GROUP_CONCAT(DISTINCT sec.config_value SEPARATOR ',') AS configValues,
         swr.id as recordId
         from sys_workflow_node swn

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

@@ -29,20 +29,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </update>
 
-    <select id="getSysWorkflowRecodeByTaskId" resultType="com.bonus.material.work.domain.dto.SysWorkflowAuditDto">
+
+     <select id="getSysWorkflowRecodeByTaskId" parameterType="Integer" resultType="com.bonus.material.work.domain.dto.SysWorkflowAuditDto">
          select
-            a.id,
+             a.id as id,
-            a.task_id,
+             a.task_id as taskId,
-            a.task_type,
+             a.task_type as taskType,
-            a.task_code,
+             a.task_code as taskCode,
-            a.workflow_id,
+             a.workflow_id as workflowId,
-            a.workflow_status
+             a.workflow_status as workflowStatus
          from sys_workflow_record a
          <where>
              <if test="taskId != null">
-                a.task_id = #{taskId}
+                and a.task_id = #{taskId}
              </if>
          </where>
-        limit 1
      </select>
 </mapper>

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

@@ -27,9 +27,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
     </insert>
     <select id="seleteSysWorkflowRecordHistory" resultType="com.bonus.material.work.domain.SysWorkflowRecordHistory">
-        select swrh.is_accept as isAccept,swrh.create_time as createTime,swrh.remark as remark
+            select swrh.is_accept as isAccept,swrh.create_time as createTime,swrh.remark as remark,swrh.next_node_id as nextNodeId,
+                swrh.create_by as createBy
             from sys_workflow_record_history swrh
             where swrh.record_id=#{recordId} and swrh.node_id= #{nodeId}
-        limit 1
     </select>
 </mapper>