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

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/common/CodeDao.java

@@ -32,6 +32,9 @@ public interface CodeDao extends MyRepository<CodeEntity, Long> {
 
 	@Query("from CodeEntity code where code.groupcode = ?1 order by code.order")
 	public List<CodeEntity> findByGroupcode(String groupcode);
+	
+	@Query("from CodeEntity code where code.parent=?1 and  code.groupcode = ?2 order by code.order")
+	public List<CodeEntity> findByParentAndGroupcode(Long fid,String groupcode);
 
 	public List<CodeEntity> findByParent(CodeEntity parent);
 
@@ -41,7 +44,7 @@ public interface CodeDao extends MyRepository<CodeEntity, Long> {
 	@Query("select distinct parent from CodeEntity")
 	public List<CodeEntity> findParent();
 
-	@Query("from CodeEntity where fid = ?1 order by order")
+	@Query("from CodeEntity where parent = ?1 order by order")
 	public List<CodeEntity> findByParent(Long fid);
 
 	/**

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/gkgq/GqEntity.java

@@ -1,18 +1,12 @@
 package com.jtgh.yjpt.entity.gkgq;
 
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
-import org.springframework.flex.remoting.RemotingExclude;
-
 import com.jtgh.yjpt.common.Constants;
 import com.jtgh.yjpt.entity.BaseEntity;
-import com.jtgh.yjpt.entity.common.CodeEntity;
 
 @Entity
 @Table(name = "T_YJPT_GQ")
@@ -25,7 +19,7 @@ public class GqEntity extends BaseEntity<Long> implements Cloneable {
 	private Long id;
 	// private CodeEntity szd;
 	private String gqmc;
-	private CodeEntity gqszsylx;
+	private String gqszsylx;
 	private String gqmj;
 	private String lymj;
 	private String syfw;
@@ -88,20 +82,16 @@ public class GqEntity extends BaseEntity<Long> implements Cloneable {
 		entity.gqgkaxcd = this.gqgkaxcd;
 		entity.gqmc = this.gqmc;
 		entity.gqmj = this.gqmj;
-		if (this.gqszsylx != null)
-			entity.gqszsylx = this.gqszsylx.clone();
+		entity.gqszsylx = this.gqszsylx;
 		entity.gqzraxcd = this.gqzraxcd;
 		return entity;
 	}
 
-	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CodeEntity.class)
-	@JoinColumn(name = "gqszsylx")
-	@RemotingExclude
-	public CodeEntity getGqszsylx() {
+	public String getGqszsylx() {
 		return gqszsylx;
 	}
 
-	public void setGqszsylx(CodeEntity gqszsylx) {
+	public void setGqszsylx(String gqszsylx) {
 		this.gqszsylx = gqszsylx;
 	}
 

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

@@ -509,7 +509,7 @@ public class JyrEntity extends BaseEntity<Long> implements Cloneable {
 		this.sfzdsp = sfzdsp;
 	}
 
-	@ManyToOne(fetch = FetchType.LAZY, targetEntity = CodeEntity.class)
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CodeEntity.class)
 	@JoinColumn(name = "xzqh")
 	public CodeEntity getXzqh() {
 		return xzqh;
@@ -519,7 +519,7 @@ public class JyrEntity extends BaseEntity<Long> implements Cloneable {
 		this.xzqh = xzqh;
 	}
 
-	@ManyToOne(fetch = FetchType.LAZY, targetEntity = CodeEntity.class)
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CodeEntity.class)
 	@JoinColumn(name = "zs")
 	@RemotingExclude
 	public CodeEntity getZs() {

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/zysqbp/ZysqbpEntity.java

@@ -752,6 +752,7 @@ public class ZysqbpEntity extends BaseEntity<Long> {
 	@ManyToOne(fetch = FetchType.LAZY, targetEntity = JyrEntity.class)
 	@JoinColumn(name = "zyddssjyr")
 	@RemotingExclude
+	@XmlTransient
 	public JyrEntity getZyddssjyr() {
 		return zyddssjyr;
 	}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/common/CodeService.java

@@ -37,6 +37,8 @@ public interface CodeService {
 	 * @return
 	 */
 	public List<CodeEntity> findByParent(Long fid);
+	
+	public List<CodeEntity> findByParentAndGroupcode(Long fid,String groupcode);
 	/***
 	 * 
 	 * @param fid

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/check/DcServiceImpl.java

@@ -157,7 +157,6 @@ public class DcServiceImpl extends BaseWorkFlowServiceImpl<DcEntity, Long>
 		}
 	}
 
-
 	/**
 	 * 发送工作提醒
 	 * 
@@ -222,8 +221,8 @@ public class DcServiceImpl extends BaseWorkFlowServiceImpl<DcEntity, Long>
 	public List<ZcDcCountEntity> countSzdEvent(CodeEntity entity, Date tjsjq,
 			Date tjsjz) {
 		List<ZcDcCountEntity> list = new ArrayList<ZcDcCountEntity>();
-		List<CodeEntity> szdList = codeDao
-				.findByParent(Constants.SZD_ID_PROVINCE);
+		List<CodeEntity> szdList = codeDao.findByParentAndGroupcode(
+				Constants.SZD_ID_PROVINCE, Constants.GROUP_CODE_SZD);
 		szdList.add(0, codeDao.findOne(Constants.SZD_ID_PROVINCE));
 		for (CodeEntity szd : szdList) {
 			ZcDcCountEntity e1 = new ZcDcCountEntity();
@@ -460,12 +459,12 @@ public class DcServiceImpl extends BaseWorkFlowServiceImpl<DcEntity, Long>
 		// 开关控制是否需要市级领导审批还是直接下发
 		variables.put(WorkFlowParam.AUDIT_PASS,
 				Constants.DC_SJSH.equals(Constants.YES));
-		variables.put(WorkflowMangerServiceImpl.KEY_SZD_ID, data.getBdcdw().getSzd().getId());
+		variables.put(WorkflowMangerServiceImpl.KEY_SZD_ID, data.getBdcdw()
+				.getSzd().getId());
 		WorkFlowParam param = new WorkFlowParam();
-		param.put(WorkFlowParam.DESCRIPTION, data.getBdcdw().getGkjyr() +  "的督查");
+		param.put(WorkFlowParam.DESCRIPTION, data.getBdcdw().getGkjyr() + "的督查");
 		// 设置流程发起人
-		if (!Utils.getCurrentUserSzd()
-				.equals(Constants.SZD_ID_PROVINCE)) {
+		if (!Utils.getCurrentUserSzd().equals(Constants.SZD_ID_PROVINCE)) {
 			if (StringUtils.isEmpty(param.getString(WorkFlowParam.AUDIT_USER))) {
 				param.put(WorkFlowParam.AUDIT_USER, Utils.getCurrentUser()
 						.getId().toString());
@@ -559,7 +558,7 @@ public class DcServiceImpl extends BaseWorkFlowServiceImpl<DcEntity, Long>
 			dcEntity = this.save(dcEntity);
 			isDone = true;
 		}
-		if( flag== true && dcEntity.getMqzt().equals("2") ) {
+		if (flag == true && dcEntity.getMqzt().equals("2")) {
 			dcEntity.setRecordStatus(BaseEntity.RECORD_STATE_SUBMIT);
 			dcEntity = this.save(dcEntity);
 			dcEntity.setPkj("2");

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/check/ZcServiceImpl.java

@@ -221,8 +221,8 @@ public class ZcServiceImpl extends BaseService<ZcEntity, Long> implements
 			Date tjsjz) {
 		List<ZcDcCountEntity> list = new ArrayList<ZcDcCountEntity>();
 		// 全省
-		List<CodeEntity> szdList = codeDao
-				.findByParent(Constants.SZD_ID_PROVINCE);
+		List<CodeEntity> szdList = codeDao.findByParentAndGroupcode(
+				Constants.SZD_ID_PROVINCE, Constants.GROUP_CODE_SZD);
 		szdList.add(0, codeDao.findOne(Constants.SZD_ID_PROVINCE));
 		for (CodeEntity szd : szdList) {
 			ZcDcCountEntity e1 = new ZcDcCountEntity();

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/common/CodeServiceImpl.java

@@ -41,11 +41,16 @@ public class CodeServiceImpl extends BaseService<CodeEntity, Long> implements
 	public List<CodeEntity> findByGroupCode(String code) {
 		return codeDao.findByGroupcode(code);
 	}
+	
 
 	@Override
 	public List<CodeEntity> findByParent(Long fid) {
 		return codeDao.findByParent(fid);
 	}
+	@Override
+	public List<CodeEntity> findByParentAndGroupcode(Long fid,String groupcode) {
+		return codeDao.findByParentAndGroupcode(fid,groupcode);
+	}
 
 	@Override
 	public List<CodeEntity> findByBz(String string) {

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/jyr/JyrServiceImpl.java

@@ -157,17 +157,24 @@ public class JyrServiceImpl extends BaseService<JyrEntity, Long> implements
 	public JyrEntity findByTbdyid(Long tbdyid) {
 		return jyrDao.findByTbdyid(tbdyid);
 	}
-	
+
 	/**
 	 * 保存记录
 	 * 
-	 * @param jyrEntity  经营人
-	 * @param dcxxeditlist 堆场
-	 * @param dcxxdeletelist 删除的堆场
-	 * @param bw_add_list 泊位
-	 * @param bw_del_list 删除的泊位
-	 * @param ckList 仓库
-	 * @param delCkList 删除的仓库
+	 * @param jyrEntity
+	 *            经营人
+	 * @param dcxxeditlist
+	 *            堆场
+	 * @param dcxxdeletelist
+	 *            删除的堆场
+	 * @param bw_add_list
+	 *            泊位
+	 * @param bw_del_list
+	 *            删除的泊位
+	 * @param ckList
+	 *            仓库
+	 * @param delCkList
+	 *            删除的仓库
 	 * @return
 	 */
 	public JyrEntity save(JyrEntity jyrEntity,
@@ -198,7 +205,7 @@ public class JyrServiceImpl extends BaseService<JyrEntity, Long> implements
 				jyrbwxxDao.logicDelete(str);
 			}
 		}
-		//堆场
+		// 堆场
 		if (dcxxeditlist != null && dcxxeditlist.size() > 0) {
 			for (JyrdcxxEntity jyrdcxxEntity : dcxxeditlist) {
 				jyrdcxxEntity.setQymc(jyrEntity);
@@ -212,17 +219,17 @@ public class JyrServiceImpl extends BaseService<JyrEntity, Long> implements
 			// 对堆存信息insert/update操作
 			jyrdcxxDao.save(dcxxeditlist);
 		}
-		//逻辑删除堆场
+		// 逻辑删除堆场
 		if (dcxxdeletelist != null && dcxxdeletelist.size() > 0) {
 			for (JyrdcxxEntity str : dcxxdeletelist) {
 				jyrdcxxDao.logicDelete(str);
 			}
 		}
-		//逻辑删除仓库
+		// 逻辑删除仓库
 		if (delCkList != null && delCkList.size() > 0) {
 			jyrckxxDao.logicDelete(delCkList);
 		}
-		//仓库信息保存
+		// 仓库信息保存
 		if (ckList != null && ckList.size() > 0) {
 			for (JyrckxxEntity ck : ckList) {
 				ck.setSzd(jyrEntity.getSzd());
@@ -314,20 +321,14 @@ public class JyrServiceImpl extends BaseService<JyrEntity, Long> implements
 				9));
 		// 堆场信息的逻辑删除
 		jyrdcxxDao.logicDelete(jyrdcxxDao.findByQymc(entity));
-		/*// 同步到省级
-		try {
-			if (Constants.DEPLOY_MODE_CITY.equals(GlobalData.DEPLOY_MODE)
-					&& Constants.YES.equals(GlobalData.JAXWS_SYNC)) {
-				JyrWebService jyrWebService = getWebService();
-				if (null != jyrWebService) {
-					jyrWebService.delete(entity);
-					entity.setTbzt(Constants.YES);
-					this.save(entity);
-				}
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}*/
+		/*
+		 * // 同步到省级 try { if
+		 * (Constants.DEPLOY_MODE_CITY.equals(GlobalData.DEPLOY_MODE) &&
+		 * Constants.YES.equals(GlobalData.JAXWS_SYNC)) { JyrWebService
+		 * jyrWebService = getWebService(); if (null != jyrWebService) {
+		 * jyrWebService.delete(entity); entity.setTbzt(Constants.YES);
+		 * this.save(entity); } } } catch (Exception e) { e.printStackTrace(); }
+		 */
 	}
 
 	/**
@@ -514,7 +515,7 @@ public class JyrServiceImpl extends BaseService<JyrEntity, Long> implements
 				row.put("WHNUM", objects[2]);
 				row.put("YEAR", objects[3]);
 				row.put("MONTH", objects[4]);
-				row.put("SL",null == cg.get(i)[1] ? 0 : cg.get(i)[1]);
+				row.put("SL", null == cg.get(i)[1] ? 0 : cg.get(i)[1]);
 				row.put("CCL", null == cg.get(i)[2] ? 0 : cg.get(i)[2]);
 				list.add(row);
 			}
@@ -742,8 +743,8 @@ public class JyrServiceImpl extends BaseService<JyrEntity, Long> implements
 		// e.setSzd("SZD.SEHNGJI");
 		// e = changeJyrEntity(e, listObject);
 		// list.add(e);
-		List<CodeEntity> szdList = codeService
-				.findByParent(Constants.SZD_ID_PROVINCE);
+		List<CodeEntity> szdList = codeService.findByParentAndGroupcode(
+				Constants.SZD_ID_PROVINCE, Constants.GROUP_CODE_SZD);
 		szdList.add(0, codeService.findOne(Constants.SZD_ID_PROVINCE));
 		for (CodeEntity entity : szdList) {
 			JyrCountEntity e1 = new JyrCountEntity();
@@ -1016,7 +1017,8 @@ public class JyrServiceImpl extends BaseService<JyrEntity, Long> implements
 				entity.setSzd(szdEntity.getBz());
 				entity.setQymc(e.getGkjyr());
 				// 设置码头泊位类别 ：危险货物集装箱码头，石油化工码头，危险货物非石油化工码头
-				if (lb3.equals("Y") && (e.getQyxz().charAt(0) + "").equals("Y")&& (e.getQyxz().charAt(4)+"").equals("Y")) {
+				if (lb3.equals("Y") && (e.getQyxz().charAt(0) + "").equals("Y")
+						&& (e.getQyxz().charAt(4) + "").equals("Y")) {
 					entity.setLb("危险货物非石油化工码头");
 				}
 				if (lb2.equals("Y") && (e.getQyxz().charAt(0) + "").equals("Y")
@@ -1093,7 +1095,7 @@ public class JyrServiceImpl extends BaseService<JyrEntity, Long> implements
 					}
 				}
 				entity.setLb(qyxz);
-				//entity.setZyhz(e.getZyhz());
+				// entity.setZyhz(e.getZyhz());
 				String qylxString = "";
 				if (e.getQylx() != null) {
 					if (e.getQylx().equals("1")) {

gkaq/yjpt-java/trunk/resources/sql/init/9.update.sql.ftl

@@ -565,5 +565,49 @@ values (11023,10903,'SSFL.WZFL',null,5,'SSFL.YWRFZSS.SYWYL',null,null,null,null,
 ALTER TABLE T_YJPT_USER ADD zs NUMBER;
 ALTER TABLE T_YJPT_JYRJCXX ADD zs NUMBER;
 
-Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) 
-values (4201011,420101,'ZS',null,5,'武汉站所',null,null,null,null,1,null,null,null,null,null,'武汉站所',null,null,'0',null,null,null,null,null);
+--站所20160901
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE) values (4210021,421002,'ZS',4210021,'玉和坪所',1,'玉和坪所','0');
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE) values (4210022,421002,'ZS',4210022,'柳林洲所',1,'柳林洲所','0');
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE) values (4210023,421002,'ZS',4210023,'窑滂所',1,'窑滂所','0');
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE) values (4210871,421087,'ZS',4210871,'松滋口港航所',1,'松滋口港航所','0');
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE) values (4210872,421087,'ZS',4210872,'涴市所',1,'涴市所','0');
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE) values (4210221,421022,'ZS',4210221,'斗湖堤所',1,'斗湖堤所','0');
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE) values (4210231,421023,'ZS',4210231,'盐船套作业区',1,'盐船套作业区','0');
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE) values (4210232,421023,'ZS',4210232,'白螺作业区',1,'白螺作业区','0');
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE) values (4210831,421083,'ZS',4210831,'城区所',1,'城区所','0');
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE) values (4210832,421083,'ZS',4210832,'螺山所',1,'螺山所','0');
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE) values (4202011,420201,'ZS',4202011,'黄石港港航管理所',1,'黄石港港航管理所','0');
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE) values (4202012,420201,'ZS',4202012,'中心港港航管理所',1,'中心港港航管理所','0');
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE) values (4202013,420201,'ZS',4202013,'西塞港航管理所',1,'西塞港航管理所','0');
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE) values (4212211,421221,'ZS',4212211,'潘家湾港航管理所',1,'潘家湾港航管理所','0');
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE) values (4212212,421221,'ZS',4212212,'石矶头港航管理所',1,'石矶头港航管理所','0');
+--20160907
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE) values (4201011,420101,'ZS',4201011,'江南航务管理一所',1,'江南航务管理一所','0');
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE) values (4201012,420101,'ZS',4201012,'江南航务管理二所',1,'江南航务管理二所','0');
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE) values (4201013,420101,'ZS',4201013,'江南航务管理长江所',1,'江南航务管理长江所','0');
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE) values (4201014,420101,'ZS',4201014,'江北航务管理一所',1,'江北航务管理一所','0');
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE) values (4201015,420101,'ZS',4201015,'江北航务管理二所',1,'江北航务管理二所','0');
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE) values (4201016,420101,'ZS',4201016,'汉江航务管理一所',1,'汉江航务管理一所','0');
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE) values (4201017,420101,'ZS',4201017,'汉江航务管理二所',1,'汉江航务管理二所','0');
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE) values (4201018,420101,'ZS',4201018,'汉江航务管理舵落口所',1,'汉江航务管理舵落口所','0');
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE) values (4201019,420101,'ZS',4201019,'阳逻督查室',1,'阳逻督查室','0');
+--更新用户和经营人资料
+update T_YJPT_USER r set r.ZS=4201011 where r.SZD=420199;
+update T_YJPT_USER r set r.ZS=4201012 where r.SZD=420107;
+update T_YJPT_USER r set r.ZS=4201013 where r.SZD=420198;
+update T_YJPT_USER r set r.ZS=4201014 where r.SZD=420105;
+update T_YJPT_USER r set r.ZS=4201015 where r.SZD=420102;
+update T_YJPT_USER r set r.ZS=4201016 where r.SZD=420196;
+update T_YJPT_USER r set r.ZS=4201017 where r.SZD=420197;
+update T_YJPT_USER r set r.ZS=4201018 where r.SZD=420104;
+update T_YJPT_JYRJCXX j set j.ZS=4201011 where j.SZD=420199;
+update T_YJPT_JYRJCXX j set j.ZS=4201012 where j.SZD=420107;
+update T_YJPT_JYRJCXX j set j.ZS=4201013 where j.SZD=420198;
+update T_YJPT_JYRJCXX j set j.ZS=4201014 where j.SZD=420105;
+update T_YJPT_JYRJCXX j set j.ZS=4201015 where j.SZD=420102;
+update T_YJPT_JYRJCXX j set j.ZS=4201016 where j.SZD=420196;
+update T_YJPT_JYRJCXX j set j.ZS=4201017 where j.SZD=420197;
+update T_YJPT_JYRJCXX j set j.ZS=4201018 where j.SZD=420104;
+
+--港区数据所在水域修正
+Alter table t_yjpt_gq modify gqszsylx varchar(10);