1.大中型 错误类型报表 补全新的错误类型

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

@@ -1883,7 +1883,7 @@
         fc.claim_datetime as claimDate,
         ap.save_file_date,
         IF( fc.claim_datetime > ap.save_file_date, fc.claim_datetime, ap.save_file_date ) AS settleDate,
-        ap.assets_name AS projectName,
+        IF(ap.assets_name IS NOT NULL, ap.assets_name, a.name ) AS projectName,
         a.bailor,
         ap.evaluate_amount,
         u.name AS principal,

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

@@ -311,44 +311,42 @@
         user.userName,
         (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
         = orderInfo.production_id AND reason LIKE CONCAT('%','委托书界定事项和报告描述不符','%') AND deleted = 0
-        
         <if test="dto.checkType == 'dep'">
             AND check_loop = '初审'
         </if>
         <if test="dto.checkType == 'com'">
             AND check_loop != '初审'
         </if>
-        ) AS
-        errorTypeCount01,
+        ) AS errorTypeCount01,
         (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
-        = orderInfo.production_id AND reason LIKE CONCAT('%','委托方函重要数据出错','%') AND deleted = 0
-        
+        = orderInfo.production_id AND reason LIKE CONCAT('%','方位图有误','%') AND deleted = 0
         <if test="dto.checkType == 'dep'">
             AND check_loop = '初审'
         </if>
         <if test="dto.checkType == 'com'">
             AND check_loop != '初审'
         </if>
-        ) AS
-        errorTypeCount02,
+        ) AS errorTypeCount02,
         (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
-        = orderInfo.production_id AND reason LIKE CONCAT('%','假设限制条件错漏','%') AND deleted = 0
-        ) AS
-        errorTypeCount03,
+        = orderInfo.production_id AND reason LIKE CONCAT('%','实景图有误','%') AND deleted = 0
+        <if test="dto.checkType == 'dep'">
+            AND check_loop = '初审'
+        </if>
+        <if test="dto.checkType == 'com'">
+            AND check_loop != '初审'
+        </if>
+        ) AS errorTypeCount03,
         (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
-        = orderInfo.production_id AND reason LIKE CONCAT('%','地价定义表述有误或不完整','%') AND deleted = 0
-        
+        = orderInfo.production_id AND reason LIKE CONCAT('%','测算参数取值不充分','%') AND deleted = 0
         <if test="dto.checkType == 'dep'">
             AND check_loop = '初审'
         </if>
         <if test="dto.checkType == 'com'">
             AND check_loop != '初审'
         </if>
-        ) AS
-        errorTypeCount04,
+        ) AS errorTypeCount04,
         (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
-        = orderInfo.production_id AND reason LIKE CONCAT('%','大小写有误','%') AND deleted = 0
-        
+        = orderInfo.production_id AND reason LIKE CONCAT('%','估价结果确定方式不恰当','%') AND deleted = 0
         <if test="dto.checkType == 'dep'">
             AND check_loop = '初审'
         </if>
@@ -357,8 +355,7 @@
         </if>
         ) AS errorTypeCount05,
         (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
-        = orderInfo.production_id AND reason LIKE CONCAT('%','面积有误','%') AND deleted = 0
-        
+        = orderInfo.production_id AND reason LIKE CONCAT('%','估价方法表述不完整','%') AND deleted = 0
         <if test="dto.checkType == 'dep'">
             AND check_loop = '初审'
         </if>
@@ -367,8 +364,7 @@
         </if>
         ) AS errorTypeCount06,
         (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
-        = orderInfo.production_id AND reason LIKE CONCAT('%','报告章节缺漏','%') AND deleted = 0
-        
+        = orderInfo.production_id AND reason LIKE CONCAT('%','实物、权益、区位描述缺项','%') AND deleted = 0
         <if test="dto.checkType == 'dep'">
             AND check_loop = '初审'
         </if>
@@ -377,8 +373,7 @@
         </if>
         ) AS errorTypeCount07,
         (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
-        = orderInfo.production_id AND reason LIKE CONCAT('%','技术路线错误','%') AND deleted = 0
-        
+        = orderInfo.production_id AND reason LIKE CONCAT('%','价值定义表述不完整','%') AND deleted = 0
         <if test="dto.checkType == 'dep'">
             AND check_loop = '初审'
         </if>
@@ -387,81 +382,230 @@
         </if>
         ) AS errorTypeCount08,
         (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
-        = orderInfo.production_id AND reason LIKE CONCAT('%','测算参数取值错误','%') AND deleted = 0
-        
+        = orderInfo.production_id AND reason LIKE CONCAT('%','非重要文字和数据录入错误','%') AND deleted = 0
+        <if test="dto.checkType == 'dep'">
+            AND check_loop = '初审'
+        </if>
+        <if test="dto.checkType == 'com'">
+            AND check_loop != '初审'
+        </if>
+        ) AS errorTypeCount09,
+        (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
+        = orderInfo.production_id AND reason LIKE CONCAT('%','估价结果价格有误','%') AND deleted = 0
+        <if test="dto.checkType == 'dep'">
+            AND check_loop = '初审'
+        </if>
+        <if test="dto.checkType == 'com'">
+            AND check_loop != '初审'
+        </if>
+        ) AS errorTypeCount10,
+        (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
+        = orderInfo.production_id AND reason LIKE CONCAT('%','大小写不一致','%') AND deleted = 0
+        <if test="dto.checkType == 'dep'">
+            AND check_loop = '初审'
+        </if>
+        <if test="dto.checkType == 'com'">
+            AND check_loop != '初审'
+        </if>
+        ) AS errorTypeCount11,
+        (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
+        = orderInfo.production_id AND reason LIKE CONCAT('%','面积错误','%') AND deleted = 0
         <if test="dto.checkType == 'dep'">
             AND check_loop = '初审'
         </if>
         <if test="dto.checkType == 'com'">
             AND check_loop != '初审'
         </if>
-        ) AS
-        errorTypeCount09,
+        ) AS errorTypeCount12,
         (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
-        = orderInfo.production_id AND reason LIKE CONCAT('%','实景图方位图错误','%') AND deleted = 0
-        
+        = orderInfo.production_id AND reason LIKE CONCAT('%','委托方函重要数据出错','%') AND deleted = 0
         <if test="dto.checkType == 'dep'">
             AND check_loop = '初审'
         </if>
         <if test="dto.checkType == 'com'">
             AND check_loop != '初审'
         </if>
-        ) AS
-        errorTypeCount10,
+        ) AS errorTypeCount13,
+        (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
+        = orderInfo.production_id AND reason LIKE CONCAT('%','委托人名称出错','%') AND deleted = 0
+        <if test="dto.checkType == 'dep'">
+            AND check_loop = '初审'
+        </if>
+        <if test="dto.checkType == 'com'">
+            AND check_loop != '初审'
+        </if>
+        ) AS errorTypeCount14,
+        (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
+        = orderInfo.production_id AND reason LIKE CONCAT('%','假设限制条件错漏','%') AND deleted = 0
+        <if test="dto.checkType == 'dep'">
+            AND check_loop = '初审'
+        </if>
+        <if test="dto.checkType == 'com'">
+            AND check_loop != '初审'
+        </if>
+        ) AS errorTypeCount15,
+        (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
+        = orderInfo.production_id AND reason LIKE CONCAT('%','价值定义表述错误','%') AND deleted = 0
+        <if test="dto.checkType == 'dep'">
+            AND check_loop = '初审'
+        </if>
+        <if test="dto.checkType == 'com'">
+            AND check_loop != '初审'
+        </if>
+        ) AS errorTypeCount16,
+        (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
+        = orderInfo.production_id AND reason LIKE CONCAT('%','报告章节缺漏','%') AND deleted = 0
+        <if test="dto.checkType == 'dep'">
+            AND check_loop = '初审'
+        </if>
+        <if test="dto.checkType == 'com'">
+            AND check_loop != '初审'
+        </if>
+        ) AS errorTypeCount17,
         (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
         = orderInfo.production_id AND reason LIKE CONCAT('%','报告出具日期错误','%') AND deleted = 0
-        
         <if test="dto.checkType == 'dep'">
             AND check_loop = '初审'
         </if>
         <if test="dto.checkType == 'com'">
             AND check_loop != '初审'
         </if>
-        ) AS
-        errorTypeCount11,
+        ) AS errorTypeCount18,
         (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
         = orderInfo.production_id AND reason LIKE CONCAT('%','报告有效期错误','%') AND deleted = 0
-        
         <if test="dto.checkType == 'dep'">
             AND check_loop = '初审'
         </if>
         <if test="dto.checkType == 'com'">
             AND check_loop != '初审'
         </if>
-        ) AS
-        errorTypeCount12,
+        ) AS errorTypeCount19,
         (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
-        = orderInfo.production_id AND reason LIKE CONCAT('%','估价依据适用不当','%') AND deleted = 0
-        
+        = orderInfo.production_id AND reason LIKE CONCAT('%','重要文字和数据录入错误','%') AND deleted = 0
         <if test="dto.checkType == 'dep'">
             AND check_loop = '初审'
         </if>
         <if test="dto.checkType == 'com'">
             AND check_loop != '初审'
         </if>
-        ) AS
-        errorTypeCount13,
+        ) AS errorTypeCount20,
         (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
-        = orderInfo.production_id AND reason LIKE CONCAT('%','委托人名称出错','%') AND deleted = 0
-        
+        = orderInfo.production_id AND reason LIKE CONCAT('%','估价对象错误','%') AND deleted = 0
+        <if test="dto.checkType == 'dep'">
+            AND check_loop = '初审'
+        </if>
+        <if test="dto.checkType == 'com'">
+            AND check_loop != '初审'
+        </if>
+        ) AS errorTypeCount21,
+        (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
+        = orderInfo.production_id AND reason LIKE CONCAT('%','估价目的错误','%') AND deleted = 0
+        <if test="dto.checkType == 'dep'">
+            AND check_loop = '初审'
+        </if>
+        <if test="dto.checkType == 'com'">
+            AND check_loop != '初审'
+        </if>
+        ) AS errorTypeCount22,
+        (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
+        = orderInfo.production_id AND reason LIKE CONCAT('%','价值时点设定出错','%') AND deleted = 0
+        <if test="dto.checkType == 'dep'">
+            AND check_loop = '初审'
+        </if>
+        <if test="dto.checkType == 'com'">
+            AND check_loop != '初审'
+        </if>
+        ) AS errorTypeCount23,
+        (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
+        = orderInfo.production_id AND reason LIKE CONCAT('%','登记状况错误','%') AND deleted = 0
+        <if test="dto.checkType == 'dep'">
+            AND check_loop = '初审'
+        </if>
+        <if test="dto.checkType == 'com'">
+            AND check_loop != '初审'
+        </if>
+        ) AS errorTypeCount24,
+        (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
+        = orderInfo.production_id AND reason LIKE CONCAT('%','权利状况错误','%') AND deleted = 0
+        <if test="dto.checkType == 'dep'">
+            AND check_loop = '初审'
+        </if>
+        <if test="dto.checkType == 'com'">
+            AND check_loop != '初审'
+        </if>
+        ) AS errorTypeCount25,
+        (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
+        = orderInfo.production_id AND reason LIKE CONCAT('%','利用状况错误','%') AND deleted = 0
+        <if test="dto.checkType == 'dep'">
+            AND check_loop = '初审'
+        </if>
+        <if test="dto.checkType == 'com'">
+            AND check_loop != '初审'
+        </if>
+        ) AS errorTypeCount26,
+        (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
+        = orderInfo.production_id AND reason LIKE CONCAT('%','技术路线错误','%') AND deleted = 0
+        <if test="dto.checkType == 'dep'">
+            AND check_loop = '初审'
+        </if>
+        <if test="dto.checkType == 'com'">
+            AND check_loop != '初审'
+        </if>
+        ) AS errorTypeCount27,
+        (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
+        = orderInfo.production_id AND reason LIKE CONCAT('%','关键参数取值错误','%') AND deleted = 0
+        <if test="dto.checkType == 'dep'">
+            AND check_loop = '初审'
+        </if>
+        <if test="dto.checkType == 'com'">
+            AND check_loop != '初审'
+        </if>
+        ) AS errorTypeCount28,
+        (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
+        = orderInfo.production_id AND reason LIKE CONCAT('%','编造虚假案例','%') AND deleted = 0
+        <if test="dto.checkType == 'dep'">
+            AND check_loop = '初审'
+        </if>
+        <if test="dto.checkType == 'com'">
+            AND check_loop != '初审'
+        </if>
+        ) AS errorTypeCount29,
+        (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
+        = orderInfo.production_id AND reason LIKE CONCAT('%','编造虚假照片','%') AND deleted = 0
+        <if test="dto.checkType == 'dep'">
+            AND check_loop = '初审'
+        </if>
+        <if test="dto.checkType == 'com'">
+            AND check_loop != '初审'
+        </if>
+        ) AS errorTypeCount30,
+        (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
+        = orderInfo.production_id AND reason LIKE CONCAT('%','估价依据资料严重不全','%') AND deleted = 0
+        <if test="dto.checkType == 'dep'">
+            AND check_loop = '初审'
+        </if>
+        <if test="dto.checkType == 'com'">
+            AND check_loop != '初审'
+        </if>
+        ) AS errorTypeCount31,
+        (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
+        = orderInfo.production_id AND reason LIKE CONCAT('%','评估结果严重失真超30%以上','%') AND deleted = 0
         <if test="dto.checkType == 'dep'">
             AND check_loop = '初审'
         </if>
         <if test="dto.checkType == 'com'">
             AND check_loop != '初审'
         </if>
-        ) AS
-        errorTypeCount14,
+        ) AS errorTypeCount32,
         (SELECT COUNT(id) FROM business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND production_id
-        = orderInfo.production_id AND reason LIKE CONCAT('%','价值时点出错','%') AND deleted = 0
-        
+        = orderInfo.production_id AND reason LIKE CONCAT('%','关键文字和数据错误','%') AND deleted = 0
         <if test="dto.checkType == 'dep'">
             AND check_loop = '初审'
         </if>
         <if test="dto.checkType == 'com'">
             AND check_loop != '初审'
         </if>
-        ) AS errorTypeCount15
+        ) AS errorTypeCount33
         FROM (SELECT DISTINCT user.id AS id,
         user.`name` AS userName,
         department.id AS departmentId

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

@@ -31,73 +31,73 @@ public class MajorErrorTypeCountVO {
     /**
      * 委托方函重要数据出错
      */
-    @Excel(name = "委托方函重要数据出错")
+    @Excel(name = "方位图有误")
     private Integer errorTypeCount02;
 
     /**
      * 假设限制条件错漏
      */
-    @Excel(name = "假设限制条件错漏")
+    @Excel(name = "实景图有误")
     private Integer errorTypeCount03;
 
     /**
      * 地价定义表述有误或不完整
      */
-    @Excel(name = "地价定义表述有误或不完整")
+    @Excel(name = "测算参数取值不充分")
     private Integer errorTypeCount04;
 
     /**
      * 大小写有误
      */
-    @Excel(name = "大小写有误")
+    @Excel(name = "估价结果确定方式不恰当")
     private Integer errorTypeCount05;
 
     /**
      * 面积有误
      */
-    @Excel(name = "面积有误")
+    @Excel(name = "估价方法表述不完整")
     private Integer errorTypeCount06;
 
     /**
      * 报告章节缺漏
      */
-    @Excel(name = "报告章节缺漏")
+    @Excel(name = "实物、权益、区位描述缺项")
     private Integer errorTypeCount07;
 
     /**
      * 技术路线错误
      */
-    @Excel(name = "技术路线错误")
+    @Excel(name = "价值定义表述不完整")
     private Integer errorTypeCount08;
 
     /**
      * 测算参数取值错误
      */
-    @Excel(name = "测算参数取值错误")
+    @Excel(name = "非重要文字和数据录入错误")
     private Integer errorTypeCount09;
 
     /**
      *
      */
-    @Excel(name = "实景图方位图错误")
+    @Excel(name = "估价结果价格有误")
     private Integer errorTypeCount10;
 
     /**
      * 报告出具日期错误
      */
-    @Excel(name = "报告出具日期错误")
+    @Excel(name = "大小写不一致")
     private Integer errorTypeCount11;
 
     /**
      * 报告有效期错误
      */
-    @Excel(name = "报告有效期错误")
+    @Excel(name = "面积错误")
     private Integer errorTypeCount12;
 
     /**
      * 估价依据适用不当
      */
-    @Excel(name = "估价依据适用不当")
+    @Excel(name = "委托方函重要数据出错")
     private Integer errorTypeCount13;
 
     /**
@@ -109,8 +109,116 @@ public class MajorErrorTypeCountVO {
     /**
      * 价值时点出错
      */
-    @Excel(name = "价值时点出错")
+    @Excel(name = "假设限制条件错漏")
     private Integer errorTypeCount15;
 
+    /**
+     * 委托书界定事项和报告描述不符
+     */
+    @Excel(name = "价值定义表述错误")
+    private Integer errorTypeCount16;
+
+    /**
+     * 委托方函重要数据出错
+     */
+    @Excel(name = "报告章节缺漏")
+    private Integer errorTypeCount17;
+
+    /**
+     * 假设限制条件错漏
+     */
+    @Excel(name = "报告出具日期错误")
+    private Integer errorTypeCount18;
+
+    /**
+     * 地价定义表述有误或不完整
+     */
+    @Excel(name = "报告有效期错误")
+    private Integer errorTypeCount19;
+
+    /**
+     * 大小写有误
+     */
+    @Excel(name = "重要文字和数据录入错误")
+    private Integer errorTypeCount20;
+
+    /**
+     * 面积有误
+     */
+    @Excel(name = "估价对象错误")
+    private Integer errorTypeCount21;
+
+    /**
+     * 报告章节缺漏
+     */
+    @Excel(name = "估价目的错误")
+    private Integer errorTypeCount22;
+
+    /**
+     * 技术路线错误
+     */
+    @Excel(name = "价值时点设定出错")
+    private Integer errorTypeCount23;
+
+    /**
+     * 测算参数取值错误
+     */
+    @Excel(name = "登记状况错误")
+    private Integer errorTypeCount24;
+
+    /**
+     *
+     */
+    @Excel(name = "权利状况错误")
+    private Integer errorTypeCount25;
+
+    /**
+     * 报告出具日期错误
+     */
+    @Excel(name = "利用状况错误")
+    private Integer errorTypeCount26;
+
+    /**
+     * 报告有效期错误
+     */
+    @Excel(name = "技术路线错误")
+    private Integer errorTypeCount27;
+
+    /**
+     * 估价依据适用不当
+     */
+    @Excel(name = "关键参数取值错误")
+    private Integer errorTypeCount28;
+
+    /**
+     * 委托人名称出错
+     */
+    @Excel(name = "编造虚假案例")
+    private Integer errorTypeCount29;
+
+    /**
+     * 价值时点出错
+     */
+    @Excel(name = "编造虚假照片")
+    private Integer errorTypeCount30;
+
+    /**
+     * 价值时点出错
+     */
+    @Excel(name = "估价依据资料严重不全")
+    private Integer errorTypeCount31;
+
+    /**
+     * 价值时点出错
+     */
+    @Excel(name = "评估结果严重失真超30%以上")
+    private Integer errorTypeCount32;
+
+    /**
+     * 价值时点出错
+     */
+    @Excel(name = "关键文字和数据错误")
+    private Integer errorTypeCount33;
+
 
 }