20210224v1.1

tall/src/main/java/com/ccsens/tall/service/ITaskPluginService.java

@@ -85,4 +85,13 @@ public interface ITaskPluginService {
      * @return 返回文件的访问路径，下载路径和文件id
      */
     List<PluginVo.MinutesInfo> saveMinutesDay(Long currentUserId, PluginDto.GetMinutesDay getMinutesDay, String token) throws FileNotFoundException, Exception;
+
+    /**
+     * 打开Excel
+     * @param taskId 任务id
+     * @param token token
+     * @param currentUserId userId
+     * @return 返回excel路径
+     */
+    String openExcel(Long taskId, String token, Long currentUserId);
 }

tall/src/main/java/com/ccsens/tall/service/TaskPluginService.java

@@ -983,4 +983,15 @@ public class TaskPluginService implements ITaskPluginService{
             minutesInfoList.add(minutesInfo);
         });
     }
+
+    @Override
+    public String openExcel(Long taskId, String token, Long currentUserId) {
+        //查询此任务是否有关联的excel，有直接返回
+
+        //没有则新建一个空白excel
+        //关联wps
+        //查询wps路径并返回
+
+        return null;
+    }
 }

tall/src/main/java/com/ccsens/tall/web/PluginController.java

@@ -1,6 +1,7 @@
 package com.ccsens.tall.web;
 
 import com.ccsens.tall.bean.dto.PluginDto;
+import com.ccsens.tall.bean.dto.TaskDto;
 import com.ccsens.tall.bean.dto.WeekMeetingDto;
 import com.ccsens.tall.bean.vo.PluginVo;
 import com.ccsens.tall.bean.vo.TaskVo;
@@ -9,6 +10,7 @@ import com.ccsens.tall.service.ITaskPluginService;
 import com.ccsens.util.JsonResponse;
 import com.ccsens.util.WebConstant;
 import com.ccsens.util.annotation.OperateType;
+import com.ccsens.util.bean.dto.QueryDto;
 import io.jsonwebtoken.Claims;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
@@ -222,4 +224,18 @@ public class PluginController {
         log.info("生成每日会议纪要完成");
         return JsonResponse.newInstance().ok(wpsPath);
     }
+
+    @ApiOperation(value = "打开excel", notes = "")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value = "/openExcel", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<String> openExcel(HttpServletRequest request,@RequestParam(required = true) Long taskId) throws Exception {
+        log.info("打开excel：{}",taskId);
+        Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
+        String authHeader = request.getHeader(WebConstant.HEADER_KEY_TOKEN);
+        String token = authHeader.substring(WebConstant.HEADER_KEY_TOKEN_PREFIX.length());
+        String path = taskPluginService.openExcel(taskId,token,currentUserId);
+        log.info("excel的路径：{}",path);
+        return JsonResponse.newInstance().ok(path);
+    }
 }

tall/src/main/java/com/ccsens/tall/web/ProjectController.java

@@ -218,7 +218,7 @@ public class ProjectController {
     @ApiImplicitParams({
     })
     @RequestMapping(value = "/create", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse createProject(HttpServletRequest request,@RequestBody ProjectDto.CreateProject createProject) throws Exception {
+    public JsonResponse<ProjectVo.ProjectInfo> createProject(HttpServletRequest request,@RequestBody ProjectDto.CreateProject createProject) throws Exception {
         Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
         String authHeader = request.getHeader(WebConstant.HEADER_KEY_TOKEN);
         String token = authHeader.substring(WebConstant.HEADER_KEY_TOKEN_PREFIX.length());

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

@@ -98,22 +98,20 @@ public class QuestionVo {
         private String remark;
         @ApiModelProperty("记录类型 0：只记录1次数据，1：记录3次，分别为0,14,90天 ，2：记录两次，分别是180,365")
         private byte reportType;
-//        @ApiModelProperty("题目信息")
-//        private List<PatientQuestionNum> questionNums;
         @ApiModelProperty("题目信息")
         private List<PatientQuestion> questionVos;
         @ApiModelProperty("子类型")
-        private List<PatientCode> optionVos;
+        private List<PatientCode> subReportCodes;
     }
 
-    @Data
-    @ApiModel("患者多次答题信息")
-    public static class PatientQuestionNum {
-        @ApiModelProperty("第几次记录，默认为0代表第一次记录，14代表第14天记录的信息")
-        private Integer reportNums;
-        @ApiModelProperty("题目信息")
-        private List<PatientQuestion> questionList;
-    }
+//    @Data
+//    @ApiModel("患者多次答题信息")
+//    public static class PatientQuestionNum {
+//        @ApiModelProperty("第几次记录，默认为0代表第一次记录，14代表第14天记录的信息")
+//        private Integer reportNums;
+//        @ApiModelProperty("题目信息")
+//        private List<PatientQuestion> questionList;
+//    }
 
 
     @Data

tcm/src/main/resources/mapper_dao/ReportCodeDao.xml

@@ -96,7 +96,7 @@
         <result column="fSort" jdbcType="INTEGER" property="sort" />
         <result column="fRemark" jdbcType="VARCHAR" property="remark" />
         <result column="fReportType" jdbcType="TINYINT" property="reportType" />
-        <collection property="subCodes" ofType="com.ccsens.tcm.bean.vo.QuestionVo$PatientCode">
+        <collection property="subReportCodes" ofType="com.ccsens.tcm.bean.vo.QuestionVo$PatientCode">
             <id column="sId" jdbcType="BIGINT" property="id" />
             <result column="sCode" jdbcType="VARCHAR" property="code" />
             <result column="sName" jdbcType="VARCHAR" property="name" />

util/src/main/java/com/ccsens/util/JsonResponse.java

@@ -53,6 +53,9 @@ public class JsonResponse<T> {
     public static JsonResponse newInstance(){
         return new JsonResponse();
     }
+//    public static JsonResponse newInstance(Class T){
+//        return new JsonResponse<T>();
+//    }
 
     public JsonResponse ok(){
         this.code  = CodeEnum.SUCCESS.getCode();