跟进记录接口调整

ruoyi-system/src/main/java/com/ruoyi/invest/domain/TProjectMeeting.java

@@ -40,13 +40,13 @@ public class TProjectMeeting extends BaseEntity
     private String projectPoolId;
 
     /** 会议开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "会议开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "会议开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 
     /** 会议结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "会议结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "会议结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
     /** 会议地点 */

ruoyi-system/src/main/java/com/ruoyi/invest/domain/TProjectRecord.java

@@ -76,6 +76,11 @@ public class TProjectRecord extends BaseEntity
      */
     private TProjectPool tProjectPool;
 
+    /**
+     * 项目名称【查询条件】
+     */
+    private String projectName;
+
     public void setId(String id) 
     {
         this.id = id;
@@ -174,6 +179,14 @@ public class TProjectRecord extends BaseEntity
         this.tProjectPool = tProjectPool;
     }
 
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-system/src/main/resources/mapper/invest/TProjectRecordMapper.xml

@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTProjectRecordVo"/>
         <where>
             a.del_flag = 0
+            <if test="projectName != null and projectName != ''"> and b.project_name like concat('%', #{projectName}, '%')</if>
             <if test="projectId != null  and projectId != ''"> and a.project_id = #{projectId}</if>
             <if test="contacts != null  and contacts != ''"> and a.contacts = #{contacts}</if>
             <if test="realityUpDate != null "> and a.reality_up_date = #{realityUpDate}</if>

ruoyi-ui/README.md

@@ -1,4 +1,4 @@
-## 开发
+ ## 开发
 
 ```bash
 # 克隆项目