浏览代码

解决bug:
车险出单---订单管理---只有初始筛选条件,没有高级筛选条件

jiakai 6 月之前
父节点
当前提交
bbfd24bcc6

+ 161 - 0
commons/src/main/java/com/jzg/commons/entity/dto/InsOrdersParamVO.java

@@ -0,0 +1,161 @@
+package com.jzg.commons.entity.dto;
+
+
+import com.jzg.commons.core.base.PageRequest;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+@Data
+@Schema(description = "订单录入分页列表查询参数")
+public class InsOrdersParamVO extends PageRequest {
+
+    // --------------- 你原有字段 ---------------
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    @Schema(description = "车牌号")
+    private String licenseNo;
+
+    @Schema(description = "是否暂存 0-否;1-是")
+    private int isTemporarily;
+
+    @Schema(description = "订单状态")
+    private String orderStatus;
+
+    @Schema(description = "保险公司")
+    private String companyName;
+
+    @Schema(description = "保险公司id")
+    private String companyId;
+
+    @Schema(description = "业务员")
+    private String salesman;
+
+    @Schema(description = "0-待审核;1-已审核;2-已驳回")
+    private String auditStatus;
+
+    @Schema(description = "业务员归属")
+    private String salesmanCompany;
+
+    @Schema(description = "录单时间开始")
+    private String startDate;
+
+    @Schema(description = "录单时间结束")
+    private String endDate;
+
+    @Schema(description = "批改状态")
+    private String adjustStatus;
+
+    @Schema(description = "租户code")
+    private String systemCode;
+
+    @Schema(description = "前端传入录单时间")
+    private String[] recordingTime;
+
+    @Schema(description = "主订单标识")
+    private Integer parentId;
+
+    @Schema(description = "投保人")
+    private String policyholder;
+
+    @Schema(description = "投保人手机号")
+    private String policyholderMobile;
+
+    @Schema(description = "被保人")
+    private String insured;
+
+    @Schema(description = "被保人手机号")
+    private String insuredMobile;
+
+    @Schema(description = "险种Code")
+    private String productCode;
+
+    @Schema(description = "险种名称")
+    private String productName;
+
+    @Schema(description = "车架号")
+    private String vinNo;
+
+    @Schema(description = "车主姓名")
+    private String ownerName;
+
+    @Schema(description = "车主手机号")
+    private String ownerMobile;
+
+    @Schema(description = "投保人姓名(保单)")
+    private String policyName;
+
+    @Schema(description = "投保人手机号(保单)")
+    private String policyMobile;
+
+    @Schema(description = "被保人姓名(保单)")
+    private String insurName;
+
+    @Schema(description = "被保人手机号(保单)")
+    private String insurMobile;
+
+    @Schema(description = "交强险起保日期")
+    private Date ciStartDate;
+
+    @Schema(description = "商业险起保日期")
+    private Date biStartDate;
+
+    @Schema(description = "总保费")
+    private String sumPremium;
+
+    @Schema(description = "交强险保费")
+    private String ciPremium;
+
+    @Schema(description = "商业险保费")
+    private String biPremium;
+
+    @Schema(description = "驾乘险保费")
+    private String niPremium;
+
+    @Schema(description = "车船税")
+    private String vvTax;
+
+    @Schema(description = "录单人")
+    private String recorder;
+
+    @Schema(description = "业务员名称")
+    private String salesmanInfo;
+
+    @Schema(description = "业务员类型")
+    private String salesmanType;
+
+    @Schema(description = "协议名称")
+    private String agreementName;
+
+    @Schema(description = "部门id")
+    private String deptId;
+
+    @Schema(description = "部门名称")
+    private String deptName;
+
+    @Schema(description = "支付链接")
+    private String paymentLink;
+
+    @Schema(description = "批改单ID")
+    private Long adjustId;
+
+    @Schema(description = "批改后保费")
+    private String adjustPremium;
+
+    @Schema(description = "签单开始时间")
+    private String startSigningTime;
+
+    @Schema(description = "签单结束时间")
+    private String endSigningTime;
+
+    @Schema(description = "支付开始时间")
+    private String startPayTime;
+
+    @Schema(description = "支付结束时间")
+    private String endPayTime;
+
+}

+ 2 - 1
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/InsOrdersController.java

@@ -7,6 +7,7 @@ import com.jzg.commons.aop.OperatorTrajectory;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.InsOrdersParam;
+import com.jzg.commons.entity.dto.InsOrdersParamVO;
 import com.jzg.commons.entity.orders.vo.HistoryQuoteQueryVo;
 import com.jzg.commons.entity.po.InsFeeOrders;
 import com.jzg.commons.entity.quote.vo.KindInfoVo;
@@ -96,7 +97,7 @@ public class InsOrdersController extends BaseController {
 
     @PostMapping("queryList")
     @Operation(summary = "查询订单列表")
-    public HttpResult queryList(@RequestBody InsOrdersParam insOrdersParam) {
+    public HttpResult queryList(@RequestBody InsOrdersParamVO insOrdersParam) {
         String systemCode = "";
         //如果是APP登录的话 则传递SystemCode的头部字段
         if (baseController.getUserSystemCode().equals("APP")) {

+ 2 - 1
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/InsOrdersMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.entity.dto.InsOrdersParam;
+import com.jzg.commons.entity.dto.InsOrdersParamVO;
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.vo.HistoryQuoteQueryVo;
 import com.jzg.commons.entity.orders.vo.HistoryQuoteResultVo;
@@ -32,7 +33,7 @@ public interface InsOrdersMapper extends BaseMapper<InsOrders> {
 
     Page<InsOrdersVo> queryList(@Param("page") Page page, @Param("insOrdersParam") InsOrdersParam insOrdersParam);
 
-    Page<OrderListVo> queryOrderList(@Param("page") Page page, @Param("insOrdersParam") InsOrdersParam insOrdersParam);
+    Page<OrderListVo> queryOrderList(@Param("page") Page page, @Param("insOrdersParam") InsOrdersParamVO insOrdersParam);
 
     List<HistoryQuoteResultVo> getHistoryQuote(@Param("userName") String userName);
 

+ 2 - 1
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsOrdersService.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.InsOrdersParam;
+import com.jzg.commons.entity.dto.InsOrdersParamVO;
 import com.jzg.commons.entity.enums.MessageCodeEnum;
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersCarInfo;
@@ -115,7 +116,7 @@ public interface InsOrdersService extends IService<InsOrders> {
      * @param insOrdersParam
      * @return
      */
-    Page<OrderListVo> queryList(InsOrdersParam insOrdersParam);
+    Page<OrderListVo> queryList(InsOrdersParamVO insOrdersParam);
 
     /**
      * 查询订单详情

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

@@ -18,6 +18,7 @@ import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.base.StateResult;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.InsOrdersParam;
+import com.jzg.commons.entity.dto.InsOrdersParamVO;
 import com.jzg.commons.entity.dto.InsTaskImagesAdd;
 import com.jzg.commons.entity.enums.MessageCodeEnum;
 import com.jzg.commons.entity.orders.po.*;
@@ -1064,7 +1065,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
 
     @Override
-    public Page<OrderListVo> queryList(InsOrdersParam insOrdersParam) {
+    public Page<OrderListVo> queryList(InsOrdersParamVO insOrdersParam) {
         String userName = baseController.getUserName();
         insOrdersParam.setSalesman(userName);
         Page<OrderListVo> orderListVoPage = insOrdersMapper.queryOrderList(insOrdersParam.getPage(), insOrdersParam);

+ 87 - 0
tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrdersMapper.xml

@@ -782,6 +782,7 @@
         ) ioa1 ON io.id = ioa1.order_no
         where
         1=1
+
         <if test="insOrdersParam.orderNo != null and insOrdersParam.orderNo != ''">
             AND io.id = #{insOrdersParam.orderNo}
         </if>
@@ -806,6 +807,92 @@
         <if test="insOrdersParam.startDate != null and insOrdersParam.startDate != ''and insOrdersParam.endDate != null and insOrdersParam.endDate != ''">
             AND io.create_time BETWEEN #{insOrdersParam.startDate} and #{insOrdersParam.endDate}
         </if>
+
+        <if test="insOrdersParam.companyName != null and insOrdersParam.companyName != ''">
+            AND io.company_name = #{insOrdersParam.companyName}
+        </if>
+        <if test="insOrdersParam.productCode != null and insOrdersParam.productCode != ''">
+            AND io.product_id = #{insOrdersParam.productCode}
+        </if>
+        <if test="insOrdersParam.productName != null and insOrdersParam.productName != ''">
+            AND io.product_name = #{insOrdersParam.productName}
+        </if>
+        <if test="insOrdersParam.vinNo != null and insOrdersParam.vinNo != ''">
+            AND ioci.vin_no = #{insOrdersParam.vinNo}
+        </if>
+        <if test="insOrdersParam.ownerName != null and insOrdersParam.ownerName != ''">
+            AND owner_u.name = #{insOrdersParam.ownerName}
+        </if>
+        <if test="insOrdersParam.ownerMobile != null and insOrdersParam.ownerMobile != ''">
+            AND owner_u.mobile = #{insOrdersParam.ownerMobile}
+        </if>
+        <if test="insOrdersParam.policyName != null and insOrdersParam.policyName != ''">
+            AND policy_u.name = #{insOrdersParam.policyName}
+        </if>
+        <if test="insOrdersParam.policyMobile != null and insOrdersParam.policyMobile != ''">
+            AND policy_u.mobile = #{insOrdersParam.policyMobile}
+        </if>
+        <if test="insOrdersParam.insurName != null and insOrdersParam.insurName != ''">
+            AND insur_u.name = #{insOrdersParam.insurName}
+        </if>
+        <if test="insOrdersParam.insurMobile != null and insOrdersParam.insurMobile != ''">
+            AND insur_u.mobile = #{insOrdersParam.insurMobile}
+        </if>
+        <if test="insOrdersParam.ciStartDate != null">
+            AND iorci.start_date = #{insOrdersParam.ciStartDate}
+        </if>
+        <if test="insOrdersParam.biStartDate != null">
+            AND iorbi.start_date = #{insOrdersParam.biStartDate}
+        </if>
+        <if test="insOrdersParam.sumPremium != null">
+            AND iorco.sum_premium = #{insOrdersParam.sumPremium}
+        </if>
+        <if test="insOrdersParam.ciPremium != null">
+            AND iorco.jq_premium = #{insOrdersParam.ciPremium}
+        </if>
+        <if test="insOrdersParam.biPremium != null">
+            AND iorco.sy_premium = #{insOrdersParam.biPremium}
+        </if>
+        <if test="insOrdersParam.niPremium != null">
+            AND iorco.jy_premium = #{insOrdersParam.niPremium}
+        </if>
+        <if test="insOrdersParam.vvTax != null">
+            AND iorco.tax_premium = #{insOrdersParam.vvTax}
+        </if>
+        <if test="insOrdersParam.recorder != null and insOrdersParam.recorder != ''">
+            AND su.username = #{insOrdersParam.recorder}
+        </if>
+        <if test="insOrdersParam.salesmanInfo != null and insOrdersParam.salesmanInfo != ''">
+            AND suji.name = #{insOrdersParam.salesmanInfo}
+        </if>
+        <if test="insOrdersParam.salesmanType != null and insOrdersParam.salesmanType != ''">
+            AND suji.type_attr = #{insOrdersParam.salesmanType}
+        </if>
+        <if test="insOrdersParam.agreementName != null and insOrdersParam.agreementName != ''">
+            AND pa.agreement_name = #{insOrdersParam.agreementName}
+        </if>
+        <if test="insOrdersParam.deptId != null and insOrdersParam.deptId != ''">
+            AND sd.id = #{insOrdersParam.deptId}
+        </if>
+        <if test="insOrdersParam.deptName != null and insOrdersParam.deptName != ''">
+            AND sd.name = #{insOrdersParam.deptName}
+        </if>
+        <if test="insOrdersParam.paymentLink != null and insOrdersParam.paymentLink != ''">
+            AND io.pay_link = #{insOrdersParam.paymentLink}
+        </if>
+        <if test="insOrdersParam.adjustId != null">
+            AND ioa.id = #{insOrdersParam.adjustId}
+        </if>
+        <if test="insOrdersParam.adjustPremium != null">
+            AND ioa1.after_premium = #{insOrdersParam.adjustPremium}
+        </if>
+        <if test="insOrdersParam.startSigningTime != null and insOrdersParam.startSigningTime != ''and insOrdersParam.endSigningTime != null and insOrdersParam.endSigningTime != ''">
+            AND io.signing_time BETWEEN #{insOrdersParam.startSigningTime} and #{insOrdersParam.endSigningTime}
+        </if>
+        <if test="insOrdersParam.startPayTime != null and insOrdersParam.startPayTime != ''and insOrdersParam.endPayTime != null and insOrdersParam.endPayTime != ''">
+            AND io.pay_time BETWEEN #{insOrdersParam.startPayTime} and #{insOrdersParam.endPayTime}
+        </if>
+
         order by io.create_time desc
     </select>