Merge remote-tracking branch 'origin/test' into test

# Conflicts:
#	src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementProductCostsNewServiceImpl.java

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceImpl.java

@@ -2804,10 +2804,10 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         BigDecimal noTaxEntranceTotalProportion = entranceTotalProportion.divide(taxRate,2,RoundingMode.DOWN);
         //出口的总比例
         BigDecimal exportTotalProportion = noTaxEntranceTotalProportion.subtract(deptTotalProportion).subtract(retailTotalProportion);
-//        if(exportTotalProportion.compareTo(BigDecimal.ZERO) < 0 ){
-//            //出口比例为负数了
-//            exportTotalProportion = new BigDecimal(0);
-//        }
+        if(exportTotalProportion.compareTo(BigDecimal.ZERO) < 0 && premium.compareTo(BigDecimal.ZERO) == 0){
+            //出口比例为负数了
+            exportTotalProportion = new BigDecimal(0);
+        }
         //如果手续费 大于 总比例 则出口手续费等于总比例
         if(superviseCostsProportion.compareTo(exportTotalProportion) >= 0 ){
             superviseCostsProportion = exportTotalProportion;
@@ -2822,6 +2822,7 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         exportFee.setSuperviseCostsPremiums(premium.multiply(exportFee.getSuperviseCosts().divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_HALF_UP));
         exportFee.setOtherCostsPremiums(premium.multiply(exportFee.getOtherCostsProportion().divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_HALF_UP));
         exportFee.setTotalAmount(premium.multiply(exportFee.getTotalProportion().divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_HALF_UP));
+
         return exportFee;
     }
 

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceNewImpl.java

@@ -483,7 +483,12 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
                 if (collect.size() > 0) {
                     logs.append("规则匹配失败:" + collect.get(0).getAttrName() + "\n");
                 }
-                logs.append("检验的值:" + ptlAgreementProductCostsAttrLinks.get(i).getMin() + "\n");
+                if(ptlAgreementProductCostsAttrLinks.get(i).getMin() != null) {
+                    logs.append("检验的值:" + ptlAgreementProductCostsAttrLinks.get(i).getMin() + "\n");
+                }else{
+                    logs.append("检验的值:" + ptlAgreementProductCostsAttrLinks.get(i).getMax() + "\n");
+                }
+
                 logs.append("传入的值:" + ruleAttrMappingVo.getValue() + "\n");
                 return false;
             }

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -11,7 +11,6 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.sun.javafx.fxml.LoadListener;
 import com.ydtech.constants.enums.dict.agreement.ProductsType;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;

src/main/java/com/ydtech/modules/ins/model/yc/audit/Audit.java

@@ -273,8 +273,8 @@ public class Audit {
         //<taxATion>
         TaxATion taxATion = new TaxATion();
         taxATion.setCTaxType("338001");
-        taxATion.setClntMark("1");
-//        taxATion.setClntMark("3");
+//        taxATion.setClntMark("1");
+        taxATion.setClntMark("3");
         taxATion.setTaxpayerComid(applyInfo.getIdentifyNumber());
         taxATion.setTaxName(applyInfo.getName());
         taxATion.setClntAddress(applyInfo.getAddr());

src/main/java/com/ydtech/modules/order/components/zijin/ZijinRequestApiComponents.java

@@ -351,11 +351,11 @@ public class ZijinRequestApiComponents {
      * @param queryOrderDetailRequest 紫金财险 订单状态查询 入参实体
      * @return 出参实体
      */
-    public QueryOrderStateResponse queryOrderDetail(QueryOrderDetailRequest queryOrderDetailRequest, HttpHeaders httpHeaders) {
-        return request(zijinApiConfigurationProperties.getOrderDetailUrl(), RequestUrl.QUERY_ORDER_DETAIL.getDesc(),
-                queryOrderDetailRequest, QueryOrderStateResponse.class, httpHeaders);
-    }
-
+//    public QueryOrderStateResponse queryOrderDetail(QueryOrderDetailRequest queryOrderDetailRequest, HttpHeaders httpHeaders) {
+//        return request(zijinApiConfigurationProperties.getOrderDetailUrl(), RequestUrl.QUERY_ORDER_DETAIL.getDesc(),
+//                queryOrderDetailRequest, QueryOrderStateResponse.class, httpHeaders);
+//    }
+//
 
     /**
      * 未缴费保单撤单

src/main/java/com/ydtech/modules/order/entity/api/zijin/constants/enums/UnderWriteFlagEnum.java

@@ -0,0 +1,30 @@
+package com.ydtech.modules.order.entity.api.zijin.constants.enums;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+
+
+/**
+ * @version
+ * @description: 核保状态代码
+ * @author: wenks
+ * @date: 2024/5/22 15:10
+ **/
+@AllArgsConstructor
+@Getter
+public enum UnderWriteFlagEnum {
+
+    U_0("0","未提交"),
+    U_1("1","已生效"),
+    U_2("2","待修改"),
+    U_4("4","待缴费"),
+    U_7("7","待复核"),
+    U_9("9","待核保");
+
+    private final String code;
+
+    private final String desc;
+
+}

src/main/java/com/ydtech/modules/order/entity/api/zijin/response/QueryOrderDetailResponse.java

@@ -80,8 +80,234 @@ public class QueryOrderDetailResponse extends BaseResponse implements Serializab
         @JsonProperty("orderPolicyList")
         private List<OrderPolicyListDTO> orderPolicyList;
 
+        @JsonProperty("baseInfo")
+        private BaseInfoDTO baseInfo;
+
     }
 
+    @NoArgsConstructor
+    @Data
+    public static class BaseInfoDTO implements Serializable {
+
+        private static final long serialVersionUID = -4278242250316276923L;
+
+        @JsonProperty("policyNo")
+        private String policyNo;
+        @JsonProperty("proposalNo")
+        private String proposalNo;
+        @JsonProperty("policyNoCI")
+        private String policyNoCI;
+        @JsonProperty("proposalNoCI")
+        private String proposalNoCI;
+        @JsonProperty("underWriteFlag")
+        private String underWriteFlag;
+        @JsonProperty("underWriteFlagCI")
+        private String underWriteFlagCI;
+        @JsonProperty("underWriteMessageCI")
+        private String underWriteMessageCI;
+        @JsonProperty("underWriteMessage")
+        private String underWriteMessage;
+        @JsonProperty("ciApplicationStatus")
+        private String ciApplicationStatus;
+        @JsonProperty("applicationStatus")
+        private Object applicationStatus;
+        @JsonProperty("startDate")
+        private String startDate;
+        @JsonProperty("startHour")
+        private String startHour;
+        @JsonProperty("startMinute")
+        private String startMinute;
+        @JsonProperty("endDate")
+        private String endDate;
+        @JsonProperty("endHour")
+        private String endHour;
+        @JsonProperty("endMinute")
+        private String endMinute;
+        @JsonProperty("startDateCI")
+        private String startDateCI;
+        @JsonProperty("startHourCI")
+        private String startHourCI;
+        @JsonProperty("startMinuteCI")
+        private String startMinuteCI;
+        @JsonProperty("endDateCI")
+        private String endDateCI;
+        @JsonProperty("endHourCI")
+        private String endHourCI;
+        @JsonProperty("endMinuteCI")
+        private String endMinuteCI;
+        @JsonProperty("inputDate")
+        private String inputDate;
+        @JsonProperty("pnpDate")
+        private String pnpDate;
+        @JsonProperty("relationPolicyFlag")
+        private String relationPolicyFlag;
+        @JsonProperty("isInstantFlag")
+        private Object isInstantFlag;
+        @JsonProperty("autoTransRenewFlag")
+        private Object autoTransRenewFlag;
+        @JsonProperty("sumPremium")
+        private Object sumPremium;
+        @JsonProperty("sumPremiumCI")
+        private Object sumPremiumCI;
+        @JsonProperty("policyType")
+        private Object policyType;
+        @JsonProperty("invoiceType")
+        private Object invoiceType;
+        @JsonProperty("policyTypeCI")
+        private Object policyTypeCI;
+        @JsonProperty("invoiceTypeCI")
+        private Object invoiceTypeCI;
+        @JsonProperty("applicationType")
+        private Object applicationType;
+        @JsonProperty("calculateFlag")
+        private String calculateFlag;
+        @JsonProperty("sumAmount")
+        private Object sumAmount;
+        @JsonProperty("argueSolution")
+        private Object argueSolution;
+        @JsonProperty("arbitBoardName")
+        private Object arbitBoardName;
+        @JsonProperty("needKindCodes")
+        private Object needKindCodes;
+        @JsonProperty("answer")
+        private Object answer;
+        @JsonProperty("demandNo")
+        private String demandNo;
+        @JsonProperty("demandNoCI")
+        private Object demandNoCI;
+        @JsonProperty("answerCI")
+        private Object answerCI;
+        @JsonProperty("provinceCode")
+        private Object provinceCode;
+        @JsonProperty("provinceName")
+        private Object provinceName;
+        @JsonProperty("cityCode")
+        private Object cityCode;
+        @JsonProperty("cityName")
+        private Object cityName;
+        @JsonProperty("networkCode")
+        private Object networkCode;
+        @JsonProperty("networkName")
+        private Object networkName;
+        @JsonProperty("saveCustomerFlag")
+        private Object saveCustomerFlag;
+        @JsonProperty("introduceCode")
+        private Object introduceCode;
+        @JsonProperty("introduceName")
+        private Object introduceName;
+        @JsonProperty("introduceAgreementNo")
+        private Object introduceAgreementNo;
+        @JsonProperty("channelCode")
+        private Object channelCode;
+        @JsonProperty("channelName")
+        private Object channelName;
+        @JsonProperty("localCharge")
+        private Object localCharge;
+        @JsonProperty("floatCoefficient")
+        private Object floatCoefficient;
+        @JsonProperty("operationName")
+        private Object operationName;
+        @JsonProperty("operationGrade")
+        private Object operationGrade;
+        @JsonProperty("hospitalName")
+        private Object hospitalName;
+        @JsonProperty("outpatientNumber")
+        private Object outpatientNumber;
+        @JsonProperty("pbSourceType")
+        private Object pbSourceType;
+        @JsonProperty("anaesthesiaProject")
+        private Object anaesthesiaProject;
+        @JsonProperty("sumQuantity")
+        private Object sumQuantity;
+        @JsonProperty("isMajorOperation")
+        private Object isMajorOperation;
+        @JsonProperty("shareId")
+        private Object shareId;
+        @JsonProperty("insurancePeriod")
+        private Object insurancePeriod;
+        @JsonProperty("salesPerson")
+        private Object salesPerson;
+        @JsonProperty("professionalNum")
+        private Object professionalNum;
+        @JsonProperty("comCode")
+        private Object comCode;
+        @JsonProperty("handler1Code")
+        private Object handler1Code;
+        @JsonProperty("businessNature")
+        private Object businessNature;
+        @JsonProperty("agentCode")
+        private Object agentCode;
+        @JsonProperty("agreementNo")
+        private Object agreementNo;
+        @JsonProperty("discount")
+        private Object discount;
+        @JsonProperty("operatorCode")
+        private Object operatorCode;
+        @JsonProperty("othFlag")
+        private Object othFlag;
+        @JsonProperty("replationInfo")
+        private Object replationInfo;
+        @JsonProperty("exhibitAgencyAgreementNo")
+        private Object exhibitAgencyAgreementNo;
+        @JsonProperty("isDjq")
+        private String isDjq;
+        @JsonProperty("lcRate")
+        private Object lcRate;
+        @JsonProperty("forceDownModify")
+        private Object forceDownModify;
+        @JsonProperty("choosePremium")
+        private Object choosePremium;
+        @JsonProperty("split")
+        private Object split;
+        @JsonProperty("mixFlag")
+        private Object mixFlag;
+        @JsonProperty("xbFlag")
+        private Object xbFlag;
+        @JsonProperty("xbFlagCI")
+        private Object xbFlagCI;
+        @JsonProperty("machineCode")
+        private Object machineCode;
+        @JsonProperty("mergeFlag")
+        private Object mergeFlag;
+        @JsonProperty("goalInsuredFlag")
+        private Object goalInsuredFlag;
+        @JsonProperty("lender")
+        private Object lender;
+        @JsonProperty("renewalInfoDto")
+        private Object renewalInfoDto;
+        @JsonProperty("oldPolicyNo")
+        private Object oldPolicyNo;
+        @JsonProperty("uwRel")
+        private Object uwRel;
+        @JsonProperty("additionSumPremium")
+        private Double additionSumPremium;
+        @JsonProperty("visaCode")
+        private Object visaCode;
+        @JsonProperty("locTypeCode")
+        private Object locTypeCode;
+        @JsonProperty("projectId")
+        private Object projectId;
+        @JsonProperty("productGroupNo")
+        private Object productGroupNo;
+        @JsonProperty("quotationNo")
+        private String quotationNo;
+        @JsonProperty("installPayFlag")
+        private Object installPayFlag;
+        @JsonProperty("installPayYears")
+        private Object installPayYears;
+        @JsonProperty("productFlag")
+        private Object productFlag;
+        @JsonProperty("productId")
+        private Object productId;
+        @JsonProperty("merchandiseId")
+        private Object merchandiseId;
+        @JsonProperty("merchandiseCode")
+        private Object merchandiseCode;
+        @JsonProperty("noCarAttachmentFileDtoList")
+        private Object noCarAttachmentFileDtoList;
+    }
+
+
     @NoArgsConstructor
     @Data
     public static class OrderPolicyListDTO implements Serializable {

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

@@ -256,6 +256,19 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         String realUserId = userId;//实际跟单业务人默认登录人
         boolean daikeFlag = false;//是否代客录单业务
         //添加出单员报价的逻辑,
+
+        //判断传入的用户id  是admin   或者 前线人员的id
+        if(StringUtils.isNotEmpty(quoteInfoVo.getUserId())){
+              if("admin".equals(quoteInfoVo.getUserId()) || quoteInfoVo.getUserId().contains("M")){
+                  realUserId=quoteInfoVo.getUserId();
+                  //userId=quoteInfoVo.getUserId();
+              }else{
+                  throw new SystemException("后线人员不允许报价！！");
+              }
+        }else{
+            throw new SystemException("未选择业务员！！");
+        }
+        /**
         boolean isCdy = false;//是否出单员标志
         if (StringUtils.isNotEmpty(userId)) {
             SysUserRole userRole = sysUserRoleService.selectByUserId(userId);
@@ -275,19 +288,19 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                 daikeFlag = true;
             }
         }
-
+        **/
         // 1. 验证订单参数
         orderComponents.checkEmpty(quoteInfoVo);
         SysUser user = sysUserService.getById(realUserId);
         SysDept dept = sysDeptService.getById(user.getDeptId());
         // 2 构造订单
         InsOrders insOrders = new InsOrders(user, dept, quoteInfoVo);
-        if (daikeFlag) {//当时代客录单业务时，才需要赋值该字段
-            insOrders.setOperatorid(userId);//赋值代客录单操作人为登录人
-        }
-        if (isCdy) {//赋值出单员  操作人为登录人
+        //if (daikeFlag) {//当时代客录单业务时，才需要赋值该字段
+        //    insOrders.setOperatorid(userId);//赋值代客录单操作人为登录人
+        //}
+        //if (isCdy) {//赋值出单员  操作人为登录人
             insOrders.setOperatorid(userId);
-        }
+        //}
         InsOrders insOrders1 = baseMapper.selectById(quoteInfoVo.getOrderNo());
 
         //需要赋值代录单人ID

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

@@ -18,10 +18,7 @@ import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsAreaCompanyAccidentalDriving;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.TaxArrears;
-import com.ydtech.modules.order.entity.api.zijin.constants.enums.BusType;
-import com.ydtech.modules.order.entity.api.zijin.constants.enums.OrderStatusEnum;
-import com.ydtech.modules.order.entity.api.zijin.constants.enums.ResultEnum;
-import com.ydtech.modules.order.entity.api.zijin.constants.enums.RiskCodeEnum;
+import com.ydtech.modules.order.entity.api.zijin.constants.enums.*;
 import com.ydtech.modules.order.entity.api.zijin.request.*;
 import com.ydtech.modules.order.entity.api.zijin.response.*;
 import com.ydtech.modules.order.entity.config.ZjConfigureParameters;
@@ -225,24 +222,20 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
 
         } catch (SystemException systemException) {
             // 下发修改
-            QueryOrderDetailRequest queryOrderDetailRequest = new QueryOrderDetailRequest(insAreaCompany.getInsOrderNo());
-            QueryOrderStateResponse queryOrderStateResponse = zijinRequestApiComponents.queryOrderDetail(queryOrderDetailRequest,
-                    httpHeaders);
-            String uwFlag = queryOrderStateResponse.getUwFlag();
-            if (OrderStatusEnum.O_3.getCode().equals(uwFlag)) {
-                insAreaCompany.setOrderstatus(InsOrderStatusEnum.TO_BACK.getCode());
-                String uwMsg = queryOrderStateResponse.getUwMsg();
-                if (StringUtils.isEmpty(uwMsg)) {
-                    uwMsg = systemException.getMessage();
-                }
-
-                // 人工核保
-                if (uwFlag.contains(OrderStatusEnum.O_1000.getName())) {
-                    insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_AUDIT.getCode());
-                }
+            OrderNoRequest orderNoRequest = new OrderNoRequest(insAreaCompany.getId());
+            QueryOrderDetailResponse queryOrderDetailResponse = zijinRequestApiComponents.getOrderDetail(orderNoRequest, httpHeaders);
+            QueryOrderDetailResponse.ResultObjDTO resultObj = queryOrderDetailResponse.getResultObj();
+            String uwMsg = systemException.getMessage();
 
+            if (OrderStatusEnum.O_3.getCode().equals(resultObj.getOrderStatus())) {
+                insAreaCompany.setOrderstatus(InsOrderStatusEnum.TO_BACK.getCode());
                 insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
                 return HttpResult.error(OrderStatusEnum.O_3.getName() + ":" + uwMsg);
+                // 人工核保
+            } else if (OrderStatusEnum.O_1.getCode().equals(resultObj.getOrderStatus())) {
+                insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_AUDIT.getCode());
+                insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
+                return HttpResult.error("人工核保" + ":" + uwMsg);
             }
 
             throw new SystemException(systemException.getMessage());
@@ -425,18 +418,22 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
                 ptlAgreementAttribution);
         HttpHeaders httpHeaders = zijinRequestApiComponents.getHttpHeaders(insAreaCompany.getAgreementId());
         // 2 请求查看订单状态
-        QueryOrderDetailRequest queryOrderDetailRequest = new QueryOrderDetailRequest(insAreaCompany.getInsOrderNo());
-        QueryOrderStateResponse response = zijinRequestApiComponents.queryOrderDetail(queryOrderDetailRequest,
-                httpHeaders);
+
+
+        OrderNoRequest orderNoRequest = new OrderNoRequest(insAreaCompany.getId());
+        QueryOrderDetailResponse queryOrderDetailResponse = zijinRequestApiComponents.getOrderDetail(orderNoRequest, httpHeaders);
+
         // 3. 订单生效以后修改状态
-        String uwFlag = response.getUwFlag();
+        QueryOrderDetailResponse.ResultObjDTO resultObj = queryOrderDetailResponse.getResultObj();
+
+        if (OrderStatusEnum.O_2.getCode().equals(resultObj.getOrderStatus())) {
+            QueryOrderDetailResponse.BaseInfoDTO baseInfo = queryOrderDetailResponse.getResultObj().getBaseInfo();
 
-        if (OrderStatusEnum.O_2.getCode().equals(uwFlag)) {
-            insAreaCompany.setJqpolicyno(response.getTciProposalNo());
-            insAreaCompany.setSypolicyno(response.getVciProposalNo());
+            insAreaCompany.setJqpolicyno(baseInfo.getPolicyNoCI());
+            insAreaCompany.setSypolicyno(baseInfo.getPolicyNo());
             // 2.2 投保单号
-            insAreaCompany.setJqapplyno(response.getTciPolicyNo());
-            insAreaCompany.setSyapplyno(response.getVciPolicyNo());
+            insAreaCompany.setJqapplyno(baseInfo.getProposalNoCI());
+            insAreaCompany.setSyapplyno(baseInfo.getProposalNo());
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());
             // 3. 聚合支付服务
             BigDecimal multiply = insAreaCompany.getSumpremium().multiply(new BigDecimal(100));
@@ -447,10 +444,17 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
             insAreaCompany.setPaymentLink(zbfAggregatePayResponse.getPayUrl());
             insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
             return HttpResult.ok("核保成功");
-        } else if (OrderStatusEnum.O_3.getCode().equals(uwFlag)) {
+        } else if (OrderStatusEnum.O_3.getCode().equals(resultObj.getOrderStatus())) {
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.TO_BACK.getCode());
             insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
-            return HttpResult.error(OrderStatusEnum.O_3.getName() + ":" + response.getUwMsg());
+
+            List<QueryOrderDetailResponse.OrderPolicyListDTO> orderPolicyListDTOS = resultObj.getOrderPolicyList()
+                    .stream()
+                    .filter(x -> UnderWriteFlagEnum.U_2.getCode().equals(x.getUnderWriteFlag()))
+                    .collect(Collectors.toList());
+            QueryOrderDetailResponse.OrderPolicyListDTO orderPolicyListDTO = orderPolicyListDTOS.get(0);
+
+            return HttpResult.error(OrderStatusEnum.O_3.getName() + ":" + orderPolicyListDTO.getUnderWriteMessage());
         }
 
         return HttpResult.ok("核保状态未修改");

src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementProductCostsNewServiceImpl.java

@@ -498,6 +498,8 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
                     ptlAgreementProductCostsNewHistory.setPriorityLevel(ptlAgreementProductCostsNew.getPriorityLevel());
                     ptlAgreementProductCostsNewHistory.setBatch(uuid);
                     ptlAgreementProductCostsNewHistory.setOperatorType("add");
+                    ptlAgreementProductCostsNewHistory.setProductId(agreementProductCosts.getProductId().get(i));
+                    ptlAgreementProductCostsNewHistory.setProductName(agreementProductCosts.getProductName().get(i));
                     ptlAgreementProductCostsNewHistory.setModifier(BaseController.getUser().getId());
                     ptlAgreementProductCostsNewHistory.setOperatorTime(LocalDateTime.now());
                     ptlAgreementProductCostsNewHistoryService.save(ptlAgreementProductCostsNewHistory);
@@ -711,6 +713,8 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         //生成批次ID
         String uuid = IdGenerate.nextId();
         ptlAgreementProductCostsNewHistory.setBatch(uuid);
+        ptlAgreementProductCostsNewHistory.setProductId(newProjectId);
+        ptlAgreementProductCostsNewHistory.setProductName(newProjectName);
         ptlAgreementProductCostsNewHistory.setOperatorType("update");
         ptlAgreementProductCostsNewHistory.setModifier(BaseController.getUser().getId());
         ptlAgreementProductCostsNewHistory.setOperatorTime(LocalDateTime.now());
@@ -820,7 +824,8 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         //生成批次ID
         String uuid = IdGenerate.nextId();
         ptlAgreementProductCostsNewHistory.setBatch(uuid);
-
+        ptlAgreementProductCostsNewHistory.setProductId(ptlAgreementProductCostsNew.getProductId());
+        ptlAgreementProductCostsNewHistory.setProductName(ptlAgreementProductCostsNew.getProductName());
         ptlAgreementProductCostsNewHistory.setOperatorType("delete");
         ptlAgreementProductCostsNewHistory.setModifier(BaseController.getUser().getId());
         ptlAgreementProductCostsNewHistory.setOperatorTime(LocalDateTime.now());

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

@@ -149,14 +149,14 @@
         io.agreeid,
         iac.productid,
         iac.product,
-        io.createtime,
+        iac.createtime,
         io.frameno,
         io.licenseno,
         io.insuredname,
-        io.jqstartdate,
-        io.jqenddate,
-        io.systartdate,
-        io.syenddate,
+        iac.jq_start_date as jqstartdate,
+        iac.jq_end_date as jqenddate,
+        iac.sy_start_date as systartdate,
+        iac.sy_end_date as syenddate,
         io.vehicle_and_vessel_tax,
         io.operatorid,
         sd.management_source,
@@ -215,14 +215,14 @@
             and iac.product = #{params.riskCode}
         </if>
         <if test="params.quoteStartDateStr != null and params.quoteStartDateStr != '' and params.quoteEndDateStr != null and params.quoteEndDateStr != ''">
-            and  DATE_FORMAT(io.createtime, '%Y-%m-%d') between #{params.quoteStartDateStr} AND #{params.quoteEndDateStr}
+            and  DATE_FORMAT(iac.createtime, '%Y-%m-%d') between #{params.quoteStartDateStr} AND #{params.quoteEndDateStr}
         </if>
         <if test="params.attachStartDateStr != null and params.attachStartDateStr != '' and params.attachStartDateStr != null and params.attachStartDateStr != '' ">
             and  ((
-            DATE_FORMAT(io.jqstartdate, '%Y-%m-%d') BETWEEN #{params.attachStartDateStr}
+            DATE_FORMAT(iac.jq_start_date, '%Y-%m-%d') BETWEEN #{params.attachStartDateStr}
             AND #{params.attachEndDateStr}
             )
-            OR ( DATE_FORMAT(io.systartdate, '%Y-%m-%d')  BETWEEN #{params.attachStartDateStr} AND #{params.attachEndDateStr} )
+            OR ( DATE_FORMAT(iac.sy_start_date, '%Y-%m-%d')  BETWEEN #{params.attachStartDateStr} AND #{params.attachEndDateStr} )
             )
         </if>
         <if test="params.provinceId != null and params.provinceId != ''">
@@ -253,10 +253,10 @@
             and sd.management_source = #{params.managementSource}
         </if>
         <if test="params.signStartDateStr != null and params.signStartDateStr != '' and params.signEndDateStr != null and params.signEndDateStr != ''">
-            and  DATE_FORMAT(io.createtime, '%Y-%m-%d') between #{params.signStartDateStr} AND #{params.signEndDateStr}
+            and  DATE_FORMAT(iac.signing_time, '%Y-%m-%d') between #{params.signStartDateStr} AND #{params.signEndDateStr}
         </if>
         <if test="params.payStartDateStr != null and params.payStartDateStr != '' and params.payEndDateStr != null and params.payEndDateStr != ''">
-            and  DATE_FORMAT(io.createtime, '%Y-%m-%d') between #{params.payStartDateStr} AND #{params.payEndDateStr}
+            and  DATE_FORMAT(iac.pay_date, '%Y-%m-%d') between #{params.payStartDateStr} AND #{params.payEndDateStr}
         </if>
     </select>
 

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

@@ -812,14 +812,14 @@
         io.agreeid as agreeid,
         iac.productid as productid,
         iac.product as product,
-        io.createtime as createtime,
+        iac.createtime as createtime,
         io.frameno as frameno,
         io.licenseno as licenseno,
         io.insuredname as insuredname,
-        io.jqstartdate as jqstartdate,
-        io.jqenddate as jqenddate,
-        io.systartdate as systartdate,
-        io.syenddate as syenddate,
+        iac.jq_start_date as jqstartdate,
+        iac.jq_end_date as jqenddate,
+        iac.sy_start_date as systartdate,
+        iac.sy_end_date as syenddate,
         io.risk as risk,
         io.king as king,
         io.vehicle_and_vessel_tax as vehicleAndVesselTax,
@@ -897,7 +897,7 @@
                 and io.insuredname = #{orderQueryVo.insuredName}
             </if>
             <if test="orderQueryVo.quoteStartDateStr != null and orderQueryVo.quoteEndDateStr != null">
-                and  DATE_FORMAT(io.createtime, '%Y-%m-%d') between #{orderQueryVo.quoteStartDateStr} AND #{orderQueryVo.quoteEndDateStr}
+                and  DATE_FORMAT(iac.createtime, '%Y-%m-%d') between #{orderQueryVo.quoteStartDateStr} AND #{orderQueryVo.quoteEndDateStr}
             </if>
             <if test="orderQueryVo.companyId != null and orderQueryVo.companyId != ''">
                 and iac.company_id = #{orderQueryVo.companyId}
@@ -937,10 +937,10 @@
             </if>
             <if test="orderQueryVo.attachStartDateStr != null and orderQueryVo.attachEndDateStr != ''">
                 and  ((
-                DATE_FORMAT(io.jqstartdate, '%Y-%m-%d') BETWEEN #{orderQueryVo.attachStartDateStr}
+                DATE_FORMAT(iac.jq_start_date, '%Y-%m-%d') BETWEEN #{orderQueryVo.attachStartDateStr}
                 AND #{orderQueryVo.attachEndDateStr}
                 )
-                OR ( DATE_FORMAT(io.systartdate, '%Y-%m-%d')  BETWEEN #{orderQueryVo.attachStartDateStr} AND #{orderQueryVo.attachEndDateStr} )
+                OR ( DATE_FORMAT(iac.sy_start_date, '%Y-%m-%d')  BETWEEN #{orderQueryVo.attachStartDateStr} AND #{orderQueryVo.attachEndDateStr} )
                 )
             </if>
         </where>
@@ -1009,7 +1009,7 @@
                 and io.insuredname = #{orderQueryVo.insuredName}
             </if>
             <if test="orderQueryVo.quoteStartDateStr != null and orderQueryVo.quoteEndDateStr != null">
-                and DATE_FORMAT(io.createtime, '%Y-%m-%d') between #{orderQueryVo.quoteStartDateStr} AND #{orderQueryVo.quoteEndDateStr}
+                and DATE_FORMAT(iac.createtime, '%Y-%m-%d') between #{orderQueryVo.quoteStartDateStr} AND #{orderQueryVo.quoteEndDateStr}
             </if>
             <if test="orderQueryVo.companyId != null and orderQueryVo.companyId != ''">
                 and iac.company_id = #{orderQueryVo.companyId}
@@ -1049,10 +1049,10 @@
             </if>
             <if test="orderQueryVo.attachStartDateStr != null and orderQueryVo.attachEndDateStr != ''">
                 and  ((
-                DATE_FORMAT(io.jqstartdate, '%Y-%m-%d') BETWEEN #{orderQueryVo.attachStartDateStr}
+                DATE_FORMAT(iac.jq_start_date, '%Y-%m-%d') BETWEEN #{orderQueryVo.attachStartDateStr}
                 AND #{orderQueryVo.attachEndDateStr}
                 )
-                OR ( DATE_FORMAT(io.systartdate, '%Y-%m-%d')  BETWEEN #{orderQueryVo.attachStartDateStr} AND #{orderQueryVo.attachEndDateStr} )
+                OR ( DATE_FORMAT(iac.sy_start_date, '%Y-%m-%d')  BETWEEN #{orderQueryVo.attachStartDateStr} AND #{orderQueryVo.attachEndDateStr} )
                 )
             </if>
         </where>