商险加-退回原因

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceListParam.java

@@ -71,7 +71,7 @@ public class InsuranceListParam extends BaseEntity {
 	private List<String> deptNoList;
 
 	/**
-	 * 购买类型， 1新增、3批增、4替换
+	 * 投保类型、购买类型， 1新增、3批增、4替换
 	 */
 	@Schema(description = " 购买类型(派单类型)， 1新增、3批增、4替换")
 	private Integer buyType;

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceListVO.java

 package com.yifu.cloud.plus.v1.yifu.insurances.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.HeadFontStyle;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -7,6 +11,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  * @author licancan
@@ -148,4 +153,10 @@ public class InsuranceListVO implements Serializable {
 
 	@Schema(description = "退回原因")
 	private String backRemark;
+
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+	@Schema(description = "派单日期")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("派单日期")
+	private LocalDateTime createTime;
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRefundListVo.java

@@ -11,6 +11,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  * @author zhaji
@@ -196,4 +197,10 @@ public class InsuranceRefundListVo implements Serializable {
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("派单人")
 	private String createName;
+
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+	@Schema(description = "派单日期")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("派单日期")
+	private LocalDateTime createTime;
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRefundParam.java

@@ -73,4 +73,16 @@ public class InsuranceRefundParam extends BaseEntity implements Serializable {
 	 */
 	@Schema(description = "项目编码列表")
 	private List<String> deptNoList;
+
+	/**
+	 * 派单开始时间
+	 */
+	@Schema(description = "派单开始时间")
+	private String startDate;
+
+	/**
+	 * 派单结束时间
+	 */
+	@Schema(description = "派单结束时间")
+	private String endDate;
 }

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml

@@ -100,7 +100,8 @@
 		a.CREATE_USER_DEPT_NAME as createUserDeptName,
 		a.SETTLE_MONTH as settleMonth,
 		a.DEPT_NAME as projectName,
-		a.REDUCE_HANDLE_STATUS as reduceHandleStatus
+		a.REDUCE_HANDLE_STATUS as reduceHandleStatus,
+		a.CREATE_TIME as createTime
 		from t_insurance_detail a
 		<if test="param.authSql != null and param.authSql.trim() != ''">
 			left join t_insurance_area_res p on p.USER_ID = #{param.createBy}
@@ -110,7 +111,7 @@
 			and a.DEPT_NO = #{param.deptNo}
 		</if>
 		<if test="param.orderNo != null and param.orderNo.trim() != ''">
-			and a.DEPT_NO = #{param.orderNo}
+			and a.ORDER_NO = #{param.orderNo}
 		</if>
 		<if test="param.buyHandleStatus != null">
 			and a.BUY_HANDLE_STATUS = #{param.buyHandleStatus}
@@ -137,7 +138,7 @@
 			and a.BUY_TYPE = #{param.buyType}
 		</if>
 		<if test="param.createName != null and param.createName.trim() != ''">
-			and a.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%')
+			and a.CREATE_NAME like concat('%',#{param.createName},'%')
 		</if>
 		<if test="param.startDate != null and param.startDate.trim() != '' and param.endDate != null and param.endDate.trim() != ''">
 			and a.CREATE_TIME <![CDATA[ >= ]]>  concat(#{param.startDate}, ' 00:00:00') and a.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59')
@@ -171,7 +172,8 @@
 		a.SETTLE_MONTH as settleMonth,
 		a.DEPT_NAME as projectName,
 		a.REDUCE_HANDLE_STATUS as reduceHandleStatus,
-		if(a.BUY_HANDLE_STATUS=4,a.BACK_REMARK,'') as backRemark
+		if(a.BUY_HANDLE_STATUS=4,a.BACK_REMARK,'') as backRemark,
+		a.CREATE_TIME as createTime
 		from t_insurance_detail a
 		<if test="param.authSql != null and param.authSql.trim() != ''">
 			left join t_insurance_area_res p on p.USER_ID = #{param.createBy}
@@ -620,7 +622,8 @@
 			a.POLICY_NO as policyNo,
 			a.CREATE_NAME as createName,
 			refund.CREATE_USER_DEPT_NAME as createUserDeptName,
-			refund.CREATE_TIME as refundCreateTime
+			refund.CREATE_TIME as refundCreateTime,
+			a.CREATE_TIME as createTime
 		from
 			(t_insurance_detail a,
 			t_insurance_refund refund)
@@ -664,6 +667,18 @@
 			(a.POLICY_END <![CDATA[ >= ]]>  concat(#{param.policyStart}, ' 00:00:00') and a.POLICY_END <![CDATA[ <= ]]> concat(#{param.policyEnd}, ' 23:59:59'))
 			)
 		</if>
+		<if test="param.createStartTime != null and param.createStartTime.trim() != ''">
+			AND a.CREATE_TIME  <![CDATA[ >= ]]>  concat(#{param.createStartTime}, ' 00:00:00')
+		</if>
+		<if test="param.createEndTime != null and param.createEndTime.trim() != ''">
+			AND a.CREATE_TIME  <![CDATA[ <= ]]> concat(#{param.createEndTime}, ' 23:59:59')
+		</if>
+		<if test="param.startDate != null and param.startDate.trim() != ''">
+			AND a.CREATE_TIME  <![CDATA[ >= ]]>  concat(#{param.startDate}, ' 00:00:00')
+		</if>
+		<if test="param.endDate != null and param.endDate.trim() != ''">
+			AND a.CREATE_TIME  <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59')
+		</if>
 		<if test="param.authSql != null and param.authSql.trim() != ''">
 			${param.authSql}
 		</if>
@@ -736,6 +751,12 @@
 			(a.POLICY_END <![CDATA[ >= ]]>  concat(#{param.policyStart}, ' 00:00:00') and a.POLICY_END <![CDATA[ <= ]]> concat(#{param.policyEnd}, ' 23:59:59'))
 			)
 		</if>
+		<if test="param.startDate != null and param.startDate.trim() != ''">
+			AND a.CREATE_TIME  <![CDATA[ >= ]]>  concat(#{param.startDate}, ' 00:00:00')
+		</if>
+		<if test="param.endDate != null and param.endDate.trim() != ''">
+			AND a.CREATE_TIME  <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59')
+		</if>
 		<if test="param.authSql != null and param.authSql.trim() != ''">
 			${param.authSql}
 		</if>