git-svn-id: https://192.168.57.71/svn/lyggkj@40 1a6f6e3a-4066-fe46-b609-79c204482ece

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

@@ -73,7 +73,7 @@ package com.jtgh.yjpt.model.zysqbp
 	
 	import spark.components.gridClasses.GridColumn;
 	import spark.events.GridSortEvent;
-
+	
 	[Bindable]
 	public class ShbpModel extends BaseModel
 	{
@@ -104,15 +104,15 @@ package com.jtgh.yjpt.model.zysqbp
 			thisView.add.addEventListener(MouseEvent.CLICK,toAdd);
 			thisView.edit.addEventListener(MouseEvent.CLICK, toEdit);
 			thisView.del.addEventListener(MouseEvent.CLICK, doDel);
-//			if(view is ZysqbpLayout)
+			//			if(view is ZysqbpLayout)
 			thisView.query.addEventListener(MouseEvent.CLICK,switchSearchBox);
 			thisView.print.addEventListener(MouseEvent.CLICK,doPrint);
 			
 			
-//			thisView.wfHistory.addEventListener(MouseEvent.CLICK,doWfHistory);
+			//			thisView.wfHistory.addEventListener(MouseEvent.CLICK,doWfHistory);
 			thisView.qxzy.addEventListener(MouseEvent.CLICK,doQxzy);
 			thisView.bgzy.addEventListener(MouseEvent.CLICK,doBgzy);
-//			thisView.displayhs.addEventListener(MouseEvent.CLICK,doDisplayHS);
+			//			thisView.displayhs.addEventListener(MouseEvent.CLICK,doDisplayHS);
 			thisView.copy.addEventListener(MouseEvent.CLICK,doCopy);
 			doQuery(null);
 			if(!Global.user.jyr ){//非经营人特有的按钮
@@ -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;
 			}
 		}
 		
@@ -388,11 +392,12 @@ package com.jtgh.yjpt.model.zysqbp
 			thisView.zysblayout.visible=false;
 			thisView.hssblayout.model.doQuery(null);
 		}
-			
+		
 		/**
 		 * 分页
 		 */
 		private var queryByFlowDisplay:Boolean = false;
+		
 		public function pageQuery(pager:SinglePageRequestVo):void
 		{
 			var queryOperation:String;
@@ -416,7 +421,7 @@ package com.jtgh.yjpt.model.zysqbp
 			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;
+			//			vo.jcg=thisView.jcg.text;
 			//根据流程状态查询
 			var lcStatus:String = "";
 			if(queryByFlowDisplay){
@@ -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;
@@ -548,10 +612,10 @@ package com.jtgh.yjpt.model.zysqbp
 			if(vo.recordStatus!=Constants.RECORD_STATE_COMPLETED&&vo.recordStatus!=Constants.RECORD_STATE_BGCOMPLETED)
 				return "";
 			else{
-			if(vo.kgzt=='N')
-				return "未开工";
-			else if(vo.kgzt=='Y')
-				return "已开工";
+				if(vo.kgzt=='N')
+					return "未开工";
+				else if(vo.kgzt=='Y')
+					return "已开工";
 			}
 			return "";
 		}
@@ -570,8 +634,8 @@ package com.jtgh.yjpt.model.zysqbp
 		//开工按钮是否可点
 		public function KgEnble(vo:ZysqbpVo):Boolean
 		{
-//			if(Global.user.id!=vo.addUser.id)
-//				return false;
+			//			if(Global.user.id!=vo.addUser.id)
+			//				return false;
 			//数据为完成或者变更完成状态并且  当前不是经营人，可以查看修改保存
 			if((vo.recordStatus==Constants.RECORD_STATE_COMPLETED||vo.recordStatus==Constants.RECORD_STATE_BGCOMPLETED)&&(Global.user.sfjyr==YesNoSelect.NO)){
 				return true;
@@ -604,7 +668,7 @@ package com.jtgh.yjpt.model.zysqbp
 			view.vo=vo;
 			view.model=this;
 			Utils.popupWindow("开工情况", view, FlexGlobals.topLevelApplication as DisplayObject, thisView.pager.doQuery, 600, 300);
-		
+			
 		}
 		/**完工按钮处理事件*/
 		public　function WgHandle(vo:ZysqbpVo):void
@@ -642,8 +706,8 @@ package com.jtgh.yjpt.model.zysqbp
 				editView.model = this;
 				Utils.popupWindow("审核",editView as DisplayObject,FlexGlobals.topLevelApplication as DisplayObject);
 			},id)
-		
-		
+			
+			
 		}
 		
 		
@@ -732,7 +796,7 @@ package com.jtgh.yjpt.model.zysqbp
 				return false;
 			}
 			if(vo.recordStatus!=Constants.RECORD_STATE_VALID
-			    &&vo.recordStatus!=Constants.RECORD_STATE_SUBMIT){
+				&&vo.recordStatus!=Constants.RECORD_STATE_SUBMIT){
 				Alert.show(instance.resourceManager.getString("common","state.shz"),resourceManager.getString("common","tip"));
 				return false;
 			}
@@ -741,7 +805,7 @@ package com.jtgh.yjpt.model.zysqbp
 				return false;
 			}
 			
-			 return true
+			return true
 		}
 		//统计查询
 		/** 统计处理 */
@@ -786,31 +850,31 @@ package com.jtgh.yjpt.model.zysqbp
 				Alert.show("该数据已进行开工，不能变更！","提示");
 				return;
 			}
-//			var dif:Number;
-//			if(zysqbp.xsscTask!=null){
-//				dif = (Number(new Date)-Number(zysqbp.xsscTask.auditTime))/3600000;
-//				
-//			}else{
-//				dif = (Number(new Date)-Number(zysqbp.zdspTask.auditTime))/3600000;
-//			}
-//			if(dif>48000){
-//				Alert.show("超出法规时限期限","提示");
-//				return;
-//			}
-//			Alert.show("确认取消作业?","提示",Alert.YES | Alert.NO,null,
-//				function (closeEvt:CloseEvent):void
-//				{
-//					if(closeEvt.detail == Alert.YES){
-//						Utils.callRemote("zysqbpController","doQxzy",function(r:ResultEvent):void{
-//							var bc:BusinessContext = r.result as BusinessContext;
-//							if(bc.getAttribute("info")=="success"){
-//								Alert.show("取消提交成功，请等待审核","提示");
-//								doQuery(null);
-//							}
-//						},zysqbp);
-//					}
-//				}
-//			);
+			//			var dif:Number;
+			//			if(zysqbp.xsscTask!=null){
+			//				dif = (Number(new Date)-Number(zysqbp.xsscTask.auditTime))/3600000;
+			//				
+			//			}else{
+			//				dif = (Number(new Date)-Number(zysqbp.zdspTask.auditTime))/3600000;
+			//			}
+			//			if(dif>48000){
+			//				Alert.show("超出法规时限期限","提示");
+			//				return;
+			//			}
+			//			Alert.show("确认取消作业?","提示",Alert.YES | Alert.NO,null,
+			//				function (closeEvt:CloseEvent):void
+			//				{
+			//					if(closeEvt.detail == Alert.YES){
+			//						Utils.callRemote("zysqbpController","doQxzy",function(r:ResultEvent):void{
+			//							var bc:BusinessContext = r.result as BusinessContext;
+			//							if(bc.getAttribute("info")=="success"){
+			//								Alert.show("取消提交成功，请等待审核","提示");
+			//								doQuery(null);
+			//							}
+			//						},zysqbp);
+			//					}
+			//				}
+			//			);
 			var view:QxEdit = new QxEdit;
 			view.model=this;
 			view.vo = zysqbp;
@@ -859,10 +923,10 @@ package com.jtgh.yjpt.model.zysqbp
 			}else{
 				dif = (Number(new Date)-Number(zysqbp.zdspTask.auditTime))/3600000;
 			}
-//			if(dif>48000){
-//				Alert.show("超出法规时限期限","提示");
-//				return;
-//			}
+			//			if(dif>48000){
+			//				Alert.show("超出法规时限期限","提示");
+			//				return;
+			//			}
 			var view:BgEdit = new BgEdit();
 			view.model=this;
 			view.vo = zysqbp;
@@ -956,7 +1020,7 @@ package com.jtgh.yjpt.model.zysqbp
 			if((item as ZysqbpVo).bgsj!=null &&
 				((item as ZysqbpVo).kgzt=="N"||(item as ZysqbpVo).wgzt=="N")&&
 				((item as ZysqbpVo).recordStatus==Constants.RECORD_STATE_COMPLETED||
-				(item as ZysqbpVo).recordStatus==Constants.RECORD_STATE_BGCOMPLETED))	{
+					(item as ZysqbpVo).recordStatus==Constants.RECORD_STATE_BGCOMPLETED))	{
 				var tempDate:Date = new Date();
 				tempDate["date"]-=Constants.ZYSB_LIMIT;
 				if(ObjectUtil.dateCompare((item as ZysqbpVo).bgsj,tempDate)<0)
@@ -1030,7 +1094,7 @@ package com.jtgh.yjpt.model.zysqbp
 				Utils.popupWindow("法人行政许可",view,FlexGlobals.topLevelApplication as DisplayObject,null,1250,550);
 			});
 		}
-
+		
 		
 		/**
 		 * 显示消息

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

@@ -10,6 +10,7 @@
 	<fx:Script>
 		<![CDATA[
 			import com.jtgh.yjpt.common.BusinessContext;
+			import com.anychart.axesPlot.scales.dateTime.DateUtils;
 			import com.jtgh.yjpt.common.Global;
 			import com.jtgh.yjpt.common.MyEvent;
 			import com.jtgh.yjpt.common.component.ui.Pager;
@@ -54,6 +55,10 @@
 
 			protected function init(event:FlexEvent):void{
 				thisView=this; 
+				var now:Date = new Date;
+				stopTime.dateTime=new Date;
+				DateUtils.addFloatDays(now,-7);
+				startTime.dateTime = now;
 				if(frString.length>16){
 					var frName:String="fr";
 					for(var i:int=0;i<17;i++){

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

@@ -357,7 +357,7 @@
 						</s:HGroup>
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
 							<cus:QLabel width="120" text="集装箱箱号"/>
-							<cus:QTextInput id="jzxxh" width="530"  text="@{zysqbp.jzxxh}"  editable="{enable}"/>
+							<cus:QTextArea id="jzxxh" width="530" height="70"  text="{zysqbp.jzxxh}"  editable="{enable}"/>
 						</s:HGroup>
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
 							<cus:QLabel text="货物种类" width="120"/>

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

@@ -754,7 +754,7 @@
 		</s:HGroup>
 		<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
 			<cus:QLabel width="120" text="集装箱箱号"/>
-			<cus:QTextInput id="jzxxh" width="530" maxChars="250" text="@{zysqbp.jzxxh}"/>
+			<cus:QTextArea id="jzxxh" width="530" height="70" maxChars="1000"  text="{zysqbp.jzxxh}"  editable="{enable}"/>
 		</s:HGroup>
 		<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
 			<cus:QLabel width="120"

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

@@ -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

@@ -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-flex/trunk/src/com/jtgh/yjpt/view/zysqbp/ZysqbpView.mxml

@@ -10,36 +10,22 @@
 		 horizontalAlign="center">
 	<fx:Script>
 		<![CDATA[
-			import com.jtgh.yjpt.common.BusinessContext;
 			import com.jtgh.yjpt.common.Global;
 			import com.jtgh.yjpt.common.PrintParam;
 			import com.jtgh.yjpt.common.PrintTypes;
 			import com.jtgh.yjpt.common.util.Constants;
 			import com.jtgh.yjpt.common.util.PrintUtil;
-			import com.jtgh.yjpt.common.util.Utils;
 			import com.jtgh.yjpt.model.zysqbp.ShbpEditModel;
 			import com.jtgh.yjpt.model.zysqbp.ShbpModel;
 			import com.jtgh.yjpt.select.MaoSelect;
-			import com.jtgh.yjpt.view.jsxmaqsc.DataList;
-			import com.jtgh.yjpt.vo.common.AccessoryVo;
 			import com.jtgh.yjpt.vo.common.CodeVo;
-			import com.jtgh.yjpt.vo.gkgq.GqVo;
-			import com.jtgh.yjpt.vo.jyr.JyrVo;
-			import com.jtgh.yjpt.vo.jyrxxgl.JyrxxglVo;
-			import com.jtgh.yjpt.vo.zyfzndjy.Gkwxhwzyfzbl_fzVo;
 			import com.jtgh.yjpt.vo.zysqbp.ZysqbpVo;
-			import com.smapp.sg186.appframework.sg186_internal;
 			
 			import mx.collections.ArrayCollection;
-			import mx.controls.Alert;
 			import mx.events.CloseEvent;
 			import mx.events.FlexEvent;
-			import mx.events.ListEvent;
-			import mx.formatters.DateFormatter;
-			import mx.rpc.events.ResultEvent;
 			import mx.utils.StringUtil;
 			
-			import spark.components.ComboBox;
 			import spark.formatters.DateTimeFormatter;
 			[Bindable]
 			public var thisModel:ShbpEditModel = new ShbpEditModel();
@@ -424,7 +410,7 @@
 						</s:HGroup>
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
 							<cus:QLabel width="120" text="集装箱箱号"/>
-							<cus:QTextInput id="jzxxh" width="530"  text="@{zysqbp.jzxxh}"  editable="{enable}"/>
+							<cus:QTextArea id="jzxxh" width="530" height="70"  text="{zysqbp.jzxxh}"  editable="{enable}"/>
 						</s:HGroup>
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
 							<cus:QLabel text="货物种类" width="120"/>

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

@@ -10,33 +10,18 @@
 		 horizontalAlign="center">
 	<fx:Script>
 		<![CDATA[
-			import com.jtgh.yjpt.common.BusinessContext;
 			import com.jtgh.yjpt.common.Global;
 			import com.jtgh.yjpt.common.util.Constants;
 			import com.jtgh.yjpt.common.util.Utils;
 			import com.jtgh.yjpt.model.task.TaskModel;
 			import com.jtgh.yjpt.model.zysqbp.ShbpEditModel;
 			import com.jtgh.yjpt.model.zysqbp.ShbpModel;
-			import com.jtgh.yjpt.view.jsxmaqsc.DataList;
-			import com.jtgh.yjpt.vo.common.AccessoryVo;
 			import com.jtgh.yjpt.vo.common.CodeVo;
-			import com.jtgh.yjpt.vo.gkgq.GqVo;
-			import com.jtgh.yjpt.vo.jyr.JyrVo;
-			import com.jtgh.yjpt.vo.jyrxxgl.JyrxxglVo;
-			import com.jtgh.yjpt.vo.zyfzndjy.Gkwxhwzyfzbl_fzVo;
 			import com.jtgh.yjpt.vo.zysqbp.ZysqbpVo;
 			
-			import mx.collections.ArrayCollection;
-			import mx.controls.Alert;
 			import mx.events.CloseEvent;
 			import mx.events.FlexEvent;
-			import mx.events.ListEvent;
-			import mx.formatters.DateFormatter;
-			import mx.rpc.events.ResultEvent;
 			import mx.utils.StringUtil;
-			
-			import spark.components.ComboBox;
-			import spark.components.Label;
 			[Bindable]
 			public var thisModel:ShbpEditModel = new ShbpEditModel();
 			[Bindable]
@@ -230,7 +215,7 @@
 						</s:HGroup>
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
 							<cus:QLabel width="120" text="集装箱箱号"/>
-							<cus:QTextInput id="jzxxh" width="530"  text="@{zysqbp.jzxxh}"  editable="{enable}"/>
+							<cus:QTextArea id="jzxxh" width="530" height="70"  text="{zysqbp.jzxxh}"  editable="{enable}"/>
 						</s:HGroup>
 						<s:HGroup width="100%" horizontalAlign="left" verticalAlign="middle">
 							<cus:QLabel text="货物种类" width="120" notNull="{null!=zysqbp.jzxsl&amp;&amp;''!=StringUtil.trim(zysqbp.jzxsl)}"/>

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) {
@@ -3874,9 +3920,9 @@ public class ZysqbpController extends BaseController {
 							entity.getXzxdrmc(),
 							entity.getTyshxydm(),
 							entity.getZzjgdm(),
-							null == entity.getXksxq() ? "" : sdf4.format(entity
+							null == entity.getXksxq() ? "" : sdf.format(entity
 									.getXksxq()),
-							null == entity.getXkjzq() ? "" : sdf4.format(entity
+							null == entity.getXkjzq() ? "" : sdf.format(entity
 									.getXkjzq()), entity.getXkjg(),
 							entity.getBz(), entity.getDfbm(),
 							entity.getFddbrxm(), entity.getFddbrsfzh(),