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

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

@@ -408,9 +408,13 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 				.eq(TEmployeeProject::getDeleteFlag,CommonConstants.STATUS_NORMAL).eq(TEmployeeProject::getProjectStatus,CommonConstants.ZERO_INT));
 		if (Common.isNotNull(updateTEmployeeProject)) {
 
-			if (updateTEmployeeProject.getSocialStatus() == CommonConstants.dingleDigitIntArray[1] ||
-					updateTEmployeeProject.getFundStatus() == CommonConstants.dingleDigitIntArray[1]) {
-				return R.failed("人员在原项目中存在在途的服务(社保或公积金在途)，请先终止后，再进行划转");
+			if (updateTEmployeeProject.getSocialStatus() == CommonConstants.dingleDigitIntArray[1]
+					&& vo.getChangeItems().indexOf(CommonConstants.ONE_STRING) >= CommonConstants.ZERO_INT) {
+				return R.failed("人员在原项目中存在在途的社保，请先终止后，再进行划转");
+			}
+			if (updateTEmployeeProject.getFundStatus() == CommonConstants.dingleDigitIntArray[1]
+					&& vo.getChangeItems().indexOf(CommonConstants.TWO_STRING) >= CommonConstants.ZERO_INT){
+				return R.failed("人员在原项目中存在在途的公积金，请先终止后，再进行划转");
 			}
 
 			TSettleDomain tSettleDomain = tSettleDomainMapper.selectOne(Wrappers.<TSettleDomain>query().lambda()

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java

@@ -299,6 +299,23 @@ public class SalaryAccountUtil implements Serializable {
 									errorList.add(new ErrorMessage((i + 2), "请注意：工资发放时间，只能是【立即发】或【暂停发】！你的内容：【"+cellValueStr+"】"));
 									continue;
 								}
+								if (SalaryConstants.SALARY_STYLE.equals(scs.getJavaFiedName())
+										&& !SalaryConstants.SALARY_STYLE_YIN.equals(cellValueStr)
+										&& !SalaryConstants.SALARY_STYLE_XIAN.equals(cellValueStr)) {
+									errorFlag = false;
+									errorList.add(new ErrorMessage((i + 2), "请注意：发放方式，只能是【银行】或【现金】！你的内容：【"+cellValueStr+"】"));
+									continue;
+								}
+								if (SalaryConstants.IS_PERSON_TAX.equals(scs.getJavaFiedName())
+										&& !SalaryConstants.IS_COMPANY.equals(cellValueStr)
+										&& !SalaryConstants.IS_PERSON_OTHER.equals(cellValueStr)
+										&& !SalaryConstants.IS_PERSON.equals(cellValueStr)) {
+									errorFlag = false;
+									errorList.add(new ErrorMessage((i + 2), "请注意：是否个人承担部分税费，只能是【"
+											+SalaryConstants.IS_COMPANY+"】或【"+SalaryConstants.IS_PERSON_OTHER+"】或【"
+											+SalaryConstants.IS_PERSON+"】！你的内容：【"+cellValueStr+"】"));
+									continue;
+								}
 								setFields(field, cellValueStr, attr, fieldType, entity);
 								error = validateUtil(cellValueStr, attr, (i + 2));
 								if (null != error) {
@@ -481,6 +498,7 @@ public class SalaryAccountUtil implements Serializable {
 									continue;
 								}
 								newEmps.setSalaryGiveTime(entity.getSalaryGiveTime());
+								log.error(newEmps.getEmpName());
 								saveNewEmpList.add(newEmps);
 								checkTaxMonthList.add(newEmps.getEmpIdcard());
 							} else {
@@ -963,9 +981,14 @@ public class SalaryAccountUtil implements Serializable {
 					}
 					areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + entity.getBankCity().trim()
 							+ CommonConstants.DOWN_LINE_STRING + entity.getBankProvince().trim());
+					log.error("entity.getBankCity():"+entity.getBankCity());
+					log.error("entity.getBankProvince():"+entity.getBankProvince());
+					log.error("areaStr:"+areaStr);
 					if (Common.isNotNull(areaStr)) {
 						newEmp.setBankCity(areaStr);
+						log.error("1：areaStr:"+areaStr);
 					} else {
+						log.error("2：开户行市错误:"+areaStr);
 						error = "第" + (i + 2) + "行：" + newEmpStr + "-开户行市错误：" + entity.getBankCity();
 						errorList.add(new ErrorMessage((i + 2), error));
 						return false;

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryConstants.java

@@ -195,4 +195,9 @@ public class SalaryConstants {
 	public static final String TAX_MONTH_LENGTH = "计税月份错误";
 	// 暂停发java
 	public static final String SALARY_GIVE_TIME_JAVA = "salaryGiveTime";
+	public static final String SALARY_STYLE = "salaryStyle";
+	public static final String SALARY_STYLE_YIN = "银行";
+	public static final String SALARY_STYLE_XIAN = "现金";
+
+	public static final String IS_PERSON_TAX = "isPersonTax";
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPaymentInfoController.java

@@ -27,6 +27,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.ErrorDetailVO;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
+import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
 import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
@@ -66,6 +67,8 @@ public class TPaymentInfoController {
 
 	private final TPaymentInfoService tPaymentInfoService;
 
+	private final MenuUtil menuUtil;
+
 	/**
 	 * 简单分页查询
 	 *
@@ -89,6 +92,16 @@ public class TPaymentInfoController {
 	@Operation(description = "简单分页查询")
 	@GetMapping("/newPage")
 	public R<IPage<TPaymentInfoNewVo>> getTPaymentInfoNewPage(Page<TPaymentInfo> page, TPaymentInfoSearchVo tPaymentInfo) {
+		YifuUser user = SecurityUtils.getUser();
+		menuUtil.setAuthSql(user, tPaymentInfo);
+		if (Common.isNotNull(tPaymentInfo.getAuthSql())) {
+			if (tPaymentInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
+				tPaymentInfo.setAuthSql(tPaymentInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
+			}
+			if (tPaymentInfo.getAuthSql().contains("1=2 EXISTS")) {
+				tPaymentInfo.setAuthSql(tPaymentInfo.getAuthSql().replace("1=2 EXISTS", "EXISTS"));
+			}
+		}
 		return new R<>(tPaymentInfoService.getTPaymentInfoNewPage(page, tPaymentInfo));
 	}
 
@@ -101,6 +114,16 @@ public class TPaymentInfoController {
 	@Operation(description = "简单分页查询")
 	@GetMapping("/newPageInfo")
 	public R<TPaymentInfoNewVo> getTPaymentInfoNewPageInfo(TPaymentInfoSearchVo tPaymentInfo) {
+		YifuUser user = SecurityUtils.getUser();
+		menuUtil.setAuthSql(user, tPaymentInfo);
+		if (Common.isNotNull(tPaymentInfo.getAuthSql())) {
+			if (tPaymentInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
+				tPaymentInfo.setAuthSql(tPaymentInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
+			}
+			if (tPaymentInfo.getAuthSql().contains("1=2 EXISTS")) {
+				tPaymentInfo.setAuthSql(tPaymentInfo.getAuthSql().replace("1=2 EXISTS", "EXISTS"));
+			}
+		}
 		return R.ok(tPaymentInfoService.getTPaymentInfoNewPageInfo(tPaymentInfo));
 	}
 
@@ -313,6 +336,16 @@ public class TPaymentInfoController {
 	@PostMapping("/sumSearchExport")
 	@PreAuthorize("@pms.hasPermission('social_tpaymentinfo_export')")
 	public void sumSearchExport(HttpServletResponse response, @RequestBody TPaymentInfoSearchVo searchVo) {
+		YifuUser user = SecurityUtils.getUser();
+		menuUtil.setAuthSql(user, searchVo);
+		if (Common.isNotNull(searchVo.getAuthSql())) {
+			if (searchVo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
+				searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
+			}
+			if (searchVo.getAuthSql().contains("1=2 EXISTS")) {
+				searchVo.setAuthSql(searchVo.getAuthSql().replace("1=2 EXISTS", "EXISTS"));
+			}
+		}
 		tPaymentInfoService.sumSearchExport(response, searchVo);
 	}
 

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

@@ -809,6 +809,9 @@
 						AND a.SOCIAL_TOWN = '${tPaymentInfo.socialTown}'
 					</if>
 				</if>
+				<if test="tPaymentInfo.authSql != null and tPaymentInfo.authSql.trim() != ''">
+					${tPaymentInfo.authSql}
+				</if>
 				<!-- 区域 默认精准查询 0    包含下级查询 1 结束  2023-03-02 fxj -->
 			</if>
 		</if>
@@ -878,6 +881,9 @@
 						AND a.FUND_TOWN = '${tPaymentInfo.socialTown}'
 					</if>
 				</if>
+				<if test="tPaymentInfo.authSql != null and tPaymentInfo.authSql.trim() != ''">
+					${tPaymentInfo.authSql}
+				</if>
 				<!-- 区域 默认精准查询 0    包含下级查询 1 结束  2023-03-02 fxj -->
 			</if>
 		</if>