Revert "审核小改+押品完成"

This reverts commit a3df1d02903bada93c2459354aac6451ce8ef2df.

# Conflicts:
#	src/main/java/com/loan/system/repository/UserRepository.java

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

@@ -102,29 +102,16 @@ 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 = 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();
-
-
+            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);
             // 保存到数据库
             approvalService.save(approvalRecord);
             stepService.updateUserId2ByCaseIdAndStepName(StepPropertyEnum.PRE_TRIAL.getLabel(), user.getId(), preApprovalDTO.getCaseId());
@@ -213,25 +200,15 @@ 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 = 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();
+            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);
             // 保存到数据库
             approvalService.save(approvalRecord);
         }else{
@@ -276,25 +253,15 @@ 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 = 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();
+            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);
             // 保存到数据库
             approvalService.save(approvalRecord);
         }else{
@@ -349,25 +316,15 @@ 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 = 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();
+            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);
             // 保存到数据库
             approvalService.save(approvalRecord);
         }else{
@@ -415,25 +372,15 @@ 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 = 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();
+            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);
             // 保存到数据库
             approvalService.save(approvalRecord);
         }else{

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

@@ -12,7 +12,6 @@ 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;
@@ -26,7 +25,6 @@ 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;
@@ -59,25 +57,6 @@ 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

@@ -1,10 +0,0 @@
-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

@@ -6,6 +6,7 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Set;
@@ -48,5 +49,7 @@ public interface UserRepository extends JpaRepository<User,Long> {
     @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);
 
+    @Query("select u from User u where u.role in ?1 and u.isDelete = ?2")
+    List<User> findByRoleInAndIsDelete(List<String> roles, Boolean isDelete);
 
 }

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

@@ -150,8 +150,8 @@ public class LoanServiceImpl implements LoanService {
     }
 
     @Override
-    public LoanCase findLoanCaseByIdAndIsDelete(Long caseId, boolean isDelete) {
-        return loanRepository.findLoanCaseById(caseId, isDelete);
+    public LoanCaseVO findLoanCaseByIdAndIsDelete(Long caseId, boolean isDelete) {
+        return BeanUtil.copyProperties(loanRepository.findLoanCaseById(caseId, isDelete), LoanCaseVO.class);
     }
 
     @Override

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

@@ -39,7 +39,6 @@ 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 {
@@ -230,13 +229,8 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    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());
-
+    public List<User> findByRoleAndIsDelete(List<String> role, boolean isDelete){
+        return userRepository.findByRoleInAndIsDelete(role,isDelete);
     };
 
 }

src/main/java/com/loan/system/service/LoanService.java

@@ -16,7 +16,7 @@ public interface LoanService {
 
     LoanCaseVO findLoanCaseDetailsById(Long caseId);
 
-    LoanCase findLoanCaseByIdAndIsDelete(Long caseId, boolean isDelete);
+    LoanCaseVO findLoanCaseByIdAndIsDelete(Long caseId, boolean isDelete);
 
     void updateUpdatetimeByIdAndIsDeleted(Long id,boolean isDelete);
 

src/main/java/com/loan/system/service/UserService.java

@@ -1,10 +1,12 @@
 package com.loan.system.service;
 
+import com.loan.system.domain.dto.UserDTO;
 import com.loan.system.domain.dto.UserLoginDTO;
 import com.loan.system.domain.entity.BizRecommender;
 import com.loan.system.domain.entity.Customer;
 import com.loan.system.domain.entity.User;
 import com.loan.system.domain.pojo.Result;
+import com.loan.system.domain.vo.UserVO;
 
 import java.util.List;