jiezhoufg/yc_fdjyfluru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

待办排序,参数拦截

Browse Source
This commit is contained in:
ys.git 2025-12-22 17:33:08 +08:00
parent 3510ed1b05
commit 8d9d9421fd
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/xdap/self_development/pojo/TodoTaskPojo.java
View File

@ -4,6 +4,7 @@ package com.xdap.self_development.pojo;
import com.definesys.mpaas.query.annotation.RowID; import com.definesys.mpaas.query.annotation.RowID;
import com.definesys.mpaas.query.annotation.RowIDType; import com.definesys.mpaas.query.annotation.RowIDType;
import com.definesys.mpaas.query.annotation.Table; import com.definesys.mpaas.query.annotation.Table;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; 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; 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; private Date lastUpdateDate;

5
src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java
View File

@ -395,9 +395,10 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
throw new RuntimeException("集合为空,请检查"); throw new RuntimeException("集合为空,请检查");
} }
for (EngineParamDetailPojo engineParamDetailPojo : engineParamDetailPojos) { for (EngineParamDetailPojo engineParamDetailPojo : engineParamDetailPojos) {
EngineParamDetailPojo engineParamDetailPojo1 = selectById(engineParamDetailPojo.getId());
//查找参数是否已经在审批中 //查找参数是否已经在审批中
if (ParamValueVersionEnum.UNDER.getCode().equals(engineParamDetailPojo.getVersionStatus())) { if (ObjectUtils.isNotEmpty(engineParamDetailPojo1) && ParamValueVersionEnum.UNDER.getCode() == (engineParamDetailPojo1.getVersionStatus())) {
throw new RuntimeException("您修改参数中有正在审批中的,请查看审批流审批后再修改,零部件+参数名称:" + engineParamDetailPojo.getPartsName()+"-"+engineParamDetailPojo.getParameterName()); throw new RuntimeException("您修改参数中有正在审批中的,请查看审批流审批后再修改,零部件+参数名称:" + engineParamDetailPojo.getPartsName() + "-" + engineParamDetailPojo.getParameterName());
} }
//通过操作状态对应不同操作新增和更新都新增数据为小版本且为草稿状态 //通过操作状态对应不同操作新增和更新都新增数据为小版本且为草稿状态

1
src/main/java/com/xdap/self_development/service/impl/EngineReviewListServiceImpl.java
View File

@ -53,6 +53,7 @@ public class EngineReviewListServiceImpl implements EngineReviewListService {
.eq("status_description", engineReviewListRequest.getStatusDescription()) .eq("status_description", engineReviewListRequest.getStatusDescription())
.eq("applicant", engineReviewListRequest.getApplicant()) .eq("applicant", engineReviewListRequest.getApplicant())
.eq("yc_or_oth", engineReviewListRequest.getYcOrOth()) .eq("yc_or_oth", engineReviewListRequest.getYcOrOth())
.orderBy("creation_date", "asc")
.doPageQuery(page, size, EngineReviewListPojo.class); .doPageQuery(page, size, EngineReviewListPojo.class);

4
src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java
View File

@ -74,7 +74,7 @@ public class TodoTaskServiceImpl implements TodoTaskService {
PageResultDTO<TodoTaskPojo> todoTaskPojoPageResultDTO = new PageResultDTO<>(); PageResultDTO<TodoTaskPojo> todoTaskPojoPageResultDTO = new PageResultDTO<>();
PageQueryResult<TodoTaskPojo> queryResult = sw.buildFromDatasource("xdap_app_223770822127386625") PageQueryResult<TodoTaskPojo> queryResult = sw.buildFromDatasource("xdap_app_223770822127386625")
.eq("created_by_id", todoTaskRequest.getCreatedById()) .eq("created_by_id", todoTaskRequest.getCreatedById())
.orderBy("last_update_date","desc") .orderBy("creation_date","desc")
.doPageQuery(todoTaskRequest.getPage(), todoTaskRequest.getSize(), TodoTaskPojo.class); .doPageQuery(todoTaskRequest.getPage(), todoTaskRequest.getSize(), TodoTaskPojo.class);
todoTaskPojoPageResultDTO.setList(queryResult.getResult()); todoTaskPojoPageResultDTO.setList(queryResult.getResult());
todoTaskPojoPageResultDTO.setTotalCount(queryResult.getCount()); todoTaskPojoPageResultDTO.setTotalCount(queryResult.getCount());
@ -122,7 +122,7 @@ public class TodoTaskServiceImpl implements TodoTaskService {
PageQueryResult<TodoTaskPojo> queryResult = sw.buildFromDatasource("xdap_app_223770822127386625") PageQueryResult<TodoTaskPojo> queryResult = sw.buildFromDatasource("xdap_app_223770822127386625")
.eq("owner_id", todoTaskRequest.getPersonId()) .eq("owner_id", todoTaskRequest.getPersonId())
.eq("is_delete", dOrYTask) .eq("is_delete", dOrYTask)
.orderBy("last_update_date","desc") .orderBy("creation_date","desc")
.doPageQuery(todoTaskRequest.getPage(), todoTaskRequest.getSize(), TodoTaskPojo.class); .doPageQuery(todoTaskRequest.getPage(), todoTaskRequest.getSize(), TodoTaskPojo.class);
List<TodoTaskPojo> todoTaskPojos = queryResult.getResult(); List<TodoTaskPojo> todoTaskPojos = queryResult.getResult();
pageResultDTO.setList(todoTaskPojos); pageResultDTO.setList(todoTaskPojos);