商险办理列表接口调整

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

 package com.yifu.cloud.plus.v1.yifu.insurances.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -51,4 +53,30 @@ public class InsuranceExportListParam implements Serializable {
 	 */
 	@Schema(description = "办理地分流sql")
 	private String regionSql;
+
+	/**
+	 * 购买类型， 1新增、3批增、4替换
+	 */
+	@Schema(description = " 购买类型(派单类型)， 1新增、3批增、4替换")
+	private Integer buyType;
+
+	/**
+	 * 创建者-姓名
+	 */
+	@Schema(description = "派单人")
+	private String createName;
+
+	/**
+	 * 派单开始时间
+	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
+	@Schema(description = "派单开始时间")
+	private LocalDate startDate;
+
+	/**
+	 * 派单结束时间
+	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
+	@Schema(description = "派单结束时间")
+	private LocalDate endDate;
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java

@@ -55,32 +55,19 @@ public class TInsuranceDetailController {
 	}
 
 	/**
-	 * EKP2INSURANCES 更新结算状态
+	 * EKP2INSURANCES 更新结算状态（已弃用）
 	 *
 	 * @author licancan
 	 * @param param
 	 * @return {@link R<String>}
 	 */
+	@Deprecated
 	@Operation(summary = "更新结算状态", description = "更新结算状态")
 	@PostMapping("/updateInsuranceSettle")
 	public R<String> updateInsuranceSettle(@RequestBody UpdateInsuranceSettleParam param) {
 		return tInsuranceDetailService.updateInsuranceSettle(param);
 	}
 
-	/**
-	 * 投保办理分页查询
-	 *
-	 * @author licancan
-	 * @param page
-	 * @param param
-	 * @return {@link R<IPage<InsuranceListVO>>}
-	 */
-	@Operation(summary = "投保办理分页查询", description = "投保办理分页查询")
-	@PostMapping("/getInsuranceHandleListPage")
-	public R<IPage<InsuranceListVO>> getInsuranceHandleListPage(Page<InsuranceListVO> page, @RequestBody InsuranceListParam param) {
-		return R.ok(tInsuranceDetailService.getInsuranceHandleListPage(page, param));
-	}
-
 	/**
 	 * 投保分页查询
 	 *
@@ -108,6 +95,20 @@ public class TInsuranceDetailController {
 		return R.ok(tInsuranceDetailService.getInsuranceList(param));
 	}
 
+	/**
+	 * 投保办理分页查询
+	 *
+	 * @author licancan
+	 * @param page
+	 * @param param
+	 * @return {@link R<IPage<InsuranceListVO>>}
+	 */
+	@Operation(summary = "投保办理分页查询", description = "投保办理分页查询")
+	@PostMapping("/getInsuranceHandleListPage")
+	public R<IPage<InsuranceListVO>> getInsuranceHandleListPage(Page<InsuranceListVO> page, @RequestBody InsuranceListParam param) {
+		return R.ok(tInsuranceDetailService.getInsuranceHandleListPage(page, param));
+	}
+
 	/**
 	 * 商险新增
 	 *

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceDetailService.java

@@ -50,24 +50,23 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	IPage<InsuranceListVO> getInsuranceListPage(Page<InsuranceListVO> page, InsuranceListParam param);
 
 	/**
-	 * 投保办理分页查询
+	 * 投保不分页查询
 	 *
 	 * @author licancan
-	 * @param page
 	 * @param param
-	 * @return {@link IPage<InsuranceListVO>}
+	 * @return {@link List<InsuranceListVO>}
 	 */
-	IPage<InsuranceListVO> getInsuranceHandleListPage(Page<InsuranceListVO> page, InsuranceListParam param);
-
+	List<InsuranceListVO> getInsuranceList(InsuranceListParam param);
 
 	/**
-	 * 投保不分页查询
+	 * 投保办理分页查询
 	 *
 	 * @author licancan
+	 * @param page
 	 * @param param
-	 * @return {@link List<InsuranceListVO>}
+	 * @return {@link IPage<InsuranceListVO>}
 	 */
-	List<InsuranceListVO> getInsuranceList(InsuranceListParam param);
+	IPage<InsuranceListVO> getInsuranceHandleListPage(Page<InsuranceListVO> page, InsuranceListParam param);
 
 	/**
 	 * 商险新增

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

@@ -131,8 +131,8 @@
 		ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC
 	</select>
 
-	<!--投保办理分页查询-->
-	<select id="getInsuranceHandleListPage" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO">
+	<!--投保不分页查询-->
+	<select id="getInsuranceList" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO">
 		select detail.id as id,
 		detail.EMP_NAME as empName,
 		detail.EMP_IDCARD_NO as empIdcardNo,
@@ -144,6 +144,7 @@
 		detail.INSURANCE_COMPANY_NAME as insuranceCompanyName,
 		detail.INSURANCE_TYPE_NAME as insuranceTypeName,
 		detail.BUY_STANDARD as buyStandard,
+		detail.CREATE_BY as createBy,
 		detail.CREATE_NAME as createName,
 		detail.BUY_HANDLE_STATUS as buyHandleStatus,
 		detail.SETTLE_TYPE as settleType,
@@ -153,6 +154,12 @@
 		<if test="param.deptNo != null and param.deptNo.trim() != ''">
 			and detail.DEPT_NO = #{param.deptNo}
 		</if>
+		<if test="param.deptNo == null or param.deptNo.trim() == ''">
+			and detail.DEPT_NO in
+			<foreach collection="param.deptNoList" index="index" item="item" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
 		<if test="param.buyHandleStatus != null">
 			and detail.BUY_HANDLE_STATUS = #{param.buyHandleStatus}
 		</if>
@@ -174,12 +181,6 @@
 				#{item}
 			</foreach>
 		</if>
-		<if test="param.regionSql != null and param.regionSql.trim() != ''">
-			and  ${param.regionSql}
-		</if>
-		<if test="param.updateBy != null and param.updateBy.trim() != ''">
-			and detail.HANDLED_BY = #{param.updateBy}
-		</if>
 		<if test="param.buyType != null">
 			and detail.BUY_TYPE = #{param.buyType}
 		</if>
@@ -192,8 +193,8 @@
 		ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC
 	</select>
 
-	<!--投保不分页查询-->
-	<select id="getInsuranceList" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO">
+	<!--投保办理分页查询-->
+	<select id="getInsuranceHandleListPage" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO">
 		select detail.id as id,
 		detail.EMP_NAME as empName,
 		detail.EMP_IDCARD_NO as empIdcardNo,
@@ -205,7 +206,6 @@
 		detail.INSURANCE_COMPANY_NAME as insuranceCompanyName,
 		detail.INSURANCE_TYPE_NAME as insuranceTypeName,
 		detail.BUY_STANDARD as buyStandard,
-		detail.CREATE_BY as createBy,
 		detail.CREATE_NAME as createName,
 		detail.BUY_HANDLE_STATUS as buyHandleStatus,
 		detail.SETTLE_TYPE as settleType,
@@ -215,12 +215,6 @@
 		<if test="param.deptNo != null and param.deptNo.trim() != ''">
 			and detail.DEPT_NO = #{param.deptNo}
 		</if>
-		<if test="param.deptNo == null or param.deptNo.trim() == ''">
-			and detail.DEPT_NO in
-			<foreach collection="param.deptNoList" index="index" item="item" open="(" separator="," close=")">
-				#{item}
-			</foreach>
-		</if>
 		<if test="param.buyHandleStatus != null">
 			and detail.BUY_HANDLE_STATUS = #{param.buyHandleStatus}
 		</if>
@@ -242,6 +236,12 @@
 				#{item}
 			</foreach>
 		</if>
+		<if test="param.regionSql != null and param.regionSql.trim() != ''">
+			and  ${param.regionSql}
+		</if>
+		<if test="param.updateBy != null and param.updateBy.trim() != ''">
+			and detail.HANDLED_BY = #{param.updateBy}
+		</if>
 		<if test="param.buyType != null">
 			and detail.BUY_TYPE = #{param.buyType}
 		</if>
@@ -374,6 +374,15 @@
 		<if test="param.regionSql != null and param.regionSql.trim() != ''">
 			and  ${param.regionSql}
 		</if>
+		<if test="param.buyType != null">
+			and detail.BUY_TYPE = #{param.buyType}
+		</if>
+		<if test="param.createName != null and param.createName.trim() != ''">
+			and detail.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%')
+		</if>
+		<if test="param.startDate != null and param.startDate.trim() != '' and param.endDate != null and param.endDate.trim() != ''">
+			and detail.CREATE_TIME <![CDATA[ >= ]]>  concat(#{param.startDate}, ' 00:00:00') and detail.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59')
+		</if>
 		ORDER BY detail.CREATE_TIME DESC
 	</select>