新需求变更--导入导出字段整理

purchase-admin/src/main/java/com/ozs/web/controller/plan/PlanQuarterController.java

@@ -253,25 +253,20 @@ public class PlanQuarterController extends BaseController {
     public AjaxResult upLoadPlanFile(@RequestBody PlanQuarterStandardVo quarterStandardVo) {
         return quarterService.upLoadPlanFile(quarterStandardVo);
     }
-    //
-    //@ApiOperation(value = "下载计划关联文件")
-    //@PostMapping("/downLoadPlanFile")
-    //public AjaxResult downLoadPlanFile(@RequestBody PlanQuarterStandardVo quarterStandardVo) {
-    //    return quarterService.downLoadPlanFile(quarterStandardVo);
-    //}
 
-    @ApiOperation(value = "导入季度计划数据")
-    @PostMapping("/importData")
-    @PreAuthorize("@ss.hasPermi('plan:quarter:importData')")
-    @Log(title = ModularConstans.planQuarter, businessType = BusinessType.INSERT)
-    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
-        ExcelUtil<PlanQuarterStandardVo> util = new ExcelUtil<>(PlanQuarterStandardVo.class);
-        List<PlanQuarterStandardVo> quarter = util.importExcel(file.getInputStream());
-        //获取采购单位-
-        LoginUser loginUser = getLoginUser();
-        String message = quarterService.importPlanQuarter(quarter, updateSupport, loginUser);
-        return success(message);
-    }
+    //季度计划不能自己创建
+    //@ApiOperation(value = "导入季度计划数据")
+    //@PostMapping("/importData")
+    //@PreAuthorize("@ss.hasPermi('plan:quarter:importData')")
+    //@Log(title = ModularConstans.planQuarter, businessType = BusinessType.INSERT)
+    //public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
+    //    ExcelUtil<PlanQuarterStandardVo> util = new ExcelUtil<>(PlanQuarterStandardVo.class);
+    //    List<PlanQuarterStandardVo> quarter = util.importExcel(file.getInputStream());
+    //    //获取采购单位-
+    //    LoginUser loginUser = getLoginUser();
+    //    String message = quarterService.importPlanQuarter(quarter, updateSupport, loginUser);
+    //    return success(message);
+    //}
 
     @ApiOperation("模板下载")
     @GetMapping("/downloaExcel")

purchase-system/src/main/java/com/ozs/plan/doman/vo/responseVo/PlanQuarterResponseVo.java

@@ -63,30 +63,28 @@ public class PlanQuarterResponseVo implements Serializable {
      * 机关业务指导处(科)
      */
     private String organDivision;
-    @Excel(name = "机关业务指导处(科)")
     private String organDivisionStr;
     /**
      * 预算科目
      */
     private String budgetAccount;
-    @Excel(name = "预算科目")
     private String budgetAccountStr;
     /**
      * 计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）
      */
-    @Excel(name = "提报需求时间", dateFormat = "yyyy-MM")
+    @Excel(name = "计划提报需求时间", dateFormat = "yyyy-MM")
     @JsonFormat(pattern = "yyyy-MM")
     private Date planDemandSubTime;
     /**
      * 计划完成采购时间--->公示中标结果的日期，即填制中标信息的日期（具体到月）
      */
-    @Excel(name = "完成采购时间", dateFormat = "yyyy-MM")
+    @Excel(name = "计划完成采购时间", dateFormat = "yyyy-MM")
     @JsonFormat(pattern = "yyyy-MM")
     private Date planPurchaseFinishTime;
     /**
      * 计划交付时间--->供应商完成并交付后，使用单位收到标的日期，即填制建设文档的日期
      */
-    @Excel(name = "交付（实施）时间", dateFormat = "yyyy-MM")
+    @Excel(name = "计划交付（实施）时间", dateFormat = "yyyy-MM")
     @JsonFormat(pattern = "yyyy-MM")
     private Date planDeliverTime;
     /**
@@ -114,6 +112,7 @@ public class PlanQuarterResponseVo implements Serializable {
      * 项目状态--->包括计划待提交、计划待审核、计划已退回、计划已审核
      * (0:计划待提交，1:计划待审核，2:计划已退回，3:计划已审核)
      */
+    @Excel(name = "项目状态")
     private String projectStatus;
 
     /**

purchase-system/src/main/java/com/ozs/plan/doman/vo/responseVo/PlanYearsResponseVo.java

@@ -1,7 +1,6 @@
 package com.ozs.plan.doman.vo.responseVo;
 
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
 import com.ozs.system.domain.SysFileInfo;

purchase-system/src/main/java/com/ozs/plan/service/PlanQuarterService.java

@@ -136,14 +136,6 @@ public interface PlanQuarterService extends IService<PlanQuarter> {
      */
     AjaxResult upLoadPlanFile(PlanQuarterStandardVo quarterStandardVo);
 
-    /**
-     * 下载计划关联文件
-     *
-     * @param quarterStandardVo 季度计划
-     * @return 结果
-     */
-    AjaxResult downLoadPlanFile(PlanQuarterStandardVo quarterStandardVo);
-
     /**
      * 查询审核分页
      */

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanQuarterServiceImpl.java

@@ -559,12 +559,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         return AjaxResult.success();
     }
 
-    @Override
-    public AjaxResult downLoadPlanFile(PlanQuarterStandardVo quarterStandardVo) {
-
-        return AjaxResult.success();
-    }
-
     @Override
     public List<PlanQuarter> queryPage(PlanQuarterStandardVo vo) {
         List<PlanQuarter> query = planQuarterMapper.query(vo);

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java

@@ -345,6 +345,16 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     @Transactional
     @Override
     public String importPlanYears(List<PlanYearsStandardVo> planYears, boolean isUpdateSupport, LoginUser loginUser) {
+        //获取字典数据
+        HashMap<String, HashMap<String, String>> planEnums = dictTypeService.getAboutEnums();
+        //项目属性
+        HashMap<String, String> projectAttributes = planEnums.get("projectAttributes");
+        //项目类型
+        HashMap<String, String> projectTypesMap = planEnums.get("projectTypes");
+        //预算科目
+        HashMap<String, String> budgetAccountMap = planEnums.get("budgetAccount");
+        //采购服务站
+        HashMap<String, String> purchaseServicesMap = planEnums.get("purchaseServices");
         if (StringUtils.isNull(planYears) || planYears.size() == 0) {
             throw new ServiceException("导入年度计划数据不能为空！");
         }
@@ -355,9 +365,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             ofYears.setPurchaseDeptName(yearsStandardVo.getPurchaseDeptId());
             plans.add(ofYears);
         }
-        HashMap<String, HashMap<String, String>> planEnums = dictTypeService.getAboutEnums();
-        HashMap<String, String> projectTypesMap = planEnums.get("projectTypes");
-        HashMap<String, String> projectAttributes = planEnums.get("projectAttributes");
 
         int successNum = 0;
         int failureNum = 0;
@@ -378,6 +385,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                         failureMsg.append("*" + failureNum + "*采购单位“" + ofYear.getPurchaseDeptName() + "”不存在");
                     }
                     ofYear.setProjectType(projectTypesMap.get(ofYear.getProjectType()));
+                    ofYear.setPurchaseServices(purchaseServicesMap.get(ofYear.getPurchaseServices()));
+                    ofYear.setBudgetAccount(budgetAccountMap.get(ofYear.getBudgetAccount()));
                     ofYear.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
                     //项目属性是多选字段
                     StringBuilder builder = new StringBuilder();