导入单位数据中增加用水性质，水价设置的增长比例修改

WebContent/WEB-INF/view/base/org-type-edit.jsp

@@ -94,7 +94,7 @@
 		</tr>
 		<tr>
 			<td><span class="star">*</span>增长比例：</td>
-			<td><input type="text" name="growthRatios" value='${baseOrgType.growthRatios!""}' datatype="n|decimal" errormsg="请输入数字!" style="width: 60%"/>%</td>
+			<td><input type="text" name="growthRatio" value='${baseOrgType.growthRatio!""}' datatype="n|decimal" errormsg="请输入数字!" style="width: 60%"/>%</td>
 		</tr>
 		<tr>
 			<td>状态：</td>

WebContent/WEB-INF/view/base/org-type-list.jsp

@@ -47,7 +47,7 @@
 	                { display: '十月水价', name: 'octPrice',     align: 'center', width: "4%"},
 	                { display: '十一月水价', name: 'novPrice',     align: 'center', width: "4%"},
 	                { display: '十二月水价', name: 'decPrice',     align: 'center', width: "4%"},
-	                { display: '增长比例', name: 'growthRatios',     align: 'center', width: "6%"},
+	                { display: '增长比例', name: 'growthRatio',     align: 'center', width: "6%"},
 	                { display: '状态', name: 'status',     align: 'center', width: "6%",
 	                	render : function(rowdata, rowindex, value, column){
 	                		 if("0"==value)
@@ -219,7 +219,7 @@
 					</td>
 					<td>增长比例：</td>
 					<td>
-						<input type="text" id="growthRatios" name="growthRatios" />%
+						<input type="text" id="growthRatio" name="growthRatio" />%
 					</td>
 					<td><button type="button" onclick="searchHandler()"><span class="icon_find">查询</span></button></td>
 					<td><button type="button" onclick="resetSearch()"><span class="icon_reload">重置</span></button></td>

WebContent/WEB-INF/view/bus/org-init-list.jsp

@@ -44,6 +44,11 @@
 	                	  return "<font class='textSlice' style='width:100%;cursor: pointer;' title='"+value+"'>"+value+"</font>";
 	                  }	
 	                },
+                     { display: '用水性质', name: 'orgNature',     align: 'center', width: "8%",
+                         render:function(rowdata, rowindex, value, column){
+                             return "<font class='textSlice' style='width:100%;cursor: pointer;' title='"+value+"'>"+value+"</font>";
+                         }
+                     },
 	                { display: '是否计划户', name: 'isPlanUser',     align: 'center', width: "6%",
 	                   render:function(rowdata, rowindex, value, column){
 	                	   if(value == "no"){
@@ -238,6 +243,8 @@
 					<td align="right">客户号：</td>
 					<td><input type="text" id="busOrgCustomerNumber"
 						name="busOrgCustomerNumber" /></td>
+					<td>用水性质：</td>
+					<td><input type="text" id="orgNature" name="orgNature" /></td>
 					<td style="padding-left: 15px;"><button type="button"
 							onclick="searchHandler()">
 							<span class="icon_find">查询</span>

src/java/com/base/model/BaseOrgType.java

@@ -18,7 +18,7 @@ public class BaseOrgType{
 	/**水价**/
 	private Float waterPrice;
 	/**增加比例 luobo**/
-	private Float  growthRatio;
+	private Float growthRatio;
 	/**状态**/
 	private String status;
 	/**备注**/
@@ -47,8 +47,7 @@ public class BaseOrgType{
 	
 	//方便页面显示水价
 	private String waterPrices;
-	/**方便页面显示增长比例**/
-	private String growthRatios;
+
 	
 	
 	/**
@@ -68,19 +67,6 @@ public class BaseOrgType{
 		this.waterPrices = waterPrices;
 	}
 
-	public String getGrowthRatios() {
-		String str="";
-		if(this.growthRatio!= null){
-			DecimalFormat df=new DecimalFormat("##0.00");
-			str=df.format(growthRatio);
-		}
-		return str;
-	}
-
-	public void setGrowthRatios(String growthRatios) {
-
-		this.growthRatios = growthRatios;
-	}
 
 	public Long getOrgTypeId() {
 		return orgTypeId;

src/java/com/base/model/temp/BaseOrgTypeTempRowMap.java

@@ -36,7 +36,6 @@ public class BaseOrgTypeTempRowMap implements
 		bot.setNovPrice(rs.getFloat("nov_price"));
 		bot.setDecPrice(rs.getFloat("dec_price"));
 		bot.setGrowthRatio(rs.getFloat("growth_ratio"));
-		bot.setGrowthRatios(rs.getString("growth_ratio"));
 		bot.setStatus(rs.getString("status"));
 		bot.setRemark(rs.getString("remark"));
 		bot.setCreater(rs.getString("creater"));

src/java/com/base/service/IBaseOrgTypeService.java

@@ -19,6 +19,8 @@ public interface IBaseOrgTypeService extends IGenericService<BaseOrgType, Long>{
 	 * @return
 	 */
 	public Page getOrgType(String orgName,Float waterPrice,int pageNo,int pageSize);
-	
-	
+
+	/**取增长比例*/
+	public Float getGrowthRatio(String orgName);
+
 }

src/java/com/base/service/impl/BaseOrgTypeServiceImpl.java

@@ -9,6 +9,9 @@ import com.base.service.IBaseOrgTypeService;
 import com.core.dao.IGenericDao;
 import com.core.service.impl.GenericServiceImpl;
 import com.core.util.Page;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+import java.util.Map;
 
 /**
  * 单位类别 业务层实现类
@@ -27,6 +30,10 @@ public class BaseOrgTypeServiceImpl extends
 		return this.dao;
 	}
 
+	@Autowired
+	private org.springframework.jdbc.core.JdbcTemplate jdbcTemplate;
+
+
 	@Override
 	public Page getOrgType(String orgName, Float waterPrice, int pageNo,
 			int pageSize) {
@@ -43,5 +50,10 @@ public class BaseOrgTypeServiceImpl extends
 				new BaseOrgTypeTempRowMap());
 	}
 
+	public Float getGrowthRatio(String name){
+		String NA = "SELECT bot.growth_ratio FROM base_org_type bot where org_name='"+name+"'";
+		Map<String, Object> aa =jdbcTemplate.queryForMap(NA);
+		return (float) aa.get("growth_ratio");
+	}
 	
 }

src/java/com/bus/dao/IBusOrgDao.java

@@ -74,7 +74,7 @@ public interface IBusOrgDao extends IGenericDao<BusOrg, Long>{
      * @throws UnsupportedEncodingException 
       */
       public List<BusOrgTemp> getPlanYearCountData(String orgNumber,String orgName,String year,
-    			String busOrgCustomerNumber,String address,String userType) throws UnsupportedEncodingException;
+    			String busOrgCustomerNumber,String address,String userType, String orgNature) throws UnsupportedEncodingException;
       
       public void updateIsplanYear(String year);
       

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

@@ -113,9 +113,9 @@ public class BusOrgDaoImpl extends GenericDaoImpl<BusOrg, Long>
 		//添加条件： AND bo.`import_status`='normal' 了必须取未删除的单位信息，
 		//李周芳 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, "
+		String sql1 =" INSERT INTO `bus_org` (org_name,org_nature,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)                                                               "    
-                    +" SELECT b.`org_name`,b.`org_number`,b.`address`,b.`is_plan_user`,?,b.`industry_number`,b.`code`,                        "
+                    +" SELECT b.`org_name`,b.`org_nature`,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`      "
                     +" FROM `bus_org` b WHERE b.`year`=? AND b.`import_status`='normal'                                                       "
                     +" AND NOT EXISTS (                                                                                                       "
@@ -224,7 +224,7 @@ public class BusOrgDaoImpl extends GenericDaoImpl<BusOrg, Long>
 
 	@Override
 	public List<BusOrgTemp> getPlanYearCountData(String orgNumber,String orgName,String year,
-			String busOrgCustomerNumber,String address,String userType) throws UnsupportedEncodingException {
+			String busOrgCustomerNumber,String address,String orgNature,String userType) throws UnsupportedEncodingException {
 		    String sql = " SELECT b.`org_id`,b.`org_number`,b.`org_name`,b.org_type_id,bw.`plan_of_water`,bw.`reply_of_water` "
                        + " FROM `bus_org` b  JOIN `bus_annual_plan_for_water` bw ON b.`org_id`=bw.`org_id`                    "
                        + " WHERE b.`year`='"+year+"' AND bw.`is_cancel`='yes'";
@@ -235,6 +235,10 @@ public class BusOrgDaoImpl extends GenericDaoImpl<BusOrg, Long>
 			      	   orgName = new String(orgName.getBytes("iso8859-1"),"UTF-8");
 			      	   sql +=" and b.org_name='"+orgName+"'";
 			      }
+			      if(!orgNature.equals("")){
+					  orgNature = new String(orgNature.getBytes("iso8859-1"),"UTF-8");
+						sql +=" and b.org_nature='"+orgNature+"'";
+					}
 			      if(!busOrgCustomerNumber.equals("")){
 			      	   sql +=" and b.org_id in (SELECT bcm.`org_id` FROM `bus_customer_meter` bcm WHERE bcm.`customer_Number`="+busOrgCustomerNumber+")";
 			      }
@@ -278,9 +282,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,"
+		String sql =" INSERT INTO `bus_org` (org_name,org_nature,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)                                                              "
-				   +" SELECT bus.`org_name`,bus.`org_number`,bus.`address`,?,?,bus.`industry_number`,bus.`code`,bus.`email`,bus.`bank`, "
+				   +" SELECT bus.`org_name`,bus.`org_nature`,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`          "
 		           +" FROM `bus_org` bus WHERE bus.`org_id`=?";
 		jdbcTemplate.update(sql,type,nextYear,orgId);

src/java/com/bus/model/BusAnnualPlanForWater.java

@@ -338,6 +338,9 @@ public class BusAnnualPlanForWater{
 	public String getOrgType(){
 		return this.getOrg().getBaseOrgType();
 	}
+	public String getOrgNature(){
+		return this.getOrg().getOrgNature();
+	}
 	
 	//获取单位下的客户号
 	public String getBusOrgCustomerNumber(){

src/java/com/bus/model/BusOrg.hbm.xml

@@ -49,8 +49,11 @@
 		</property> 
 		<property name="newMeter">
 			<column name="newMeter" />
-		</property> 
-<!-- 		<set name="customers" cascade="all-delete-orphan" inverse="true"> -->
+		</property>
+		<property name="orgNature">
+			<column name="org_nature" />
+		</property>
+		<!-- 		<set name="customers" cascade="all-delete-orphan" inverse="true"> -->
 <!-- 			<key column="org_id" /> -->
 <!-- 			<one-to-many class="com.bus.model.BusCustomer" /> -->
 <!-- 		</set> -->

src/java/com/bus/model/BusOrg.java

@@ -65,7 +65,9 @@ public class BusOrg {
 	/** 邮寄地址 **/
 	private String postalAddress; 
 	/** 已做完年初始化后，单位新增的水表 **/
-	private String newMeter; 
+	private String newMeter;
+	/** 用水性质 **/
+	private String orgNature;
 
 	// ----------不持久化到数据库----------------------------------------
 	/** 客户号 **/
@@ -223,6 +225,10 @@ public class BusOrg {
 		this.orgName = orgName;
 	}
 
+	public String getOrgNature() { return this.orgNature; }
+
+	public void setOrgNature(String orgNature) { this.orgNature = orgNature; }
+
 	public String getAddress() {
 		return this.address;
 	}

src/java/com/bus/model/Yhjbxx.hbm.xml

@@ -29,5 +29,8 @@
 		<property name="Zh">
 			<column name="ZH" />
 		</property>
+		<property name="Yssx">
+			<column name="YSSX" />
+		</property>
 	</class>
 </hibernate-mapping>

src/java/com/bus/model/Yhjbxx.java

@@ -19,6 +19,8 @@ public class Yhjbxx {
 	/**账号**/
 	private String Zh;
 	private Long Id;
+	/**用水性质**/
+	private String Yssx;
 	
 	public String getKhh() {
 		return Khh;
@@ -63,6 +65,12 @@ public class Yhjbxx {
 	public void setZh(String zh) {
 		Zh = zh;
 	}
+	public String getYssx() {
+		return Yssx;
+	}
+	public void setYssx(String yssx) {
+		Yssx = yssx;
+	}
 	public Long getId() {
 		return Id;
 	}

src/java/com/bus/model/temp/UnitWaterMeterTemp.java

@@ -38,6 +38,8 @@ public class UnitWaterMeterTemp {
 	private Float waterPrice = 0.00f;
 	/** 水表编号 **/
 	private String propertiesName;
+	/** 用水性质 **/
+	private String orgNature;
 
 	public UnitWaterMeterTemp() {
 	}
@@ -155,6 +157,14 @@ public class UnitWaterMeterTemp {
 		this.meterNumber = meterNumber;
 	}
 
+	public String getOrgNature() {
+		return orgNature;
+	}
+
+	public void setOrgNature(String orgNature) {
+		this.orgNature = orgNature;
+	}
+
 	public int getMonth() {
 		return month;
 	}

src/java/com/bus/service/IBusMeterReadInfoService.java

@@ -28,6 +28,7 @@ public interface IBusMeterReadInfoService extends IGenericService<BusMeterReadIn
 	 * @param orgIds
 	 * @param orgNumber
 	 * @param orgName
+	 * @param orgNature
 	 * @param meterNumber
 	 * @param year
 	 * @param address
@@ -39,7 +40,7 @@ public interface IBusMeterReadInfoService extends IGenericService<BusMeterReadIn
 	 * @param pageSize
 	 * @return
 	 */
-	public Page getMonthWaterConsumptionList(String orgIds,String orgNumber,String orgName,
+	public Page getMonthWaterConsumptionList(String orgIds,String orgNumber,String orgName, String orgNature,
 			String meterNumber,String year,String address,String isPlanUser,
 			Integer userType,Float minWater,Float maxWater,int pageNo, int pageSize);
 	
@@ -75,7 +76,7 @@ public interface IBusMeterReadInfoService extends IGenericService<BusMeterReadIn
 	 * @param pageSize
 	 * @return
 	 */
-	public List<UnitWaterMeterTemp> getUnitWaterMeterList(String orgNumber,String orgName,
+	public List<UnitWaterMeterTemp> getUnitWaterMeterList(String orgNumber,String orgName,String orgNature,
 			String meterNumber,String year,String isPlanUser,
 			Integer userType,Float minwater,Float maxWater,String infoIds,Integer pageNo, Integer pageSize);
 	
@@ -93,7 +94,7 @@ public interface IBusMeterReadInfoService extends IGenericService<BusMeterReadIn
 	 * @param pageSize
 	 * @return
 	 */
-	public Integer getTotalRows(String orgNumber,String orgName,
+	public Integer getTotalRows(String orgNumber,String orgName,String orgNature,
 			String meterNumber,String year,String isPlanUser,
 			Integer userType,Float minWater,Float maxWater,String infoIds,int pageNo, int pageSize);
 	

src/java/com/bus/service/IBusOrgService.java

@@ -62,12 +62,13 @@ public interface IBusOrgService extends IGenericService<BusOrg, Long>{
     * @param busOrgMeterNumber
     * @param isPlanUser
     * @param userType
+	* @param orgNature
     * @return
     */
    Page getOrgListPage(int pageNo, int pageSize, String orgNumber,
 			String orgName, String year, String busOrgCustomerNumber,
 			String address, String busOrgMeterNumber, String isPlanUser,
-			String userType);
+			String userType, String orgNature);
    
 	  /**
 	   * 
@@ -96,7 +97,7 @@ public interface IBusOrgService extends IGenericService<BusOrg, Long>{
       * @throws UnsupportedEncodingException 
        */
        public List<BusOrgTemp> getPlanYearCountData(String orgNumber,String orgName,String year,
-     			String busOrgCustomerNumber,String address,String userType) throws UnsupportedEncodingException;
+     			String busOrgCustomerNumber,String address,String userType,String orgNature) throws UnsupportedEncodingException;
 
        /**
         * 通知打印预览
@@ -108,10 +109,11 @@ public interface IBusOrgService extends IGenericService<BusOrg, Long>{
         * @param busOrgMeterNumber
         * @param priYearUseWater
         * @param userType
+		* @param orgNature
         * @return
         */
       public List<ReplyPrintTemp> unitYearReplyPrin(String orgNumber,String orgName,String year,String busOrgCustomerNumber,
-    			String address,String busOrgMeterNumber,String priYearUseWater,String userType);
+    			String address,String busOrgMeterNumber,String priYearUseWater,String userType,String orgNature);
 
       /**
        * 信封打印预览
@@ -123,11 +125,12 @@ public interface IBusOrgService extends IGenericService<BusOrg, Long>{
        * @param busOrgMeterNumber
        * @param priYearUseWater
        * @param userType
+	   * @param orgNature
        * @return
      * @throws UnsupportedEncodingException 
        */
       public List<OrgTemp> emailPrintView(String orgNumber,String orgName,String year,String busOrgCustomerNumber,
-    			String address,String busOrgMeterNumber,String priYearUseWater,String userType) throws UnsupportedEncodingException;
+    			String address,String busOrgMeterNumber,String priYearUseWater,String userType,String orgNature) throws UnsupportedEncodingException;
       
       /**
        * 检查待处理的单位是否已经处理完毕

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

@@ -50,7 +50,7 @@ public class BusMeterReadInfoServiceImpl extends GenericServiceImpl<BusMeterRead
 
 
 	@Override
-	public Page getMonthWaterConsumptionList(String orgIds,String orgNumber, String orgName,
+	public Page getMonthWaterConsumptionList(String orgIds,String orgNumber, String orgName, String orgNature,
 			String meterNumber, String year, String address,
 			String isPlanUser, Integer userType, Float minWater,Float maxWater,
 			int pageNo, int pageSize) {
@@ -84,8 +84,9 @@ public class BusMeterReadInfoServiceImpl extends GenericServiceImpl<BusMeterRead
 		String sql =
 				"	SELECT 	                                                                                                                                       "+ 
 				"			bo.org_id AS orgId,                                                                                                                    "+ 
-				"			bo.org_name AS orgName,                                                                                                                "+ 
-				"			bo.org_number AS orgNumber,                                                                                                            "+ 
+				"			bo.org_name AS orgName,                                                                                                                "+
+				"	        bo.org_nature AS orgNature,                                                                                                            "+
+				"			bo.org_number AS orgNumber,                                                                                                            "+
 				"			bo.address,                                                                                                                            "+ 
 				"			bo.remark,                                                                                                                             "+ 
 				"			new_meter.months AS priceMonths,                                                                                                       "+ 
@@ -133,6 +134,8 @@ public class BusMeterReadInfoServiceImpl extends GenericServiceImpl<BusMeterRead
 			sql += " and bo.org_number='" + orgNumber + "'";
 		if (orgName != null&&!orgName.equals(""))
 			sql += " and bo.org_name like '%" + orgName + "%'";
+		if (orgNature != null&&!orgNature.equals(""))
+			sql += " and bo.org_nature like '%" + orgNature + "%'";
 		if (year != null && !year.equals(""))
 			sql += " and new_meter.`year`='" + year + "'";
 		if (address != null && !address.equals(""))
@@ -181,7 +184,7 @@ public class BusMeterReadInfoServiceImpl extends GenericServiceImpl<BusMeterRead
 	 * @return
 	 */
 	@Override
-	public List<UnitWaterMeterTemp> getUnitWaterMeterList(String orgNumber, String orgName,
+	public List<UnitWaterMeterTemp> getUnitWaterMeterList(String orgNumber, String orgName,String orgNature,
 			String meterNumber, String year,String isPlanUser, Integer userType,
 			Float minWater,Float maxWater,String infoIds, Integer pageNo, Integer pageSize) {
 
@@ -198,6 +201,8 @@ public class BusMeterReadInfoServiceImpl extends GenericServiceImpl<BusMeterRead
 			tmp += " and bo.org_number='" + orgNumber + "'";
 		if (orgName != null&&!orgName.equals(""))
 			tmp += " and bo.org_name like '%" + orgName + "%'";
+		if (orgNature != null&&!orgNature.equals(""))
+			tmp += " and bo.org_nature like '%" + orgNature + "%'";
 		if (meterNumber != null&&!meterNumber.equals(""))
 			tmp += " and meter.meterNumber = '" + meterNumber + "'";
 		if (isPlanUser != null && !isPlanUser.equals(""))
@@ -214,8 +219,9 @@ public class BusMeterReadInfoServiceImpl extends GenericServiceImpl<BusMeterRead
 				"		SELECT _x1.*,bwp.`properties_name` FROM(                                                                                                                                                                     "+ 
 				"			SELECT                                                                                                                                                                                                     "+ 
 				"				_x.orgId,                                                                                                                                                                                                "+ 
-				"				_x.orgName,                                                                                                                                                                                              "+ 
-				"				_x.orgNumber,                                                                                                                                                                                            "+ 
+				"				_x.orgName,                                                                                                                                                                                              "+
+			    "				_x.orgNature,                                                                                                                                                                                              "+
+				 "				_x.orgNumber,                                                                                                                                                                                            "+
 				"				_x.address,                                                                                                                                                                                              "+ 
 				"				_x.remark,                                                                                                                                                                                               "+ 
 				"				_x.`month`,                                                                                                                                                                                              "+ 
@@ -229,8 +235,9 @@ public class BusMeterReadInfoServiceImpl extends GenericServiceImpl<BusMeterRead
 				"				(SELECT `properties_id` FROM `bus_meter_read_info` WHERE `meter_number`=_x.meterNumber AND `year`=_x.`year` AND `month`=_x.`month` ORDER BY `water` DESC LIMIT 0,1) AS propertiesId   	                 "+ 
 				"			FROM(                                                                                                                                                                                                      "+ 
 				"				SELECT 	bo.org_id AS orgId,                                                                                                                                                                              "+ 
-				"					bo.org_name AS orgName,                                                                                                                                                                                "+ 
-				"					bo.org_number AS orgNumber,                                                                                                                                                                            "+ 
+				"					bo.org_name AS orgName,                                                                                                                                                                                "+
+				 "					bo.org_nature AS orgNature,                                                                                                                                                                                "+
+				 "					bo.org_number AS orgNumber,                                                                                                                                                                            "+
 				"					bo.address,                                                                                                                                                                                            "+ 
 				"					bo.remark,                                                                                                                                                                                             "+ 
 				"					meter.`month`,                                                                                                                                                                                         "+ 
@@ -263,6 +270,7 @@ public class BusMeterReadInfoServiceImpl extends GenericServiceImpl<BusMeterRead
 				UnitWaterMeterTemp tmp = new UnitWaterMeterTemp();
 				tmp.setOrgId(rs.getLong("orgId"));
 				tmp.setOrgName(rs.getString("orgName"));
+				tmp.setOrgNature(rs.getString("orgNature"));
 				tmp.setOrgNumber(rs.getString("orgNumber"));
 				tmp.setAddress(rs.getString("address"));
 				tmp.setRemark(rs.getString("remark"));
@@ -383,7 +391,7 @@ public class BusMeterReadInfoServiceImpl extends GenericServiceImpl<BusMeterRead
 	}
 
 	@Override
-	public Integer getTotalRows(String orgNumber, String orgName,
+	public Integer getTotalRows(String orgNumber, String orgName, String orgNature,
 			String meterNumber, String year, String isPlanUser,
 			Integer userType, Float minWater, Float maxWater,String infoIds, int pageNo,
 			int pageSize) {
@@ -392,6 +400,8 @@ public class BusMeterReadInfoServiceImpl extends GenericServiceImpl<BusMeterRead
 			tmp += " and bo.org_number='" + orgNumber + "'";
 		if (orgName != null&&!orgName.equals(""))
 			tmp += " and bo.org_name like '%" + orgName + "%'";
+		if (orgNature != null&&!orgNature.equals(""))
+			tmp += " and bo.org_nature like '%" + orgNature + "%'";
 		if (meterNumber != null&&!meterNumber.equals(""))
 			tmp += " and meter.meterNumber like '%" + meterNumber + "%'";
 		if (isPlanUser != null && !isPlanUser.equals(""))
@@ -408,6 +418,7 @@ public class BusMeterReadInfoServiceImpl extends GenericServiceImpl<BusMeterRead
 				"	SELECT COUNT(*) FROM(                                                           "+
 				"		SELECT 	bo.org_id AS orgId,                                                   "+
 				"			bo.org_name AS orgName,                                                     "+
+				 "			bo.org_nature AS orgNature,                                                     "+
 				"			bo.org_number AS orgNumber,                                                 "+
 				"			bo.address,                                                                 "+
 				"			bo.remark,                                                                  "+

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

@@ -53,7 +53,7 @@ public class BusOrgServiceImpl extends GenericServiceImpl<BusOrg, Long> implemen
 	public Page getOrgListPage(int pageNo, int pageSize, String orgNumber,
 			String orgName, String year, String busOrgCustomerNumber,
 			String address, String busOrgMeterNumber, String isPlanUser,
-			String userType) {
+			String userType, String orgNature) {
 		String hql = "select b from BusOrg b where b.importStatus='normal'";
 		if (null != orgNumber && !orgNumber.equals("")) {
 			hql += " and b.orgNumber = '" + orgNumber + "'";
@@ -79,6 +79,9 @@ public class BusOrgServiceImpl extends GenericServiceImpl<BusOrg, Long> implemen
 		if (null != isPlanUser && !isPlanUser.equals("")) {
 			hql += " and b.isPlanUser ='" + isPlanUser + "'";
 		}
+		if (null != orgNature && !orgNature.equals("")) {
+			hql += " and b.orgNature like '%" + orgNature + "%'";
+		}
 		return busOrgDao.getPageByHql(hql, pageNo, pageSize);
 	}
 
@@ -113,9 +116,9 @@ public class BusOrgServiceImpl extends GenericServiceImpl<BusOrg, Long> implemen
 	@Override
 	public List<BusOrgTemp> getPlanYearCountData(String orgNumber,
 			String orgName, String year, String busOrgCustomerNumber,
-			String address, String userType) throws UnsupportedEncodingException {
+			String address, String userType, String orgNature) throws UnsupportedEncodingException {
 		// TODO Auto-generated method stub
-		return this.busOrgDao.getPlanYearCountData(orgNumber, orgName, year, busOrgCustomerNumber, address, userType);
+		return this.busOrgDao.getPlanYearCountData(orgNumber, orgName, year, busOrgCustomerNumber, address, userType, orgNature);
 	}
 
 	@Override
@@ -133,7 +136,7 @@ public class BusOrgServiceImpl extends GenericServiceImpl<BusOrg, Long> implemen
 	@Override
 	public List<ReplyPrintTemp> unitYearReplyPrin(String orgNumber, String orgName,
 			String year, String busOrgCustomerNumber, String address,
-			String busOrgMeterNumber, String priYearUseWater, String userType) {
+			String busOrgMeterNumber, String priYearUseWater, String userType, String orgNature) {
 	     String sql = " SELECT b.`org_name`,w.`first_quarter_reply` AS numOne,w.`second_quarter_reply` AS numTwo,w.`third_quarter_reply` AS numThird,w.`fourth_quarter_reply` AS numFourth,GROUP_CONCAT(bm.`meter_Number`) AS meterNum,w.reply_of_water "
                  + " FROM `bus_org` b " 
                  + " JOIN `bus_annual_plan_for_water` w ON b.`org_id` = w.`org_id` JOIN `bus_customer_meter` bm ON b.`org_id`=bm.`org_id` "
@@ -150,7 +153,15 @@ public class BusOrgServiceImpl extends GenericServiceImpl<BusOrg, Long> implemen
 		}
       	   sql +=" and b.org_name like '%"+orgName+"%'";
       }
+		if(!orgNature.equals("")){
+			try {
+				orgNature = new String(orgNature.getBytes("iso8859-1"),"UTF-8");
+			} catch (UnsupportedEncodingException e) {
 
+				e.printStackTrace();
+			}
+			sql +=" and b.org_nature like '%"+orgNature+"%'";
+		}
       	   sql +=" and b.year="+year;
       if(!address.equals("")){
       	   try {
@@ -192,7 +203,7 @@ public class BusOrgServiceImpl extends GenericServiceImpl<BusOrg, Long> implemen
 	@Override
 	public List<OrgTemp> emailPrintView(String orgNumber, String orgName,
 			String year, String busOrgCustomerNumber, String address,
-			String busOrgMeterNumber, String priYearUseWater, String userType) throws UnsupportedEncodingException {
+			String busOrgMeterNumber, String priYearUseWater, String userType, String orgNature) throws UnsupportedEncodingException {
 		String sql = " SELECT b.`code`,b.`org_name`,b.postal_address FROM `bus_org` b " +
 				     " LEFT JOIN `bus_annual_plan_for_water` w ON b.`org_id` = w.`org_id` WHERE b.`year`='"+year+"' AND b.`is_plan_user`='yes' AND w.`is_cancel`='yes'";
 		        if(!orgNumber.equals("")){
@@ -202,6 +213,10 @@ public class BusOrgServiceImpl extends GenericServiceImpl<BusOrg, Long> implemen
 		        	orgName = new String(orgName.getBytes("iso8859-1"),"UTF-8");
 		        	sql +=" and b.org_name like '%"+orgName+"%'";
 		        }
+				if(!orgNature.equals("")){
+					orgNature = new String(orgNature.getBytes("iso8859-1"),"UTF-8");
+					sql +=" and b.org_nature like '%"+orgNature+"%'";
+				}
 		        if(!address.equals("")){
 		        	address = new String(address.getBytes("iso8859-1"),"UTF-8");
 		        	sql +=" and b.address like '%"+address+"%'";

src/java/com/bus/web/BusInitController.java

@@ -23,6 +23,7 @@ import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.base.service.IBaseOrgTypeService;
 import jxl.Workbook;
 import jxl.format.Alignment;
 import jxl.write.Label;
@@ -102,6 +103,9 @@ public class BusInitController extends BaseController {
 	@Autowired
 	private IBusOrgService busOrgService;
 
+    @Autowired
+    private IBaseOrgTypeService baseOrgTypeService;
+
 	@Autowired
 	private IBusMeterReadInfoService busMeterReadInfoService;
 
@@ -159,7 +163,7 @@ public String busInitList(Model model) {
 public String bugInitInfoList(int pageNo, int pageSize, String orgNumber,
 		String orgName, String year, String busOrgCustomerNumber,
 		String address, String busOrgMeterNumber, String isPlanUser,
-		String userType, HttpServletRequest request) {
+		String userType, String orgNature, HttpServletRequest request) {
 
 	String hql = "select b from BusOrg b where b.importStatus='normal'";
 	if (null != orgNumber && !orgNumber.equals("")) {
@@ -186,6 +190,9 @@ public String bugInitInfoList(int pageNo, int pageSize, String orgNumber,
 	if (null != isPlanUser && !isPlanUser.equals("")) {
 		hql += " and b.isPlanUser ='" + isPlanUser + "'";
 	}
+	if (null != orgNature && !orgNature.equals("")) {
+		hql += " and b.orgNature like '%" + orgNature + "%'";
+	}
 	this.page = busOrgService.getPageByHql(hql, pageNo, pageSize);
 	String result = this.getPageJosnResult();
 
@@ -258,8 +265,6 @@ public Object createYearWaterInfo(String ids, String startTime,
  * 
  * @param startTime
  * @param endTime
- * @param pageNo
- * @param pageSize
  * @param year
  */
 public void doInityearDate(Date startTime, Date endTime,String year,int initValue) {
@@ -296,13 +301,18 @@ private void doDataInit(int orgNumber,Long orgId, Date startTime, Date endTime,i
 //		return;
 //	}
 
+	BusOrg borg1 = busOrgService.get(orgId);
+	String name = borg1.getOrgNature();
+	//取增长比例
+	Float GR = baseOrgTypeService.getGrowthRatio(name);
+
 	// 找到12个月区间总水量
 	List<BusMeterReadInfo> listM = busMeterReadInfoService.getStartOneMonthMeterInfo(orgNumber, startTime, endTime);
 	Float w = 0f;
 	for (int i = 0; i < listM.size(); i++) {
-		BusMeterReadInfo info = listM.get(i);
-		w += info.getWater();
-	}
+        BusMeterReadInfo info = listM.get(i);
+        w += info.getWater();
+    }
 
 	// 计划水量加上5%
 	int planWater = (int) Math.round((1+Float.valueOf(initValue)/100) * w);
@@ -373,7 +383,7 @@ public String userInitInfoList(Model model) {
 public String busUserInfoList(int pageNo, int pageSize, String orgNumber,
 		String orgName, String year, String busOrgCustomerNumber,
 		String address, String busOrgMeterNumber, String isPlanUser,
-		String userType, HttpServletRequest request) {
+		String userType, String orgNature, HttpServletRequest request) {
 			String hql="select b from BusOrg b where b.importStatus='normal'";	
 			if(null != busOrgCustomerNumber && !busOrgCustomerNumber.equals("")){
 				hql +=" and b.orgId in(select bcm.org.orgId from BusCustomerMeter bcm where bcm.customerNumber='"+busOrgCustomerNumber+"')";
@@ -399,6 +409,9 @@ public String busUserInfoList(int pageNo, int pageSize, String orgNumber,
 			if (null != isPlanUser && !isPlanUser.equals("")) {
 				hql += " and b.isPlanUser ='" + isPlanUser+"'";
 			}
+			if (null != orgNature && !orgNature.equals("")) {
+				hql += " and b.orgNature like '%" + orgNature + "%'";
+			}
 			this.page = busOrgService.getPageByHql(hql, pageNo, pageSize);
 			String result = this.getPageJosnResult();
 			log.debug("#########################result" + result);
@@ -646,7 +659,7 @@ public String unitYearPlanWater(Model model){
 public String getYearPlanData(int pageNo,int pageSize,String orgNumber,
 		String orgName, String year, String busOrgCustomerNumber,
 		String address, String busOrgMeterNumber, String priYearUseWater,
-		String userType,String status,String org_name) throws ParseException{
+		String userType, String orgNature,String status,String org_name) throws ParseException{
 	    SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 	    //String sql = "select p.status_id,o.org_id,o.org_number,o.org_name,o.user_type,o.year,p.plan_of_water,p.replay_of_water,p.first_quarter_plan,p.second_quarter_plan,p.third_quarter_plan,p.fourth_quarter_plan,p.user_name,p.fill_time,p.remark,p.pri_year_usewater FROM `bus_annual_plan_for_water` as p left join bus_org o on p.org_id=o.org_id where p.is_cancel='yes'";
 	    String sql = "select p.status_id,o.org_id,o.org_number,o.org_name,o.user_type,o.year,p.plan_of_water,p.reply_of_water,p.first_quarter_reply,p.second_quarter_reply,p.third_quarter_reply,p.fourth_quarter_reply,p.user_name,p.fill_time,p.remark,p.pri_year_usewater ";
@@ -668,6 +681,9 @@ public String getYearPlanData(int pageNo,int pageSize,String orgNumber,
 		if (null != orgName && !orgName.equals("")) {
 			   sql +=" and o.org_name like '%"+orgName+"%'";
 		}
+		if (null != orgNature && !orgNature.equals("")) {
+			sql += " and b.orgNature like '%" + orgNature + "%'";
+		}
 		if (null != year && !year.equals("")) {
 			   sql +=" and o.year='"+year+"'";
 		}
@@ -928,7 +944,6 @@ public Object editYearUnitNotice(BusAnnualPlanForWater plan,BusOrg busOrg,Long s
 /**
  * 水表信息数据
  * @param request
- * @param model
  * @return
  */
 @RequestMapping("AdjWaterList.do")
@@ -982,7 +997,7 @@ public Object YearUnitNoticeCancel(Long[] ids){
  * @throws UnsupportedEncodingException 
  */
 @RequestMapping("unitWaterExportData.do")
-public void unitWaterExportData(String orgNumber,String orgName,String year,String busOrgCustomerNumber,String address,
+public void unitWaterExportData(String orgNumber,String orgName,String orgNature,String year,String busOrgCustomerNumber,String address,
 		String busOrgMeterNumber,String priYearUseWater,String userType,String status,HttpServletResponse response,HttpServletRequest request) throws UnsupportedEncodingException{
 	   //request.setCharacterEncoding("UTF-8");
 	   String hql="select w from BusAnnualPlanForWater w join w.org o where w.isCancel='yes'";
@@ -994,6 +1009,11 @@ public void unitWaterExportData(String orgNumber,String orgName,String year,Stri
 	    	 orgName = new String(orgName.getBytes("iso8859-1"),"UTF-8");
 	    	 hql +=" and o.orgName like '%"+orgName+"%'";
 	    }
+		if(!orgNature.equals("")){
+
+			orgNature = new String(orgNature.getBytes("iso8859-1"),"UTF-8");
+			hql +=" and o.orgNature like '%"+orgNature+"%'";
+		}
 	    if(!year.equals("")){
 	    	 hql +=" and o.year='"+year+"'";
 	    }else{
@@ -1120,8 +1140,8 @@ private void fillExcel(WritableSheet sheet,String hql,int pageNo,int pageSize,in
 			sheet.addCell(new Label(10,row,Math.round(plan.getFourthQuarterReply())+""));//四季度
 			sheet.addCell(new Label(11,row,Math.round(plan.getPlanOfWater())+""));//全年
 			sheet.addCell(new Label(12,row,Math.round(plan.getReplyOfWater())+""));//全年
-			sheet.addCell(new Label(13,row,plan.getOrgType()));//用户类型			
-			
+			sheet.addCell(new Label(13,row,plan.getOrgType()));//用户类型
+			sheet.addCell(new Label(14,row,plan.getOrgNature()));//用水性质
 			
 			row+=1;			
 		}
@@ -1134,14 +1154,6 @@ private void fillExcel(WritableSheet sheet,String hql,int pageNo,int pageSize,in
 }
 /**
  * 打印年度计划通知
- * @param orgNumber
- * @param orgName
- * @param year
- * @param busOrgCustomerNumber
- * @param address
- * @param busOrgMeterNumber
- * @param priYearUseWater
- * @param userType
  * @param model
  * @param ids
  * @return
@@ -1224,7 +1236,7 @@ public String unitYearPlanPrint(Model model){
  * @throws UnsupportedEncodingException 
  */
 @RequestMapping("unitYearReplyPrint.do")
-public String unitYearReplyPrint(String orgNumber,String orgName,String year,String busOrgCustomerNumber,
+public String unitYearReplyPrint(String orgNumber,String orgName,String orgNature,String year,String busOrgCustomerNumber,
 		String address,String busOrgMeterNumber,String priYearUseWater,String userType,Model model,Long[] ids){	   
         if(year.equals("")){
     	  year = getCurrentYear();
@@ -1257,7 +1269,7 @@ public String unitYearReplyPrint(String orgNumber,String orgName,String year,Str
         		list.add(temp);      		
         	}
         }else{
-            list = busOrgService.unitYearReplyPrin(orgNumber, orgName, year, busOrgCustomerNumber, address, busOrgMeterNumber, priYearUseWater, userType);
+            list = busOrgService.unitYearReplyPrin(orgNumber, orgName, year, busOrgCustomerNumber, address, busOrgMeterNumber, priYearUseWater, userType, orgNature);
         }	 
          model.addAttribute("unit", list);
 	     model.addAttribute("year", year);
@@ -1302,7 +1314,7 @@ static void saveToFile(BufferedImage paramBufferedImage, String paramString1, St
  * @throws UnsupportedEncodingException 
  */
 @RequestMapping("unitYearEmailPrint.do")
-public String unitYearEmailPrint(String orgNumber,String orgName,String year,String busOrgCustomerNumber,
+public String unitYearEmailPrint(String orgNumber,String orgName,String orgNature,String year,String busOrgCustomerNumber,
 		String address,String busOrgMeterNumber,String priYearUseWater,String userType,Model model,Long[] ids) throws UnsupportedEncodingException{
 	    List<OrgTemp>  orgList = new ArrayList<OrgTemp>();
 	    if(year.equals("")){
@@ -1313,12 +1325,13 @@ public String unitYearEmailPrint(String orgNumber,String orgName,String year,Str
 	    		BusOrg org = busOrgService.get(orgId);
 	    		String code = org.getCode();
 	    		String name = org.getOrgName();
+				String nature = org.getOrgNature();
 	    		String addr= org.getPostalAddress();
 	    		OrgTemp temp = new OrgTemp(code,name,addr);
 	    		orgList.add(temp);
 	    	}
 	    }else{
-	    	orgList = busOrgService.emailPrintView(orgNumber, orgName, year, busOrgCustomerNumber, address, busOrgMeterNumber, priYearUseWater, userType);
+	    	orgList = busOrgService.emailPrintView(orgNumber, orgName, year, busOrgCustomerNumber, address, busOrgMeterNumber, priYearUseWater, userType, orgNature);
 	    }
 	    String result = JsonUtil.getJSONSerializer().deepSerialize(orgList);
 	    log.debug("#####################################size:"+orgList.size()+"  "+result);
@@ -1341,7 +1354,7 @@ public String unitYearEmailPrint(String orgNumber,String orgName,String year,Str
  * @return
  */
 @RequestMapping("yearPlanPrint.do")
-public String yearPlanPrint(String orgNumber,String orgName,String year,String busOrgCustomerNumber,
+public String yearPlanPrint(String orgNumber,String orgName,String orgNature,String year,String busOrgCustomerNumber,
 		String address,String busOrgMeterNumber,String priYearUseWater,String userType,Model model,Long[] ids){
 		   if(year.equals("")){
 			  year = getCurrentYear();
@@ -1370,7 +1383,7 @@ public String yearPlanPrint(String orgNumber,String orgName,String year,String b
 				  list.add(temp);
 			  } 
 		   }else{
-			   list = busOrgService.unitYearReplyPrin(orgNumber, orgName, year, busOrgCustomerNumber, address, busOrgMeterNumber, priYearUseWater, userType);
+			   list = busOrgService.unitYearReplyPrin(orgNumber, orgName, year, busOrgCustomerNumber, address, busOrgMeterNumber, priYearUseWater, userType, orgNature);
 		   }
 		   if(list!=null)
 			   model.addAttribute("listLength", list.size());
@@ -1404,8 +1417,6 @@ public String countReplyWaterList(Model model){
  * @param year
  * @param busOrgCustomerNumber
  * @param address
- * @param busOrgMeterNumber
- * @param priYearUseWater
  * @param userType
  * @return
  * @throws ParseException 
@@ -1413,7 +1424,7 @@ public String countReplyWaterList(Model model){
 @RequestMapping("listCountReplyWater.do")
 @ResponseBody
 public String listCountReplyWater(int pageNo,int pageSize,String orgNumber,
-		String orgName, String year, String busOrgCustomerNumber,
+		String orgName,String orgNature, String year, String busOrgCustomerNumber,
 		String address,String userType) throws ParseException{
 	    SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 	    
@@ -1426,6 +1437,9 @@ public String listCountReplyWater(int pageNo,int pageSize,String orgNumber,
 	    if(null !=orgName && !orgName.equals("")){
 	    	sql +=" and b.org_name like '%"+orgName+"%'";
 	    }
+		if(null !=orgNature && !orgNature.equals("")){
+			sql +=" and b.org_name like '%"+orgNature+"%'";
+		}
 	    if(null !=address && !address.equals("")){
 	    	sql +=" and b.address like '%"+address+"%'";
 	    }
@@ -1468,7 +1482,7 @@ public String listCountReplyWater(int pageNo,int pageSize,String orgNumber,
  * @throws ParseException 
  */
 @RequestMapping("importYearCountUnitWater.do")
-public void importYearCountUnitWater(String orgNumber,String orgName,String year,
+public void importYearCountUnitWater(String orgNumber,String orgName,String orgNature,String year,
 		String busOrgCustomerNumber,String address,String userType,HttpServletResponse response) throws UnsupportedEncodingException, ParseException{
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         int y =Integer.parseInt(year); 
@@ -1493,7 +1507,7 @@ public void importYearCountUnitWater(String orgNumber,String orgName,String year
 			addFirstRowExcel(sheet,y,f);			
 			
 	        //获取要导出的数据
-	        List<BusOrgTemp> list = busOrgService.getPlanYearCountData(orgNumber, orgName, year, busOrgCustomerNumber, address, userType);
+	        List<BusOrgTemp> list = busOrgService.getPlanYearCountData(orgNumber, orgName, year, busOrgCustomerNumber, address, userType, orgNature);
 	        int row =1;
 	        if(list != null && list.size()>0){
 	        	for(int i=0;i<list.size();i++){

src/java/com/bus/web/BusMeterReadInfoController.java

@@ -67,23 +67,23 @@ public class BusMeterReadInfoController extends BaseController{
 	 * 分页显示单位月用水量信息
 	 * @param orgNumber
 	 * @param orgName
+	 * @param orgNature
 	 * @param year
 	 * @param address
 	 * @param isPlanUser
 	 * @param userType
-	 * @param waterConsumption
 	 * @param pageNo
 	 * @param pageSize
 	 * @return
 	 */
 	@RequestMapping("listPage.do")
 	@ResponseBody
-	public String listPage(String orgNumber, String orgName,
+	public String listPage(String orgNumber, String orgName, String orgNature,
 			String meterNumber,String year, String address,
 			String isPlanUser, Integer userType,Float minWater,Float maxWater,
 			int pageNo, int pageSize){
 		//modify by llq	2015-01-23	去掉客户号
-		this.page =busMeterReadInfoService.getMonthWaterConsumptionList(null,orgNumber, orgName, meterNumber, year, address, isPlanUser, userType, minWater,maxWater, pageNo, pageSize);
+		this.page =busMeterReadInfoService.getMonthWaterConsumptionList(null,orgNumber, orgName, orgNature, meterNumber, year, address, isPlanUser, userType, minWater,maxWater, pageNo, pageSize);
 		return this.getPageJosnResult();
 	}
 	
@@ -114,7 +114,6 @@ public class BusMeterReadInfoController extends BaseController{
 	 * @param userType
 	 * @param minWater
 	 * @param maxWater
-	 * @param ids
 	 * @param flag
 	 * @param pageNo
 	 * @param pageSize
@@ -125,7 +124,7 @@ public class BusMeterReadInfoController extends BaseController{
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@RequestMapping(value = "exportWaterConsumptionExcel.do", method = RequestMethod.GET)
 	@ResponseBody
-	public Object exportWaterConsumptionExcel(String orgNumber, String orgName,
+	public Object exportWaterConsumptionExcel(String orgNumber, String orgName,String orgNature,
 			String meterNumber,String year, String address,
 			String isPlanUser, Integer userType,Float minWater,Float maxWater,String orgIds,String flag,
 			Integer pageNo, Integer pageSize,HttpServletRequest request) throws UnsupportedEncodingException{
@@ -137,7 +136,7 @@ public class BusMeterReadInfoController extends BaseController{
 			String onlyYear=judgeDifYear(y);
 			if(onlyYear!=null){
 				//modify by llq	2015-01-23	去掉客户号
-				this.page=busMeterReadInfoService.getMonthWaterConsumptionList(orgIds, orgNumber, orgName, meterNumber, onlyYear, address, isPlanUser, userType, minWater, maxWater, 1, ids.length);
+				this.page=busMeterReadInfoService.getMonthWaterConsumptionList(orgIds, orgNumber, orgName, orgNature, meterNumber, onlyYear, address, isPlanUser, userType, minWater, maxWater, 1, ids.length);
 				list= (List<UnitMonthWaterConsumptionTemp>) this.page.getResult();
 			}else{
 				list=new ArrayList<UnitMonthWaterDetailTemp>();
@@ -152,8 +151,9 @@ public class BusMeterReadInfoController extends BaseController{
 		}else if(flag!=null&&flag.equals("query")){
 			orgName = new String(orgName.getBytes("ISO8859-1"),"UTF-8");
 			address = new String(address.getBytes("ISO8859-1"),"UTF-8");
+			orgNature = new String(orgNature.getBytes("ISO8859-1"),"UTF-8");
 			//modify by llq	2015-01-23	去掉客户号
-			this.page =busMeterReadInfoService.getMonthWaterConsumptionList(orgIds, orgNumber, orgName, meterNumber, year, address, isPlanUser, userType,minWater,maxWater, pageNo, pageSize);
+			this.page =busMeterReadInfoService.getMonthWaterConsumptionList(orgIds, orgNumber, orgName, orgNature, meterNumber, year, address, isPlanUser, userType,minWater,maxWater, pageNo, pageSize);
 			list= (List<UnitMonthWaterConsumptionTemp>) this.page.getResult();
 		}
 		
@@ -210,7 +210,7 @@ public class BusMeterReadInfoController extends BaseController{
 	 */
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@RequestMapping(value = "printWaterConsumption.do", method = RequestMethod.GET)
-	public String printWaterConsumption(String orgNumber, String orgName,
+	public String printWaterConsumption(String orgNumber, String orgName,String orgNature,
 			String meterNumber,String year, String address,
 			String isPlanUser, Integer userType,Float minWater,Float maxWater,String orgIds,String flag,
 			Integer pageNo, Integer pageSize,HttpServletRequest request,ModelMap model) throws UnsupportedEncodingException{
@@ -222,7 +222,7 @@ public class BusMeterReadInfoController extends BaseController{
 			String onlyYear=judgeDifYear(y);
 			if(onlyYear!=null){
 				//modify by llq	2015-01-23	去掉客户号
-				this.page=busMeterReadInfoService.getMonthWaterConsumptionList(orgIds, orgNumber, orgName, meterNumber, onlyYear, address, isPlanUser, userType, minWater, maxWater, 1, ids.length);
+				this.page=busMeterReadInfoService.getMonthWaterConsumptionList(orgIds, orgNumber, orgName, orgNature, meterNumber, onlyYear, address, isPlanUser, userType, minWater, maxWater, 1, ids.length);
 				list= (List<UnitMonthWaterConsumptionTemp>) this.page.getResult();
 			}else{
 				list=new ArrayList<UnitMonthWaterDetailTemp>();
@@ -237,8 +237,9 @@ public class BusMeterReadInfoController extends BaseController{
 		}else if(flag!=null&&flag.equals("query")){
 			orgName = new String(orgName.getBytes("ISO8859-1"),"UTF-8");
 			address = new String(address.getBytes("ISO8859-1"),"UTF-8");
+			orgNature = new String(orgNature.getBytes("ISO8859-1"),"UTF-8");
 			//modify by llq	2015-01-23	去掉客户号
-			this.page =busMeterReadInfoService.getMonthWaterConsumptionList(orgIds, orgNumber, orgName, meterNumber, year, address, isPlanUser, userType,minWater,maxWater, pageNo, pageSize);
+			this.page =busMeterReadInfoService.getMonthWaterConsumptionList(orgIds, orgNumber, orgName, orgNature, meterNumber, year, address, isPlanUser, userType,minWater,maxWater, pageNo, pageSize);
 			list= (List<UnitMonthWaterConsumptionTemp>) this.page.getResult();
 		}
 		
@@ -300,7 +301,7 @@ public class BusMeterReadInfoController extends BaseController{
 	 */
 	@RequestMapping("listUnitWaterMeterPage.do")
 	@ResponseBody
-	public String listUnitWaterMeterPage(String orgNumber,String orgName,
+	public String listUnitWaterMeterPage(String orgNumber,String orgName,String orgNature,
 			String meterNumber,String year,String isPlanUser,
 			Integer userType,Float minWater,Float maxWater,int pageNo, int pageSize){
 		//modify by llq	2015-01-22	去掉客户号
@@ -309,8 +310,8 @@ public class BusMeterReadInfoController extends BaseController{
 //		if(year==null || "".equals(year)){
 //			year = getCurrentYear();
 //		}
-		List<UnitWaterMeterTemp> list = busMeterReadInfoService.getUnitWaterMeterList(orgNumber, orgName, meterNumber, year, isPlanUser, userType, minWater, maxWater,null, pageNo, pageSize);
-		int totalRows = busMeterReadInfoService.getTotalRows(orgNumber, orgName, meterNumber, year, isPlanUser, userType, minWater, maxWater,null, pageNo, pageSize);
+		List<UnitWaterMeterTemp> list = busMeterReadInfoService.getUnitWaterMeterList(orgNumber, orgName, orgNature, meterNumber, year, isPlanUser, userType, minWater, maxWater,null, pageNo, pageSize);
+		int totalRows = busMeterReadInfoService.getTotalRows(orgNumber, orgName, orgNature, meterNumber, year, isPlanUser, userType, minWater, maxWater,null, pageNo, pageSize);
 		Map<String, Object> map = new Hashtable<String,Object>();
 		map.put("rows", list);
 		map.put("pager.pageNo", pageNo);
@@ -408,7 +409,7 @@ public class BusMeterReadInfoController extends BaseController{
 	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "exportUnitWaterMeterExcel.do", method = RequestMethod.GET)
 	@ResponseBody
-	public Object exportUnitWaterMeterExcel(String orgNumber,String orgName,
+	public Object exportUnitWaterMeterExcel(String orgNumber,String orgName,String orgNature,
 			String meterNumber,String year,String month,String isPlanUser,
 			Integer userType,Float minWater,Float maxWater,
 			Integer pageNo, Integer pageSize,String infoIds,String flag,HttpServletRequest request) throws UnsupportedEncodingException{
@@ -418,7 +419,7 @@ public class BusMeterReadInfoController extends BaseController{
 		List<UnitWaterMeterTemp> list=null;
 		if(flag!=null&&flag.equals("selected")){
 			list=new ArrayList<UnitWaterMeterTemp>();
-			list=busMeterReadInfoService.getUnitWaterMeterList(orgNumber, orgName, meterNumber, year, isPlanUser, userType, minWater, maxWater, infoIds,pageNo, pageSize);
+			list=busMeterReadInfoService.getUnitWaterMeterList(orgNumber, orgName, orgNature, meterNumber, year, isPlanUser, userType, minWater, maxWater, infoIds,pageNo, pageSize);
 //			String[] ids=infoIds.split(",");
 //			for (int i = 0;ids!=null&&i < ids.length; i++) {
 //				if(ids[i]!=null){
@@ -433,7 +434,7 @@ public class BusMeterReadInfoController extends BaseController{
 			//modify by llq	2015-01-22	去掉客户号
 //			this.page =busMeterReadInfoService.getUnitWaterMeterList(orgNumber, orgName,meterNumber, year,isPlanUser, userType, minWater,maxWater, pageNo, pageSize);
 //			list= (List<UnitWaterMeterTemp>) this.page.getResult();
-			list= busMeterReadInfoService.getUnitWaterMeterList(orgNumber, orgName, meterNumber, year, isPlanUser, userType, minWater, maxWater,null, pageNo, pageSize);
+			list= busMeterReadInfoService.getUnitWaterMeterList(orgNumber, orgName, orgNature, meterNumber, year, isPlanUser, userType, minWater, maxWater,null, pageNo, pageSize);
 		}
 		
 		String fileName="单位水表水量.xls";
@@ -489,7 +490,7 @@ public class BusMeterReadInfoController extends BaseController{
 	 */
 	@SuppressWarnings("unchecked")
 	@RequestMapping("printUnitWaterMeter.do")
-	public String printUnitWaterMeter(String orgNumber,String orgName,
+	public String printUnitWaterMeter(String orgNumber,String orgName,String orgNature,
 			String meterNumber,String year,String month,String isPlanUser,
 			Integer userType,Float minWater,Float maxWater,
 			Integer pageNo, Integer pageSize,String infoIds,String flag,ModelMap model,HttpServletRequest request) throws UnsupportedEncodingException {
@@ -502,7 +503,7 @@ public class BusMeterReadInfoController extends BaseController{
 		List<UnitWaterMeterTemp> list=null;
 		if(flag!=null&&flag.equals("selected")){
 			list=new ArrayList<UnitWaterMeterTemp>();
-			list=busMeterReadInfoService.getUnitWaterMeterList(orgNumber, orgName, meterNumber, year, isPlanUser, userType, minWater, maxWater, infoIds,pageNo, pageSize);
+			list=busMeterReadInfoService.getUnitWaterMeterList(orgNumber, orgName, orgNature, meterNumber, year, isPlanUser, userType, minWater, maxWater, infoIds,pageNo, pageSize);
 //			String[] ids=infoIds.split(",");
 //			for (int i = 0;ids!=null&&i < ids.length; i++) {
 //				if(ids[i]!=null){
@@ -518,7 +519,7 @@ public class BusMeterReadInfoController extends BaseController{
 			//modify by llq	2015-01-22	去掉客户号
 //			this.page =busMeterReadInfoService.getUnitWaterMeterList(orgNumber, orgName, meterNumber, year,isPlanUser, userType, minWater,maxWater, pageNo, pageSize);
 //			list= (List<UnitWaterMeterTemp>) this.page.getResult();
-			list= busMeterReadInfoService.getUnitWaterMeterList(orgNumber, orgName, meterNumber, year, isPlanUser, userType, minWater, maxWater, null,pageNo, pageSize);
+			list= busMeterReadInfoService.getUnitWaterMeterList(orgNumber, orgName, orgNature, meterNumber, year, isPlanUser, userType, minWater, maxWater, null,pageNo, pageSize);
 		}
 		model.addAttribute("list", list);
 		return "bus/org-water-meter-print";

src/java/com/bus/web/BusOrgController.java

@@ -137,6 +137,7 @@ public class BusOrgController extends BaseController{
 					 "		WHERE b.importStatus='"+importStatus+"' AND b.year='"+year+"' 		                		                                 " +
 					 "		AND	 (b.orgName='"+param+"' 	   			                		                		                                 " +
 					 "		OR	  b.address='"+param+"'        		                		                		                                     " +
+				     "      OR    b.orgNature='"+param+"'                                                                                                " +
 					 "      OR    b.orgNumber in('"+param+"')      		                		                		                                 " +
 					 "      OR    b.phone='"+param+"'          		                		                		                                     " +
 					 "      OR    b.bankAccount='"+param+"'    		                		                		                                     " + 
@@ -196,10 +197,10 @@ public class BusOrgController extends BaseController{
 	@ResponseBody
 	public String listPage(String orgNumber, String orgName,
 			String meterNumber,String year, String address,
-			String isPlanUser, Integer userType,Float minWater,Float maxWater,
+			String isPlanUser, Integer userType, String orgNature,Float minWater,Float maxWater,
 			int pageNo, int pageSize){
 		//modify by llq	2015-01-23	去掉客户号
-		this.page =busMeterReadInfoService.getMonthWaterConsumptionList(null,orgNumber, orgName, meterNumber, year, address, isPlanUser, userType, minWater,maxWater, pageNo, pageSize);
+		this.page =busMeterReadInfoService.getMonthWaterConsumptionList(null,orgNumber, orgName,orgNature, meterNumber, year, address, isPlanUser, userType, minWater,maxWater, pageNo, pageSize);
 		return this.getPageJosnResult();
 	}
 	
@@ -232,9 +233,9 @@ public class BusOrgController extends BaseController{
 	public String orgListPage(int pageNo, int pageSize, String orgNumber,
 			String orgName, String year, String busOrgCustomerNumber,
 			String address, String busOrgMeterNumber, String isPlanUser,
-			String userType, HttpServletRequest request) {
+			String userType, String orgNature, HttpServletRequest request) {
 		this.page = busOrgService.getOrgListPage(pageNo, pageSize, orgNumber, orgName, year,
-				busOrgCustomerNumber, address, busOrgMeterNumber, isPlanUser, userType);
+				busOrgCustomerNumber, address, busOrgMeterNumber, isPlanUser, userType, orgNature);
 		String result = this.getPageJosnResult();
 		return result;
 	}
@@ -595,7 +596,7 @@ public class BusOrgController extends BaseController{
 	public Object exportOrgExcel(Integer pageNo, Integer pageSize, String orgNumber,
 			String orgName, String year, String busOrgCustomerNumber,
 			String address, String busOrgMeterNumber, String isPlanUser,
-			String userType,String ids,String flag,HttpServletRequest request) throws UnsupportedEncodingException{
+			String userType, String orgNature,String ids,String flag,HttpServletRequest request) throws UnsupportedEncodingException{
 		
 		List<BusOrg> list=null;
 		if(flag!=null&&flag.equals("selected")){
@@ -612,7 +613,8 @@ public class BusOrgController extends BaseController{
 		}else if(flag!=null&&flag.equals("query")){
 			orgName = new String(orgName.getBytes("ISO8859-1"),"UTF-8");
 			address = new String(address.getBytes("ISO8859-1"),"UTF-8");
-			this.page =busOrgService.getOrgListPage(pageNo, pageSize, orgNumber, orgName, year, busOrgCustomerNumber, address, busOrgMeterNumber, isPlanUser, userType);
+			orgNature = new String(orgNature.getBytes("ISO8859-1"),"UTF-8");
+			this.page =busOrgService.getOrgListPage(pageNo, pageSize, orgNumber, orgName, orgNature, year, busOrgCustomerNumber, address, busOrgMeterNumber, isPlanUser, userType);
 			list= (List<BusOrg>) this.page.getResult();
 		}
 		
@@ -624,9 +626,9 @@ public class BusOrgController extends BaseController{
 		}
 		
 		try {
-			String[] titles = new String[]{ "单位编号", "单位名称", "是否计划户", "用户类型", "年度", "客户号" ,"水表编号","单位地址", "邮政编码","单位email","开户银行","银行账号","备注"};
+			String[] titles = new String[]{ "单位编号", "单位名称", "用水性质", "是否计划户", "用户类型", "年度", "客户号" ,"水表编号","单位地址", "邮政编码","单位email","开户银行","银行账号","备注"};
 	        int columnLength[] = {20,30,20,20,20,30, 30,30,20,20,20,20,30};
-	        String[] fileds=new String[]{"orgNumber","orgName","planUser","userType","year",
+	        String[] fileds=new String[]{"orgNumber","orgName","orgNature","planUser","userType","year",
 	        		"busOrgCustomerNumber","busOrgMeterNumber","address","code","email","bank",
 	        		"bankAccount","remark"};
 			ExcelUtils.writeExcel(fileName, list, titles, columnLength, fileds);
@@ -665,7 +667,7 @@ public class BusOrgController extends BaseController{
 	@SuppressWarnings("unchecked")
 	@RequestMapping("printUnitInfo.do")
 	public String printUnitInfo(Integer pageNo, Integer pageSize, String orgNumber,
-			String orgName, String year, String busOrgCustomerNumber,
+			String orgName, String orgNature, String year, String busOrgCustomerNumber,
 			String address, String busOrgMeterNumber, String isPlanUser,
 			String userType,String ids,String flag,ModelMap model,HttpServletRequest request) throws UnsupportedEncodingException {
 		
@@ -684,7 +686,8 @@ public class BusOrgController extends BaseController{
 		}else if(flag!=null&&flag.equals("query")){
 			orgName = new String(orgName.getBytes("ISO8859-1"),"UTF-8");
 			address = new String(address.getBytes("ISO8859-1"),"UTF-8");
-			this.page =busOrgService.getOrgListPage(pageNo, pageSize, orgNumber, orgName, year, busOrgCustomerNumber, address, busOrgMeterNumber, isPlanUser, userType);
+			orgNature = new String(orgNature.getBytes("ISO8859-1"),"UTF-8");
+			this.page =busOrgService.getOrgListPage(pageNo, pageSize, orgNumber, orgName, orgNature, year, busOrgCustomerNumber, address, busOrgMeterNumber, isPlanUser, userType);
 			list= (List<BusOrg>) this.page.getResult();
 		}
 		model.addAttribute("list", list);
@@ -721,11 +724,11 @@ public class BusOrgController extends BaseController{
 	@RequestMapping("listTapWaterUserPage.do")
 	@ResponseBody
 	public String listTapWaterUsers(int pageNo, int pageSize, String orgNumber,
-			String orgName, String year, String busOrgCustomerNumber,
+			String orgName,String orgNature, String year, String busOrgCustomerNumber,
 			String busOrgMeterNumber, String isPlanUser,
 			HttpServletRequest request){
 		
-		this.page=busOrgService.getOrgListPage(pageNo, pageSize, orgNumber, orgName, year, busOrgCustomerNumber, null, busOrgMeterNumber, isPlanUser, "");
+		this.page=busOrgService.getOrgListPage(pageNo, pageSize, orgNumber, orgName, orgNature, year, busOrgCustomerNumber, null, busOrgMeterNumber, isPlanUser, "");
 		return this.getPageJosnResult();
 	}
 	
@@ -996,7 +999,7 @@ public class BusOrgController extends BaseController{
 	@RequestMapping(value = "exportTapWaterUserExcel.do", method = RequestMethod.GET)
 	@ResponseBody
 	public Object exportTapWaterUserExcel(Integer pageNo, Integer pageSize, String orgNumber,
-			String orgName, String year, String busOrgCustomerNumber,
+			String orgName,String orgNature, String year, String busOrgCustomerNumber,
 			String busOrgMeterNumber, String isPlanUser,
 			String ids,String flag,HttpServletRequest request) throws UnsupportedEncodingException{
 		
@@ -1014,7 +1017,8 @@ public class BusOrgController extends BaseController{
 			
 		}else if(flag!=null&&flag.equals("query")){
 			orgName = new String(orgName.getBytes("ISO8859-1"),"UTF-8");
-			this.page =busOrgService.getOrgListPage(pageNo, pageSize, orgNumber, orgName, year, busOrgCustomerNumber, null, busOrgMeterNumber, isPlanUser, null);
+			orgNature = new String(orgNature.getBytes("ISO8859-1"),"UTF-8");
+			this.page =busOrgService.getOrgListPage(pageNo, pageSize, orgNumber, orgName, orgNature, year, busOrgCustomerNumber, null, busOrgMeterNumber, isPlanUser, null);
 			list= (List<BusOrg>) this.page.getResult();
 		}
 		
@@ -1026,9 +1030,9 @@ public class BusOrgController extends BaseController{
 		}
 		
 		try {
-	        String[] titles = new String[]{"单位编号","单位名称","单位地址","年度","是否计划户","客户号","水表编号","单位类别","分片区管理","备注"};
+	        String[] titles = new String[]{"单位编号","单位名称","用水性质","单位地址","年度","是否计划户","客户号","水表编号","单位类别","分片区管理","备注"};
 	        int columnLength[] = {20,30,30,10,20,20,20,20,20,20};
-	        String[] fileds=new String[]{"orgNumber","orgName","address","year","planUser",
+	        String[] fileds=new String[]{"orgNumber","orgName","orgNature","address","year","planUser",
 	        		"busOrgCustomerNumber","busOrgMeterNumber","baseOrgType","area","remark"};
 			ExcelUtils.writeExcel(fileName, list, titles, columnLength, fileds);
 		} catch (RowsExceededException e) {

src/java/com/data/dao/impl/ImportDataFileDaoImpl.java

@@ -179,18 +179,22 @@ public class ImportDataFileDaoImpl extends GenericDaoImpl<ImportDataFile, Long>
 						String ZH = rs.getString("ZH");
 						if(ZH==null){
 							ZH = "";
-						}		
+						}
+						String YSSX = rs.getString("YSSX");
+						if(YSSX==null){
+							YSSX = "";
+						}
 //						if(strsql==""){
-							strsql = "('"+KHH+"', '"+HH+"', '"+BZMC+"', '"+ZBWZ+"', '"+YYQY+"', '"+LXDH+"', '"+ZH+"')";
+							strsql = "('"+KHH+"', '"+HH+"', '"+BZMC+"', '"+ZBWZ+"', '"+YYQY+"', '"+LXDH+"', '"+ZH+"', '"+YSSX+"')";
 //						}
 //						else{
 //							strsql += ",('"+KHH+"', '"+HH+"', '"+BZMC+"', '"+ZBWZ+"', '"+YYQY+"', '"+LXDH+"', '"+ZH+"')";
 //						}	
-						sm.executeUpdate("insert into yhjbxx (KHH, HH, BZMC, ZBWZ, YYQY, LXDH, ZH) values "+ strsql);
+						sm.executeUpdate("insert into yhjbxx (KHH, HH, BZMC, ZBWZ, YYQY, LXDH, ZH, YSSX) values "+ strsql);
 				}
-				//sm.executeUpdate("insert into yhjbxx (KHH, HH, BZMC, ZBWZ, YYQY, LXDH, ZH) values "+ strsql);
+				//sm.executeUpdate("insert into yhjbxx (KHH, HH, BZMC, ZBWZ, YYQY, LXDH, ZH, YSSX) values "+ strsql);
 //			}
-			sm.executeUpdate("DELETE Y FROM  yhjbxx Y WHERE EXISTS ( SELECT * FROM `bus_org` bo JOIN `bus_customer_meter` bcm ON bo.`org_id`=bcm.`org_id` WHERE y.bzmc=bo.`org_name` AND y.zbwz=bcm.`address` AND y.khh=bcm.`customer_Number` AND y.hh = bcm.`meter_Number` AND bcm.`year`='"+year+"')");	
+			sm.executeUpdate("DELETE Y FROM  yhjbxx Y WHERE EXISTS ( SELECT * FROM `bus_org` bo JOIN `bus_customer_meter` bcm ON bo.`org_id`=bcm.`org_id` WHERE y.bzmc=bo.`org_name` AND y.yssx=bo.`org_nature` AND y.zbwz=bcm.`address` AND y.khh=bcm.`customer_Number` AND y.hh = bcm.`meter_Number` AND bcm.`year`='"+year+"')");
 			sm.close();
 			stmt.close();
 			oracleconn.close();
@@ -295,17 +299,21 @@ public class ImportDataFileDaoImpl extends GenericDaoImpl<ImportDataFile, Long>
 						String ZH = rs.getString("ZH");
 						if(ZH==null){
 							ZH = "";
-						}		
+						}
+						String YSSX = rs.getString("YSSX");
+						if(YSSX==null){
+							YSSX = "";
+						}
 						if(strsql==""){
-							strsql = "('"+KHH+"', '"+HH+"', '"+BZMC+"', '"+ZBWZ+"', '"+YYQY+"', '"+LXDH+"', '"+ZH+"')";
+							strsql = "('"+KHH+"', '"+HH+"', '"+BZMC+"', '"+ZBWZ+"', '"+YYQY+"', '"+LXDH+"', '"+ZH+"', '"+YSSX+"')";
 						}
 						else{
-							strsql += ",('"+KHH+"', '"+HH+"', '"+BZMC+"', '"+ZBWZ+"', '"+YYQY+"', '"+LXDH+"', '"+ZH+"')";
+							strsql += ",('"+KHH+"', '"+HH+"', '"+BZMC+"', '"+ZBWZ+"', '"+YYQY+"', '"+LXDH+"', '"+ZH+"', '"+YSSX+"')";
 						}				
 				}
-				sm.executeUpdate("insert into yhjbxx (KHH, HH, BZMC, ZBWZ, YYQY, LXDH, ZH) values "+ strsql);
+				sm.executeUpdate("insert into yhjbxx (KHH, HH, BZMC, ZBWZ, YYQY, LXDH, ZH, YSSX) values "+ strsql);
 			}
-			sm.executeUpdate("DELETE Y FROM  yhjbxx Y WHERE EXISTS ( SELECT * FROM `bus_org` bo JOIN `bus_customer_meter` bcm ON bo.`org_id`=bcm.`org_id` WHERE y.bzmc=bo.`org_name` AND y.zbwz=bcm.`address` AND y.khh=bcm.`customer_Number` AND y.hh = bcm.`meter_Number` AND bcm.`year`='"+year+"')");	
+			sm.executeUpdate("DELETE Y FROM  yhjbxx Y WHERE EXISTS ( SELECT * FROM `bus_org` bo JOIN `bus_customer_meter` bcm ON bo.`org_id`=bcm.`org_id` WHERE y.bzmc=bo.`org_name` AND y.yssx=bo.`org_nature` AND y.zbwz=bcm.`address` AND y.khh=bcm.`customer_Number` AND y.hh = bcm.`meter_Number` AND bcm.`year`='"+year+"')");
 			sm.close();
 			stmt.close();
 			mysqlconn.close();

src/java/com/popedom/web/WxController.java

@@ -129,7 +129,7 @@ public class WxController extends BaseController
 	//String orgNumber = wxOrgService.findUniqueBy("openId", openId).getOrgNumber().toString();
 	Long orgId = busOrgService.findOrgNumberByYear(Integer.parseInt(orgNumber));
 	BusOrg busOrg = busOrgService.get(orgId);		
-	List<UnitWaterMeterTemp> list = this.busMeterReadInfoService.getUnitWaterMeterList(orgNumber, null, meterNumber, year, null, null, null, null, null, 1, 20);
+	List<UnitWaterMeterTemp> list = this.busMeterReadInfoService.getUnitWaterMeterList(orgNumber, null, null, meterNumber, year, null, null, null, null, null, 1, 20);
 	model.addAttribute("busOrg", busOrg);
 
 	model.addAttribute("UnitWaterMeterTemp", list);