feat: 用户新增税邦云协议签署记录

db/v2.0/0802.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `sys_user`
+    ADD `tax_helper_agreement_signature` INT(1) NULL COMMENT '税邦云协议签署记录 0 未签署 1 已签署';

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/SysUser.java

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.qunzhixinxi.hnqz.admin.api.enums.SignatureStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -269,4 +270,10 @@ public class SysUser implements Serializable {
 	@ApiModelProperty(value="人力家认证状态")
 	private Integer rljCertStatus;
 
+	/**
+	 * 税邦云协议签署,0->未签署，1->已签署
+	 */
+	@ApiModelProperty(value="税邦云协议签署")
+	private SignatureStatusEnum taxHelperAgreementSignature;
+
 }

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/enums/SignatureStatusEnum.java

@@ -0,0 +1,27 @@
+package com.qunzhixinxi.hnqz.admin.api.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * {@code SignatureStatusEnum}
+ * <p>
+ * 签名状态枚举
+ *
+ * @author Hengchen.Sun
+ * @version 1.0.0
+ * @date 2021/08/02 15:03:31
+ */
+@Getter
+@AllArgsConstructor
+public enum SignatureStatusEnum {
+
+	NOT_SIGNED(0, "未签署"),
+	SIGNED(1, "已签署");
+
+	@EnumValue
+	private final int code;
+
+	private final String message;
+}

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -2251,62 +2252,26 @@ public class ApiController {
 	@ApiOperation(value = "修改用户信息接口", notes = "修改用户信息接口")
 	@SysLog("修改用户信息接口")
 	@PostMapping("/updateUserInfo")
-	public R updateUserInfo(@RequestBody UserUpdateInput userUpdateInput) {
+	public R<?> updateUserInfo(@RequestBody UserUpdateInput userUpdateInput) {
 
-//		if (null == userUpdateInput.getUserId()) {
-//			return R.failed("用户ID不能为空");
-//		}
 		List<SysUser> list = sysUserService.getUserByPlatId(SecurityUtils.getUser().getPlatId());
-		boolean isUpdateOwner = false;
-		for (SysUser SysU : list) {
-			if ((SysU.getUserId() + "").equals(userUpdateInput.getUserId())) {
-				isUpdateOwner = true;
-			}
-		}
+		Optional<SysUser> userOptional = list.stream()
+				.filter(user -> StringUtils.equals(String.valueOf(user.getUserId()), userUpdateInput.getUserId()))
+				.findAny();
 
-		if (!isUpdateOwner) {
+		if (!userOptional.isPresent()) {
 			return R.failed("只能修改自己的用户信息");
 		}
 
 		SysUser sysUser = sysUserService.getById(userUpdateInput.getUserId());
-		if (userUpdateInput.getIdCardNumber().length() > 0) {
-			String str = userUpdateInput.getIdCardNumber();
-			str = str.substring(6, 10);
-			String str1 = userUpdateInput.getIdCardNumber();
-			str1 = str1.substring(10, 12);
-			String str2 = userUpdateInput.getIdCardNumber();
-			str2 = str2.substring(12, 14);
-			int i = Integer.parseInt(str);
-			int i1 = Integer.parseInt(str1) - 1;
-			int i2 = Integer.parseInt(str2);
-
-			Calendar calendar = Calendar.getInstance();
-			calendar.setTime(new Date());//放入Date类型数据
-
-			int year = calendar.get(Calendar.YEAR);//获取年份
-			int month = calendar.get(Calendar.MONTH);//获取月份
-			int day = calendar.get(Calendar.DATE);//获取日
-
-			if (year - i < 18) {
+
+		// 校验身份证上的年龄
+		if(StringUtils.isNotEmpty(userUpdateInput.getIdCardNumber())){
+			int ageByIdCard = IdcardUtil.getAgeByIdCard(userUpdateInput.getIdCardNumber());
+			if (ageByIdCard < 18) {
 				return R.failed("年龄未满十八");
-			} else if (year - i == 18) {
-				if (month > i1) {
-					return R.failed("年龄未满十八");
-				} else if (month == i1) {
-					if (day < i2) {
-						return R.failed("年龄未满十八");
-					}
-				}
-			} else if (year - i > 65) {
+			} else if (ageByIdCard > 65) {
 				return R.failed("年龄已超过六十五");
-			} else if (year - i == 65) {
-				if (month > i1) {
-					return R.failed("年龄已超过六十五");
-				} else if (month == i1) {
-					if (day >= i2) {
-						return R.failed("年龄已超过六十五");
-					}
-				}
 			}
 		}
 
@@ -2463,40 +2428,18 @@ public class ApiController {
 			}
 		}
 
-
-//		if (null != sysUser.getCertStatus() && (sysUser.getCertStatus() == 1 || sysUser.getCertStatus() == 3)
-//				&& (sysUser.getCertStatus() == 10 || sysUser.getCertStatus() == 16)) {
-//			if (!userUpdateInput.getRealname().equals(sysUser.getRealname())) {
-//				return R.failed("用户认证通过或正在认证，暂不能修改姓名");
-//			}
-//			if (!userUpdateInput.getIdCardNumber().equals(sysUser.getIdCardNumber())) {
-//				return R.failed("用户认证通过或正在认证，暂不能修改身份证号");
-//			}
-//		} else {
-//			//发起认证
-//			SysDept sysDept = sysDeptService.getById(sysUser.getDeptId());
-//
-//			if (null != sysDept && StringUtils.isNotEmpty(sysDept.getAppId())) {
-//				if ("1".equals(sysUser.getUserType())) {
-//
-//
-//				} else {
-//
-//				}
-//			}
-//		}
-
-		if (null != sysUser) {
-			sysUser.setAvatar(userUpdateInput.getAvatar());
-			if (StringUtils.isNotEmpty(userUpdateInput.getIdCardNumber())) {
-				sysUser.setIdCardNumber(userUpdateInput.getIdCardNumber());
-			}
-			// 姓名去除空格（包括字符之间的所有空格都会去除）
-			sysUser.setRealname(StrUtil.cleanBlank(userUpdateInput.getRealname()));
-			sysUser.setUserSign(userUpdateInput.getUserSign());
-			sysUserService.updateById(sysUser);
-
+		sysUser.setAvatar(userUpdateInput.getAvatar());
+		if (StringUtils.isNotEmpty(userUpdateInput.getIdCardNumber())) {
+			sysUser.setIdCardNumber(userUpdateInput.getIdCardNumber());
+		}
+		// 姓名去除空格（包括字符之间的所有空格都会去除）
+		sysUser.setRealname(StrUtil.cleanBlank(userUpdateInput.getRealname()));
+		sysUser.setUserSign(userUpdateInput.getUserSign());
+		if (userUpdateInput.getTaxHelperAgreementSignature() != null){
+			sysUser.setTaxHelperAgreementSignature(userUpdateInput.getTaxHelperAgreementSignature());
 		}
+		sysUserService.updateById(sysUser);
+
 		return R.ok();
 	}
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/view/user/UserUpdateInput.java

@@ -1,6 +1,7 @@
 package com.qunzhixinxi.hnqz.admin.view.user;
 
 
+import com.qunzhixinxi.hnqz.admin.api.enums.SignatureStatusEnum;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -43,5 +44,10 @@ public class UserUpdateInput {
 	 */
 	private String userSign;
 
+	/**
+	 * 税邦云协议签署,0->未签署，1->已签署
+	 */
+	private SignatureStatusEnum taxHelperAgreementSignature;
+
 	private List<String> subList;
 }