电签提交

blade-common/src/main/java/org/springblade/common/utils/AsyncConfigurer.java

@@ -15,7 +15,7 @@ public class AsyncConfigurer {
     /**
      * cpu 核心数量
      */
-    public static final int cpuNum = 1 ;//Runtime.getRuntime().availableProcessors();
+    public static final int cpuNum = 3 ;//Runtime.getRuntime().availableProcessors();
 
     /**
      * 线程池配置

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/TaskSignInfoVO.java

@@ -17,7 +17,7 @@ public class TaskSignInfoVO {
     @ApiModelProperty("待审批列表中对应的taskId字段值")
     private String taskId;
 
-    /**
+    /**R
      * parallelProcessInstanceId字段值
      */
     @ApiModelProperty("待审批列表中对应的parallelProcessInstanceId字段值")
@@ -26,7 +26,7 @@ public class TaskSignInfoVO {
     @ApiModelProperty("数据源")
     private String formDataId;
 
-    // 1=填报数据（质量填报，试验上报） 2=工程文件 3=日志资料 4=档案数据   5=计量支付证书  6=计量 材料预付款  7= 计量 中间支付  8委托单
+    // 1=填报数据（质量填报，试验上报） 2=工程文件(档案) 3=日志资料  4=档案数据   5=计量支付证书  6=计量 材料预付款  7= 计量 中间支付  8委托单
     @ApiModelProperty("上报类型")
     private Integer approvalType;
 

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/controller/EVController.java

@@ -84,7 +84,7 @@ public class EVController {
                       String sql12 = "SELECT a.* from u_task a,u_task_parallel b where a.process_instance_id=b.process_instance_id and b.initiative=1 and  a.is_deleted=0 and b.is_deleted=0 and a.`status` in(1,2) and a.id='"+dataInfo.getTaskId()+"'";
                       List<Map<String, Object>> maps12 = jdbcTemplate.queryForList(sql12);
                       if(maps12!=null && maps12.size()>=1){
-                          jdbcTemplate.execute("delete from u_task_batch where id="+dataInfo.getId()+"");
+                          jdbcTemplate.execute("delete from u_task_batch where id in("+dataInfo.getId()+")");
                           aBoolean = true;
                       }
                     }else {

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/service/impl/EVDataServiceImpl.java

@@ -256,9 +256,9 @@ public class EVDataServiceImpl implements EVDataService {
                          * 在资料填报工序-预览全部pdf时再拼接合并显示，当前只做储存（如果当前资料填报工序节点有其他多个试验记录pdf关联信息，那么合并存储，否则直接存储）
                          */
 
-                        String redoe = " select * from  u_trial_self_inspection_record where id=(select b.trial_self_inspection_record_id from u_task b,u_task_parallel c where b.process_instance_id=c.process_instance_id and b.is_deleted=0 and c.is_deleted=0 and b.status in(1,2) and parallel_process_instance_id='" + taskApp.getParallelProcessInstanceId() + "')";
+                        String redoe = " select * from  u_trial_self_inspection_record where id=(select DISTINCT b.trial_self_inspection_record_id from u_task b,u_task_parallel c where b.process_instance_id=c.process_instance_id and b.is_deleted=0 and c.is_deleted=0 and b.status in(1,2) and parallel_process_instance_id in(" + taskApp.getParallelProcessInstanceId() + "))";
                         TrialSelfInspectionRecord record = jdbcTemplate.query(redoe, new BeanPropertyRowMapper<>(TrialSelfInspectionRecord.class)).stream().findAny().orElse(null);
-                        if (("已审批").equals(record.getTaskStatus()) && (new Integer(1)).equals(record.getDetectionResult()) && (new Integer(1)).equals(record.getDetectionCategory())) {
+                        if (record!=null &&("已审批").equals(record.getTaskStatus()) && (new Integer(1)).equals(record.getDetectionResult()) && (new Integer(1)).equals(record.getDetectionCategory())) {
                             if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(record.getProjectPosition())) {
                                 //有pdf的节点
                                 String sqlNodeAll = "select wbs_id from u_information_query where wbs_id in(" + record.getProjectPosition() + ") and contract_id = " + record.getContractId();

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -193,11 +193,11 @@ public class UserController {
         CacheUtil.clear(USER_CACHE);
         // 为第三方系统
         if (ObjectUtil.isNotEmpty(user.getSysId()) && user.getSysId().equals("30")) {
-            user.setUserType("1,2,3");
+            user.setUserType("1,2"); //质检系统 和 app
             user.setPassword("123456");
             user.setPlaintextPassword("123456");
             user.setTenantId("000000");
-            user.setDeptId("1592394131177873410");
+            user.setDeptId("1625032285051297793"); //白马
             user.setStatus(1);
             user.setSysType(2);
             List<SaveUserInfoByProjectDTO> projectAndUserList = new ArrayList<>();