From 3de771de14536d71d0d643be55c254df27a7e648 Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Thu, 17 Dec 2020 14:52:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8C=87=E6=B4=BE?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=91=98=E5=B7=A5=E6=97=B6?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../daqing/financial/hrms/controller/EmployeeController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java index 182cf632..bf563dbe 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java @@ -69,8 +69,7 @@ public class EmployeeController implements EmployeeControllerApi { @PostMapping("/tree") public ResponseResult tree(@RequestBody List ids) { List result = employeeService.permissionTreeList(ids); - return result == null ? new ResponseResult(CommonCode.PERMISSION_IS_NOT) : - new ResponseResult>().SUCCESS(result); + return ResponseResult.SUCCESS(result); } /** From a4ec4525e4f9fe92c1d3965e84dc16dedf33ec85 Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Fri, 18 Dec 2020 17:06:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E5=AF=BC=E5=85=A5jar=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=9B=9E=E7=BB=99=E6=8B=85?= =?UTF-8?q?=E4=BF=9D=E5=87=BD=E6=97=B6=E5=88=A0=E9=99=A4=E9=A9=B3=E5=9B=9E?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../guarantee/mapper/DgLoanCommitteeConsiderMapper.java | 3 ++- .../service/impl/DgLoanCommitteeConsiderServiceImpl.java | 4 ++-- .../src/main/resources/bootstrap.properties | 4 ++-- .../mapper/guarantee/DgLoanCommitteeConsiderMapper.xml | 2 +- .../financial/hrms/service/impl/EmployeeServiceImpl.java | 2 +- dq-framework-utils/pom.xml | 5 +++++ 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java index 062b4a61..8a338ef2 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java @@ -50,7 +50,8 @@ public interface DgLoanCommitteeConsiderMapper extends BaseMapper 0) { - // 当前贷审会的操作状态为驳回,表示为担保函驳回数据,改变担保函的法规部经理的操作状态为待处理,审核状态为审核中 + // 当前贷审会的数据存在,表示为担保函驳回数据,改变担保函的法规部经理的操作状态为待处理,审核状态为审核中 result1 = this.getBaseMapper().updateGuaranteeLetterAssignUser( this.getBaseMapper().getDgLoanCommitteeConsider(dgLoanCommitteeConsiderRequest.getId()).getBusinessId(), - PromptSuccess.FG_JL_ID, StatusCode.SP_IN_REVIEW, StatusCode.CZ_ON_HAND); + PromptSuccess.FG_JL_ID, StatusCode.SP_IN_REVIEW, StatusCode.CZ_ON_HAND,""); } else { // 当前贷审会的操作状态不为驳回,表示不是担保函驳回数据,在担保函表中插入一条数据 DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = new DgGuaranteeLetterAssignUser(); diff --git a/dq-financial-guarantee/src/main/resources/bootstrap.properties b/dq-financial-guarantee/src/main/resources/bootstrap.properties index d0e675df..e979dd87 100644 --- a/dq-financial-guarantee/src/main/resources/bootstrap.properties +++ b/dq-financial-guarantee/src/main/resources/bootstrap.properties @@ -1,6 +1,6 @@ #服务名称 -spring.application.name=dq-financial-guarantee -#配置中心地址 +#spring.application.name=dq-financial-guarantee +##配置中心地址 spring.cloud.nacos.config.server-addr=192.168.31.140:8848 spring.cloud.nacos.config.namespace=58fa89c6-0e23-4530-ac13-95747e873c60 #spring.cloud.nacos.config.group=prod diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml index 328c1ce6..1ecc5aff 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml @@ -137,7 +137,7 @@ - UPDATE dg_guarantee_letter_assign_user SET status = #{auditStatus},operating_status = #{operatingStatus} + UPDATE dg_guarantee_letter_assign_user SET status = #{auditStatus},operating_status = #{operatingStatus},audit_opinion = #{auditOpinion} WHERE business_id = #{businessId} AND role_id = #{roleId} diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java index 0d29448e..42e830a8 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java @@ -539,7 +539,7 @@ public class EmployeeServiceImpl extends ServiceImpl(roleIds)); + this.getBaseMapper().insertRole(user.getId(), new ArrayList<>(roleIds)); } return true; } diff --git a/dq-framework-utils/pom.xml b/dq-framework-utils/pom.xml index c780b64c..61868c10 100644 --- a/dq-framework-utils/pom.xml +++ b/dq-framework-utils/pom.xml @@ -52,6 +52,11 @@ poi-ooxml-schemas 3.15 + + org.apache.poi + ooxml-schemas + 1.0 + org.apache.tomcat.embed tomcat-embed-core From 8fd3cbb140059e6ccfbb29f4ea6583e3c7b5fdcc Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Fri, 18 Dec 2020 17:14:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6=E5=87=BA=E9=94=99=E7=9A=84=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../financial/crms/service/impl/CustomerServiceImpl.java | 6 +++--- .../com/daqing/framework/model/response/ResponseResult.java | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java index 20f03db5..34c101fc 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java @@ -370,7 +370,7 @@ public class CustomerServiceImpl extends ServiceImpl().SUCCESS("导入数据失败,员工" + manager.getManager() + "不存在"); + return new ResponseResult().FAIL("导入数据失败,员工" + manager.getManager() + "不存在"); } } this.saveCustomerPersonal(customerPersonalTOI); @@ -390,14 +390,14 @@ public class CustomerServiceImpl extends ServiceImpl().SUCCESS("导入数据失败,员工" + manager.getManager() + "不存在"); + return new ResponseResult().FAIL("导入数据失败,员工" + manager.getManager() + "不存在"); } } this.saveCustomerCompany(customerCompanyTOI); } return ResponseResult.SUCCESS(); } catch (Exception e) { - return new ResponseResult().SUCCESS("导入数据失败,请检查文件和数据格式或稍后再试"); + return new ResponseResult().FAIL("导入数据失败,请检查文件和数据格式或稍后再试"); } } diff --git a/dq-framework-common/src/main/java/com/daqing/framework/model/response/ResponseResult.java b/dq-framework-common/src/main/java/com/daqing/framework/model/response/ResponseResult.java index 3b78c29c..edf2b061 100644 --- a/dq-framework-common/src/main/java/com/daqing/framework/model/response/ResponseResult.java +++ b/dq-framework-common/src/main/java/com/daqing/framework/model/response/ResponseResult.java @@ -53,7 +53,11 @@ public class ResponseResult { } public static ResponseResult SUCCESS(Object t) { - return new ResponseResult<>(true, 10000, t, "操作成功！"); + return new ResponseResult<>(true, 10000, t, "操作成功!"); + } + + public static ResponseResult FAIL(Object t) { + return new ResponseResult<>(false, 99999, t, "操作失败!"); } public ResponseResult SUCCESS_DATA(T t){