diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCostOutputMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCostOutputMapper.xml index eb3d8f04..c431b9b6 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCostOutputMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCostOutputMapper.xml @@ -110,16 +110,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + SELECT 10 cost_type , SUM(money) money FROM sur_project_cost_output - WHERE ( (cost_type=9 AND YEAR=#{year} AND MONTH <= #{month}) OR (cost_type=9 AND YEAR <#{year})) + WHERE (cost_type=2 AND YEAR <=#{year} ) and project_id IN (SELECT id FROM sur_project WHERE deptid=#{id}) and project_id=#{projectId} - UNION SELECT 2 cost_type , SUM(money) money FROM sur_project_cost_output