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

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

@@ -36,4 +36,15 @@ public class ContractAlertSearchVo extends TEmpContractAlert {
 	 * 查询数据止
 	 **/
 	private int limitEnd;
+
+	/**
+	 * @Author fxj
+	 * 合同截止时间区间查询--开始
+	 **/
+	private LocalDateTime contractEndStart;
+	/**
+	 * @Author fxj
+	 * 合同截止时间区间查询--截止
+	 **/
+	private LocalDateTime contractEndEnd;
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpContractAlertServiceImpl.java

@@ -70,6 +70,12 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
 		} else {
 			wrapper.orderByDesc(BaseEntity::getCreateTime);
 		}
+		if (Common.isNotNull(searchVo.getContractEndStart())){
+			wrapper.ge(TEmpContractAlert::getContractEnd,searchVo.getContractEndStart());
+		}
+		if (Common.isNotNull(searchVo.getContractEndEnd())){
+			wrapper.le(TEmpContractAlert::getContractEnd,searchVo.getContractEndEnd());
+		}
 		return baseMapper.selectPage(page,wrapper);
 	}
 
@@ -80,7 +86,12 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
 		if (Common.isNotNull(idList)){
 			wrapper.in(TEmpContractAlert::getId,idList);
 		}
-		wrapper.ne(TEmpContractAlert::getId,CommonConstants.ZERO_STRING);
+		if (Common.isNotNull(searchVo.getContractEndStart())){
+			wrapper.ge(TEmpContractAlert::getContractEnd,searchVo.getContractEndStart());
+		}
+		if (Common.isNotNull(searchVo.getContractEndEnd())){
+			wrapper.le(TEmpContractAlert::getContractEnd,searchVo.getContractEndEnd());
+		}
 		if (Common.isNotNull(searchVo.getAuthSql())) {
 			if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains("a.")) {
 				searchVo.setAuthSql(searchVo.getAuthSql().replace("a.", " "));
@@ -96,6 +107,12 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
 		if (Common.isNotNull(idList)){
 			wrapper.in(TEmpContractAlert::getId,idList);
 		}
+		if (Common.isNotNull(searchVo.getContractEndStart())){
+			wrapper.ge(TEmpContractAlert::getContractEnd,searchVo.getContractEndStart());
+		}
+		if (Common.isNotNull(searchVo.getContractEndEnd())){
+			wrapper.le(TEmpContractAlert::getContractEnd,searchVo.getContractEndEnd());
+		}
 		if (Common.isNotNull(searchVo.getAuthSql())) {
 			if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains("a.")) {
 				searchVo.setAuthSql(searchVo.getAuthSql().replace("a.", " "));
@@ -171,7 +188,6 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
 
 	private LambdaQueryWrapper buildQueryWrapper(ContractAlertSearchVo entity){
 		LambdaQueryWrapper<TEmpContractAlert> wrapper = Wrappers.lambdaQuery();
-		wrapper.ne(TEmpContractAlert::getId,CommonConstants.ZERO_STRING);
 		if (ArrayUtil.isNotEmpty(entity.getCreateTimes())) {
 			wrapper.ge(TEmpContractAlert::getCreateTime, entity.getCreateTimes()[0])
 					.le(TEmpContractAlert::getCreateTime,

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoSearchVo.java

@@ -70,4 +70,12 @@ public class TPaymentInfoSearchVo extends TPaymentInfo {
 	@Schema(description = "查询limit  数据条数")
 	private int limitEnd;
 
+	/**
+	 * @Author fxj
+	 * 区域查询辅助字段：0 不包含下级  1 包含下级
+	 **/
+	@Schema(description = "0 不包含下级  1 包含下级")
+	private String areaFlag;
+
+
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TPaymentInfoMapper.java

@@ -44,7 +44,7 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> {
      * @param tPaymentInfo 缴费库
      * @return
      */
-    IPage<TPaymentInfo> getTPaymentInfoPage(Page<TPaymentInfo> page, @Param("tPaymentInfo") TPaymentInfo tPaymentInfo);
+    IPage<TPaymentInfo> getTPaymentInfoPage(Page<TPaymentInfo> page, @Param("tPaymentInfo") TPaymentInfoSearchVo tPaymentInfo);
 
 	/**
 	 * 缴费库简单分页查询

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TPaymentInfoService.java

@@ -42,7 +42,7 @@ public interface TPaymentInfoService extends IService<TPaymentInfo> {
 	 * @param tPaymentInfo 缴费库
 	 * @return
 	 */
-	IPage<TPaymentInfo> getTPaymentInfoPage(Page<TPaymentInfo> page, TPaymentInfo tPaymentInfo);
+	IPage<TPaymentInfo> getTPaymentInfoPage(Page<TPaymentInfo> page, TPaymentInfoSearchVo tPaymentInfo);
 
 	/**
 	 * 缴费库批量导入社保

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -2500,11 +2500,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_DATE_LIMIT_ERROR2)));
 				return true;
 			}
-
+			if (CommonConstants.ZERO_STRING.equals(excel.getPaymentType())){
+				excel.setPensionCardinal(socialSet.getLowerLimit());
+			}
+			if (CommonConstants.TWO_STRING.equals(excel.getPaymentType())){
+				excel.setPensionCardinal(socialSet.getUpperLimit());
+			}
 			if (!CommonConstants.ONE_STRING.equals(excel.getPaymentType())
-					&& Common.isEmpty(excel.getTrustRemark())
-					&& (Common.isEmpty(excel.getPensionCardinal())
-					|| excel.getPensionCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)){
+					&& (excel.getPensionCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)){
 					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_BASE_LIMIT_ERROR)));
 					return true;
 			}

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java

@@ -142,7 +142,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 	 * @return
 	 */
 	@Override
-	public IPage<TPaymentInfo> getTPaymentInfoPage(Page<TPaymentInfo> page, TPaymentInfo tPaymentInfo) {
+	public IPage<TPaymentInfo> getTPaymentInfoPage(Page<TPaymentInfo> page, TPaymentInfoSearchVo tPaymentInfo) {
 		return baseMapper.getTPaymentInfoPage(page, tPaymentInfo);
 	}
 

yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml

@@ -390,12 +390,12 @@
 			<if test="tPaymentInfo.providentPayAddr != null and tPaymentInfo.providentPayAddr.trim() != ''">
 				AND a.PROVIDENT_PAY_ADDR = #{tPaymentInfo.providentPayAddr}
 			</if>
-			<if test="tPaymentInfo.socialProvince != null and tPaymentInfo.socialProvince.trim() != ''">
-				AND (a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' or a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}')
-			</if>
-			<if test="tPaymentInfo.socialCity != null and tPaymentInfo.socialCity.trim() != ''">
-				AND (a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' or a.FUND_CITY = '${tPaymentInfo.socialCity}')
+			<if test="tPaymentInfo.providentPayAddr != null and tPaymentInfo.providentPayAddr.trim() != ''">
+				AND a.PROVIDENT_PAY_ADDR = #{tPaymentInfo.providentPayAddr}
 			</if>
+
+			<!-- 区域 默认精准查询 0    包含下级查询 1 开始 2023-03-02 fxj -->
+			<if test="tPaymentInfo.areaFlag == null || tPaymentInfo.areaFlag == '0'">
 				<if test="tPaymentInfo.socialTown == null">
 					<if test="tPaymentInfo.socialCity != null">
 						AND (a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' or a.FUND_CITY = '${tPaymentInfo.socialCity}')
@@ -409,6 +409,29 @@
 				<if test="tPaymentInfo.socialTown != null and tPaymentInfo.socialTown.trim() != ''">
 					AND (a.SOCIAL_TOWN = '${tPaymentInfo.socialTown}' or a.FUND_TOWN = '${tPaymentInfo.socialTown}')
 				</if>
+			</if>
+			<if test="tPaymentInfo.areaFlag == '1'">
+				<if test="tPaymentInfo.socialProvince != null and tPaymentInfo.socialProvince.trim() != '' and tPaymentInfo.socialCity == null">
+					AND (
+					(a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' and a.SOCIAL_CITY is null)
+					or
+					(a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}' and a.FUND_CITY is null)
+					)
+				</if>
+				<if test="tPaymentInfo.socialCity != null and tPaymentInfo.socialCity.trim() != '' and tPaymentInfo.socialTown == null">
+					AND (
+					(a.SOCIAL_CITY = '${tPaymentInfo.socialCity}'  and a.SOCIAL_TOWN is null )
+					or
+					(a.FUND_CITY = '${tPaymentInfo.socialCity}' and a.FUND_TOWN is null)
+					)
+				</if>
+				<if test="tPaymentInfo.socialTown != null and tPaymentInfo.socialTown.trim() != ''">
+					AND (a.SOCIAL_TOWN = '${tPaymentInfo.socialTown}' or a.FUND_TOWN = '${tPaymentInfo.socialTown}')
+				</if>
+			</if>
+			<!-- 区域 默认精准查询 0    包含下级查询 1 结束  2023-03-02 fxj -->
+
+
 			<if test="tPaymentInfo.socialId != null and tPaymentInfo.socialId.trim() != ''">
 				AND a.SOCIAL_ID = #{tPaymentInfo.socialId}
 			</if>
@@ -607,15 +630,8 @@
 				<if test="tPaymentInfo.fundCity != null and tPaymentInfo.fundCity.trim() != ''">
 					AND a.FUND_CITY = #{tPaymentInfo.fundCity}
 				</if>
-				<if test="tPaymentInfo.fundTown != null and tPaymentInfo.fundTown.trim() != ''">
-					AND a.FUND_TOWN = #{tPaymentInfo.fundTown}
-				</if>
-				<if test="tPaymentInfo.socialProvince != null and tPaymentInfo.socialProvince.trim() != ''">
-					AND (a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' or a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}')
-				</if>
-				<if test="tPaymentInfo.socialCity != null and tPaymentInfo.socialCity.trim() != ''">
-					AND (a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' or a.FUND_CITY = '${tPaymentInfo.socialCity}')
-				</if>
+				<!-- 区域 默认精准查询 0    包含下级查询 1 开始 2023-03-02 fxj -->
+				<if test="tPaymentInfo.areaFlag == null || tPaymentInfo.areaFlag == '0'">
 					<if test="tPaymentInfo.socialTown == null">
 						<if test="tPaymentInfo.socialCity != null">
 							AND (a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' or a.FUND_CITY = '${tPaymentInfo.socialCity}')
@@ -629,6 +645,28 @@
 					<if test="tPaymentInfo.socialTown != null and tPaymentInfo.socialTown.trim() != ''">
 						AND (a.SOCIAL_TOWN = '${tPaymentInfo.socialTown}' or a.FUND_TOWN = '${tPaymentInfo.socialTown}')
 					</if>
+				</if>
+				<if test="tPaymentInfo.areaFlag == '1'">
+					<if test="tPaymentInfo.socialProvince != null and tPaymentInfo.socialProvince.trim() != '' and tPaymentInfo.socialCity == null">
+						AND (
+						(a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' and a.SOCIAL_CITY is null)
+						or
+						(a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}' and a.FUND_CITY is null)
+						)
+					</if>
+					<if test="tPaymentInfo.socialCity != null and tPaymentInfo.socialCity.trim() != '' and tPaymentInfo.socialTown == null">
+						AND (
+						(a.SOCIAL_CITY = '${tPaymentInfo.socialCity}'  and a.SOCIAL_TOWN is null )
+						or
+						(a.FUND_CITY = '${tPaymentInfo.socialCity}' and a.FUND_TOWN is null)
+						)
+					</if>
+					<if test="tPaymentInfo.socialTown != null and tPaymentInfo.socialTown.trim() != ''">
+						AND (a.SOCIAL_TOWN = '${tPaymentInfo.socialTown}' or a.FUND_TOWN = '${tPaymentInfo.socialTown}')
+					</if>
+				</if>
+				<!-- 区域 默认精准查询 0    包含下级查询 1 结束  2023-03-02 fxj -->
+
 				<if test="tPaymentInfo.providentNo != null and tPaymentInfo.providentNo.trim() != ''">
 					AND a.PROVIDENT_NO = #{tPaymentInfo.providentNo}
 				</if>