Jelajahi Sumber

1.协议费用审核查询 修改 协议名称
2.财务审核明细导出 增加字段

wks 1 tahun lalu
induk
melakukan
04f4715017

+ 12 - 0
src/main/java/com/ydtech/modules/order/entity/vo/AuditExportVo.java

@@ -79,6 +79,18 @@ public class AuditExportVo {
     @ExcelProperty("非车保费")
     private String jypremium;
 
+    @ExcelProperty(value = "协议号")
+    private String agreementCode;
+
+    @ExcelProperty(value = "工号描述")
+    private String jobDescription;
+
+    @ExcelProperty(value = "对接人")
+    private String dockingPerson;
+
+    @ExcelProperty(value = "联系方式")
+    private String dockingPhone;
+
     @ApiModelProperty("交强出口比例")
     @ExcelProperty("交强出口比例")
     private String jqExportProportion;

+ 7 - 0
src/main/java/com/ydtech/modules/protocols/dao/PtlAgreementProductCostsNewMapper.java

@@ -14,6 +14,13 @@ import org.apache.ibatis.annotations.Param;
  * @createDate 2024-2-22 15:44:29
  */
 public interface PtlAgreementProductCostsNewMapper extends BaseMapper<PtlAgreementProductCostsNew> {
+
+    /**
+     *  协议费用审核查询
+     * @param page 分页参数
+     * @param agreementProductQueryVo  协议费用审核查询实体
+     * @return
+     */
     Page<PtlAgreementProductCostsNew> getCostsPage(Page page,@Param("params") AgreementProductQueryVo agreementProductQueryVo);
     /**
      *  @version

+ 10 - 2
src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -1594,7 +1594,11 @@
             ifo.jq_profit_margin_premiums,
             ifo.sy_profit_margin_premiums,
             ifo.no_profit_margin_premiums,
-            io.is_external
+            io.is_external,
+            pa.agreement_code,
+            pa.job_description,
+            pa.docking_person,
+            pa.docking_phone
         FROM
             ins_fee_order_new ifo
                 LEFT JOIN ins_fee_audit ifa ON ifo.ins_order_no = ifa.ins_order_no
@@ -1666,7 +1670,11 @@
             ifo.third_detail_premiums,
             ifo.jq_profit_margin_premiums,
             ifo.sy_profit_margin_premiums,
-            ifo.no_profit_margin_premiums
+            ifo.no_profit_margin_premiums,
+            pa.agreement_code,
+            pa.job_description,
+            pa.docking_person,
+            pa.docking_phone
         </if>
 
     </select>

+ 3 - 3
src/main/resources/mapper/modules/protocols/PtlAgreementProductCostsNewMapper.xml

@@ -7,14 +7,14 @@
     <select id="getCostsPage" resultType="com.ydtech.modules.protocols.entity.po.PtlAgreementProductCostsNew">
         SELECT
         pa.insurance_company,
-        pa.agreement_name,
+        concat(pa.agreement_name, '-', pa.business_description, '-',pa.job_description) as agreement_name,
         papcn.*,
         iuf.file_name as fee_file_name,
         iuf.url as fee_file_url
         FROM
         ptl_agreement_product_costs_new papcn
         LEFT JOIN ptl_agreement pa ON papcn.agreement_id = pa.id
-        LEFT JOIN ins_upload_files iuf on  pa.fee_file_id = iuf.id
+        LEFT JOIN ins_upload_files iuf on pa.fee_file_id = iuf.id
         where 1=1
         and pa.deleted = 0
         <if test="params.agreementIds != null and params.agreementIds != ''">
@@ -42,7 +42,7 @@
         <if test="params.productCode != null and params.productCode.size() > 0">
             AND papcn.product_id in
             <foreach item="item" index="index" collection="params.productCode" open="(" separator="," close=")">
-            #{item}
+                #{item}
             </foreach>
         </if>
         <if test="params.createStartTime != null and params.createStartTime != ''">