Merge remote-tracking branch 'origin/master'

戈灵虎
2 parents 54a328ba 68c7e7df
Showing 16 changed files with 212 additions and 58 deletions
urbanops-framework/urbanops-common/src/main/java/com/zteits/urbanops/framework/common/util/validation/ValidationUtils.java
urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/material/MaterialInventoryOutDto.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/CostFeeController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AppGardenWorkOrderConvert.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/ErrorCodeConstants.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/costfee/CostFeeServiceImpl.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/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/materialinventoryout/MaterialInventoryOutServiceImpl.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailSaveReqVO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/enums/BusiLineTeamLeaderRoleCodeEnum.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/enums/BusiLineWorkerRoleCodeEnum.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/materialdetail/MaterialDetailServiceImpl.java
urbanops-server/src/main/resources/application-dev.yaml
@@ -18,8 +18,9 @@ import java.util.regex.Pattern;
  */
 public class ValidationUtils {
-    private static final Pattern PATTERN_MOBILE = Pattern.compile("^(?:(?:\\+|00)86)?1(?:(?:3[\\d])|(?:4[0,1,4-9])|(?:5[0-3,5-9])|(?:6[2,5-7])|(?:7[0-8])|(?:8[\\d])|(?:9[0-3,5-9]))\\d{8}$");
-
+    //private static final Pattern PATTERN_MOBILE = Pattern.compile("^(?:(?:\\+|00)86)?1(?:(?:3[\\d])|(?:4[0,1,4-9])|(?:5[0-3,5-9])|(?:6[2,5-7])|(?:7[0-8])|(?:8[\\d])|(?:9[0-3,5-9]))\\d{8}$");
+    //add by wq 20260327 手机号码校验覆盖全号段
+    private static final Pattern PATTERN_MOBILE = Pattern.compile("^(?:\\+86|0086)?1[3-9]\\d{9}$");
     private static final Pattern PATTERN_URL = Pattern.compile("^(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]");
     private static final Pattern PATTERN_XML_NCNAME = Pattern.compile("[a-zA-Z_][\\-_.0-9_a-zA-Z$]*");
@@ -51,5 +52,4 @@ public class ValidationUtils {
             throw new ConstraintViolationException(constraintViolations);
         }
     }
-
 }
@@ -17,6 +17,9 @@ public class MaterialInventoryOutDto {
     @Schema(description = "入库ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "18713")
     private Long id;
+    @Schema(description = "库存ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "111")
+    private Long inventoryId;
+
     @Schema(description = "物料ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14541")
     @NotNull(message = "物料ID不能为空")
     private Long materialId;
@@ -5,16 +5,24 @@ import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
 import com.zteits.urbanops.module.garden.controller.admin.costfee.vo.WaterFeeImport;
 import com.zteits.urbanops.module.garden.enums.TemplateEnum;
 import com.zteits.urbanops.module.garden.service.costfee.CostFeeService;
+import com.zteits.urbanops.module.system.api.dept.DeptApi;
+import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.security.PermitAll;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddressList;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -23,7 +31,6 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Method;
 import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.util.*;
 import static com.zteits.urbanops.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
@@ -49,6 +56,12 @@ public class CostFeeController{
     @Value("${static.resource.server.enable}")
     private Boolean staticResourceServerenable;
+    @Autowired
+    private ResourceLoader resourceLoader;
+
+    @jakarta.annotation.Resource
+    private DeptApi deptApi;
+
     // Excel文件校验相关
     private static final List<String> ALLOWED_EXCEL_SUFFIX = Arrays.asList(".xlsx", ".xlsm");
     private static final String EXCEL_MIME_TYPE = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
@@ -59,6 +72,7 @@ public class CostFeeController{
      */
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入用户模板")
+    @PermitAll
     public void importTemplate(HttpServletResponse response,
                                @RequestParam("templateName") String templateName) throws IOException {
         // 参数校验
@@ -74,29 +88,150 @@ public class CostFeeController{
             return;
         }
-        if (staticResourceServerenable) {
-            // 构建完整的静态服务器URL（确保路径正确）
-            String serverUrl = staticResourceServerUrl;
-            if (serverUrl != null && !serverUrl.endsWith("/")) {
-                serverUrl += "/"; // 确保URL以/结尾，避免拼接错误
-            }
+        writeAndModifyTemplate(response, template.getName(), template.getStartIndex());
+    }
+
+    private void writeAndModifyTemplate(HttpServletResponse response,
+                                    String downloadFileName,
+                                    int startIndexRow) throws IOException {
+
+        // 拼接模板路径
+        String serverUrl = staticResourceServerUrl;
+        if (serverUrl != null && !serverUrl.endsWith("/")) {
+            serverUrl += "/";
+        }
+        String fullPath = serverUrl + downloadFileName;
+        fullPath = fullPath.replace("\\", "/");
+
+        Resource resource = resourceLoader.getResource(fullPath);
+
+        // 检查文件是否存在
+        if (!resource.exists()) {
+            response.sendError(HttpServletResponse.SC_NOT_FOUND, "模板文件不存在");
+            return;
+        }
+
+        // 设置下载响应头
+        response.reset();
+        response.setContentType(EXCEL_MIME_TYPE);
+        // response.setCharacterEncoding("UTF-8");
+        String encodedName = URLEncoder.encode(downloadFileName, "UTF-8");
+        // 标准文件名编码（Chrome / Edge / Firefox 全兼容）
+        response.setHeader("Content-Disposition", "attachment;filename*=UTF-8''" + encodedName);
+        // 浏览器缓存配置（必须）
+        response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
+        response.setHeader("Pragma", "no-cache");
+        response.setHeader("Expires", "0");
+
+
+        try (InputStream in = resource.getInputStream();
+             XSSFWorkbook workbook = new XSSFWorkbook(in);
+             OutputStream out = response.getOutputStream()) {
-            String encodedFileName = URLEncoder.encode(template.getName().split("\\.")[0], StandardCharsets.UTF_8.name());
+             Sheet sheet = workbook.getSheetAt(0);
-            String templateFileName = encodedFileName + "." + template.getName().split("\\.")[1];
+            // ==============================================
+            // 获取最新单位列表
+            // ==============================================
+            List<DeptRespDTO> companyList = deptApi.getSubDeptList();
+            List<String> newUnits = companyList.stream()
+                    .map(DeptRespDTO::getName)
+                    .filter(Objects::nonNull)
+                    .toList();
-            String templateUrl = serverUrl +  templateFileName; // 包含templates目录
+            log.info("加载到单位列表：{}，共{}条", newUnits, newUnits.size());
-            // 方式1：重定向到静态资源服务器
-            response.sendRedirect(templateUrl);
-        } else {
-            String templateFileName = templateName + "." + template.getName().split("\\.")[1];
+            // ==============================================
+            // 生成新下拉 + 自动赋值
+            // ==============================================
+            createDropdownAndSetValue(sheet, newUnits, startIndexRow);
+
+            // 写入并强制刷新
+            workbook.write(out);
+            out.flush();
-            // 写入模板文件到响应
-            writeTemplateToResponse(response, template.getName(), templateFileName);
+        } catch (Exception e) {
+            log.error("模板处理失败", e);
+            throw new IOException("文件处理失败", e);
         }
     }
+    /**
+     * 创建下拉框 + 给单元格赋值
+     */
+    private void createDropdownAndSetValue(Sheet sheet, List<String> options, int startRow) {
+        if (options.isEmpty()) {
+            log.error("下拉选项为空，不创建");
+            return;
+        }
+
+        // 获取表头行
+        Row headerRow = sheet.getRow(startRow - 1);
+        if (headerRow == null) {
+            log.error("表头行不存在：{}", startRow - 1);
+            return;
+        }
+
+        // 查找“所属单位”列
+        int targetCol = -1;
+        for (Cell cell : headerRow) {
+            if (cell != null && cell.getCellType() == CellType.STRING) {
+                String val = cell.getStringCellValue().trim();
+                if (val.contains("所属单位") || val.contains("所属公司") ) {
+                    targetCol = cell.getColumnIndex();
+                    break;
+                }
+            }
+        }
+
+        if (targetCol == -1) {
+            log.error("未找到【所属单位】列表头");
+            return;
+        }
+
+        // 取消列隐藏
+        sheet.setColumnHidden(targetCol, false);
+
+        // ==============================================
+        // 遍历行：清空原有内容 + 设置默认值
+        // ==============================================
+        int endRow = 100;
+        for (int r = startRow; r <= endRow; r++) {
+            Row row = sheet.getRow(r);
+            if (row == null) {
+                row = sheet.createRow(r);
+            }
+
+            Cell cell = row.getCell(targetCol);
+            if (cell == null) {
+                cell = row.createCell(targetCol);
+            }
+            String unit = cell.getStringCellValue();
+            // 默认赋值【第一个单位】，你可以根据业务改成其他值
+            if (!StringUtils.isEmpty(unit)) {
+                cell.setCellValue(options.get(0));
+            }
+        }
+
+        // ==============================================
+        // 创建下拉框（作用范围：startRow ~ 1000行）
+        // ==============================================
+        CellRangeAddressList regions = new CellRangeAddressList(startRow, endRow, targetCol, targetCol);
+        DataValidationHelper helper = sheet.getDataValidationHelper();
+        DataValidationConstraint constraint = helper.createExplicitListConstraint(
+                options.toArray(new String[0])
+        );
+        DataValidation validation = helper.createValidation(constraint, regions);
+        // 下拉框基础配置
+        validation.setEmptyCellAllowed(true);
+        validation.setSuppressDropDownArrow(true); // 显示箭头
+        validation.setShowErrorBox(true);
+        validation.setShowPromptBox(true); // 启用点击弹出提示
+        sheet.addValidationData(validation);
+
+        log.info("【成功】为列{}添加下拉并赋值，行{}~{}，选项数：{}",
+                targetCol, startRow, endRow, options.size());
+    }
     /**
      * Excel文件上传预览
@@ -214,31 +349,6 @@ public class CostFeeController{
     }
     /**
-     * 写入模板文件到响应流
-     */
-    private void writeTemplateToResponse(HttpServletResponse response, String filename, String templatePath) throws IOException {
-        // 设置响应头
-        response.setContentType(EXCEL_MIME_TYPE);
-        response.setCharacterEncoding("UTF-8");
-        String encodedFileName = URLEncoder.encode(filename, "UTF-8").replaceAll("\\+", "%20");
-        response.setHeader("Content-Disposition", "attachment;filename=" + encodedFileName);
-        response.setHeader("Cache-Control", "no-store"); // 禁止缓存
-
-        // 读取模板文件并写入响应
-        try (InputStream in = new ClassPathResource("template/" + templatePath).getInputStream();
-             OutputStream out = response.getOutputStream()) {
-
-            byte[] buffer = new byte[4096];
-            int bytesRead;
-            while ((bytesRead = in.read(buffer)) != -1) {
-                out.write(buffer, 0, bytesRead);
-            }
-            out.flush();
-        }
-    }
-
-
-    /**
      * 校验Excel文件有效性（后缀+MIME类型）
      */
     private boolean isValidExcelFile(MultipartFile file) {
@@ -24,7 +24,7 @@ public interface AppGardenWorkOrderConvert {
         orderReqVO.setPressingType(2);//紧急
         orderReqVO.setOrderName(inspectionPlanDO.getPlanName());
         orderReqVO.setSourceId(1);//来源ID 工单来源  1、巡查
-        orderReqVO.setSourceName("园林巡查上报");
+        orderReqVO.setSourceName("巡查上报");
         orderReqVO.setThirdWorkNo(planNo);
         orderReqVO.setOrderType("C");
         orderReqVO.setPressingType(createReqVO.getPressingType());
@@ -87,9 +87,11 @@ public interface ErrorCodeConstants {
     ErrorCode INSPECTION_CYCLE_ERROR = new ErrorCode(1-200-100-003, "获取两个时间之间间隔天数错误");
     ErrorCode INSPECTION_PLAN_EXISTS = new ErrorCode(1-200-100-007, "道路对应类型已存在记录");
     ErrorCode INSPECTION_PLAN_NOT_ALLOW_DELETE = new ErrorCode(1-100-007-005, "计划已开始执行不能删除");
+    ErrorCode INSPECTION_COMMIT_PLAN__EXISTS = new ErrorCode(1-100-007-005, "巡检计划明细已提交");
     // ========== 养护计划汇总 TODO 补充编号 ==========
     ErrorCode MAINTAIN_PLAN_NOT_EXISTS = new ErrorCode(1-100-007-001, "养护计划汇总不存在");
+    ErrorCode MAINTAIN_COMMIT_PLAN__EXISTS = new ErrorCode(1-100-007-007, "养护计划明细已提交");
     //========== 频次 TODO 补充编号 ==========
     ErrorCode PLAN_RATE_EXISTS = new ErrorCode(1-100-007-001, "养护频次已存在");
@@ -206,6 +206,8 @@ public class CostFeeServiceImpl implements CostFeeService {
             log.info("数据列表为空，跳过插入操作");
             return;
         }
+        //总公司
+        DeptRespDTO deptRespDTO = deptApi.getDept(getCompanyId());
         //单位集合
         List<DeptRespDTO>  companyList = deptApi.getSubDeptList();
         // 1. 预加载部门映射（循环外加载，避免重复查询）
@@ -220,7 +222,7 @@ public class CostFeeServiceImpl implements CostFeeService {
                 ));
-                // 模板类型校验
+        // 模板类型校验
         Class<?> importClass = template.getImportClass(); // 从枚举获取导入类，避免switch
         // 根据不同模板类型执行不同的处理逻辑
         if (WaterFeeImport.class.isAssignableFrom(importClass)) {
@@ -239,8 +241,8 @@ public class CostFeeServiceImpl implements CostFeeService {
                         WaterFeeDO fee = new WaterFeeDO();
                         BeanUtils.copyProperties(importObj, fee);
                         fee.setCompanyId(String.valueOf(getCompanyId()));
-                        if (getCompanyId() == 100) {
-                            fee.setCompanyName("蓟城山水");
+                        if (deptRespDTO.getParentId() == 0) {
+                            fee.setCompanyName(Objects.toString(deptRespDTO.getName(), ""));
                         } else {
                             // 设置单位id
                             fee.setCompanyName(String.valueOf(companyIdToNamedMap.get(getCompanyId())));
@@ -612,7 +614,7 @@ public class CostFeeServiceImpl implements CostFeeService {
                     Set<ConstraintViolation<WaterFeeImport>> violations = validator.validate(importBean);
                     if (!violations.isEmpty()) {
                         // 收集所有校验错误信息（比如“用水量不能为空”“格式应为两位小数”）
-                       // StringBuilder errorMsg = new StringBuilder();
+                        // StringBuilder errorMsg = new StringBuilder();
                         for (ConstraintViolation<WaterFeeImport> violation : violations) {
                             //errorMsg.append(violation.getMessage()).append("；");
                             throw exception0(BAD_REQUEST.getCode() ,String.format(
@@ -644,13 +646,13 @@ public class CostFeeServiceImpl implements CostFeeService {
                         // 收集所有校验错误信息（比如“用水量不能为空”“格式应为两位小数”）
                         //StringBuilder errorMsg = new StringBuilder();
                         for (ConstraintViolation<PersonalCostImport> violation : violations) {
-                           // errorMsg.append(violation.getMessage()).append("；");
+                            // errorMsg.append(violation.getMessage()).append("；");
                             throw exception0(BAD_REQUEST.getCode() ,String.format(
                                     "第[{}]条数据："+ violation.getMessage()
                             ), rowNum);
                         }
                         // 抛出包含行号和所有错误的异常
-                       // throw exception0(BAD_REQUEST.getCode(), errorMsg.toString().trim(), violations);
+                        // throw exception0(BAD_REQUEST.getCode(), errorMsg.toString().trim(), violations);
                     }
                     Long companyId = nameToCompanyIdMap.get(importBean.getCompanyName());
                     //单位校验
@@ -766,9 +768,9 @@ public class CostFeeServiceImpl implements CostFeeService {
                     Set<ConstraintViolation<RentalMechanicalCostImport>> violations = validator.validate(importBean);
                     if (!violations.isEmpty()) {
                         // 收集所有校验错误信息（比如“用水量不能为空”“格式应为两位小数”）
-                       // StringBuilder errorMsg = new StringBuilder();
+                        // StringBuilder errorMsg = new StringBuilder();
                         for (ConstraintViolation<RentalMechanicalCostImport> violation : violations) {
-                           // errorMsg.append(violation.getMessage()).append("；");
+                            // errorMsg.append(violation.getMessage()).append("；");
                             throw exception0(BAD_REQUEST.getCode() ,String.format(
                                     "第[{}]条数据："+violation.getMessage()
                             ), rowNum);
@@ -18,6 +18,7 @@ import com.zteits.urbanops.module.garden.convert.AppGardenWorkOrderConvert;
 import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanCommitDO;
 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.maintainplan.MaintainPlanCommitDO;
 import com.zteits.urbanops.module.garden.dal.dataobject.road.RoadDO;
 import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanCommitMapper;
 import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanDetailMapper;
@@ -43,7 +44,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.INSPECTION_PLAN_NOT_EXISTS;
+import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*;
 /**
@@ -76,6 +77,10 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ
     @Override
     public Long createInspectionPlanCommit(InspectionPlanCommitSaveReqVO createReqVO) {
+        List<InspectionPlanCommitDO> list = inspectionPlanCommitMapper.selectList(InspectionPlanCommitDO::getPlanNo, createReqVO.getPlanNo());
+        if(!CollectionUtils.isEmpty(list)){
+            throw exception(INSPECTION_COMMIT_PLAN__EXISTS);
+        }
         // 插入
         InspectionPlanCommitDO inspectionPlanCommit = BeanUtils.toBean(createReqVO, InspectionPlanCommitDO.class);
         inspectionPlanCommitMapper.insert(inspectionPlanCommit);
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zteits.urbanops.framework.common.exception.ErrorCode;
 import com.zteits.urbanops.framework.common.pojo.CommonResult;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
@@ -89,6 +90,12 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public CommonResult<Integer> createInspectionPlan(InspectionPlanSaveReqVO createReqVO) {
+        createReqVO.getRoadListReqVO().forEach(road -> {
+            if (road.getDeptId() == null || road.getRoadId() == 0L) {
+                ErrorCode errorCode = new ErrorCode(INSPECTION_PLAN_NOT_EXISTS.getCode(), road.getRoadName()+"未配置部门信息,请在道路管理界面配置班组");
+                throw exception(errorCode);
+            }
+        });
         //存在性校验
         validateInspectionPlanExists(createReqVO);
         LocalDateTime now = LocalDateTime.now();
@@ -63,6 +63,10 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService 
     @Override
     public Long createMaintainPlanCommit(MaintainPlanCommitSaveReqVO createReqVO) {
+        List<MaintainPlanCommitDO> list = maintainPlanCommitMapper.selectList(MaintainPlanCommitDO::getPlanNo, createReqVO.getPlanNo());
+        if(!CollectionUtils.isEmpty(list)){
+            throw exception(MAINTAIN_PLAN_NOT_EXISTS);
+        }
         // 插入
         MaintainPlanCommitDO maintainPlanCommit = BeanUtils.toBean(createReqVO, MaintainPlanCommitDO.class);
         maintainPlanCommitMapper.insert(maintainPlanCommit);
@@ -6,6 +6,7 @@ import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zteits.urbanops.framework.common.exception.ErrorCode;
 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;
@@ -102,6 +103,12 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
     @Override
     public CommonResult<Integer> createMaintainPlan(MaintainPlanSaveReqVO createReqVO) {
+        createReqVO.getRoadListReqVO().forEach(road -> {
+            if (road.getDeptId() == null || road.getRoadId() == 0L) {
+                ErrorCode errorCode = new ErrorCode(INSPECTION_PLAN_NOT_EXISTS.getCode(), road.getRoadName() + "未配置部门信息,请在道路管理界面配置班组");
+                throw exception(errorCode);
+            }
+        });
         //存在性校验
         validateMaintainPlanExists(createReqVO);
         LocalDateTime now = LocalDateTime.now();
@@ -15,6 +15,7 @@ import com.zteits.urbanops.module.system.api.dept.DeptApi;
 import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
@@ -55,6 +56,7 @@ public class MaterialInventoryOutServiceImpl implements MaterialInventoryOutServ
         if(null == material){
             throw exception0(BAD_REQUEST.getCode(), "无效参数-materialId");
         }
+
         MaterialInventoryDO materialInventory = materialInventoryService.getMaterialInventory(createReqVO.getInventoryId());
         if(null == materialInventory){
             throw exception0(BAD_REQUEST.getCode(),createReqVO.getMaterialName()+"没有库存");
@@ -79,4 +79,7 @@ public class MaterialDetailSaveReqVO {
     @Schema(description = "规格", requiredMode = Schema.RequiredMode.REQUIRED, example = "规格")
     @NotEmpty(message = "规格不能为空")
     private String specifications;
+
+    @Schema(description = "库存ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "111")
+    private Long inventoryId;
 }
@@ -25,6 +25,10 @@ public enum BusiLineTeamLeaderRoleCodeEnum { // 注意：枚举类必须用enum
     ROLECODE_WY("wy", "team_leader_wy"),
     /** 市政业务线-角色编码 */
     ROLECODE_SZ("sz", "team_leader_sz"),
+    /** 秩序管理业务线-角色编码 */
+    ROLECODE_ZX("zx", "team_leader_zxgl"),
+    /** 环境卫生业务线-角色编码 */
+    ROLECODE_HJ("hj", "team_leader_hjws"),
     /** 园林业务线-角色编码 */
     ROLECODE_YL("yl", "team_leader_yl"); // 最后一个常量必须以分号结尾
@@ -25,6 +25,10 @@ public enum BusiLineWorkerRoleCodeEnum {
     ROLECODE_WORKER_WY("wy", "wy_worker"),
     /** 市政业务线-角色编码 */
     ROLECODE_WORKER_SZ("sz", "sz_worker"),
+    /** 环境卫生业务线-角色编码 */
+    ROLECODE_HJ("hj", "hjws_worker"),
+    /** 秩序管理业务线-角色编码 */
+    ROLECODE_ZX("zx", "zxgl_worker"),
     /** 园林业务线-角色编码 */
     ROLECODE_WORKER_YL("yl", "yl_worker"); // 最后一个常量必须以分号结尾
@@ -133,12 +133,13 @@ public class MaterialDetailServiceImpl implements MaterialDetailService {
 //            }
 //        }
         //耗材出库
-        for (MaterialDetailDO materialDetailDO : materialDetailList) {
+        for (MaterialDetailSaveReqVO materialDetailDO : createReqVO) {
             MaterialInventoryOutDto outDto = new MaterialInventoryOutDto();
             outDto.setMaterialId(materialDetailDO.getMaterialId());
             outDto.setMaterialName(materialDetailDO.getMaterialName());
-            outDto.setOutInventoryNum(materialDetailDO.getUserCount());
+            outDto.setOutInventoryNum(Long.valueOf(materialDetailDO.getUserCount()));
             outDto.setOutDate(LocalDateTime.now());
+            outDto.setInventoryId(materialDetailDO.getInventoryId());
             materialApi.createMaterialInventoryOut(outDto);
         }
         //保存耗材
@@ -251,7 +251,7 @@ wechat:
     tokenUrl: https://api.weixin.qq.com/cgi-bin/stable_token
     sendUrl: https://api.weixin.qq.com/cgi-bin/message/template/send
 siot:
-  roadUrl: https://iot.jichengshanshui.com.cn:28202/prod-api/fence/fenceInfo/getFenceRoadListByLocation
+  roadUrl: https://test.jichengshanshui.com.cn:28202/prod-api/fence/fenceInfo/getFenceRoadListByLocation
 # 高德地图配置
 amap: