Merge remote-tracking branch 'origin/MVP1.6.1' into MVP1.6.1

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java

@@ -441,6 +441,14 @@ public class EmployeeProjectExportVO {
 	@ExcelAttribute(name = "项目档案来源", isDataId = true,dataType = ExcelAttributeConstants.PROJECT_EMP_SOURCE)
 	private String projectSource;
 
+	/**
+	 * 通信地址
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="通信地址")
+	@ExcelAttribute(name = "通信地址")
+	private String contactAddress;
+
 	/**
 	 * 项目档案状态（0=正常,1=已减项）
 	 */

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml

@@ -118,6 +118,7 @@
 		<result property="contractStatus" column="CONTRACT_STATUS"/>
 		<result property="empLabel" column="EMP_LABEL"/>
 		<result property="contractParty" column="CONTRACT_PARTY"/>
+		<result property="contactAddress" column="contact_address"/>
 	</resultMap>
 
 	<sql id="Base_Column_List">
@@ -835,7 +836,7 @@
 	<!--tEmployeeInfo导出查询改造 fxj 2022-11-03-->
 	<select id="noPageDiy" resultMap="tEmployeeProjectExportMap">
 		SELECT
-		<include refid="Base_Export_List"/>
+		<include refid="Base_Export_List"/>,b.contact_address
 		FROM t_employee_project a
 		left join t_employee_info b on a.EMP_ID = b.id
 		LEFT JOIN (

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

@@ -62,6 +62,18 @@ public class InsuranceRefundParam extends BaseEntity implements Serializable {
 	@Schema(description = "保单结束时间")
 	private String policyEnd;
 
+	/**
+	 * 保单开始时间
+	 */
+	@Schema(description = "保单开始时间")
+	private String policyJingQueStart;
+
+	/**
+	 * 保单结束时间
+	 */
+	@Schema(description = "保单结束时间")
+	private String policyJingQueEnd;
+
 	/**
 	 * 投保办理状态 1待投保 2投保中 3已投保 4投保退回 5 已减员
 	 */

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

@@ -66,6 +66,18 @@ public class InsuredParam extends BaseEntity implements Serializable {
 	@Schema(description = "保单结束时间")
 	private String policyEnd;
 
+	/**
+	 * 保单开始时间
+	 */
+	@Schema(description = "保单开始时间")
+	private String policyJingQueStart;
+
+	/**
+	 * 保单结束时间
+	 */
+	@Schema(description = "保单结束时间")
+	private String policyJingQueEnd;
+
 	/**
 	 * 发票号
 	 */

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

@@ -634,12 +634,13 @@
 		<if test="param.policyNo != null and param.policyNo.trim() != ''">
 			and a.POLICY_NO like concat('%',replace(replace(#{param.policyNo},'_','\_'),'%','\%'),'%')
 		</if>
-		<if test="param.policyStart != null and param.policyStart.trim() != '' and (param.policyEnd == null or param.policyEnd.trim() == '')">
-			AND a.POLICY_END   <![CDATA[ >= ]]>  concat(#{param.policyStart}, ' 00:00:00')
+		<if test="param.policyJingQueStart != null and param.policyJingQueStart.trim() != ''">
+			AND  DATE_FORMAT(a.POLICY_START,"%Y-%m-%d")  = #{param.policyJingQueStart}
 		</if>
-		<if test="param.policyEnd != null and param.policyEnd.trim() != '' and (param.policyStart == null or param.policyStart.trim() == '')">
-			AND a.POLICY_START <![CDATA[ <= ]]> concat(#{param.policyEnd}, ' 23:59:59')
+		<if test="param.policyJingQueEnd != null and param.policyJingQueEnd.trim() != ''">
+			AND   DATE_FORMAT(a.POLICY_END,"%Y-%m-%d") = #{param.policyJingQueEnd}
 		</if>
+
 		<if test="param.policyStart != null and param.policyStart.trim() != '' and param.policyEnd != null and param.policyEnd.trim() != ''">
 			and (
 			(a.POLICY_START <![CDATA[ <= ]]>  concat(#{param.policyStart}, ' 00:00:00') and a.POLICY_END <![CDATA[ >= ]]> concat(#{param.policyEnd}, ' 23:59:59')) OR
@@ -745,6 +746,12 @@
 		<if test="param.policyEnd != null and param.policyEnd.trim() != '' and (param.policyStart == null or param.policyStart.trim() == '')">
 			AND a.POLICY_START <![CDATA[ <= ]]> concat(#{param.policyEnd}, ' 23:59:59')
 		</if>
+		<if test="param.policyJingQueStart != null and param.policyJingQueStart.trim() != ''">
+			AND  DATE_FORMAT(a.POLICY_START,"%Y-%m-%d")  = #{param.policyJingQueStart}
+		</if>
+		<if test="param.policyJingQueEnd != null and param.policyJingQueEnd.trim() != ''">
+			AND   DATE_FORMAT(a.POLICY_END,"%Y-%m-%d") = #{param.policyJingQueEnd}
+		</if>
 		<if test="param.policyStart != null and param.policyStart.trim() != '' and param.policyEnd != null and param.policyEnd.trim() != ''">
 			and (
 			(a.POLICY_START <![CDATA[ <= ]]>  concat(#{param.policyStart}, ' 00:00:00') and a.POLICY_END <![CDATA[ >= ]]> concat(#{param.policyEnd}, ' 23:59:59')) OR
@@ -819,6 +826,12 @@
 		<if test="param.policyEnd != null and param.policyEnd.trim() != '' and (param.policyStart == null or param.policyStart.trim() == '')">
 			AND a.POLICY_START <![CDATA[ <= ]]> concat(#{param.policyEnd}, ' 23:59:59')
 		</if>
+		<if test="param.policyJingQueStart != null and param.policyJingQueStart.trim() != ''">
+			AND  DATE_FORMAT(a.POLICY_START,"%Y-%m-%d")  = #{param.policyJingQueStart}
+		</if>
+		<if test="param.policyJingQueEnd != null and param.policyJingQueEnd.trim() != ''">
+			AND   DATE_FORMAT(a.POLICY_END,"%Y-%m-%d") = #{param.policyJingQueEnd}
+		</if>
 		<if test="param.policyStart != null and param.policyStart.trim() != '' and param.policyEnd != null and param.policyEnd.trim() != ''">
 			and (
 			(a.POLICY_START <![CDATA[ <= ]]>  concat(#{param.policyStart}, ' 00:00:00') and a.POLICY_END <![CDATA[ >= ]]> concat(#{param.policyEnd}, ' 23:59:59')) OR
@@ -903,6 +916,12 @@
 		<if test="param.policyEnd != null and param.policyEnd.trim() != '' and (param.policyStart == null or param.policyStart.trim() == '')">
 			AND a.POLICY_START <![CDATA[ <= ]]> concat(#{param.policyEnd}, ' 23:59:59')
 		</if>
+		<if test="param.policyJingQueStart != null and param.policyJingQueStart.trim() != ''">
+			AND  DATE_FORMAT(a.POLICY_START,"%Y-%m-%d")  = #{param.policyJingQueStart}
+		</if>
+		<if test="param.policyJingQueEnd != null and param.policyJingQueEnd.trim() != ''">
+			AND   DATE_FORMAT(a.POLICY_END,"%Y-%m-%d") = #{param.policyJingQueEnd}
+		</if>
 		<if test="param.policyStart != null and param.policyStart.trim() != '' and param.policyEnd != null and param.policyEnd.trim() != ''">
 			and (
 			(a.POLICY_START <![CDATA[ <= ]]>  concat(#{param.policyStart}, ' 00:00:00') and a.POLICY_END <![CDATA[ >= ]]> concat(#{param.policyEnd}, ' 23:59:59')) OR
@@ -983,6 +1002,12 @@
 		<if test="param.policyEnd != null and param.policyEnd.trim() != '' and (param.policyStart == null or param.policyStart.trim() == '')">
 			AND a.POLICY_START <![CDATA[ <= ]]> concat(#{param.policyEnd}, ' 23:59:59')
 		</if>
+		<if test="param.policyJingQueStart != null and param.policyJingQueStart.trim() != ''">
+			AND  DATE_FORMAT(a.POLICY_START,"%Y-%m-%d")  = #{param.policyJingQueStart}
+		</if>
+		<if test="param.policyJingQueEnd != null and param.policyJingQueEnd.trim() != ''">
+			AND   DATE_FORMAT(a.POLICY_END,"%Y-%m-%d") = #{param.policyJingQueEnd}
+		</if>
 		<if test="param.policyStart != null and param.policyStart.trim() != '' and param.policyEnd != null and param.policyEnd.trim() != ''">
 			and (
 			(a.POLICY_START <![CDATA[ <= ]]>  concat(#{param.policyStart}, ' 00:00:00') and a.POLICY_END <![CDATA[ >= ]]> concat(#{param.policyEnd}, ' 23:59:59')) OR