Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-Material

bonus-common-biz/src/main/java/com/bonus/common/biz/enums/TmTaskTypeEnum.java

@@ -29,7 +29,9 @@ public enum TmTaskTypeEnum {
     //安全工器具领料任务
     TM_TASK_SAFE_LEASE(17, "安全工器具领料任务"),
     // 宏源领料领料任务
-    TM_TASK_HY_LEASE(18, "宏源领料任务");
+    TM_TASK_HY_LEASE(18, "宏源领料任务"),
+    // 领用任务
+    TM_TASK_LEASE_APPLY(19, "领用任务");
 
 
 

bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java

@@ -49,6 +49,9 @@ public class LeaseApplyDetails extends BaseEntity {
     @ApiModelProperty(value = "规格型号id")
     private Long typeId;
 
+    @ApiModelProperty(value = "三级id")
+    private Long thirdTypeId;
+
     @ApiModelProperty(value = "规格型号id")
     private Long taskId;
 

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

@@ -120,9 +120,9 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService {
                 } else {
                     taskStatus = LeaseTaskStatusEnum.LEASE_TASK_SUBMIT.getStatus();
                 }
-            int thisMonthMaxOrder = tmTaskMapper.getMonthMaxOrderByDate(DateUtils.getCurrentYear(), DateUtils.getCurrentMonth(), TmTaskTypeEnum.TM_TASK_LEASE.getTaskTypeId());
+            int thisMonthMaxOrder = tmTaskMapper.getMonthMaxOrderByDate(DateUtils.getCurrentYear(), DateUtils.getCurrentMonth(), TmTaskTypeEnum.TM_TASK_LEASE_APPLY.getTaskTypeId());
             String taskCode = leaseApplyRequestVo.getLeaseApplyInfo().getCode();
-            TmTask tmTask = new TmTask(null, TmTaskTypeEnum.TM_TASK_LEASE.getTaskTypeId(),
+            TmTask tmTask = new TmTask(null, TmTaskTypeEnum.TM_TASK_LEASE_APPLY.getTaskTypeId(),
                     taskStatus,
                     leaseApplyRequestVo.getLeaseApplyInfo().getCompanyId(),thisMonthMaxOrder + 1, taskCode);
             tmTask.setCreateTime(DateUtils.getNowDate());
@@ -278,7 +278,7 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService {
                 leaseDeptInfo = mapper.getDeptIdByParentId(parentIdTemp);
             }
             if(!deptName.equals("")){
-                int thisMonthMaxOrder = tmTaskMapper.getMonthMaxOrderByDate(DateUtils.getCurrentYear(), DateUtils.getCurrentMonth(), TmTaskTypeEnum.TM_TASK_LEASE.getTaskTypeId());
+                int thisMonthMaxOrder = tmTaskMapper.getMonthMaxOrderByDate(DateUtils.getCurrentYear(), DateUtils.getCurrentMonth(), TmTaskTypeEnum.TM_TASK_LEASE_APPLY.getTaskTypeId());
                  taskCode = genderTaskCodeTwo(thisMonthMaxOrder,leaseDeptInfo.getCompanySX());
                  leaseDeptInfo.setTaskCode(taskCode);
             }

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java

@@ -137,8 +137,8 @@ public class TypeController extends BaseController {
     @ApiOperation(value = "根据物资类型ID-查询子级下拉列表")
     @RequiresPermissions("ma:type:list")
     @GetMapping("/selectMaTypeListByTypeId")
-    public AjaxResult selectMaTypeListByTypeId(@NotNull(message = "物资类型ID不能为空") Long typeId) {
+    public AjaxResult selectMaTypeListByTypeId(Type type) {
-        List<MaTypeSelectVo> list = typeService.getMaTypeSelectVoListByParentId(typeId);
+        List<MaTypeSelectVo> list = typeService.getMaTypeSelectVoListByParentId(type.getTypeId());
         return success(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 sysWorkflowConfig = new SysWorkflowConfig();
+        sysWorkflowConfig.setNodeId(sysWorkflowNode.getId());
-            sysWorkflowConfig.setNodeId(sysWorkflowNode.getId());
+        sysWorkflowConfig.setConfigType(sysWorkflowNode.getNodeSignType());
-            sysWorkflowConfig.setConfigType(sysWorkflowNode.getNodeSignType());
+        sysWorkflowConfig.setConfigValue(sysWorkflowNode.getConfigValues());
-            sysWorkflowConfig.setConfigValue(Integer.valueOf(ConfigValue[i]));
+        //新增审核详情表信息
-            //新增审核详情表信息
+        sysWorkflowConfigMapper.addSysWorkflowConfig(sysWorkflowConfig);
-            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.setNodeId(sysWorkflowNode.getId());
+        sysWorkflowConfig.setConfigType(sysWorkflowNode.getNodeSignType());
-            sysWorkflowConfig.setConfigType(sysWorkflowNode.getNodeSignType());
+        sysWorkflowConfig.setConfigValue(sysWorkflowNode.getConfigValues());
-            sysWorkflowConfig.setConfigValue(Integer.valueOf(ConfigValue[i]));
+        //新增审核详情表信息
-            //新增审核详情表信息
+        sysWorkflowConfigMapper.addSysWorkflowConfig(sysWorkflowConfig);
-            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:会签
-                SysWorkflowNode.setIsAccept(sysWorkflowRecordHistoryNew.getIsAccept());
+                if (0==SysWorkflowNode.getNodeSignType()){
-                SysWorkflowNode.setCreateTime(sysWorkflowRecordHistoryNew.getCreateTime());
+                    SysWorkflowNode.setIsAccept(sysWorkflowRecordHistoryList.get(0).getIsAccept());
-                SysWorkflowNode.setRemark(sysWorkflowRecordHistoryNew.getRemark());
+                    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/LeaseApplyInfoMapper.xml

@@ -101,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="leaseType != null  and leaseType != ''"> and lai.lease_type = #{leaseType}</if>
             <if test="estimateLeaseTime != null "> and lai.estimate_lease_time = #{estimateLeaseTime}</if>
             <if test="costBearingParty != null  and costBearingParty != ''"> and lai.cost_bearing_party = #{costBearingParty}</if>
-            and tt.task_status != '0'
+            and tt.task_type = '2'
         </where>
         GROUP BY lai.id
         ORDER BY tt.task_status,tt.create_time desc

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

@@ -329,7 +329,7 @@
         and sda.dict_type = 'lease_task_status'
         left join ma_type mt on lad.type_id = mt.type_id and mt.del_flag = '0'
         left join ma_type mt1 on mt.parent_id = mt1.type_id and mt1.del_flag = '0'
-            where 1=1
+            where tt.task_type = '19'
             <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>
@@ -642,6 +642,7 @@
             lad.parent_id AS parentId,
             mt.type_id AS typeId,
             mt.type_name AS typeName,
+            mt2.type_id AS thirdTypeId,
             mt2.type_name AS maTypeName,
             CASE
                 mt.manage_type
@@ -721,8 +722,8 @@
         and sda.dict_type = 'lease_task_status'
         left join ma_type mt on lad.type_id = mt.type_id and mt.del_flag = '0'
         left join ma_type mt1 on mt.parent_id = mt1.type_id and mt1.del_flag = '0'
-        where
+        where tt.task_type = '19'
-        tt.task_status = '1'
+        and tt.task_status = '1'
         <if test="taskId != null ">and lai.task_id = #{taskId}</if>
         <if test="statusList != null  and statusList.size() > 0">
             and tt.task_status in

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
+     <select id="getSysWorkflowRecodeByTaskId" parameterType="Integer" resultType="com.bonus.material.work.domain.dto.SysWorkflowAuditDto">
-            a.id,
+         select
-            a.task_id,
+             a.id as id,
-            a.task_type,
+             a.task_id as taskId,
-            a.task_code,
+             a.task_type as taskType,
-            a.workflow_id,
+             a.task_code as taskCode,
-            a.workflow_status
+             a.workflow_id as workflowId,
-        from sys_workflow_record a
+             a.workflow_status as workflowStatus
-        <where>
+         from sys_workflow_record a
-            <if test="taskId != null">
+         <where>
-                a.task_id = #{taskId}
+             <if test="taskId != null">
-            </if>
+                and a.task_id = #{taskId}
-        </where>
+             </if>
-        limit 1
+         </where>
-    </select>
+     </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,
-        from sys_workflow_record_history swrh
+                swrh.create_by as createBy
-        where swrh.record_id=#{recordId} and swrh.node_id= #{nodeId}
+            from sys_workflow_record_history swrh
-        limit 1
+            where swrh.record_id=#{recordId} and swrh.node_id= #{nodeId}
     </select>
 </mapper>