Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java

@@ -34,7 +34,7 @@ public class NtcLwhhReportController extends BaseController {
 	@RequestMapping("/ajaxNtcLwhhReport")
 	public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
-		List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
+		List<RequestInfo> requestInfos=requestInfoService.getAllLwhhRequestInfo();
 		model.addAttribute("requestInfos", requestInfos);
 		if(bean.getServiceId()!=null){
 			bean.setServices(bean.getServiceId().toString());

src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml

@@ -379,6 +379,9 @@
 	      <if test="ipTotal != null" >
 	        ip_total = #{ipTotal,jdbcType=INTEGER},
 	      </if>
+	      <if test="addrPoolName != null and addrPoolName != ''" >
+	        addr_pool_name = #{addrPoolName,jdbcType=VARCHAR},
+	      </if>
 	      <if test="isValid != null" >
 	        is_valid = #{isValid,jdbcType=INTEGER},
 	      </if>

src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml

@@ -252,6 +252,9 @@
 	      <if test="userType != null and userType != ''" >
 	        user_type = #{userType,jdbcType=VARCHAR},
 	      </if>
+	      <if test="cfgDesc != null and cfgDesc != ''" >
+	        cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
+	      </if>
 	      <if test="addrPoolId != null" >
 	        addr_pool_id = #{addrPoolId,jdbcType=INTEGER},
 	      </if>

src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java

@@ -26,6 +26,8 @@ public interface RequestInfoDao  extends CrudDao {
 	void delete(@Param("id") Long id);
 	
 	String getRequestTitleById(@Param("id")Long id);
+	
+	List<RequestInfo> findAllLwhhList();
 
 
 }

src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml

@@ -218,6 +218,13 @@
 	from request_info
   </select>
   
+    <select id="findAllLwhhList" resultMap="BaseResultMap">
+	select
+		<include refid="Base_Column_List" />
+	from request_info
+	where  is_audit =1 or is_audit=3 
+  </select>
+  
   <select id="getRequestTitleById" resultType="string">
   	select request_title requestTitle from request_info where id=#{id}
   </select>

src/main/java/com/nis/web/service/configuration/RequestInfoService.java

@@ -114,6 +114,11 @@ public class RequestInfoService extends BaseService{
 		RequestInfo requestInfo=new RequestInfo();
 		return requestInfoDao.findAllList(requestInfo);
 	}
+	
+	public List<RequestInfo> getAllLwhhRequestInfo(){
+		return requestInfoDao.findAllLwhhList();
+	}
+	
 
 	public List<TaskInfo> showTask(TaskInfo taskInfo) {
 		return taskInfoDao.findList(taskInfo);