Merge branch 'dev'

王富生
2 parents 7ec780bc ce765f0c
Showing 4 changed files with 22 additions and 6 deletions
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/enums/ErrorCodeConstants.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
@@ -114,10 +114,15 @@ public class CostFeeController{
         // 设置下载响应头
         response.reset();
         response.setContentType(EXCEL_MIME_TYPE);
-       // response.setCharacterEncoding("UTF-8");
-        String encodedName = URLEncoder.encode(downloadFileName, "UTF-8").replaceAll("\\+", "%20");
-        response.setHeader("Content-Disposition", "attachment;filename=" + encodedName);
-        response.setHeader("Cache-Control", "no-store"); // 禁止缓存
+        // 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);
@@ -204,7 +209,7 @@ public class CostFeeController{
             String unit = cell.getStringCellValue();
             // 默认赋值【第一个单位】，你可以根据业务改成其他值
             if (!StringUtils.isEmpty(unit)) {
-                cell.setCellValue(options.get(2));
+                cell.setCellValue(options.get(0));
             }
         }
@@ -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, "养护频次已存在");
@@ -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);
@@ -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);