2 Komitmen d629eea5e0 ... 05fe4ff073

Pembuat SHA1 Pesan Tanggal
  huangguoce 05fe4ff073 Merge remote-tracking branch 'origin/master' 1 Minggu lalu
  huangguoce 1ff21c9e91 归档借用审批状态问题调整 1 Minggu lalu

+ 2 - 0
jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/service/CwProjectReportBorrowService.java

@@ -57,6 +57,7 @@ public class CwProjectReportBorrowService {
                 return update(workContractBorrowDto, info.getArchiveId());
             }
         }
+        infoMapper.updateBorrowTypeById(workContractBorrowDto.getId(),workContractBorrowDto.getBorrowType());
         return add(workContractBorrowDto);
     }
 
@@ -103,6 +104,7 @@ public class CwProjectReportBorrowService {
      * 根据id修改status
      */
     public void updateStatusById(CwProjectReportBorrowDto workContractBorrowDto) {
+        infoMapper.updateBorrowTypeById(workContractBorrowDto.getArchiveId(),workContractBorrowDto.getBorrowType());
         borrowMapper.updateStatusById(workContractBorrowDto.getId(), workContractBorrowDto.getBorrowType());
     }
 

+ 2 - 0
jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/service/dto/CwProjectReportBorrowDto.java

@@ -26,6 +26,8 @@ public class CwProjectReportBorrowDto extends BaseDTO {
 
     private String clientName;
 
+    private String archiveId;
+
     private String borrowName;
 
     @DateTimeFormat(pattern = "yyyy-MM-dd")