Merge remote-tracking branch 'origin/master' into master

blade-service/blade-business/src/main/java/org/springblade/business/controller/ContractTreeDrawingsController.java

@@ -62,7 +62,7 @@ public class ContractTreeDrawingsController extends BladeController {
             @ApiImplicitParam(name = "fileUrl", value = "文件url", required = true),
             @ApiImplicitParam(name = "id", value = "节点的drawingsId")
     })
-    public R<String> saveOrUpdateContractTreeDrawings(@RequestParam String primaryKeyId, @RequestParam String fileUrl, @RequestParam String id) {
+    public R<String> saveOrUpdateContractTreeDrawings(@RequestParam String primaryKeyId, @RequestParam String fileUrl,String id) {
         //当前提交用户
         BladeUser user = AuthUtil.getUser();
         if (!"-1".equals(id) && StringUtils.isNotEmpty(id)) {

blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -1408,10 +1408,15 @@ public class TaskController extends BladeController {
         StringBuilder sqlString = new StringBuilder("SELECT * FROM u_task WHERE 1=1 AND status = 1 AND approval_type != 4 AND contract_id = " + dto.getContractId()); //approval_type != 4 非档案的任务就是1填报资料，2工程文件，3日志资料
 
         if (StringUtils.isNotBlank(dto.getStartTimeValue()) && StringUtils.isNotBlank(dto.getEndTimeValue())) {
-            sqlString.append(" AND start_time >= ?")
-                    .append(" AND end_time <= ?");
-            params.add(dto.getStartTimeValue());
-            params.add(dto.getEndTimeValue());
+            if (dto.getStartTimeValue().equals(dto.getEndTimeValue())) {
+                sqlString.append(" AND start_time = ?");
+                params.add(dto.getStartTimeValue());
+            } else {
+                sqlString.append(" AND start_time >= ?")
+                        .append(" AND end_time <= ?");
+                params.add(dto.getStartTimeValue());
+                params.add(dto.getEndTimeValue());
+            }
         }
 
         if (StringUtils.isNotBlank(dto.getQueryValue())) {
@@ -1548,15 +1553,18 @@ public class TaskController extends BladeController {
                             for (Task task : taskList) {
                                 List<TaskParallel> taskParallelList = finalTaskParallelGroupMap.get(task.getProcessInstanceId());
                                 for (TaskParallel taskParallel : taskParallelList) {
-                                    TaskApprovalVO approvalVO = new TaskApprovalVO();
-                                    approvalVO.setTaskId(task.getId().toString());
-                                    approvalVO.setFlag("OK");
-                                    approvalVO.setComment("重新发起电签");
-                                    approvalVO.setApprovalType(1);
-                                    approvalVO.setFormDataId(task.getFormDataId());
-                                    approvalVO.setParallelProcessInstanceId(taskParallel.getParallelProcessInstanceId());
-                                    approvalVO.setYsNickName(taskParallel.getTaskUserName());
-                                    taskApprovalVOS.add(approvalVO);
+                                    //待审批的不进行重签
+                                    if (!(new Integer(1)).equals(taskParallel.getStatus())) {
+                                        TaskApprovalVO approvalVO = new TaskApprovalVO();
+                                        approvalVO.setTaskId(task.getId().toString());
+                                        approvalVO.setFlag("OK");
+                                        approvalVO.setComment("重新发起电签");
+                                        approvalVO.setApprovalType(1);
+                                        approvalVO.setFormDataId(task.getFormDataId());
+                                        approvalVO.setParallelProcessInstanceId(taskParallel.getParallelProcessInstanceId());
+                                        approvalVO.setYsNickName(taskParallel.getTaskUserName());
+                                        taskApprovalVOS.add(approvalVO);
+                                    }
                                 }
                             }
                             long startTime_2 = System.currentTimeMillis();

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskServiceImpl.java

@@ -1071,6 +1071,11 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
             for (String iId : list) {
                 //获取
                 InformationQuery queryinfo = informationQueryService.getById(iId);
+                if (StringUtils.isNotBlank(queryinfo.getFileUserIdAndName())){
+                    String userIdAndName = queryinfo.getFileUserIdAndName();
+                    String[] split = userIdAndName.split("-");
+                    userId = Long.parseLong(split[0]);
+                }
 
                 List<AppWbsTreeContractVO> WbsTreeContract = wbsTreeContractClient.searchNodeAllTableInfo(queryinfo.getWbsId() + "", queryinfo.getClassify() + "", queryinfo.getContractId() + "", queryinfo.getProjectId() + "", userId);
                 List<String> collect = new ArrayList<>();

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -1342,7 +1342,9 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 for (Element element : bhtitle) {
                     int trindex = Integer.parseInt(element.attr("trindex"));
                     if (trindex <= 10) {
-                        reData.put(element.attr("keyName"), node.getPartitionCode() == null ? "" : node.getPartitionCode());
+                        if (StringUtils.isNotBlank(node.getPartitionCode())) {
+                            reData.put(element.attr("keyName"), node.getPartitionCode());
+                        }
                     }
                 }
             }
@@ -1511,8 +1513,6 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         Map<String, Object> DataInfo = (Map<String, Object>) getBussDataInfo(pkeyId, 0).getData();
         //真实填报率
         Integer realFillRate = 0;
-        //获取已经填报的数据
-        Long fillNumbers = DataInfo.keySet().stream().filter(e -> e.contains("__")).count();
 
         //获取excel流 和 html流
         InputStream exceInp = CommonUtil.getOSSInputStream(excelTab.getFileUrl());
@@ -1589,20 +1589,30 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         //数据不为空
         if (StringUtils.isNotEmpty(wbsTreeContract.getHtmlUrl())) {
             InputStream inputStreamByUrl = FileUtils.getInputStreamByUrl(wbsTreeContract.getHtmlUrl());
-//            InputStream inputStreamByUrl = FileUtils.getInputStreamByUrl("C:\\Users\\泓创研发01\\Desktop\\privateUrl\\1578963584895942656.html");
+//            InputStream inputStreamByUrl = FileUtils.getInputStreamByUrl("C:\\Users\\泓创研发01\\Desktop\\privateUrl\\1693464012966068224.html");
             String htmlString = IoUtil.readToString(inputStreamByUrl);
 
             Document doc = Jsoup.parse(htmlString);
             Element table = doc.select("table").first();
             //计算填报率
-            Long keySize = table.getElementsByAttribute("v-model").stream().count();
+            List<String> keyList = table.getElementsByAttribute("v-model").stream()
+                    .map(l -> {
+                        String attr = l.attr("v-model");
+                        System.out.println(attr);
+                        String[] split = attr.split("\\.");
+                        return split[1];
+                    })
+                    .collect(Collectors.toList());
             Long sigSize = table.getElementsByAttribute(":readonly").stream().count();
-            if (fillNumbers != 0 && keySize != 0){
+            int keySize = keyList.size();
+            List<String> fills = DataInfo.keySet().stream().filter(e -> e.contains("__") && e.contains("key")).collect(Collectors.toList());
+            if (fills.size() != 0 && keyList != null && keyList.size() != 0){
                 if (keySize == sigSize){
                     realFillRate = 100;
-                }else {
-                    keySize = keySize - sigSize;
-                    Double v = fillNumbers.doubleValue() / keySize.doubleValue() * 100;
+                }else if (keySize > sigSize) {
+                    keySize = keySize - sigSize.intValue();
+                    keyList.retainAll(fills);
+                    Double v = new Double(keyList.size()) / new Double(keySize) * 100;
                     realFillRate = v.intValue();
                 }
             }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/SignPfxFileServiceImpl.java

@@ -120,7 +120,12 @@ public class SignPfxFileServiceImpl extends BaseServiceImpl<SignPfxFileMapper, S
                 makeSeal.setSealName(EVisaConstant.SIGN_SEAL_NAME + user.getAccount());
                 makeSeal.setSealPassword(user.getId().toString().substring(0, EVisaConstant.USER_ID_SUB));
                 //注册印模
-                return R.data(this.pfxMakeSeal(makeSeal, "个人签名印章", id.toString()));
+                Boolean seal = this.pfxMakeSeal(makeSeal, "个人签名印章", id.toString());
+                if (seal == true){
+                    return R.data(true);
+                }else {
+                    return R.data(-1, false, "创建印模失败");
+                }
             }
 
         } else {
@@ -154,7 +159,7 @@ public class SignPfxFileServiceImpl extends BaseServiceImpl<SignPfxFileMapper, S
             }
         }
 
-        return R.data(false);
+        return R.data(-1, false, "注册失败");
     }
 
     /**