Prechádzať zdrojové kódy

feat: 补签协议逻辑

lixuesong 1 rok pred
rodič
commit
a20b9e720f

+ 7 - 2
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmPayOffServiceImpl.java

@@ -751,11 +751,16 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 
 		String subType = String.valueOf(location.getGigType().getCode());
 
-		input.getNotes().forEach(note -> {
+		for (WmScorePackageSettleNote note : input.getNotes()) {
+			SysUser sysUser = sysUserMapper.selectById(note.getUserId());
+			if (sysUser.getReSignedAgreement().equals(0)) {
+				return R.failed(sysUser.getRealname() + "需要补签协议");
+			}
+
 			// 设置实际结算deptId和dept的subId
 			note.setSettleDeptId(operator.getDeptId());
 			note.setSettleDeptSubId(sysDeptSub.getSubId());
-		});
+		}
 
 		// 人力家
 		if (SubjectTypeEnum.TYPE_RENLIJIA.getCode().equals(subType)) {

+ 8 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageSettleNoteServiceImpl.java

@@ -637,6 +637,10 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			return R.failed(sysUser.getRealname() + "人员认证信息不存在,不能结算");
 		}
 
+		if (sysUser.getReSignedAgreement().equals(0)) {
+			return R.failed(sysUser.getRealname() + "需要补签协议");
+		}
+
 		if (redisTemplate.hasKey(CacheConstants.SETTLE_PACKAGE_KEY + note.getId())) {
 			return R.failed("结算对象-" + sysUser.getRealname() + ":正在结算,请勿重复结算");
 		}
@@ -815,6 +819,10 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				return R.failed(sysUser.getRealname() + "人员认证信息不存在,不能结算");
 			}
 
+			if (sysUser.getReSignedAgreement().equals(0)) {
+				return R.failed(sysUser.getRealname() + "需要补签协议");
+			}
+
 			if (redisTemplate.hasKey(CacheConstants.SETTLE_PACKAGE_KEY + note.getId())) {
 				return R.failed("结算对象-" + sysUser.getRealname() + ":正在结算,请勿重复结算");
 			}