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