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/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/resources/mapper/project/SurProjectMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml
index 9565c4c8..4f66e66b 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml
@@ -283,9 +283,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT b.dict_value id,b.dict_label projectName,cnt deptId FROM (
SELECT b.dict_value, b.dict_label,
COUNT(1)*10000
- SUM(totalInvestment*10000.0)
+ SUM(c.totalInvestment)
COUNT(1)*10000
- cnt FROM sur_project a, sys_dict_data b WHERE b.dict_type='project_category'
+ cnt FROM sur_project a, sys_dict_data b,vw_sur_project_cost_output c WHERE b.dict_type='project_category' AND a.id=c.project_id
AND a.projectType=b.dict_value and a.isDel=0
AND deptid=#{deptId}
GROUP BY dict_value,dict_label
@@ -295,10 +295,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT b.dict_value id,b.dict_label projectName,cnt deptId FROM (
SELECT b.dict_value, b.dict_label,
COUNT(1)*10000
- SUM(totalInvestment*10000.0)
+ SUM(c.totalInvestment)
COUNT(1)*10000
- cnt FROM sur_project a, sys_dict_data b WHERE b.dict_type='project_level'
+ cnt FROM sur_project a, sys_dict_data b ,vw_sur_project_cost_output c WHERE b.dict_type='project_level' AND a.id=c.project_id
AND a.projiectLevel=b.dict_value and a.isDel=0
AND deptid=#{deptId}
GROUP BY dict_value,dict_label