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

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

@@ -114,4 +114,10 @@ public class InsuredParam extends BaseEntity implements Serializable {
 	@Schema(description = "项目编码列表")
 	private List<String> deptNoList;
 
+	@Schema(description = " 投保类型， 1新增、3批增、4替换")
+	private Integer buyType;
+
+	@Schema(description = "减员状态 1待减员 2减员中3减员退回,4减员成功")
+	private Integer reduceHandleStatus;
+
 }

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

@@ -459,7 +459,9 @@
 			a.INSURANCE_COMPANY_NAME as insuranceCompanyName,
 			a.INSURANCE_TYPE_NAME as insuranceTypeName,
 			a.CREATE_USER_DEPT_NAME as createUserDeptName,
-			a.BUY_STANDARD as buyStandard
+			a.BUY_STANDARD as buyStandard,
+			a.CREATE_TIME as createTime,
+			a.CREATE_NAME as createName
 		from
 		     t_insurance_detail a
 		<if test="param.authSql != null and param.authSql.trim() != ''">
@@ -469,6 +471,15 @@
 			a.DELETE_FLAG = 0
 		and
 			a.BUY_HANDLE_STATUS = 3
+		<if test="param.createName != null and param.createName.trim() != ''">
+			and a.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%')
+		</if>
+		<if test="param.buyType != null">
+			and a.BUY_TYPE = #{param.buyType}
+		</if>
+		<if test="param.reduceHandleStatus != null">
+			and a.REDUCE_HANDLE_STATUS = #{param.reduceHandleStatus}
+		</if>
 		<if test="param.empName != null and param.empName.trim() != ''">
 			and a.EMP_NAME like concat('%',replace(replace(#{param.empName},'_','\_'),'%','\%'),'%')
 		</if>
@@ -558,6 +569,15 @@
 		    a.DELETE_FLAG = 0
 		and
 			a.BUY_HANDLE_STATUS = 3
+		<if test="param.createName != null and param.createName.trim() != ''">
+			and a.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%')
+		</if>
+		<if test="param.buyType != null">
+			and a.BUY_TYPE = #{param.buyType}
+		</if>
+		<if test="param.reduceHandleStatus != null">
+			and a.REDUCE_HANDLE_STATUS = #{param.reduceHandleStatus}
+		</if>
 		<if test="param.empName != null and param.empName.trim() != ''">
 			and a.EMP_NAME like concat('%',replace(replace(#{param.empName},'_','\_'),'%','\%'),'%')
 		</if>
@@ -586,6 +606,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.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.invoiceNo != null and param.invoiceNo.trim() != ''">
 			and a.INVOICE_NO like concat('%',replace(replace(#{param.invoiceNo},'_','\_'),'%','\%'),'%')
 		</if>
@@ -595,12 +621,6 @@
 		<if test="param.isOverdue != null ">
 			and a.IS_OVERDUE = #{param.isOverdue}
 		</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.authSql != null and param.authSql.trim() != ''">
 			${param.authSql}
 		</if>
@@ -667,12 +687,6 @@
 			(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>