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

提交代码

dev_xds
姜玉琦 2024-08-13 22:21:06 +08:00
parent 78df575406
commit 0ff793ce80
3 changed files with 66 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/resources/application-prod.yml
View File

@ -44,8 +44,8 @@ wechat:
# 日志配置 # 日志配置
logging: logging:
level: level:
com.ruoyi: error com.ruoyi: info
com.yanzhu.jh: error com.yanzhu.jh: info
org.springframework: error org.springframework: error
org.flowable: error org.flowable: error

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yanzhu.jh.project.mapper.SurProjectBuildNodeDataMapper"> <mapper namespace="com.yanzhu.jh.project.mapper.SurProjectBuildNodeDataMapper">
<resultMap type="SurProjectBuildNodeData" id="SurProjectBuildNodeDataResult"> <resultMap type="SurProjectBuildNodeData" id="SurProjectBuildNodeDataResult">
@ -149,7 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT * FROM vw_sur_project_build_node_data_current WHERE id IN ( SELECT * FROM vw_sur_project_build_node_data_current WHERE id IN (
SELECT MAX(vbn.id) FROM vw_sur_project_build_node_data_current vbn SELECT MAX(vbn.id) FROM vw_sur_project_build_node_data_current vbn
left join sur_project sp on sp.id = vbn.project_id left join sur_project sp on sp.id = vbn.project_id
WHERE LENGTH(vbn.node_lvl)=2 and sp.isDel=0 WHERE LENGTH(vbn.node_lvl)=2 and sp.isDel=0 and sp.progressVisible=0
<if test="projectId !=null and projectId !=0">and vbn.project_id=#{projectId}</if> <if test="projectId !=null and projectId !=0">and vbn.project_id=#{projectId}</if>
<if test="id!=null and id!=0">and sp.deptId=#{id}</if> <if test="id!=null and id!=0">and sp.deptId=#{id}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if> <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
@ -176,7 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT * FROM vw_sur_project_build_node_data_current WHERE id IN ( SELECT * FROM vw_sur_project_build_node_data_current WHERE id IN (
SELECT MAX(vbn.id) FROM vw_sur_project_build_node_data_current vbn SELECT MAX(vbn.id) FROM vw_sur_project_build_node_data_current vbn
left join sur_project sp on sp.id = vbn.project_id left join sur_project sp on sp.id = vbn.project_id
WHERE LENGTH(vbn.node_lvl)=2 and sp.isDel=0 WHERE LENGTH(vbn.node_lvl)=2 and sp.isDel=0 and sp.progressVisible=0
<if test="projectId !=null and projectId !=0">and vbn.project_id=#{projectId}</if> <if test="projectId !=null and projectId !=0">and vbn.project_id=#{projectId}</if>
<if test="id!=null and id!=0">and sp.deptId=#{id}</if> <if test="id!=null and id!=0">and sp.deptId=#{id}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if> <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
@ -192,7 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
(SELECT * FROM vw_sur_project_build_node_data_current WHERE id IN ( (SELECT * FROM vw_sur_project_build_node_data_current WHERE id IN (
SELECT MAX(vbn.id) FROM vw_sur_project_build_node_data_current vbn SELECT MAX(vbn.id) FROM vw_sur_project_build_node_data_current vbn
left join sur_project sp on sp.id = vbn.project_id left join sur_project sp on sp.id = vbn.project_id
WHERE LENGTH(vbn.node_lvl)=2 and sp.isDel=0 WHERE LENGTH(vbn.node_lvl)=2 and sp.isDel=0 and sp.progressVisible=0
<if test="projectId !=null and projectId !=0">and vbn.project_id=#{projectId}</if> <if test="projectId !=null and projectId !=0">and vbn.project_id=#{projectId}</if>
<if test="id!=null and id!=0">and sp.deptId=#{id}</if> <if test="id!=null and id!=0">and sp.deptId=#{id}</if>
<if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if> <if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if>
@ -210,7 +210,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
(SELECT * FROM vw_sur_project_build_node_data_current WHERE id IN ( (SELECT * FROM vw_sur_project_build_node_data_current WHERE id IN (
SELECT MAX(vbn.id) FROM vw_sur_project_build_node_data_current vbn SELECT MAX(vbn.id) FROM vw_sur_project_build_node_data_current vbn
left join sur_project sp on sp.id = vbn.project_id left join sur_project sp on sp.id = vbn.project_id
WHERE LENGTH(vbn.node_lvl)=2 and sp.isDel=0 WHERE LENGTH(vbn.node_lvl)=2 and sp.isDel=0 and sp.progressVisible=0
<if test="projectId !=null and projectId !=0">and vbn.project_id=#{projectId}</if> <if test="projectId !=null and projectId !=0">and vbn.project_id=#{projectId}</if>
<if test="id!=null and id!=0">and sp.deptId=#{id}</if> <if test="id!=null and id!=0">and sp.deptId=#{id}</if>
<if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if> <if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if>
@ -231,7 +231,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT id FROM sur_project WHERE isdel=0 AND projectType=#{type}) SELECT id FROM sur_project WHERE isdel=0 AND projectType=#{type})
</select> </select>
<select id="queryFinishProject" parameterType="Long" resultMap="SurProjectBuildNodeDataResultNode"> <select id="queryFinishProject" parameterType="Long" resultMap="SurProjectBuildNodeDataResultNode">
<include refid="selectSurProjectBuildNodeDataVoByNode"/> <include refid="selectSurProjectBuildNodeDataVoByNode"/>
WHERE is_del=0 AND project_id =#{projectId} and end_date is not null WHERE is_del=0 AND project_id =#{projectId} and end_date is not null

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

@ -298,7 +298,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT b.dict_value id,b.dict_label projectName,cnt deptId FROM ( SELECT b.dict_value id,b.dict_label projectName,cnt deptId FROM (
SELECT b.dict_value, b.dict_label,sum(c.money) 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} 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 and a.progressVisible=0 AND a.projectType=b.dict_value and a.isDel=0
<if test="deptId>0">AND deptid=#{deptId}</if> <if test="deptId>0">AND deptid=#{deptId}</if>
<if test="proType != null and proType != ''"> and a.projectType = #{proType}</if> <if test="proType != null and proType != ''"> and a.projectType = #{proType}</if>
GROUP BY dict_value,dict_label GROUP BY dict_value,dict_label
@ -312,7 +312,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="id==2">COUNT(1)*10000</if> <if test="id==2">COUNT(1)*10000</if>
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 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 a.projectType=b.dict_value and a.isDel=0
<if test="id!=0"> and a.progressVisible=0</if>
<if test="deptId>0">AND deptid=#{deptId}</if> <if test="deptId>0">AND deptid=#{deptId}</if>
<if test="proType != null and proType != ''"> and projectType = #{proType}</if> <if test="proType != null and proType != ''"> and projectType = #{proType}</if>
GROUP BY dict_value,dict_label GROUP BY dict_value,dict_label
@ -325,7 +324,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT b.dict_value id,b.dict_label projectName,cnt deptId FROM ( SELECT b.dict_value id,b.dict_label projectName,cnt deptId FROM (
SELECT b.dict_value, b.dict_label,sum(c.money) cnt 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} 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 and a.progressVisible=0 AND a.projiectLevel=b.dict_value and a.isDel=0
<if test="deptId>0">AND deptid=#{deptId}</if> <if test="deptId>0">AND deptid=#{deptId}</if>
<if test="proType != null and proType != ''"> and projectType = #{proType}</if> <if test="proType != null and proType != ''"> and projectType = #{proType}</if>
GROUP BY dict_value,dict_label GROUP BY dict_value,dict_label
@ -339,7 +338,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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 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 a.projiectLevel=b.dict_value and a.isDel=0
<if test="id!=0"> and a.progressVisible=0</if>
<if test="deptId>0">AND deptid=#{deptId}</if> <if test="deptId>0">AND deptid=#{deptId}</if>
<if test="proType != null and proType != ''"> and projectType = #{proType}</if> <if test="proType != null and proType != ''"> and projectType = #{proType}</if>
GROUP BY dict_value,dict_label GROUP BY dict_value,dict_label
@ -350,7 +348,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectProgressProjects" parameterType="SurProject" resultMap="SurProjectResult"> <select id="selectProgressProjects" parameterType="SurProject" resultMap="SurProjectResult">
<include refid="selectSurProjectVo"/> <include refid="selectSurProjectVo"/>
where progressVisible = 0 where 1=1
<if test="deptId!=0">and deptid=#{deptId}</if> <if test="deptId!=0">and deptid=#{deptId}</if>
<if test="projectType != null and projectType != ''"> and projectType = #{projectType}</if> <if test="projectType != null and projectType != ''"> and projectType = #{projectType}</if>
<if test="prjIds !=null and prjIds.size()>0"> <if test="prjIds !=null and prjIds.size()>0">
@ -385,7 +383,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectSurProjectListByBuser" parameterType="SurProject" resultMap="SurProjectResult"> <select id="selectSurProjectListByBuser" parameterType="SurProject" resultMap="SurProjectResult">
select sp.id, sp.deptId, sp.projectName, sp.projectCode, sp.paretProjectName, sp.paretProjectCode, sp.simpleName, sp.projectType, sp.projiectLevel, sp.projectRegional, a.areaName as projectRegionalName, sp.projectAddress, sp.projectNature, sp.licenceNumber, sp.projectApproval, sp.projectPerson, sp.projectPhone, sp.longitude, sp.latitude, sp.projectTimeLimit, sp.totalInvestment, sp.floorArea, sp.totalOutputValue, sp.plannedCompletionTime, sp.scheduledStartTime, sp.actualOperatingTime, sp.actualCompletionTime, sp.contractAmount, sp.paidAmount, sp.onAccountAmount, sp.projectSchedule, sp.projectSummarize, sp.isDel, sp.projectStatus, sp.servicePersonnel, sp.supervisorPersonnel, sp.generalContractor, sp.create_by, sp.create_time, sp.update_by, sp.update_time, sp.remark, sp.weightType, sp.projectSort, sp.progressVisible, d.dept_name select sp.id, sp.deptId, sp.projectName, sp.projectCode, sp.paretProjectName, sp.paretProjectCode, sp.simpleName, sp.projectType, sp.projiectLevel, sp.projectRegional, a.areaName as projectRegionalName, sp.projectAddress, sp.projectNature, sp.licenceNumber, sp.projectApproval, sp.projectPerson, sp.projectPhone, sp.longitude, sp.latitude, sp.projectTimeLimit, sp.totalInvestment, sp.floorArea, sp.totalOutputValue, sp.plannedCompletionTime, sp.scheduledStartTime, sp.actualOperatingTime, sp.actualCompletionTime, sp.contractAmount, sp.paidAmount, sp.onAccountAmount, sp.projectSchedule, sp.projectSummarize, sp.isDel, sp.projectStatus, sp.servicePersonnel, sp.supervisorPersonnel, sp.generalContractor, sp.create_by, sp.create_time, sp.update_by, sp.update_time, sp.remark, sp.weightType, sp.projectSort, sp.progressVisible, d.dept_name
from ( from (
select * from sur_project sp where sp.isdel=0 and sp.progressVisible=0 select * from sur_project sp where sp.isdel=0
<if test='proType != null and proType !=""'> and sp.projectType = #{proType}</if> <if test='proType != null and proType !=""'> and sp.projectType = #{proType}</if>
<if test="id!=null and id>0"> <if test="id!=null and id>0">
and sp.id in (select spu.project_id from sur_project_userinfo spu where spu.user_id = #{id} and spu.is_del=0) and sp.id in (select spu.project_id from sur_project_userinfo spu where spu.user_id = #{id} and spu.is_del=0)