app养护计划明细提交

王富生
1 parent 30db68ba
Showing 14 changed files with 535 additions and 5 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanDetailRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/AppMaintainPlanController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanService.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
@@ -20,6 +20,9 @@ public class AppInspectionPlanDetailRespVO {
     @Schema(description = "计划编码", requiredMode = Schema.RequiredMode.REQUIRED)
     private String planNo;
  
+    @Schema(description = "计划名称", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String planName;
+
     @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704")
     private Long roadId;
  
+package com.zteits.urbanops.module.garden.controller.app.maintainplan;
+
+import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog;
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.common.util.object.BeanUtils;
+import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
+import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanPageReqVO;
+import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanRespVO;
+import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanSaveReqVO;
+import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanUpdateReqVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeReqVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeRespVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPageRoadReqVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPageRoadRespVO;
+import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDO;
+import com.zteits.urbanops.module.garden.service.maintainplan.MaintainPlanService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.List;
+
+import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.error;
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.PLAN_RATE_VALUE_ERROR;
+
+@Tag(name = "APP管理 - 养护计划汇总")
+@RestController
+@RequestMapping("/app/garden/maintain-plan")
+@Validated
+@Slf4j
+public class AppMaintainPlanController {
+
+    @Resource
+    private MaintainPlanService maintainPlanService;
+
+    @GetMapping("/get")
+    @Operation(summary = "获得养护计划汇总")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('garden:maintain-plan:query')")
+    public CommonResult<MaintainPlanRespVO> getMaintainPlan(@RequestParam("id") Long id) {
+        MaintainPlanDO maintainPlan = maintainPlanService.getMaintainPlan(id);
+        return success(BeanUtils.toBean(maintainPlan, MaintainPlanRespVO.class));
+    }
+
+    /**
+     * APP获得养护计划汇总分页-按道路
+     */
+    @GetMapping("/page/road")
+    @Operation(summary = "APP按道路-获得养护计划汇总分页")
+    //@PreAuthorize("@ss.hasPermission('app:garden:maintain-plan:road:query')")
+    public CommonResult<PageResult<AppMaintainPlanPageRoadRespVO>> appMaintainPlanRoadPage(@Valid AppMaintainPlanPageRoadReqVO pageReqVO) {
+        PageResult<AppMaintainPlanPageRoadRespVO> pageResult = maintainPlanService.appMaintainPlanRoadPage(pageReqVO);
+        return success(pageResult);
+    }
+
+    /**
+     * APP获得养护计划汇总分页-养护类型
+     */
+    @GetMapping("/page/plan-type-id")
+    @Operation(summary = "APP按养护类型-获得养护计划汇总分页")
+    //@PreAuthorize("@ss.hasPermission('app:garden:maintain-plan:plan-type:query')")
+    public CommonResult<PageResult<AppMaintainPlanPagePlanTypeRespVO>> appMaintainPlanPlanTypePage(@Valid AppMaintainPlanPagePlanTypeReqVO pageReqVO) {
+        PageResult<AppMaintainPlanPagePlanTypeRespVO> pageResult = maintainPlanService.appMaintainPlanPlanTypePage(pageReqVO);
+        return success(pageResult);
+    }
+
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.app.maintainplan.vo;
+
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Schema(description = "管理后台 - 养护计划汇总分页 Request VO")
+@Data
+public class AppMaintainPlanPagePlanTypeReqVO extends PageParam {
+
+    @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输  ;2009:补植;3001:绿地巡视;", requiredMode = Schema.RequiredMode.REQUIRED, example = "24742")
+    @NotNull(message = "养护类型不能为空")
+    private Integer planTypeId;
+
+    @Schema(description = "计划名称", example = "王五")
+    private String planName;
+
+    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效")
+    @NotNull(message = "完成状态不能为空")
+    @Min(value = 1, message = "状态最小为1")
+    @Max(value = 3, message = "状态不能大于4")
+    private Integer finishState;
+
+    @Schema(description = "公司ID")
+    @Hidden
+    private Long companyId;
+
+    @Schema(description = "角色IDS")
+    @Hidden
+    private List<Long> roleIds;
+
+    @Schema(description = "业务线")
+    @Hidden
+    private List<String> busiLineList;
+
+    @Schema(description = "系统时间")
+    @Hidden
+    private LocalDate localDate;
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.app.maintainplan.vo;
+
+import cn.idev.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
+@Schema(description = "管理后台 - 养护计划汇总分页 Request VO")
+@Data
+public class AppMaintainPlanPagePlanTypeRespVO {
+
+    @Schema(description = "批次号", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704")
+    private String batchNo;
+
+    @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704")
+    private Long roadId;
+
+    @Schema(description = "道路名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704")
+    private String roadName;
+
+    @Schema(description = "街道ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8439")
+    private String streetId;
+
+    @Schema(description = "街道名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    private String streetName;
+
+    @Schema(description = "养护级别: 10:特级；11:一级：12:二级;13:三级", requiredMode = Schema.RequiredMode.REQUIRED, example = "8588")
+    private Integer levelId;
+
+    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效")
+    @NotNull(message = "完成状态不能为空")
+    @Min(value = 1, message = "状态最小为1")
+    @Max(value = 3, message = "状态不能大于4")
+    private Integer finishState;
+
+    @Schema(description = "计划次数", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("计划次数")
+    private Integer planNum;
+
+    @Schema(description = "已完成次数", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("已完成次数")
+    private Integer planFinishNum;
+
+
+    @Schema(description = "执行开始时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDateTime beginTime;
+
+    @Schema(description = "执行时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDateTime endTime;
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.app.maintainplan.vo;
+
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+import java.util.List;
+
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 养护计划汇总分页 Request VO")
+@Data
+public class AppMaintainPlanPageRoadReqVO extends PageParam {
+
+    @Schema(description = "道路名称", example = "王五")
+    private String roadName;
+
+    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效")
+    @NotNull(message = "完成状态不能为空")
+    @Min(value = 1, message = "状态最小为1")
+    @Max(value = 3, message = "状态不能大于4")
+    private Integer finishState;
+
+    @Schema(description = "公司ID")
+    @Hidden
+    private Long companyId;
+
+    @Schema(description = "角色IDS")
+    @Hidden
+    private List<Long> roleIds;
+
+    @Schema(description = "业务线")
+    @Hidden
+    private List<String> busiLineList;
+
+    @Schema(description = "系统时间")
+    @Hidden
+    private LocalDate localDate;
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.app.maintainplan.vo;
+
+import cn.idev.excel.annotation.ExcelProperty;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
+@Schema(description = "管理后台 - 养护计划汇总分页 Request VO")
+@Data
+public class AppMaintainPlanPageRoadRespVO{
+
+    @Schema(description = "批次号", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704")
+    private String batchNo;
+
+    @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704")
+    private Long roadId;
+
+    @Schema(description = "道路名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704")
+    private String roadName;
+
+    @Schema(description = "街道ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8439")
+    private String streetId;
+
+    @Schema(description = "街道名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    private String streetName;
+
+    @Schema(description = "养护级别: 10:特级；11:一级：12:二级;13:三级", requiredMode = Schema.RequiredMode.REQUIRED, example = "8588")
+    private Integer levelId;
+
+    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效")
+    @NotNull(message = "完成状态不能为空")
+    @Min(value = 1, message = "状态最小为1")
+    @Max(value = 3, message = "状态不能大于4")
+    private Integer finishState;
+
+    @Schema(description = "计划次数", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("计划次数")
+    private Integer planNum;
+
+    @Schema(description = "已完成次数", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("已完成次数")
+    private Integer planFinishNum;
+
+
+    @Schema(description = "执行开始时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDateTime beginTime;
+
+    @Schema(description = "执行时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDateTime endTime;
+
+}
 \ No newline at end of file
 package com.zteits.urbanops.module.garden.dal.mysql.maintainplan;
  
  
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
+import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanRespVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeReqVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeRespVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPageRoadReqVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPageRoadRespVO;
 import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDO;
 import org.apache.ibatis.annotations.Mapper;
 import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*;
@@ -34,4 +40,22 @@ public interface MaintainPlanMapper extends BaseMapperX&lt;MaintainPlanDO&gt; {
  
     int deleteByBatchNo(@Param("batchNo") String batchNo);
  
+    /**
+     * app-按道路获取巡检计划列表-app
+     *
+     * @param page
+     * @param req
+     * @return 列表
+     */
+    IPage<AppMaintainPlanPageRoadRespVO> appMaintainPlanRoadPage(@Param("page") IPage<AppMaintainPlanPageRoadRespVO> page, @Param("req") AppMaintainPlanPageRoadReqVO req);
+
+    /**
+     * app-按养护类型获取巡检计划列表-app
+     *
+     * @param page
+     * @param req
+     * @return 列表
+     */
+    IPage<AppMaintainPlanPagePlanTypeRespVO> appMaintainPlanPlanTypePage(@Param("page") IPage<AppMaintainPlanPagePlanTypeRespVO> page, @Param("req") AppMaintainPlanPagePlanTypeReqVO req);
+
 }
 \ No newline at end of file
@@ -202,7 +202,7 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ
         List<AppInspectionPlanCommitRespVO> list = inspectionPlanCommitMapper.appInspectionPlanCommitListByPlanNo(planNo, busiLineList);
  
         list.forEach(e -> {
-            e.setImgList(StrUtils.imgProcess(e.getImg(), e.getImgHost()));
+            e.setImgList(StrUtils.imgProcess(e.getImg(), ""));
         });
         return list;
     }
@@ -238,7 +238,7 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ
  
     private List<InspectionPlanCommitRespVO> imgProcess(List<InspectionPlanCommitRespVO> list) {
         list.forEach(e -> {
-            e.setImgList(StrUtils.imgProcess(e.getImg(), e.getImgHost()));
+            e.setImgList(StrUtils.imgProcess(e.getImg(), ""));
         });
         return list;
     }
@@ -103,9 +103,9 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService 
         list.forEach(e -> {
             MaintainPlanCommitDetailRespVO respVO = new MaintainPlanCommitDetailRespVO();
             BeanUtils.copyProperties(e, respVO);
-            respVO.setBeginImgList(StrUtils.imgProcess(e.getBeginImg(), e.getImgHost()));
-            respVO.setProcessImgList(StrUtils.imgProcess(e.getProcessImg(), e.getImgHost()));
-            respVO.setEndImgList(StrUtils.imgProcess(e.getEndImg(), e.getImgHost()));
+            respVO.setBeginImgList(StrUtils.imgProcess(e.getBeginImg(), ""));
+            respVO.setProcessImgList(StrUtils.imgProcess(e.getProcessImg(), ""));
+            respVO.setEndImgList(StrUtils.imgProcess(e.getEndImg(), ""));
  
             List<MaintainPlanCommonUserVO> commonUsers = new ArrayList<>();
             List<MaintainPlanCommonUserDO> maintainPlanCommonUserList = maintainPlanCommonUserMapper.selectList(new QueryWrapper<MaintainPlanCommonUserDO>().lambda()
@@ -3,6 +3,10 @@ package com.zteits.urbanops.module.garden.service.maintainplan;
 import java.util.*;
  
 import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeReqVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeRespVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPageRoadReqVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPageRoadRespVO;
 import jakarta.validation.*;
 import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*;
 import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDO;
@@ -72,4 +76,20 @@ public interface MaintainPlanService {
      * @param batchNo
      */
     void stopPlanInspectionPlan(String batchNo);
+
+    /**
+     * app按道路-获得养护计划汇总分页
+     * @param pageReqVO
+     * @return
+     */
+    PageResult<AppMaintainPlanPageRoadRespVO> appMaintainPlanRoadPage(AppMaintainPlanPageRoadReqVO pageReqVO);
+
+    /**
+     * app按养护类型-获得养护计划汇总分页
+     * @param pageReqVO
+     * @return
+     */
+    PageResult<AppMaintainPlanPagePlanTypeRespVO> appMaintainPlanPlanTypePage(AppMaintainPlanPagePlanTypeReqVO pageReqVO);
+
+
 }
 \ No newline at end of file
@@ -4,17 +4,26 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zteits.urbanops.framework.common.pojo.CommonResult;
 import com.zteits.urbanops.framework.dict.core.DictFrameworkUtils;
+import com.zteits.urbanops.framework.mybatis.core.util.MyBatisUtils;
 import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanRespVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeReqVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeRespVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPageRoadReqVO;
+import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPageRoadRespVO;
 import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDO;
 import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDetailDO;
 import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanRoleDO;
 import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDetailDO;
 import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanRoleDO;
+import com.zteits.urbanops.module.garden.dal.dataobject.road.RoadDO;
 import com.zteits.urbanops.module.garden.dal.mysql.maintainplan.MaintainPlanDetailMapper;
 import com.zteits.urbanops.module.garden.dal.mysql.maintainplan.MaintainPlanInterceptMapper;
 import com.zteits.urbanops.module.garden.dal.mysql.maintainplan.MaintainPlanRoleMapper;
+import com.zteits.urbanops.module.garden.dal.mysql.road.RoadMapper;
 import com.zteits.urbanops.module.garden.enums.FinishStateEnum;
 import com.zteits.urbanops.module.garden.enums.PlanConstants;
 import com.zteits.urbanops.module.garden.util.timeinterval.PeriodResult;
@@ -25,11 +34,14 @@ import com.zteits.urbanops.module.system.api.permission.RoleApi;
 import com.zteits.urbanops.module.system.dal.dataobject.permission.RoleDO;
 import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
  
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -68,6 +80,9 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
     private MaintainPlanRoleMapper maintainPlanRoleMapper;
  
     @Resource
+    private RoadMapper roadMapper;
+
+    @Resource
     private DeptApi deptApi;
  
     @Resource
@@ -312,4 +327,64 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
         maintainPlanRoleMapper.delete(MaintainPlanRoleDO::getBatchNo, batchNo);
     }
  
+    @Override
+    public PageResult<AppMaintainPlanPageRoadRespVO> appMaintainPlanRoadPage(AppMaintainPlanPageRoadReqVO pageReqVO) {
+        String busiLine = SecurityFrameworkUtils.getBusiLine();
+        Long companyId = SecurityFrameworkUtils.getCompanyId();
+        if (StringUtils.isNotEmpty(busiLine)) {
+            pageReqVO.setBusiLineList(Arrays.asList(busiLine.split(",")));
+        }
+        pageReqVO.setCompanyId(companyId);
+
+        /*1.查询登录用户角色*/
+        List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
+        pageReqVO.setRoleIds(roleIds);
+        pageReqVO.setLocalDate(LocalDate.now());
+
+        /*2.分页*/
+        IPage<AppMaintainPlanPageRoadRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
+        IPage<AppMaintainPlanPageRoadRespVO> page = maintainPlanMapper.appMaintainPlanRoadPage(mpPage, pageReqVO);
+        addStreetInfo(page.getRecords());
+        return new PageResult<>(page.getRecords(), page.getTotal());
+    }
+
+    @Override
+    public PageResult<AppMaintainPlanPagePlanTypeRespVO> appMaintainPlanPlanTypePage(AppMaintainPlanPagePlanTypeReqVO pageReqVO) {
+        String busiLine = SecurityFrameworkUtils.getBusiLine();
+        Long companyId = SecurityFrameworkUtils.getCompanyId();
+        if (StringUtils.isNotEmpty(busiLine)) {
+            pageReqVO.setBusiLineList(Arrays.asList(busiLine.split(",")));
+        }
+        pageReqVO.setCompanyId(companyId);
+
+        /*1.查询登录用户角色*/
+        List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
+        pageReqVO.setRoleIds(roleIds);
+        pageReqVO.setLocalDate(LocalDate.now());
+        /*2.分页*/
+        IPage<AppMaintainPlanPagePlanTypeRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
+        IPage<AppMaintainPlanPagePlanTypeRespVO> page = maintainPlanMapper.appMaintainPlanPlanTypePage(mpPage, pageReqVO);
+        return new PageResult<>(page.getRecords(), page.getTotal());
+    }
+
+    private void addStreetInfo(List<AppMaintainPlanPageRoadRespVO> list){
+        if(CollectionUtils.isEmpty(list)){
+            return ;
+        }
+        Set<Long> roadIds = list.stream().map(AppMaintainPlanPageRoadRespVO::getRoadId).collect(Collectors.toSet());
+
+
+        List<RoadDO> roadList = roadMapper.selectList(new QueryWrapper<RoadDO>().lambda().in(RoadDO::getId, roadIds));
+        //list转map
+        Map<Long, RoadDO> roadMap = roadList.stream().collect(Collectors.toMap(RoadDO::getId, road -> road));
+
+        list.forEach(plan -> {
+            RoadDO road = roadMap.get(plan.getRoadId());
+            if(road != null){
+                plan.setStreetId(road.getStreetId());
+                plan.setStreetName(road.getStreetName());
+            }
+        });
+    }
+
 }
 \ No newline at end of file
@@ -16,6 +16,7 @@
         SELECT
         a.batch_no,
         b.plan_no,
+        a.plan_name,
         a.road_id,
         a.road_name,
         a.plan_type_id,
@@ -20,6 +20,7 @@
             a.road_name,
             a.plan_type_id,
             a.level_id,
+            a.finish_state,
             a.begin_time,
             a.end_time
         FROM
@@ -11,4 +11,113 @@
     <delete id="deleteByBatchNo">
         delete from garden_maintain_plan where batch_no =#{batchNo}
     </delete>
+
+
+    <select id="appMaintainPlanRoadPage" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPageRoadRespVO">
+        SELECT
+        a.batch_no,
+        a.road_id,
+        a.road_name,
+        a.level_id,
+        a.finish_state,
+        max(a.plan_num) as plan_num,
+        max(a.plan_finish_num) as plan_finish_num,
+        a.begin_time,
+        a.end_time
+        FROM
+        garden_maintain_plan a,
+        garden_maintain_plan_role b
+        WHERE
+        a.batch_no = b.batch_no
+        AND a.dept_id =b.dept_id
+        AND a.deleted=0
+        AND a.company_id = #{req.companyId}
+        <if test="req.roadName != null and req.roadName !=''">
+            AND a.road_name LIKE CONCAT('%',#{req.roadName},'%')
+        </if>
+        <if test="req.roleIds != null and req.roleIds.size() > 0">
+            AND b.role_id IN
+            <foreach collection="req.roleIds" item="roleId" open="(" separator="," close=")">
+                #{roleId}
+            </foreach>
+        </if>
+        <if test="req.busiLineList != null and req.busiLineList.size() > 0">
+            AND a.busi_line IN
+            <foreach collection="req.busiLineList" item="busiLine" open="(" separator="," close=")">
+                #{busiLine}
+            </foreach>
+        </if>
+        <!--状态 1:未完成;2:已完成;3:已失效-->
+        <if test="req.finishState == 3">
+            <![CDATA[and a.end_time < #{req.localDate}]]>
+        </if>
+        <if test="req.finishState == 2">
+            and a.finish_state = #{req.finishState}
+        </if>
+        <if test="req.finishState == 1">
+            and a.finish_state = #{req.finishState}
+            <![CDATA[and a.end_time >= #{req.localDate}]]>
+        </if>
+        GROUP BY
+        a.batch_no,
+        a.road_id,
+        a.road_name,
+        a.level_id,
+        a.finish_state,
+        a.begin_time,
+        a.end_time
+    </select>
+
+    <select id="appMaintainPlanPlanTypePage" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeRespVO">
+        SELECT
+            c.batch_no,
+            c.plan_no,
+            a.plan_name,
+            a.plan_type_id,
+            a.rate,
+            a.cycle_id,
+            c.plan_num,
+            c.finish_percent,
+            c.finish_state,
+            c.begin_time,
+            c.end_time
+        FROM
+            garden_maintain_plan a,
+            garden_maintain_plan_role b,
+            garden_maintain_plan_detail c
+        WHERE
+            a.batch_no = b.batch_no
+          and a.batch_no=b.batch_no
+          AND a.dept_id =b.dept_id
+          AND a.deleted=0
+        AND a.company_id = #{req.companyId}
+          AND a.company_id = #{req.planTypeId}
+        <if test="req.planName != null and req.planName !=''">
+            AND a.plan_type_id LIKE CONCAT('%',#{req.planName},'%')
+        </if>
+        <if test="req.roleIds != null and req.roleIds.size() > 0">
+            AND b.role_id IN
+            <foreach collection="req.roleIds" item="roleId" open="(" separator="," close=")">
+                #{roleId}
+            </foreach>
+        </if>
+        <if test="req.busiLineList != null and req.busiLineList.size() > 0">
+            AND a.busi_line IN
+            <foreach collection="req.busiLineList" item="busiLine" open="(" separator="," close=")">
+                #{busiLine}
+            </foreach>
+        </if>
+        <!--状态 1:未完成;2:已完成;3:已失效-->
+        <if test="req.finishState == 3">
+            <![CDATA[and c.end_time < #{req.localDate}]]>
+        </if>
+        <if test="req.finishState == 2">
+            and c.finish_state = #{req.finishState}
+        </if>
+        <if test="req.finishState == 1">
+            and c.finish_state = #{req.finishState}
+            <![CDATA[and c.end_time >= #{req.localDate}]]>
+        </if>
+    </select>
+
 </mapper>
 \ No newline at end of file