审核

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -69,6 +69,7 @@ public class SysProfileController extends BaseController {
         currentUser.setEmail(user.getEmail());
         currentUser.setPhonenumber(user.getPhonenumber());
         currentUser.setSex(user.getSex());
+        currentUser.setJgId(user.getJgId());
         if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(currentUser)) {
             return error("修改用户'" + loginUser.getUsername() + "'失败，手机号码已存在");
         }

ruoyi-common/src/main/java/com/ruoyi/common/utils/jPush/AbstractJPushToolUtil.java

@@ -35,9 +35,9 @@ public abstract class AbstractJPushToolUtil {
     }
 
 
-    private final static String appKey = "275af46e0d888270da3cfd1d";
+    private final static String appKey = "a6413fdbfa71dd4f27f4c9f4";
 
-    private final static String masterSecret = "47047dfe7509f243bb8e25c7";
+    private final static String masterSecret = "def1b7b57c7924339773e2cb";
 
     private static JPushClient jPushClient = new JPushClient(masterSecret, appKey);
 

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/LoanApplicationServiceImpl.java

@@ -834,13 +834,8 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         }
         //通过,进入到下一个步骤
         if (TWO.equals(auditType)) {
-            //删除已处理的待办信息
-            WaitRemind waitRemindDelete = new WaitRemind();
-            waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-            waitRemindDelete.setReadUserId(reviewComments.getaUserId().toString());
-            waitRemindDelete.setRemindType(TWO);
-            waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
 
+            WaitRemind waitRemindDelete = new WaitRemind();
             List<Long> userIdList = new ArrayList<>();
 
             WaitRemind waitRemind = new WaitRemind();
@@ -850,6 +845,14 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             waitRemind.setRemindTime(DateUtils.getNowDate());
             waitRemind.setRemindType(TWO);
             if (auditSchedule.equals(ONE)) {
+                //删除已处理的待办信息
+                waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
+                waitRemindDelete.setReadUserId(loanApplication.getaUserId().toString());
+                waitRemindDelete.setRemindType(TWO);
+                waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
+                loanApplication.setLoanSchedule(String.valueOf(Integer.parseInt(loanScheduleOld) + 1));
+                loanApplication.setAuditSchedule(String.valueOf(Integer.parseInt(auditSchedule) + 1));
+                loanApplication.setAuditType(ONE);
                 //设置AB角色id和风险ID
                 loanApplication.setaUserId(reviewComments.getaUserId());
                 loanApplication.setaUserName(reviewComments.getaUserName());
@@ -878,7 +881,6 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                         waitRemindManager.setRemindTitle("有一条【" + enterpriseName + "】的审核信息申请通过进入到下一阶段");
                         waitRemindManager.setRemindTime(DateUtils.getNowDate());
                         waitRemindManager.setRemindType(TWO);
-                        waitRemindManager.setReadUserId(loanApplication.getaUserId().toString());
                         waitRemindManager.setRemindContent(enterpriseName + "有一条贷款申请审核通过进入到下一阶段");
                         //给管理员发送待办提醒
                         waitRemindManager.setReadUserId(sysUserRole.getUserId().toString());
@@ -892,7 +894,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 sysUserConferenceMapper.batchSysUserConference(sysUserConferenceList);
             }*/
             //audit_schedule = 2,3的时候贷款申请进度处于担保初审状态
-            if (auditSchedule.equals(TWO) || auditSchedule.equals(THR)) {
+         else    if (auditSchedule.equals(TWO) || auditSchedule.equals(THR)) {
                 loanApplication.setLoanSchedule(THR);
                 loanApplication.setAuditSchedule(String.valueOf(Integer.parseInt(auditSchedule) + 1));
                 loanApplication.setAuditType(ONE);
@@ -1039,8 +1041,6 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                     }
                 }
             }
-            waitRemindMapper.batchWaitRemind(waitRemindList);
-
         }
         return AjaxResult.success();
     }

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -174,7 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectUserListByIdList" parameterType="java.util.List" resultMap="SysUserResult">
 		select user_id,jg_id, dept_id, nick_name,user_type,init_face, user_name, email, avatar, phonenumber, sex, status, del_flag, login_ip, login_date, create_by, create_time, remark
 		from sys_user where user_id in
-		<foreach collection="array" item="userId" open="(" separator="," close=")">
+		<foreach collection="list" item="userId" open="(" separator="," close=")">
 			#{userId}
 		</foreach>
 	</select>