Browse Source

组织查询

xda 3 years ago
parent
commit
83dac79268

+ 8 - 8
src/main/java/com/winhc/repal/controller/RepalBookController.java

@@ -36,11 +36,11 @@ public class RepalBookController {
     private RepalBookService repalBookService;
 
 
-    @ApiOperation("首页接口")
-    @RequestMapping(value = "/home/{repalGroupId}", method = RequestMethod.GET)
-    public BeanResponse<RepalBookHomeVO> getRepalHomeDetail(@PathVariable("repalGroupId") Long repalGroupId) {
-        return BeanResponse.success(CodeMsg.SUCCESS, repalBookService.getRepalHomeDetail(repalGroupId));
-    }
+//    @ApiOperation("首页接口")
+//    @RequestMapping(value = "/home", method = RequestMethod.GET)
+//    public BeanResponse<RepalBookHomeVO> getRepalHomeDetail() {
+//        return BeanResponse.success(CodeMsg.SUCCESS, repalBookService.getRepalHomeDetail(repalGroupId));
+//    }
 
     @ApiOperation("删除账本")
     @RequestMapping(value = "/deleteRepalBook", method = RequestMethod.POST)
@@ -50,9 +50,9 @@ public class RepalBookController {
     }
 
     @ApiOperation("用户查看账本列表和count")
-    @RequestMapping(value = "/group/{repalGroupId}")
-    public BeanResponse<List<RepalBookInfoVO>> getRepalBookInfoList(@PathVariable("repalGroupId") Long repalGroupId) {
-        return BeanResponse.success(CodeMsg.SUCCESS, repalBookService.getRepalBookInfoList(repalGroupId));
+    @RequestMapping(value = "/group")
+    public BeanResponse<List<RepalBookInfoVO>> getRepalBookInfoList() {
+        return BeanResponse.success(CodeMsg.SUCCESS, repalBookService.getRepalBookInfoList());
     }
 
 

+ 0 - 3
src/main/java/com/winhc/repal/model/dto/AddRepalBillDTO.java

@@ -19,9 +19,6 @@ import java.util.List;
 @ApiModel("新增账款")
 public class AddRepalBillDTO {
 
-    @ApiModelProperty(required = true, value = "组织id")
-    private Long repalGroupId;
-
     @ApiModelProperty("账本id")
     private Long repalBookId;
 

+ 0 - 2
src/main/java/com/winhc/repal/model/dto/DeleteRepalBookDTO.java

@@ -16,6 +16,4 @@ public class DeleteRepalBookDTO {
     @ApiModelProperty("账本id")
     private Long repalBookId;
 
-    @ApiModelProperty("组织id")
-    private Long repalGroupId;
 }

+ 0 - 3
src/main/java/com/winhc/repal/model/dto/GetRepalBillPageDTO.java

@@ -19,9 +19,6 @@ import java.time.LocalDate;
 @ApiModel("获取账本下的账款列表")
 public class GetRepalBillPageDTO extends PageRequest {
 
-    @ApiModelProperty(value = "组织id", required = true)
-    private Long repalGroupId;
-
     @ApiModelProperty(value = "账本id", required = true)
     private Long repalBookId;
 

+ 0 - 6
src/main/java/com/winhc/repal/model/dto/UpdateRepalBillDTO.java

@@ -17,15 +17,9 @@ import java.util.List;
 @ApiModel("修改账款信息")
 public class UpdateRepalBillDTO {
 
-    @ApiModelProperty(value = "所属组织id")
-    private Long repalGroupId;
-
     @ApiModelProperty(value = "账款id")
     private Long repalBillId;
 
-    @ApiModelProperty(value = "账本id")
-    private Long repalBookId;
-
     @ApiModelProperty("负责人idList")
     private List<Long> responsiblePersonIdList;
 

+ 3 - 0
src/main/java/com/winhc/repal/model/vo/ResponsiblePersonNameVO.java

@@ -17,4 +17,7 @@ public class ResponsiblePersonNameVO {
     @ApiModelProperty(value = "责任人name")
     private String userName;
 
+    @ApiModelProperty(value = "责任人userId")
+    private Long userId;
+
 }

+ 9 - 10
src/main/java/com/winhc/repal/service/RepalBookService.java

@@ -17,14 +17,14 @@ import java.util.List;
 public interface RepalBookService extends IService<RepalBook> {
 
 
-    /**
-     * 个人首页账本信息
-     * @param repalGroupId repalGroupId
-     * @return com.winhc.repal.model.vo.RepalBookHomeVO
-     * @author xda
-     * @date 2022/4/18 09:55
-     */
-    RepalBookHomeVO getRepalHomeDetail(Long repalGroupId);
+//    /**
+//     * 个人首页账本信息
+//     * @param repalGroupId repalGroupId
+//     * @return com.winhc.repal.model.vo.RepalBookHomeVO
+//     * @author xda
+//     * @date 2022/4/18 09:55
+//     */
+//    RepalBookHomeVO getRepalHomeDetail(Long repalGroupId);
 
 
     /**
@@ -39,11 +39,10 @@ public interface RepalBookService extends IService<RepalBook> {
 
     /**
      * 获取账本列表信息
-     * @param repalBookGroupId repalBookGroupId
      * @return java.util.List<com.winhc.repal.model.vo.RepalBookInfoVO>
      * @author xda
      * @date 2022/4/18 10:19
      */
-    List<RepalBookInfoVO> getRepalBookInfoList(Long repalBookGroupId);
+    List<RepalBookInfoVO> getRepalBookInfoList();
 
 }

+ 8 - 1
src/main/java/com/winhc/repal/service/RepalGroupMemberService.java

@@ -11,6 +11,13 @@ import com.winhc.repal.entity.RepalGroupMember;
  */
 public interface RepalGroupMemberService extends IService<RepalGroupMember> {
 
-
+    /**
+     * 获取用户组织id
+     * @param userId userId
+     * @return java.lang.Long
+     * @author xda
+     * @date 2022/5/6 11:00
+     */
+    Long getUserGroupId(Long userId);
 
 }

+ 9 - 0
src/main/java/com/winhc/repal/service/RepalResponsiblePersonService.java

@@ -33,6 +33,15 @@ public interface RepalResponsiblePersonService extends IService<RepalResponsible
      */
     List<String> getResponsiblePersonName(Long billId);
 
+    /**
+     * 获取账款对应负责人idList
+     * @param billId billId
+     * @return java.util.List<java.lang.String>
+     * @author xda
+     * @date 2022/4/14 11:31
+     */
+    List<Long> getResponsiblePersonId(Long billId);
+
 
     /**
      * 删除账本下所有账款对应的责任人

+ 62 - 22
src/main/java/com/winhc/repal/service/impl/RepalBillServiceImpl.java

@@ -106,9 +106,8 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
 
     @Override
     public RepalBillInfoVO getRepalBillPage(GetRepalBillPageDTO dto) {
-        if (ObjectUtil.hasEmpty(dto.getRepalGroupId(), dto.getRepalBookId())) {
-            throw new CommonException(CodeMsg.VALIDATE_PARAMETER);
-        }
+        Long groupId = repalGroupMemberService.getUserGroupId(UserContextUtil.getUser().getUserId());
+
         VOPage<RepalBillPageVO> voPage = new VOPage<>();
         voPage.setPageSize(dto.getPageSize());
         voPage.setPageNum(dto.getPageNum());
@@ -120,14 +119,14 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
         TotalMoneyBO overdueBO;
         TotalMoneyBO totalBO;
         if (allFlag) {
-            totalMoneyBO = repalBillMapper.getTotalMoneyByGroup(dto.getRepalGroupId(), dto.getRepalBillType(), RepalBillStatusEnum.PROGRESSING.getCode(), dto.getRepalBookId());
-            overdueBO = repalBillMapper.getTotalMoneyByGroup(dto.getRepalGroupId(), dto.getRepalBillType(), RepalBillStatusEnum.OVERDUE.getCode(), dto.getRepalBookId());
-            totalBO = repalBillMapper.getTotalMoneyByGroup(dto.getRepalGroupId(), dto.getRepalBillType(), null, dto.getRepalBookId());
+            totalMoneyBO = repalBillMapper.getTotalMoneyByGroup(groupId, dto.getRepalBillType(), RepalBillStatusEnum.PROGRESSING.getCode(), dto.getRepalBookId());
+            overdueBO = repalBillMapper.getTotalMoneyByGroup(groupId, dto.getRepalBillType(), RepalBillStatusEnum.OVERDUE.getCode(), dto.getRepalBookId());
+            totalBO = repalBillMapper.getTotalMoneyByGroup(groupId, dto.getRepalBillType(), null, dto.getRepalBookId());
         } else {
             // 只查询自己负责的
-            totalMoneyBO = repalBillMapper.getTotalMoneyByUser(UserContextUtil.getUser().getUserId(), dto.getRepalGroupId(), dto.getRepalBillType(), RepalBillStatusEnum.PROGRESSING.getCode(), dto.getRepalBookId());
-            overdueBO = repalBillMapper.getTotalMoneyByUser(UserContextUtil.getUser().getUserId(), dto.getRepalGroupId(), dto.getRepalBillType(), RepalBillStatusEnum.OVERDUE.getCode(), dto.getRepalBookId());
-            totalBO = repalBillMapper.getTotalMoneyByUser(UserContextUtil.getUser().getUserId(), dto.getRepalGroupId(), dto.getRepalBillType(), null, dto.getRepalBookId());
+            totalMoneyBO = repalBillMapper.getTotalMoneyByUser(UserContextUtil.getUser().getUserId(), groupId, dto.getRepalBillType(), RepalBillStatusEnum.PROGRESSING.getCode(), dto.getRepalBookId());
+            overdueBO = repalBillMapper.getTotalMoneyByUser(UserContextUtil.getUser().getUserId(), groupId, dto.getRepalBillType(), RepalBillStatusEnum.OVERDUE.getCode(), dto.getRepalBookId());
+            totalBO = repalBillMapper.getTotalMoneyByUser(UserContextUtil.getUser().getUserId(), groupId, dto.getRepalBillType(), null, dto.getRepalBookId());
         }
         infoVO.setTotalBillMoneyStr(totalMoneyBO.getTotalMoney().stripTrailingZeros().toPlainString());
         infoVO.setTotalBillCount(totalMoneyBO.getTotalCount());
@@ -202,8 +201,11 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
     @Override
     public RepalBillDetailVO getRepalBillDetail(Long repalBillId) {
         RepalBill repalBill = this.getById(repalBillId);
-        if (Objects.isNull(repalBill)) {
-            return null;
+        // 负责人或高级权限才能查看
+        boolean queryAllFlag = repalRolePermissionService.checkUserPermission(UserContextUtil.getUser().getUserId(),
+                RepalBillTypeEnum.RECEIVABLE.getCode().equals(repalBill.getRepalBillType()) ? PermissionEnum.QUERY_ALL_RECEIVABLE.getCode() : PermissionEnum.QUERY_ALL_RECEIPT.getCode());
+        if (!queryAllFlag &&!repalResponsiblePersonService.getResponsiblePersonId(repalBillId).contains(UserContextUtil.getUser().getUserId())) {
+            throw new CommonException(CodeMsg.FAILED, "没有查看权限");
         }
         RepalBillDetailVO vo = new RepalBillDetailVO();
         BeanUtils.copyProperties(repalBill, vo);
@@ -286,7 +288,7 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
     @Transactional(rollbackFor = Exception.class)
     public Boolean deleteRepalBillById(DeleteRepalBillDTO dto) {
         RepalBill repalBill = this.getById(dto.getRepalBillId());
-        if (repalRolePermissionService.checkUserPermission(UserContextUtil.getUser().getUserId(),
+        if (!repalRolePermissionService.checkUserPermission(UserContextUtil.getUser().getUserId(),
                 RepalBillTypeEnum.RECEIVABLE.getCode().equals(repalBill.getRepalBillType()) ? PermissionEnum.UPDATE_RECEIVABLE.getCode() : PermissionEnum.UPDATE_RECEIPT.getCode())) {
             throw new CommonException(CodeMsg.FAILED, "无对应权限");
         }
@@ -301,7 +303,7 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
     @Transactional(rollbackFor = Exception.class)
     public Boolean settleRepalBillById(SettleRepalBillDTO dto) {
         RepalBill repalBill = this.getById(dto.getRepalBillId());
-        if (repalRolePermissionService.checkUserPermission(UserContextUtil.getUser().getUserId(),
+        if (!repalRolePermissionService.checkUserPermission(UserContextUtil.getUser().getUserId(),
                 RepalBillTypeEnum.RECEIVABLE.getCode().equals(repalBill.getRepalBillType()) ? PermissionEnum.UPDATE_RECEIVABLE.getCode() : PermissionEnum.UPDATE_RECEIPT.getCode())) {
             throw new CommonException(CodeMsg.FAILED, "无对应权限");
         }
@@ -341,20 +343,21 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
         if (Objects.isNull(customer)) {
             throw new CommonException(CodeMsg.FAILED, "客户信息错误");
         }
+        long groupId = repalGroupMemberService.getUserGroupId(UserContextUtil.getUser().getUserId());
         // 评级flag
         boolean diagnosisFlag = (CustPropertyEnum.COMPANY.getCode().equals(customer.getCustProperty()) || CustPropertyEnum.GOV.getCode().equals(customer.getCustProperty()))
                         && RepalBillTypeEnum.RECEIVABLE.getCode().equals(dto.getRepalBillType());
         if (diagnosisFlag && StrUtil.isBlank(customer.getCompanyId())) {
             throw new CommonException(CodeMsg.FAILED, "公司信息错误");
         }
-        if (repalRolePermissionService.checkUserPermission(UserContextUtil.getUser().getUserId(),
+        if (!repalRolePermissionService.checkUserPermission(UserContextUtil.getUser().getUserId(),
                 RepalBillTypeEnum.RECEIVABLE.getCode().equals(dto.getRepalBillType()) ? PermissionEnum.ADD_RECEIVABLE.getCode() : PermissionEnum.ADD_RECEIPT.getCode())) {
             throw new CommonException(CodeMsg.FAILED, "无对应权限");
         }
         if (Objects.isNull(dto.getRepalBookId())) {
             // 新建账本
             RepalBook repalBook = new RepalBook();
-            repalBook.setRepalGroupId(dto.getRepalGroupId());
+            repalBook.setRepalGroupId(groupId);
             repalBook.setCustomerId(customer.getCustId());
             repalBook.setCustomerName(customer.getCustName());
             repalBook.setRepalBookName(customer.getCustName());
@@ -379,7 +382,7 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
         // 负责人
         repalResponsiblePersonService.saveBatch(dto.getResponsiblePersonIdList().stream().map(t -> {
             RepalResponsiblePerson person = new RepalResponsiblePerson();
-            person.setRepalGroupId(dto.getRepalGroupId());
+            person.setRepalGroupId(groupId);
             person.setRepalBookId(dto.getRepalBookId());
             person.setRepalBillId(repalBill.getId());
             person.setUserId(t);
@@ -395,7 +398,7 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
         if (Objects.isNull(repalBill)) {
             throw new CommonException(CodeMsg.FAILED, "账款错误");
         }
-        if (repalRolePermissionService.checkUserPermission(UserContextUtil.getUser().getUserId(),
+        if (!repalRolePermissionService.checkUserPermission(UserContextUtil.getUser().getUserId(),
                 RepalBillTypeEnum.RECEIVABLE.getCode().equals(repalBill.getRepalBillType()) ? PermissionEnum.UPDATE_RECEIVABLE.getCode() : PermissionEnum.UPDATE_RECEIPT.getCode())) {
             throw new CommonException(CodeMsg.FAILED, "无对应权限");
         }
@@ -410,15 +413,52 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateRepalBill(UpdateRepalBillDTO dto) {
         RepalBill repalBill = this.getById(dto.getRepalBillId());
-        if (repalRolePermissionService.checkUserPermission(UserContextUtil.getUser().getUserId(),
+        if (!repalRolePermissionService.checkUserPermission(UserContextUtil.getUser().getUserId(),
                 RepalBillTypeEnum.RECEIVABLE.getCode().equals(repalBill.getRepalBillType()) ? PermissionEnum.UPDATE_RECEIVABLE.getCode() : PermissionEnum.UPDATE_RECEIPT.getCode())) {
             throw new CommonException(CodeMsg.FAILED, "无对应权限");
         }
-        
-
-
-
+        // 责任人
+        List<Long> currentIdList = repalResponsiblePersonService.getResponsiblePersonId(repalBill.getId());
+        List<Long> difference = new ArrayList<>(CollUtil.disjunction(dto.getResponsiblePersonIdList(), currentIdList));
+        if (CollUtil.isNotEmpty(difference)) {
+            for (Long aLong : difference) {
+                if (currentIdList.contains(aLong)) {
+                    // 移除
+                    repalResponsiblePersonService.update(Wrappers.lambdaUpdate(RepalResponsiblePerson.class)
+                        .eq(RepalResponsiblePerson::getRepalBillId, repalBill.getId())
+                        .eq(RepalResponsiblePerson::getUserId, aLong)
+                        .set(RepalResponsiblePerson::getDeleted, DeletedStatusEnum.DELETE.getCode()));
+                }
+                if (dto.getResponsiblePersonIdList().contains(aLong)) {
+                    // 新增
+                    RepalResponsiblePerson person = new RepalResponsiblePerson();
+                    person.setRepalBillId(repalBill.getId());
+                    person.setRepalBookId(repalBill.getRepalBookId());
+                    person.setRepalGroupId(repalBill.getRepalGroupId());
+                    person.setUserId(aLong);
+                    repalResponsiblePersonService.save(person);
+                }
+            }
+        }
+        if (LocalDate.now().isBefore(dto.getEndDate())) {
+            // 逾期
+            repalBill.setRepalBillStatus(RepalBillStatusEnum.OVERDUE.getCode());
+        }
+        repalBill.setTotalMoney(new BigDecimal(dto.getTotalMoneyStr()));
+        if (repalBill.getReceipt().compareTo(repalBill.getTotalMoney()) >= 0) {
+            // 收回了
+            repalBill.setRefreshStatus(RepalBillStatusEnum.SUCCESS.getCode());
+            repalBill.setReceivable(BigDecimal.ZERO);
+        }
 
+        this.update(Wrappers.lambdaUpdate(RepalBill.class)
+                .eq(RepalBill::getId, repalBill.getId())
+                .set(RepalBill::getEndDate, dto.getEndDate())
+                .set(RepalBill::getRepalBillStatus, repalBill.getRepalBillStatus())
+                .set(RepalBill::getRepalBillStage, dto.getRepalBillStage())
+                .set(RepalBill::getBillRemark, dto.getBillRemark())
+                .set(RepalBill::getTotalMoney, repalBill.getTotalMoney())
+                .set(RepalBill::getReceivable, repalBill.getReceivable()));
         return true;
     }
 

+ 14 - 9
src/main/java/com/winhc/repal/service/impl/RepalBookServiceImpl.java

@@ -13,6 +13,7 @@ import com.winhc.repal.model.vo.RepalBookInfoVO;
 import com.winhc.repal.repository.RepalBookMapper;
 import com.winhc.repal.service.RepalBillService;
 import com.winhc.repal.service.RepalBookService;
+import com.winhc.repal.service.RepalGroupMemberService;
 import com.winhc.repal.service.RepalRolePermissionService;
 import com.winhc.repal.util.UserContextUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,23 +41,27 @@ public class RepalBookServiceImpl extends ServiceImpl<RepalBookMapper, RepalBook
     @Autowired
     private RepalRolePermissionService repalRolePermissionService;
 
-    @Override
-    public RepalBookHomeVO getRepalHomeDetail(Long repalGroupId) {
-        RepalBookHomeVO vo = new RepalBookHomeVO();
-        return vo;
-    }
+    @Autowired
+    private RepalGroupMemberService repalGroupMemberService;
+
+//    @Override
+//    public RepalBookHomeVO getRepalHomeDetail(Long repalGroupId) {
+//        RepalBookHomeVO vo = new RepalBookHomeVO();
+//        return vo;
+//    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean deleteRepalBook(DeleteRepalBookDTO dto) {
+        long groupId = repalGroupMemberService.getUserGroupId(UserContextUtil.getUser().getUserId());
         int count = this.count(Wrappers.lambdaQuery(RepalBook.class)
-                .eq(RepalBook::getRepalGroupId, dto.getRepalGroupId())
+                .eq(RepalBook::getRepalGroupId, groupId)
                 .eq(RepalBook::getDeleted, DeletedStatusEnum.NORMAL.getCode()));
         if (count < 2) {
             throw new CommonException(CodeMsg.FAILED, "必须保留一个账本哦~");
         }
         if (!this.update(Wrappers.lambdaUpdate(RepalBook.class)
-                .eq(RepalBook::getRepalGroupId, dto.getRepalGroupId())
+                .eq(RepalBook::getRepalGroupId, groupId)
                 .set(RepalBook::getDeleted, DeletedStatusEnum.NORMAL.getCode()))) {
             throw new CommonException(CodeMsg.FAILED, "参数错误");
         }
@@ -66,13 +71,13 @@ public class RepalBookServiceImpl extends ServiceImpl<RepalBookMapper, RepalBook
     }
 
     @Override
-    public List<RepalBookInfoVO> getRepalBookInfoList(Long repalBookGroupId) {
+    public List<RepalBookInfoVO> getRepalBookInfoList() {
         Set<String> codeSet = repalRolePermissionService.getUserPermissionCodeSet(UserContextUtil.getUser().getUserId());
         // todo
         //boolean receivableFlag = codeSet.contains(PermissionEnum.QUERY_ALL_RECEIVABLE.getCode());
         boolean receivableFlag = true;
         //boolean receiptFlag = codeSet.contains(PermissionEnum.QUERY_ALL_RECEIPT.getCode());
         boolean receiptFlag = true;
-        return repalBookMapper.getRepalBookInfoList(UserContextUtil.getUser().getUserId(), repalBookGroupId, receivableFlag, receiptFlag);
+        return repalBookMapper.getRepalBookInfoList(UserContextUtil.getUser().getUserId(), repalGroupMemberService.getUserGroupId(UserContextUtil.getUser().getUserId()), receivableFlag, receiptFlag);
     }
 }

+ 16 - 0
src/main/java/com/winhc/repal/service/impl/RepalGroupMemberServiceImpl.java

@@ -1,11 +1,17 @@
 package com.winhc.repal.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.winhc.common.enums.CodeMsg;
+import com.winhc.common.exception.CommonException;
 import com.winhc.repal.entity.RepalGroupMember;
+import com.winhc.repal.enums.DeletedStatusEnum;
 import com.winhc.repal.repository.RepalGroupMemberMapper;
 import com.winhc.repal.service.RepalGroupMemberService;
 import org.springframework.stereotype.Service;
 
+import java.util.Objects;
+
 /**
  * @description RepalGroupMember 接口实现类
  * @author Generator
@@ -15,4 +21,14 @@ import org.springframework.stereotype.Service;
 public class RepalGroupMemberServiceImpl extends ServiceImpl<RepalGroupMemberMapper, RepalGroupMember> implements RepalGroupMemberService {
 
 
+    @Override
+    public Long getUserGroupId(Long userId) {
+        RepalGroupMember repalGroupMember = this.getOne(Wrappers.lambdaQuery(RepalGroupMember.class)
+                .eq(RepalGroupMember::getUserId, userId)
+                .eq(RepalGroupMember::getDeleted, DeletedStatusEnum.NORMAL.getCode()));
+        if (Objects.isNull(repalGroupMember)) {
+            throw new CommonException(CodeMsg.FAILED, "组织错误");
+        }
+        return repalGroupMember.getRepalGroupId();
+    }
 }

+ 9 - 0
src/main/java/com/winhc/repal/service/impl/RepalResponsiblePersonServiceImpl.java

@@ -49,6 +49,15 @@ public class RepalResponsiblePersonServiceImpl extends ServiceImpl<RepalResponsi
     }
 
     @Override
+    public List<Long> getResponsiblePersonId(Long billId) {
+        List<ResponsiblePersonNameVO> nameList = repalResponsiblePersonMapper.getResponsiblePersonNameList(Collections.singletonList(billId));
+        if (CollUtil.isEmpty(nameList)) {
+            return new ArrayList<>();
+        }
+        return nameList.stream().map(ResponsiblePersonNameVO::getUserId).collect(Collectors.toList());
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean deletePersonByBookId(Long repalBookId) {
         this.update(Wrappers.lambdaUpdate(RepalResponsiblePerson.class)

+ 1 - 1
src/main/resources/mapper/RepalResponsiblePersonMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.winhc.repal.repository.RepalResponsiblePersonMapper">
 
     <select id="getResponsiblePersonNameList" parameterType="java.lang.Long" resultType="com.winhc.repal.model.vo.ResponsiblePersonNameVO">
-        SELECT rPerson.REPAL_BILL_ID AS repalBillId, userExt.USER_NAME AS userName FROM REPAL_RESPONSIBLE_PERSON AS rPerson
+        SELECT rPerson.REPAL_BILL_ID AS repalBillId, userExt.USER_NAME AS userName, userExt.USER_ID AS userId FROM REPAL_RESPONSIBLE_PERSON AS rPerson
         LEFT JOIN USER_EXT AS userExt ON rPerson.USER_ID = userExt.USER_ID
         WHERE rPerson.REPAL_BILL_ID IN
         <foreach item="item" index="index" collection="billIdList" open="(" close=")" separator=",">