diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ParamsManifestTodoCenterEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ParamsManifestTodoCenterEO.java index b985f82ea..9be55c843 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ParamsManifestTodoCenterEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ParamsManifestTodoCenterEO.java @@ -44,4 +44,7 @@ public class ParamsManifestTodoCenterEO { private Date createTime; private String state; private String projectId; + + //用于区分跳转所带的状态 + private String flag; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/FlagEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/FlagEnum.java new file mode 100644 index 000000000..2635b756e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/FlagEnum.java @@ -0,0 +1,24 @@ +package com.jero.modules.todoCenter.enums; + +/** + * 待办中心状态枚举类 + */ +public enum FlagEnum { + ZERO("0"), + ONE("1"), + ; + + String value; + + private FlagEnum(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java index 24ad795fd..0068bba6a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java @@ -11,6 +11,7 @@ import com.jero.modules.cert.collect.enums.ManifestStateEnum; import com.jero.modules.cert.collect.mapper.ParamsCollectManifestEOMapper; import com.jero.modules.cert.collect.mapper.ParamsManifestEOMapper; import com.jero.modules.todoCenter.entity.ParamsManifestTodoCenterEO; +import com.jero.modules.todoCenter.enums.FlagEnum; import com.jero.modules.todoCenter.service.IParamsManifestTodoCenterService; import com.jero.modules.todoCenter.vo.ParamsManifestTodoCenterEOPage; import org.apache.shiro.SecurityUtils; @@ -92,6 +93,7 @@ public class ParamsManifestTodoCenterServiceImpl implements IParamsManifestTodoC if (count > 0) { paramsManifestEO.setWaitFillNum(count); } + paramsManifestEO.setFlag(FlagEnum.ZERO.getValue()); } else { // 工程接口只能看到工程接口人是自己的;填写人只能看到填写人是自己 的数量 // 统计待分配数量 包括状态:待工程接口人处理,填写人退回 count = (int) pcmList.stream().filter(e-> (CollectManifestStateEnum.WAIT_SDT.getValue().equals(e.getState()) @@ -108,6 +110,7 @@ public class ParamsManifestTodoCenterServiceImpl implements IParamsManifestTodoC if (count > 0) { paramsManifestEO.setWaitFillNum(count); } + paramsManifestEO.setFlag(FlagEnum.ONE.getValue()); }