修改bug

research-admin/src/main/java/com/research/web/controller/client/task/TaskController.java

@@ -19,6 +19,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 import static com.research.common.utils.PageUtils.startPage;
@@ -103,6 +104,12 @@ public class TaskController {
         return JsonResponse.ok(new PageInfo<>(result));
     }
 
+    @ApiOperation(value = "导出任务列表")
+    @PostMapping("/export")
+    public void exportTask(HttpServletResponse response, @ApiParam @Validated @RequestBody TaskDto.QueryTaskList params) {
+        taskService.exportTask(response, params, SecurityUtils.getUserId());
+    }
+
     @ApiOperation(value = "查询交付物列表")
     @PostMapping("/getDeliverableList")
     public JsonResponse<PageInfo<TaskVo.DeliverableInfo>> getDeliverableList(

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

@@ -8,8 +8,8 @@ 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: sdey18aA!
-#                password: csylcx18aA!
+#                password: sdey18aA!
+                password: csylcx18aA!
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

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

@@ -74,7 +74,7 @@
 <!--        <table tableName="prj_proj_document" domainObjectName="PrjProjDocument" enableDeleteByExample="false"/>-->
 <!--        <table tableName="prj_proj_info" domainObjectName="PrjProjInfo" enableDeleteByExample="false"/>-->
 <!--        <table tableName="prj_proj_org" domainObjectName="PrjProjOrg" enableDeleteByExample="false"/>-->
-<!--        <table tableName="kts_kt_group_member_aduit" domainObjectName="KtsKtGroupMemberAduit" enableDeleteByExample="false"/>-->
+        <table tableName="kts_kt_group_member_aduit" domainObjectName="KtsKtGroupMemberAduit" enableDeleteByExample="false"/>
 <!--        <table tableName="srv_message" domainObjectName="SrvMessage" enableDeleteByExample="false"/>-->
 <!--        <table tableName="shs_ckwx_category" domainObjectName="ShsCkwxCategory" enableDeleteByExample="false"/>-->
 <!--        <table tableName="shs_ckwx_info" domainObjectName="ShsCkwxInfo" enableDeleteByExample="false"/>-->

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

@@ -97,6 +97,9 @@ public class MemberAduitDto {
         @JsonFormat(pattern = "yyyy-MM-dd")
         private Date graduationTime;
 
+        @ApiModelProperty("在读状态  0在读硕士  1在读博士  2在读博士后 ")
+        private Byte readingStatus;
+
 //        @ApiModelProperty(value = "微信小程序的openId", example = "1001")
 //        private String openId;
 

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

@@ -1,5 +1,6 @@
 package com.research.system.domain.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -40,6 +41,7 @@ public class ShsResDeviceDto {
 
         private String deviceSn;
 
+        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
         private Date purchaseDate;
 
         private Date networkingDate;

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

@@ -74,6 +74,8 @@ public class KtsKtGroupMemberAduit implements Serializable {
 
     private Date graduationTime;
 
+    private Byte readingStatus;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -356,6 +358,14 @@ public class KtsKtGroupMemberAduit implements Serializable {
         this.graduationTime = graduationTime;
     }
 
+    public Byte getReadingStatus() {
+        return readingStatus;
+    }
+
+    public void setReadingStatus(Byte readingStatus) {
+        this.readingStatus = readingStatus;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -397,6 +407,7 @@ public class KtsKtGroupMemberAduit implements Serializable {
         sb.append(", ktGroupName=").append(ktGroupName);
         sb.append(", enrollTime=").append(enrollTime);
         sb.append(", graduationTime=").append(graduationTime);
+        sb.append(", readingStatus=").append(readingStatus);
         sb.append("]");
         return sb.toString();
     }

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

@@ -2354,6 +2354,66 @@ public class KtsKtGroupMemberAduitExample {
             addCriterion("graduation_time not between", value1, value2, "graduationTime");
             return (Criteria) this;
         }
+
+        public Criteria andReadingStatusIsNull() {
+            addCriterion("reading_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReadingStatusIsNotNull() {
+            addCriterion("reading_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReadingStatusEqualTo(Byte value) {
+            addCriterion("reading_status =", value, "readingStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andReadingStatusNotEqualTo(Byte value) {
+            addCriterion("reading_status <>", value, "readingStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andReadingStatusGreaterThan(Byte value) {
+            addCriterion("reading_status >", value, "readingStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andReadingStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("reading_status >=", value, "readingStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andReadingStatusLessThan(Byte value) {
+            addCriterion("reading_status <", value, "readingStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andReadingStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("reading_status <=", value, "readingStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andReadingStatusIn(List<Byte> values) {
+            addCriterion("reading_status in", values, "readingStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andReadingStatusNotIn(List<Byte> values) {
+            addCriterion("reading_status not in", values, "readingStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andReadingStatusBetween(Byte value1, Byte value2) {
+            addCriterion("reading_status between", value1, value2, "readingStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andReadingStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("reading_status not between", value1, value2, "readingStatus");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.research.system.domain.dto.GroupDto;
 import com.research.system.domain.po.PrjProjInfo;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -51,6 +52,8 @@ public class HomeVo {
         private Long orgId;
         private String completionPercentage = "0";
         private List<GroupVO.Result> groupList;
+        @ApiModelProperty("课题组数量")
+        private Integer groupNum;
     }
 
     @Data

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

@@ -48,6 +48,12 @@ public class MemberAduitVo {
 
         private Long projOrgId;
 
+        @ApiModelProperty(" 0申报单位   1合作单位")
+        private Byte projOrgType;
+
+        @ApiModelProperty("在读状态  0在读硕士  1在读博士  2在读博士后")
+        private Byte readingStatus;
+
         private String roleIdList;
 
         private String title;

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

@@ -3,6 +3,7 @@ package com.research.system.service;
 import com.research.system.domain.dto.TaskDto;
 import com.research.system.domain.vo.TaskVo;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -41,6 +42,8 @@ public interface ITaskService {
      */
     List<TaskVo.TaskInfo> queryTaskList(TaskDto.QueryTaskList param, Long userId);
 
+    void exportTask(HttpServletResponse response, TaskDto.QueryTaskList param, Long userId);
+
     /**
      * 查询交付物列表
      */

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

@@ -85,6 +85,7 @@ public class HomeServiceImpl implements HomeService {
                     }
                     if (CollUtil.isNotEmpty(results)) {
                         groupResult.setGroupList(results.stream().sorted(Comparator.comparing(GroupVO.Result::getSort)).collect(Collectors.toList()));
+                        groupResult.setGroupNum(results.size());
                     }
                 }
             }

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

@@ -264,6 +264,12 @@ public class KtsGroupServiceImpl implements KtsGroupService {
         KtsKtGroupWithBLOBs ktsKtGroup = new KtsKtGroupWithBLOBs();
         ktsKtGroup.setDelFlag((byte) 1);
         ktsKtGroupMapper.updateByExampleSelective(ktsKtGroup, ktsKtGroupExample);
+
+        //删除子级课题组
+        KtsKtGroupExample ktsKtGroupExample1 = new KtsKtGroupExample();
+        ktsKtGroupExample1.createCriteria().andParentKtIdIn(dto.getIdList());
+        ktsKtGroupMapper.updateByExampleSelective(ktsKtGroup, ktsKtGroupExample1);
+
     }
 
     @Override
@@ -375,6 +381,7 @@ public class KtsGroupServiceImpl implements KtsGroupService {
                 //如果用户已存在，直接关联该用户
                 ktsKtGroupMember.setUserId(sysUser.getUserId());
             }
+            ktsKtGroupMemberMapper.updateByPrimaryKeySelective(ktsKtGroupMember);
         }else {
             //检查课题组id，没有且课题组名称不为空，则创建课题组信息
             if (dto.getKtGroupId() == null && StrUtil.isNotEmpty(dto.getKtGroupName())) {

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

@@ -7,10 +7,7 @@ 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.MeetingDto;
-import com.research.system.domain.po.MetMeetingParticipant;
-import com.research.system.domain.po.MetMeetingParticipantExample;
-import com.research.system.domain.po.MetMeetingRecord;
-import com.research.system.domain.po.PrjProjInfo;
+import com.research.system.domain.po.*;
 import com.research.system.domain.vo.MeetingVo;
 import com.research.system.persist.dao.MeetingDao;
 import com.research.system.persist.mapper.MetMeetingParticipantMapper;
@@ -98,10 +95,10 @@ public class MeetingServiceImpl implements MeetingService {
 
     @Override
     public void del(CommonDto.DelDto dto) {
-        MetMeetingParticipantExample metMeetingParticipantExample = new MetMeetingParticipantExample();
-        metMeetingParticipantExample.createCriteria().andMeetingIdIn(dto.getIdList());
-        MetMeetingParticipant metMeetingParticipant = new MetMeetingParticipant();
+        MetMeetingRecordExample metMeetingRecordExample = new MetMeetingRecordExample();
+        metMeetingRecordExample.createCriteria().andIdIn(dto.getIdList());
+        MetMeetingRecord metMeetingParticipant = new MetMeetingRecord();
         metMeetingParticipant.setDelFlag((byte) 1);
-        metMeetingParticipantMapper.updateByExampleSelective(metMeetingParticipant, metMeetingParticipantExample);
+        metMeetingRecordMapper.updateByExampleSelective(metMeetingParticipant, metMeetingRecordExample);
     }
 }

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

@@ -71,7 +71,7 @@ public class OutcomeServiceImpl implements OutcomeService {
             if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
                 AchAchievement achAchievement1 = achAchievementMapper.selectByPrimaryKey(dto.getId());
                 if (!achAchievement1.getCreateBy().equals(SecurityUtils.getUsername())) {
-                    throw new BaseException("无权限修改");
+                    throw new BaseException("您只能修改自己创建的信息");
                 }
             }
 

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

@@ -82,7 +82,7 @@ public class ShsCkwxServiceImpl implements ShsCkwxService {
             if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
                 ShsCkwxInfo shsCkwxInfo1 = shsCkwxInfoMapper.selectByPrimaryKey(dto.getId());
                 if (!shsCkwxInfo1.getCreateBy().equals(SecurityUtils.getUsername())) {
-                    throw new BaseException("无权限修改");
+                    throw new BaseException("您只能修改自己创建的信息");
                 }
             }
             shsCkwxInfo.setUpdateBy(SecurityUtils.getUsername());

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

@@ -60,7 +60,7 @@ public class ShsSyffCategoryServiceImpl implements ShsSyffCategoryService {
             if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
                 ShsSyffInfo shsSyffInfo1 = shsSyffInfoMapper.selectByPrimaryKey(add.getId());
                 if (!shsSyffInfo1.getCreateBy().equals(SecurityUtils.getUsername())) {
-                    throw new BaseException("无权限修改");
+                    throw new BaseException("您只能修改自己创建的信息");
                 }
             }
             shsSyffInfo.setUpdateBy(SecurityUtils.getUsername());

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

@@ -2,15 +2,19 @@ package com.research.system.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.poi.excel.BigExcelWriter;
 import com.research.common.core.domain.entity.SysRole;
 import com.research.common.core.domain.model.LoginUser;
 import com.research.common.exception.ServiceException;
+import com.research.common.exception.base.BaseException;
 import com.research.common.utils.SecurityUtils;
 import com.research.system.domain.dto.TaskDto;
 import com.research.system.domain.po.*;
+import com.research.system.domain.vo.ClientPrjProjInfoVo;
 import com.research.system.domain.vo.TaskVo;
 import com.research.system.persist.dao.TaskDao;
 import com.research.system.persist.mapper.*;
@@ -22,6 +26,9 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -336,6 +343,72 @@ public class TaskServiceImpl implements ITaskService {
         return taskList;
     }
 
+    @Override
+    public void exportTask(HttpServletResponse response, TaskDto.QueryTaskList param, Long userId) {
+        List<TaskVo.TaskInfo> taskInfos = queryTaskList(param, userId);
+        if (CollUtil.isEmpty(taskInfos)) {
+            throw new BaseException("暂无数据");
+        }
+        BigExcelWriter writer = new BigExcelWriter();
+        List<String> header = new ArrayList<>();
+        header.add("序号");
+        header.add("课题组");
+        header.add("任务名称");
+        header.add("任务说明");
+        header.add("负责人");
+        header.add("优先级");
+        header.add("任务类型");
+        header.add("应交付物说明");
+        header.add("开始时间");
+        header.add("截止时间");
+        header.add("任务状态");
+        header.add("审核状态");
+        header.add("审核时间");
+        header.add("驳回原因");
+        header.add("创建人");
+        writer.writeHeadRow(header);
+        int row = 0;
+        for (int i = 0; i < taskInfos.size(); i++) {
+            row += 1;
+            writer.writeCellValue(0, row, row);
+            writer.writeCellValue(1, row, taskInfos.get(i).getKtGroupName());
+            writer.writeCellValue(2, row, taskInfos.get(i).getTaskName());
+            writer.writeCellValue(3, row, taskInfos.get(i).getTaskDescription());
+            writer.writeCellValue(4, row, taskInfos.get(i).getMemberNames());
+            writer.writeCellValue(5, row, taskInfos.get(i).getPriority() == null ? null : taskInfos.get(i).getPriority() == 1 ? "低" : taskInfos.get(i).getPriority() == 2 ? "中" : "高");
+            writer.writeCellValue(6, row, taskInfos.get(i).getTaskTypeName());
+            writer.writeCellValue(7, row, taskInfos.get(i).getDescription());
+            writer.writeCellValue(8, row, DateUtil.format(taskInfos.get(i).getStartTime(), "yyyy-MM-dd HH:mm"));
+            writer.writeCellValue(9, row, DateUtil.format(taskInfos.get(i).getEndTime(), "yyyy-MM-dd HH:mm"));
+            writer.writeCellValue(10, row, taskInfos.get(i).getTaskStatusName());
+            writer.writeCellValue(11, row, taskInfos.get(i).getAuditStatusName());
+            writer.writeCellValue(12, row, DateUtil.format(taskInfos.get(i).getAuditTime(), "yyyy-MM-dd HH:mm"));
+            writer.writeCellValue(13, row, taskInfos.get(i).getRejectReason());
+            writer.writeCellValue(14, row, taskInfos.get(i).getCreateBy());
+        }
+
+
+        String filename = StrUtil.format("任务管理-{}.xlsx", DateUtil.date().toString("yyyyMMdd"));
+
+        //response为HttpServletResponse对象
+        response.setContentType("application/vnd.ms-excel;charset=utf-8");
+        //test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码
+        response.setHeader("Content-Disposition", "attachment;filename=" + filename);
+        ServletOutputStream out = null;
+        try {
+            out = response.getOutputStream();
+            writer.flush(out);
+        } catch (
+                IOException e) {
+            e.printStackTrace();
+        } finally {
+            // 关闭writer，释放内存
+            writer.close();
+            //此处记得关闭输出Servlet流
+            IoUtil.close(out);
+        }
+    }
+
     private void setPriorityName(TaskVo.TaskInfo task) {
         if (task.getPriority() == null) return;
         switch (task.getPriority()) {

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

@@ -241,7 +241,7 @@
         from prj_proj_org o
                  left join
              kts_kt_group g on g.proj_org_id = o.id and g.del_flag = 0
-                 LEFT JOIN kts_kt_group_member m on m.kt_group_id = g.id
+                 LEFT JOIN kts_kt_group_member m on m.kt_group_id = g.id and m.del_flag = 0
         where o.del_flag = 0
         group by o.id
     </select>

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

@@ -53,7 +53,7 @@
         <if test="dto.ktGroupId != null">
             and r.kt_group_id = #{dto.ktGroupId}
         </if>
-
+        order by r.id desc
     </select>
 
     <select id="selectByMeetingId" resultType="com.research.system.domain.vo.MeetingVo$ParticipantResult">

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

@@ -58,8 +58,10 @@
             po.org_name as projOrgName,
             a.reviewed_persion as reviewedPersion,
             a.reviewed_time as reviewedTime,
+        a.reading_status as readingStatus,
             u.nick_name as reviewedPersionName,
-            g1.kt_group_name as parentKtIdName
+            g1.kt_group_name as parentKtIdName,
+            po.category as projOrgType
         FROM
             kts_kt_group_member_aduit a
                 left join sys_dict_data d1 on d1.dict_value = a.qualification and d1.dict_type = 'qualification'

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

@@ -37,6 +37,7 @@
     <result column="kt_group_name" jdbcType="VARCHAR" property="ktGroupName" />
     <result column="enroll_time" jdbcType="TIMESTAMP" property="enrollTime" />
     <result column="graduation_time" jdbcType="TIMESTAMP" property="graduationTime" />
+    <result column="reading_status" jdbcType="TINYINT" property="readingStatus" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -101,7 +102,7 @@
     member_gender, member_name, member_phone, parent_member_id, password, proj_org_id, 
     role_id_list, title, type, user_id, username, del_flag, create_by, create_time, update_by, 
     update_time, remark, step, status, reviewer, qualification, reviewed_persion, reviewed_time, 
-    parent_kt_id, kt_group_name, enroll_time, graduation_time
+    parent_kt_id, kt_group_name, enroll_time, graduation_time, reading_status
   </sql>
   <select id="selectByExample" parameterType="com.research.system.domain.po.KtsKtGroupMemberAduitExample" resultMap="BaseResultMap">
     select
@@ -139,7 +140,8 @@
       remark, step, status, 
       reviewer, qualification, reviewed_persion, 
       reviewed_time, parent_kt_id, kt_group_name, 
-      enroll_time, graduation_time)
+      enroll_time, graduation_time, reading_status
+      )
     values (#{id,jdbcType=BIGINT}, #{openId,jdbcType=VARCHAR}, #{category,jdbcType=TINYINT}, 
       #{deptId,jdbcType=BIGINT}, #{ktGroupId,jdbcType=BIGINT}, #{ktGroupIntro,jdbcType=VARCHAR}, 
       #{memberBirth,jdbcType=TIMESTAMP}, #{memberEmail,jdbcType=VARCHAR}, #{memberGender,jdbcType=TINYINT}, 
@@ -151,7 +153,8 @@
       #{remark,jdbcType=VARCHAR}, #{step,jdbcType=TINYINT}, #{status,jdbcType=TINYINT}, 
       #{reviewer,jdbcType=VARCHAR}, #{qualification,jdbcType=INTEGER}, #{reviewedPersion,jdbcType=BIGINT}, 
       #{reviewedTime,jdbcType=TIMESTAMP}, #{parentKtId,jdbcType=BIGINT}, #{ktGroupName,jdbcType=VARCHAR}, 
-      #{enrollTime,jdbcType=TIMESTAMP}, #{graduationTime,jdbcType=TIMESTAMP})
+      #{enrollTime,jdbcType=TIMESTAMP}, #{graduationTime,jdbcType=TIMESTAMP}, #{readingStatus,jdbcType=TINYINT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.research.system.domain.po.KtsKtGroupMemberAduit">
     insert into kts_kt_group_member_aduit
@@ -261,6 +264,9 @@
       <if test="graduationTime != null">
         graduation_time,
       </if>
+      <if test="readingStatus != null">
+        reading_status,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -368,6 +374,9 @@
       <if test="graduationTime != null">
         #{graduationTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="readingStatus != null">
+        #{readingStatus,jdbcType=TINYINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.research.system.domain.po.KtsKtGroupMemberAduitExample" resultType="java.lang.Long">
@@ -484,6 +493,9 @@
       <if test="record.graduationTime != null">
         graduation_time = #{record.graduationTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.readingStatus != null">
+        reading_status = #{record.readingStatus,jdbcType=TINYINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -525,7 +537,8 @@
       parent_kt_id = #{record.parentKtId,jdbcType=BIGINT},
       kt_group_name = #{record.ktGroupName,jdbcType=VARCHAR},
       enroll_time = #{record.enrollTime,jdbcType=TIMESTAMP},
-      graduation_time = #{record.graduationTime,jdbcType=TIMESTAMP}
+      graduation_time = #{record.graduationTime,jdbcType=TIMESTAMP},
+      reading_status = #{record.readingStatus,jdbcType=TINYINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -635,6 +648,9 @@
       <if test="graduationTime != null">
         graduation_time = #{graduationTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="readingStatus != null">
+        reading_status = #{readingStatus,jdbcType=TINYINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -673,7 +689,8 @@
       parent_kt_id = #{parentKtId,jdbcType=BIGINT},
       kt_group_name = #{ktGroupName,jdbcType=VARCHAR},
       enroll_time = #{enrollTime,jdbcType=TIMESTAMP},
-      graduation_time = #{graduationTime,jdbcType=TIMESTAMP}
+      graduation_time = #{graduationTime,jdbcType=TIMESTAMP},
+      reading_status = #{readingStatus,jdbcType=TINYINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

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

@@ -127,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
 	    <include refid="selectUserVo"/>
-		where u.user_name = #{userName} and u.del_flag = '0'
+		where u.user_name = #{userName} and u.del_flag = '0' order by id limit 1
 	</select>
 	
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">