diff --git a/ruoyi-ui/src/views/project/costOutput/costOutputDrawer.vue b/ruoyi-ui/src/views/project/costOutput/costOutputDrawer.vue index f8fc055d..3a2561d4 100644 --- a/ruoyi-ui/src/views/project/costOutput/costOutputDrawer.vue +++ b/ruoyi-ui/src/views/project/costOutput/costOutputDrawer.vue @@ -43,11 +43,11 @@ -
安措金额
+
安措费
- - + + 万元 @@ -68,7 +68,7 @@ -
月度投资
+
月度产值
diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectBuildNodeController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectBuildNodeController.java index 86a3d39b..396c0e38 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectBuildNodeController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectBuildNodeController.java @@ -82,6 +82,19 @@ public class ProjectBuildNodeController { List list=surProjectBuildNodeDataService.queryByProjectType(type); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); - } + + + @GetMapping("/queryFinishProject") + public AjaxResult queryFinishProject(long projectId){ + String key="bgscreen_projectBuildNode_queryFinishProject_"+projectId; + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + //return AjaxResult.success(obj); + } + List list=surProjectBuildNodeDataService.queryFinishProject(projectId); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return AjaxResult.success(list); + } + } diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectController.java index c1947977..6cbe8a54 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectController.java @@ -55,6 +55,7 @@ public class ProjectController { return AjaxResult.success(list); } + /** * 获取进度显示的项目 * @return @@ -114,4 +115,6 @@ public class ProjectController { where.setProjectId(projectId); return AjaxResult.success( surProjectUserinfoService.selectSurProjectUserinfoList(where)); } + + } diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCostOutputController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCostOutputController.java index 54390128..d73be41c 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCostOutputController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCostOutputController.java @@ -3,8 +3,10 @@ package com.yanzhu.jh.bigscreen.web.controller; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.redis.RedisCache; +import com.yanzhu.jh.project.domain.SurProject; import com.yanzhu.jh.project.domain.SurProjectCostOutput; import com.yanzhu.jh.project.service.ISurProjectCostOutputService; +import com.yanzhu.jh.project.service.ISurProjectService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -19,6 +21,9 @@ public class ProjectCostOutputController { @Autowired private RedisCache redisCache; + @Autowired + private ISurProjectService projectService; + @PostMapping("/selectYearAndMonth") public AjaxResult selectYearAndMonth(@RequestBody SurProjectCostOutput where){ String key="bgscreen_costOut_selectYearAndMonth_"+where.getYear()+"-"+where.getMonth()+"-"+where.getProjectId(); @@ -46,4 +51,6 @@ public class ProjectCostOutputController { redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); } + + } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCostOutputController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCostOutputController.java index 096dfa2e..0c51c50e 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCostOutputController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCostOutputController.java @@ -3,8 +3,10 @@ package com.yanzhu.jh.project.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.yanzhu.jh.project.domain.SurProject; import com.yanzhu.jh.project.domain.SurProjectCostOutput; import com.yanzhu.jh.project.service.ISurProjectCostOutputService; +import com.yanzhu.jh.project.service.ISurProjectService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -35,6 +37,9 @@ public class SurProjectCostOutputController extends BaseController @Autowired private ISurProjectCostOutputService surProjectCostOutputService; + @Autowired + private ISurProjectService projectService; + /** * 查询项目成本产值列表 */ @@ -161,4 +166,49 @@ public class SurProjectCostOutputController extends BaseController } + public AjaxResult test(){ + List list=projectService.selectSurProjectList(new SurProject()); + long y=2023l; + long m=9l; + SurProjectCostOutput where=new SurProjectCostOutput(); + where.setYear(y); + where.setMonth(m); + for(SurProject prj :list){ + where.setProjectId(prj.getId()); + System.out.println("---->"+prj.getId()); + List list2=surProjectCostOutputService.selectYearAndMonth(where); + for(SurProjectCostOutput it :list2){ + if(it.getCostType().equals(1l)){ + it.setMoney(toLong(prj.getTotalInvestment())); + surProjectCostOutputService.updateSurProjectCostOutput(it); + } + if(it.getCostType().equals(3l)){ + it.setMoney(toLong(prj.getContractAmount())); + surProjectCostOutputService.updateSurProjectCostOutput(it); + } + if(it.getCostType().equals(4l)){ + it.setMoney(toLong(prj.getPaidAmount())); + surProjectCostOutputService.updateSurProjectCostOutput(it); + } + if(it.getCostType().equals(5l)){ + it.setMoney(toLong(prj.getOnAccountAmount())); + surProjectCostOutputService.updateSurProjectCostOutput(it); + } + } + //cost_type 1 总投资 -总投资 totalInvestment + //3-合同总额 contractAmount + //4-付款金额 paidAmount + //5-挂账金额 onAccountAmount + } + return AjaxResult.success(); + } + + private Long toLong(String totalInvestment) { + try { + return (long)(Double.parseDouble(totalInvestment)*10000); + }catch (Exception ex){ + return 0l; + } + } + } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectBuildNodeDataMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectBuildNodeDataMapper.java index 7acbbb39..e67c9f91 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectBuildNodeDataMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectBuildNodeDataMapper.java @@ -76,4 +76,6 @@ public interface SurProjectBuildNodeDataMapper public List countCompletionRate(SurProjectBuildNodeData where); public List queryByProjectType(long type); + + public List queryFinishProject(long projectId); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectBuildNodeDataService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectBuildNodeDataService.java index 374a62b1..5aee94cc 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectBuildNodeDataService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectBuildNodeDataService.java @@ -81,4 +81,6 @@ public interface ISurProjectBuildNodeDataService public List countCompletionRate(SurProjectBuildNodeData where); public List queryByProjectType(long type); + + public List queryFinishProject(long projectId); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectBuildNodeDataServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectBuildNodeDataServiceImpl.java index c2e36bd5..ab70de95 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectBuildNodeDataServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectBuildNodeDataServiceImpl.java @@ -185,4 +185,9 @@ public class SurProjectBuildNodeDataServiceImpl implements ISurProjectBuildNodeD public List queryByProjectType(long type) { return surProjectBuildNodeDataMapper.queryByProjectType(type); } + + @Override + public List queryFinishProject(long projectId) { + return surProjectBuildNodeDataMapper.queryFinishProject(projectId); + } } diff --git a/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml index f1a53944..80a82810 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml @@ -48,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml index 6db1b9eb..ac84ebd7 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml @@ -198,4 +198,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE is_del=0 AND project_id IN ( SELECT id FROM sur_project WHERE isdel=0 AND projecttype=#{type}) + + + \ No newline at end of file diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml index 9565c4c8..3de8b66d 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml @@ -280,29 +280,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"