Browse Source

产品验证接口加评估日期字段

wucl 2 months ago
parent
commit
a589282e86

+ 3 - 1
dao/src/main/resources/mapper/MajorProductionMapper.xml

@@ -687,7 +687,9 @@
             ROUND(mp.evaluate_amount/10000,2) as amount,
             mp.name AS productionName,
             mp.report_no AS productionNo ,
-            mp.client_name as bailor
+            mp.client_name as bailor,
+            DATE_FORMAT(mp.production_time,'%Y-%m-%d') as productionTime,
+            mp.value_timing
         FROM
             major_production mp
         WHERE

+ 3 - 1
dao/src/main/resources/mapper/PersonalTargetMapper.xml

@@ -36,7 +36,9 @@
             p.location AS productionName,
             p.order_id AS productionNo ,
             p.bailorA,
-            p.bailorB
+            p.bailorB,
+            JSON_UNQUOTE(JSON_EXTRACT(pt.selling_ability,'$.sceneDateD')) as valueTiming,
+            DATE_FORMAT((select production_time from personal_production where target_id = pt.id and production_time is not null and deleted = 0 order by production_time asc LIMIT 1 ),'%Y-%m-%d') as productionTime
         FROM
             personal_target pt
                 LEFT JOIN personal p ON p.id = pt.personal_id

+ 10 - 0
domain/src/main/java/com/dayou/vo/ProdValidateVO.java

@@ -27,4 +27,14 @@ public class ProdValidateVO {
     private BigDecimal acreage;
 
     private BigDecimal amount;
+
+    /**
+     * 价值时点(报告基准日)
+     */
+    private String valueTiming;
+
+    /**
+     * 产品出具日
+     */
+    private String productionTime;
 }