Merge branch 'hotfix-20220621-agreementsignature' into temp-pre

# Conflicts:
#	hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaxHelperController.java

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;
+
+
 }

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

@@ -114,7 +114,6 @@ public class WmTaxHelperController {
 	private final UserAgreementSignatureRecordMapper userAgreementSignatureRecordMapper;
 
 
-
 	/**
 	 * 税邦云增员
 	 *
@@ -218,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();
 
@@ -283,7 +283,7 @@ public class WmTaxHelperController {
 			model.setAuthorizationTime(LocalDateTimeUtil.format(signTime, CommonConstants.DEFAULT_DATE_TIME_FORMAT_PATTERN));
 			model.setIdCard(user.getIdCardNumber());
 			try {
-				model.setSignatureHandwriting(Base64Utils.encodeImageWithPrefix(new URI(String.format("%s%s", upmsConfig.getClientUrl(), signPic))));
+				model.setSignatureHandwriting(Base64Utils.encodeImageWithPrefix(new URI(signPic)));
 
 			} catch (Exception e) {
 				log.error("获取手签图片失败，signPic={}", signPic);
@@ -312,6 +312,7 @@ public class WmTaxHelperController {
 				uasr.setCreateTime(LocalDateTime.now());
 				uasr.setTarget(1);
 				uasr.setSignTime(signTime);
+				uasr.setSignImg(picPath);
 				userAgreementSignatureRecordMapper.insert(uasr);