Merge branch 'master' of http://47.100.37.243:10080/wutt/lsappBms

pcbms/src/main/java/com/hssx/pcbms/constant/Constant.java

@@ -1,5 +1,8 @@
 package com.hssx.pcbms.constant;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Author: 吴涛涛
  * Date : 2019 - 07 - 24 16:00
@@ -30,5 +33,4 @@ public class Constant {
     public static final String TASK_COMPLETED= "已完成";
     public static final String TASK_NO_PASS= "未通过";
     public static final String TASK_PULISH= "发布任务";
-
 }

pcbms/src/main/java/com/hssx/pcbms/controller/TaskExamineController.java

@@ -34,12 +34,13 @@ public class TaskExamineController {
      * 审核结果的发布
      * 发布时参数：
      * publisherId:发布审核结果的人
-     * publishContent:的内容
+     * publishContent:发布的内容
      * taskId:任务id
      * 回复时的参数：
      * responderId:回复者的id
+     * respondContent:回复内容
      * isPass:是否通过1-不通过，2-通过
-     * score:评分（只有isPass=1时才传该参数）
+     * score:评分（只有isPass=2时才传该参数）
      */
     @ApiOperation(value = "审核结果的发布/修改", notes = "审核结果的发布/修改方法")
     @RequestMapping("/addOrUpdate")
@@ -52,7 +53,7 @@ public class TaskExamineController {
     /**
      * 审核结果列表
      * 参数：
-     * taskId:任务id,pageNum:当前页，pageSize：每页多少条
+     * taskId:任务id,pageNum:当前页，pageSize:每页多少条
      * @return
      */
     @ApiOperation(value = "审核结果列表", notes = "审核结果列表方法")

pcbms/src/main/java/com/hssx/pcbms/entity/Goods.java

@@ -1,6 +1,7 @@
 package com.hssx.pcbms.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;

pcbms/src/main/java/com/hssx/pcbms/entity/TaskFile.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -53,6 +55,7 @@ public class TaskFile extends Model<TaskFile> {
      * 文件保存的日期
      */
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**

pcbms/src/main/java/com/hssx/pcbms/service/impl/TaskExamineServiceImpl.java

@@ -90,7 +90,7 @@ public class TaskExamineServiceImpl extends ServiceImpl<TaskExamineMapper, TaskE
     public HttpRespMsg getList(PageUtil page, String taskId) {
         HttpRespMsg msg = new HttpRespMsg();
         PageHelper.startPage(page.getPageNum(),page.getPageSize());
-        List<TaskExamine> list = taskExamineMapper.selectList(new QueryWrapper<TaskExamine>().eq("task_id", taskId));
+        List<TaskExamine> list = taskExamineMapper.selectList(new QueryWrapper<TaskExamine>().eq("task_id", taskId).orderByDesc("publish_date"));
         PageInfo<TaskExamine> pageInfo = new PageInfo<>(list);
         msg.data = pageInfo;
         return msg;