1.资产业务CallBackEnum业务数据校验返回的流程节点修改

2.新增节点REPORT_CHOICE
3.取号新增产品类型的判断
4.资产订单列表SQL修改
5.资产评估对象表修改

biz-base/src/main/java/com/dayou/controller/AssetsEvaluationTargetController.java

@@ -46,7 +46,7 @@ public class AssetsEvaluationTargetController extends BaseController {
      */
     @GetMapping("/getAETargetListByAssetsId")
     public RestResponse<List<AssetsEvaluationTargetVO>> getAETargetListByAssetsId(AETargetListSelectDTO dto) {
-        return RestResponse.data(assetsEvaluationTargetService.getAETargetListByAssetsId(dto.getBusinessId(), dto.getProductionNo()));
+        return RestResponse.data(assetsEvaluationTargetService.getAETargetListByAssetsId(dto.getBusinessId(), dto.getStatementNo(), dto.getReportNo()));
     }
 
     /**

dao/src/main/java/com/dayou/mapper/AssetsEvaluationTargetMapper.java

@@ -22,22 +22,37 @@ public interface AssetsEvaluationTargetMapper extends CustomBaseMapper<AssetsEva
      * @param id 资产订单id
      * @return List<AssetsEvaluationTargetVO>
      */
-    List<AssetsEvaluationTargetVO> getAETargetListByAssetsId(@Param("id") Long id,@Param("productionNo") String productionNo);
+    List<AssetsEvaluationTargetVO> getAETargetListByAssetsId(@Param("id") Long id,@Param("statementNo") String statementNo,@Param("reportNo") String reportNo);
 
     /**
-     * 评估对象添加产品号
+     * 评估对象添加意见书产品号
      * @param id 评估对象id
      * @param productionNo 产品号
      * @return BOolean
      */
-    Boolean updateTargetProductionNo(@Param("id") Long id, @Param("productionNo") String productionNo);
+    Boolean updateTargetStatementNo(@Param("id") Long id, @Param("productionNo") String productionNo);
 
     /**
-     * 根据业务id获取已取号评估对象的产品号
+     * 评估对象添加报告产品号
+     * @param id 评估对象id
+     * @param productionNo 产品号
+     * @return BOolean
+     */
+    Boolean updateTargetReportNo(@Param("id") Long id, @Param("productionNo") String productionNo);
+
+    /**
+     * 根据业务id获取已取号评估对象的意见书产品号
+     * @param businessId 资产业务id
+     * @return List<String>
+     */
+    List<String> getStatementNoList(@Param("businessId") Long businessId);
+
+    /**
+     * 根据业务id获取已取号评估对象的报告产品号
      * @param businessId 资产业务id
      * @return List<String>
      */
-    List<String> getProductionNoList(@Param("businessId") Long businessId);
+    List<String> getReportNoList(@Param("businessId") Long businessId);
 
     /**
      * 评估对象审核定价

dao/src/main/resources/mapper/AssetsEvaluationTargetMapper.xml

@@ -52,38 +52,57 @@
         (SELECT assets_evaluation_target_type.type_name FROM assets_evaluation_target_type WHERE
         assets_evaluation_target_type.id = target.evaluation_type_sec_id) AS secTargetTypaName,
         value_type.type_name AS valueTypeName,
-        target.production_no,
+        target.statement_no,
+        target.report_no,
         production.create_production_date
         FROM assets_evaluation_target AS target
         LEFT JOIN assets_evaluation_target_purpose AS purpose ON purpose.id = target.evaluation_purpose_id
         LEFT JOIN assets_value_type AS value_type ON value_type.id = target.assets_value_id
-        LEFT JOIN assets_production AS production ON production.production_no = target.production_no
+        LEFT JOIN assets_production AS production ON production.production_no = target.statement_no OR production.production_no = target.report_no
         WHERE target.assets_id = #{id}
-        <if test="productionNo != null and productionNo != '' ">
-            AND target.production_no = #{productionNo}
+        <if test="(statementNo != null and statementNo != '') or (reportNo != null and reportNo != '') ">
+            AND production_no = #{statementNo} OR production_no = #{reportNo}
         </if>
-        <if test="productionNo == null or productionNo == '' ">
+        <if test="(statementNo == null or statementNo == '') and (reportNo == null or reportNo == '') ">
             AND create_production_date IS NULL
         </if>
         AND target.deleted = 0
     </select>
 
-    <!--评估对象添加产品号-->
-    <update id="updateTargetProductionNo">
+    <!--评估对象添加意见书产品号-->
+    <update id="updateTargetStatementNo">
         UPDATE assets_evaluation_target
-        SET production_no = #{productionNo}
+        SET statement_no = #{productionNo}
+        WHERE id = #{id}
+        AND deleted = 0
+    </update>
+
+    <!--评估对象添加报告产品号-->
+    <update id="updateTargetReportNo">
+        UPDATE assets_evaluation_target
+        SET report_no = #{productionNo}
         WHERE id = #{id}
         AND deleted = 0
     </update>
 
     <!--根据业务id获取已取号评估对象的产品号-->
-    <select id="getProductionNoList" resultType="java.lang.String">
-        SELECT production_no
+    <select id="getStatementNoList" resultType="java.lang.String">
+        SELECT statement_no
         FROM assets_evaluation_target
         WHERE assets_id = #{businessId}
         AND deleted = 0
-        AND production_no IS NOT NULL
-        AND production_no != ''
+        AND statement_no IS NOT NULL
+        AND statement_no != ''
+    </select>
+
+    <!--根据业务id获取已取号评估对象的产品号-->
+    <select id="getReportNoList" resultType="java.lang.String">
+        SELECT statement_no
+        FROM assets_evaluation_target
+        WHERE assets_id = #{businessId}
+          AND deleted = 0
+          AND statement_no IS NOT NULL
+          AND statement_no != ''
     </select>
 
     <!--评估对象审核定价-->

dao/src/main/resources/mapper/AssetsMapper.xml

@@ -54,7 +54,8 @@
         order_id,
         assets_business_gener,
         allot_type,
-        (SELECT production_no FROM assets_production WHERE assets_production.production_no = nodeInfo.business_sub_id) AS productionNo,
+        (SELECT production_no FROM assets_production WHERE assets_production.production_no = nodeInfo.business_sub_id) AS statementNo,
+        (SELECT production_no FROM assets_production WHERE assets_production.production_no = nodeInfo.business_min_id) AS reportNo,
         (SELECT production_type FROM assets_production WHERE assets_production.production_no = nodeInfo.business_sub_id) AS productionType,
         clientele_id,
         customer.name AS customerName,
@@ -80,7 +81,8 @@
         node.name AS currentNodeName,
         node.code AS currentNodeCode,
         nodeInstance.business_id AS businessId,
-        nodeInstance.business_sub_id
+        nodeInstance.business_sub_id,
+        nodeInstance.business_min_id
         FROM work_flow_node_instance AS nodeInstance,
         work_task_record AS record,
         user,

dao/src/main/resources/mapper/AssetsProductionMapper.xml

@@ -127,8 +127,8 @@
                qr_code
         FROM assets_production
         WHERE business_id = #{businessId}
-        <if test="productionNo != null and productionNo != '' ">
-            AND production_no = #{productionNo}
+        <if test="(statementNo != null and statementNo != '') or (reportNo != null and reportNo != '') ">
+            AND production_no = #{statementNo} OR production_no = #{reportNo}
         </if>
         AND create_production_date IS NOT NULL
         AND deleted = 0
@@ -140,10 +140,10 @@
         FROM work_flow_node_instance
         WHERE deleted = 0
         AND business_id = #{businessId}
-        AND business_sub_id = #{productionNo}
+        AND (business_sub_id = #{statementNo} OR business_min_id = #{reportNo})
     </select>
 
-    <!--根据id获取产品出入库装填-->
+    <!--根据id获取产品出入库状态-->
     <select id="getRepertoryState" resultType="java.lang.Boolean">
         SELECT repertory_state
         FROM assets_production

domain/src/main/java/com/dayou/dto/AETargetListSelectDTO.java

@@ -11,8 +11,13 @@ public class AETargetListSelectDTO {
     private Long businessId;
 
     /**
-     * 资产业务产品号
+     * 意见书号
      */
-    private String productionNo;
+    private String statementNo;
+
+    /**
+     * 报告号
+     */
+    private String reportNo;
 
 }

domain/src/main/java/com/dayou/dto/AProListSelectDTO.java

@@ -10,7 +10,13 @@ public class AProListSelectDTO {
     private Long businessId;
 
     /**
-     * 资产业务产品号
+     * 资产业务意见书产品号
      */
-    private String productionNo;
+    private String statementNo;
+
+    /**
+     * 资产业务报告产品号
+     */
+    private String reportNo;
+
 }

domain/src/main/java/com/dayou/entity/AssetsEvaluationTarget.java

@@ -135,9 +135,14 @@ public class AssetsEvaluationTarget extends BaseEntity {
     private Double checkValue;
 
     /**
-     * 资产产品id
+     * 意见书产品号
      */
-    private String productionNo;
+    private String statementNo;
+
+    /**
+     * 报告产品号
+     */
+    private String reportNo;
 
 
 }

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

@@ -120,29 +120,29 @@ public enum CallbackEnum {
             //价值意见书在校验产品类型的节点
             NecessaryNode valueStatement = new NecessaryNode();
             valueStatement.setProduction(ProductionEnum.STATEMENT);
-            WorkflowNodeEnum[] workflowNodeEnums = {GENERATE_STATEMENT,REVIEW_STATEMENT,REEXAMINE_STATEMENT,STATEMENT_BOOKBINDING_STAMP,STATEMENT_IN,STATEMENT_FEEDBACK,STATEMENT_OUT};
-            valueStatement.setNecessaryNodes(workflowNodeEnums);
+            WorkflowNodeEnum[] statementWorkflowNodeEnums = {GENERATE_STATEMENT,REVIEW_STATEMENT,REEXAMINE_STATEMENT,STATEMENT_BOOKBINDING_STAMP,STATEMENT_IN,STATEMENT_FEEDBACK,STATEMENT_OUT,REPORT_CHOICE};
+            valueStatement.setNecessaryNodes(statementWorkflowNodeEnums);
             this.necessaryNodes.add(valueStatement);
 
-            //报告在校验产品类型时节点
+            //评估报告在校验产品类型时节点
             NecessaryNode report = new NecessaryNode();
             report.setProduction(ProductionEnum.REPORT);
-            WorkflowNodeEnum[] workflowNodeEnums1 = {WRITE_REPORT, CHECK_REPORT,RECHECK_REPORT,FOURTH_CHECK_REPORT,REPORT_BOOKBINDING_STAMP,REPORT_IN,REPORT_OUT,CHECK_ARCHIVING,RECHECK_ARCHIVING,BUSINESS_ARCHIVING};
-            report.setNecessaryNodes(workflowNodeEnums1);
+            WorkflowNodeEnum[] reportWorkflowNodeEnums = {ASSET_REPORT_TAKE_NO,WRITE_REPORT, CHECK_REPORT,RECHECK_REPORT,FOURTH_CHECK_REPORT,REPORT_BOOKBINDING_STAMP,REPORT_IN,REPORT_OUT,CHECK_ARCHIVING,RECHECK_ARCHIVING,BUSINESS_ARCHIVING};
+            report.setNecessaryNodes(reportWorkflowNodeEnums);
             this.necessaryNodes.add(report);
 
-            //报告在校验产品类型时节点
+            //咨询报告在校验产品类型时节点
             NecessaryNode consult = new NecessaryNode();
             report.setProduction(ProductionEnum.CONSULT);
-            WorkflowNodeEnum[] workflowNodeEnums2 = {WRITE_REPORT, CHECK_REPORT,RECHECK_REPORT,FOURTH_CHECK_REPORT,REPORT_BOOKBINDING_STAMP,REPORT_IN,REPORT_OUT,CHECK_ARCHIVING,RECHECK_ARCHIVING,BUSINESS_ARCHIVING};
-            report.setNecessaryNodes(workflowNodeEnums1);
+            WorkflowNodeEnum[] consultWorkflowNodeEnums = {ASSET_REPORT_TAKE_NO,WRITE_REPORT, CHECK_REPORT,RECHECK_REPORT,FOURTH_CHECK_REPORT,REPORT_BOOKBINDING_STAMP,REPORT_IN,REPORT_OUT,CHECK_ARCHIVING,RECHECK_ARCHIVING,BUSINESS_ARCHIVING};
+            report.setNecessaryNodes(consultWorkflowNodeEnums);
             this.necessaryNodes.add(consult);
 
-            //意见函在校验产品类型时的节点
+            //复评函在校验产品类型时的节点
             NecessaryNode letter = new NecessaryNode();
             letter.setProduction(ProductionEnum.LETTER);
-            WorkflowNodeEnum[] workflowNodeEnums3 = {WRITE_REPORT, CHECK_REPORT,RECHECK_REPORT,FOURTH_CHECK_REPORT,REPORT_BOOKBINDING_STAMP,REPORT_IN,REPORT_OUT,CHECK_ARCHIVING,RECHECK_ARCHIVING,BUSINESS_ARCHIVING};
-            letter.setNecessaryNodes(workflowNodeEnums3);
+            WorkflowNodeEnum[] letterWorkflowNodeEnums = {ASSET_REPORT_TAKE_NO,WRITE_REPORT, CHECK_REPORT,RECHECK_REPORT,FOURTH_CHECK_REPORT,REPORT_BOOKBINDING_STAMP,REPORT_IN,REPORT_OUT,CHECK_ARCHIVING,RECHECK_ARCHIVING,BUSINESS_ARCHIVING};
+            letter.setNecessaryNodes(letterWorkflowNodeEnums);
             this.necessaryNodes.add(letter);
         }
     }

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

@@ -65,7 +65,8 @@ public enum WorkflowNodeEnum implements CodeMsgEnumInterface<String,String>{
         COMMIT_FILE("提交归档资料","COMMIT_FILE"),
         PRODUCT_CHOICE("产品选择","PRODUCT_CHOICE"),
         SPOT_RECONNAISSANCE_DETERMINE_PRICE("勘察定价","SPOT_RECONNAISSANCE_DETERMINE_PRICE"),
-        ASSET_REPORT_TAKE_NO("资产报告取号","ASSET_REPORT_TAKE_NO")
+        REPORT_CHOICE("报告选择","REPORT_CHOICE"),
+        ASSET_REPORT_TAKE_NO("资产报告取号","ASSET_REPORT_TAKE_NO");
         ;
 
 

domain/src/main/java/com/dayou/vo/AssetsVO.java

@@ -15,9 +15,14 @@ public class AssetsVO extends Assets {
     private Long assetsId;
 
     /**
-     * 产品号
+     * 意见书号
      */
-    private String productionNo;
+    private String statementNo;
+
+    /**
+     * 报告号
+     */
+    private String reportNo;
 
     /**
      *  当前实例节点id

service/src/main/java/com/dayou/service/IAssetsEvaluationTargetService.java

@@ -24,7 +24,7 @@ public interface IAssetsEvaluationTargetService extends IService<AssetsEvaluatio
          * @param id 资产业务id
          * @return List<AssetsEvaluationTarget>
          */
-        List<AssetsEvaluationTargetVO> getAETargetListByAssetsId(Long id, String productionNo);
+        List<AssetsEvaluationTargetVO> getAETargetListByAssetsId(Long id, String statementNo, String reportNo);
 
         Page<AssetsEvaluationTarget> selectPage(Page page,AssetsEvaluationTarget assetsEvaluationTarget);
 

service/src/main/java/com/dayou/service/impl/AssetsEvaluationTargetServiceImpl.java

@@ -33,8 +33,8 @@ public class AssetsEvaluationTargetServiceImpl extends ServiceImpl<AssetsEvaluat
      * @return List<AssetsEvaluationTargetVO>
      */
     @Override
-    public List<AssetsEvaluationTargetVO> getAETargetListByAssetsId(Long id, String productionNo) {
-        return assetsEvaluationTargetMapper.getAETargetListByAssetsId(id,productionNo);
+    public List<AssetsEvaluationTargetVO> getAETargetListByAssetsId(Long id, String statementNo, String reportNo) {
+        return assetsEvaluationTargetMapper.getAETargetListByAssetsId(id,statementNo,reportNo);
     }
 
     @Override

service/src/main/java/com/dayou/service/impl/AssetsServiceImpl.java

@@ -166,7 +166,13 @@ public class AssetsServiceImpl extends ServiceImpl<AssetsMapper, Assets> impleme
         }
         //评估对象添加产品号
         for (Long id : dto.getTargetIdList()) {
-            assetsEvaluationTargetMapper.updateTargetProductionNo(id, productionNo);
+            //判断取号的产品类型
+            if (dto.getProductionType().equals(STATEMENT.getCode())){ //意见书
+                assetsEvaluationTargetMapper.updateTargetStatementNo(id, productionNo);
+            }else { //报告
+                assetsEvaluationTargetMapper.updateTargetReportNo(id, productionNo);
+            }
+
         }
         return productionNo;
     }
@@ -187,7 +193,13 @@ public class AssetsServiceImpl extends ServiceImpl<AssetsMapper, Assets> impleme
         BusinessNumber businessNumber = assetsMapper.getBusinessNum(takeAssetsProductionNoDTO.getProductionType() + "_NUMBER", ASSET_BUSINESS.getCode(), nowYear);
 
         //获取当前资产业务评估对象已经生成的产品号集合
-        List<String> productionNoList = assetsEvaluationTargetMapper.getProductionNoList(takeAssetsProductionNoDTO.getBusinessId());
+        List<String> productionNoList = null;
+        //判断取号的产品类型
+        if (takeAssetsProductionNoDTO.getProductionType().equals(STATEMENT.getCode())){ //意见书
+            productionNoList = assetsEvaluationTargetMapper.getStatementNoList(takeAssetsProductionNoDTO.getBusinessId());
+        }else { //报告
+            productionNoList = assetsEvaluationTargetMapper.getReportNoList(takeAssetsProductionNoDTO.getBusinessId());
+        }
         //判断该资产业务订单是否有取过号
         if (ObjectUtil.isNull(productionNoList) || productionNoList.isEmpty()) {
             //判断是否有取号信息

sql/update_sql.sql

@@ -286,4 +286,12 @@ ALTER TABLE `assets_evaluation_target` ADD production_no VARCHAR(128) NULL COMME
  */
 # 资产产品表file_path字段修改为json类型,新增字段assets_name
 ALTER TABLE assets_production MODIFY COLUMN file_path json NULL comment '资料路由信息(json)';
-ALTER TABLE assets_production ADD COLUMN assets_name VARCHAR(255) NULL comment '项目名称';
+ALTER TABLE assets_production ADD COLUMN assets_name VARCHAR(255) NULL comment '项目名称';
+
+/**
+  日期：2024-04-29
+  修改人:苟耕铨
+ */
+ # 资产评估对象表修改以及新增字段
+ALTER TABLE assets_evaluation_target CHANGE COLUMN production_no statement_no VARCHAR(128) NULL COMMENT '意见书产品号';
+ALTER TABLE assets_evaluation_target ADD COLUMN report_no VARCHAR(128) NULL COMMENT '报告产品号';