diff --git a/src/main/java/com/xdap/self_development/listener/PersonReadListener.java b/src/main/java/com/xdap/self_development/listener/PersonReadListener.java index f176dbd..94fd458 100644 --- a/src/main/java/com/xdap/self_development/listener/PersonReadListener.java +++ b/src/main/java/com/xdap/self_development/listener/PersonReadListener.java @@ -7,6 +7,8 @@ import com.xdap.self_development.pojo.ResponsiblePerson; import com.xdap.self_development.pojo.view.XdapUserView; import com.xdap.self_development.service.ResponsiblePersonService; +import java.sql.Timestamp; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -31,6 +33,7 @@ public class PersonReadListener implements ReadListener { } else { responsiblePerson.setUserId(user.getUserId()); responsiblePerson.setDepartmentId(user.getDepartmentId()); + responsiblePerson.setCreationDate(Timestamp.valueOf(LocalDateTime.now())); cachedDataList.add(responsiblePerson); } } diff --git a/src/main/java/com/xdap/self_development/pojo/ResponsiblePerson.java b/src/main/java/com/xdap/self_development/pojo/ResponsiblePerson.java index b343068..cf553f3 100644 --- a/src/main/java/com/xdap/self_development/pojo/ResponsiblePerson.java +++ b/src/main/java/com/xdap/self_development/pojo/ResponsiblePerson.java @@ -6,12 +6,14 @@ import com.definesys.mpaas.query.model.MpaasBasePojo; import lombok.Data; import lombok.EqualsAndHashCode; +import java.sql.Timestamp; + @EqualsAndHashCode(callSuper = true) @Data @Table("yfsjglpt_model_responsible_person") @SQLQuery(value = { @SQL(view = "getResponsibleAndName", - sql = "SELECT ymrp.*, xu.username FROM yfsjglpt_model_responsible_person ymrp JOIN xdap_users xu ON ymrp.user_id = xu.id where ymrp.person_level = #level") + sql = "SELECT ymrp.*, xu.username FROM yfsjglpt_model_responsible_person ymrp JOIN xdap_users xu ON ymrp.user_id = xu.id where ymrp.person_level = #level order by creation_date desc") }) public class ResponsiblePerson extends MpaasBasePojo { @RowID(sequence = "responsible_person_s", type = RowIDType.UUID) @@ -25,7 +27,13 @@ public class ResponsiblePerson extends MpaasBasePojo { private String partsName; private Integer personLevel; + private Timestamp creationDate; + @ExcelProperty("责任人") @Column(type = ColumnType.CALCULATE) private String username; + + @ExcelProperty("工号") + @Column(type = ColumnType.JAVA) + private String userAccount; } \ No newline at end of file diff --git a/src/main/java/com/xdap/self_development/pojo/dto/DataEntryEngineModelDto.java b/src/main/java/com/xdap/self_development/pojo/dto/DataEntryEngineModelDto.java index f4fc381..64d6a2f 100644 --- a/src/main/java/com/xdap/self_development/pojo/dto/DataEntryEngineModelDto.java +++ b/src/main/java/com/xdap/self_development/pojo/dto/DataEntryEngineModelDto.java @@ -137,4 +137,10 @@ public class DataEntryEngineModelDto extends MpaasBasePojo { */ private Integer parameterVersion; + /** + * 创建时间 + */ + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date creationDate; + } diff --git a/src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java index 8dc3f2a..55ccfab 100644 --- a/src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java @@ -246,7 +246,7 @@ public class BenchmarkingReportServiceImpl implements BenchmarkingReportService BenchmarkingReport report = bd.getBusinessDatabase() .eq("id", form.getReportId()) .doQueryFirst(BenchmarkingReport.class); - if (!"DRAFT".equals(report.getStatus()) && !"REJECT".equals(report.getStatus())) { + if (!"DRAFT".equals(report.getStatus()) && !"REJECTED".equals(report.getStatus())) { throw new CommonException("报告非草稿或拒绝状态不可修改"); } if (!Objects.equals(report.getCreateBy(), form.getUserId())) { diff --git a/src/main/java/com/xdap/self_development/service/impl/DataEntryEngineModelServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/DataEntryEngineModelServiceImpl.java index 83c750a..6a6e5cf 100644 --- a/src/main/java/com/xdap/self_development/service/impl/DataEntryEngineModelServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/DataEntryEngineModelServiceImpl.java @@ -166,6 +166,7 @@ public class DataEntryEngineModelServiceImpl implements DataEntryEngineModelServ dataEntryEngineModelDto.setDistributeStatus(byDesc1 != null ? byDesc1.getDesc() : null); dataEntryEngineModelDtos.add(dataEntryEngineModelDto); } + dataEntryEngineModelDtos.sort(Comparator.comparing(DataEntryEngineModelDto::getCreationDate).reversed()); tPageResultDTO.setList(dataEntryEngineModelDtos); tPageResultDTO.setTotalCount(pageQueryResult.getCount()); return tPageResultDTO; diff --git a/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java index b1e8c1c..8640975 100644 --- a/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java @@ -25,6 +25,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.net.URLEncoder; +import java.sql.Timestamp; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; @@ -59,6 +60,7 @@ public class ResponsiblePersonServiceImpl implements ResponsiblePersonService { responsiblePerson.setUserId(form.getUserId()); responsiblePerson.setSubsystem(form.getSubsystem()); responsiblePerson.setPersonLevel(1); + responsiblePerson.setCreationDate(Timestamp.valueOf(LocalDateTime.now())); bd.getBusinessDatabase().doInsert(responsiblePerson); } @@ -91,6 +93,7 @@ public class ResponsiblePersonServiceImpl implements ResponsiblePersonService { .update("user_id", form.getUserId()) .update("department", form.getDepartment()) .update("subsystem", form.getSubsystem()) + .update("creation_date", Timestamp.valueOf(LocalDateTime.now())) .doUpdate(ResponsiblePerson.class); } @@ -186,6 +189,7 @@ public class ResponsiblePersonServiceImpl implements ResponsiblePersonService { List list = bd.getBusinessDatabase() .viewQueryMode(true).view("getResponsibleAndName") .setVar("level", 1) + .orderBy("creation_date", "desc") .doQuery(ResponsiblePerson.class); EasyExcel.write(response.getOutputStream(), ResponsiblePerson.class) @@ -290,6 +294,7 @@ public class ResponsiblePersonServiceImpl implements ResponsiblePersonService { fieldNames.add("department"); fieldNames.add("subsystem"); fieldNames.add("username"); + fieldNames.add("userAccount"); return fieldNames; } } diff --git a/src/main/java/com/xdap/self_development/service/impl/TemplateServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/TemplateServiceImpl.java index dba73b4..c91d32e 100644 --- a/src/main/java/com/xdap/self_development/service/impl/TemplateServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/TemplateServiceImpl.java @@ -246,9 +246,11 @@ public class TemplateServiceImpl implements TemplateService { validationResult.get("errorMessage")); problems.setFlag(true); problems.getErrors().add(errorMsg); - return; } } + if (problems.getFlag()) { + return; + } } // 处理模板版本 @@ -268,6 +270,16 @@ public class TemplateServiceImpl implements TemplateService { } } + Template template = bd.getBusinessDatabase() + .eq("template_name", templateName) + .orderBy("version", "desc") + .doQueryFirst(Template.class); + if (Objects.equals(template.getStatus(), "APPROVING")) { + problems.setFlag(true); + problems.getErrors().add("模板导入失败:模板'" + templateName + "'正在审批中"); + return; + } + // 首先查找是否有草稿版本 Template draftTemplate = bd.getBusinessDatabase() .eq("template_name", templateName)