年度计划导出

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

@@ -121,7 +121,7 @@ public class PlanYearsController extends BaseController {
     @ApiOperation(value = "申请修改年度计划")
     @PostMapping("/appUpdate")
     public AjaxResult appUpdate(@RequestBody PlanYearsStandardVo yearsStandardVo) {
-        return planYearsService.reviewReturn(yearsStandardVo);
+        return planYearsService.appUpdate(yearsStandardVo);
     }
 
     @ApiOperation(value = "发函催告")

purchase-system/src/main/java/com/ozs/plan/doman/PlanYears.java

@@ -44,9 +44,9 @@ public class PlanYears {
     /**
      * 项目类型（0：装备类；1：物资类；2：服务类；3：工程类）
      */
-    @Excel(name = "项目类型")
     @NotNull(message = "项目类型不能为空")
     private String projectType;
+    @Excel(name = "项目类型")
     @TableField(exist = false)
     private String projectTypeStr;
     /**
@@ -69,46 +69,47 @@ public class PlanYears {
     /**
      * 采购服务站
      */
-    @Excel(name = "采购服务站")
     @NotNull(message = "采购服务站不能为空")
     private String purchaseServices;
+    @Excel(name = "采购服务站")
     @TableField(exist = false)
     private String purchaseServicesStr;
     /**
      * 采购方式 (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)
      */
-    @Excel(name = "采购方式")
     @NotNull(message = "采购方式不能为空")
     private String purchaseMode;
+    @Excel(name = "采购方式")
     @TableField(exist = false)
     private String purchaseModeStr;
     /**
      * 计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）
      */
-    @Excel(name = "提报需求时间")
+    @Excel(name = "提报需求时间", dateFormat = "yyyy-MM-dd")
     @NotNull(message = "计划提报需求时间不能为空")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date planDemandSubTime;
     /**
      * 计划完成采购时间--->公示中标结果的日期，即填制中标信息的日期（具体到月）
      */
-    @Excel(name = "完成采购时间")
+    @Excel(name = "完成采购时间", dateFormat = "yyyy-MM-dd")
     @NotNull(message = "计划完成采购时间不能为空")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date planPurchaseFinishTime;
     /**
      * 计划交付时间--->供应商完成并交付后，使用单位收到标的日期，即填制建设文档的日期
      */
-    @Excel(name = "交付（实施）时间")
+    @Excel(name = "交付（实施）时间", dateFormat = "yyyy-MM-dd")
     @NotNull(message = "计划交付时间不能为空")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date planDeliverTime;
     /**
      * 项目属性--->应急应战项目、重大规划任务项目、规划任务项目或一般项目
      */
-    @Excel(name = "项目属性")
     @NotNull(message = "项目属性不能为空")
     private String projectAttr;
+
+    @Excel(name = "项目属性")
     @TableField(exist = false)
     private String projectAttrStr;
     /**

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

@@ -3,7 +3,7 @@ package com.ozs.plan.doman.vo.responseVo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
-import com.ozs.system.domain.SysFileRef;
+import com.ozs.system.domain.SysFileInfo;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -113,8 +113,8 @@ public class PlanYearsResponseVo implements Serializable {
     private String refuseReason;
 
     /**
-     * 上传附件的URL
+     * 已上传的关联附件信息
      */
-    HashMap<String, String> fileMap;
+    List<SysFileInfo> fileInfos;
 
 }

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

@@ -198,14 +198,14 @@ public class PlanYearsServiceImpl implements PlanYearsService {
         map.put("red_id", byId.getPlanYearId());
         map.put("type", "1");
         List<SysFileRef> fileRefs = sysFileRefMapper.selectByMap(map);
+        List<SysFileInfo> fileInfos = new ArrayList<>();
         BeanUtils.copyProperties(byId, responseVo);
         if (!ObjectUtils.isEmpty(fileRefs)) {
-            HashMap<String, String> fileMap = new HashMap<>();
             for (SysFileRef ref : fileRefs) {
                 SysFileInfo fileInfo = fileService.getById(ref.getFileId());
-                fileMap.put(fileInfo.getFileUrl(), fileInfo.getFileName());
+                fileInfos.add(fileInfo);
             }
-            responseVo.setFileMap(fileMap);
+            responseVo.setFileInfos(fileInfos);
         }
         return AjaxResult.success(responseVo);
     }
@@ -486,7 +486,7 @@ public class PlanYearsServiceImpl implements PlanYearsService {
                 }
             }
             //项目属性是拼接的
-            if (planYear.getProjectAttr().length() > 2) {
+            if (planYear.getProjectAttr().length() > 1) {
                 StringBuilder builder = new StringBuilder();
                 String[] split = planYear.getProjectAttr().split("，");
                 for (String s : split) {
@@ -497,7 +497,7 @@ public class PlanYearsServiceImpl implements PlanYearsService {
                         }
                     }
                 }
-                planYear.setProjectAttr(builder.toString());
+                planYear.setProjectAttrStr(builder.toString());
             } else {
                 for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
                     if (planYear.getProjectAttr().equals(entry.getValue())) {