附证信息增加查询条件，和导入

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

gkaq/yjpt-flex/trunk/locale/zh_CN/common.properties

@@ -207,7 +207,7 @@ logoutConfirmTitle=\u767b\u51fa\u7cfb\u7edf
 otherConfirm=\u786e\u8ba4\u64cd\u4f5c\uff1f
 otherConfirmTitle=\u786e\u8ba4\u4fe1\u606f
 
-password.yxq=\u60a8\u5f53\u524d\u5bc6\u7801\u4e0d\u6ee1\u8db3\u590d\u6742\u5ea6\u8981\u6c42\uff088\u4f4d\u53ca\u4ee5\u4e0a\u5e76\u5305\u62ec\u5b57\u6bcd\u3001\u6570\u5b57\u3001\u7279\u6b8a\u5b57\u7b26\uff09\uff0c\u5f53\u524d\u5bc6\u7801\u8fd8\u53ef\u4ee5\u7ee7\u7eed\u4f7f\u7528\u81f3{0}\uff0c\u5efa\u8bae\u60a8\u7acb\u5373\u4fee\u6539\u5bc6\u7801\uff01
+password.yxq=   \u60a8\u5f53\u524d\u5bc6\u7801\u4e0d\u6ee1\u8db3\u590d\u6742\u5ea6\u8981\u6c42\uff088\u4f4d\u53ca\u4ee5\u4e0a\u5e76\u5305\u62ec\u5b57\u6bcd\u3001\u6570\u5b57\u3001\u7279\u6b8a\u5b57\u7b26\uff09\uff0c\u5f53\u524d\u5bc6\u7801\u8fd8\u53ef\u4ee5\u7ee7\u7eed\u4f7f\u7528\u81f32016-10-01\uff0c\u5efa\u8bae\u60a8\u7acb\u5373\u4fee\u6539\u5bc6\u7801\uff01
 session.timeout=\u4f1a\u8bdd\u8d85\u65f6\uff0c\u8bf7\u91cd\u65b0\u767b\u5f55\uff01
 systemError=\u7cfb\u7edf\u9519\u8bef
 systemTip=\u7cfb\u7edf\u63d0\u793a

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/zyfzndjy/GkwxhwzyfzxxModel.as

@@ -2,10 +2,11 @@ package com.jtgh.yjpt.model.zyfzndjy
 {
 	
 	import com.jtgh.yjpt.common.BusinessContext;
+	import com.jtgh.yjpt.common.component.ui.DataGridColumn;
 	import com.jtgh.yjpt.common.component.ui.Pager;
 	import com.jtgh.yjpt.common.util.Utils;
-	import com.jtgh.yjpt.model.SystemModel;
 	import com.jtgh.yjpt.model.BaseModel;
+	import com.jtgh.yjpt.model.SystemModel;
 	import com.jtgh.yjpt.vo.common.CodeVo;
 	import com.jtgh.yjpt.vo.common.SinglePageRequestVo;
 	import com.jtgh.yjpt.vo.gkgq.GqVo;
@@ -13,11 +14,18 @@ package com.jtgh.yjpt.model.zyfzndjy
 	
 	import flash.events.Event;
 	import flash.events.MouseEvent;
+	import flash.net.FileReference;
+	import flash.net.URLRequest;
+	import flash.net.URLRequestMethod;
+	import flash.net.URLVariables;
 	
 	import mx.binding.utils.BindingUtils;
 	import mx.collections.ArrayCollection;
-	import mx.events.ResourceEvent;
+	import mx.collections.ArrayList;
 	import mx.events.ListEvent;
+	import mx.events.ResourceEvent;
+	import mx.formatters.DateFormatter;
+	import mx.managers.CursorManager;
 	import mx.rpc.events.ResultEvent;
 
 	[Bindable]
@@ -67,11 +75,17 @@ package com.jtgh.yjpt.model.zyfzndjy
 			thisView.parentView.fzlayout.visible=true;		
 			thisView.parentView.thisModel.doQuery(null);
 		}
+		
+		/**
+		 * 查询附证信息
+		 */
 		public function pageQuery(pager:SinglePageRequestVo):void
 		{
 			var jyr:JyrVo ;
 			var szd:CodeVo;
 			var gq:GqVo;
+			var szqy:CodeVo;
+			var zycs:CodeVo;
 			if(null != thisView.query_szd.selectedVO&&"NaN"!=(thisView.query_szd.selectedVO as CodeVo).id.toString()){
 				szd = thisView.query_szd.selectedVO as CodeVo;
 			}
@@ -81,9 +95,84 @@ package com.jtgh.yjpt.model.zyfzndjy
 			if(null != thisView.query_gq.selectedVO ){
 				gq = thisView.query_gq.selectedVO as GqVo;
 			}
+			if(null != thisView.query_szqy.selectedVO){
+				szqy=thisView.query_szqy.selectedVO ;
+			}
+			if(null!=thisView.query_zycs.selectedVO){
+				zycs= thisView.query_zycs.selectedVO;
+			}
 		 Utils.callRemote("gkwxhwzyfzblhhzcontroller","listFzxx",resultCallback, 
-			 pager, jyr,szd,gq,thisView.query_yxrq_1.dateTime,thisView.query_yxrq_2.dateTime,thisView.query_wxpm.text);
+			 pager, jyr,szd,gq,thisView.query_yxrq_1.dateTime,thisView.query_yxrq_2.dateTime,thisView.query_wxpm.text,szqy,zycs);
 		}	
+		
+		/**
+		 * 
+		 *导出附证信息 
+		 */
+		public function printFzxx(e:MouseEvent):void
+		{
+			var jyr:JyrVo ;
+			var szd:CodeVo;
+			var gq:GqVo;
+			var szqy:CodeVo;
+			var zycs:CodeVo;
+			if(null != thisView.query_szd.selectedVO&&"NaN"!=(thisView.query_szd.selectedVO as CodeVo).id.toString()){
+				szd = thisView.query_szd.selectedVO as CodeVo;
+			}
+			if(null!=thisView.query_jyr.selectedVO){
+				jyr = thisView.query_jyr.selectedVO;
+			}
+			if(null != thisView.query_gq.selectedVO ){
+				gq = thisView.query_gq.selectedVO as GqVo;
+			}
+			if(null != thisView.query_szqy.selectedVO){
+				szqy=thisView.query_szqy.selectedVO  as CodeVo;
+			}
+			if(null!=thisView.query_zycs.selectedVO){
+				zycs= thisView.query_zycs.selectedVO  as CodeVo;
+			}
+			
+			var title:String="作业附证信息";
+			var columns:ArrayList=thisView.dataGrid.columns as ArrayList;
+			var headers:Array=new Array;
+			for each(var column:DataGridColumn in columns.source){
+				if(column.visible&&""!=column.headerText&&resourceManager.getString('common','btn.cz')!=column.headerText)
+					headers.push(column.headerText);				
+			}
+			var fomaterDate:DateFormatter=new DateFormatter();
+			fomaterDate.formatString="YYYY-MM-DD";
+			var param:Vector.<String>=new Vector.<String>();
+			param.push(
+				null==szd?"":szd.id+"",
+				null==gq?"":gq.id+"",
+				null==jyr?"":jyr.id+"",
+				null==thisView.query_yxrq_1.dateTime?"":fomaterDate.format(thisView.query_yxrq_1.dateTime),
+				null==thisView.query_yxrq_2.dateTime?"":fomaterDate.format(thisView.query_yxrq_2.dateTime),
+				thisView.query_wxpm.text,
+				null==szqy?"":szqy.id+"",
+				null==zycs?"":zycs.id+""			
+			);
+			var params:URLVariables = new URLVariables();
+			params.title=title;
+			params.headers=headers;
+			params.controller="gkwxhwzyfzblhhzController";
+			params.method="printFzxx";
+			params.param=param;
+			var url:String = Utils.getBaseUrl()+"exportExcel.do";
+			var request:URLRequest = new URLRequest(url);
+			request.data = params;
+			request.method = URLRequestMethod.POST;
+			var file:FileReference = new FileReference();
+			file.addEventListener(Event.COMPLETE, downloadCompleteHandler);
+			file.addEventListener(Event.CANCEL, downloadCompleteHandler);
+			file.download(request, title+".xls");
+			CursorManager.setBusyCursor();
+		}
+		
+		private function downloadCompleteHandler(event:Event):void {
+			CursorManager.removeBusyCursor();
+		}
+		
 		public function resultCallback(r:ResultEvent):void
 		{
 			var doAction:String = r.token.message["operation"];
@@ -97,11 +186,3 @@ package com.jtgh.yjpt.model.zyfzndjy
 		}
 	}
 }
-
-
-
-
-
-
-
-

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/zyfzndjy/GkwxhwzyfzxxLayout.mxml

@@ -10,25 +10,12 @@
 	</fx:Declarations>
 	<fx:Script>
 		<![CDATA[
-			import com.jtgh.yjpt.common.BusinessContext;
 			import com.jtgh.yjpt.common.Global;
-			import com.jtgh.yjpt.common.TypeBase;
-			import com.jtgh.yjpt.common.util.Constants;
-			import com.jtgh.yjpt.common.util.Utils;
 			import com.jtgh.yjpt.model.zyfzndjy.GkwxhwzyfzblhhzModel;
 			import com.jtgh.yjpt.model.zyfzndjy.GkwxhwzyfzxxModel;
-			import com.jtgh.yjpt.vo.common.CodeVo;
-			import com.jtgh.yjpt.vo.common.SinglePageRequestVo;
-			import com.jtgh.yjpt.vo.gkgq.GqVo;
-			import com.jtgh.yjpt.vo.jyr.JyrVo;
-			import com.jtgh.yjpt.vo.sys.ButtonVo;
-			import com.jtgh.yjpt.vo.sys.MenuVo;
-			import com.jtgh.yjpt.vo.zyfzndjy.GkwxhwzyfzblhhzVo;
 			
-			import mx.collections.ArrayCollection;
 			import mx.events.FlexEvent;
-			import mx.rpc.events.ResultEvent;
-			
+			import com.jtgh.yjpt.common.util.Constants;
 			import spark.components.gridClasses.GridColumn;
 			[Bindable]
 			public var model:GkwxhwzyfzxxModel=new GkwxhwzyfzxxModel();
@@ -48,12 +35,13 @@
 			{
 				return (this.pager.pageVo.page*10+this.dataGrid.dataProvider.getItemIndex(item)+1).toString();
 			}
-
+			
 		]]>
 	</fx:Script>
 	<s:VGroup width="100%">
 		<s:HGroup width="100%" height="40" paddingLeft="10" gap="10"  horizontalAlign="left" verticalAlign="middle">
 			<button:IconButton id="query" type="query" click="model.switchSearchBox(event)" toolTip="{resourceManager.getString('common','btn.query')}"/>
+			<button:IconButton id="print" type="print" click="model.printFzxx(event)" toolTip="{resourceManager.getString('common','btn.print')}"/>
 			<button:IconButton id="back" type="back" click="model.toBack(event)"  toolTip="{resourceManager.getString('common','btn.back')}"/>
 		</s:HGroup>
 		<s:VGroup id="searchGroup" width="100%"  visible="false" includeInLayout="false">
@@ -80,11 +68,23 @@
 					<cus:QLabel text="有效日期止" width="130"/>
 					<ui:DateTime id="query_yxrq_2" width="180"/>
 				</s:HGroup>
-				<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="30%">
+				<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="31%">
 					<cus:QLabel text="危险物品名称" width="130"/>
 					<cus:QTextInput id="query_wxpm" width="180"/>
 				</s:HGroup>
-				<s:HGroup  verticalAlign="middle" textAlign="right">
+			</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:QComboBox id="query_szqy" width="180" comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_SYLX}" 
+								   hasBlank="true"/>
+				</s:HGroup>
+				<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="31%">
+					<cus:QLabel text="作业场所" width="130"/>
+					<cus:QComboBox id="query_zycs" width="180" comboxClass="CodeSelect"  codeType="{Constants.GROUP_CODE_ZYCS}"  hasBlank="true"/>
+				</s:HGroup>
+				<s:HGroup  horizontalAlign="left" verticalAlign="middle"  width="31%">
+					<cus:QLabel width="130"/>
 					<s:Image source="@Embed('resource/yjpt/list/btn_query.png')" buttonMode="true" click="model.doQuery(event)"/>
 				</s:HGroup>
 			</s:HGroup>

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/zyfzndjy/GkwxhwzyfzblhhzController.java

@@ -168,14 +168,21 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 
 	/**
 	 * 一览查询
+	 * 
 	 * @param functionId
 	 * @param pageable
-	 * @param jyr 企业
-	 * @param szd 所在地
-	 * @param gq 港区
-	 * @param whdj 危货等级
-	 * @param lcStatus 流程状态
-	 * @param fddbr 法定代表人
+	 * @param jyr
+	 *            企业
+	 * @param szd
+	 *            所在地
+	 * @param gq
+	 *            港区
+	 * @param whdj
+	 *            危货等级
+	 * @param lcStatus
+	 *            流程状态
+	 * @param fddbr
+	 *            法定代表人
 	 * @return
 	 */
 	@Log(Type.QUERY)
@@ -195,8 +202,9 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 							BaseEntity.RECORD_STATE_DELETE));
 					// 根据 申请单位 过滤
 					if (null != jyr && !"".equals(jyr)) {
-						list.add(cb.like(
-								root.get("jyrVo").get("gkjyr").as(String.class), "%" + jyr + "%"));
+						list.add(cb
+								.like(root.get("jyrVo").get("gkjyr")
+										.as(String.class), "%" + jyr + "%"));
 					}
 					// 根据所在地过滤
 					if (null != szd) {
@@ -281,9 +289,10 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 					}
 					// 根据 申请单位 过滤
 					if (!"".equals(param.get(1))) {
-						list.add(cb.like(
-								root.get("jyrVo").get("gkjyr").as(String.class),
-								"%"+param.get(1)+"%"));
+						list.add(cb
+								.like(root.get("jyrVo").get("gkjyr")
+										.as(String.class), "%" + param.get(1)
+										+ "%"));
 					}
 					// 根据港区过滤
 					if (!"".equals(param.get(2))) {
@@ -2793,7 +2802,8 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 	@Log(Type.QUERY)
 	public BusinessContext listFzxx(Pageable pageable, final JyrEntity jyr,
 			final CodeEntity szd, final GqEntity gq, final Date yxrq1,
-			final Date yxrq2, final String wxpm) {
+			final Date yxrq2, final String wxpm, final CodeEntity szqy,
+			final CodeEntity zycs) {
 		try {
 			Specification<GkwxhwzyfzblFzEntity> spec = new Specification<GkwxhwzyfzblFzEntity>() {
 
@@ -2814,11 +2824,11 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 								.as(String.class)));
 					}
 					if (null != szd)
-						list.add(cb.like(root.get("jyr").get("szd").get("id")
+						list.add(cb.like(root.get("fzsq").get("szd").get("id")
 								.as(String.class), szd.getId() + "%"));
 					if (null != gq)
 						list.add(cb.equal(
-								root.get("jyr").get("szgq").as(GqEntity.class),
+								root.get("fzsq").get("ssgq").as(GqEntity.class),
 								gq));
 					if (null != jyr)
 						list.add(cb.equal(root.get("jyr").as(JyrEntity.class),
@@ -2833,6 +2843,13 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 					if (null != wxpm)
 						list.add(cb.like(root.get("wxhwm").as(String.class),
 								"%" + wxpm + "%"));
+					if (null != szqy)
+						list.add(cb.equal(
+								root.get("fzsq").get("ssgq").get("gqszsylx")
+										.as(CodeEntity.class), szqy));
+					if (null != zycs)
+						list.add(cb.equal(
+								root.get("zycs").as(CodeEntity.class), zycs));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -2853,12 +2870,12 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 	@RequestMapping(value = "jyxkzAndFz", method = RequestMethod.GET)
 	@ResponseBody
 	@RemotingExclude
-	public void jyxkzAndFz(String filePath,HttpServletResponse response,
+	public void jyxkzAndFz(String filePath, HttpServletResponse response,
 			HttpServletRequest request) {
 		List<CodeEntity> szds = codeService// .findSzdByParent(90011l);
 				.findSzdByParent(Constants.SZD_ID_PROVINCE);
 		if (szds != null && szds.size() > 0) {
-			 System.out.println("szd:" + szds.size() + "个!");
+			System.out.println("szd:" + szds.size() + "个!");
 		}
 		for (CodeEntity szd : szds) {
 			List<PredicateModel> filterList = new ArrayList<PredicateModel>();
@@ -2869,8 +2886,8 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 					.searchByPredicateModels(filterList);
 			List<JyrEntity> jyrList = jyrService.findAll(spec);
 			if (jyrList != null && jyrList.size() > 0) {
-				 System.out
-				 .println(szd.getBz() + "的经营人" + jyrList.size() + "个!");
+				System.out
+						.println(szd.getBz() + "的经营人" + jyrList.size() + "个!");
 			}
 			for (JyrEntity jyr : jyrList) {
 				// 经营许可证扫描件
@@ -2960,4 +2977,92 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 			}
 		}
 	}
+
+	public Collection<String[]> printFzxx(final List<String> param)
+			throws ParseException {
+		Collection<GkwxhwzyfzblFzEntity> dataset = null;
+		try {
+			Specification<GkwxhwzyfzblFzEntity> spec = new Specification<GkwxhwzyfzblFzEntity>() {
+				@Override
+				public Predicate toPredicate(Root<GkwxhwzyfzblFzEntity> root,
+						CriteriaQuery<?> query, CriteriaBuilder cb) {
+					List<Predicate> list = new ArrayList<Predicate>();
+					list.add(cb.notEqual(
+							root.get("recordStatus").as(String.class),
+							BaseEntity.RECORD_STATE_DELETE));
+					list.add(cb.isNotNull(root.get("fzsq").as(
+							GkwxhwzyfzblhhzEntity.class)));
+					if (root.get("fzsq") != null) {
+						list.add(cb.equal(root.get("fzsq").get("recordStatus")
+								.as(String.class),
+								BaseEntity.RECORD_STATE_COMPLETED));
+						list.add(cb.isNotNull(root.get("fzsq").get("fzjg")
+								.as(String.class)));
+					}
+					if (null != param.get(0) && !"".equals(param.get(0)))
+						list.add(cb.like(root.get("fzsq").get("szd").get("id")
+								.as(String.class),param.get(0) + "%"));
+					if (null != param.get(1) && !"".equals(param.get(1)))
+						list.add(cb.equal(
+								root.get("fzsq").get("ssgq").get("id").as(Long.class),
+								Long.parseLong( param.get(1))));
+					if (null != param.get(2) && !"".equals(param.get(2)))
+						list.add(cb.equal(root.get("jyr").get("id").as(Long.class),
+								Long.parseLong( param.get(2))));
+					if (null != param.get(3) && !"".equals(param.get(3))) {
+						try {
+							list.add(cb.greaterThanOrEqualTo(	root.get("fzsq").get("yxqjssj").as(Date.class), sdf.parse(param.get(3))));
+						} catch (ParseException e) {
+							e.printStackTrace();
+						}
+					}
+					if (null != param.get(4) && !"".equals(param.get(4))) {
+						try {
+							list.add(cb.lessThan(root.get("fzsq").get("yxqjssj")
+									.as(Date.class), DateUtil.addDate(
+									sdf.parse(param.get(4)), 1)));
+						} catch (ParseException e) {
+							e.printStackTrace();
+						}
+					}
+					if (null != param.get(5) && !"".equals(param.get(5)))
+						list.add(cb.like(root.get("wxhwm").as(String.class),
+								"%" + param.get(5) + "%"));
+					if (null != param.get(6) && !"".equals(param.get(6)))
+						list.add(cb.equal(
+								root.get("fzsq").get("ssgq").get("gqszsylx").get("id").as(Long.class),Long.parseLong(param.get(6))));
+					if (null != param.get(7) && !"".equals(param.get(7)))
+						list.add(cb.equal(
+								root.get("zycs").get("id").as(Long.class),Long.parseLong(param.get(7))));
+					return cb.and(list.toArray(new Predicate[] {}));
+				}
+			};
+			dataset = gkwxhwzyfzService.findAll(spec, sort);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		Collection<String[]> strings = new ArrayList<String[]>();
+		int i = 1;
+		if (dataset != null)
+			for (GkwxhwzyfzblFzEntity entity : dataset) {
+				String[] ss = new String[] {
+							i + "",
+							null==entity.getFzsq()?"":entity.getFzsq().getByzd1(),
+							null == entity.getJyr() ? "" : entity.getJyr().getGkjyr(),
+							entity.getQynbmc(),
+							entity.getFzcsbh(),
+							entity.getByzd5(),
+							null==entity.getFzsq()?"":entity.getFzsq().getFzjg(),
+							(null==entity.getFzsq()||null==entity.getFzsq().getFzsj())?"":sdf.format(entity.getFzsq().getFzsj()),
+							(null==entity.getFzsq()||null==entity.getFzsq().getYxqjssj())?"":sdf.format(entity.getFzsq().getYxqjssj()),
+							(null==entity.getFzsq()||null==entity.getFzsq().getSsgq()) ? "" : entity.getFzsq().getSsgq()
+									.getGqmc(),
+							(null==entity.getFzsq()||null==entity.getFzsq().getSzd()) ? "" : resource
+									.getString(entity.getFzsq().getSzd().getName()) 
+					};
+				strings.add(ss);
+				i++;
+				} 
+		return strings;
+	}
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/zyfzndjy/GkwxhwzyfzService.java

@@ -6,10 +6,12 @@ package com.jtgh.yjpt.service.zyfzndjy;
  * @author 马都喜
  */
 
+import java.util.Collection;
 import java.util.List;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
 
 import com.jtgh.yjpt.entity.zyfzhz.GkwxhwzyfzhzEntity;
@@ -30,6 +32,9 @@ public interface GkwxhwzyfzService extends BaseWorkFlowService {
 
 	public List<GkwxhwzyfzblFzEntity> findByFzsq(
 			GkwxhwzyfzblhhzEntity gkwxhwzyfzblhhzEntity);
+	
+	public Collection<GkwxhwzyfzblFzEntity> findAll(
+			Specification<GkwxhwzyfzblFzEntity> spec, Sort sort);
 
 	public List<GkwxhwzyfzblFzEntity> findByFzhz(
 			GkwxhwzyfzhzEntity gkwxhwzyfzhzEntity);