近一周问题列表

project-zcustom/src/main/java/com/project/zcustom/controller/engineering/PlatProjectCheckController.java

@@ -1,7 +1,9 @@
 package com.project.zcustom.controller.engineering;
 
+import com.project.common.config.ProjectConfig;
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
+import com.project.common.utils.file.FileUploadUtils;
 import com.project.zcustom.domain.addional.LargeIssue;
 import com.project.zcustom.domain.addional.LargePlan;
 import com.project.zcustom.service.unit.ILargeIssueService;
@@ -78,8 +80,10 @@ public class PlatProjectCheckController extends BaseController {
      * 近一周问题列表
      */
     @GetMapping("/getIssueListLastWeek/{appOrg}")
-    public AjaxResult getIssueListLastWeek(@PathVariable String appOrg, @RequestParam(required = false, name = "day") Date day) {
-        return AjaxResult.success("查询成功", largeIssueService.getIssueListLastWeek(appOrg, day));
+    public AjaxResult getIssueListLastWeek(@PathVariable String appOrg,
+                                           @RequestParam(required = false, name = "day") Date day,
+                                           @RequestParam(required = false, name = "status") Integer status) {
+        return AjaxResult.success("查询成功", largeIssueService.getIssueListLastWeek(appOrg, day,status));
     }
 
     /**
@@ -94,7 +98,15 @@ public class PlatProjectCheckController extends BaseController {
      * 更改问题状态
      * */
     @PostMapping("/changeIssueStatus")
-    public AjaxResult changeIssueStatus(@RequestPart("issue") LargeIssue entity, @RequestPart(value = "file") MultipartFile multipartFile) {
+    public AjaxResult changeIssueStatus(@RequestPart("issue") LargeIssue entity, @RequestPart(value = "file") MultipartFile file) {
+        try {
+            // 上传文件路径
+            String filePath = ProjectConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String fileName = FileUploadUtils.upload(filePath, file);
+            entity.setImagePath(fileName);
+        }catch (Exception e){
+        }
         return toAjax(largeIssueService.updateById(entity));
     }
 
@@ -106,13 +118,13 @@ public class PlatProjectCheckController extends BaseController {
         if (!multipartFile.isEmpty()) {
             try {
                 String originalFilename = multipartFile.getOriginalFilename();
-                Path path = Paths.get(uploadDirectory, originalFilename);
+                /*Path path = Paths.get(uploadDirectory, originalFilename);
 
                 Files.createDirectories(path.getParent());
                 multipartFile.transferTo(path);
-                entity.setImagePath(path.toString());
+                entity.setImagePath(path.toString());*/
 
-            } catch (IOException e) {
+            } catch (Exception e) {
                 e.printStackTrace();
                 return AjaxResult.error("文件上传失败");
             }

project-zcustom/src/main/java/com/project/zcustom/mapper/unit/LargeIssueMapper.java

@@ -74,7 +74,7 @@ public interface LargeIssueMapper extends BaseMapper<LargeIssue>
 
     public int getOverIssueNum(String appOrg);
 
-    public List<LargeIssue> getIssueListLastWeek(String appOrg);
+    public List<LargeIssue> getIssueListLastWeek(@Param("appOrg") String appOrg,@Param("status")Integer status);
 
-    public List<LargeIssue> getIssueList(String appOrg, Date date);
+    public List<LargeIssue> getIssueList(@Param("appOrg")String appOrg,@Param("date") Date date,@Param("status")Integer status);
 }

project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargeIssueService.java

@@ -93,7 +93,7 @@ public interface ILargeIssueService extends IService<LargeIssue> {
 
     public int getOverIssueNum(String appOrg);
 
-    public List<LargeIssue> getIssueListLastWeek(String appOrg, Date date);
+    public List<LargeIssue> getIssueListLastWeek(String appOrg, Date date,Integer status);
 
     public List<LargeIssue> selectList(LargeIssue largeIssue);
     public LargeIssue selectLargeIssueById(Long id);

project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargeIssueServiceImpl.java

@@ -178,11 +178,12 @@ public class LargeIssueServiceImpl extends ServiceImpl<LargeIssueMapper, LargeIs
         return largeIssueMapper.getOverIssueNum(appOrg);
     }
 
-    public List<LargeIssue> getIssueListLastWeek(String appOrg, Date date){
+    public List<LargeIssue> getIssueListLastWeek(String appOrg, Date date,Integer status){
         if (date == null){
-            return largeIssueMapper.getIssueListLastWeek(appOrg);
+            return largeIssueMapper.getIssueListLastWeek(appOrg,status);
         }
-        else return largeIssueMapper.getIssueList(appOrg, date);
+        return largeIssueMapper.getIssueList(appOrg, date,status);
+
     }
 
 

project-zcustom/src/main/resources/mapper/zcustom/unit/LargeIssueMapper.xml

@@ -148,6 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             DATE( a.create_time ) BETWEEN DATE_SUB(CURDATE(), INTERVAL 7 DAY) AND CURDATE()
             )
         <if test="appOrg != '0000'">AND ( c.app_parent_org = #{appOrg} OR c.app_org = #{appOrg} )</if>
+        <if test="status != null">AND a.status = #{status}</if>
         order by a.create_time desc
     </select>
 
@@ -167,10 +168,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND b.del_flag = 0
         AND c.del_flag = '0'
         AND (
-        DATE( a.create_time ) BETWEEN DATE( #{arg1} )
+        DATE( a.create_time ) BETWEEN DATE( #{date} )
         AND CURDATE()
         )
-        <if test="arg0 != '0000'">AND ( c.app_parent_org = #{arg0} OR c.app_org = #{arg0} )</if>
+        <if test="appOrg != '0000'">AND ( c.app_parent_org = #{appOrg} OR c.app_org = #{appOrg} )</if>
+        <if test="status != null">AND a.status = #{status}</if>
         order by a.create_time desc
     </select>
 </mapper>