Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-1phase

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

@@ -169,6 +169,9 @@
             <if test="majorStat!=null and majorStat.financial!=null ">
                 and m.financial = #{majorStat.financial}
             </if>
+            <if test="majorStat!=null and majorStat.evaluateDepartmentName!=null and majorStat.evaluateDepartmentName!='' ">
+                and d.name = #{majorStat.evaluateDepartmentName}
+            </if>
         </where>
 
     </sql>

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

@@ -473,6 +473,9 @@
                 AND (select IF
                 ( fc.claim_datetime > mp.save_file_date, fc.claim_datetime, mp.save_file_date )) <= #{settleVO.endDate}
             </if>
+            <if test="settleVO!=null and settleVO.evaluateDepartmentName!=null and settleVO.evaluateDepartmentName!=''">
+                and d.name = #{settleVO.evaluateDepartmentName}
+            </if>
         </where>
         order by fc.claim_datetime ASC
     </sql>

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

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

@@ -32,11 +32,27 @@
     <select id="validateProd" parameterType="java.lang.Long" resultType="com.dayou.vo.ProdValidateVO">
         SELECT
             pt.acreage,
-            ROUND(pt.amount/10000,2) AS amount,
+            ROUND( pt.amount / 10000, 2 ) AS amount,
             p.location AS productionName,
-            p.order_id AS productionNo ,
+            p.order_id AS productionNo,
             p.bailorA,
-            p.bailorB
+            p.bailorB,
+            DATE_FORMAT((
+                SELECT
+                    created
+                FROM
+                    work_flow_log
+                WHERE
+                    state= 'PASS'
+                  AND business_type = 'PERSONAL_BUSINESS'
+                  AND instance_id = ( SELECT id FROM work_flow_node_instance WHERE business_type = 'PERSONAL_BUSINESS' AND business_id = p.id AND deleted = 0 AND node_id = 100 AND state='FINISHED' ORDER BY created DESC LIMIT 1 )
+		ORDER BY
+			created DESC
+			LIMIT 1
+			),
+		'%Y-%m-%d'
+	) 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 production_time
         FROM
             personal_target pt
                 LEFT JOIN personal p ON p.id = pt.personal_id

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;
 }

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

@@ -159,6 +159,8 @@ public class RealFundMajorStatVO {
 
     private String payEndDate;
 
+    private String evaluateDepartmentName;
+
 
 
 

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

@@ -99,7 +99,4 @@ public class SettleMajorProductionVO {
     private String members;
 
 
-
-
-
 }