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

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

@@ -89,5 +89,23 @@ public class InsuranceRefundHandlingParam implements Serializable {
 	@Schema(description = "办理人")
 	private String updateBy;
 
+	/**
+	 * 派单人
+	 */
+	@Schema(description = "派单人")
+	private String createName;
+
+	/**
+	 * 派单开始时间
+	 */
+	@Schema(description = "派单开始时间")
+	private String createStartTime;
+
+	/**
+	 * 派单结束时间
+	 */
+	@Schema(description = "派单结束时间")
+	private String createEndTime;
+
 
 }

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

+package com.yifu.cloud.plus.v1.yifu.insurances.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaji
+ * @description 减员办理导入校验
+ * @date 2022-08-22 10:15:19
+ */
+@Data
+@Tag(name = "减员办理导入参数")
+public class InsuranceRefundImportParam implements Serializable {
+	private static final long serialVersionUID = -2689686777914935788L;
+
+	/**
+	 * 商险id
+	 */
+	@Schema(description = "商险id")
+	private String id;
+
+	/**
+	 * 办理意见
+	 */
+	@Schema(description = "办理意见")
+	private String remark;
+}

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

@@ -34,4 +34,7 @@ public class InsuranceRefundListParam implements Serializable {
 	@Schema(name = "更新时间")
 	private LocalDateTime updateTime;
 
+	@Schema(name = "办理意见")
+	private String remark;
+
 }

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

@@ -739,6 +739,15 @@
 		<if test="param.updateBy != null and param.updateBy.trim() != ''">
 			and  refund.UPDATE_BY = #{param.updateBy}
 		</if>
+		<if test="param.createName != null and param.createName.trim() != ''">
+			and refund.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%')
+		</if>
+		<if test="param.createStartTime != null and param.createStartTime.trim() != ''">
+			AND refund.CREATE_TIME   <![CDATA[ >= ]]>  concat(#{param.createStartTime}, ' 00:00:00')
+		</if>
+		<if test="param.createEndTime != null and param.createEndTime.trim() != ''">
+			AND refund.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.createEndTime}, ' 23:59:59')
+		</if>
 		ORDER BY refund.CREATE_TIME DESC,detail.ID ASC
 	</select>
 	<!-- 查询保单列表-->