sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev

dev_xds
姜玉琦 2023-09-07 23:05:57 +08:00
parent 9b73771165 a3c282cdd0
commit bb9a471566
11 changed files with 121 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-ui/src/views/project/costOutput/costOutputDrawer.vue
View File

@ -43,11 +43,11 @@
</el-col>
</el-row>
<div class="div-title fblue" style="color: #409eff;border-bottom: solid 1px #409eff;line-height: 40px;">安措金额</div>
<div class="div-title fblue" style="color: #409eff;border-bottom: solid 1px #409eff;line-height: 40px;">安措费</div>
<el-row style="margin-top:12px;">
<el-col :span="8">
<el-form-item label="安措金额" class="w200">
<el-input-number :precision="4" v-model="form.safety1.money" placeholder="请输入安措金额">
<el-form-item label="安措费金额" class="w200">
<el-input-number :precision="4" v-model="form.safety1.money" placeholder="请输入安措费金额">
</el-input-number>
<span class="sp-unit">万元</span>
</el-form-item>
@ -68,7 +68,7 @@
</el-col>
</el-row>
<div class="div-title fblue" style="color: #409eff;">月度投资</div>
<div class="div-title fblue" style="color: #409eff;">月度产值</div>
<costMonth ref="costMonth" @success="doAddYearSuccess"></costMonth>
</el-form>
<div style="text-align: center;margin-top: 24px;">

15
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectBuildNodeController.java
View File

@ -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);
}
}

3
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectController.java
View File

@ -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));
}
}

7
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCostOutputController.java
View File

@ -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);
}
}

50
yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCostOutputController.java
View File

@ -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<SurProject> 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<SurProjectCostOutput> 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;
}
}
}

2
yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectBuildNodeDataMapper.java
View File

@ -76,4 +76,6 @@ public interface SurProjectBuildNodeDataMapper
public List<SurProjectBuildNodeData> countCompletionRate(SurProjectBuildNodeData where);
public List<SurProjectBuildNodeData> queryByProjectType(long type);
public List<SurProjectBuildNodeData> queryFinishProject(long projectId);
}

2
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectBuildNodeDataService.java
View File

@ -81,4 +81,6 @@ public interface ISurProjectBuildNodeDataService
public List<SurProjectBuildNodeData> countCompletionRate(SurProjectBuildNodeData where);
public List<SurProjectBuildNodeData> queryByProjectType(long type);
public List<SurProjectBuildNodeData> queryFinishProject(long projectId);
}

5
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectBuildNodeDataServiceImpl.java
View File

@ -185,4 +185,9 @@ public class SurProjectBuildNodeDataServiceImpl implements ISurProjectBuildNodeD
public List<SurProjectBuildNodeData> queryByProjectType(long type) {
return surProjectBuildNodeDataMapper.queryByProjectType(type);
}
@Override
public List<SurProjectBuildNodeData> queryFinishProject(long projectId) {
return surProjectBuildNodeDataMapper.queryFinishProject(projectId);
}
}

1
yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml
View File

@ -48,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="projectName" column="projectName" />
<result property="paretProjectName" column="paretProjectName" />
<result property="projectSchedule" column="projectSchedule"/>
<result property="deptName" column="dept_name"/>
</association>
</resultMap>

6
yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml
View File

@ -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})
</select>
<select id="queryFinishProject" parameterType="Long" resultMap="SurProjectBuildNodeDataResultNode">
<include refid="selectSurProjectBuildNodeDataVoByNode"/>
WHERE is_del=0 AND project_id =#{projectId} and end_date is not null
</select>
</mapper>

32
yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml
View File

@ -280,29 +280,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<select id="groupByCategory" parameterType="SurProject" resultMap="SurProjectResult">
<if test="id==2">
SELECT b.dict_value id,b.dict_label projectName,cnt deptId FROM (
SELECT b.dict_value, b.dict_label,sum(c.money)
cnt FROM sur_project a, sys_dict_data b,sur_project_cost_output c WHERE b.dict_type='project_category' AND a.id=c.project_id AND c.cost_type=2 and c.year=#{isDel}
AND a.projectType=b.dict_value and a.isDel=0
<if test="deptId>0">AND deptid=#{deptId}</if>
GROUP BY dict_value,dict_label
) a RIGHT JOIN sys_dict_data b ON a.dict_value=b.dict_value WHERE b.dict_type='project_category' ORDER BY cnt DESC
</if>
<if test="id!=2">
SELECT b.dict_value id,b.dict_label projectName,cnt deptId FROM (
SELECT b.dict_value, b.dict_label,
<if test="id==0">COUNT(1)*10000</if>
<if test="id==1">SUM(totalInvestment*10000.0)</if>
<if test="id==1">SUM(c.totalInvestment)</if>
<if test="id==2">COUNT(1)*10000</if>
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
<if test="deptId>0">AND deptid=#{deptId}</if>
GROUP BY dict_value,dict_label
) a RIGHT JOIN sys_dict_data b ON a.dict_value=b.dict_value WHERE b.dict_type='project_category' ORDER BY cnt DESC
</if>
</select>
<select id="groupByLevel" parameterType="SurProject" resultMap="SurProjectResult">
<if test="id==2">
SELECT b.dict_value id,b.dict_label projectName,cnt deptId FROM (
SELECT b.dict_value, b.dict_label,sum(c.money) cnt
FROM sur_project a,sys_dict_data b ,sur_project_cost_output c WHERE b.dict_type='project_level' AND a.id=c.project_id AND c.cost_type=2 and c.year=#{isDel}
AND a.projiectLevel=b.dict_value and a.isDel=0
<if test="deptId>0">AND deptid=#{deptId}</if>
GROUP BY dict_value,dict_label
) a RIGHT JOIN sys_dict_data b ON a.dict_value=b.dict_value WHERE b.dict_type='project_level' ORDER BY cnt DESC
</if>
<if test="id!=2">
SELECT b.dict_value id,b.dict_label projectName,cnt deptId FROM (
SELECT b.dict_value, b.dict_label,
<if test="id==0">COUNT(1)*10000</if>
<if test="id==1">SUM(totalInvestment*10000.0)</if>
<if test="id==2">COUNT(1)*10000</if>
<if test="id==1">SUM(c.totalInvestment)</if>
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
<if test="deptId>0">AND deptid=#{deptId}</if>
GROUP BY dict_value,dict_label
) a RIGHT JOIN sys_dict_data b ON a.dict_value=b.dict_value WHERE b.dict_type='project_level' ORDER BY cnt DESC
</if>
</select>
<select id="selectProgressProjects" parameterType="Long" resultMap="SurProjectResult">