Browse Source

Merge branch 'hotfix-20220621-agreementsignature'

# Conflicts:
#	hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaxHelperController.java
shc 3 years ago
parent
commit
c5e9d97998

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

@@ -30,12 +30,16 @@ public class UserAgreementSignatureRecord implements Serializable {
 
 	private Integer userId;
 
-	private  Integer target;
+	private Integer target;
 
 	private String agreement;
 
+	private String signImg;
+
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private LocalDateTime signTime;
 
 	private LocalDateTime createTime;
+
+
 }

+ 3 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaxHelperController.java

@@ -217,7 +217,8 @@ public class WmTaxHelperController {
 	public R<?> userAgreementAuthorization(@RequestBody String params) {
 
 		JSONObject jsonObject = JSONUtil.parseObj(params);
-		String signPic = upmsConfig.getApiUrl() + jsonObject.getStr("pic");
+		String picPath = jsonObject.getStr("pic");
+		String signPic = upmsConfig.getApiUrl() + picPath;
 
 		HnqzUser hnqzUser = SecurityUtils.getUser();
 
@@ -311,6 +312,7 @@ public class WmTaxHelperController {
 				uasr.setCreateTime(LocalDateTime.now());
 				uasr.setTarget(1);
 				uasr.setSignTime(signTime);
+				uasr.setSignImg(picPath);
 				userAgreementSignatureRecordMapper.insert(uasr);