anderx преди 1 година
родител
ревизия
e2eb91b1a4

+ 1 - 1
src/main/java/com/goafanti/common/dao/TaskScoreMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
  * 项目评分列表(TaskScore)表数据库访问层
  *
  * @author makejava
- * @since 2024-09-27 11:47:46
+ * @since 2024-10-09 14:30:03
  */
 public interface TaskScoreMapper {
 

+ 21 - 9
src/main/java/com/goafanti/common/mapper/TaskScoreMapper.xml

@@ -12,10 +12,11 @@
         <result property="serviceAttitude" column="service_attitude" jdbcType="INTEGER"/>
         <result property="monthlyReport" column="monthly_report" jdbcType="INTEGER"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="remarks" column="remarks" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="TaskScoreAllSql">
-        id, tid, professionalism, communication_skills, responsiveness, public_image, service_attitude, monthly_report, create_time
+        id, tid, professionalism, communication_skills, responsiveness, public_image, service_attitude, monthly_report, create_time, remarks
     </sql>
 
     <!--查询单个-->
@@ -60,6 +61,9 @@
             <if test="createTime != null">
                 and create_time = #{createTime}
             </if>
+            <if test="remarks != null and remarks != ''">
+                and remarks = #{remarks}
+            </if>
         </where>
         <if test="page_sql != null">
             ${page_sql}
@@ -98,35 +102,39 @@
             <if test="createTime != null">
                 and create_time = #{createTime}
             </if>
+            <if test="remarks != null and remarks != ''">
+                and remarks = #{remarks}
+            </if>
         </where>
     </select>
 
-
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
         insert into task_score(tid, professionalism, communication_skills, responsiveness, public_image,
-                               service_attitude, monthly_report )
+                               service_attitude, monthly_report, create_time, remarks)
         values (#{tid}, #{professionalism}, #{communicationSkills}, #{responsiveness}, #{publicImage},
-                #{serviceAttitude}, #{monthlyReport})
+                #{serviceAttitude}, #{monthlyReport}, #{createTime}, #{remarks})
     </insert>
 
     <insert id="insertBatch">
         insert into task_score(tid, professionalism, communication_skills, responsiveness, public_image,
-        service_attitude, monthly_report, create_time)
+        service_attitude, monthly_report, create_time, remarks)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.tid}, #{entity.professionalism}, #{entity.communicationSkills}, #{entity.responsiveness},
-            #{entity.publicImage}, #{entity.serviceAttitude}, #{entity.monthlyReport}, #{entity.createTime})
+            #{entity.publicImage}, #{entity.serviceAttitude}, #{entity.monthlyReport}, #{entity.createTime},
+            #{entity.remarks})
         </foreach>
     </insert>
 
     <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
         insert into task_score(tid, professionalism, communication_skills, responsiveness, public_image,
-        service_attitude, monthly_report, create_time)
+        service_attitude, monthly_report, create_time, remarks)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.tid}, #{entity.professionalism}, #{entity.communicationSkills}, #{entity.responsiveness},
-            #{entity.publicImage}, #{entity.serviceAttitude}, #{entity.monthlyReport}, #{entity.createTime})
+            #{entity.publicImage}, #{entity.serviceAttitude}, #{entity.monthlyReport}, #{entity.createTime},
+            #{entity.remarks})
         </foreach>
         on duplicate key update
         tid = values(tid),
@@ -136,7 +144,8 @@
         public_image = values(public_image),
         service_attitude = values(service_attitude),
         monthly_report = values(monthly_report),
-        create_time = values(create_time)
+        create_time = values(create_time),
+        remarks = values(remarks)
     </insert>
 
     <!--通过主键修改数据-->
@@ -167,6 +176,9 @@
             <if test="createTime != null">
                 create_time = #{createTime},
             </if>
+            <if test="remarks != null and remarks != ''">
+                remarks = #{remarks},
+            </if>
         </set>
         where id = #{id}
     </update>

+ 14 - 5
src/main/java/com/goafanti/common/model/TaskScore.java

@@ -1,7 +1,5 @@
 package com.goafanti.common.model;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 import java.io.Serializable;
 import java.util.Date;
 
@@ -10,10 +8,10 @@ import java.util.Date;
  * 项目评分列表(TaskScore)实体类
  *
  * @author makejava
- * @since 2024-09-27 15:44:17
+ * @since 2024-10-09 14:30:03
  */
 public class TaskScore implements Serializable {
-    private static final long serialVersionUID = -84505501980238600L;
+    private static final long serialVersionUID = 184617794735553702L;
     /**
      * id
      */
@@ -50,6 +48,10 @@ public class TaskScore implements Serializable {
      * 创建时间
      */
     private Date createTime;
+    /**
+     * 备注
+     */
+    private String remarks;
 
 
     public Integer getId() {
@@ -116,7 +118,6 @@ public class TaskScore implements Serializable {
         this.monthlyReport = monthlyReport;
     }
 
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     public Date getCreateTime() {
         return createTime;
     }
@@ -125,5 +126,13 @@ public class TaskScore implements Serializable {
         this.createTime = createTime;
     }
 
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
 }