Merge remote-tracking branch 'origin/master'

assistMg/src/main/java/com/hotent/project/dao/CostAnnualPlanDao.java

@@ -21,5 +21,7 @@ public interface CostAnnualPlanDao extends BaseMapper<CostAnnualPlan> {
             , @Param("countyCode") String countyCode
             , @Param("planYear") String planYear
             , @Param("areaCode") String areaCode
-            , @Param("projectName") String projectName);
+            , @Param("projectName") String projectName
+            ,@Param("initiationStatus") Integer initiationStatus
+           );
 }

assistMg/src/main/java/com/hotent/project/manager/impl/CostAnnualPlanManagerImpl.java

@@ -133,7 +133,9 @@ public class CostAnnualPlanManagerImpl extends BaseManagerImpl<CostAnnualPlanDao
 				,req.getCountyCode()
 				,req.getPlanYear()
 				,req.getAreaCode()
-				,req.getProjectName());
+				,req.getProjectName()
+				,req.getInitiationStatus()
+		);
 		return new PageList<>(page);
 	}
 

assistMg/src/main/resources/mapper/CostAnnualPlanMapper.xml

@@ -74,6 +74,10 @@
             and c.project_name LIKE CONCAT('%', #{projectName}, '%')
         </if>
 
+        <if test=" initiationStatus != null">
+            and c.status = #{initiationStatus}
+        </if>
+
         <if test=" dataScope != null and  dataScope != ''">
             <if test=" dataScope ==1">
                 and  (u.CITY_CODE=#{ cityCode} or c.area_code=#{ cityCode})