|
@@ -159,7 +159,7 @@ public class ProjectListService {
|
|
BeanUtils.copyProperties(dto, info);
|
|
BeanUtils.copyProperties(dto, info);
|
|
String reportNo = "";
|
|
String reportNo = "";
|
|
String id = UUID.randomUUID().toString().replace("-", "");
|
|
String id = UUID.randomUUID().toString().replace("-", "");
|
|
- if (("true").equals(dto.getGenerateReportNumber())) {
|
|
|
|
|
|
+ if (("true").equals(dto.getGenerateReportNumber()) && dto.getStatus().equals("2")) {
|
|
// 获取当前日期
|
|
// 获取当前日期
|
|
LocalDate currentDate = LocalDate.now();
|
|
LocalDate currentDate = LocalDate.now();
|
|
// 获取当前年份
|
|
// 获取当前年份
|
|
@@ -478,7 +478,7 @@ public class ProjectListService {
|
|
LocalDate currentDate = LocalDate.now();
|
|
LocalDate currentDate = LocalDate.now();
|
|
// 获取当前年份
|
|
// 获取当前年份
|
|
String currentYear = String.valueOf(currentDate.getYear());
|
|
String currentYear = String.valueOf(currentDate.getYear());
|
|
- if (("false").equals(dto.getGenerateReportNumber()) && dto.getStatus().equals("5")) {
|
|
|
|
|
|
+ if ((("false").equals(dto.getGenerateReportNumber()) && dto.getStatus().equals("5")) || (("true").equals(dto.getGenerateReportNumber()) && dto.getStatus().equals("2"))) {
|
|
ProgramProjectListInfo programProjectListInfo = projectListMapper.selectById(dto.getId());
|
|
ProgramProjectListInfo programProjectListInfo = projectListMapper.selectById(dto.getId());
|
|
ProgramReportNo programReportNo = programReportNoMapper.selectByProgramId(info.getId());
|
|
ProgramReportNo programReportNo = programReportNoMapper.selectByProgramId(info.getId());
|
|
if (null == programReportNo) {
|
|
if (null == programReportNo) {
|