解决bug

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java

@@ -79,11 +79,7 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
     @GetMapping("/getRoles")
     @ApiOperation(value = "获取当前用户角色")
     public ResponseResult getRoles(){
-        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String roleIds = applyAmountInfoService.getRoles();
-        String token = request.getHeader("token");
-        String userId = RedisUtil.get("dq:token:" + token);
-        //获取当前用户拥有的角色ids
-        String roleIds = RedisUtil.get("dq:userRole:" + userId);
         return ResponseResult.SUCCESS(roleIds);
     }
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountInfoService.java

@@ -32,4 +32,6 @@ public interface IDgApplyAmountInfoService extends IService<DgApplyAmountInfo> {
     Boolean excelExport(List<String> ids,HttpServletResponse response);
 
     int approvalBusinessApplication(Integer id, Integer status, String remark, Integer companyId);
+
+    String getRoles();
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java

@@ -80,6 +80,14 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
     @Resource
     private DgApplyAmountInfoController dgApplyAmountInfoController;
 
+    @Override
+    public String getRoles() {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String token = request.getHeader("token");
+        String userId = RedisUtil.get("dq:token:" + token);
+        //获取当前用户拥有的角色ids
+        return RedisUtil.get("dq:userRole:" + userId);
+    }
 
     @Override
     @Transactional

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java

@@ -626,7 +626,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                         tempA.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_A_ID);
                         DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUserA = baseMapper.selectOne(tempA);
                         dgGuaranteeLetterAssignUserA.setStatus(StatusCode.SP_REJECT);
-                        dgGuaranteeLetterAssignUserA.setStatus(StatusCode.CZ_PROCESSED);
+                        dgGuaranteeLetterAssignUserA.setOperatingStatus(StatusCode.CZ_PROCESSED);
                         baseMapper.updateById(dgGuaranteeLetterAssignUserA);
 
                         //更新法规部经理的审核状态为驳回，操作状态为待处理

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java

@@ -137,7 +137,7 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl<DgLoanNoticeMapper, DgL
             DgLoanNotice loanNotice = baseMapper.selectOne(loanNoticeQueryWrapper);
             loanNotice.setAuditOpinion(auditOpinion);
             loanNotice.setConsiderId(currentUser);
-            loanNotice.setStatus(StatusCode.SP_REVIEWED);
+            loanNotice.setStatus(StatusCode.SP_REJECT);
             loanNotice.setOperatingStatus(StatusCode.CZ_PROCESSED);
             int update = baseMapper.updateById(loanNotice);
             //同时往审核流程进程表新增一条记录
@@ -150,6 +150,7 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl<DgLoanNoticeMapper, DgL
                 DgPaymentConfirmationConsider paymentConfirmationConsider = paymentConfirmationConsiderMapper.selectOne(queryWrapper);
                 paymentConfirmationConsider.setStatus(StatusCode.SP_REJECT);
                 paymentConfirmationConsider.setOperatingStatus(StatusCode.CZ_ON_HAND);
+                paymentConfirmationConsider.setAuditOpinion("");
                 int updateById = paymentConfirmationConsiderMapper.updateById(paymentConfirmationConsider);
                 //更新成功，返回操作结果
                 log.info(updateById > 0 ? "驳回更新财务部经理成功" : "驳回更新财务部经理失败");

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml

@@ -51,7 +51,7 @@
                 AND (lau.user_id = #{userId} or lau.user_id is null OR lau.user_id = '')
             </if>
             <if test="customerNumberOrName != null and customerNumberOrName != ''">
-                AND aai.business_code LIKE CONCAT('%',#{customerNumberOrName},'%') OR cc.name LIKE CONCAT('%',#{customerNumberOrName},'%')
+                AND (aai.business_code LIKE CONCAT('%' #{customerNumberOrName} '%') OR cc.name LIKE CONCAT('%' #{customerNumberOrName} '%'))
             </if>
             <if test="status != null and status != ''">
                 AND lau.status = #{status}

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml

@@ -49,7 +49,7 @@
                 AND (ln.consider_id = #{userId} or ln.consider_id is null OR ln.consider_id = '')
             </if>
             <if test="customerNumberOrName != null and customerNumberOrName != ''">
-                AND aai.business_code LIKE CONCAT('%',#{customerNumberOrName},'%') OR cc.name LIKE CONCAT('%',#{customerNumberOrName},'%')
+                AND (aai.business_code LIKE CONCAT('%' #{customerNumberOrName} '%') OR cc.name LIKE CONCAT('%' #{customerNumberOrName} '%'))
             </if>
             <if test="status != null and status != ''">
                 AND ln.status = #{status}

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml

@@ -53,7 +53,7 @@
                 AND (pcc.consider_id = #{userId} or pcc.consider_id is null OR pcc.consider_id = '')
             </if>
             <if test="customerNumberOrName != null and customerNumberOrName != ''">
-                AND aai.business_code LIKE CONCAT('%',#{customerNumberOrName},'%') OR cc.name LIKE CONCAT('%',#{customerNumberOrName},'%')
+                AND (aai.business_code LIKE CONCAT('%' #{customerNumberOrName} '%') OR cc.name LIKE CONCAT('%' #{customerNumberOrName} '%'))
             </if>
             <if test="status != null and status != ''">
                 AND pcc.status = #{status}