报价 添加返回总出口费用 费用审核 添加审核人 审核时间

src/main/java/com/ydtech/modules/ins/model/vo/QuoteRespVo.java

@@ -150,6 +150,9 @@ public class QuoteRespVo {
     @ApiModelProperty("非车出口费用")
     private BigDecimal noExportFee;
 
+    @ApiModelProperty("总计出口费用")
+    private BigDecimal sumExportFee;
+
 
     public List<AccidentResponseVo> getAccidentInfo() {
         return accident == null ? Collections.emptyList() : accident;

src/main/java/com/ydtech/modules/order/aop/aspect/QuoteVerificationAspect.java

@@ -92,6 +92,10 @@ public class QuoteVerificationAspect {
             result.getData().setJqExportFee(subOrderExportFeeVo.getJqExportCosts());
             result.getData().setSyExportFee(subOrderExportFeeVo.getSyExportCosts());
             result.getData().setNoExportFee(subOrderExportFeeVo.getNoExportCosts());
+            result.getData().setSumExportFee(subOrderExportFeeVo.getJqExportCosts()
+                    .add(subOrderExportFeeVo.getSyExportCosts())
+                    .add(subOrderExportFeeVo.getNoExportCosts()));
+
         } catch (Exception ignored) {
             System.out.printf("费用因子匹配失败:" + ignored.getMessage());
         }

src/main/java/com/ydtech/modules/order/entity/InsOrders.java

@@ -229,6 +229,12 @@ public class InsOrders implements Serializable {
     @TableField(exist = false)
     private String auditStatus;  //订单费用审核状态
 
+    @TableField(exist = false)
+    private String auditUser;   //订单费用审核人
+
+    @TableField(exist = false)
+    private String auditTime;   //订单费用审核时间
+
 
     public InsOrders(SysUser user, SysDept dept, BaseQuoteInfoVo quoteInfoVo) {
         // 2. 组装订单

src/main/java/com/ydtech/modules/order/entity/vo/InsOrdersEditingVo.java

@@ -150,6 +150,9 @@ public class InsOrdersEditingVo extends InsOrders implements Serializable {
         @ApiModelProperty("非车出口费用")
         private BigDecimal noExportFee;
 
+        @ApiModelProperty("总共出口费用")
+        private BigDecimal sumExportFee;
+
         public InsAreaCompanyEditingDto(InsAreaCompanyQueryDto insAreaCompany) {
             this.orderno = insAreaCompany.getOrderno();
             this.orderstatus = insAreaCompany.getOrderstatus();

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -726,6 +726,9 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                 result.setJqExportFee(subOrderExportFeeVo.getJqExportCosts());
                 result.setSyExportFee(subOrderExportFeeVo.getSyExportCosts());
                 result.setNoExportFee(subOrderExportFeeVo.getNoExportCosts());
+                result.setSumExportFee(subOrderExportFeeVo.getJqExportCosts()
+                        .add(subOrderExportFeeVo.getSyExportCosts())
+                        .add(subOrderExportFeeVo.getNoExportCosts()));
             });
 
         });

src/main/java/com/ydtech/modules/protocol/service/impl/PtlAgreementServiceImpl.java

@@ -350,10 +350,8 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         LambdaQueryWrapper<PtlAgreement> wrapper = new LambdaQueryWrapper<>();
         // 获取供应商本级id 及其 下级id
         List<String> lowerId = esmInsCompanyService.getByLowerId(ptlAgreementPageVo.getPartnerCompaniesId());
-        // 审核状态
-        wrapper.eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getAuditStatus()), PtlAgreement::getAuditStatus, ptlAgreementPageVo.getAuditStatus())
-                //是否有效
-                .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getValidStatus()), PtlAgreement::getValidStatus, ptlAgreementPageVo.getValidStatus())
+        //是否有效
+        wrapper.eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getValidStatus()), PtlAgreement::getValidStatus, ptlAgreementPageVo.getValidStatus())
                 // 供应商类型
                 .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getCompaniesType()), PtlAgreement::getCompaniesType, ptlAgreementPageVo.getCompaniesType())
                 // 协议类型

src/main/resources/mapper/modules/order/InsAreaCompanyMapper.xml

@@ -135,21 +135,33 @@
     <select id="getPendingAuditOrders" resultType="com.ydtech.modules.order.entity.InsOrders">
         SELECT
         io.*,
-        sd.management_source
+        sd.management_source,
+        su2.name AS auditUser,
+        ifa.audittime as auditTime
         FROM
-        ins_orders io left join sys_user su on su.id = io.userid left join sys_dept sd on sd.id = su.dept_id
+        ins_orders io
+        LEFT JOIN ins_fee_audit ifa ON ifa.orderno = io.orderno
+        LEFT JOIN sys_user su ON su.id = io.userid
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        LEFT JOIN sys_user su2 on ifa.audituser = su2.id
         WHERE
-        orderno IN (
+        io.orderno IN (
         SELECT
         orderno
         FROM
         ins_area_company
         WHERE
-        id IN ( SELECT ins_order_no FROM ins_fee_order_new WHERE ins_order_no NOT IN ( SELECT ins_order_no FROM ins_fee_audit ) )
-        AND orderstatus = 3
+        id IN (
+        SELECT
+        ifon.ins_order_no
+        FROM
+        ins_fee_order_new ifon
+        RIGHT JOIN ins_fee_audit ifa ON ifon.ins_order_no = ifa.ins_order_no
+        WHERE
+        ifa.auditstatus = #{params.auditStatus}
         )
-        AND
-        orderstatus= 3
+        )
+        AND orderstatus = 3
 <!--        <if test="params.orderNo != null and params.orderNo != ''">-->
 <!--            AND orderno = #{params.orderNo}-->
 <!--        </if>-->
@@ -304,19 +316,33 @@
     <select id="getAlreadyAuditOrders" resultType="com.ydtech.modules.order.entity.InsOrders">
         SELECT
         io.*,
-        sd.management_source
+        sd.management_source,
+        su2.name AS auditUser,
+        ifa.audittime as auditTime
         FROM
-        ins_orders io left join sys_user su on su.id = io.userid left join sys_dept sd on sd.id = su.dept_id
+        ins_orders io
+        LEFT JOIN ins_fee_audit ifa ON ifa.orderno = io.orderno
+        LEFT JOIN sys_user su ON su.id = io.userid
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        LEFT JOIN sys_user su2 on ifa.audituser = su2.id
         WHERE
-        orderno IN (
+        io.orderno IN (
         SELECT
         orderno
         FROM
         ins_area_company
         WHERE
-        id IN ( SELECT ifon.ins_order_no FROM ins_fee_order_new ifon RIGHT JOIN ins_fee_audit ifa ON ifon.ins_order_no = ifa.ins_order_no where ifa.auditstatus = #{params.auditStatus} ))
-          AND
-            orderstatus = 3
+        id IN (
+        SELECT
+        ifon.ins_order_no
+        FROM
+        ins_fee_order_new ifon
+        RIGHT JOIN ins_fee_audit ifa ON ifon.ins_order_no = ifa.ins_order_no
+        WHERE
+        ifa.auditstatus = #{params.auditStatus}
+        )
+        )
+        AND orderstatus = 3
 <!--        <if test="params.orderNo != null and params.orderNo != ''">-->
 <!--            AND orderno = #{params.orderNo}-->
 <!--        </if>-->