git-svn-id: https://192.168.57.71/svn/hbghj@75 201dd7a2-ec1b-f84b-8b06-88221118ff88

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

@@ -74,6 +74,8 @@ SSFL.XFSBHSS.YDXFSP=\u79fb\u52a8\u6d88\u9632\u6c34\u70ae
 SSFL.YWRFZSS=\u6cb9\u6c61\u67d3\u9632\u6cbb\u8bbe\u65bd
 SSFL.YWRFZSS.JYMPMZMT=\u5438\u6cb9\u68c9\u7247/\u68c9\u6795/\u68c9\u6761
 SSFL.YWRFZSS.LYWYL=\u9646\u7528\u56f4\u6cb9\u680f
+SSFL.YWRFZSS.SYWYL=\u6c34\u7528\u56f4\u6cb9\u680f
+
 SSFL.YWRFZSS.XYJ=\u6d88\u6cb9\u5242
 SSFL.YWRFZSS.ZKXYJCYQ=\u771f\u7a7a\u5438\u6cb9\u673a/\u6487\u6cb9\u5668
 SYLX.HL=\u5185\u6cb3
@@ -1637,4 +1639,6 @@ FZ.ZYFS5=\u8239-\u5806\u573a
 FZ.ZYFS6=\u5806\u573a-\u8239
 FZ.ZYFS7=\u8239-\u8239
 FZ.ZYFS8=\u706b\u8f66-\u6c7d\u8f66
-FZ.ZYFS9=\u6c7d\u8f66-\u706b\u8f66
+FZ.ZYFS9=\u6c7d\u8f66-\u706b\u8f66
+FZ.ZYFS10=\u50a8\u7f50-\u7ba1\u9053-\u6c7d\u8f66
+FZ.ZYFS11=\u6c7d\u8f66-\u7ba1\u9053-\u50a8\u7f50

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/common/ClassRegistry.as

@@ -314,6 +314,7 @@ package com.jtgh.yjpt.common
 		MtlxSelect;
 		GqBySzdZysqbpSelect;
 		WhqySelect;
+		ZsBySzdSelect;
 		// Model
 
 		// View

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/common/util/Constants.as

@@ -750,23 +750,21 @@ package com.jtgh.yjpt.common.util
 		/** 任务类型 */
 		public static var RWLX_CITY:ArrayCollection = new ArrayCollection([
 			{id:"", text:""},
-
+			{id:"jyrUser",text:"用户审批"},
 			{id:"whzyfzsq-city", text:"危险货物作业附证申请"},
-
+			{id:"whzyfzhz-city",text:"危险货物作业附证变更"},
+			{id:"whzyfzns-city",text:"危险货物作业附证年审"},
+			{id:"zysbsp-city",text:"危险货物的作业申请"},
+			{id:"qxzysbsp-city",text:"危险货物的取消作业"},
+			{id:"bgzysbsp-city",text:"危险货物的作业变更"},
+			{id:"jsxmaqtjsc-city",text:"建设项目安全条件审查"},
 			{id:"aqyssc-city", text:"安全设施专项验收审查"},
-			{id:"jyrUser",text:"用户审批"},
+			{id:"aqsszpsc-city",text:"安全设施设计专篇审查"},
+			{id:"jdhxpyjzdwxy-city", text:"剧毒化学品及重大危险源备案"},
 			{id:"zdsgyhpc-city", text:"重大事故的隐患排查和治理情况备案"},
+			{id:"aqpjbgjzgfa-city", text:"安全评价报告备案"},		
 			{id:"yjyaba-city", text:"应急预案备案"},
-			{id:"jdhxpyjzdwxy-city", text:"剧毒化学品及重大危险源备案"},
-			{id:"aqpjbgjzgfa-city", text:"安全评价报告备案"},
-			{id:"zysbsp-city",text:"危险货物的作业申请 "},
-			{id:"qxzysbsp-city",text:"危险货物的取消作业 "},
-			{id:"bgzysbsp-city",text:"危险货物的作业变更 "},
-			{id:"whzyfzns-city",text:"附证作业年审"},
-			{id:"whzyfzhz-city",text:"附证作业变更"},
-			{id:"jsxmaqtjsc-city",text:"建设项目安全条件审查"},
-			{id:"jdjc",text:"监督检查"},
-			{id:"aqsszpsc-city",text:"安全设施设计专篇审查"}
+			{id:"jdjc",text:"监督检查"}
 //			{id:"dc-city",text:"监督检查"}
 			]);
 		

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/access/RegistModel.as

@@ -59,7 +59,9 @@ package com.jtgh.yjpt.model.access
 		
 		public function reloadGq(e:Event):void{
 			thisView.szgq.reload(thisView.szd.selectedVO);		
-			thisView.xzqh.reload(thisView.szd.selectedVO);	
+			thisView.xzqh.reload(thisView.szd.selectedVO);
+			if( thisView.szd.selectedVO != null)
+			thisView.zs.reload((thisView.szd.selectedVO as CodeVo).id);
 		}
 		
 		private function init():void
@@ -81,6 +83,7 @@ package com.jtgh.yjpt.model.access
 			if(vo.szgq!=null){
 				vo.szd=vo.szgq.szd;
 			}
+			vo.zs  = thisView.zs.selectedVO as CodeVo;
 			vo.qylx = thisView.qylx.textValue as String;
 //			vo.qyxz = thisView.qyxz.selectedVO as CodeVo;
 			vo.fzrq = thisView.fzrq.dateTime;

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/access/UserModel.as

@@ -113,6 +113,10 @@ package com.jtgh.yjpt.model.access
 					thisData.szdsmc = editView.szd.selectedItem.name;
 				}
 			}
+			if(editView.zs.selectedVO != null)
+			{
+				thisData.zs = editView.zs.selectedVO as CodeVo;
+			}
 			thisData.jyrjcxx = editView.ssjyr.selectedVO as JyrVo;
 			thisData.jsdw = editView.jsdw.selectedVO as JsfxxwhVo;
 			thisData.aqpjjg = editView.aqpjjg.selectedVO as AqpjjgxxVo;

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/model/jyr/JyrEditModel.as

@@ -150,7 +150,10 @@ package com.jtgh.yjpt.model.jyr
 
 
 		public function reloadGq(e:Event):void{
-			thisView.szgq.reload(thisView.szd.selectedVO);		
+			thisView.szgq.reload(thisView.szd.selectedVO);	
+			if(thisView.szd.selectedVO!=null){
+				thisView.zs.reload((thisView.szd.selectedVO as CodeVo).id)
+			}	
 			//重新获取港区list
 			doListGqBySzd((thisView.szd.selectedVO as CodeVo));
 		}
@@ -227,6 +230,7 @@ package com.jtgh.yjpt.model.jyr
 			if(thisView.zczb.text!="")
 			vo.zczb=new Number(thisView.zczb.text);
 			vo.szd=thisView.szd.selectedVO as CodeVo;
+			vo.zs = thisView.zs.selectedVO as CodeVo;
 			vo.szgq=thisView.szgq.selectedVO as GqVo;
 			//企业性质
 //			vo.qyxz = thisView.qyxz.selectedVO as CodeVo;

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/select/ZsBySzdSelect.as

@@ -0,0 +1,22 @@
+package com.jtgh.yjpt.select
+{
+	import com.jtgh.yjpt.common.util.Utils;
+
+	public class ZsBySzdSelect extends ServerDataSelectBase
+	{
+		public function ZsBySzdSelect()
+		{
+			super.id="id";
+			super.name="localeName";
+		}
+
+		/*********************
+		 * 取数据，可以被多次调用，刷新下拉框数据
+		 */
+		public function loadDataByParentId(parentId:String):void
+		{
+			Utils.callRemote("codeController","findZsByParentCode",resultlist,parentId);
+		}
+	}
+}
+

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/access/RegistApproveView.mxml

@@ -103,6 +103,8 @@
 						<cus:QComboBox id="szgq" comboxClass="RegistGqBySzdSelect" hasBlank="false"  selectedVO="{this.vo.jyrjcxx.szgq}" enabled="false" width="19%"/>
 					</s:HGroup>
 					<s:HGroup width="100%" verticalAlign="middle" gap="0">
+						<cus:QLabel width="13%" text="站所"/>
+						<cus:QComboBox id="zs" comboxClass="ZsBySzdSelect" selectedVO="{this.vo.jyrjcxx.zs}" width="19%" enabled="false"/>
 						<cus:QLabel width="13%" text="{resourceManager.getString('jlrxxgl','qylx')}" />
 						<cus:QComboBox id="qylx"  comboxClass="QylxSelect" hasBlank="true" width="19%" enabled="false" dataField="{this.vo.jyrjcxx.qylx}"/>
 						<cus:QLabel width="13%" text="{resourceManager.getString('jlrxxgl','yzbm')} "/>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/access/RegistView.mxml

@@ -142,6 +142,8 @@
 						<cus:QComboBox id="szgq" comboxClass="RegistGqBySzdSelect" selectedVO="{model.vo.szgq}" width="19%"/>	
 					</s:HGroup>
 					<s:HGroup width="100%" verticalAlign="middle" gap="0">
+						<cus:QLabel width="13%" text="站所"/>
+						<cus:QComboBox id="zs" comboxClass="ZsBySzdSelect" selectedVO="{model.vo.zs}" width="19%" hasBlank="true" />
 						<cus:QLabel notNull="true" width="13%" text="{resourceManager.getString('jlrxxgl','qylx')}" />
 						<cus:QComboBox id="qylx"  comboxClass="QylxSelect" width="19%" dataField="{model.vo.qylx}"/>
 						<cus:QLabel width="13%" text="{resourceManager.getString('jlrxxgl','yzbm')} "/>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/access/UserEdit.mxml

@@ -41,9 +41,12 @@
 				ssjyr.reload(szd.selectedVO);
 				jsdw.reload(szd.selectedVO);
 				aqpjjg.reload(szd.selectedVO);
-				if(szd.selectedVO !=null)
-				roleTree.szd= (szd.selectedVO as CodeVo).id;
-				roleTree.refresh();
+				
+				if(szd.selectedVO !=null){
+					zs.reload((szd.selectedVO as CodeVo).id);
+					roleTree.szd= (szd.selectedVO as CodeVo).id;
+					roleTree.refresh();
+				}				
 			}
 			
 			public function roleQueryFunction():void
@@ -97,6 +100,10 @@
 				<cus:QComboBox id="szd" comboxClass="SzdSelect" parentId="{Global.szd.id}"
 							   selectedVO="{thisModel.thisData.szd==null?Global.szd:thisModel.thisData.szd}" enabled="{!Global.user.jyr}"/>
 			</ui:FormItem>
+			<ui:FormItem  label="站所">
+				<cus:QComboBox id="zs" comboxClass="ZsBySzdSelect" parentId="{thisModel.thisData.szd==null?Global.user.szd.id.toString():thisModel.thisData.szd.id.toString()}"
+							   selectedVO="{thisModel.thisData.zs}" enabled="{!Global.user.jyr}" hasBlank="true"/>
+			</ui:FormItem>
 			<s:HGroup>
 				<ui:FormItem label="{resourceManager.getString('author','user.sfaqfzr')}">
 					<ui:CheckBox label="" selected="@{thisModel.thisData.aqfzr}" enabled="{!(mode==Constants.mode_view||Global.user.cd)}"/>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/jyr/JyrEdit.mxml

@@ -175,10 +175,15 @@
 						<cus:QComboBox id="szgq" comboxClass="GqBySzdSelect" selectedVO="{thisModel.vo.szgq}" parentId="{thisModel.vo.szd==null?Global.user.szd:thisModel.vo.szd}" width="19%"/>
 					</s:HGroup>
 					<s:HGroup width="100%" verticalAlign="middle" gap="0">
+						<cus:QLabel width="13%" text="站所"/>
+						<cus:QComboBox id="zs" comboxClass="ZsBySzdSelect" parentId="{thisModel.vo.szd==null?Global.user.szd.id.toString():thisModel.vo.szd.id.toString()}"
+									   selectedVO="{thisModel.vo.zs}" width="19%" hasBlank="true"/>
 						<cus:QLabel width="13%" text="{resourceManager.getString('jlrxxgl','qylx')}" notNull="true" />
 						<cus:QComboBox id="qylx" comboxClass="QylxSelect" width="19%" dataField="{thisModel.vo.qylx}"/>	
 						<cus:QLabel width="13%" text="{resourceManager.getString('jlrxxgl','yzbm')} "/>
 						<cus:QTextInput id="yzbm" text="@{thisModel.vo.yzbm}" width="19%" type="int"/>
+					</s:HGroup>
+					<s:HGroup width="100%" verticalAlign="middle" gap="0">
 						<cus:QLabel width="13%" text="{resourceManager.getString('jlrxxgl','sjjyr')}"/>
 						<cus:QComboBox id="parentJyr" comboxClass="JyrAllSelect" selectedVO="{thisModel.vo.parentJyr}" hasBlank="true" width="19%"/>
 					</s:HGroup>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/jyr/JyrView.mxml

@@ -268,11 +268,16 @@
 									   enabled="false"  />
 					</s:HGroup>
 					<s:HGroup width="100%" verticalAlign="middle" height="25" gap="0">
+						<cus:QLabel width="13%" text="站所"/>
+						<cus:QComboBox id="zs" comboxClass="ZsBySzdSelect" parentId="{model.vo.szd==null?Global.user.szd.id.toString():model.vo.szd.id.toString()}"
+									   selectedVO="{model.vo.zs}" width="19%" enabled="false"/>
 						<cus:QLabel id="qylxStr" click="shModel.showShyj1('qylx')" width="13%" text="{resourceManager.getString('jlrxxgl','qylx')}" />
 						<cus:QComboBox id="qylx"  comboxClass="QylxSelect" hasBlank="true" width="19%" dataField="{model.vo.qylx}" 
 									   enabled="false" />
 						<cus:QLabel id="yzbmStr"  click="shModel.showShyj1('yzbm')"  width="13%" text="{resourceManager.getString('jlrxxgl','yzbm')}" />
 						<cus:QTextInput id="yzbm" text="@{model.vo.yzbm}" width="19%" editable="false"  />
+					</s:HGroup>
+					<s:HGroup width="100%" verticalAlign="middle" gap="0">
 						<cus:QLabel id="parentJyrStr" click="shModel.showShyj1('parentJyr')" width="13%" text="{resourceManager.getString('jlrxxgl','sjjyr')}" />
 						<cus:QComboBox id="parentJyr" comboxClass="JyrAllSelect" selectedVO="{model.vo.parentJyr}" hasBlank="true" width="19%" 
 									   enabled="false"/>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/access/UserVo.as

@@ -23,6 +23,7 @@ package com.jtgh.yjpt.vo.access
 //		public var jyrdryxx:RyjbxxVo;//经营人人员基本信息
 		/** 所在地市ID */
 		public var szd:CodeVo;
+		public var zs:CodeVo;
 		/** 所在地市名称 */
 		public var szdsmc:String;
 		public var sfaqfzr:String=YesNoSelect.NO;

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/jyr/JyrVo.as

@@ -22,6 +22,8 @@ package com.jtgh.yjpt.vo.jyr
 		public var id:Number;
 		// 所在地
 		public var szd:CodeVo = null;
+		//站所
+		public var zs:CodeVo = null;
 		// 行政区划
 		public var xzqh:CodeVo = null;
 		// 所在港区

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/common/Constants.java

@@ -571,6 +571,8 @@ public class Constants {
 	// ***********************************公共代码group***************************************
 	/** 所在地 */
 	public final static String GROUP_CODE_SZD = "SZD";
+	/** 站所 */
+	public final static String GROUP_CODE_ZS = "ZS";
 	/** 人员类型 */
 	public final static String GROUP_CODE_RYLX = "RYLX";
 	/** 应急预案备案 */

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/BaseController.java

@@ -547,6 +547,17 @@ public abstract class BaseController {
 					filterList.add(new PredicateModel("szd.id", Utils
 							.getCurrentUser().getSzd().getByzd2(),
 							Operator.LIKE_R));
+				// 根据站所过滤
+				if(Utils.getCurrentUser().getZs() != null && StringUtils.isNotEmpty(jyr) ){
+					if(jyr.equals("id")){
+						filterList.add(new PredicateModel("zs.id",  Utils.getCurrentUser().getZs().getId(),
+								Operator.EQ));
+					} else {
+						filterList.add(new PredicateModel(jyr +".zs.id",  Utils.getCurrentUser().getZs().getId(),
+								Operator.EQ));
+					}
+					
+				}
 				role = Utils.getParentRole(role);
 				orList.add(new PredicateModel("recordCode", null,
 						Operator.NL));
@@ -624,6 +635,17 @@ public abstract class BaseController {
 							root.get("szd").get("id").as(String.class), Utils
 									.getCurrentUser().getSzd().getByzd2()
 									+ "%"));
+				// 根据站所过滤
+				if(Utils.getCurrentUser().getZs() != null && StringUtils.isNotEmpty(jyr) ){
+					if(jyr.equals("id")){
+						filterList.add(cb.equal(root.get("zs").get("id").as(Long.class),
+								Utils.getCurrentUser().getZs().getId()));
+					} else {
+						filterList.add(cb.equal(root.get(jyr).get("zs").get("id").as(Long.class),
+								Utils.getCurrentUser().getZs().getId()));
+					}
+					
+				}
 				if (role != null)
 					role = Utils.getParentRole(role);
 				orList.add(cb.like(root.get("recordCode").as(String.class),

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/auth/UserController.java

@@ -74,6 +74,10 @@ public class UserController extends BaseController {
 				BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
 		addNotEmptyModel(filterList, "recordStatus",
 				BaseEntity.RECORD_STATE_DRAFT, Operator.NEQ);
+		if(Utils.getCurrentUser().getZs() != null){
+			addNotEmptyModel(filterList, "zs.id",
+					Utils.getCurrentUser().getZs().getId(), Operator.EQ);
+		}
 		addRecordCodeFilter(functionId, filterList, "");
 		Specification<UserEntity> spec = SpecificationCreater
 				.searchByPredicateModels(filterList);
@@ -273,6 +277,7 @@ public class UserController extends BaseController {
 		entity.setSfaqfzr(user.getSfaqfzr());
 		entity.setSfyxdl(user.getSfyxdl());
 		entity.setSzd(user.getSzd());
+		entity.setZs(user.getZs());
 		entity.setSzdsmc(user.getSzdsmc());
 		entity.setYx(user.getYx());
 		entity.setJyrjcxx(user.getJyrjcxx());

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/common/CodeController.java

@@ -155,6 +155,24 @@ public class CodeController extends BaseController {
 		}
 		return bc;
 	}
+	
+	/**
+	 * 根据父id获取站所 
+	 * @param id
+	 * @return
+	 */
+	public BusinessContext findZsByParentCode(String id) {
+		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
+		addNotEmptyModel(filterList, "parent.id", id,
+				PredicateModel.Operator.LIKE_R);
+		addNotEmptyModel(filterList, "groupcode", Constants.GROUP_CODE_ZS,
+				PredicateModel.Operator.EQ);
+		Specification<CodeEntity> spec = SpecificationCreater
+				.searchByPredicateModels(filterList);
+		BusinessContext bc = createBusinessContext();
+		bc.setResult(codeService.findAll(spec));
+		return bc;
+	}
 
 	/**
 	 * 根据传入的parentId和code获取公共代码列表

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/auth/UserEntity.java

@@ -29,10 +29,12 @@ import javax.xml.bind.annotation.XmlTransient;
 
 import org.hibernate.annotations.Where;
 import org.springframework.flex.core.io.AmfIgnore;
+import org.springframework.flex.remoting.RemotingExclude;
 
 import com.jtgh.yjpt.common.Constants;
 import com.jtgh.yjpt.entity.BaseEntity;
 import com.jtgh.yjpt.entity.aqpjjgxx.AqpjjgxxEntity;
+import com.jtgh.yjpt.entity.common.CodeEntity;
 import com.jtgh.yjpt.entity.common.JsfxxwhEntity;
 import com.jtgh.yjpt.entity.jyr.JyrEntity;
 
@@ -55,6 +57,8 @@ public class UserEntity extends BaseEntity<Long> {
 	public static final String PROCESS_DEFINITION_KEY = "jyrUser";
 	/** ID主键 */
 	private Long id = null;
+	/** 站所 */
+	private CodeEntity zs;
 	/** 姓名 */
 	private String name = null;
 	/** 登录账号 */
@@ -382,4 +386,15 @@ public class UserEntity extends BaseEntity<Long> {
 		this.sfcd = sfcd;
 	}
 
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CodeEntity.class)
+	@JoinColumn(name = "zs")
+	@RemotingExclude
+	public CodeEntity getZs() {
+		return zs;
+	}
+
+	public void setZs(CodeEntity zs) {
+		this.zs = zs;
+	}
+
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/jyr/JyrEntity.java

@@ -33,6 +33,8 @@ public class JyrEntity extends BaseEntity<Long> implements Cloneable {
 	private Long id = null;
 	// // 所在地
 	// private CodeEntity szd = null;
+	// 站所
+	private CodeEntity zs = null;
 	// 所在港区
 	private GqEntity szgq = null;
 	// 港口经营人
@@ -517,4 +519,15 @@ public class JyrEntity extends BaseEntity<Long> implements Cloneable {
 		this.xzqh = xzqh;
 	}
 
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CodeEntity.class)
+	@JoinColumn(name = "zs")
+	@RemotingExclude
+	public CodeEntity getZs() {
+		return zs;
+	}
+
+	public void setZs(CodeEntity zs) {
+		this.zs = zs;
+	}
+
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/zyfzns/GkzyfznsServiceImpl.java

@@ -203,11 +203,18 @@ public class GkzyfznsServiceImpl extends
 				nsEntity.setNssj(nssj);
 				nsEntity.setNsyj(nsyj);
 				nsEntity.setNsr(nsr);
+				nsEntity.setUpdateUser(Utils.getCurrentUser());
 				nsEntity.setUpdateDate(new Date());
 				nsDao.save(nsEntity);
 			} else {
 				nsEntity.setNsns(nsns);
 				nsEntity.setNsjg(nsjg);
+				nsEntity.setNsid(entity.getId());
+				nsEntity.setNssj(nssj);
+				nsEntity.setNsyj(nsyj);
+				nsEntity.setNsr(nsr);
+				nsEntity.setJyr(entity.getJyr());
+				nsEntity.setAddUser(Utils.getCurrentUser());
 				nsEntity.setAddDate(new Date());
 				nsEntity.setFzbh(entity.getFzbh());
 				nsDao.save(nsEntity);