一览退回和不通过数据异步显示

git-svn-id: https://192.168.57.71/svn/jsgkj@70 931142cf-59ea-a443-aa0e-51397b428577

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/common/component/ui/ZysqbpPager.mxml

@@ -10,6 +10,7 @@
 			[Bindable]
 			public var pageVo:SinglePageRequestVo = new SinglePageRequestVo();
 			public var queryFunction:Function;
+			[Bindable]
 			public var extraText:String="";
 			/**
 			 *  检索处理

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/zysqbp/ShbpModel.as

@@ -351,14 +351,11 @@ package com.jtgh.yjpt.model.zysqbp
 			{
 				sfsbList = bc.getAttribute("sfsbList") as ArrayCollection;
 				thisDataList = bc.getAttribute("records") as ArrayCollection;
-				var btgs:int = bc.getAttribute("btgs") as int;
-				var ths:int = bc.getAttribute("ths") as int;
-				text="不通过"+"<font color='#ff0000'>" + btgs + "</font>" + "条,退回"+
-				"<font color='#ff0000'>" + ths + "</font>" + "条";
-				thisView.pager.pageVo.totalCount = bc.getAttribute("totalCount") as int;		
+				thisView.pager.pageVo.totalCount = bc.getAttribute("totalCount") as int;	
+				queryBty();
 				return;					
 			}
-			if(doAction == "listNoFlow"){
+			else if(doAction == "listNoFlow"){
 				sfsbList = bc.getAttribute("sfsbList") as ArrayCollection;
 				thisDataList = bc.getAttribute("records") as ArrayCollection;
 				thisView.pager.pageVo.totalCount = bc.getAttribute("totalCount") as int;
@@ -368,6 +365,13 @@ package com.jtgh.yjpt.model.zysqbp
 			{
 				doQuery(null);
 				return;					
+			} else if(doAction == "countStatus"){
+				var btgs:int = bc.getAttribute("btgs") as int;
+				var ths:int = bc.getAttribute("ths") as int;
+				text="不通过"+"<font color='#ff0000'>" + btgs + "</font>" + "条,退回"+
+					"<font color='#ff0000'>" + ths + "</font>" + "条";
+				thisView.pager.extraText=text;
+				return;
 			}
 		}
 		
@@ -393,6 +397,7 @@ package com.jtgh.yjpt.model.zysqbp
 		 * 分页
 		 */
 		private var queryByFlowDisplay:Boolean = false;
+		
 		public function pageQuery(pager:SinglePageRequestVo):void
 		{
 			var queryOperation:String;
@@ -444,6 +449,65 @@ package com.jtgh.yjpt.model.zysqbp
 				thisView.query_shr.text,thisView.query_gkdw.text
 			);
 		}
+		
+		/**
+		 * 查询不同意数和退回数
+		 */
+		public function queryBty():void
+		{
+			var queryOperation:String;
+			//查询一览
+			var vo:ZysqbpVo = new ZysqbpVo();
+			if(null !=thisView.query_gk.selectedVO&&"NaN"!=(thisView.query_gk.selectedVO as CodeVo).id.toString()){
+				vo.szd = thisView.query_gk.selectedVO as CodeVo;
+			}
+			if(null != thisView.query_gq.selectedVO){
+				vo.szgq = thisView.query_gq.selectedVO as GqVo;
+			}
+			if(null!=thisView.query_gkdw2.selectedVO){
+				vo.zydw = thisView.query_gkdw2.selectedVO as JyrVo;
+			}
+			vo.bh = thisView.query_bh.text;
+			vo.mao = thisView.mao.textValue as String;
+			vo.cm = thisView.query_hmhc.text;
+			vo.wxwpmc = thisView.query_hwpmbh.text;
+			vo.wxhwmcbh = thisView.query_hwpm.text;
+			vo.recordStatus=9;
+			if(undefined != thisView.query_rwzt.selectedItem && ""!=thisView.query_rwzt.selectedItem.id){
+				vo.recordStatus =new Number(thisView.query_rwzt.selectedItem.id);
+			}
+			//			vo.jcg=thisView.jcg.text;
+			//根据流程状态查询
+			var lcStatus:String = "";
+			if(queryByFlowDisplay){
+				if(Global.deployMode=="0"){//省级  只能点击省级部分的节点
+					if(selectedNodeName!= "查询与统计"&&selectedNodeName!="入库"){
+						return;
+					}else{
+						lcStatus = selectedNodeName;
+					}
+				}else{//市级只能点击所在地和经营人的节点
+					if(selectedNodeName == "zdsgyhpc_cxtj"||selectedNodeName=="查询"){
+						
+					}else if(selectedNodeName== "查询与统计"||selectedNodeName=="入库"){
+						return;
+					}else{
+						lcStatus = selectedNodeName;
+					}
+				}
+			}
+			Utils.callRemote("zysqbpController","countStatus",resultCallback,
+				Utils.getFunctionId(thisView),vo,lcStatus,
+				thisView.query_bgsj_1.dateTime,thisView.query_bgsj_2.dateTime,
+				thisView.query_kgsj_1.dateTime,thisView.query_kgsj_2.dateTime,
+				thisView.query_wgsj_1.dateTime,thisView.query_wgsj_2.dateTime,
+				thisView.query_shr.text,thisView.query_gkdw.text
+			);
+		}
+		
+		/**
+		 * 打印
+		 */
 		public function doPrint(e:Event):void{
 			var vo:ZysqbpVo;
 			vo=new ZysqbpVo;

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/zysqbp/ZysqbpLayout.mxml

@@ -304,7 +304,7 @@
 			</s:HGroup>
 			<s:HGroup width="100%" height="40" gap="0" horizontalAlign="left" verticalAlign="middle">		
 				<s:HGroup width="31%" horizontalAlign="left" verticalAlign="middle">			
-					<cus:QLabel width="130" text="审核人"/>
+					<cus:QLabel width="130" text="审批人"/>
 					<cus:QTextInput id="query_shr" width="180"/>
 				</s:HGroup>	
 				<s:HGroup width="31%" horizontalAlign="left" verticalAlign="middle">			
@@ -335,7 +335,7 @@
 					<ui:DataGridColumn visible="false" dataField="xcglfzr" headerText="现场管理负责人"/>
 					<ui:DataGridColumn visible="false" dataField="jcg" headerText="进出港"/>
 					<ui:DataGridColumn dataField="zysl" headerText="作业数量"/>
-					<ui:DataGridColumn dataField="bgsj" dateFormatString="YYYY-MM-DD"
+					<ui:DataGridColumn dataField="bgsj" dateFormatString="YYYY-MM-DD JJ:NN:SS"
 									   headerText="报告时间" sortable="true"/>
 					<ui:DataGridColumn visible="false" dataField="wxplb" headerText="危险品类别"/>
 					<ui:DataGridColumn width="100" dataField="wxhwmcbh" dataTipField="wxhwmcbh"

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/zysqbp/ZysqbpLayoutNoflow.mxml

@@ -175,7 +175,7 @@
 		</s:HGroup>
 		<s:HGroup width="100%" height="40" gap="0" horizontalAlign="left" verticalAlign="middle">		
 			<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="31%">			
-				<cus:QLabel text="审核人" width="130"/>
+				<cus:QLabel text="审批人" width="130"/>
 				<cus:QTextInput id="query_shr" width="180"/>
 			</s:HGroup>	
 			<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="31%">			
@@ -211,7 +211,7 @@
 				<ui:DataGridColumn dataField="zysl" 
 								   headerText="作业数量" />
 				<ui:DataGridColumn dataField="bgsj" sortable="true"
-								   headerText="报告时间"  dateFormatString="YYYY-MM-DD" />
+								   headerText="报告时间"  dateFormatString="YYYY-MM-DD JJ:NN:SS" />
 				<ui:DataGridColumn dataField="wxplb"
 								   headerText="危险品类别" visible="false"/>
 				<ui:DataGridColumn dataField="wxhwmcbh"

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/zysqbp/ZysqbpController.java

@@ -212,6 +212,22 @@ public class ZysqbpController extends BaseController {
 		return createBusinessContext("msg.success", true);
 	}
 
+	/**
+	 * 一览查询
+	 * @param pageable
+	 * @param functionId
+	 * @param entity
+	 * @param lcStatus
+	 * @param bgsj1
+	 * @param bgsj2
+	 * @param kgsj1
+	 * @param kgsj2
+	 * @param wgsj1
+	 * @param wgsj2
+	 * @param name
+	 * @param gkdw
+	 * @return
+	 */
 	@Log(Type.QUERY)
 	public BusinessContext list(Pageable pageable, final Long functionId,
 			final ZysqbpEntity entity, final String lcStatus, final Date bgsj1,
@@ -360,8 +376,38 @@ public class ZysqbpController extends BaseController {
 			}
 			bc = createBusinessContext(pageList);
 			bc.setAttribute("sfsbList", sfsbList);
-			Specification<ZysqbpEntity> spec1 = new Specification<ZysqbpEntity>() {
+			return bc;
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return null;
 
+	}
+	
+	/**
+	 *计算不通过和被退回的数量 
+	 * @param functionId
+	 * @param entity
+	 * @param lcStatus
+	 * @param bgsj1
+	 * @param bgsj2
+	 * @param kgsj1
+	 * @param kgsj2
+	 * @param wgsj1
+	 * @param wgsj2
+	 * @param name
+	 * @param gkdw
+	 * @return
+	 */
+	@Log(Type.QUERY)
+	public BusinessContext countStatus(final Long functionId,
+			final ZysqbpEntity entity, final String lcStatus, final Date bgsj1,
+			final Date bgsj2, final Date kgsj1, final Date kgsj2,
+			final Date wgsj1, final Date wgsj2, final String name,
+			final String gkdw) {
+		BusinessContext bc = new BusinessContext();
+		try {		
+			Specification<ZysqbpEntity> spec1 = new Specification<ZysqbpEntity>() {
 				@Override
 				public Predicate toPredicate(Root<ZysqbpEntity> root,
 						CriteriaQuery<?> query, CriteriaBuilder cb) {