1.修复大中型-我的订单负责人查询条件无效

2.资产结算项目查询多条开票信息(待完善)

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

@@ -1403,6 +1403,31 @@
         <include refid="assetsMarketerSettleSql" />
     </select>
 
+    <resultMap id="settleAssetsProductionVOMap" type="com.dayou.vo.SettleAssetsProductionVO">
+        <id property="id" column="id" />
+        <result property="id" column="id" />
+        <result property="claimAmount" column="claim_amount" />
+        <result property="orderId" column="order_id" />
+        <result property="productionNo" column="production_no" />
+        <result property="claimDate" column="claimDate" />
+        <result property="saveFileDate" column="save_file_date" />
+        <result property="settleDate" column="settleDate" />
+        <result property="projectName" column="projectName" />
+        <result property="bailor" column="bailor" />
+        <result property="evaluateAmount" column="evaluate_amount" />
+        <result property="principal" column="principal" />
+        <result property="clientManager" column="clientManager" />
+        <result property="clientName" column="clientName" />
+        <result property="clientSubName" column="clientSubName" />
+        <result property="evaluateDepartmentName" column="evaluateDepartmentName" />
+        <result property="marketDepartmentName" column="marketDepartmentName" />
+        <collection property="invoices" ofType="com.dayou.vo.SettleProInvoiceVo">
+            <result property="invoiceDate" column="invoiceDate" />
+            <result property="invoiceUser" column="invoiceUser" />
+            <result property="invoiceNo" column="invoiceNo" />
+        </collection>
+    </resultMap>
+
     <!--资产评估人员结算项目Sql-->
     <sql id="assetsEvaluatorSettleSql">
         SELECT
@@ -1433,7 +1458,10 @@
         FROM
         post
         WHERE
-        id IN ( SELECT post_id FROM user_post WHERE user_id = a.client_manager_id ))) AS marketDepartmentName
+        id IN ( SELECT post_id FROM user_post WHERE user_id = a.client_manager_id ))) AS marketDepartmentName,
+        invoice.name AS invoiceUser,
+        invoice.real_make_date AS invoiceDate,
+        invoice.tax_no AS invoiceNo
         FROM
         (
         SELECT
@@ -1460,6 +1488,14 @@
         LEFT JOIN customer_company cc ON cc.id = a.clientele_id
         LEFT JOIN customer_company cc1 ON cc1.id = a.clientele_sub_id
         LEFT JOIN department d ON d.id = a.department_id
+        LEFT JOIN (
+             SELECT real_make_date,name,tax_no,finance_invoice.order_fund_id,production_no
+             FROM finance_invoice,user,production_fund
+             WHERE maker_id = user.id
+               AND finance_invoice.order_fund_id = production_fund.order_fund_id
+               AND finance_invoice.deleted = 0
+               AND state = '已开票'
+        ) AS invoice ON invoice.order_fund_id = pf.order_fund_id AND invoice.production_no = pf.production_no
         <where>
             <if test="settleVO!=null and settleVO.orderId!=null and settleVO.orderId!='' ">
                 and a.order_id = #{settleVO.orderId}
@@ -1478,12 +1514,12 @@
     </sql>
 
     <!--资产评估人员结算项目查询-->
-    <select id="assetsEvaluatorSettleProd" resultType="com.dayou.vo.SettleAssetsProductionVO">
+    <select id="assetsEvaluatorSettleProd" resultMap="settleAssetsProductionVOMap">
         <include refid="assetsEvaluatorSettleSql" />
     </select>
 
     <!--资产评估人员结算项目导出-->
-    <select id="assetsEvaluatorSettleExport" resultType="com.dayou.vo.SettleAssetsProductionVO">
+    <select id="assetsEvaluatorSettleExport" resultMap="settleAssetsProductionVOMap">
         <include refid="assetsEvaluatorSettleSql" />
     </select>
 

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

@@ -230,18 +230,15 @@
             or orf.remark like concat('%',#{keyword},'%')
             )
         </if>
+        <if test="vo!=null and vo.principalId!=null and vo.principalId!=''">
+            AND m.principal_id like concat('%',#{vo.principalId},'%')
+        </if>
         <if test="vo!=null and vo.startDate!=null and vo.startDate!=''">
             and m.created &gt;= #{vo.startDate}
         </if>
         <if test="vo!=null and vo.endDate!=null and vo.endDate!=''">
             and m.created &lt;= #{vo.endDate}
         </if>
-        <if test="vo!=null and vo.endDate!=null and vo.endDate!=''">
-            and m.created &lt;= #{vo.endDate}
-        </if>
-        <if test="vo!=null and vo.endDate!=null and vo.endDate!=''">
-            and m.created &lt;= #{vo.endDate}
-        </if>
         order by m.created DESC
     </select>
 

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

@@ -110,4 +110,9 @@ public class MajorOrderVO {
 
     private String name;
 
+    /**
+     * 项目负责人id(user_id)
+     */
+    private Long principalId;
+
 }

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

@@ -5,7 +5,7 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.util.Date;
+import java.util.List;
 
 @Data
 public class SettleAssetsProductionVO {
@@ -60,14 +60,10 @@ public class SettleAssetsProductionVO {
     @Excel(name = "评估价值(元)")
     private BigDecimal evaluateAmount;
 
-    @Excel(name = "开票日期")
-    private Date invoiceDate;
-
-    @Excel(name = "开票人")
-    private String invoiceUser;
-
-    @Excel(name = "发票号")
-    private String invoiceNo;
+    /**
+     * 开票信息
+     */
+    private List<SettleProInvoiceVo> invoices;
 
     private String startDate;
 

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

@@ -0,0 +1,22 @@
+package com.dayou.vo;
+
+import com.dayou.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SettleProInvoiceVo {
+
+    @Excel(name = "开票日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date invoiceDate;
+
+    @Excel(name = "开票人")
+    private String invoiceUser;
+
+    @Excel(name = "发票号")
+    private String invoiceNo;
+
+}