发函催告

审核文件/计划附件 上传
年度计划导入

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

@@ -3,10 +3,12 @@ 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 lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author buzhanyi
@@ -108,5 +110,9 @@ public class PlanYearsResponseVo {
      */
     private String refuseReason;
 
+    /**
+     * 上传附件的URL
+     */
+    List<String> urlList;
 
 }

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

@@ -16,12 +16,14 @@ import com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo;
 import com.ozs.plan.doman.vo.responseVo.PlanYearsResponseVo;
 import com.ozs.plan.mapper.PlanYearsMapper;
 import com.ozs.plan.service.PlanYearsService;
+import com.ozs.system.domain.SysFileInfo;
 import com.ozs.system.domain.SysFileRef;
 import com.ozs.system.domain.vo.responseVo.SysDeptResponseVo;
 import com.ozs.system.mapper.SysDeptMapper;
 import com.ozs.system.mapper.SysFileRefMapper;
 import com.ozs.system.service.ISysDeptService;
 import com.ozs.system.service.ISysDictTypeService;
+import com.ozs.system.service.SysFileService;
 import com.ozs.system.service.impl.SysUserServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -56,6 +58,8 @@ public class PlanYearsServiceImpl implements PlanYearsService {
     SysFileRefMapper sysFileRefMapper;
     @Autowired
     private SysDeptMapper deptMapper;
+    @Autowired
+    private SysFileService fileService;
 
     @Override
     public List<PlanYears> selectPlanYearsList(PlanYearsStandardVo vo) {
@@ -138,14 +142,28 @@ public class PlanYearsServiceImpl implements PlanYearsService {
 
     @Override
     public AjaxResult view(PlanYearsStandardVo yearsStandardVo) {
-        PlanYearsResponseVo planYearsResponseVo = new PlanYearsResponseVo();
+
+        PlanYearsResponseVo responseVo = new PlanYearsResponseVo();
         PlanYears byId = planYearsMapper.getById(yearsStandardVo.getPlanYearId());
+        byId.getPlanYearId();
         if (byId == null) {
             return AjaxResult.error("数据查询失败");
         }
-        ArrayList<PlanYears> years = new ArrayList<>();
-        years.add(byId);
-        return AjaxResult.success(changeTo(years).get(0));
+        SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(byId.getPurchaseDeptId()).get("sysDept");
+        byId.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("red_id", byId.getPlanYearId());
+        map.put("type", "1");
+        List<SysFileRef> fileRefs = sysFileRefMapper.selectByMap(map);
+        BeanUtils.copyProperties(byId, responseVo);
+        if (fileRefs.size() > 0) {
+            List<String> urlList = new ArrayList<>();
+            for (SysFileRef ref : fileRefs) {
+                urlList.add(fileService.getById(ref.getFileId()).getFileUrl());
+            }
+            responseVo.setUrlList(urlList);
+        }
+        return AjaxResult.success(responseVo);
     }
 
     @Override
@@ -163,6 +181,20 @@ public class PlanYearsServiceImpl implements PlanYearsService {
         ofYears.setUpdateTime(new Date());
         ofYears.setSendLetter("0");
         planYearsMapper.updateById(ofYears);
+        List<SysFileRef> sysFileRefs = yearsStandardVo.getSysFileRefs();
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("red_id", ofYears.getPlanYearId());
+        map.put("type", "1");
+        sysFileRefMapper.deleteByMap(map);
+        for (SysFileRef ref : sysFileRefs) {
+            ref.setRedId(ofYears.getPlanYearId());
+            ref.setType(SysFileRefEnum.PLAN_YEAR.getType());
+            ref.setCreated(ofYears.getCreated());
+            ref.setCreateTime(new Date());
+            ref.setUpdated(ofYears.getCreated());
+            ref.setUpdateTime(new Date());
+            sysFileRefMapper.insert(ref);
+        }
         return AjaxResult.success();
     }
 
@@ -395,15 +427,17 @@ public class PlanYearsServiceImpl implements PlanYearsService {
             }
             //项目属性是拼接的
             if (planYear.getProjectAttr().length() > 2) {
+                StringBuilder builder = new StringBuilder();
                 String[] split = planYear.getProjectAttr().split("，");
                 for (String s : split) {
                     for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
                         if (s.equals(entry.getValue())) {
-                            planYear.setProjectAttr(entry.getKey());
+                            builder.append(entry.getKey() + "，");
                             break;
                         }
                     }
                 }
+                planYear.setProjectAttr(builder.toString());
             } else {
                 for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
                     if (planYear.getProjectAttr().equals(entry.getValue())) {