上传审批列表（2023.3.25）

CarbonSysBE1/src/main/java/edu/ncst/carbon/controller/task/TaskAuditController.java

@@ -10,6 +10,7 @@ import edu.ncst.carbon.utils.SessionUtils;
 import edu.ncst.carbon.vo.ListResultVO;
 import edu.ncst.carbon.vo.Query;
 import edu.ncst.carbon.vo.ResultVO;
+import edu.ncst.carbon.vo.task.TaskAuditDetail;
 import edu.ncst.carbon.vo.user.UserInfoVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -27,6 +28,7 @@ import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.util.List;
 
 @Api(description = "任务审核管理", tags = "TaskAuditController")
 @RestController
@@ -130,4 +132,11 @@ public class TaskAuditController {
         return ResultUtils.success("ok", result);
     }
 
+
+    @ApiOperation("获取用户审核任务列表")
+    @GetMapping("/listByUserId")
+    public ResultVO<List<TaskAudit>> getTaskAuditListByUserId(HttpServletResponse response) throws IOException {
+        List<TaskAudit> TaskAuditList = taskAuditService.getTaskAuditListByUserId();
+        return ResultUtils.success("ok", TaskAuditList);
+    }
 }

CarbonSysBE1/src/main/java/edu/ncst/carbon/mapper/task/TaskAuditMapper.java

@@ -1,10 +1,13 @@
 package edu.ncst.carbon.mapper.task;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import edu.ncst.carbon.model.task.Task;
 import edu.ncst.carbon.model.task.TaskAudit;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * 任务审核 Mapper 接口
  */

CarbonSysBE1/src/main/java/edu/ncst/carbon/model/task/TaskAudit.java

@@ -29,6 +29,9 @@ public class TaskAudit implements Serializable {
     @ApiModelProperty(value = "审核图片id")
     private Integer imageId;
 
+    @ApiModelProperty(value = "审核图片id")
+    private String imageUrl;
+
     @ApiModelProperty(value = "审核文本")
     private String text;
 
@@ -42,7 +45,7 @@ public class TaskAudit implements Serializable {
     private Integer createUserId;
 
     @ApiModelProperty(value = "创建用户时间")
-    private Integer createTime;
+    private Date createTime;
 
     @ApiModelProperty(value = "审核者id")
     private Integer auditUserId;

CarbonSysBE1/src/main/java/edu/ncst/carbon/service/ITaskAuditService.java

@@ -5,10 +5,14 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import edu.ncst.carbon.model.task.TaskAudit;
 import edu.ncst.carbon.vo.ListResultVO;
 import edu.ncst.carbon.vo.Query;
+import edu.ncst.carbon.vo.ResultVO;
+import edu.ncst.carbon.vo.task.TaskAuditDetail;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * 任务审核  服务类
@@ -28,4 +32,5 @@ public interface ITaskAuditService extends IService<TaskAudit>{
 
     TaskAudit audit(Integer taskAuditId,  Boolean yesNo);
 
+    List<TaskAudit> getTaskAuditListByUserId() throws IOException;
 }

CarbonSysBE1/src/main/java/edu/ncst/carbon/service/impl/task/TaskAuditServiceImpl.java

@@ -26,10 +26,14 @@ import edu.ncst.carbon.utils.ImageUtils;
 import edu.ncst.carbon.utils.SessionUtils;
 import edu.ncst.carbon.vo.ListResultVO;
 import edu.ncst.carbon.vo.Query;
+import edu.ncst.carbon.vo.ResultVO;
+import edu.ncst.carbon.vo.task.TaskAuditDetail;
 import edu.ncst.carbon.vo.user.UserInfoVO;
 import edu.ncst.carbon.vo.wechat.SportDay;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
@@ -39,8 +43,12 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletRequest;
+import java.awt.image.BufferedImage;
+import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -52,6 +60,9 @@ import java.util.List;
 @Slf4j
 public class TaskAuditServiceImpl extends ServiceImpl<TaskAuditMapper, TaskAudit> implements ITaskAuditService {
 
+    // 读取配置文件中上传路径
+    @Value("${file.file-dir}")
+    String imagePath;
 
     @Autowired
     private ImageServiceImpl imageService;
@@ -206,9 +217,11 @@ public class TaskAuditServiceImpl extends ServiceImpl<TaskAuditMapper, TaskAudit
 
             TaskAudit taskAudit = new TaskAudit();
             taskAudit.setImageId(auditImage.get(0).getId());
+            taskAudit.setImageUrl(auditImage.get(0).getImgUrl());
             taskAudit.setCreateUserId(currentUser.getId());
-            Date date = new Date(System.currentTimeMillis());
+//            Date date = new Date(System.currentTimeMillis());
-            taskAudit.setAuditTime(date);
+//            taskAudit.setAuditTime(date);
+            taskAudit.setCreateTime(new Date());
             taskAudit.setText(text);
             taskAudit.setStatus("1");
             taskAudit.setIntegral(integral);
@@ -218,7 +231,6 @@ public class TaskAuditServiceImpl extends ServiceImpl<TaskAuditMapper, TaskAudit
             taskAudit.setEmission(integral*carFormula.getEmission());
             taskAuditMapper.insert(taskAudit);
         }
-
 //        // 上传用户日志
 //        LogUserFootprint logUserFootprint = new LogUserFootprint();
 //        logUserFootprint.setUserId(currentUser.getId());
@@ -250,8 +262,7 @@ public class TaskAuditServiceImpl extends ServiceImpl<TaskAuditMapper, TaskAudit
 
         // 更新任务状态
         taskAudit.setAuditUserId(SessionUtils.getCurrentUser().getId());
-        Date date = new Date(System.currentTimeMillis());
+        taskAudit.setAuditTime(new Date());
-        taskAudit.setAuditTime(date);
 
         int update = taskAuditMapper.updateById(taskAudit);
 
@@ -262,30 +273,20 @@ public class TaskAuditServiceImpl extends ServiceImpl<TaskAuditMapper, TaskAudit
         }
     }
 
-
+    public List<TaskAudit> getTaskAuditListByUserId() throws IOException {
-    public TaskAudit confirmAudit(@RequestParam Integer taskAuditId){
-        TaskAudit taskAudit = taskAuditMapper.selectById(taskAuditId);
-        taskAudit.setStatus("0");
-        taskAuditMapper.updateById(taskAudit);
-
-        // 上传用户当前信息
         UserInfoVO currentUser = SessionUtils.getCurrentUser();
-
+        QueryWrapper<TaskAudit> queryWrapper = new QueryWrapper<>();
-        QueryWrapper<LogUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("create_user_id", currentUser.getId());
-        queryWrapper.eq("user_id", currentUser.getId());
+        List<TaskAudit> taskAuditList = taskAuditMapper.selectList(queryWrapper);
-        LogUser logUser = logUserMapper.selectList(queryWrapper).get(0);
+
-
+        /*List<TaskAuditDetail> result = new ArrayList<>();
-        logUser.setIntegralTotal( logUser.getIntegralTotal() + taskAudit.getIntegral());
+        for(TaskAudit item: taskAuditList){
-        logUser.setEmissionTotal( logUser.getEmissionTotal() + taskAudit.getEmission());
+            TaskAuditDetail taskAuditDetail = new TaskAuditDetail();
-        logUser.setAuditingTaskTotal( logUser.getAuditingTaskTotal() -1);
+            BeanUtils.copyProperties(item, taskAuditDetail);
-
+            BufferedImage image = ImageIO.read(new File(imagePath + "/" + item.getTaskName()+currentUser.getUsername()));
-
+            taskAuditDetail.setImage(image);
-        UpdateWrapper<LogUser> updateWrapper = new UpdateWrapper<>();
+            result.add(taskAuditDetail);
-        queryWrapper.eq("user_id", currentUser.getId());
+        }*/
-        int update = logUserMapper.update(logUser, updateWrapper);
+        return taskAuditList;
-
-
-        return taskAudit;
-
     }
 }

CarbonSysBE1/src/main/java/edu/ncst/carbon/vo/task/TaskAuditDetail.java

@@ -0,0 +1,22 @@
+package edu.ncst.carbon.vo.task;
+
+import lombok.Data;
+
+import java.awt.image.BufferedImage;
+import java.util.Date;
+
+@Data
+public class TaskAuditDetail {
+
+    private Integer id;
+
+    private Integer integral;
+
+    private Date createTime;
+
+    private String status;
+
+    private String taskName;
+
+    BufferedImage image;
+}