测试bug修复+养护计划明细提交

王富生
1 parent c3165b5b
Showing 19 changed files with 281 additions and 120 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanCommitRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanCommitController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanDetailMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanCommitMapper.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/inspectionplan/InspectionPlanServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitService.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/MaintainPlanServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/DeptController.java
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/dept/DeptServiceImpl.java
@@ -111,4 +111,11 @@ public class InspectionPlanCommitRespVO {
     @ExcelProperty("更新者")
     private String updaterName;
+    @Schema(description = "归属(一级部门id)", example = "20800")
+    @ExcelProperty("归属(一级部门id)")
+    private String companyName;
+
+    @ExcelProperty("部门(道路负责部门)")
+    private String deptName;
+
 }
 \ No newline at end of file
@@ -34,6 +34,8 @@ public class InspectionPlanPageReqVO extends PageParam {
     @Schema(description = "养护级别: 10:特级；11:一级：12:二级;13:三级", example = "8588")
     private Integer levelId;
+    @Schema(description = "周期ID")
+    private Integer cycleId;
     @Schema(description = "开始时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@@ -83,8 +83,8 @@ public class MaintainPlanCommitController {
     @Operation(summary = "获得养护计划明细分页")
     @PreAuthorize("@ss.hasPermission('garden:maintain-plan-commit:query')")
     public CommonResult<PageResult<MaintainPlanCommitRespVO>> getMaintainPlanCommitPage(@Valid MaintainPlanCommitPageReqVO pageReqVO) {
-        PageResult<MaintainPlanCommitDO> pageResult = maintainPlanCommitService.getMaintainPlanCommitPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, MaintainPlanCommitRespVO.class));
+        PageResult<MaintainPlanCommitRespVO> pageResult = maintainPlanCommitService.getMaintainPlanCommitPage(pageReqVO);
+        return success(pageResult);
     }
     @GetMapping("/export-excel")
@@ -94,7 +94,7 @@ public class MaintainPlanCommitController {
     public void exportMaintainPlanCommitExcel(@Valid MaintainPlanCommitPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<MaintainPlanCommitDO> list = maintainPlanCommitService.getMaintainPlanCommitPage(pageReqVO).getList();
+        List<MaintainPlanCommitRespVO> list = maintainPlanCommitService.getMaintainPlanCommitPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "养护计划明细.xls", "数据", MaintainPlanCommitRespVO.class,
                         BeanUtils.toBean(list, MaintainPlanCommitRespVO.class));
@@ -6,8 +6,9 @@ import java.time.LocalDate;
 import io.swagger.v3.oas.annotations.media.Schema;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
+import java.util.List;
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
 import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 @Schema(description = "管理后台 - 养护计划明细分页 Request VO")
@@ -20,6 +21,9 @@ public class MaintainPlanCommitPageReqVO extends PageParam {
     @Schema(description = "计划编码")
     private String planNo;
+    @Schema(description = "计划名称")
+    private String planName;
+
     @Schema(description = "业务线: yl-园林；wy-物业：sz-市政")
     private String busiLine;
@@ -32,33 +36,25 @@ public class MaintainPlanCommitPageReqVO extends PageParam {
     @Schema(description = "部门ID(道路负责部门id)", example = "29117")
     private Long deptId;
-    @Schema(description = "道路ID", example = "12084")
-    private Long roadId;
-
-    @Schema(description = "本次完成百分比")
-    private Double finishPercent;
-
-    @Schema(description = "照片host")
-    private String imgHost;
-
-    @Schema(description = "开始照片")
-    private String beginImg;
+    @Schema(description = "计划属性:1:标准计划；2:临时计划", example = "1")
+    private Integer planAttr;
-    @Schema(description = "处理中照片")
-    private String processImg;
+    @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输  ;2009:补植;3001:绿地巡视;", example = "2001")
+    private Integer planTypeId;
-    @Schema(description = "结束照片")
-    private String endImg;
+    @Schema(description = "道路ID", example = "12084")
+    private Long roadId;
+    @Schema(description = "道路", example = "12917")
+    private String roadName;
-    @Schema(description = "养护面积:单位m²")
-    private Double opArea;
+    @Schema(description = "角色名称", example = "12917")
+    private String roleName;
-    @Schema(description = "操作时长")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private Double[] opTime;
+    @Schema(description = "养护级别: 10:特级；11:一级：12:二级;13:三级",  example = "10")
+    private Integer levelId;
     @Schema(description = "完成时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDate[] finishTime;
     @Schema(description = "提交人用户", example = "19167")
@@ -67,17 +63,6 @@ public class MaintainPlanCommitPageReqVO extends PageParam {
     @Schema(description = "提交人用户ID", example = "王五")
     private String userName;
-    @Schema(description = "备注", example = "你猜")
-    private String remark;
-
-    @Schema(description = "创建者", example = "张三")
-    private String creatorName;
-
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-
-    @Schema(description = "更新者", example = "赵六")
-    private String updaterName;
+    private List<String> busiLineList;
 }
 \ No newline at end of file
@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.time.LocalDateTime;
+
 import cn.idev.excel.annotation.*;
 @Schema(description = "管理后台 - 养护计划明细 Response VO")
@@ -11,92 +12,93 @@ import cn.idev.excel.annotation.*;
 @ExcelIgnoreUnannotated
 public class MaintainPlanCommitRespVO {
-    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26945")
-    @ExcelProperty("ID")
-    private Long id;
-
-    @Schema(description = "批次号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "批次号")
     @ExcelProperty("批次号")
     private String batchNo;
-    @Schema(description = "计划编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "计划编码")
     @ExcelProperty("计划编码")
     private String planNo;
-    @Schema(description = "业务线: yl-园林；wy-物业：sz-市政", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "计划名称")
+    @ExcelProperty("计划名称")
+    private String planName;
+
+    @Schema(description = "业务线: yl-园林；wy-物业：sz-市政")
     @ExcelProperty("业务线: yl-园林；wy-物业：sz-市政")
     private String busiLine;
-    @Schema(description = "提交次序号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "提交次序号")
     @ExcelProperty("提交次序号")
     private Integer sortNum;
-    @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2759")
+    @Schema(description = "归属(一级部门id)", example = "2759")
     @ExcelProperty("归属(一级部门id)")
     private Long companyId;
-    @Schema(description = "部门ID(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "29117")
+    @Schema(description = "公司", requiredMode = Schema.RequiredMode.REQUIRED, example = "2759")
+    @ExcelProperty("公司")
+    private String companyName;
+
+    @Schema(description = "部门ID(道路负责部门id)", example = "29117")
     @ExcelProperty("部门ID(道路负责部门id)")
     private Long deptId;
-    @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12084")
+    @Schema(description = "部门", example = "29117")
+    @ExcelProperty("部门")
+    private String deptName;
+
+    @Schema(description = "道路ID", example = "12084")
     @ExcelProperty("道路ID")
     private Long roadId;
-    @Schema(description = "本次完成百分比", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("本次完成百分比")
-    private Double finishPercent;
+    @Schema(description = "道路名称", example = "12084")
+    @ExcelProperty("道路名称")
+    private String roadName;
-    @Schema(description = "照片host", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("照片host")
-    private String imgHost;
+    @Schema(description = "养护级别: 10:特级；11:一级：12:二级;13:三级", example = "10")
+    @ExcelProperty("养护级别")
+    private Integer levelId;
-    @Schema(description = "开始照片", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("开始照片")
-    private String beginImg;
+    @Schema(description = "计划属性:1:标准计划；2:临时计划", example = "1")
+    private Integer planAttr;
-    @Schema(description = "处理中照片", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("处理中照片")
-    private String processImg;
+    @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输  ;2009:补植;3001:绿地巡视;", example = "24742")
+    @ExcelProperty("养护类型")
+    private Integer planTypeId;
-    @Schema(description = "结束照片", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("结束照片")
-    private String endImg;
-    @Schema(description = "养护面积:单位m²", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("养护面积:单位m²")
-    private Double opArea;
-
-    @Schema(description = "操作时长", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("操作时长")
-    private Double opTime;
+    @Schema(description = "本次完成百分比")
+    @ExcelProperty("本次完成百分比")
+    private Double finishPercent;
     @Schema(description = "完成时间")
     @ExcelProperty("完成时间")
     private LocalDateTime finishTime;
-    @Schema(description = "提交人用户", requiredMode = Schema.RequiredMode.REQUIRED, example = "19167")
+    @Schema(description = "提交人用户", example = "19167")
     @ExcelProperty("提交人用户")
     private Long userId;
-    @Schema(description = "提交人用户ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
+    @Schema(description = "提交人用户ID", example = "王五")
     @ExcelProperty("提交人用户ID")
     private String userName;
-    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
+    @Schema(description = "角色ID", example = "你猜")
+    @ExcelProperty("角色ID")
+    private Long roleId;
+
+    @Schema(description = "角色", example = "你猜")
+    @ExcelProperty("角色")
+    private String roleName;
+
+    @Schema(description = "备注", example = "你猜")
     @ExcelProperty("备注")
     private String remark;
-    @Schema(description = "创建者", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @Schema(description = "创建者", example = "张三")
     @ExcelProperty("创建者")
     private String creatorName;
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
-    @Schema(description = "更新者", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
-    @ExcelProperty("更新者")
-    private String updaterName;
 }
 \ No newline at end of file
@@ -27,6 +27,9 @@ public class MaintainPlanPageReqVO extends PageParam {
     @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输  ;2009:补植;3001:绿地巡视;", example = "7439")
     private Integer planTypeId;
+    @Schema(description = "周期ID")
+    private Integer cycleId;
+
     @Schema(description = "归属(一级部门id)", example = "1713")
     private Long companyId;
@@ -88,7 +88,7 @@ public class RoadController {
     @PostMapping("/list")
     @Operation(summary = "获得道路列表")
-    @PreAuthorize("@ss.hasPermission('garden:road:query')")
+    //@PreAuthorize("@ss.hasPermission('garden:road:query')")
     public CommonResult<List<RoadListRespVO>> getRoadList(@Valid @RequestBody RoadListReqVO reqVO) {
         List<RoadDO> roadList = roadService.getRoadList(reqVO);
         return success(BeanUtils.toBean(roadList, RoadListRespVO.class));
@@ -32,7 +32,7 @@ public interface InspectionPlanDetailMapper extends BaseMapperX&lt;InspectionPlanDe
                 .eqIfPresent(InspectionPlanDetailDO::getFinishState, reqVO.getFinishState())
                 .betweenIfPresent(InspectionPlanDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eq(InspectionPlanDetailDO::getDeleted,0)
-                .orderByDesc(InspectionPlanDetailDO::getId));
+                .orderByAsc(InspectionPlanDetailDO::getId));
     }
     int deleteByBatchNo(@Param("batchNo") String batchNo);
 package com.zteits.urbanops.module.garden.dal.mysql.maintainplan;
-import com.zteits.urbanops.framework.common.pojo.PageResult;
-import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
 import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanCommitDO;
 import org.apache.ibatis.annotations.Mapper;
 import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*;
+import org.apache.ibatis.annotations.Param;
 /**
  * 养护计划明细 Mapper
@@ -16,30 +16,12 @@ import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*;
 @Mapper
 public interface MaintainPlanCommitMapper extends BaseMapperX<MaintainPlanCommitDO> {
-    default PageResult<MaintainPlanCommitDO> selectPage(MaintainPlanCommitPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<MaintainPlanCommitDO>()
-                .eqIfPresent(MaintainPlanCommitDO::getBatchNo, reqVO.getBatchNo())
-                .eqIfPresent(MaintainPlanCommitDO::getPlanNo, reqVO.getPlanNo())
-                .eqIfPresent(MaintainPlanCommitDO::getBusiLine, reqVO.getBusiLine())
-                .eqIfPresent(MaintainPlanCommitDO::getSortNum, reqVO.getSortNum())
-                .eqIfPresent(MaintainPlanCommitDO::getCompanyId, reqVO.getCompanyId())
-                .eqIfPresent(MaintainPlanCommitDO::getDeptId, reqVO.getDeptId())
-                .eqIfPresent(MaintainPlanCommitDO::getRoadId, reqVO.getRoadId())
-                .eqIfPresent(MaintainPlanCommitDO::getFinishPercent, reqVO.getFinishPercent())
-                .eqIfPresent(MaintainPlanCommitDO::getImgHost, reqVO.getImgHost())
-                .eqIfPresent(MaintainPlanCommitDO::getBeginImg, reqVO.getBeginImg())
-                .eqIfPresent(MaintainPlanCommitDO::getProcessImg, reqVO.getProcessImg())
-                .eqIfPresent(MaintainPlanCommitDO::getEndImg, reqVO.getEndImg())
-                .eqIfPresent(MaintainPlanCommitDO::getOpArea, reqVO.getOpArea())
-                .betweenIfPresent(MaintainPlanCommitDO::getOpTime, reqVO.getOpTime())
-                .betweenIfPresent(MaintainPlanCommitDO::getFinishTime, reqVO.getFinishTime())
-                .eqIfPresent(MaintainPlanCommitDO::getUserId, reqVO.getUserId())
-                .likeIfPresent(MaintainPlanCommitDO::getUserName, reqVO.getUserName())
-                .eqIfPresent(MaintainPlanCommitDO::getRemark, reqVO.getRemark())
-                .likeIfPresent(MaintainPlanCommitDO::getCreatorName, reqVO.getCreatorName())
-                .betweenIfPresent(MaintainPlanCommitDO::getCreateTime, reqVO.getCreateTime())
-                .likeIfPresent(MaintainPlanCommitDO::getUpdaterName, reqVO.getUpdaterName())
-                .orderByDesc(MaintainPlanCommitDO::getId));
-    }
+    /* 自定义 SQL 分页查询（复杂联表场景，XML 方式）
+     * @param page 分页上下文
+     * @param reqDTO 查询条件
+     * @return 分页结果
+     */
+    IPage<MaintainPlanCommitRespVO> selectForPage(@Param("page") IPage<MaintainPlanCommitRespVO> page, @Param("req") MaintainPlanCommitPageReqVO req);
+
 }
 \ No newline at end of file
@@ -4,12 +4,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zteits.urbanops.framework.common.util.string.StrUtils;
 import com.zteits.urbanops.framework.mybatis.core.util.MyBatisUtils;
 import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.system.api.dept.DeptApi;
+import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import java.util.*;
+import java.util.stream.Collectors;
 import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.*;
 import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanCommitDO;
@@ -31,6 +35,9 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ
     @Resource
     private InspectionPlanCommitMapper inspectionPlanCommitMapper;
+    @Resource
+    private DeptApi deptApi;
+
     @Override
     public Long createInspectionPlanCommit(InspectionPlanCommitSaveReqVO createReqVO) {
         // 插入
@@ -91,10 +98,40 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ
         //分页
         IPage<InspectionPlanCommitRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
         IPage<InspectionPlanCommitRespVO> page = inspectionPlanCommitMapper.selectForPage(mpPage, pageReqVO);
+        addDataInspectionPlan(page.getRecords());
         // 转换返回
         return new PageResult<>(imgProcess(page.getRecords()), page.getTotal());
     }
+    /**
+     * 回填部门/公司/角色
+     * @param list 分页对象
+     */
+    private void addDataInspectionPlan(List<InspectionPlanCommitRespVO> list ){
+        if(CollectionUtils.isEmpty(list)){
+            return ;
+        }
+        //公司
+        Set<Long> companyIds = list.stream().map(InspectionPlanCommitRespVO::getCompanyId).collect(Collectors.toSet());
+        //部门
+        Set<Long> deptIds = list.stream().map(InspectionPlanCommitRespVO::getDeptId).collect(Collectors.toSet());
+        deptIds.addAll(companyIds);
+        /*1.获取部门*/
+        Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(deptIds);
+
+        list.forEach(plan -> {
+            DeptRespDTO dept =  deptMap.get(plan.getDeptId());
+            if (dept != null) {
+                plan.setDeptName(dept.getName());
+
+            }
+            DeptRespDTO company =  deptMap.get(plan.getCompanyId());
+            if(company != null){
+                plan.setCompanyName(company.getName());
+            }
+        });
+    }
+
     private List<InspectionPlanCommitRespVO> imgProcess(List<InspectionPlanCommitRespVO> list) {
         list.forEach(e -> {
             e.setImgList(StrUtils.imgProcess(e.getImg(), e.getImgHost()));
@@ -102,7 +102,7 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
         //按照道路创建计划
         createReqVO.getRoadListReqVO().forEach(roadReqVO -> {
             InspectionPlanDO inspectionPlan = BeanUtils.toBean(createReqVO, InspectionPlanDO.class);
-            String batchNo = "BN" + System.currentTimeMillis() + RandomUtil.randomInt(10000) + roadReqVO.getRoadId();
+            String batchNo = "BN" + System.currentTimeMillis() + RandomUtil.randomInt(1000 , 9999) + roadReqVO.getRoadId();
             inspectionPlan.setBatchNo(batchNo);
             inspectionPlan.setPlanFinishNum(0);
             inspectionPlan.setFinishState(FinishStateEnum.NOT_FINISHED.getStatus());
@@ -56,6 +56,6 @@ public interface MaintainPlanCommitService {
      * @param pageReqVO 分页查询
      * @return 养护计划明细分页
      */
-    PageResult<MaintainPlanCommitDO> getMaintainPlanCommitPage(MaintainPlanCommitPageReqVO pageReqVO);
+    PageResult<MaintainPlanCommitRespVO> getMaintainPlanCommitPage(MaintainPlanCommitPageReqVO pageReqVO);
 }
 \ No newline at end of file
 package com.zteits.urbanops.module.garden.service.maintainplan;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zteits.urbanops.framework.mybatis.core.util.MyBatisUtils;
+import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.system.api.dept.DeptApi;
+import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import java.util.*;
+import java.util.stream.Collectors;
+
 import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*;
 import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanCommitDO;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
@@ -25,6 +34,9 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService 
     @Resource
     private MaintainPlanCommitMapper maintainPlanCommitMapper;
+    @Resource
+    private DeptApi deptApi;
+
     @Override
     public Long createMaintainPlanCommit(MaintainPlanCommitSaveReqVO createReqVO) {
         // 插入
@@ -71,8 +83,52 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService 
     }
     @Override
-    public PageResult<MaintainPlanCommitDO> getMaintainPlanCommitPage(MaintainPlanCommitPageReqVO pageReqVO) {
-        return maintainPlanCommitMapper.selectPage(pageReqVO);
+    public PageResult<MaintainPlanCommitRespVO> getMaintainPlanCommitPage(MaintainPlanCommitPageReqVO pageReqVO) {
+        String busiLine = SecurityFrameworkUtils.getBusiLine();
+        List<String> busiLineList = new ArrayList<>();
+        if (StringUtils.isNotEmpty(pageReqVO.getBusiLine())) {
+            busiLineList.add(pageReqVO.getBusiLine());
+        } else {
+            if (StringUtils.isNotEmpty(busiLine)) {
+                busiLineList.addAll(Arrays.asList(busiLine.split(",")));
+            }
+        }
+        pageReqVO.setBusiLineList(busiLineList);
+        //分页
+        IPage<MaintainPlanCommitRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
+        IPage<MaintainPlanCommitRespVO> page = maintainPlanCommitMapper.selectForPage(mpPage, pageReqVO);
+        addDataInspectionPlan(page.getRecords());
+        // 转换返回
+        return new PageResult<>(page.getRecords(), page.getTotal());
+    }
+
+    /**
+     * 回填部门/公司/角色
+     * @param list 分页对象
+     */
+    private void addDataInspectionPlan(List<MaintainPlanCommitRespVO> list ){
+        if(CollectionUtils.isEmpty(list)){
+            return ;
+        }
+        //公司
+        Set<Long> companyIds = list.stream().map(MaintainPlanCommitRespVO::getCompanyId).collect(Collectors.toSet());
+        //部门
+        Set<Long> deptIds = list.stream().map(MaintainPlanCommitRespVO::getDeptId).collect(Collectors.toSet());
+        deptIds.addAll(companyIds);
+        /*1.获取部门*/
+        Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(deptIds);
+
+        list.forEach(plan -> {
+            DeptRespDTO dept =  deptMap.get(plan.getDeptId());
+            if (dept != null) {
+                plan.setDeptName(dept.getName());
+
+            }
+            DeptRespDTO company =  deptMap.get(plan.getCompanyId());
+            if(company != null){
+                plan.setCompanyName(company.getName());
+            }
+        });
     }
 }
 \ No newline at end of file
@@ -103,7 +103,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
         //按照道路创建计划
         createReqVO.getRoadListReqVO().forEach(roadReqVO -> {
             MaintainPlanDO maintainPlan = BeanUtils.toBean(createReqVO, MaintainPlanDO.class);
-            String batchNo = "BN" + System.currentTimeMillis() + RandomUtil.randomInt(10000) + roadReqVO.getRoadId();
+            String batchNo = "BN" + System.currentTimeMillis() + RandomUtil.randomInt(1000, 9999) + roadReqVO.getRoadId();
             maintainPlan.setBatchNo(batchNo);
             maintainPlan.setPlanFinishNum(0);
             maintainPlan.setFinishState(FinishStateEnum.NOT_FINISHED.getStatus());
@@ -138,7 +138,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
                 roleList.add(maintainPlanRoleDO);
             });
             /*3.插入巡查计划明细*/
-            int index =1;
+            int index = 1;
             for (PeriodResult periodResult : calculate) {
                 MaintainPlanDetailDO entity = getMaintainPlanDetailDO(batchNo, createReqVO, roadReqVO, now);
                 ThreadUtil.sleep(2);
@@ -70,8 +70,14 @@ public class RoadServiceImpl implements RoadService {
     public void updateRoad(RoadUpdateReqVO updateReqVO) {
         // 校验存在
         //validateRoadExists(updateReqVO.getId());
+        LocalDateTime now = LocalDateTime.now();
+        String userId = SecurityFrameworkUtils.getLoginUserId() + "";
+        String userName = SecurityFrameworkUtils.getLoginUserNickname();
         // 更新
         RoadDO updateObj = BeanUtils.toBean(updateReqVO, RoadDO.class);
+        updateObj.setUpdateTime(now);
+        updateObj.setUpdaterName(userName);
+        updateObj.setUpdater(userId);
         roadMapper.updateById(updateObj);
     }
@@ -64,7 +64,7 @@
             AND b.road_name  LIKE CONCAT(#{req.roadName},'%')
         </if>
         <if test="req.roleName != null and req.roleName !=''">
-            AND a.role_name LIKE CONCAT(#{roleName},'%')
+            AND a.role_name LIKE CONCAT(#{req.roleName},'%')
         </if>
         <if test="req.companyId != null">
             and b.company_id = #{req.companyId}
@@ -9,4 +9,74 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
+    <select id="selectForPage" resultType="com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanCommitRespVO">
+        SELECT
+            a.batch_no,
+            a.plan_no,
+            b.plan_name,
+            b.road_id,
+            b.road_name,
+            b.level_id,
+            b.plan_attr,
+            b.plan_type_id,
+            b.cycle_id,
+            b.plan_num,
+            b.busi_line,
+            b.plan_finish_num,
+            a.begin_time,
+            a.end_time,
+            a.company_id,
+            a.dept_id,
+            a.finish_percent,
+            c.role_name,
+            c.finish_time,
+            c.user_name
+        FROM
+            garden_maintain_plan_detail a,
+            garden_maintain_plan b,
+            (SELECT plan_no, role_name , finish_time,user_id,user_name  FROM garden_maintain_plan_commit ORDER BY id ASC LIMIT 1) c
+        WHERE
+            a.batch_no = b.batch_no
+          AND a.plan_no = c.plan_no
+        <if test="req.planNo != null and req.planNo !=''">
+            and a.plan_no = #{req.planNo}
+        </if>
+        <if test="req.planName != null and req.planName !=''">
+            and a.plan_name = #{req.planName}
+        </if>
+        <if test="req.roadName != null and req.roadName !=''">
+            AND b.road_name  LIKE CONCAT(#{req.roadName},'%')
+        </if>
+        <if test="req.levelId != null">
+            and b.level_id = #{req.levelId}
+        </if>
+        <if test="req.busiLineList != null and req.busiLineList.size() > 0">
+            AND b.busi_line IN
+            <foreach collection="req.busiLineList" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="req.planTypeId != null">
+            and b.plan_type_id = #{req.planTypeId}
+        </if>
+        <if test="req.planAttr != null">
+            and b.plan_attr = #{req.planAttr}
+        </if>
+        <if test="req.companyId != null">
+            and a.company_id = #{req.companyId}
+        </if>
+        <if test="req.deptId != null">
+            and a.dept_id = #{req.deptId}
+        </if>
+        <if test="req.roleName != null and req.roleName !=''">
+            AND c.role_name  LIKE CONCAT(#{req.roleName},'%')
+        </if>
+        <if test="req.userName != null and req.userName !=''">
+            AND c.user_name  LIKE CONCAT(#{req.userName},'%')
+        </if>
+        <if test="req.finishTime != null">
+            AND DATE_FORMAT(c.finish_time, '%Y-%m-%d') = #{req.finishTime}
+        </if>
+    </select>
+
 </mapper>
 \ No newline at end of file
@@ -94,7 +94,7 @@ public class DeptController {
     @GetMapping("/sub-list")
     @Operation(summary = "获取二级部门列表")
-    @PreAuthorize("@ss.hasPermission('system:dept:query')")
+    //@PreAuthorize("@ss.hasPermission('system:dept:query')")
     public CommonResult<List<DeptRespVO>> getSubDeptList() {
         List<DeptDO> list = deptService.getSubDeptList();
         return success(BeanUtils.toBean(list, DeptRespVO.class));
@@ -102,7 +102,7 @@ public class DeptController {
     @GetMapping("/last-list")
     @Operation(summary = "获取最末级部门列表")
-    @PreAuthorize("@ss.hasPermission('system:dept:query')")
+    //@PreAuthorize("@ss.hasPermission('system:dept:query')")
     public CommonResult<List<DeptRespVO>> getLastDeptList(@RequestParam("id") Long id) {
         List<DeptDO> list = deptService.getLastDeptList(id);
         return success(BeanUtils.toBean(list, DeptRespVO.class));
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zteits.urbanops.framework.common.enums.CommonStatusEnum;
 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
 import com.zteits.urbanops.framework.datapermission.core.annotation.DataPermission;
+import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
 import com.zteits.urbanops.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
 import com.zteits.urbanops.module.system.controller.admin.dept.vo.dept.DeptSaveReqVO;
 import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
@@ -21,6 +22,7 @@ import org.springframework.validation.annotation.Validated;
 import jakarta.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertSet;
@@ -181,7 +183,16 @@ public class DeptServiceImpl implements DeptService {
     @Override
     public List<DeptDO> getSubDeptList() {
-        return deptMapper.selectList(DeptDO::getParentId,100);
+        List<DeptDO> list = deptMapper.selectList(DeptDO::getParentId, 100);
+        Long companyId = SecurityFrameworkUtils.getCompanyId();
+        if(companyId == null){
+            return list;
+        }
+        //超级管理员全返回
+        if(companyId.equals(100L)){
+            return list;
+        }
+        return list.stream().filter(dept -> dept.getId().equals(companyId)).collect(Collectors.toList());
     }
     @Override