bug fix

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

@@ -987,19 +987,25 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
         if (Objects.isNull(repalBill)) {
             throw new CommonException(CodeMsg.FAILED, "账款id错误");
         }
-        if (ObjectUtil.isAllNotEmpty(repalBill.getPreDiagnosisDatetime(), repalBill.getDiagnosisDatetime())) {
+        if (ObjectUtil.isAllEmpty(repalBill.getPreDiagnosisScore(), repalBill.getDiagnosisScore())) {
             LOGGER.error("没有账款评级");
             return null;
         }
         DiagnosisSectionVO vo = new DiagnosisSectionVO();
         BeanUtils.copyProperties(repalBill, vo);
+        vo.setDiagnosisRecordId(repalBill.getDiagnosisId());
+        vo.setDiagnosisGrade(repalBill.getDiagnosisGrade());
+        vo.setDiagnosisScoreStr(Objects.nonNull(repalBill.getDiagnosisScore()) ? repalBill.getDiagnosisScore().stripTrailingZeros().toPlainString() : "");
+        vo.setPreDiagnosisGrade(repalBill.getPreDiagnosisGrade());
+        vo.setPreDiagnosisScoreStr(Objects.nonNull(repalBill.getPreDiagnosisScore()) ? repalBill.getPreDiagnosisScore().stripTrailingZeros().toPlainString() : "");
         RepalBillDiagnosis diagnosis = repalBillDiagnosisService.getById(repalBill.getDiagnosisId());
         if (Objects.nonNull(diagnosis)) {
             vo.setDiagnosisRecordId(diagnosis.getBizId());
         }
         QueryV8DynamicDTO dynamicDto = new QueryV8DynamicDTO();
         dynamicDto.setEntityNames(Collections.singletonList(repalBill.getCustomerName()));
-        dynamicDto.setStartDate(repalBill.getPreDiagnosisDatetime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+        LocalDateTime startDateTime = Objects.isNull(repalBill.getPreDiagnosisDatetime()) ? repalBill.getTimeCreated() : repalBill.getPreDiagnosisDatetime();
+        dynamicDto.setStartDate(startDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
         dynamicDto.setEndDate(repalBill.getDiagnosisDatetime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
         VOPage<V8DynamicVO> resultPage = companyService.queryDynamic(dynamicDto, 1, 10);
         if (Objects.isNull(resultPage) || CollUtil.isEmpty(resultPage.getDataList())) {

src/main/resources/mapper/RepalBillMapper.xml

@@ -93,7 +93,7 @@
             LEFT JOIN REPAL_RESPONSIBLE_PERSON AS person ON person.REPAL_BILL_ID = bill.ID
         </if>
         <if test="dynamicType != null">
-            LEFT JOIN REPAL_REMIND_READ_INFO ri ON bill.id = ri.REPAL_BILL_ID AND ri.USER_ID = #{param2.userId}
+            LEFT JOIN REPAL_REMIND_READ_INFO ri ON bill.id = ri.REPAL_BILL_ID AND ri.USER_ID = #{userId}
         </if>
         <where>
             <if test="!allFlag">
@@ -106,7 +106,7 @@
             AND bill.REPAL_BILL_TYPE = #{repalBillType}
             <if test="overdueStatus != null">
                 <if test="overdueStatus == 1">
-                    AND bill.REPAL_BILL_STATUS = 1
+                    AND bill.REPAL_BILL_STATUS NOT IN (3,4)
                 </if>
                 <if test="overdueStatus == 2">
                     AND bill.REPAL_BILL_STATUS = 1 AND bill.END_DATE <![CDATA[<=]]> date_add(CURDATE(), interval 7 day) and bill.END_DATE >= CURDATE()