接口调整---

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

@@ -3,14 +3,16 @@ package com.project.zcustom.controller.engineering;
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
 import com.project.zcustom.domain.addional.LargeIssue;
+import com.project.zcustom.domain.addional.LargePlan;
 import com.project.zcustom.service.unit.ILargeIssueService;
+import com.project.zcustom.service.unit.ILargePlanService;
 import com.project.zcustom.service.unit.ILargeProjectService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/large/three")
+@RequestMapping("/large/check")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class PlatProjectCheckController extends BaseController {
 
@@ -18,6 +20,8 @@ public class PlatProjectCheckController extends BaseController {
 
     private final ILargeIssueService largeIssueService;
 
+    private final ILargePlanService largePlanService;
+
     /**
      * 问题数量
      */
@@ -65,4 +69,20 @@ public class PlatProjectCheckController extends BaseController {
     public AjaxResult changeIssueStatus(@RequestBody LargeIssue entity) {
         return toAjax(largeIssueService.updateById(entity));
     }
+
+    /**
+     * 本周检查计划
+     * */
+    @GetMapping("/planCheckList")
+    public AjaxResult planCheckList() {
+        return AjaxResult.success("查询成功", largePlanService.planCheckList());
+    }
+
+    /**
+     * 本周施工计划
+     * */
+    @GetMapping("/planDoneList")
+    public AjaxResult planDoneList() {
+        return AjaxResult.success("查询成功", largePlanService.planDoneList());
+    }
 }

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

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/large/two")
+@RequestMapping("/large/monitor")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class PlatProjectMonitorController extends BaseController {
 

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

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/large/one")
+@RequestMapping("/large/production")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class PlatProjectProductionController extends BaseController {
 

project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargePlan.java

@@ -80,4 +80,6 @@ public class LargePlan extends CustomBaseEntity {
     @ApiModelProperty("结束日期")
     private Date endTime;
 
+    private String projectName;
+
 }

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

@@ -71,4 +71,8 @@ public interface LargePlanMapper extends BaseMapper<LargePlan>
     Integer reallyDeleteByWrapper(@Param(Constants.WRAPPER) LambdaQueryWrapper<LargePlan> deleteWrapper);
 
     public int getCheckProjectNum(Date startDate, Date endDate);
+
+    public List<LargePlan> planCheckList();
+
+    public List<LargePlan> planDoneList();
 }

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

@@ -90,4 +90,8 @@ public interface ILargePlanService extends IService<LargePlan> {
     public void reallyDeleteLargePlan(LambdaQueryWrapper<LargePlan> lqw);
 
     public int getCheckProjectNum(Date startDate, Date endDate);
+
+    public List<LargePlan> planCheckList();
+
+    public List<LargePlan> planDoneList();
 }

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

@@ -182,4 +182,12 @@ public class LargePlanServiceImpl extends ServiceImpl<LargePlanMapper, LargePlan
     public int getCheckProjectNum(Date startDate, Date endDate){
         return largePlanMapper.getCheckProjectNum(startDate, endDate);
     }
+
+    public List<LargePlan> planCheckList(){
+        return largePlanMapper.planCheckList();
+    }
+
+    public List<LargePlan> planDoneList(){
+        return largePlanMapper.planDoneList();
+    }
 }

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

@@ -4,12 +4,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.project.zcustom.mapper.unit.LargePlanMapper">
 
-    <resultMap type="LargePlan" id="LargePlanResult">
+    <resultMap type="com.project.zcustom.domain.addional.LargePlan" id="LargePlanResult">
         <result property="id"    column="id"    />
         <result property="projectId"    column="project_id"    />
         <result property="type"    column="type"    />
         <result property="head"    column="head"    />
         <result property="content"    column="content"    />
+        <result property="projectName"    column="project_name"    />
         <result property="startTime"    column="start_time"    />
         <result property="endTime"    column="end_time"    />
         <result property="createBy"    column="create_by"    />
@@ -111,4 +112,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             `type`,
             project_id
     </select>
+
+    <select id="planCheckList" resultMap="LargePlanResult">
+        SELECT
+            head,
+            content,
+            project_name,
+            start_time,
+            end_time
+        FROM
+            `large_plan` a
+                LEFT JOIN large_project b ON a.project_id = b.id
+        WHERE
+            a.del_flag = 0
+          AND b.del_flag = 0
+          AND a.type = '0'
+          AND (
+            DATE( a.start_time ) BETWEEN DATE_SUB( CURDATE(), INTERVAL ( DAYOFWEEK( CURDATE()) - 2 ) DAY )
+            AND DATE_ADD( CURDATE(), INTERVAL ( 8 - DAYOFWEEK( CURDATE())) DAY )
+            OR DATE( a.end_time ) BETWEEN DATE_SUB( CURDATE(), INTERVAL ( DAYOFWEEK( CURDATE()) - 2 ) DAY )
+            AND DATE_ADD( CURDATE(), INTERVAL ( 8 - DAYOFWEEK( CURDATE())) DAY ))
+    </select>
+
+    <select id="planDoneList" resultMap="LargePlanResult">
+        SELECT
+            head,
+            content,
+            project_name,
+            start_time,
+            end_time
+        FROM
+            `large_plan` a
+                LEFT JOIN large_project b ON a.project_id = b.id
+        WHERE
+            a.del_flag = 0
+          AND b.del_flag = 0
+          AND a.type = '1'
+          AND (
+            DATE( a.start_time ) BETWEEN DATE_SUB( CURDATE(), INTERVAL ( DAYOFWEEK( CURDATE()) - 2 ) DAY )
+            AND DATE_ADD( CURDATE(), INTERVAL ( 8 - DAYOFWEEK( CURDATE())) DAY )
+            OR DATE( a.end_time ) BETWEEN DATE_SUB( CURDATE(), INTERVAL ( DAYOFWEEK( CURDATE()) - 2 ) DAY )
+            AND DATE_ADD( CURDATE(), INTERVAL ( 8 - DAYOFWEEK( CURDATE())) DAY ))
+    </select>
 </mapper>

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

@@ -118,13 +118,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.del_flag = '0'
           AND b.del_flag = '0'
           AND a.type = '0'
-          AND DATE(a.start_time) BETWEEN DATE_SUB( CURDATE(), INTERVAL ( DAYOFWEEK( CURDATE()) - 2 ) DAY )
-          AND DATE_ADD( CURDATE(), INTERVAL ( 8 - DAYOFWEEK( CURDATE())) DAY )
-           OR DATE(a.end_time) BETWEEN DATE_SUB( CURDATE(), INTERVAL ( DAYOFWEEK( CURDATE()) - 2 ) DAY )
-          AND DATE_ADD(
-            CURDATE(),
-            INTERVAL (
-            8 - DAYOFWEEK(
-            CURDATE())) DAY)
+          AND (
+            DATE( a.start_time ) BETWEEN DATE_SUB( CURDATE(), INTERVAL ( DAYOFWEEK( CURDATE()) - 2 ) DAY )
+            AND DATE_ADD( CURDATE(), INTERVAL ( 8 - DAYOFWEEK( CURDATE())) DAY )
+            OR DATE( a.end_time ) BETWEEN DATE_SUB( CURDATE(), INTERVAL ( DAYOFWEEK( CURDATE()) - 2 ) DAY )
+            AND DATE_ADD( CURDATE(), INTERVAL ( 8 - DAYOFWEEK( CURDATE())) DAY ))
     </select>
 </mapper>