Merge branch 'feat-20230110-subjectswitch' into temp-pre

db/v2.0/230110.sql

@@ -0,0 +1,5 @@
+-- deptSub新增字段
+alter table sys_dept_sub
+    add cert_enable tinyint default 1 null comment '认证是否启用：1：启用，0：停用';
+alter table sys_dept_sub
+    add settle_enable tinyint default 1 null comment '结算是否启用：1：启用，0：停用';

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysDeptSubController.java

@@ -86,6 +86,7 @@ public class SysDeptSubController {
 	 * @param settleConfigDTO
 	 * @return
 	 */
+	@SysLog("结算管理配置-保存")
 	@PostMapping("/save-settle-config")
 	public R<?> saveSettleConfig(@Valid @RequestBody SettleConfigDTO settleConfigDTO) {
 		for (SettleConfigDTO.DeptSub deptSub : settleConfigDTO.getSubList()) {

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserSignCertController.java

@@ -8,12 +8,16 @@ import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.qunzhixinxi.hnqz.admin.api.constant.CacheConstants;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
+import com.qunzhixinxi.hnqz.admin.entity.SysDeptSub;
 import com.qunzhixinxi.hnqz.admin.entity.SysUserExtRecord;
 import com.qunzhixinxi.hnqz.admin.entity.SysUserSub;
 import com.qunzhixinxi.hnqz.admin.entity.dto.UserSignCertDTO;
 import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
 import com.qunzhixinxi.hnqz.admin.enums.GigTypeEnum;
 import com.qunzhixinxi.hnqz.admin.enums.SubjectLocation;
+import com.qunzhixinxi.hnqz.admin.enums.SubjectTypeEnum;
+import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
+import com.qunzhixinxi.hnqz.admin.service.SysDeptSubService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserExtRecordService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserSubService;
@@ -59,6 +63,8 @@ public class SysUserSignCertController {
 
 	private final SysUserSubService sysUserSubService;
 
+	private final SysDeptSubService sysDeptSubService;
+
 	private final RedisTemplate<String, Object> redisTemplate;
 
 	/**
@@ -112,6 +118,17 @@ public class SysUserSignCertController {
 			return R.failed("身份证号不正确");
 		}
 
+		// 校验是否配置了结算限制
+		Integer deptId = SecurityUtils.getUser().getDeptId();
+		SysDeptSub queryDeptSub = sysDeptSubService.getOne(Wrappers.<SysDeptSub>lambdaQuery()
+				.eq(SysDeptSub::getDeptId, SecurityUtils.getUser().getDeptId())
+				.eq(SysDeptSub::getSubjectLocation, userSignCertDTO.getSubjectLocation())
+				.eq(SysDeptSub::getEnableFlag, SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode()));
+		if (!queryDeptSub.getCertEnable()) {
+			log.info("{}企业配置了认证限制", deptId);
+			return R.failed("系统维护中，请联系管理员");
+		}
+
 		sysUserSignCertService.saveBaseInfo(userSignCertDTO);
 
 		return R.ok();
@@ -132,6 +149,18 @@ public class SysUserSignCertController {
 		if (userSignCertDTO.getSubjectLocation() == null) {
 			return R.failed("税源地不能为空");
 		}
+
+		// 校验是否配置了结算限制
+		Integer deptId = SecurityUtils.getUser().getDeptId();
+		SysDeptSub queryDeptSub = sysDeptSubService.getOne(Wrappers.<SysDeptSub>lambdaQuery()
+				.eq(SysDeptSub::getDeptId, SecurityUtils.getUser().getDeptId())
+				.eq(SysDeptSub::getSubjectLocation, userSignCertDTO.getSubjectLocation())
+				.eq(SysDeptSub::getEnableFlag, SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode()));
+		if (!queryDeptSub.getCertEnable()) {
+			log.info("{}企业配置了认证限制", deptId);
+			return R.failed("系统维护中，请联系管理员");
+		}
+
 		return sysUserSignCertService.toSign(userSignCertDTO);
 	}
 
@@ -236,6 +265,17 @@ public class SysUserSignCertController {
 //			}
 		}
 
+		// 校验是否配置了结算限制
+		Integer deptId = SecurityUtils.getUser().getDeptId();
+		SysDeptSub queryDeptSub = sysDeptSubService.getOne(Wrappers.<SysDeptSub>lambdaQuery()
+				.eq(SysDeptSub::getDeptId, SecurityUtils.getUser().getDeptId())
+				.eq(SysDeptSub::getSubjectLocation, userSignCertDTO.getSubjectLocation())
+				.eq(SysDeptSub::getEnableFlag, SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode()));
+		if (!queryDeptSub.getCertEnable()) {
+			log.info("{}企业配置了认证限制", deptId);
+			return R.failed("系统维护中，请联系管理员");
+		}
+
 		// 过滤出阿拉钉的渠道
 		Collection<SubjectLocation> oladingList =
 				CollUtil.intersection(CollUtil.toList(userSignCertDTO.getSubjectLocation()), SubjectLocation.getByGigType(GigTypeEnum.OLADING));

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/SysDeptSub.java

@@ -82,4 +82,14 @@ public class SysDeptSub extends Model<SysDeptSub> {
 	 */
 	private String[] pathNo;
 
+	/**
+	 * 认证是否启用：1：启用，0：停用
+	 */
+	private Boolean certEnable;
+
+	/**
+	 * 结算是否启用：1：启用，0：停用
+	 */
+	private Boolean settleEnable;
+
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/dto/SettleConfigDTO.java

@@ -71,5 +71,15 @@ public class SettleConfigDTO implements Serializable {
 		 * 税邦云用户类型对应的发票类目
 		 */
 		private String[] subjectInvoiceCategory;
+
+		/**
+		 * 认证是否启用：1：启用，0：停用
+		 */
+		private Boolean certEnable;
+
+		/**
+		 * 结算是否启用：1：启用，0：停用
+		 */
+		private Boolean settleEnable;
 	}
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysDeptSubServiceImpl.java

@@ -35,7 +35,6 @@ import com.qunzhixinxi.hnqz.admin.mapper.WmDaAgentMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmDaDrugEntMapper;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptSubService;
 import com.qunzhixinxi.hnqz.common.core.util.R;
-import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
@@ -169,6 +168,8 @@ public class SysDeptSubServiceImpl extends ServiceImpl<SysDeptSubMapper, SysDept
 				updateDeptSub.setSubjectLocation(sysDeptSub.getSubjectLocation());
 				updateDeptSub.setSubjectInvoiceCategory(sysDeptSub.getSubjectInvoiceCategory());
 				updateDeptSub.setLimitAmount(sysDeptSub.getLimitAmount());
+				updateDeptSub.setCertEnable(sysDeptSub.getCertEnable());
+				updateDeptSub.setSettleEnable(sysDeptSub.getSettleEnable());
 				updateDeptSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
 				updateDeptSub.setUpdateTime(LocalDateTime.now());
 				sysDeptSubMapper.updateById(updateDeptSub);
@@ -181,6 +182,8 @@ public class SysDeptSubServiceImpl extends ServiceImpl<SysDeptSubMapper, SysDept
 				insertDeptSub.setSubjectLocation(sysDeptSub.getSubjectLocation());
 				insertDeptSub.setSubjectInvoiceCategory(sysDeptSub.getSubjectInvoiceCategory());
 				insertDeptSub.setLimitAmount(sysDeptSub.getLimitAmount());
+				insertDeptSub.setCertEnable(sysDeptSub.getCertEnable());
+				insertDeptSub.setSettleEnable(sysDeptSub.getSettleEnable());
 				insertDeptSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
 				sysDeptSubMapper.insert(insertDeptSub);
 			}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysUserServiceImpl.java

@@ -42,7 +42,6 @@ import com.qunzhixinxi.hnqz.admin.api.vo.UserVO;
 import com.qunzhixinxi.hnqz.admin.entity.SysCertResultRecord;
 import com.qunzhixinxi.hnqz.admin.entity.SysDeptSub;
 import com.qunzhixinxi.hnqz.admin.entity.SysUserSub;
-import com.qunzhixinxi.hnqz.admin.entity.WmScorePackageSettleNote;
 import com.qunzhixinxi.hnqz.admin.entity.dto.CommonUserDTO;
 import com.qunzhixinxi.hnqz.admin.entity.input.UserCertificationInput;
 import com.qunzhixinxi.hnqz.admin.entity.output.UserCertificationOutput;
@@ -645,6 +644,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		StringBuilder msg = new StringBuilder();
 
 		for (String subjectLocation : input.getSubList()) {
+			// 校验是否配置了结算限制
+			Integer deptId = SecurityUtils.getUser().getDeptId();
+			SysDeptSub queryDeptSub = sysDeptSubMapper.selectOne(Wrappers.<SysDeptSub>lambdaQuery()
+					.eq(SysDeptSub::getDeptId, SecurityUtils.getUser().getDeptId())
+					.eq(SysDeptSub::getSubjectLocation, subjectLocation)
+					.eq(SysDeptSub::getEnableFlag, SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode()));
+			if (!queryDeptSub.getSettleEnable()) {
+				log.info("{}企业配置了结算限制", deptId);
+				return R.failed(null, "系统维护中，请联系管理员");
+			}
+
 			//人力家
 			if (SubjectLocation.REN_LI_JIA.getType().equals(subjectLocation)) {
 				Map<String, String> resultMap = certByRenLiJia(sysUser, sysDept);

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

@@ -252,6 +252,17 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		List<WmScorePackageSettleNote> notes = input.getNotes();
 		SubjectLocation location = input.getSubjectLocation();
 
+		// 校验是否配置了结算限制
+		Integer deptId = SecurityUtils.getUser().getDeptId();
+		SysDeptSub queryDeptSub = sysDeptSubService.getOne(Wrappers.<SysDeptSub>lambdaQuery()
+				.eq(SysDeptSub::getDeptId, SecurityUtils.getUser().getDeptId())
+				.eq(SysDeptSub::getSubjectLocation, location)
+				.eq(SysDeptSub::getEnableFlag, SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode()));
+		if (!queryDeptSub.getSettleEnable()) {
+			log.info("{}企业配置了结算限制", deptId);
+			throw new RuntimeException("系统维护中，请联系管理员");
+		}
+
 		// 校验人员信息
 		Set<Integer> userIds = notes.stream().map(WmScorePackageSettleNote::getUserId).map(Integer::valueOf).collect(Collectors.toSet());
 		userService.checkUserInfoToSettle(userIds, location);

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

@@ -342,6 +342,12 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 		condition.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
 		SysDeptSub sysDeptSub = sysDeptSubService.getOne(Wrappers.query(condition));
 
+		// 校验是否配置了结算限制
+		if (!sysDeptSub.getSettleEnable()) {
+			log.info("{}企业配置了结算限制", user.getDeptId());
+			throw new RuntimeException("系统维护中，请联系管理员");
+		}
+
 		if (null == sysDeptSub || StringUtils.isBlank(sysDeptSub.getAppId())) {
 			return R.failed("人员所在机构未配置结算信息");
 		}