diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCostOutputMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCostOutputMapper.xml index 1ed394ce..a5d1c9c1 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCostOutputMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCostOutputMapper.xml @@ -209,6 +209,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM sur_project_cost_output a,sur_project sp WHERE a.project_id=sp.id AND a.cost_type in (11,12) and sp.isDel=0 and sp.progressVisible=0 + and a.date1 >= #{createTime} + and a.date1 <= #{updateTime} and sp.deptId = #{id} and sp.projectType = #{proType} @@ -228,6 +230,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM sur_project_cost_output a,sur_project sp WHERE a.project_id=sp.id AND a.cost_type in (11) and sp.isDel=0 and sp.progressVisible=0 + and a.date1 >= #{createTime} + and a.date1 <= #{updateTime} and sp.deptId = #{id} and sp.projectType = #{proType} @@ -246,6 +250,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM sur_project_cost_output a,sur_project sp WHERE a.project_id=sp.id AND a.cost_type IN (12) and sp.isDel=0 and sp.progressVisible=0 + and a.date1 >= #{createTime} + and a.date1 <= #{updateTime} and sp.deptId = #{id} and sp.projectType = #{proType} @@ -263,6 +269,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM sur_project_cost_output a,sur_project sp WHERE a.project_id=sp.id AND a.cost_type IN (11,12) and sp.isDel=0 and sp.progressVisible=0 + and a.date1 >= #{createTime} + and a.date1 <= #{updateTime} and sp.deptId = #{id} and sp.projectType = #{proType} diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkingCommitteeMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkingCommitteeMapper.xml index 5423ad73..02158d36 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkingCommitteeMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkingCommitteeMapper.xml @@ -115,6 +115,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from ( select a.* from sur_project_working_committee a,sur_project b where a.projectId=b.id + and a.applicationDate >= #{createTime} + and a.applicationDate <= #{updateTime} and a.committeeId=#{committeeId} @@ -142,6 +144,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select a.id,a.costName,a.money,b.projectName remark,a.committeeid,a.workingType,a.projectId,a.create_by,a.create_time,a.update_time,c.name update_by,a.applicationDate from sur_project_working_committee a,sur_project b ,base_working_committee c where a.projectId=b.id and a.committeeid=c.id + and a.applicationDate >= #{createTime} + and a.applicationDate <= #{updateTime} and a.committeeId=#{committeeId}