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

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java

@@ -115,6 +115,7 @@ public class TEmployeeContractInfo extends BaseEntity {
 	@ExcelAttribute(name = "合同到期时间", needExport = true)
 	@Schema(description = "合同到期时间", name = "contractEnd")
 	@JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
+	@TableField(value = "contract_end", updateStrategy = FieldStrategy.IGNORED)
 	private Date contractEnd;
 	/**
 	 * 项目名称

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

@@ -296,10 +296,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 			// 初始化
 			tEmployeeContractInfo.setUpdateBy(user.getId());
 			tEmployeeContractInfo.setUpdateTime(LocalDateTime.now());
-			if (CommonConstants.TWO_STRING.equals(tEmployeeContractInfo.getContractType())
-					|| CommonConstants.ZERO_STRING.equals(tEmployeeContractInfo.getContractType())) {
-				tEmployeeContractInfo.setContractEnd(null);
-			}
+
 			//是否归档：否
 			tEmployeeContractInfo.setIsFile(CommonConstants.ONE_STRING);
 			//是否在用：否
@@ -342,6 +339,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 				}
 
 			}
+			if (CommonConstants.TWO_STRING.equals(tEmployeeContractInfo.getContractType())
+					|| CommonConstants.ZERO_STRING.equals(tEmployeeContractInfo.getContractType())) {
+				tEmployeeContractInfo.setContractEnd(null);
+			}
 			return this.saveContractAndAtta(tEmployeeContractInfo, user);
 		} catch (Exception e) {
 			log.error("员工合同保存异常：" + e.getMessage());
@@ -449,6 +450,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 		if (Common.isNotNull(tEmployeeContractInfo.getAttaList())) {
 			tEmployeeContractInfo.setIsFile(CommonConstants.ZERO_STRING);
 		}
+		if (CommonConstants.TWO_STRING.equals(tEmployeeContractInfo.getContractType())
+				|| CommonConstants.ZERO_STRING.equals(tEmployeeContractInfo.getContractType())) {
+			tEmployeeContractInfo.setContractEnd(null);
+		}
 		if (null != tEmployeeContractInfo.getSettleDomain()
 				&& (Common.isEmpty(tEmployeeContractInfo.getSubjectUnit())
 				|| Common.isEmpty(tEmployeeContractInfo.getSubjectDepart()))) {
@@ -472,7 +477,6 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 
 		// 标准合同、劳动派遣合同、其他。————社保公积金都派减，自动审核通过
 		this.judgeAuditStatus(tEmployeeContractInfo, user);
-
 		if (Common.isEmpty(tEmployeeContractInfo.getId())) {
 			// 针对编码再做一次重复性校验
 			String isCur = baseMapper.getContractByApplyNo(tEmployeeContractInfo.getApplyNo());
@@ -485,12 +489,14 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 				this.updateFileMainId(tEmployeeContractInfo);
 			}
 		} else {
+
 			baseMapper.updateById(tEmployeeContractInfo);
 		}
 		// 不是待提交，记录审核记录
 		this.setAuditInfo(tEmployeeContractInfo);
 
 		// 更新档案合同状态
+
 		if (tEmployeeContractInfo.getAuditStatus() == CommonConstants.TWO_INT) {
 			this.updateEmployeeContractStatus(tEmployeeContractInfo);
 		}
@@ -1138,7 +1144,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 					}
 				}
 				if (!EmployeeConstants.SITUATION_SEVEN.equals(insert.getSituation()) && !EmployeeConstants.SITUATION_SIX.equals(insert.getSituation())) {
-					if (CommonConstants.TWO_STRING.equals(insert.getContractType()) || CommonConstants.ZERO_STRING.equals(insert.getContractType())) {
+					if (CommonConstants.CONTRACT_TYPE_TWO.equals(insert.getContractType()) || CommonConstants.CONTRACT_TYPE_ZERO.equals(insert.getContractType())) {
 						TEmployeeContractInfo contractInfo = this.getOne(Wrappers.<TEmployeeContractInfo>query().lambda()
 								.eq(TEmployeeContractInfo::getEmpIdcard, insert.getEmpIdcard())
 								.eq(TEmployeeContractInfo::getContractStart, insert.getContractStart())

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java

@@ -579,4 +579,8 @@ public interface CommonConstants {
 
 	String START =  "启用";
 	String STOP  =  "停用";
+
+
+	String CONTRACT_TYPE_TWO="无固定期限";
+	String CONTRACT_TYPE_ZERO="已完成一定工作任务为期限";
 }

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_ID"));
+			}
+			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_ID"));
+			}
+			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_ID"));
+			}
+			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>