年初初始化及其他

WebContent/WEB-INF/view/bus/org-month-water-consumption-list.jsp

@@ -97,6 +97,11 @@
 		
 		/**初始时通过向后台传递排序id、排序顺序、初始页码、每页条数**/
 		function getData(pageNo,pageSize){
+			var year=$("#year").val();
+			if(year.length<=0){
+				$("#remind").html("<font color=red>年度不能为空</font>");
+				return false;
+			}
 			jQuery.post("${ctx}/meterReadInfo/listPage.do",
 					getFormParams(pageNo,pageSize),
 					function(result){

src/java/com/bus/dao/impl/BusOrgDaoImpl.java

@@ -124,9 +124,9 @@ public class BusOrgDaoImpl extends GenericDaoImpl<BusOrg, Long>
 		//李周芳 2016-02-19
 		//把所有上一年用户都初值化到今年来
 		String sql1 =" INSERT INTO `bus_org` (org_name,org_number,address,is_plan_user,`year`,industry_number,`code`,email,bank,bank_account, "
-                    +" remark,org_type_id,`area`,phone,import_status,user_type,postal_address)                                                               "    
+                    +" remark,org_type_id,`area`,phone,import_status,user_type,postal_address,properties_id)                                                               "    
                     +" SELECT b.`org_name`,b.`org_number`,b.`address`,b.`is_plan_user`,?,b.`industry_number`,b.`code`,                        "
-                    +" b.`email`,b.`bank`,b.`bank_account`,b.`remark`,b.`org_type_id`,b.`area`,b.`phone`,b.`import_status`,b.`user_type`,b.`postal_address`      "
+                    +" b.`email`,b.`bank`,b.`bank_account`,b.`remark`,b.`org_type_id`,b.`area`,b.`phone`,b.`import_status`,b.`user_type`,b.`postal_address`,properties_id      "
                     +" FROM `bus_org` b WHERE b.`year`=? AND b.`import_status`='normal'                                                       "
                     +" AND NOT EXISTS (                                                                                                       "
                     +" SELECT bo.`org_id` FROM `bus_org` bo WHERE bo.`org_number`=b.`org_number` AND bo.`year`=?   AND bo.`import_status`='normal'                            "
@@ -349,9 +349,9 @@ public class BusOrgDaoImpl extends GenericDaoImpl<BusOrg, Long>
 	@Override
 	public void initOneData(Long orgId,int nextYear,String type) {
 		String sql =" INSERT INTO `bus_org` (org_name,org_number,address,is_plan_user,`year`,industry_number,`code`,email,bank,bank_account,"
-                   +" remark,org_type_id,`area`,phone,import_status,user_type,postal_address)                                                              "
+                   +" remark,org_type_id,`area`,phone,import_status,user_type,postal_address,properties_id)                                                              "
 				   +" SELECT bus.`org_name`,bus.`org_number`,bus.`address`,?,?,bus.`industry_number`,bus.`code`,bus.`email`,bus.`bank`, "
-                   +" bus.`bank_account`,bus.`remark`,bus.`org_type_id`,bus.`area`,bus.`phone`,bus.`import_status`,bus.`user_type`,bus.`postal_address`          "
+                   +" bus.`bank_account`,bus.`remark`,bus.`org_type_id`,bus.`area`,bus.`phone`,bus.`import_status`,bus.`user_type`,bus.`postal_address`,properties_id          "
 		           +" FROM `bus_org` bus WHERE bus.`org_id`=?";
 		jdbcTemplate.update(sql,type,nextYear,orgId);
 		

src/java/com/bus/service/impl/BusMeterReadInfoServiceImpl.java

@@ -111,7 +111,7 @@ public class BusMeterReadInfoServiceImpl extends GenericServiceImpl<BusMeterRead
 				"					YEAR (bmri.price_month) AS `year`,                                                                                             "+ 
 				"					bmri.price_month AS `month`	                                                                                                   "+ 
 				"				FROM                                                                                                                               "+ 
-				"					bus_meter_read_info bmri                                                                                                       "+ 
+				"					bus_meter_read_info bmri   WHERE YEAR='"+ year +"'                                                                                                      "+ 
 				"				GROUP BY                                                                                                                           "+ 
 				"				bmri.org_id,                                   																					   "+ 
 				"				MONTH (bmri.price_month)                                                                                                           "+