修改bug

commons/src/main/java/com/jzg/commons/entity/agreement/po/PtlAgreementAttribution.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.jzg.commons.core.base.BaseModel;
 import com.jzg.commons.entity.agreement.vo.PtlAgreementAttributionSaveVo;
 import com.jzg.commons.util.idgen.IdGenerate;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -14,7 +15,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
 
 /**
  * @author quchen
@@ -27,7 +27,7 @@ import java.io.Serializable;
 @EqualsAndHashCode
 @AllArgsConstructor
 @TableName(value = "ptl_agreement_attribution", autoResultMap = true)
-public class PtlAgreementAttribution implements Serializable {
+public class PtlAgreementAttribution extends BaseModel {
     @Schema(description = "id")
     @TableId(value = "id")
     private String id;
@@ -86,7 +86,7 @@ public class PtlAgreementAttribution implements Serializable {
 
     @Schema(description = "是否删除 1 是 0 否")
     @TableField(value = "is_delete")
-    private String isDelete;
+    private Integer isDelete;
 
     @TableField(exist = false)
     private String url;

commons/src/main/java/com/jzg/commons/entity/dto/CostExternalPageParam.java

@@ -20,8 +20,8 @@ public class CostExternalPageParam extends PageRequest {
     @Schema(description = "承保规则")
     private String rulesName;
 
-    @Schema(description = "费用规则")
-    private String costRules;
+    @Schema(description = "费用描述")
+    private String costDescribe;
 
     @Schema(description = "费用状态")
     private String agreementStatus;

commons/src/main/java/com/jzg/commons/entity/quote/vo/orders/InsOrdersVo.java

@@ -86,4 +86,7 @@ public class InsOrdersVo extends QuoteVo {
     @Schema(description = "订单其他信息")
     private InsOrdersOther insOrdersOther;
 
+    @Schema(description = "车船税信息")
+    private InsOrdersTax insOrdersTax;
+
 }

commons/src/main/java/com/jzg/commons/entity/vo/CostExternalListVo.java

@@ -34,6 +34,9 @@ public class CostExternalListVo {
     @Schema(description = "费用描述")
     private String costDescribe;
 
+    @Schema(description = "承保规则")
+    private String rulesName;
+
     @Schema(description = "是否现询 0 -是；1-否")
     private String isInquiry;
 

platform/src/main/java/com/jzg/controller/AgreementAttributionController.java

@@ -3,6 +3,7 @@ package com.jzg.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.aop.OperatorTrajectory;
 import com.jzg.commons.constants.OperationTypeEnum;
+import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.agreement.vo.PtlAgreementAttributionDeptVo;
 import com.jzg.commons.entity.agreement.vo.PtlAgreementAttributionQueryVo;
@@ -27,7 +28,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/manager/attribution")
 @Tag(name="保险公司归属账号配置")
-public class AgreementAttributionController {
+public class AgreementAttributionController extends BaseController {
 
     @Resource
     private PtlAgreementAttributionService agreementAttributionService;

platform/src/main/java/com/jzg/service/impl/PtlAgreementAttributionImpl.java

@@ -116,7 +116,7 @@ public class PtlAgreementAttributionImpl extends ServiceImpl<PtlAgreementAttribu
             if (!ptlAgreements.isEmpty()) {
                 throw new SystemException("当前账号有部分报价协议，请更换协议的账号后，再进行删除");
             }
-            ptlAgreementAttribution.setIsDelete("1");
+            ptlAgreementAttribution.setIsDelete(1);
             ptlAgreementAttributionService.updateById(ptlAgreementAttribution);
         }
         return true;

platform/src/main/resources/mapper/PtlAgreementAttributionMapper.xml

@@ -30,7 +30,7 @@
         left join esm_ins_company eic on paa.ins_company_id = eic.id
         where
         1=1
-            and paa.is_delete = '0'
+        and paa.is_delete = '0'
         <if test="ptlAgreementAttributionQueryVo.username != null and ptlAgreementAttributionQueryVo.username != ''">
             and paa.username like concat('%',#{ptlAgreementAttributionQueryVo.username},'%')
             or paa.user_abbr like concat('%',#{ptlAgreementAttributionQueryVo.username},'%')
@@ -47,6 +47,7 @@
         <if test="ptlAgreementAttributionQueryVo.userDept != null and ptlAgreementAttributionQueryVo.userDept != ''">
             and paa.user_dept = #{ptlAgreementAttributionQueryVo.userDept}
         </if>
+        order by paa.create_time desc
     </select>
 
     <select id="getAgreementAttribution" resultMap="BaseResultMap">

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsOrdersTaxService.java

@@ -3,7 +3,8 @@ package com.jzg.quotation.summary.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersTax;
+import com.jzg.commons.entity.quote.vo.QuoteVo;
 
 public interface InsOrdersTaxService extends IService<InsOrdersTax> {
-    void createTax(InsOrders insOrders);
+    void createTax(InsOrders insOrders, QuoteVo quoteVo);
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -356,6 +356,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                 }
             });
         }
+        insOrdersVo.setInsOrdersTax(insOrdersTaxService.getById(id));
         setInsOrdersExternalPolicy(insOrdersVo.getInsOrdersExternalPolicy());
         return insOrdersVo;
     }
@@ -721,7 +722,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         insOrdersRiskService.createRisk(insOrders, quoteVo.getCiRiskInfoVo(),quoteVo.getBiRiskInfoVo());
 
         // 保存订单车船税税信息 ins_orders_tax
-        insOrdersTaxService.createTax(insOrders);
+        insOrdersTaxService.createTax(insOrders,quoteVo);
 
         // 创建订单轨迹
         String optContent = baseController.getUserName() + "创建了订单";

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersTaxServiceImpl.java

@@ -3,15 +3,17 @@ package com.jzg.quotation.summary.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersTax;
+import com.jzg.commons.entity.quote.vo.QuoteVo;
 import com.jzg.quotation.summary.mapper.InsOrdersTaxMapper;
 import com.jzg.quotation.summary.service.InsOrdersTaxService;
 import org.springframework.stereotype.Service;
 
 @Service
 public class InsOrdersTaxServiceImpl extends ServiceImpl<InsOrdersTaxMapper, InsOrdersTax> implements InsOrdersTaxService {
-    public void createTax(InsOrders insOrders) {
+    public void createTax(InsOrders insOrders,QuoteVo quoteVo) {
         InsOrdersTax insOrdersTax = new InsOrdersTax();
         insOrdersTax.setOrderNo(insOrders.getId());
+        insOrdersTax.setTaxRelifFlag(Integer.parseInt(quoteVo.getVehicleAndVesselTaxVo().getTaxRelifFlag()));
         this.save(insOrdersTax);
     }
 }

tenant/organization/src/main/resources/mapper/PtlAgreementCostExternalMapper.xml

@@ -139,8 +139,8 @@
             <if test="costParam.rulesName != null and costParam.rulesName != ''">
                 AND ce.rule_description  like concat('%',#{costParam.rulesName},'%')
             </if>
-            <if test="costParam.costRules != null and costParam.costRules != ''">
-                AND ce.cost_rules  like concat('%',#{costParam.costRules},'%')
+            <if test="costParam.costDescribe != null and costParam.costDescribe != ''">
+                AND ce.cost_describe  like concat('%',#{costParam.costDescribe},'%')
             </if>
             <if test="costParam.agreementStatus != null and costParam.agreementStatus != ''">
                 AND ce.is_enabled = #{costParam.agreementStatus}