1.资产台账查询结果调整

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

@@ -12,6 +12,7 @@
                CASE report.production_type WHEN 'LETTER' THEN '意见函' WHEN 'CONSULT' THEN '咨询报告' WHEN 'REPORT' THEN '评估报告' ELSE '-' END AS productionType,
                report.valuation_basis_date                                           AS valuationBasisDate,
                report.create_production_date                                         AS createReportDate,
+               report.print_count AS reportPrintCount,
                COALESCE(report.assets_name, statement.assets_name, assets.name)      AS projectName,
                IF(nodeInfo.state = 'CLOSED','项目终止',IF(nodeInfo.name IS NULL,IF(statement.production_no IS NULL, '撰写意见书', '撰写报告'),nodeInfo.name)) AS currentNodeName,
                assets.security AS security,
@@ -28,8 +29,11 @@
                GROUP_CONCAT(target.id SEPARATOR '; ')                                AS targetId,
                GROUP_CONCAT(target.purpose_name SEPARATOR '; ')                      AS purposeName,
                GROUP_CONCAT(target.type_name SEPARATOR '; ')                         AS valueTypeName,
-               GROUP_CONCAT(target.targetTypename SEPARATOR '; ')                    AS targetTypename,
-               GROUP_CONCAT(target.secTargetTypaName SEPARATOR '; ')                 AS secTargetTypaName,
+               GROUP_CONCAT(
+                   IF(target.evaluation_type_defined_sec IS NOT NULL, CONCAT(target.targetTypeName, '-', target.secTargetTypaName,
+                   '-', target.evaluation_type_defined_sec), CONCAT(target.targetTypeName, '-', target.secTargetTypaName))
+                   SEPARATOR '; '
+               ) AS targetTypeName,
                GROUP_CONCAT(target.evaluation_method_id SEPARATOR ', ')              AS evaluationMethods,
                GROUP_CONCAT(target.defined_evaluation_method SEPARATOR '; ')         AS definedEvaluationMethod,
                GROUP_CONCAT(target.choice_evaluation_method_id SEPARATOR ', ')       AS choiceEvaluationMethods,
@@ -119,15 +123,16 @@
                    defined_evaluation_method,
                    choice_evaluation_method_id,
                    choice_defined_evaluation_method,
-                   type.type_name AS targetTypename,
+                   type.type_name AS targetTypeName,
                    secType.type_name AS secTargetTypaName,
+                   evaluation_type_defined_sec,
                    estimated_value,
                    statement_no,
                    report_no
             FROM assets_evaluation_target AS target
                      LEFT JOIN assets_evaluation_target_purpose AS purpose ON evaluation_purpose_id = purpose.id
                      LEFT JOIN assets_evaluation_target_type AS type ON evaluation_type_id = type.id
-                     LEFT JOIN assets_evaluation_target_type AS secType ON evaluation_type_sec_id = type.id
+                     LEFT JOIN assets_evaluation_target_type AS secType ON evaluation_type_sec_id = secType.id
                      LEFT JOIN assets_value_type AS vType ON assets_value_id = vType.id
         ) AS target ON assets.id = target.assets_id
         LEFT JOIN assets_production AS report ON report_no = report.production_no

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

@@ -40,6 +40,11 @@ public class AssetsEvaluationTarget extends BaseEntity {
     private Long evaluationTypeSecId;
 
     /**
+     * 其他自定义二级资产评估对象类型
+     */
+    private String evaluationTypeDefinedSec;
+
+    /**
      * 产权持有人
      */
     @ImportCell

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

@@ -74,7 +74,9 @@ public enum WorkflowNodeEnum implements CodeMsgEnumInterface<String,String>{
 
         TOP_MANAGER_CHECK("总经理审批","TOP_MANAGER_CHECK"),
 
-        GROUP_LEADER_CHECK("组长审批", "GROUP_LEADER_CHECK");
+        GROUP_LEADER_CHECK("组长审批", "GROUP_LEADER_CHECK"),
+
+        COMMIT_ARCHIVING("提交归档","COMMIT_ARCHIVING");
 
         ;
 

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

@@ -54,6 +54,12 @@ public class AssetsLedgerVO {
     private LocalDate createReportDate;
 
     /**
+     * 打印份数
+     */
+    @Excel(name = "打印份数")
+    private Integer reportPrintCount;
+
+    /**
      * 项目名称
      */
     @Excel(name = "项目名称")
@@ -144,16 +150,10 @@ public class AssetsLedgerVO {
     private String valueTypeName;
 
     /**
-     * 一级评估对象
-     */
-    @Excel(name = "一级评估对象")
-    private String targetTypename;
-
-    /**
-     * 二级评估对象
+     * 评估对象
      */
-    @Excel(name = "二级评估对象")
-    private String secTargetTypaName;
+    @Excel(name = "评估对象")
+    private String targetTypeName;
 
     /**
      * 评估方法id

sql/update_sql.sql

@@ -666,3 +666,11 @@ ALTER TABLE `assets` ADD market_department_id bigint(20) NULL COMMENT '市场部
 */
 ALTER TABLE `order_fund_allot` ADD real_fund_id bigint(20) NOT NULL COMMENT '实收款id';
 
+/**
+  日期：2024-08-30
+  修改人:苟耕铨
+  未更新到test-env
+ */
+ALTER TABLE assets_evaluation_target MODIFY COLUMN the_holder varchar(255) NULL COMMENT '产权持有人';
+ALTER TABLE assets_evaluation_target ADD COLUMN evaluation_type_defined_sec varchar(255) NULL COMMENT '其他自定义二级资产评估对象类型';
+