部分查询修改

src/main/java/com/winhc/repal/config/CharlesRequestInterceptor.java

@@ -1,5 +1,6 @@
 package com.winhc.repal.config;
 
+import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import feign.Request;
@@ -23,12 +24,10 @@ public class CharlesRequestInterceptor implements RequestInterceptor {
     @Override
     public void apply(RequestTemplate template) {
         // feign 不支持 GET 方法传 POJO, json body转query
-        if ("GET".equals(template.method()) && template.requestBody() != null) {
+        if ("GET".equals(template.method()) && template.requestBody() != null && StrUtil.isNotBlank(template.bodyTemplate())) {
             try {
-                JsonNode jsonNode = objectMapper.readTree(template.body());
-
+                JsonNode jsonNode = objectMapper.readTree(template.bodyTemplate());
                 template.body(Request.Body.empty());
-
                 Map<String, Collection<String>> queries = new HashMap<>();
                 buildQuery(jsonNode, "", queries);
                 template.queries(queries);

src/main/java/com/winhc/repal/controller/RepalBookController.java

@@ -40,9 +40,9 @@ public class RepalBookController {
 
 
     @ApiOperation("首页应收/应付部分")
-    @RequestMapping(value = "/home/receivable/{billType}", method = RequestMethod.POST)
-    public BeanResponse<HomeReceivableVO> getHomeReceivable(@PathVariable("billType")Integer billType, HomeTypeDTO dto) {
-        return BeanResponse.success(CodeMsg.SUCCESS, repalBookService.getHomeReceivable(billType, dto));
+    @RequestMapping(value = "/home/receivable", method = RequestMethod.GET)
+    public BeanResponse<HomeReceivableVO> getHomeReceivable(HomeTypeDTO dto) {
+        return BeanResponse.success(CodeMsg.SUCCESS, repalBookService.getHomeReceivable(dto));
     }
 
 

src/main/java/com/winhc/repal/model/bo/PageRequest.java

@@ -14,8 +14,8 @@ import lombok.Data;
 public class PageRequest {
 
     @ApiModelProperty("pageNum")
-    private int pageNum;
+    private int pageNum = 1;
 
     @ApiModelProperty("pageSize")
-    private int pageSize;
+    private int pageSize = 10;
 }

src/main/java/com/winhc/repal/model/dto/HomeTypeDTO.java

@@ -16,7 +16,10 @@ public class HomeTypeDTO {
     @ApiModelProperty(value = "查询类型。[1]近7天 [2]近30天.默认30天 [3]全部")
     private Integer queryType = 2;
 
-    @ApiModelProperty(value = "账本id")
+    @ApiModelProperty(value = "账本id", required = true)
     private Long repalBookId;
 
+    @ApiModelProperty(value = "1应收2应付", required = true)
+    private Integer repalBillType;
+
 }

src/main/java/com/winhc/repal/repository/RepalBillMapper.java

@@ -46,7 +46,7 @@ public interface RepalBillMapper extends BaseMapper<RepalBill> {
     /**
      * 获取对应类型的总金额和笔数
      * @param repalGroupId repalGroupId
-     * @param repalGroupType repalGroupType
+     * @param repalBillType repalBillType
      * @param repalBillStatus repalBillStatus
      * @param repalBookId repalBookId
      * @return com.winhc.repal.model.bo.TotalMoneyBO
@@ -54,7 +54,7 @@ public interface RepalBillMapper extends BaseMapper<RepalBill> {
      * @date 2022/4/30 09:25
      */
     TotalMoneyBO getTotalMoneyByGroup(@Param("repalGroupId") Long repalGroupId,
-                                      @Param("repalGroupType") Integer repalGroupType,
+                                      @Param("repalBillType") Integer repalBillType,
                                       @Param("repalBillStatus") Integer repalBillStatus,
                                       @Param("repalBookId") Long repalBookId);
 

src/main/java/com/winhc/repal/service/RepalBookService.java

@@ -24,13 +24,12 @@ public interface RepalBookService extends IService<RepalBook> {
 
     /**
      * 获取应收付金额和笔数
-     * @param repalBillType repalBillType
      * @param dto dto
      * @return com.winhc.repal.model.vo.HomeReceivableVO
      * @author xda
      * @date 2022/5/9 10:23
      */
-    HomeReceivableVO getHomeReceivable(Integer repalBillType, HomeTypeDTO dto);
+    HomeReceivableVO getHomeReceivable(HomeTypeDTO dto);
 
 
 

src/main/java/com/winhc/repal/service/impl/RepalBillServiceImpl.java

@@ -360,9 +360,13 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
         if (Objects.nonNull(repalBill.getDiagnosisId())) {
             RepalBillDiagnosis repalBillDiagnosis = repalBillDiagnosisService.getById(repalBill.getDiagnosisId());
             if (Objects.nonNull(repalBillDiagnosis)) {
-                ApiDataResult<DiagnosisRecordVO> apiDataResult = inCaseService.getRecordVO(repalBillDiagnosis.getBizId());
-                if (Objects.nonNull(apiDataResult)) {
-                    vo.setAnalysisList(DiagnosisUtil.convertItemToList(apiDataResult.getData().getResultItem()));
+                try {
+                    ApiDataResult<DiagnosisRecordVO> apiDataResult = inCaseService.getRecordVO(repalBillDiagnosis.getBizId());
+                    if (Objects.nonNull(apiDataResult)) {
+                        vo.setAnalysisList(DiagnosisUtil.convertItemToList(apiDataResult.getData().getResultItem()));
+                    }
+                } catch (Exception e) {
+                    LOGGER.error("查询评估信息错误", e);
                 }
             }
         }
@@ -491,6 +495,7 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
         repalBill.setUserId(UserContextUtil.getUser().getUserId());
         repalBill.setRepalBillStatus(RepalBillStatusUtil.getRepalBillStatus(dto.getEndDate()));
         repalBill.setRepalGroupId(groupId);
+        repalBill.setReceivable(dto.getTotalMoney());
         if (CollUtil.isNotEmpty(dto.getContractUrlList())) {
             repalBill.setContractUrl(String.join(";", dto.getContractUrlList()));
         }

src/main/java/com/winhc/repal/service/impl/RepalBookServiceImpl.java

@@ -68,7 +68,7 @@ public class RepalBookServiceImpl extends ServiceImpl<RepalBookMapper, RepalBook
     private RepalChangeRecordService repalChangeRecordService;
 
     @Override
-    public HomeReceivableVO getHomeReceivable(Integer repalBillType, HomeTypeDTO dto) {
+    public HomeReceivableVO getHomeReceivable(HomeTypeDTO dto) {
         HomeReceivableVO vo = new HomeReceivableVO();
         boolean allFlag = repalRolePermissionService.checkUserPermission(UserContextUtil.getUser().getUserId(), PermissionEnum.QUERY_ALL_RECEIVABLE.getCode());
         // 所有
@@ -84,8 +84,8 @@ public class RepalBookServiceImpl extends ServiceImpl<RepalBookMapper, RepalBook
             start = LocalDateTime.of(now.minusDays(30), LocalTime.MIN);
             end = LocalDateTime.of(now, LocalTime.MAX);
         }
-        HomeReceivableBO receivableBO = repalBillService.getBillTotal(null, allFlag ? null : UserContextUtil.getUser().getUserId(), dto.getRepalBookId(), repalBillType, start, end);
-        HomeReceivableBO overdueBO = repalBillService.getBillTotal(RepalBillStatusEnum.OVERDUE.getCode(), allFlag ? null : UserContextUtil.getUser().getUserId(), dto.getRepalBookId(), repalBillType, start, end);
+        HomeReceivableBO receivableBO = repalBillService.getBillTotal(null, allFlag ? null : UserContextUtil.getUser().getUserId(), dto.getRepalBookId(), dto.getRepalBillType(), start, end);
+        HomeReceivableBO overdueBO = repalBillService.getBillTotal(RepalBillStatusEnum.OVERDUE.getCode(), allFlag ? null : UserContextUtil.getUser().getUserId(), dto.getRepalBookId(), dto.getRepalBillType(), start, end);
         vo.setBillMoneyStr(receivableBO.getBillMoney().setScale(2).toString());
         vo.setBillCount(receivableBO.getBillCount());
         vo.setOverdueTotalStr(overdueBO.getOverdueTotal().setScale(2).toString());
@@ -96,7 +96,7 @@ public class RepalBookServiceImpl extends ServiceImpl<RepalBookMapper, RepalBook
         if (BigDecimal.ZERO.compareTo(receivableBO.getTotalBillMoney()) != 0 && BigDecimal.ZERO.compareTo(overdueBO.getOverdueTotal()) != 0) {
             vo.setOverdueRate(overdueBO.getOverdueTotal().multiply(new BigDecimal(100)).divide(receivableBO.getTotalBillMoney(), 0, RoundingMode.HALF_UP).toString());
         }
-        vo.setVisible(repalGroupMemberService.getMemberVisible(repalBillType));
+        vo.setVisible(repalGroupMemberService.getMemberVisible(dto.getRepalBillType()));
         return vo;
     }
 

src/main/resources/mapper/RepalBillMapper.xml

@@ -117,7 +117,7 @@
         <if test="repalBillStatus != null">
             AND REPAL_BILL_STATUS = #{repalBillStatus}
         </if>
-        AND REPAL_BILL_TYPE = #{repalGroupType}
+        AND REPAL_BILL_TYPE = #{repalBillType}
         AND REPAL_BOOK_ID = #{repalBookId}
     </select>
 

src/main/resources/mapper/RepalResponsiblePersonMapper.xml

@@ -5,7 +5,7 @@
     <select id="getResponsiblePersonNameList" parameterType="java.lang.Long" resultType="com.winhc.repal.model.vo.ResponsiblePersonNameVO">
         SELECT rPerson.REPAL_BILL_ID AS repalBillId, groupMember.MEMBER_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
-        LEFT JOIN REPAL_GROUP_MEMBER AS groupMember ON userExt.USER_ID = groupMember.USER_ID
+        LEFT JOIN REPAL_GROUP_MEMBER AS groupMember ON userExt.USER_ID = groupMember.USER_ID AND groupMember.DELETED = 0
         WHERE rPerson.REPAL_BILL_ID IN
         <foreach item="item" index="index" collection="billIdList" open="(" close=")" separator=",">
             #{item}