1.WorkFlowNodeInstanceServiceImpl新增资产业务流程的判断

2.新增节点勘察定价,以及资产固定流程节点

domain/src/main/java/com/dayou/common/FixedWorkNode.java

@@ -27,6 +27,9 @@ public class FixedWorkNode {
     public static final List<WorkflowNodeEnum> PERSONAL_FIXED_NODES = Arrays.asList(new WorkflowNodeEnum[]
             {CHECK_ARCHIVING,SPOT_RECONNAISSANCE,DETERMINE_PRICE,QUOTATION_FEEDBACK,COMMIT_FILE,CHECK_ARCHIVING,BUSINESS_ARCHIVING});
 
+    public static final List<WorkflowNodeEnum> ASSET_FIXED_NODES = Arrays.asList(new WorkflowNodeEnum[]
+            {DEPARTMENT_ALLOCATION,SPOT_RECONNAISSANCE_DETERMINE_PRICE,QUOTATION_FEEDBACK,PRODUCT_CHOICE,GENERATE_STATEMENT,CHECK_ARCHIVING, RECHECK_ARCHIVING, BUSINESS_ARCHIVING});
+
     public static  List<WorkflowNodeEnum> getFixedNodesByBusinessType(String businessType){
         if (MainBusinessEnum.MAJOR_BUSINESS.name().equals(businessType)){
             return MAJOR_FIXED_NODES;
@@ -34,6 +37,9 @@ public class FixedWorkNode {
         if (MainBusinessEnum.PERSONAL_BUSINESS.name().equals(businessType)){
             return PERSONAL_FIXED_NODES;
         }
+        if (MainBusinessEnum.ASSET_BUSINESS.name().equals(businessType)){
+            return ASSET_FIXED_NODES;
+        }
         return null;
     }
 

domain/src/main/java/com/dayou/enums/workflow/WorkflowNodeEnum.java

@@ -63,7 +63,8 @@ public enum WorkflowNodeEnum implements CodeMsgEnumInterface<String,String>{
         REVIEW_STATEMENT("审核意见书","REVIEW_STATEMENT"),
         REEXAMINE_STATEMENT("复审意见书","REEXAMINE_STATEMENT"),
         COMMIT_FILE("提交归档资料","COMMIT_FILE"),
-        PRODUCT_CHOICE("产品选择","PRODUCT_CHOICE")
+        PRODUCT_CHOICE("产品选择","PRODUCT_CHOICE"),
+        SPOT_RECONNAISSANCE_DETERMINE_PRICE("勘察定价","SPOT_RECONNAISSANCE_DETERMINE_PRICE")
         ;
 
 

service/src/main/java/com/dayou/service/workflow/WorkFlowNodeInstanceServiceImpl.java

@@ -27,6 +27,7 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import static com.dayou.enums.MainBusinessEnum.ASSET_BUSINESS;
 import static com.dayou.enums.MainBusinessEnum.MAJOR_BUSINESS;
 import static com.dayou.enums.workflow.CallbackEnum.CHECK_PRODUCTION_TYPE;
 import static com.dayou.enums.workflow.WorkflowNodeEnum.*;
@@ -136,7 +137,12 @@ public class WorkFlowNodeInstanceServiceImpl extends ServiceImpl<WorkFlowNodeIns
                     if (next ==null) return nodesSorted;
                     nodesSorted.add(next);
                     fistNode = next;
-                    if (CollectionUtil.isEmpty(production) && next.getNodeCode().equals(QUOTATION_FEEDBACK.name())) return nodesSorted;
+                    // 判断是资产业务需要多获取一个节点:产品选择节点 (资产的产品选择在客户反馈节点之后,略有不同)
+                    if (instance.getMainBusiness().equals(ASSET_BUSINESS.name())){
+                        if (CollectionUtil.isEmpty(production) && next.getNodeCode().equals(PRODUCT_CHOICE.name())) return nodesSorted;
+                    }else {
+                        if (CollectionUtil.isEmpty(production) && next.getNodeCode().equals(QUOTATION_FEEDBACK.name())) return nodesSorted;
+                    }
                 }
 
             }

sql/update_sql.sql

@@ -237,9 +237,18 @@ ALTER TABLE production_out_warehouse MODIFY COLUMN production_fund_id bigint(20)
  */
 ALTER TABLE assets_evaluation_target MODIFY COLUMN file_path json NOT NULL comment '资料路由信息(json)';
 
+/**
+  日期：2024-04-10
+ */
 ALTER TABLE personal_production DROP COLUMN if_save_file;
 ALTER TABLE personal_production DROP COLUMN save_file_check;
 ALTER TABLE personal_production DROP COLUMN save_file_date;
 alter table personal add COLUMN if_save_file bit(1) NOT NULL DEFAULT 0 comment '是否归档';
 alter table personal add COLUMN save_file_check bit(1) DEFAULT NULL comment '归档审核';
-alter table personal add COLUMN save_file_date datetime(0) DEFAULT NULL comment '归档日期';
+alter table personal add COLUMN save_file_date datetime(0) DEFAULT NULL comment '归档日期';
+
+/**
+  日期：2024-04-10
+  修改人:苟耕铨
+ */
+ALTER TABLE assets_production MODIFY COLUMN create_production_date date NULL comment '产品出具日期';