瀏覽代碼

fix: 协议签名信息

shc 3 年之前
父節點
當前提交
0e2890b8e0

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

@@ -274,6 +274,6 @@ public class SysUser implements Serializable {
 	 * 税邦云协议签署,0->未签署,1->已签署
 	 */
 	@ApiModelProperty(value="税邦云协议签署")
-	private SignatureStatusEnum taxHelperAgreementSignature;
+	private Integer taxHelperAgreementSignature;
 
 }

+ 1 - 1
hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/vo/UserVO.java

@@ -241,6 +241,6 @@ public class UserVO implements Serializable {
 	 * 税邦云协议签署,0->未签署,1->已签署
 	 */
 	@ApiModelProperty(value="税邦云协议签署")
-	private SignatureStatusEnum taxHelperAgreementSignature;
+	private Integer taxHelperAgreementSignature;
 
 }

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

@@ -18,6 +18,7 @@ import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDictItem;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysRole;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
+import com.qunzhixinxi.hnqz.admin.api.enums.SignatureStatusEnum;
 import com.qunzhixinxi.hnqz.admin.api.vo.UserVO;
 import com.qunzhixinxi.hnqz.admin.config.UpmsConfig;
 import com.qunzhixinxi.hnqz.admin.entity.*;
@@ -2436,8 +2437,8 @@ public class ApiController {
 		// 姓名去除空格(包括字符之间的所有空格都会去除)
 		sysUser.setRealname(StrUtil.cleanBlank(userUpdateInput.getRealname()));
 		sysUser.setUserSign(userUpdateInput.getUserSign());
-		if (userUpdateInput.getTaxHelperAgreementSignature() != null){
-			sysUser.setTaxHelperAgreementSignature(userUpdateInput.getTaxHelperAgreementSignature());
+		if (StringUtils.isNotEmpty(userUpdateInput.getTaxHelperAgreementSignature())){
+			sysUser.setTaxHelperAgreementSignature(StringUtils.equals(SignatureStatusEnum.SIGNED.name(), userUpdateInput.getTaxHelperAgreementSignature()) ? 1 : 0);
 		}
 		sysUserService.updateById(sysUser);
 

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

@@ -47,7 +47,7 @@ public class UserUpdateInput {
 	/**
 	 * 税邦云协议签署,0->未签署,1->已签署
 	 */
-	private SignatureStatusEnum taxHelperAgreementSignature;
+	private String taxHelperAgreementSignature;
 
 	private List<String> subList;
 }