haozq
/
ah_jjzhgd_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

首页

This commit is contained in:
cwchen 2024-03-29 16:26:08 +08:00
parent bae27c5ea2
commit 3a489ac064
2 changed files with 49 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/AppServiceImpl.java
View File

@ -49,6 +49,7 @@ public class AppServiceImpl implements IAppService {
ProVo proVo = new ProVo(); ProVo proVo = new ProVo();
try { try {
proVo = mapper.getProBrief(dto); proVo = mapper.getProBrief(dto);
if(Objects.nonNull(proVo)){
List<ProVo.FileData> list = new ArrayList<>(); List<ProVo.FileData> list = new ArrayList<>();
List<ResourceFileVo> resourceFileVos = mapper.getFiles(proVo.getProId()); List<ResourceFileVo> resourceFileVos = mapper.getFiles(proVo.getProId());
if (CollectionUtils.isNotEmpty(resourceFileVos)) { if (CollectionUtils.isNotEmpty(resourceFileVos)) {
@ -68,6 +69,7 @@ public class AppServiceImpl implements IAppService {
} }
} }
proVo.setFileData(list); proVo.setFileData(list);
}
} catch (Exception e) { } catch (Exception e) {
log.error("工程简介", e); log.error("工程简介", e);
} }
@ -223,7 +225,35 @@ public class AppServiceImpl implements IAppService {
} }
dataMap.put("vo",vo); dataMap.put("vo",vo);
dataMap.put("item",item); dataMap.put("item",item);
dataMap.put("proGxPlanList",proGxPlanList); dataMap.put("proGxPlan",proGxPlanList);
dataMap.put("proCost",getProCostData());
return AjaxResult.success(dataMap); 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;
}
} }

3
securitycontrol-model/securitycontrol-background/src/main/resources/mapper/AppMapper.xml
View File

@ -15,7 +15,8 @@
tp.jl_unit AS jlUnit, tp.jl_unit AS jlUnit,
tp.sg_unit AS sgUnit, tp.sg_unit AS sgUnit,
tp.pro_brief AS proBrief, tp.pro_brief AS proBrief,
tp.pro_type AS proType tp.pro_type AS proType,
tp.pro_cost AS proCost
FROM tb_project tp FROM tb_project tp
LEFT JOIN sys_build sb ON tp.org = sb.org_id LEFT JOIN sys_build sb ON tp.org = sb.org_id
WHERE tp.bid_code = #{bidCode} AND del_flag = 0 WHERE tp.bid_code = #{bidCode} AND del_flag = 0