审核小改+押品完成

src/main/java/com/loan/system/controller/wechat/ApprovalController.java

@@ -102,16 +102,29 @@ public class ApprovalController {
         }
         ApprovalRecordVO approvalRecord_origin = approvalService.findByCaseIdAndIsDeleteAndStepName(preApprovalDTO.getCaseId(),StepPropertyEnum.PRE_TRIAL.getLabel(),userId);
         if (approvalRecord_origin == null) {
+
             // 创建审批记录
-            ApprovalRecord approvalRecord = new ApprovalRecord();
-            approvalRecord.setCaseId(preApprovalDTO.getCaseId());
-            approvalRecord.setStepName(StepPropertyEnum.PRE_TRIAL.getLabel());
-            approvalRecord.setApproverId(user.getId());
-            approvalRecord.setDecision(DecisionEnum.PASS.getMsg());
-            approvalRecord.setComments(preApprovalDTO.getComments());
-            approvalRecord.setCreateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            approvalRecord.setUpdateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            approvalRecord.setIsDelete(false);
+//            ApprovalRecord approvalRecord = new ApprovalRecord();
+//            approvalRecord.setCaseId(preApprovalDTO.getCaseId());
+//            approvalRecord.setStepName(StepPropertyEnum.PRE_TRIAL.getLabel());
+//            approvalRecord.setApproverId(user.getId());
+//            approvalRecord.setDecision(DecisionEnum.PASS.getMsg());
+//            approvalRecord.setComments(preApprovalDTO.getComments());
+//            approvalRecord.setCreateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+//            approvalRecord.setUpdateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+//            approvalRecord.setIsDelete(false);
+            ApprovalRecord approvalRecord = ApprovalRecord.builder()
+                    .caseId(preApprovalDTO.getCaseId())
+                    .stepName(StepPropertyEnum.PRE_TRIAL.getLabel())
+                    .approverId(user.getId())
+                    .decision(DecisionEnum.PASS.getMsg())
+                    .comments(preApprovalDTO.getComments())
+                    .createTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
+                    .updateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
+                    .isDelete(false)
+                    .build();
+
+
             // 保存到数据库
             approvalService.save(approvalRecord);
             stepService.updateUserId2ByCaseIdAndStepName(StepPropertyEnum.PRE_TRIAL.getLabel(), user.getId(), preApprovalDTO.getCaseId());
@@ -200,15 +213,25 @@ public class ApprovalController {
         if(approvalRecord_origin == null) {
             log.info("没找到对应以前审批记录");
             // 创建审批记录
-            ApprovalRecord approvalRecord = new ApprovalRecord();
-            approvalRecord.setCaseId(preApprovalDTO.getCaseId());
-            approvalRecord.setStepName(StepPropertyEnum.PRE_TRIAL.getLabel());
-            approvalRecord.setApproverId(userId);
-            approvalRecord.setDecision(DecisionEnum.REJECT.getMsg());
-            approvalRecord.setComments(preApprovalDTO.getComments());
-            approvalRecord.setCreateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            approvalRecord.setUpdateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            approvalRecord.setIsDelete(false);
+//            ApprovalRecord approvalRecord = new ApprovalRecord();
+//            approvalRecord.setCaseId(preApprovalDTO.getCaseId());
+//            approvalRecord.setStepName(StepPropertyEnum.PRE_TRIAL.getLabel());
+//            approvalRecord.setApproverId(userId);
+//            approvalRecord.setDecision(DecisionEnum.REJECT.getMsg());
+//            approvalRecord.setComments(preApprovalDTO.getComments());
+//            approvalRecord.setCreateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+//            approvalRecord.setUpdateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+//            approvalRecord.setIsDelete(false);
+            ApprovalRecord approvalRecord = ApprovalRecord.builder()
+                    .caseId(preApprovalDTO.getCaseId())
+                    .stepName(StepPropertyEnum.PRE_TRIAL.getLabel())
+                    .approverId(user.getId())
+                    .decision(DecisionEnum.PASS.getMsg())
+                    .comments(preApprovalDTO.getComments())
+                    .createTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
+                    .updateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
+                    .isDelete(false)
+                    .build();
             // 保存到数据库
             approvalService.save(approvalRecord);
         }else{
@@ -253,15 +276,25 @@ public class ApprovalController {
         if(approvalRecord_origin == null) {
             log.info("没找到对应以前审批记录");
             // 创建审批记录
-            ApprovalRecord approvalRecord = new ApprovalRecord();
-            approvalRecord.setCaseId(approvalDTO.getCaseId());
-            approvalRecord.setStepName(StepPropertyEnum.APPROVAL.getLabel());
-            approvalRecord.setApproverId(userId);
-            approvalRecord.setDecision(DecisionEnum.PASS.getMsg());
-            approvalRecord.setComments(approvalDTO.getComments());
-            approvalRecord.setCreateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            approvalRecord.setUpdateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            approvalRecord.setIsDelete(false);
+//            ApprovalRecord approvalRecord = new ApprovalRecord();
+//            approvalRecord.setCaseId(approvalDTO.getCaseId());
+//            approvalRecord.setStepName(StepPropertyEnum.APPROVAL.getLabel());
+//            approvalRecord.setApproverId(userId);
+//            approvalRecord.setDecision(DecisionEnum.PASS.getMsg());
+//            approvalRecord.setComments(approvalDTO.getComments());
+//            approvalRecord.setCreateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+//            approvalRecord.setUpdateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+//            approvalRecord.setIsDelete(false);
+            ApprovalRecord approvalRecord = ApprovalRecord.builder()
+                    .caseId(approvalDTO.getCaseId())
+                    .stepName(StepPropertyEnum.APPROVAL.getLabel())
+                    .approverId(userId)
+                    .decision(DecisionEnum.PASS.getMsg())
+                    .comments(approvalDTO.getComments())
+                    .createTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
+                    .updateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
+                    .isDelete(false)
+                    .build();
             // 保存到数据库
             approvalService.save(approvalRecord);
         }else{
@@ -316,15 +349,25 @@ public class ApprovalController {
         if(approvalRecord_origin == null) {
             log.info("没找到对应以前审批记录");
             // 创建审批记录
-            ApprovalRecord approvalRecord = new ApprovalRecord();
-            approvalRecord.setCaseId(approvalDTO.getCaseId());
-            approvalRecord.setStepName(StepPropertyEnum.APPROVAL.getLabel());
-            approvalRecord.setApproverId(userId);
-            approvalRecord.setDecision(DecisionEnum.REJECT.getMsg());
-            approvalRecord.setComments(approvalDTO.getComments());
-            approvalRecord.setCreateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            approvalRecord.setUpdateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            approvalRecord.setIsDelete(false);
+//            ApprovalRecord approvalRecord = new ApprovalRecord();
+//            approvalRecord.setCaseId(approvalDTO.getCaseId());
+//            approvalRecord.setStepName(StepPropertyEnum.APPROVAL.getLabel());
+//            approvalRecord.setApproverId(userId);
+//            approvalRecord.setDecision(DecisionEnum.REJECT.getMsg());
+//            approvalRecord.setComments(approvalDTO.getComments());
+//            approvalRecord.setCreateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+//            approvalRecord.setUpdateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+//            approvalRecord.setIsDelete(false);
+            ApprovalRecord approvalRecord = ApprovalRecord.builder()
+                    .caseId(approvalDTO.getCaseId())
+                    .stepName(StepPropertyEnum.APPROVAL.getLabel())
+                    .approverId(userId)
+                    .decision(DecisionEnum.REJECT.getMsg())
+                    .comments(approvalDTO.getComments())
+                    .createTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
+                    .updateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
+                    .isDelete(false)
+                    .build();
             // 保存到数据库
             approvalService.save(approvalRecord);
         }else{
@@ -372,15 +415,25 @@ public class ApprovalController {
         if(approvalRecord_origin == null) {
             log.info("没找到对应以前审批记录");
             // 创建审批记录
-            ApprovalRecord approvalRecord = new ApprovalRecord();
-            approvalRecord.setCaseId(approvalDTO.getCaseId());
-            approvalRecord.setStepName(StepPropertyEnum.APPROVAL.getLabel());
-            approvalRecord.setApproverId(userId);
-            approvalRecord.setDecision(DecisionEnum.TERMINATE.getMsg());
-            approvalRecord.setComments(approvalDTO.getComments());
-            approvalRecord.setCreateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            approvalRecord.setUpdateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            approvalRecord.setIsDelete(false);
+//            ApprovalRecord approvalRecord = new ApprovalRecord();
+//            approvalRecord.setCaseId(approvalDTO.getCaseId());
+//            approvalRecord.setStepName(StepPropertyEnum.APPROVAL.getLabel());
+//            approvalRecord.setApproverId(userId);
+//            approvalRecord.setDecision(DecisionEnum.TERMINATE.getMsg());
+//            approvalRecord.setComments(approvalDTO.getComments());
+//            approvalRecord.setCreateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+//            approvalRecord.setUpdateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+//            approvalRecord.setIsDelete(false);
+            ApprovalRecord approvalRecord = ApprovalRecord.builder()
+                    .caseId(approvalDTO.getCaseId())
+                    .stepName(StepPropertyEnum.APPROVAL.getLabel())
+                    .approverId(userId)
+                    .decision(DecisionEnum.TERMINATE.getMsg())
+                    .comments(approvalDTO.getComments())
+                    .createTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
+                    .updateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
+                    .isDelete(false)
+                    .build();
             // 保存到数据库
             approvalService.save(approvalRecord);
         }else{

src/main/java/com/loan/system/controller/wechat/CollateralController.java

@@ -12,6 +12,7 @@ import com.loan.system.domain.enums.ExceptionEnum;
 import com.loan.system.domain.enums.RoleEnum;
 import com.loan.system.domain.pojo.Result;
 import com.loan.system.domain.vo.CollateralPlanVO;
+import com.loan.system.domain.vo.CollateralSalesVO;
 import com.loan.system.domain.vo.CollateralVO;
 import com.loan.system.service.ApprovalService;
 import com.loan.system.service.CollateralPlanService;
@@ -25,6 +26,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.Base64Utils;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
@@ -57,6 +59,25 @@ public class CollateralController {
         List<CollateralVO> collaterals = collateralService.findByCaseId(id);
         return ResultUtil.success("success",collaterals);
     }
+
+    @GetMapping("/user")
+    @ApiOperation("获取可选用户")
+    public Result findUser(){
+        List<String> Roles=new ArrayList<>();
+        Roles.add("LEAD_SALES");
+        Roles.add("ASSIST_SALES");
+        List<User> users = userService.findByRoleAndIsDelete(Roles,false);
+        if(users == null || users.isEmpty()){
+            return ResultUtil.error(USER_NOT_EXIST.getCode(),"用户不存在");
+        }
+        List<CollateralSalesVO> salesVOS=new ArrayList<>();
+        for (User user : users){
+            CollateralSalesVO salesVO = new CollateralSalesVO();
+            BeanUtil.copyProperties(user, salesVO);
+            salesVOS.add(salesVO);
+        }
+        return ResultUtil.success("success",salesVOS);
+    }
     /**
      * 查看项目抵押物计划
      * @param id

src/main/java/com/loan/system/domain/vo/CollateralSalesVO.java

@@ -0,0 +1,10 @@
+package com.loan.system.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+@Data
+public class CollateralSalesVO implements Serializable {
+    private Long id;
+    private String realName;
+}

src/main/java/com/loan/system/repository/UserRepository.java

@@ -29,7 +29,8 @@ public interface UserRepository extends JpaRepository<User,Long> {
 
     User findByIdAndIsDelete(Long mobile, Boolean isDelete);
 
-    @Query("select u from User u where u.role in ?1 and u.isDelete = ?2")
-    List<User> findByRoleInAndIsDelete(List<String> roles, Boolean isDelete);
+    @Query("select u from User u where (u.role like %?1% or u.role = ?1) and u.isDelete = ?2")
+    List<User> findByRoleLikeAndIsDelete(String role, Boolean isDelete);
+
 
 }

src/main/java/com/loan/system/service/Impl/UserServiceImpl.java

@@ -32,6 +32,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 @Service
 public class UserServiceImpl implements UserService {
@@ -185,8 +186,13 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public List<User> findByRoleAndIsDelete(List<String> role, boolean isDelete){
-        return userRepository.findByRoleInAndIsDelete(role,isDelete);
+    public List<User> findByRoleAndIsDelete(List<String> roles, boolean isDelete){
+        return userRepository.findByIsDelete(isDelete).stream()
+                .filter(user -> roles.stream()
+                        .anyMatch(role -> user.getRole().contains(role)))
+                .distinct()
+                .collect(Collectors.toList());
+
     };
 
 }