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

laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java

@@ -132,7 +132,7 @@ public class ProcessNodeService extends ServiceImpl<ProcessNodeMapper, ProcessNo
         }
         // 启用封存废止流程特殊后处理
         if (processDefinitionId.contains(ProcessType.ES_ENABLE.getProcessKey()) ||
-                processDefinitionId.contains(ProcessType.ES_ARCHIVE.getProcessKey())||
+                processDefinitionId.contains(ProcessType.ES_ARCHIVE.getProcessKey()) ||
                 processDefinitionId.contains(ProcessType.ES_ABOLISH.getProcessKey())) {
             specialProcessEsMiniProcessEnd(processNodeList);
         }
@@ -140,9 +140,24 @@ public class ProcessNodeService extends ServiceImpl<ProcessNodeMapper, ProcessNo
         if (processDefinitionId.contains(ProcessType.ES_INIT_CHANGE.getProcessKey())) {
             specialProcessEsInitChange(processNodeList, processInstanceId);
         }
+        // 复审流程特殊后处理
+        if (processDefinitionId.contains(ProcessType.ES_RECHECK.getProcessKey())) {
+            specialProcessEsRecheck(processNodeList, processInstanceId);
+        }
         return processNodeList;
     }
 
+    private void specialProcessEsRecheck(List<ProcessNode> processNodeList, String processInstanceId) {
+        // 如果有标准化发起节点，但是没有人员，则删除标准化发起节点
+        ProcessNode firstNode = processNodeList.get(0);
+        ProcessNode secondNode = processNodeList.get(1);
+        if (StrUtil.isNotBlank(secondNode.getLinkUserIds())) {
+            if (StrUtil.isBlank(firstNode.getLinkUserIds())) {
+                processNodeList.remove(0);
+            }
+        }
+    }
+
     private void specialProcessEsInitChange(List<ProcessNode> processNodeList, String processInstanceId) {
         LambdaQueryWrapper<ProcessEsInitChange> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ProcessEsInitChange::getProcessInstanceId, processInstanceId);
@@ -193,6 +208,7 @@ public class ProcessNodeService extends ServiceImpl<ProcessNodeMapper, ProcessNo
 
     /**
      * 前处理
+     *
      * @param processNodeList
      */
     private void specialProcessEsRevisionPre(List<ProcessNode> processNodeList) {
@@ -217,6 +233,7 @@ public class ProcessNodeService extends ServiceImpl<ProcessNodeMapper, ProcessNo
 
     /**
      * 后处理
+     *
      * @param processNodeList
      */
     private void specialProcessEsRevisionEnd(List<ProcessNode> processNodeList) {

laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsProjectLibrary.java

@@ -65,6 +65,12 @@ public class LawsProjectLibrary implements Serializable {
     @ApiModelProperty(value = "项目健康度(1-预警、2-风险、3-正常)")
     private String projectHealth;
 
+	/**项目级别*/
+    @Dict(dicCode = "project_level")
+    @Excel(name = "项目级别", width = 15, dicCode = "project_level")
+    @ApiModelProperty(value = "项目级别")
+    private String projectLevel;
+
     /**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;

laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java

@@ -356,7 +356,12 @@ public class FileSpiltService {
                                     }
                                 }
                                 // 判断名称，如果大于10位，取十位，
-                                String itemName = paragraphString.substring(nowStart.get(i).length()).length() > 10 ? paragraphString.substring(nowStart.get(i).length(), nowStart.get(i).length() + 10) : paragraphString.substring(nowStart.get(i).length());
+                                String itemName;
+                                if (paragraphString.indexOf(nowStart.get(i)) == 0){
+                                    itemName = paragraphString.substring(nowStart.get(i).length()).trim().length() > 10 ? paragraphString.substring(nowStart.get(i).length()).trim().substring(0,10) :paragraphString.substring(nowStart.get(i).length()).trim();
+                                }else {
+                                    itemName = paragraphString.substring(nowStart.get(i).length()).length() > 10 ? paragraphString.substring(nowStart.get(i).length(), nowStart.get(i).length() + 10) : paragraphString.substring(nowStart.get(i).length());
+                                }
                                 List<String> clauseContent = new ArrayList<>();
                                 clauseContent.add(paragraphString);
                                 SarFileSplitItemsEO message = getSarFileSplitItemsEO(sarFileSplitInfoEO.getId(), nowStart.get(i), itemName, clauseContent);

laws-modules/src/main/java/com/jero/modules/split/util/ReadWordTable.java

@@ -144,10 +144,7 @@ public class ReadWordTable {
         if (tcPr.getVMerge() == null) {
             return false;
         }
-        if (tcPr.getVMerge().getVal() == null){
-            return false;
-        }
-        if (tcPr.getVMerge().getVal().toString().equalsIgnoreCase("continue")) {
+        if (tcPr.getVMerge().getVal() == null) {
             return true;
         }
         return false;