专题检索新增字段

src/main/java/com/zzsn/event/mapper/xml/SubjectMapper.xml

@@ -45,9 +45,10 @@
     </select>
 
     <select id="pageList_new" resultType="com.zzsn.event.vo.SubjectPageVO">
-        SELECT d.id,d.subject_name,d.status,d.data_scope,
+        SELECT d.id,d.subject_code,d.subject_name,d.status,d.data_scope,
         s.total_num,s.un_check_num,s.bind_source_num,s.bind_keyword_num,s.latest_data_date,
-        c.type_name as subjectTypeName, g.project_name as projectName
+        c.type_name as subjectTypeName, g.project_name as projectName,d.estimate_status,
+        d.create_by,d.create_time,d.update_by,d.update_time
         from subject d
         <if test="userId !=null and userId != ''">
             inner join sys_user_data_permission dp on d.id=dp.permission_id and dp.user_id = #{userId}
@@ -70,6 +71,9 @@
         <if test="subjectCondition.subjectName!=null and subjectCondition.subjectName != ''">
             and d.subject_name like CONCAT('%',#{subjectCondition.subjectName},'%')
         </if>
+        <if test="subjectCondition.subjectCode!=null and subjectCondition.subjectCode != ''">
+            and d.subject_code like CONCAT('%',#{subjectCondition.subjectCode},'%')
+        </if>
         <if test="subjectCondition.status!=null">
             and d.status = #{subjectCondition.status}
         </if>

src/main/java/com/zzsn/event/vo/SubjectCondition.java

@@ -14,6 +14,8 @@ public class SubjectCondition {
 
     /**专题id*/
     private String id;
+    /**专题编码*/
+    private String subjectCode;
     /**专题名称*/
     private String subjectName;
     /**项目id*/

src/main/java/com/zzsn/event/vo/SubjectPageVO.java

@@ -2,7 +2,9 @@ package com.zzsn.event.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zzsn.event.entity.arrange.ClbModelArrange;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
@@ -48,4 +50,15 @@ public class SubjectPageVO {
 
     /**主题绑定流程信息*/
     private List<ClbModelArrange> clbModelArranges;
+
+    /**创建人*/
+    private String createBy;
+    /**创建时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    private java.util.Date createTime;
+    /**更新人*/
+    private String updateBy;
+    /**更新时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    private java.util.Date updateTime;
 }