From 3a489ac064bfecf93fc9c058f6d26201a24fa262 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 29 Mar 2024 16:26:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AppServiceImpl.java          | 64 ++++++++++++++-----
 .../src/main/resources/mapper/AppMapper.xml   |  3 +-
 2 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/AppServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/AppServiceImpl.java
index 6121b3b..f010cf9 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/AppServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/AppServiceImpl.java
@@ -49,25 +49,27 @@ public class AppServiceImpl implements IAppService {
         ProVo proVo = new ProVo();
         try {
             proVo = mapper.getProBrief(dto);
-            List<ProVo.FileData> list = new ArrayList<>();
-            List<ResourceFileVo> resourceFileVos = mapper.getFiles(proVo.getProId());
-            if (CollectionUtils.isNotEmpty(resourceFileVos)) {
-                for (ResourceFileVo fileVo : resourceFileVos) {
-                    String base64 = null;
-                    Result<SysFile> result = remoteFileService.getImgBase64(fileVo.getFileId(), SecurityConstants.INNER);
-                    if (result != null && result.getCode() == HttpStatus.SUCCESS && result.getData() != null) {
-                        String jsonString = JSON.toJSONString(result.getData());
-                        JSONObject item = JSON.parseObject(jsonString);
-                        base64 = item.getString("url");
+            if(Objects.nonNull(proVo)){
+                List<ProVo.FileData> list = new ArrayList<>();
+                List<ResourceFileVo> resourceFileVos = mapper.getFiles(proVo.getProId());
+                if (CollectionUtils.isNotEmpty(resourceFileVos)) {
+                    for (ResourceFileVo fileVo : resourceFileVos) {
+                        String base64 = null;
+                        Result<SysFile> result = remoteFileService.getImgBase64(fileVo.getFileId(), SecurityConstants.INNER);
+                        if (result != null && result.getCode() == HttpStatus.SUCCESS && result.getData() != null) {
+                            String jsonString = JSON.toJSONString(result.getData());
+                            JSONObject item = JSON.parseObject(jsonString);
+                            base64 = item.getString("url");
+                        }
+                        ProVo.FileData fileData = new ProVo.FileData();
+                        fileData.setFileId(fileVo.getFileId());
+                        fileData.setBase64Url(base64);
+                        fileData.setFileSourceType(fileVo.getSourceType());
+                        list.add(fileData);
                     }
-                    ProVo.FileData fileData = new ProVo.FileData();
-                    fileData.setFileId(fileVo.getFileId());
-                    fileData.setBase64Url(base64);
-                    fileData.setFileSourceType(fileVo.getSourceType());
-                    list.add(fileData);
                 }
+                proVo.setFileData(list);
             }
-            proVo.setFileData(list);
         } catch (Exception e) {
             log.error("工程简介", e);
         }
@@ -223,7 +225,35 @@ public class AppServiceImpl implements IAppService {
         }
         dataMap.put("vo",vo);
         dataMap.put("item",item);
-        dataMap.put("proGxPlanList",proGxPlanList);
+        dataMap.put("proGxPlan",proGxPlanList);
+        dataMap.put("proCost",getProCostData());
         return AjaxResult.success(dataMap);
     }
+
+    public Map<String, Object> getProCostData(){
+        Map<String, Object> dataMap = new HashMap<>(16);
+        dataMap.put("planCost","1200.0");
+        dataMap.put("expenditureCost","523.4");
+        dataMap.put("residueCost","676.6");
+        List<Map<String, Object>> proCostList = new ArrayList<>();
+        for (int i = 0; i < Constant.CELL_3; i++) {
+            Map<String, Object> map = new HashMap<>(3);
+            if(i == 0){
+                map.put("expenditureDate","2024-03-05");
+                map.put("expenditure","设备购买");
+                map.put("amount","200.1");
+            }else if(i == 1){
+                map.put("expenditureDate","2024-03-12");
+                map.put("expenditure","工人工资");
+                map.put("amount","23.3");
+            }else if(i == 2){
+                map.put("expenditureDate","2024-03-15");
+                map.put("expenditure","设备安装");
+                map.put("amount","300.0");
+            }
+            proCostList.add(map);
+        }
+        dataMap.put("proCostPlanList",proCostList);
+        return dataMap;
+    }
 }
diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/AppMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/AppMapper.xml
index 456af75..adf6297 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/AppMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/AppMapper.xml
@@ -15,7 +15,8 @@
                tp.jl_unit AS jlUnit,
                tp.sg_unit AS sgUnit,
                tp.pro_brief AS proBrief,
-               tp.pro_type AS proType
+               tp.pro_type AS proType,
+               tp.pro_cost AS proCost
         FROM tb_project tp
         LEFT JOIN sys_build sb ON tp.org = sb.org_id
         WHERE tp.bid_code = #{bidCode} AND del_flag = 0