新增教务处sop和研究生sop流程

pom.xml

@@ -86,11 +86,11 @@
                 <artifactId>core-cache</artifactId>
                 <version>${qmth.boot.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.qmth.boot</groupId>
-                <artifactId>core-concurrent</artifactId>
-                <version>${qmth.boot.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>com.qmth.boot</groupId>-->
+<!--                <artifactId>core-concurrent</artifactId>-->
+<!--                <version>${qmth.boot.version}</version>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>com.qmth.boot</groupId>
                 <artifactId>core-fss</artifactId>

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDingApplyServiceImpl.java

@@ -233,6 +233,7 @@ public class TBDingApplyServiceImpl extends ServiceImpl<TBDingApplyMapper, TBDin
      * @return
      * @throws InterruptedException
      */
+    @Override
     public Boolean taskApprove(Long taskId, Long userId, DingExceptionApproveEnum dingExceptionApprove) throws InterruptedException {
         Task task = taskService.createTaskQuery().taskId(String.valueOf(taskId)).singleResult();
         Optional.ofNullable(task).orElseThrow(() -> ExceptionResultEnum.FLOW_TASK_NO_DATA.exception());

sop-business/src/main/java/com/qmth/sop/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -2,8 +2,6 @@ package com.qmth.sop.business.templete.service.impl;
 
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.sop.business.bean.dto.CustomImportDto;
 import com.qmth.sop.business.bean.dto.DeviceImportDto;
 import com.qmth.sop.business.bean.dto.SysMessageExportDto;
@@ -381,18 +379,18 @@ public class TaskLogicServiceImpl implements TaskLogicService {
             int errorSize = Objects.nonNull(customImportDtoLinkedMultiValueMap.get(BasicExcelListener.ERROR)) ? Objects.requireNonNull(customImportDtoLinkedMultiValueMap.get(BasicExcelListener.ERROR)).size() : 0;
 
             if (errorSize == 0) {
-                List<SysDevice> sysDevices=new ArrayList<>();
+                List<SysDevice> sysDevices = new ArrayList<>();
                 SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-                List<SysSupplier> supplierList = sysSupplierService.list(new QueryWrapper<SysSupplier>().lambda().eq(SysSupplier::getType,SupplierTypeEnum.DEVICE));
+                List<SysSupplier> supplierList = sysSupplierService.list(new QueryWrapper<SysSupplier>().lambda().eq(SysSupplier::getType, SupplierTypeEnum.DEVICE));
                 Objects.requireNonNull(customImportDtoLinkedMultiValueMap.get(BasicExcelListener.SUCCESS)).forEach(e -> {
-                    SysDevice device=new SysDevice();
+                    SysDevice device = new SysDevice();
                     device.setDeviceCode(e.getDeviceCode());
                     InOutTypeEnum bound = InOutTypeEnum.IN.getTitle().equals(e.getBound()) ? InOutTypeEnum.IN : InOutTypeEnum.OUT;
                     device.setBound(bound);
                     device.setBrand(e.getBrand());
                     device.setLocation(e.getLocation());
                     device.setEnable(true);
-                   //日期字符串转换时间戳
+                    //日期字符串转换时间戳
                     try {
                         device.setBuyTime(new SimpleDateFormat("yyyy/MM/dd").parse(e.getBuyTime()).getTime());
                     } catch (ParseException ex) {

sop-business/src/main/resources/mapper/TBUserArchivesSupplierMapper.xml

@@ -7,4 +7,5 @@
         left join sys_user u on u.mobile_number=ua.mobile_number
         where us.supplier_id=#{supplierId}
     </select>
+    <select id="findUsersBySupplierId" resultType="com.qmth.sop.business.entity.SysUser"></select>
 </mapper>

sop-server/src/main/java/com/qmth/sop/server/api/TFCustomFlowController.java

@@ -55,7 +55,7 @@ public class TFCustomFlowController {
     @RequestMapping(value = "/createDeployment", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
     public Result createDeployment() throws IOException {
-        return ResultUtil.ok(activitiService.createDeployment(Arrays.asList(TFCustomTypeEnum.OFFICE_SOP_FLOW, TFCustomTypeEnum.DING_EXCEPTION_FLOW, TFCustomTypeEnum.PROJECT_EXCHANGE_FLOW, TFCustomTypeEnum.QUALITY_PROBLEM_FLOW)));
+        return ResultUtil.ok(activitiService.createDeployment(Arrays.asList(TFCustomTypeEnum.OFFICE_SOP_FLOW, TFCustomTypeEnum.CLOUD_MARK_SOP_FLOW, TFCustomTypeEnum.DING_EXCEPTION_FLOW, TFCustomTypeEnum.PROJECT_EXCHANGE_FLOW, TFCustomTypeEnum.QUALITY_PROBLEM_FLOW)));
 //        return ResultUtil.ok(activitiService.createDeployment(Arrays.asList(TFCustomTypeEnum.QUALITY_PROBLEM_FLOW)));
     }
 

sop-server/src/main/java/com/qmth/sop/server/start/StartRunning.java

@@ -36,7 +36,7 @@ public class StartRunning implements CommandLineRunner {
     public void run(String... args) throws Exception {
         log.info("服务器启动时执行 start");
         sysConfigService.selectAll();
-        activitiService.createDeployment(Arrays.asList(TFCustomTypeEnum.OFFICE_SOP_FLOW, TFCustomTypeEnum.DING_EXCEPTION_FLOW, TFCustomTypeEnum.PROJECT_EXCHANGE_FLOW, TFCustomTypeEnum.QUALITY_PROBLEM_FLOW));
+        activitiService.createDeployment(Arrays.asList(TFCustomTypeEnum.OFFICE_SOP_FLOW, TFCustomTypeEnum.CLOUD_MARK_SOP_FLOW, TFCustomTypeEnum.DING_EXCEPTION_FLOW, TFCustomTypeEnum.PROJECT_EXCHANGE_FLOW, TFCustomTypeEnum.QUALITY_PROBLEM_FLOW));
 //        activitiService.createDeployment(Arrays.asList(TFCustomTypeEnum.QUALITY_PROBLEM_FLOW));
         tsAuthService.appInfoInit();
         log.info("服务器启动时执行 end");

sop-server/src/main/resources/cloudMarkSopFlow.bpmn

@@ -31,7 +31,7 @@
       </multiInstanceLoopCharacteristics>
     </userTask>
     <sequenceFlow id="flow22" sourceRef="f_usertask_cloudmark_device_out_5" targetRef="f_usertask_cloudmark_scan_ready_6"></sequenceFlow>
-    <userTask id="f_usertask_cloudmark_check_final_7 " name="校验收尾" activiti:assignee="${assignee7}" activiti:formKey="cloudmark_sop_check_final.form">
+    <userTask id="f_usertask_cloudmark_check_final_7" name="校验收尾" activiti:assignee="${assignee7}" activiti:formKey="cloudmark_sop_check_final.form">
       <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList7}" activiti:elementVariable="assignee7">
         <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject7==1}</completionCondition>
       </multiInstanceLoopCharacteristics>
@@ -60,8 +60,8 @@
     </userTask>
     <sequenceFlow id="flow30" sourceRef="f_usertask_cloudmark_inside_approve_3" targetRef="f_usertask_cloudmark_env_test_4"></sequenceFlow>
     <sequenceFlow id="flow31" sourceRef="f_usertask_cloudmark_env_test_4" targetRef="f_usertask_cloudmark_device_out_5"></sequenceFlow>
-    <sequenceFlow id="flow32" sourceRef="f_usertask_cloudmark_scan_ready_6" targetRef="f_usertask_cloudmark_check_final_7 "></sequenceFlow>
-    <sequenceFlow id="flow33" sourceRef="f_usertask_cloudmark_check_final_7 " targetRef="f_usertask_cloudmark_mark_prep_8"></sequenceFlow>
+    <sequenceFlow id="flow32" sourceRef="f_usertask_cloudmark_scan_ready_6" targetRef="f_usertask_cloudmark_check_final_7"></sequenceFlow>
+    <sequenceFlow id="flow33" sourceRef="f_usertask_cloudmark_check_final_7" targetRef="f_usertask_cloudmark_mark_prep_8"></sequenceFlow>
     <userTask id="f_usertask_cloudmark_mark_check_9" name="成绩复核" activiti:assignee="${assignee9}" activiti:formKey="cloudmark_sop_mark_check.form">
       <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList9}" activiti:elementVariable="assignee9">
         <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject9==1}</completionCondition>
@@ -94,7 +94,7 @@
       <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_scan_ready_6" id="BPMNShape_f_usertask_cloudmark_scan_ready_6">
         <omgdc:Bounds height="55.0" width="85.0" x="456.0" y="140.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_check_final_7 " id="BPMNShape_f_usertask_cloudmark_check_final_7 ">
+      <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_check_final_7" id="BPMNShape_f_usertask_cloudmark_check_final_7">
         <omgdc:Bounds height="55.0" width="85.0" x="285.0" y="140.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_mark_prep_8" id="BPMNShape_f_usertask_cloudmark_mark_prep_8">

sop-server/src/main/resources/officeSopFlow.bpmn

@@ -39,18 +39,18 @@
       </multiInstanceLoopCharacteristics>
     </userTask>
     <sequenceFlow id="flow23" sourceRef="f_usertask_office_scan_ready_5" targetRef="f_usertask_office_scan_6"></sequenceFlow>
-    <userTask id="f_usertask_office_check_final_7 " name="校验收尾" activiti:assignee="${assignee7}" activiti:formKey="office_sop_check_final.form">
+    <userTask id="f_usertask_office_check_final_7" name="校验收尾" activiti:assignee="${assignee7}" activiti:formKey="office_sop_check_final.form">
       <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList7}" activiti:elementVariable="assignee7">
         <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject7==1}</completionCondition>
       </multiInstanceLoopCharacteristics>
     </userTask>
-    <sequenceFlow id="flow24" sourceRef="f_usertask_office_scan_6" targetRef="f_usertask_office_check_final_7 "></sequenceFlow>
+    <sequenceFlow id="flow24" sourceRef="f_usertask_office_scan_6" targetRef="f_usertask_office_check_final_7"></sequenceFlow>
     <userTask id="f_usertask_office_mark_prep_8" name="评卷准备" activiti:assignee="${assignee8}" activiti:formKey="office_sop_mark_prep.form">
       <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList8}" activiti:elementVariable="assignee8">
         <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject8==1}</completionCondition>
       </multiInstanceLoopCharacteristics>
     </userTask>
-    <sequenceFlow id="flow25" sourceRef="f_usertask_office_check_final_7 " targetRef="f_usertask_office_mark_prep_8"></sequenceFlow>
+    <sequenceFlow id="flow25" sourceRef="f_usertask_office_check_final_7" targetRef="f_usertask_office_mark_prep_8"></sequenceFlow>
     <userTask id="f_usertask_office_mark_final_9" name="评卷收尾" activiti:assignee="${assignee9}" activiti:formKey="office_sop_mark_final.form">
       <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="${assigneeList9}" activiti:elementVariable="assignee9">
         <completionCondition>${nrOfCompletedInstances/nrOfInstances==1 || reject9==1}</completionCondition>
@@ -91,7 +91,7 @@
       <bpmndi:BPMNShape bpmnElement="f_usertask_office_scan_6" id="BPMNShape_f_usertask_office_scan_6">
         <omgdc:Bounds height="55.0" width="85.0" x="472.0" y="140.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="f_usertask_office_check_final_7 " id="BPMNShape_f_usertask_office_check_final_7 ">
+      <bpmndi:BPMNShape bpmnElement="f_usertask_office_check_final_7" id="BPMNShape_f_usertask_office_check_final_7">
         <omgdc:Bounds height="55.0" width="85.0" x="290.0" y="140.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="f_usertask_office_mark_prep_8" id="BPMNShape_f_usertask_office_mark_prep_8">