From 67685e775e05dedc22d7ef751a504b7ccf948fad Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Thu, 8 Apr 2021 11:55:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=84=E9=80=81=E6=96=B0=E5=A2=9E=E5=8F=82?= =?UTF-8?q?=E6=95=B0=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=B5=8B=E8=AF=95=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap.properties | 4 ++-- .../guarantee/controller/DgCopyForController.java | 5 +++-- .../guarantee/model/request/CopySendRequest.java | 7 ++++++- .../guarantee/model/response/CopyForMeResponse.java | 8 ++++++++ .../guarantee/service/IDgCopyForService.java | 2 +- .../guarantee/service/impl/DgCopyForServiceImpl.java | 12 +++++++----- .../src/main/resources/bootstrap.properties | 4 ++-- .../resources/mapper/guarantee/DgCopyUserMapper.xml | 6 +++++- .../hrauth/controller/UserLoginController.java | 3 ++- .../hrauth/service/impl/UserServiceImpl.java | 9 ++++++--- .../src/main/resources/bootstrap.properties | 4 ++-- .../src/main/resources/bootstrap.properties | 4 ++-- .../framework/model/response/PromptSuccess.java | 6 ++++-- .../daqing/framework/domain/guarantee/DgCopyFor.java | 5 +++++ .../src/main/resources/bootstrap.properties | 4 ++-- 15 files changed, 57 insertions(+), 26 deletions(-) diff --git a/dq-financial-crms/src/main/resources/bootstrap.properties b/dq-financial-crms/src/main/resources/bootstrap.properties index f255f463..092df239 100644 --- a/dq-financial-crms/src/main/resources/bootstrap.properties +++ b/dq-financial-crms/src/main/resources/bootstrap.properties @@ -14,10 +14,10 @@ spring.redis.jedis.pool.max-wait=-1 spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.min-idle=0 #本地测试环境 -spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 +#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #线上测试环境 -#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 +spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 #线上生产环境 #spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406 diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyForController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyForController.java index d0c30c91..c51caf9b 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyForController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyForController.java @@ -39,9 +39,10 @@ public class DgCopyForController { public R copySend(@RequestBody CopySendRequest copySendRequest){ Integer businessId = copySendRequest.getBusinessId(); Integer processId = copySendRequest.getProcessId(); - String imgData = copySendRequest.getImgData(); + //String imgData = copySendRequest.getImgData(); + Integer detailId = copySendRequest.getDetailId(); try { - boolean ok = copyForService.copySendUser(businessId,processId,imgData); + boolean ok = copyForService.copySendUser(businessId,processId,detailId); return ok ? R.ok() : R.error(); } catch (IOException e) { e.printStackTrace(); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/CopySendRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/CopySendRequest.java index 21b09db5..39d84424 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/CopySendRequest.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/CopySendRequest.java @@ -18,5 +18,10 @@ public class CopySendRequest { @NotNull private Integer processId; - private String imgData; + //private String imgData; + /** + * 详情id + */ + @NotNull + private Integer detailId; } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/CopyForMeResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/CopyForMeResponse.java index 2bfa65eb..17f9857d 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/CopyForMeResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/CopyForMeResponse.java @@ -58,4 +58,12 @@ public class CopyForMeResponse { @ApiModelProperty("截图路径") private String picUrl; + @ExcelIgnore + @ApiModelProperty("详情id") + private Integer detailId; + + @ExcelIgnore + @ApiModelProperty("业务id") + private Integer businessId; + } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgCopyForService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgCopyForService.java index b5302640..22098c35 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgCopyForService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgCopyForService.java @@ -16,5 +16,5 @@ import java.io.IOException; */ public interface IDgCopyForService extends IService { - boolean copySendUser(Integer businessId, Integer processId, String imgData) throws IOException; + boolean copySendUser(Integer businessId, Integer processId, Integer detailId) throws IOException; } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgCopyForServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgCopyForServiceImpl.java index 22697c16..d32e2a77 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgCopyForServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgCopyForServiceImpl.java @@ -42,8 +42,8 @@ public class DgCopyForServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("business_id",businessId).eq("process_id",processId); baseMapper.update(copyForUpdate, updateWrapper); @@ -84,7 +85,8 @@ public class DgCopyForServiceImpl extends ServiceImpl + +