任务添加交付物描述字段

research-admin/src/main/resources/application-dev.yml

@@ -8,7 +8,7 @@ spring:
             master:
                 url: jdbc:mysql://127.0.0.1:3306/open_research?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                 username: root
-                password: 123456
+                password: q7510327
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

research-admin/src/main/resources/application-prod.yml

@@ -9,6 +9,7 @@ spring:
                 url: jdbc:mysql://127.0.0.1:3306/open_research?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                 username: root
                 password: sdey18aA!
+#                password: csylcx18aA!
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

research-generator/src/main/resources/mbg.xml

@@ -22,7 +22,7 @@
         <jdbcConnection driverClass="com.mysql.jdbc.Driver"
                         connectionURL="jdbc:mysql://127.0.0.1:3306/open_research_yfyy?useUnicode=true&amp;characterEncoding=UTF-8&amp;serverTimezone=GMT%2B8&amp;tinyInt1isBit=false"
                         userId="root"
-                        password="123456">
+                        password="q7510327">
             <!--仅仅查询当前库的表，不查询其他库-->
             <property name="nullCatalogMeansCurrent" value="true"/>
         </jdbcConnection>
@@ -99,10 +99,10 @@
 <!--        <table tableName="kt_research_content" domainObjectName="KtResearchContent" enableDeleteByExample="false"/>-->
 <!--        <table tableName="kt_expected_outcomes" domainObjectName="KtExpectedOutcomes" enableDeleteByExample="false"/>-->
 <!--        <table tableName="kt_config" domainObjectName="KtConfig" enableDeleteByExample="false"/>-->
-<!--        <table tableName="tas_task" domainObjectName="TasTask" enableDeleteByExample="false"/>-->
+        <table tableName="tas_task" domainObjectName="TasTask" enableDeleteByExample="false"/>
 <!--        <table tableName="tas_task_member" domainObjectName="TasTaskMember" enableDeleteByExample="false"/>-->
 <!--        <table tableName="tas_deliverable" domainObjectName="TasDeliverable" enableDeleteByExample="false"/>-->
-        <table tableName="com_file" domainObjectName="ComFile" enableDeleteByExample="false"/>
+<!--        <table tableName="com_file" domainObjectName="ComFile" enableDeleteByExample="false"/>-->
         <!-- 有些表的字段需要指定java类型
          <table schema="" tableName="">
             <columnOverride column="" javaType="" />

research-system/src/main/java/com/research/system/domain/dto/TaskDto.java

@@ -1,5 +1,6 @@
 package com.research.system.domain.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.research.system.domain.vo.TaskVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -43,6 +44,9 @@ public class TaskDto {
         @NotNull(message = "任务类型不能为空")
         private Byte taskType;
 
+        @ApiModelProperty("应交付物描述")
+        private String description;
+
         @ApiModelProperty("负责人ID列表")
         @NotNull(message = "负责人不能为空")
         private List<Long> memberIds;
@@ -70,9 +74,13 @@ public class TaskDto {
         @ApiModelProperty("优先级：1-低 2-中 3-高")
         private Integer priority;
 
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
         @ApiModelProperty("截止时间")
         private Date endTime;
 
+        @ApiModelProperty("应交付物描述")
+        private String description;
+
         @ApiModelProperty("应交付物")
         private List<String> requiredDeliverable;
     }

research-system/src/main/java/com/research/system/domain/po/TasTask.java

@@ -36,6 +36,8 @@ public class TasTask implements Serializable {
 
     private String remark;
 
+    private String description;
+
     private String taskDescription;
 
     private static final long serialVersionUID = 1L;
@@ -168,6 +170,14 @@ public class TasTask implements Serializable {
         this.remark = remark == null ? null : remark.trim();
     }
 
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description == null ? null : description.trim();
+    }
+
     public String getTaskDescription() {
         return taskDescription;
     }
@@ -198,6 +208,7 @@ public class TasTask implements Serializable {
         sb.append(", updateBy=").append(updateBy);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", remark=").append(remark);
+        sb.append(", description=").append(description);
         sb.append(", taskDescription=").append(taskDescription);
         sb.append("]");
         return sb.toString();

research-system/src/main/java/com/research/system/domain/po/TasTaskExample.java

@@ -1104,6 +1104,76 @@ public class TasTaskExample {
             addCriterion("remark not between", value1, value2, "remark");
             return (Criteria) this;
         }
+
+        public Criteria andDescriptionIsNull() {
+            addCriterion("description is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionIsNotNull() {
+            addCriterion("description is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionEqualTo(String value) {
+            addCriterion("description =", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionNotEqualTo(String value) {
+            addCriterion("description <>", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionGreaterThan(String value) {
+            addCriterion("description >", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionGreaterThanOrEqualTo(String value) {
+            addCriterion("description >=", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionLessThan(String value) {
+            addCriterion("description <", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionLessThanOrEqualTo(String value) {
+            addCriterion("description <=", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionLike(String value) {
+            addCriterion("description like", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionNotLike(String value) {
+            addCriterion("description not like", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionIn(List<String> values) {
+            addCriterion("description in", values, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionNotIn(List<String> values) {
+            addCriterion("description not in", values, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionBetween(String value1, String value2) {
+            addCriterion("description between", value1, value2, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionNotBetween(String value1, String value2) {
+            addCriterion("description not between", value1, value2, "description");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

research-system/src/main/java/com/research/system/domain/vo/ShsResDeviceVo.java

@@ -57,6 +57,9 @@ public class ShsResDeviceVo {
         @ApiModelProperty("")
         private Date createTime;
         private String platformName;
+
+        @ApiModelProperty("实验室名称")
+        private String libraryName;
         @ApiModelProperty("图片列表")
         private List<String> picList = new ArrayList<>();
     }

research-system/src/main/java/com/research/system/domain/vo/TaskVo.java

@@ -97,6 +97,8 @@ public class TaskVo {
         private Date auditTime;
         @ApiModelProperty("驳回原因")
         private String rejectReason;
+        @ApiModelProperty("应交付物描述")
+        private String description;
         @ApiModelProperty("应交付物")
         private List<FileInfo> requiredDeliverable;
     }

research-system/src/main/java/com/research/system/service/ShsCkwxService.java

@@ -4,6 +4,7 @@ import com.research.system.domain.dto.CommonDto;
 import com.research.system.domain.dto.ShsCkwxDto;
 import com.research.system.domain.vo.ShsCkwxVo;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -16,6 +17,9 @@ public interface ShsCkwxService {
 
     List<ShsCkwxVo.Result> queryList(ShsCkwxDto.Query query, Integer pageNum, Integer pageSize);
 
+    //下载参考文献
+    void download(HttpServletResponse response, Long id);
+
     Integer add(ShsCkwxDto.Add dto);
 
     Integer del(CommonDto.DelDto dto);

research-system/src/main/java/com/research/system/service/impl/OutcomeServiceImpl.java

@@ -3,6 +3,7 @@ package com.research.system.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
+import com.research.common.exception.base.BaseException;
 import com.research.common.utils.SecurityUtils;
 import com.research.system.domain.dto.CommonDto;
 import com.research.system.domain.dto.OutcomeDto;
@@ -61,10 +62,19 @@ public class OutcomeServiceImpl implements OutcomeService {
             achAchievement.setId(IdUtil.getSnowflakeNextId());
             achAchievement.setCreateBy(SecurityUtils.getUsername());
             achAchievement.setCreateTime(new Date());
-            achAchievement.setProjOrgId(SecurityUtils.getTenantId());
+//            achAchievement.setProjOrgId(SecurityUtils.getTenantId());
             achAchievement.setDelFlag((byte) 0);
             achAchievementMapper.insertSelective(achAchievement);
         }else {
+
+            //创建者才可修改
+            if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
+                AchAchievement achAchievement1 = achAchievementMapper.selectByPrimaryKey(dto.getId());
+                if (!achAchievement1.getCreateBy().equals(SecurityUtils.getUsername())) {
+                    throw new BaseException("无权限修改");
+                }
+            }
+
             achAchievement.setUpdateBy(SecurityUtils.getUsername());
             achAchievement.setUpdateTime(new Date());
             achAchievementMapper.updateByPrimaryKeySelective(achAchievement);

research-system/src/main/java/com/research/system/service/impl/ShsCkwxServiceImpl.java

@@ -2,6 +2,7 @@ package com.research.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.poi.excel.BigExcelWriter;
 import com.github.pagehelper.PageHelper;
 import com.research.common.exception.base.BaseException;
 import com.research.common.utils.SecurityUtils;
@@ -17,6 +18,7 @@ import com.research.system.service.ShsCkwxService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
 import java.util.List;
 
@@ -50,6 +52,17 @@ public class ShsCkwxServiceImpl implements ShsCkwxService {
         return shsCkwxDao.queryList(query, proInfoByTenantId.getId());
     }
 
+    @Override
+    public void download(HttpServletResponse response, Long id) {
+        ShsCkwxInfo shsCkwxInfo = shsCkwxInfoMapper.selectByPrimaryKey(id);
+        if (shsCkwxInfo == null) {
+            return;
+        }
+        BigExcelWriter writer = new BigExcelWriter();
+
+
+    }
+
     @Override
     public Integer add(ShsCkwxDto.Add dto) {
         ShsCkwxInfo shsCkwxInfo = BeanUtil.copyProperties(dto, ShsCkwxInfo.class);
@@ -65,6 +78,13 @@ public class ShsCkwxServiceImpl implements ShsCkwxService {
             shsCkwxInfo.setDelFlag((byte) 0);
             return shsCkwxInfoMapper.insertSelective(shsCkwxInfo);
         } else {
+            //创建者才可修改
+            if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
+                ShsCkwxInfo shsCkwxInfo1 = shsCkwxInfoMapper.selectByPrimaryKey(dto.getId());
+                if (!shsCkwxInfo1.getCreateBy().equals(SecurityUtils.getUsername())) {
+                    throw new BaseException("无权限修改");
+                }
+            }
             shsCkwxInfo.setUpdateBy(SecurityUtils.getUsername());
             shsCkwxInfo.setUpdateTime(new Date());
             return shsCkwxInfoMapper.updateByPrimaryKeySelective(shsCkwxInfo);

research-system/src/main/java/com/research/system/service/impl/ShsSyffCategoryServiceImpl.java

@@ -2,6 +2,7 @@ package com.research.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.IdUtil;
+import com.research.common.exception.base.BaseException;
 import com.research.common.utils.SecurityUtils;
 import com.research.system.domain.dto.CommonDto;
 import com.research.system.domain.dto.ShsSyffCategoryDto;
@@ -55,6 +56,13 @@ public class ShsSyffCategoryServiceImpl implements ShsSyffCategoryService {
             shsSyffInfo.setCreateTime(new Date());
             return shsSyffInfoMapper.insertSelective(shsSyffInfo);
         } else {
+            //创建者才可修改
+            if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
+                ShsSyffInfo shsSyffInfo1 = shsSyffInfoMapper.selectByPrimaryKey(add.getId());
+                if (!shsSyffInfo1.getCreateBy().equals(SecurityUtils.getUsername())) {
+                    throw new BaseException("无权限修改");
+                }
+            }
             shsSyffInfo.setUpdateBy(SecurityUtils.getUsername());
             shsSyffInfo.setDelFlag((byte) 0);
             shsSyffInfo.setUpdateTime(new Date());

research-system/src/main/java/com/research/system/service/impl/TaskServiceImpl.java

@@ -229,6 +229,9 @@ public class TaskServiceImpl implements ITaskService {
         if (param.getEndTime() != null) {
             updateTask.setEndTime(param.getEndTime());
         }
+        if (StrUtil.isNotBlank(param.getDescription())) {
+            updateTask.setDescription(param.getDescription());
+        }
         updateTask.setUpdateBy(SecurityUtils.getUsername());
         updateTask.setUpdateTime(new Date());
         taskMapper.updateByPrimaryKeySelective(updateTask);

research-system/src/main/resources/mapper/dao/KtsGroupDao.xml

@@ -12,7 +12,7 @@
         g.sort,
         g.intro,
         g.kt_group_status as ktGroupStatus,
-        g.create_by as createBy,
+        u.nick_name as createBy,
         g.create_time as createTime,
         o.org_name as projOrgName,
         pg.kt_group_name as parentKtName,
@@ -28,6 +28,7 @@
         prj_proj_org o on g.proj_org_id = o.id
         left join
         kts_kt_group pg on g.parent_kt_id = pg.id
+        left join sys_user u on u.user_name = g.create_by
         where 1=1
         and g.del_flag = 0
           <if test="dto.idList != null and dto.idList.size()>0">
@@ -145,7 +146,7 @@
         m.intro,
         m.audit_status as auditStatus,
         m.member_status as memberStatus,
-        m.create_by as createBy,
+        u1.nick_name as createBy,
         m.create_time as createTime,
         g.kt_group_name as ktGroupName,
         d1.dict_label as qualificationName,
@@ -163,6 +164,7 @@
         left join sys_user u on u.user_id = m.user_id and u.del_flag = 0
         left join sys_dict_data d1 on d1.dict_value = m.qualification and d1.dict_type = 'qualification'
         left join sys_dict_data d2 on d2.dict_value = m.title and d2.dict_type = 'sys_title'
+        left join sys_user u1 on u1.user_name = m.create_by
         where
         o.del_flag = 0
         <if test="dto.projOrgId != null">

research-system/src/main/resources/mapper/dao/MeetingDao.xml

@@ -24,7 +24,7 @@
         r.meeting_place,
         r.meeting_number,
         r.remark,
-        r.create_by,
+        u.nick_name as create_by,
         r.create_time,
         r.meeting_url as meetingUrl,
         o.org_name as projOrgName,
@@ -35,7 +35,7 @@
         prj_proj_org o on r.proj_org_id = o.id
         left join
         kts_kt_group g on g.id = r.kt_group_id
-
+        left join sys_user u on r.create_by = u.user_name
         where
         r.del_flag = 0
         <if test="dto.meetingTitle != null and dto.meetingTitle != ''">

research-system/src/main/resources/mapper/dao/OutcomeDao.xml

@@ -46,7 +46,7 @@
         a.pdf_download_url as pdfDownloadUrl,
         a.commitment_letter_url as commitmentLetterUrl,
         a.remark,
-        a.create_by as createBy,
+        u1.nick_name as createBy,
         a.create_time as createTime,
         p.org_name as projOrgName,
         g.kt_group_name as ktGroupName,
@@ -62,7 +62,7 @@
         FROM ach_achievement a
         left join prj_proj_org p on a.proj_org_id = p.id and p.del_flag = 0
         left join kts_kt_group g on a.kt_group_id = g.id and g.del_flag = 0
-
+        left join sys_user u1 on u1.user_name = a.create_by
         WHERE a.del_flag = 0
         <if test="dto.title != null and dto.title != ''">
             AND a.title LIKE CONCAT('%', #{dto.title}, '%')

research-system/src/main/resources/mapper/dao/ShsCkwxDao.xml

@@ -16,7 +16,7 @@
             s.pdf_download_url as pdfDownloadUrl,
             s.uploader_name as uploaderName,
             s.uploader_org as uploaderOrg,
-            s.create_by as createBy,
+            u1.nick_name as createBy,
             s.create_time as createTime,
             s.publication_year as publicationYear,
             s.type,
@@ -27,6 +27,7 @@
         shs_ckwx_info s
         left join shs_ckwx_category c on s.category_id = c.id
         left join prj_proj_org o on o.id = s.uploader_org
+        left join sys_user u1 on u1.user_name = s.create_by
         where
         s.del_flag = 0
         <if test="dto.categoryId != null">

research-system/src/main/resources/mapper/dao/ShsResDeviceDao.xml

@@ -22,10 +22,12 @@
         d.address,
         d.sort,
         d.description,
-        p.name as platformName
+        p.name as platformName,
+        s.title as libraryName
         FROM shs_res_device d
         left join
         res_platform p on d.platform_id = p.id
+        left join shs_lib_info s on d.library_id = s.id
         WHERE d.del_status = 0
         <if test="dto.platformId != null">
             AND d.platform_id = #{dto.platformId}

research-system/src/main/resources/mapper/dao/TaskDao.xml

@@ -42,6 +42,7 @@
         <result column="audit_status" property="auditStatus"/>
         <result column="reject_reason" property="rejectReason"/>
         <result column="audit_time" property="auditTime"/>
+        <result column="description" property="description"/>
     </resultMap>
 
     <select id="queryTaskList" resultMap="TaskInfoMap">
@@ -63,6 +64,7 @@
         t.start_time,
         t.end_time,
         t.create_time,
+        t.description,
         tm.task_status,
         tm.audit_status,
         tm.reject_reason,

research-system/src/main/resources/mapper/system/TasTaskMapper.xml

@@ -18,6 +18,7 @@
     <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="description" jdbcType="VARCHAR" property="description" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.research.system.domain.po.TasTask">
     <result column="task_description" jdbcType="LONGVARCHAR" property="taskDescription" />
@@ -83,7 +84,7 @@
   <sql id="Base_Column_List">
     id, kt_group_id, proj_org_id, proj_id, task_name, priority, task_type, start_time, 
     end_time, task_creator_id, del_flag, create_by, create_time, update_by, update_time, 
-    remark
+    remark, description
   </sql>
   <sql id="Blob_Column_List">
     task_description
@@ -136,13 +137,15 @@
       task_type, start_time, end_time, 
       task_creator_id, del_flag, create_by, 
       create_time, update_by, update_time, 
-      remark, task_description)
+      remark, description, task_description
+      )
     values (#{id,jdbcType=BIGINT}, #{ktGroupId,jdbcType=BIGINT}, #{projOrgId,jdbcType=BIGINT}, 
       #{projId,jdbcType=BIGINT}, #{taskName,jdbcType=VARCHAR}, #{priority,jdbcType=TINYINT}, 
       #{taskType,jdbcType=TINYINT}, #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, 
       #{taskCreatorId,jdbcType=BIGINT}, #{delFlag,jdbcType=TINYINT}, #{createBy,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{remark,jdbcType=VARCHAR}, #{taskDescription,jdbcType=LONGVARCHAR})
+      #{remark,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{taskDescription,jdbcType=LONGVARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.research.system.domain.po.TasTask">
     insert into tas_task
@@ -195,6 +198,9 @@
       <if test="remark != null">
         remark,
       </if>
+      <if test="description != null">
+        description,
+      </if>
       <if test="taskDescription != null">
         task_description,
       </if>
@@ -248,6 +254,9 @@
       <if test="remark != null">
         #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="description != null">
+        #{description,jdbcType=VARCHAR},
+      </if>
       <if test="taskDescription != null">
         #{taskDescription,jdbcType=LONGVARCHAR},
       </if>
@@ -310,6 +319,9 @@
       <if test="record.remark != null">
         remark = #{record.remark,jdbcType=VARCHAR},
       </if>
+      <if test="record.description != null">
+        description = #{record.description,jdbcType=VARCHAR},
+      </if>
       <if test="record.taskDescription != null">
         task_description = #{record.taskDescription,jdbcType=LONGVARCHAR},
       </if>
@@ -336,6 +348,7 @@
       update_by = #{record.updateBy,jdbcType=VARCHAR},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       remark = #{record.remark,jdbcType=VARCHAR},
+      description = #{record.description,jdbcType=VARCHAR},
       task_description = #{record.taskDescription,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -358,7 +371,8 @@
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_by = #{record.updateBy,jdbcType=VARCHAR},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      remark = #{record.remark,jdbcType=VARCHAR}
+      remark = #{record.remark,jdbcType=VARCHAR},
+      description = #{record.description,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -411,6 +425,9 @@
       <if test="remark != null">
         remark = #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="description != null">
+        description = #{description,jdbcType=VARCHAR},
+      </if>
       <if test="taskDescription != null">
         task_description = #{taskDescription,jdbcType=LONGVARCHAR},
       </if>
@@ -434,6 +451,7 @@
       update_by = #{updateBy,jdbcType=VARCHAR},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       remark = #{remark,jdbcType=VARCHAR},
+      description = #{description,jdbcType=VARCHAR},
       task_description = #{taskDescription,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -453,7 +471,8 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_by = #{updateBy,jdbcType=VARCHAR},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      remark = #{remark,jdbcType=VARCHAR}
+      remark = #{remark,jdbcType=VARCHAR},
+      description = #{description,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>