|
@@ -2300,7 +2300,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
|
|
}
|
|
}
|
|
|
|
|
|
public CwProjectReportSignature findBySignatureId(String signatureId) {
|
|
public CwProjectReportSignature findBySignatureId(String signatureId) {
|
|
- return cwProjectReportSignatureMapper.selectById(signatureId);
|
|
|
|
|
|
+ return cwProjectReportSignatureMapper.getInfoById(signatureId);
|
|
}
|
|
}
|
|
|
|
|
|
public String updateSignatureStatusById(CwProjectReportSignatureDTO data) {
|
|
public String updateSignatureStatusById(CwProjectReportSignatureDTO data) {
|
|
@@ -2677,7 +2677,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
|
|
|
|
|
|
public void saveReportArchive (String reportId) throws Exception {
|
|
public void saveReportArchive (String reportId) throws Exception {
|
|
UserDTO userDTO = UserUtils.getCurrentUserDTO();
|
|
UserDTO userDTO = UserUtils.getCurrentUserDTO();
|
|
- CwProjectReport cwProjectReport = cwProjectReportService.getById(reportId);
|
|
|
|
|
|
+ CwProjectReport cwProjectReport = cwProjectReportService.getCwProjectReportById(reportId);
|
|
CwProjectReportArchive cwProjectReportArchive = new CwProjectReportArchive();
|
|
CwProjectReportArchive cwProjectReportArchive = new CwProjectReportArchive();
|
|
cwProjectReportArchive.setStatus("0");
|
|
cwProjectReportArchive.setStatus("0");
|
|
cwProjectReportArchive.setReportId(reportId);
|
|
cwProjectReportArchive.setReportId(reportId);
|
|
@@ -3084,4 +3084,8 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
|
|
reportMapper.updateCwProjectReportDataById(report);
|
|
reportMapper.updateCwProjectReportDataById(report);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ public CwProjectReport getCwProjectReportById(String id){
|
|
|
|
+ return reportMapper.getById(id);
|
|
|
|
+ }
|
|
}
|
|
}
|