From dfa3a9f10c8b731a37ffc2a95629e8a5b0f7e5d4 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 17 Oct 2022 17:58:40 +0800
Subject: [PATCH] update

---
 .../jero/modules/todoCenter/entity/ProcessInfoEO.java | 11 ++++++-----
 .../service/impl/ProcessInfoEOServiceImpl.java        |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ProcessInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ProcessInfoEO.java
index 9fa7c1681..642a6d959 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ProcessInfoEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ProcessInfoEO.java
@@ -1,8 +1,6 @@
 package com.jero.modules.todoCenter.entity;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -11,13 +9,10 @@ import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
 
 /**
  * @Description: 流程信息表
@@ -125,4 +120,10 @@ public class ProcessInfoEO implements Serializable {
     /**标准标题*/
     @TableField(exist = false)
     private String title;
+    /**项目名称*/
+    @TableField(exist = false)
+    private String projectName;
+    /**年份*/
+    @TableField(exist = false)
+    private String yearName;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
index c7b73387b..4bd2d95bd 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
@@ -301,6 +301,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 						data.setAssigneeName(currentUserName);
 					}
 				}
+				data.setProjectName(data.getProjectName() + "-" + data.getYearName());
 			});
 		}
 	}