From 8d9d9421fda8a3ca423bf0b8a4e40370161c0914 Mon Sep 17 00:00:00 2001 From: "ys.git" <18439391935@163.com> Date: Mon, 22 Dec 2025 17:33:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E6=8E=92=E5=BA=8F,=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=8B=A6=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xdap/self_development/pojo/TodoTaskPojo.java | 3 +++ .../service/impl/EngineParamDetailServiceImpl.java | 5 +++-- .../service/impl/EngineReviewListServiceImpl.java | 1 + .../self_development/service/impl/TodoTaskServiceImpl.java | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/xdap/self_development/pojo/TodoTaskPojo.java b/src/main/java/com/xdap/self_development/pojo/TodoTaskPojo.java index b835557..12febf6 100644 --- a/src/main/java/com/xdap/self_development/pojo/TodoTaskPojo.java +++ b/src/main/java/com/xdap/self_development/pojo/TodoTaskPojo.java @@ -4,6 +4,7 @@ package com.xdap.self_development.pojo; import com.definesys.mpaas.query.annotation.RowID; import com.definesys.mpaas.query.annotation.RowIDType; import com.definesys.mpaas.query.annotation.Table; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; @@ -87,6 +88,7 @@ public class TodoTaskPojo implements Serializable { /** * 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date creationDate; /** @@ -97,6 +99,7 @@ public class TodoTaskPojo implements Serializable { /** * 最后更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date lastUpdateDate; diff --git a/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java index 5dac3a8..ab9bfa3 100644 --- a/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java @@ -395,9 +395,10 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService { throw new RuntimeException("集合为空,请检查"); } for (EngineParamDetailPojo engineParamDetailPojo : engineParamDetailPojos) { + EngineParamDetailPojo engineParamDetailPojo1 = selectById(engineParamDetailPojo.getId()); //查找参数是否已经在审批中 - if (ParamValueVersionEnum.UNDER.getCode().equals(engineParamDetailPojo.getVersionStatus())) { - throw new RuntimeException("您修改参数中有正在审批中的,请查看审批流审批后再修改,零部件+参数名称:" + engineParamDetailPojo.getPartsName()+"-"+engineParamDetailPojo.getParameterName()); + if (ObjectUtils.isNotEmpty(engineParamDetailPojo1) && ParamValueVersionEnum.UNDER.getCode() == (engineParamDetailPojo1.getVersionStatus())) { + throw new RuntimeException("您修改参数中有正在审批中的,请查看审批流审批后再修改,零部件+参数名称:" + engineParamDetailPojo.getPartsName() + "-" + engineParamDetailPojo.getParameterName()); } //通过操作状态对应不同操作新增和更新都新增数据为小版本且为草稿状态 diff --git a/src/main/java/com/xdap/self_development/service/impl/EngineReviewListServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/EngineReviewListServiceImpl.java index 14af4fa..495ebc8 100644 --- a/src/main/java/com/xdap/self_development/service/impl/EngineReviewListServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/EngineReviewListServiceImpl.java @@ -53,6 +53,7 @@ public class EngineReviewListServiceImpl implements EngineReviewListService { .eq("status_description", engineReviewListRequest.getStatusDescription()) .eq("applicant", engineReviewListRequest.getApplicant()) .eq("yc_or_oth", engineReviewListRequest.getYcOrOth()) + .orderBy("creation_date", "asc") .doPageQuery(page, size, EngineReviewListPojo.class); diff --git a/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java index 6745c45..babcf7c 100644 --- a/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java @@ -74,7 +74,7 @@ public class TodoTaskServiceImpl implements TodoTaskService { PageResultDTO todoTaskPojoPageResultDTO = new PageResultDTO<>(); PageQueryResult queryResult = sw.buildFromDatasource("xdap_app_223770822127386625") .eq("created_by_id", todoTaskRequest.getCreatedById()) - .orderBy("last_update_date","desc") + .orderBy("creation_date","desc") .doPageQuery(todoTaskRequest.getPage(), todoTaskRequest.getSize(), TodoTaskPojo.class); todoTaskPojoPageResultDTO.setList(queryResult.getResult()); todoTaskPojoPageResultDTO.setTotalCount(queryResult.getCount()); @@ -122,7 +122,7 @@ public class TodoTaskServiceImpl implements TodoTaskService { PageQueryResult queryResult = sw.buildFromDatasource("xdap_app_223770822127386625") .eq("owner_id", todoTaskRequest.getPersonId()) .eq("is_delete", dOrYTask) - .orderBy("last_update_date","desc") + .orderBy("creation_date","desc") .doPageQuery(todoTaskRequest.getPage(), todoTaskRequest.getSize(), TodoTaskPojo.class); List todoTaskPojos = queryResult.getResult(); pageResultDTO.setList(todoTaskPojos);