会议记录表关联任务id

signin/src/main/java/com/ccsens/signin/intercept/MybatisInterceptor.java

@@ -1,4 +1,4 @@
-package com.ccsens.wisdomcar.intercept;
+package com.ccsens.signin.intercept;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.ccsens.util.WebConstant;

tcm/src/main/java/com/ccsens/tcm/api/ConferenceRecordsController.java

@@ -53,7 +53,7 @@ public class ConferenceRecordsController {
     @RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<ConRecVo.SelConRecVo> saveConference(@ApiParam @Validated @RequestBody QueryDto<ConRecDto.SaveConference> params) {
         log.info("统计每个医院的完成情况：{}",params);
-        ConRecVo.SelConRecVo saveConference = conferenceService.saveConference(params.getParam());
+        ConRecVo.SelConRecVo saveConference = conferenceService.saveConference(params.getParam(),params.getUserId());
         log.info("查找每个医院的病例完成情况");
         return JsonResponse.newInstance().ok(saveConference);
     }
@@ -61,10 +61,20 @@ public class ConferenceRecordsController {
     @MustLogin
     @ApiOperation(value = "分享会议记录", notes = "zy:")
     @RequestMapping(value = "/share", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<ConRecVo.ShareConRecVo> shareConference(@ApiParam @Validated @RequestBody QueryDto params) throws Exception {
+    public JsonResponse<ConRecVo.ShareConRecVo> shareConference(@ApiParam @Validated @RequestBody QueryDto<ConRecDto.ConferenceTask> params) throws Exception {
         log.info("统计每个医院的完成情况：{}",params);
         ConRecVo.ShareConRecVo shareConference = conferenceService.shareConference(params.getParam());
         log.info("查找每个医院的病例完成情况");
         return JsonResponse.newInstance().ok(shareConference);
     }
+
+    @MustLogin
+    @ApiOperation(value = "查看会议记录", notes = "zy:")
+    @RequestMapping(value = "/get", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<ConRecVo.SelConRecVo> getConference(@ApiParam @Validated @RequestBody QueryDto<ConRecDto.ConferenceTask> params) throws Exception {
+        log.info("统计每个医院的完成情况：{}",params);
+        ConRecVo.SelConRecVo selConRecVo = conferenceService.getConference(params.getParam());
+        log.info("查找每个医院的病例完成情况");
+        return JsonResponse.newInstance().ok(selConRecVo);
+    }
 }

tcm/src/main/java/com/ccsens/tcm/bean/dto/ConRecDto.java

@@ -7,6 +7,7 @@ import lombok.Data;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -41,8 +42,11 @@ public class ConRecDto {
     }
 
     @Data
-    @ApiModel("查询会议记录搜索条件")
+    @ApiModel("添加会议记录")
     public static class SaveConference {
+        @NotNull(message = "任务id不能为空")
+        @ApiModelProperty("任务id")
+        private Long taskId;
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         @ApiModelProperty("开始时间")
         private Date startTime;
@@ -55,9 +59,17 @@ public class ConRecDto {
         private String host;
         @ApiModelProperty("'参会人'")
         private String participants;
-        @ApiModelProperty("内容")
+        @ApiModelProperty("研讨内容")
         private String discussionContent;
-        @ApiModelProperty("内容")
+        @ApiModelProperty("会议纪要")
         private String meetingMinutes;
     }
+
+    @Data
+    @ApiModel("会议关联的任务id")
+    public static class ConferenceTask {
+        @NotNull(message = "任务id不能为空")
+        @ApiModelProperty("任务id")
+        private Long taskId;
+    }
 }

tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecords.java

@@ -6,6 +6,8 @@ import java.util.Date;
 public class ConferenceRecords implements Serializable {
     private Long id;
 
+    private Long taskId;
+
     private Date startTime;
 
     private Date endTime;
@@ -38,6 +40,14 @@ public class ConferenceRecords implements Serializable {
         this.id = id;
     }
 
+    public Long getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(Long taskId) {
+        this.taskId = taskId;
+    }
+
     public Date getStartTime() {
         return startTime;
     }
@@ -133,6 +143,7 @@ public class ConferenceRecords implements Serializable {
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
+        sb.append(", taskId=").append(taskId);
         sb.append(", startTime=").append(startTime);
         sb.append(", endTime=").append(endTime);
         sb.append(", place=").append(place);

tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecordsExample.java

@@ -165,6 +165,66 @@ public class ConferenceRecordsExample {
             return (Criteria) this;
         }
 
+        public Criteria andTaskIdIsNull() {
+            addCriterion("task_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdIsNotNull() {
+            addCriterion("task_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdEqualTo(Long value) {
+            addCriterion("task_id =", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotEqualTo(Long value) {
+            addCriterion("task_id <>", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdGreaterThan(Long value) {
+            addCriterion("task_id >", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("task_id >=", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLessThan(Long value) {
+            addCriterion("task_id <", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLessThanOrEqualTo(Long value) {
+            addCriterion("task_id <=", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdIn(List<Long> values) {
+            addCriterion("task_id in", values, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotIn(List<Long> values) {
+            addCriterion("task_id not in", values, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdBetween(Long value1, Long value2) {
+            addCriterion("task_id between", value1, value2, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotBetween(Long value1, Long value2) {
+            addCriterion("task_id not between", value1, value2, "taskId");
+            return (Criteria) this;
+        }
+
         public Criteria andStartTimeIsNull() {
             addCriterion("start_time is null");
             return (Criteria) this;

tcm/src/main/java/com/ccsens/tcm/bean/vo/ConRecVo.java

@@ -17,6 +17,8 @@ public class ConRecVo {
     public static class SelConRecVo {
         @ApiModelProperty("会议记录id")
         private Long id;
+        @ApiModelProperty("任务id")
+        private Long taskId;
         @ApiModelProperty("会议开始时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private Date startTime;

tcm/src/main/java/com/ccsens/tcm/service/ConferenceService.java

@@ -1,6 +1,7 @@
 package com.ccsens.tcm.service;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Snowflake;
 import com.ccsens.tcm.bean.dto.ConRecDto;
 import com.ccsens.tcm.bean.po.ConferenceRecords;
@@ -16,6 +17,8 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author 逗
@@ -30,10 +33,11 @@ public class ConferenceService implements IConferenceService{
     private ConferenceRecordsMapper conferenceRecordsMapper;
 
     @Override
-    public ConRecVo.SelConRecVo saveConference(ConRecDto.SaveConference param) {
+    public ConRecVo.SelConRecVo saveConference(ConRecDto.SaveConference param,Long userId) {
         //新建会议记录对象
         ConferenceRecords conferenceRecords = new ConferenceRecords();
         conferenceRecords.setId(snowflake.nextId());
+        conferenceRecords.setUserId(userId);
         BeanUtil.copyProperties(param,conferenceRecords);
         //加入数据库
         conferenceRecordsMapper.insertSelective(conferenceRecords);
@@ -44,7 +48,7 @@ public class ConferenceService implements IConferenceService{
     }
 
     @Override
-    public ConRecVo.ShareConRecVo shareConference(Object param) throws Exception {
+    public ConRecVo.ShareConRecVo shareConference(ConRecDto.ConferenceTask param) throws Exception {
         //TODO 获取会议记录的地址
         String conferencePath = "www.baidu.com";
         //生成二维码
@@ -54,4 +58,16 @@ public class ConferenceService implements IConferenceService{
         shareConRecVo.setPath(PropUtil.imgDomain + fileName);
         return shareConRecVo;
     }
+
+    @Override
+    public ConRecVo.SelConRecVo getConference(ConRecDto.ConferenceTask param) {
+        ConRecVo.SelConRecVo selConRecVo = new ConRecVo.SelConRecVo();
+        ConferenceRecordsExample conferenceRecordsExample = new ConferenceRecordsExample();
+        conferenceRecordsExample.createCriteria().andTaskIdEqualTo(param.getTaskId());
+        List<ConferenceRecords> conferenceRecordsList = conferenceRecordsMapper.selectByExample(conferenceRecordsExample);
+        if(CollectionUtil.isNotEmpty(conferenceRecordsList)){
+            BeanUtil.copyProperties(conferenceRecordsList.get(0),selConRecVo);
+        }
+        return selConRecVo;
+    }
 }

tcm/src/main/java/com/ccsens/tcm/service/IConferenceService.java

@@ -7,14 +7,22 @@ public interface IConferenceService {
     /**
      * 添加会议记录
      * @param param 会议内容
+     * @param userId userId
      * @return 返回会议内容
      */
-    ConRecVo.SelConRecVo saveConference(ConRecDto.SaveConference param);
+    ConRecVo.SelConRecVo saveConference(ConRecDto.SaveConference param,Long userId);
 
     /**
      * 分享会议记录
-     * @param param
+     * @param param 任务id
      * @return 返回二维码路径
      */
-    ConRecVo.ShareConRecVo shareConference(Object param) throws Exception;
+    ConRecVo.ShareConRecVo shareConference(ConRecDto.ConferenceTask param) throws Exception;
+
+    /**
+     * 查看会议记录
+     * @param param 任务id
+     * @return 返回会议内容
+     */
+    ConRecVo.SelConRecVo getConference(ConRecDto.ConferenceTask param);
 }

tcm/src/main/resources/mapper_raw/ConferenceRecordsMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.ccsens.tcm.persist.mapper.ConferenceRecordsMapper">
   <resultMap id="BaseResultMap" type="com.ccsens.tcm.bean.po.ConferenceRecords">
     <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="task_id" jdbcType="BIGINT" property="taskId" />
     <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
     <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
     <result column="place" jdbcType="VARCHAR" property="place" />
@@ -74,8 +75,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, start_time, end_time, place, host, participants, discussion_content, meeting_minutes, 
-    user_id, created_at, update_at, rec_status
+    id, task_id, start_time, end_time, place, host, participants, discussion_content, 
+    meeting_minutes, user_id, created_at, update_at, rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.tcm.bean.po.ConferenceRecordsExample" resultMap="BaseResultMap">
     select
@@ -108,24 +109,26 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.ccsens.tcm.bean.po.ConferenceRecords">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into t_conference_records (start_time, end_time, place, 
-      host, participants, discussion_content, 
-      meeting_minutes, user_id, created_at, 
-      update_at, rec_status)
-    values (#{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{place,jdbcType=VARCHAR}, 
-      #{host,jdbcType=VARCHAR}, #{participants,jdbcType=VARCHAR}, #{discussionContent,jdbcType=VARCHAR}, 
-      #{meetingMinutes,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, 
-      #{updateAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
+    insert into t_conference_records (id, task_id, start_time, 
+      end_time, place, host, 
+      participants, discussion_content, meeting_minutes, 
+      user_id, created_at, update_at, 
+      rec_status)
+    values (#{id,jdbcType=BIGINT}, #{taskId,jdbcType=BIGINT}, #{startTime,jdbcType=TIMESTAMP}, 
+      #{endTime,jdbcType=TIMESTAMP}, #{place,jdbcType=VARCHAR}, #{host,jdbcType=VARCHAR}, 
+      #{participants,jdbcType=VARCHAR}, #{discussionContent,jdbcType=VARCHAR}, #{meetingMinutes,jdbcType=VARCHAR}, 
+      #{userId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updateAt,jdbcType=TIMESTAMP}, 
+      #{recStatus,jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.tcm.bean.po.ConferenceRecords">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
     insert into t_conference_records
     <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="taskId != null">
+        task_id,
+      </if>
       <if test="startTime != null">
         start_time,
       </if>
@@ -161,6 +164,12 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="taskId != null">
+        #{taskId,jdbcType=BIGINT},
+      </if>
       <if test="startTime != null">
         #{startTime,jdbcType=TIMESTAMP},
       </if>
@@ -208,6 +217,9 @@
       <if test="record.id != null">
         id = #{record.id,jdbcType=BIGINT},
       </if>
+      <if test="record.taskId != null">
+        task_id = #{record.taskId,jdbcType=BIGINT},
+      </if>
       <if test="record.startTime != null">
         start_time = #{record.startTime,jdbcType=TIMESTAMP},
       </if>
@@ -249,6 +261,7 @@
   <update id="updateByExample" parameterType="map">
     update t_conference_records
     set id = #{record.id,jdbcType=BIGINT},
+      task_id = #{record.taskId,jdbcType=BIGINT},
       start_time = #{record.startTime,jdbcType=TIMESTAMP},
       end_time = #{record.endTime,jdbcType=TIMESTAMP},
       place = #{record.place,jdbcType=VARCHAR},
@@ -267,6 +280,9 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.tcm.bean.po.ConferenceRecords">
     update t_conference_records
     <set>
+      <if test="taskId != null">
+        task_id = #{taskId,jdbcType=BIGINT},
+      </if>
       <if test="startTime != null">
         start_time = #{startTime,jdbcType=TIMESTAMP},
       </if>
@@ -305,7 +321,8 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.ccsens.tcm.bean.po.ConferenceRecords">
     update t_conference_records
-    set start_time = #{startTime,jdbcType=TIMESTAMP},
+    set task_id = #{taskId,jdbcType=BIGINT},
+      start_time = #{startTime,jdbcType=TIMESTAMP},
       end_time = #{endTime,jdbcType=TIMESTAMP},
       place = #{place,jdbcType=VARCHAR},
       host = #{host,jdbcType=VARCHAR},