Merge remote-tracking branch 'origin/master'

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtSupplierManageController.java

@@ -64,6 +64,12 @@ public class ExtSupplierManageController<V extends ExtSupplierManageVO, S extend
         extSupplierManageService.generateSupplierNumber(extSupplierManageVO);
         return ApiResult.ok(ApiResult.SUCCESS, "更新供方编号成功");
     }
+
+    @ApiOperation("供应商停用")
+    @PostMapping(value = "/contextDisable")
+    public ApiResult contextDisable(@RequestParam("id") Long id) {
+        return ApiResult.ok(extSupplierManageService.contextDisable(id), "操作完成");
+    }
 }
 
 

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/ExtSupplierManageService.java

@@ -17,6 +17,7 @@ import java.util.List;
 public interface ExtSupplierManageService<V extends ExtSupplierManageVO> extends ExtSupplierManageServiceShadow<V> {
     /**
      * 流程启动
+     *
      * @param id
      * @return
      */
@@ -26,6 +27,7 @@ public interface ExtSupplierManageService<V extends ExtSupplierManageVO> extends
 
     /**
      * 导出
+     *
      * @param searchQueryCondition
      * @param warningDay
      * @return
@@ -34,6 +36,7 @@ public interface ExtSupplierManageService<V extends ExtSupplierManageVO> extends
 
     /**
      * 修改供应商编码
+     *
      * @param extSupplierManageVO
      */
     void generateSupplierNumber(ExtSupplierManageVO extSupplierManageVO);
@@ -42,4 +45,12 @@ public interface ExtSupplierManageService<V extends ExtSupplierManageVO> extends
      * 定时任务修改状态
      */
     void changeSupplierStatus();
+
+    /**
+     * 停用
+     *
+     * @param id
+     * @return
+     */
+    ExtSupplierManageVO contextDisable(Long id);
 }

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/impl/ExtPlanServiceImpl.java

@@ -256,20 +256,20 @@ public class ExtPlanServiceImpl<V extends ExtPlanVO> implements ExtPlanService<V
      * 设置计划值
      */
     private void settingPlan(ExcelReader reader) {
-        reader.addHeaderAlias("操作", "operate");
+        reader.addHeaderAlias("操作*", "operate");
         reader.addHeaderAlias("计划级别", "planLevel");
-        reader.addHeaderAlias("计划编号", "number");
+        reader.addHeaderAlias("计划编号*", "number");
         reader.addHeaderAlias("父级计划编号", "superPlanCode");
-        reader.addHeaderAlias("计划名称", "name");
+        reader.addHeaderAlias("计划名称*", "name");
         reader.addHeaderAlias("业务计划类型", "businessPlanType");
         reader.addHeaderAlias("阶段状态", "phaseState");
-        reader.addHeaderAlias("反馈类型", "feedbackType");
+        reader.addHeaderAlias("反馈类型*", "feedbackType");
         /*reader.addHeaderAlias("是否产生计划任务", "hasPlanTasks");*/
         reader.addHeaderAlias("合同编号", "contractNo");
-        reader.addHeaderAlias("计划执行人", "planExecutor");
+        reader.addHeaderAlias("计划执行人*", "planExecutor");
         reader.addHeaderAlias("工期", "constructPeriod");
-        reader.addHeaderAlias("开始时间", "startTime");
-        reader.addHeaderAlias("完成时间", "completeTime");
+        reader.addHeaderAlias("开始时间*", "startTime");
+        reader.addHeaderAlias("完成时间*", "completeTime");
         //文件分类
 /*        reader.addHeaderAlias("文件分类", "fileType");
         reader.addHeaderAlias("文件名称", "fileName");
@@ -280,7 +280,7 @@ public class ExtPlanServiceImpl<V extends ExtPlanVO> implements ExtPlanService<V
         reader.addHeaderAlias("审核者", "review");
         reader.addHeaderAlias("批准者", "approver");
         reader.addHeaderAlias("审定者", "verifier");*/
-        reader.addHeaderAlias("密级", "secretCode");
+        reader.addHeaderAlias("密级*", "secretCode");
     }
 
     /**

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/impl/ExtSupplierManageServiceImpl.java

@@ -153,6 +153,18 @@ public class ExtSupplierManageServiceImpl<V extends ExtSupplierManageVO> impleme
             this.changeStatus(id, "Expired", true);
         }
     }
+
+    @Override
+    public ExtSupplierManageVO contextDisable(Long id) {
+        ExtSupplierManageVO extSupplierManageVO = this.get(id);
+        if (extSupplierManageVO == null) {
+            throw new DxBusinessException("500", "获取不到对象");
+        }
+        if (!extSupplierManageVO.getState().equals(Constants.RELEASE)) {
+            throw new DxBusinessException("500", "该对象不是编制状态");
+        }
+        return this.changeStatus(extSupplierManageVO.getId(), Constants.CONTEXT_DISABLE, true);
+    }
 }