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-12-22 23:36:08 +08:00
parent b7844e3d3f cfc468ac1f
commit 4ab19823f0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,16 +110,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</select>
<select id="sumByDeptId" parameterType="SurProjectCostOutput" resultMap="SurProjectCostOutputResult">
<select id="sumByDeptId" parameterType="SurProjectCostOutput" resultMap="SurProjectCostOutputResult">
SELECT 10 cost_type , SUM(money) money FROM sur_project_cost_output
WHERE ( (cost_type=9 AND YEAR=#{year} AND MONTH &lt;= #{month}) OR (cost_type=9 AND YEAR &lt;#{year}))
WHERE (cost_type=2 AND YEAR &lt;=#{year} )
<if test="id!=null and id>0">
and project_id IN (SELECT id FROM sur_project WHERE deptid=#{id})
</if>
<if test="projectId!=null and projectId>0">
and project_id=#{projectId}
</if>
UNION
SELECT 2 cost_type , SUM(money) money FROM sur_project_cost_output