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

gkaq/yjpt-java/trunk/.classpath

@@ -10,7 +10,7 @@
 			<attribute name="owner.project.facets" value="jst.web"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_45"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_45"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="output" path="yjpt/WEB-INF/classes"/>
 </classpath>

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/client/common/accessory/AccessoryService.java

@@ -3,7 +3,6 @@ package com.jtgh.yjpt.client.common.accessory;
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.List;
 import java.util.logging.Logger;
 
 import javax.xml.namespace.QName;
@@ -11,8 +10,6 @@ import javax.xml.ws.Service;
 import javax.xml.ws.WebEndpoint;
 import javax.xml.ws.WebServiceClient;
 
-import com.jtgh.yjpt.entity.common.AccessoryEntity;
-
 
 
 /**

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

@@ -184,6 +184,7 @@ public class Constants {
 	/** 重大危险源 **/
 	public static final String SEQ_T_YJPT_CG = "SEQ_T_YJPT_CG";
 	public static final String SEQ_T_YJPT_CGZT = "SEQ_T_YJPT_CGZT";
+	public static final String SEQ_T_YJPT_CGSY = "SEQ_T_YJPT_CGSY";
 	public static final String SEQ_T_YJPT_ZBHJJBQK = "SEQ_T_YJPT_ZBHJJBQK";
 	public static final String SEQ_T_YJPT_QSK = "SEQ_T_YJPT_QSK";
 	public static final String SEQ_T_YJPT_ZDWXYBA_FLOW = "SEQ_T_YJPT_GQNWXYDJBAB_FLOW";
@@ -457,6 +458,9 @@ public class Constants {
 	public static long FJSSLX_GLZDXX = 10000285l;
 	/** 应急预案备案 **/
 	public static long FJSSLX_YJYABA = 10000290l;
+	/***人员基本信息**/
+	public static Long FJSSLX_RYJBXX=10000366l;
+	
 	/** 附证扫描件 **/
 	public static long GGDM_ID_FZSMJ = 10000509l;
 	/** 重大危险源备案 */
@@ -683,6 +687,8 @@ public class Constants {
 	public final static String BUSTYPE_YXQ_XKZ = "yxq_xkz";
 	public final static String BUSTYPE_YXQ_FZ = "yxq_fz";
 	public final static String BUSTYPE_YXQ_AB = "yxq_ab";
+	// =============================状态提醒相关类型=====================================
+	public final static String BUSTYPE_ZT_CG = "zt_cg";
 	// ******************附件类型*********************************************************
 	/** 应急培训表的附件类型——参加人员签到附件 */
 	public static long FJLX_YJPX_CJRYQD = 10000537;

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/jyrxxgl/RyjbxxController.java

@@ -221,8 +221,8 @@ public class RyjbxxController extends BaseController {
 	@Log(Type.ADD)
 	public BusinessContext doAdd(RyjbxxEntity ryjbxxEntity,
 			List<RyjbxxZSEntity> zsList, List<RyjbxxZSEntity> deleteZsList,
-			Long functionId) {
-		return save(ryjbxxEntity, zsList, deleteZsList, functionId);
+			Long functionId ,Long accId) {
+		return save(ryjbxxEntity, zsList, deleteZsList, functionId,accId);
 	}
 
 	/**
@@ -234,13 +234,13 @@ public class RyjbxxController extends BaseController {
 	@Log(Type.EDIT)
 	public BusinessContext doEdit(RyjbxxEntity ryjbxxEntity,
 			List<RyjbxxZSEntity> zsList, List<RyjbxxZSEntity> deleteZsList,
-			Long functionId) {
-		return save(ryjbxxEntity, zsList, deleteZsList, functionId);
+			Long functionId,Long accId) {
+		return save(ryjbxxEntity, zsList, deleteZsList, functionId,accId);
 	}
 
 	public BusinessContext save(RyjbxxEntity ryjbxxEntity,
 			List<RyjbxxZSEntity> zsList, List<RyjbxxZSEntity> deleteZsList,
-			Long functionId) {
+			Long functionId,Long accId) {
 		BusinessContext bContext = new BusinessContext();
 		if (null == ryjbxxEntity.getId()) {
 			// 新增
@@ -253,7 +253,7 @@ public class RyjbxxController extends BaseController {
 			ryjbxxEntity.setUpdateUser(Utils.getCurrentUser());
 		}
 		RyjbxxEntity ryjbxx = new RyjbxxEntity();
-		ryjbxx = service.save(ryjbxxEntity, zsList, deleteZsList);
+		ryjbxx = service.save(ryjbxxEntity, zsList, deleteZsList,accId);
 		bContext.setResult(ryjbxx);
 		bContext.addMsg("save.success", "common", MsgLevel.INFO);
 		return bContext;

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/yjgl/zdwxyfb/CgController.java

@@ -45,21 +45,28 @@ import com.jtgh.yjpt.common.SpecificationCreater;
 import com.jtgh.yjpt.common.Utils;
 import com.jtgh.yjpt.controller.BaseController;
 import com.jtgh.yjpt.controller.sgalgl.PoiUtils;
+import com.jtgh.yjpt.dao.task.GztxDao;
 import com.jtgh.yjpt.dao.yjgl.zdwxyfb.CgDao;
 import com.jtgh.yjpt.entity.BaseEntity;
+import com.jtgh.yjpt.entity.auth.UserEntity;
 import com.jtgh.yjpt.entity.common.AccessoryEntity;
 import com.jtgh.yjpt.entity.gkgq.GqEntity;
 import com.jtgh.yjpt.entity.jyr.JyrEntity;
 import com.jtgh.yjpt.entity.jyrxxgl.GksssbEntity;
+import com.jtgh.yjpt.entity.task.Gztx;
 import com.jtgh.yjpt.entity.yjgl.zdwxyfb.CgCountEntity;
 import com.jtgh.yjpt.entity.yjgl.zdwxyfb.CgEntity;
+import com.jtgh.yjpt.entity.yjgl.zdwxyfb.CgsyEntity;
 import com.jtgh.yjpt.entity.yjgl.zdwxyfb.CgztEntity;
 import com.jtgh.yjpt.entity.yjgl.zdwxyfb.ZbhjjbqkEntity;
+import com.jtgh.yjpt.service.auth.UserService;
 import com.jtgh.yjpt.service.common.AccessoryService;
 import com.jtgh.yjpt.service.gkgq.GqService;
 import com.jtgh.yjpt.service.jyr.JyrService;
 import com.jtgh.yjpt.service.jyrxxgl.GksssbService;
+import com.jtgh.yjpt.service.task.TaskService;
 import com.jtgh.yjpt.service.yjgl.zdwxyfb.CgService;
+import com.jtgh.yjpt.service.yjgl.zdwxyfb.CgsyService;
 import com.jtgh.yjpt.service.yjgl.zdwxyfb.CgztService;
 import com.jtgh.yjpt.service.yjgl.zdwxyfb.ZbhjjbqkService;
 
@@ -76,6 +83,8 @@ public class CgController extends BaseController {
 	@Autowired
 	private CgztService cgztService;
 	@Autowired
+	private CgsyService cgsyService;
+	@Autowired
 	private CgDao cgDao;
 	@Autowired
 	private AccessoryService accessoryService;
@@ -87,6 +96,13 @@ public class CgController extends BaseController {
 	private JyrService jyrService;
 	@Autowired
 	private GksssbService aqsssbService;
+	@Autowired
+	private GztxDao gztxDao;
+	@Autowired
+	private TaskService taskService;
+	@Autowired
+	private UserService userService;
+	
 
 	@Log(Type.QUERY)
 	public BusinessContext list(SinglePageRequest pageRequest, Long functionId,
@@ -106,11 +122,9 @@ public class CgController extends BaseController {
 		if (null == pageRequest) {
 			List<CgEntity> dataset = cgService.findAll(spec);
 			for (CgEntity vo : dataset) {
-				//检索储罐状态
-				CgztEntity cgzt = cgztService.findByCg(vo);
-				if(cgzt != null) {
-					vo.setZt(cgzt.getZt());
-				}
+				// 检索储罐状态
+				vo.setCgzt(cgztService.findByCg(vo));
+				vo.setCgsy(cgsyService.findByCg(vo));
 				// 检索附件
 				filterList = new ArrayList<PredicateModel>();
 				addNotEmptyModel(filterList, "entityType.id",
@@ -129,11 +143,9 @@ public class CgController extends BaseController {
 		} else {
 			Page<CgEntity> page = cgService.findAll(spec, pageRequest);
 			for (CgEntity vo : page) {
-				//检索储罐状态
-				CgztEntity cgzt = cgztService.findByCg(vo);
-				if(cgzt != null) {
-					vo.setZt(cgzt.getZt());
-				}
+				// 检索储罐状态
+				vo.setCgzt(cgztService.findByCg(vo));
+				vo.setCgsy(cgsyService.findByCg(vo));
 				// 检索附件
 				filterList = new ArrayList<PredicateModel>();
 				addNotEmptyModel(filterList, "entityType.id",
@@ -153,7 +165,6 @@ public class CgController extends BaseController {
 
 	}
 
-	
 	@RequestMapping(value = "cgJasper", method = RequestMethod.POST)
 	@ResponseBody
 	@RemotingExclude
@@ -162,28 +173,27 @@ public class CgController extends BaseController {
 		List<CgEntity> dataList = new ArrayList<CgEntity>();
 		CgEntity data = cgService.findOne(Long.parseLong(id));
 		dataList.add(data);
-		Map<String, Object> parameters=new HashMap<String, Object>();
-		
-		List<ZbhjjbqkEntity> dataList1 =  new ArrayList<ZbhjjbqkEntity>();
-		List<ZbhjjbqkEntity> dataList2 =  new ArrayList<ZbhjjbqkEntity>();
-		List<ZbhjjbqkEntity> dataList3 =  new ArrayList<ZbhjjbqkEntity>();
-		List<ZbhjjbqkEntity> dataList4 =  new ArrayList<ZbhjjbqkEntity>();
-		dataList1=  zbhjjbqkService.jbqkByDwlx("jmq",data);
-		dataList2 = zbhjjbqkService.jbqkByDwlx("jgtt",data);
-		dataList3 = zbhjjbqkService.jbqkByDwlx("scdw",data);
-		dataList4 = zbhjjbqkService.jbqkByDwlx("ggcs",data);
+		Map<String, Object> parameters = new HashMap<String, Object>();
+
+		List<ZbhjjbqkEntity> dataList1 = new ArrayList<ZbhjjbqkEntity>();
+		List<ZbhjjbqkEntity> dataList2 = new ArrayList<ZbhjjbqkEntity>();
+		List<ZbhjjbqkEntity> dataList3 = new ArrayList<ZbhjjbqkEntity>();
+		List<ZbhjjbqkEntity> dataList4 = new ArrayList<ZbhjjbqkEntity>();
+		dataList1 = zbhjjbqkService.jbqkByDwlx("jmq", data);
+		dataList2 = zbhjjbqkService.jbqkByDwlx("jgtt", data);
+		dataList3 = zbhjjbqkService.jbqkByDwlx("scdw", data);
+		dataList4 = zbhjjbqkService.jbqkByDwlx("ggcs", data);
 		parameters.put("SUBREPORT_DIR", "iReport/yjgl/");
 		parameters.put("datalist", dataList);
-        parameters.put("sublist1", dataList1);
-        parameters.put("sublist2", dataList2);
-        parameters.put("sublist3", dataList3);
-        parameters.put("sublist4", dataList4);
+		parameters.put("sublist1", dataList1);
+		parameters.put("sublist2", dataList2);
+		parameters.put("sublist3", dataList3);
+		parameters.put("sublist4", dataList4);
 		download(parameters, "重大危险源录入", "iReport/yjgl/zdwxy.jasper",
 				ReportExportHelper.REPORT_EXPORT_TYPE_WORD,
 				new JRBeanCollectionDataSource(dataList), response, request);
-		}
-	
-	
+	}
+
 	public Collection<String[]> print(List<String> param) {
 		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
 		addRecordCodeFilter(Long.parseLong(param.get(4)), filterList);
@@ -208,22 +218,16 @@ public class CgController extends BaseController {
 		Collection<String[]> strings = new ArrayList<String[]>();
 		int i = 1;
 		for (CgEntity entity : dataset) {
+			CgztEntity cgztEntity = cgztService.findByCg(entity);
 			String[] ss = new String[] {
 					i + "",
 					null == entity.getDwmc() ? "" : entity.getDwmc().getGkjyr(),
-					entity.getCgqmc(),
-					entity.getJtwz(),
-					null == entity.getCgqmj() ? "" : entity.getCgqmj() + "",
-					entity.getCggs() + "",
-					entity.getHxpmc(),
-					entity.getQyccbh(),
-					null == entity.getHxpsl() ? "" : entity.getHxpsl() + "",
-					entity.getGkzdwxybh(),
-					null == entity.getSzd() ? "" : resource.getString(entity
-							.getSzd().getName()),
-					null == entity.getGq() ? "" : entity.getGq().getGqmc(),
-					null == entity.getTcsj() ? "" : sdf
-							.format(entity.getTcsj()) };
+					entity.getCgqmc(), entity.getCgmc(), entity.getQyccbh(),
+					null == entity.getCgrj() ? "" : entity.getCgrj() + "",
+					null == cgztEntity ? "" : cgztEntity.getHz(),
+					null == cgztEntity ? "" : cgztEntity.getYl(),
+					null == cgztEntity ? "" : cgztEntity.getWd(),
+					null == cgztEntity ? "" : cgztEntity.getYw() };
 			strings.add(ss);
 			i++;
 		}
@@ -239,6 +243,12 @@ public class CgController extends BaseController {
 			entity.setRecordCode(getCurrentRoleCode(functionId));
 		}
 		CgEntity cgEntity = cgService.save(entity);
+		// 保存储罐适用范围
+		if (entity.getCgsy() != null) {
+			CgsyEntity cgsyEntity = entity.getCgsy();
+			cgsyEntity.setCg(cgEntity);
+			saveSy(functionId, cgsyEntity);
+		}
 		List<ZbhjjbqkEntity> tbAddList = new ArrayList<ZbhjjbqkEntity>();
 		for (ZbhjjbqkEntity zbhjjbqk : addList) {
 			zbhjjbqk.setSscg(cgEntity);
@@ -267,6 +277,12 @@ public class CgController extends BaseController {
 			entity.setRecordCode(getCurrentRoleCode(functionId));
 		}
 		CgEntity cgEntity = cgService.save(entity);
+		// 保存储罐适用范围
+		if (entity.getCgsy() != null) {
+			CgsyEntity cgsyEntity = entity.getCgsy();
+			cgsyEntity.setCg(cgEntity);
+			saveSy(functionId, cgsyEntity);
+		}
 		List<ZbhjjbqkEntity> tbAddList = new ArrayList<ZbhjjbqkEntity>();
 		for (ZbhjjbqkEntity zbhjjbqk : addList) {
 			zbhjjbqk.setSscg(cgEntity);
@@ -292,6 +308,8 @@ public class CgController extends BaseController {
 		if (BaseEntity.RECORD_STATE_DELETE == cgEntity.getRecordStatus()) {
 			bc.setResult("delete");
 		} else {
+			cgEntity.setCgzt(cgztService.findByCg(cgEntity));
+			cgEntity.setCgsy(cgsyService.findByCg(cgEntity));
 			List<ZbhjjbqkEntity> jmqList = new ArrayList<ZbhjjbqkEntity>();
 			List<ZbhjjbqkEntity> jgttList = new ArrayList<ZbhjjbqkEntity>();
 			List<ZbhjjbqkEntity> scdwList = new ArrayList<ZbhjjbqkEntity>();
@@ -328,11 +346,11 @@ public class CgController extends BaseController {
 			try {
 				CgWebService webService = cgService.getWebService();
 				if (null != webService) {
-						webService.delete(entity);
-						//储罐的entity有clone 需要重新取
-						entity =  cgService.findOne(entity.getId());
-						entity.setTbzt(Constants.YES);
-						cgService.save(entity);
+					webService.delete(entity);
+					// 储罐的entity有clone 需要重新取
+					entity = cgService.findOne(entity.getId());
+					entity.setTbzt(Constants.YES);
+					cgService.save(entity);
 				}
 			} catch (Exception e) {
 				e.printStackTrace();
@@ -361,24 +379,27 @@ public class CgController extends BaseController {
 		bc.setAttribute("records", list);
 		return bc;
 	}
-	
+
 	@RequestMapping(value = "cgxxTjJasper", method = RequestMethod.POST)
 	@ResponseBody
 	@RemotingExclude
-	public void jasperPrintTj(@RequestParam(value = "szd", required = false) final String szd,
+	public void jasperPrintTj(
+			@RequestParam(value = "szd", required = false) final String szd,
 			HttpServletResponse response, HttpServletRequest request) {
 		List<Map<String, Object>> dataList = null;
 		String reportFile = "";
-		String  mc = "";
+		String mc = "";
 		Map<String, Object> parameters = new HashMap<String, Object>();
-		if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)){
-			dataList = (List<Map<String, Object>>) countCgxx(szd).getAttribute("records");
+		if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+			dataList = (List<Map<String, Object>>) countCgxx(szd).getAttribute(
+					"records");
 			reportFile = "iReport/yjgl/cgxxTj-city.jasper";
-			mc="储罐信息统计";
-		}else{
-			dataList = (List<Map<String, Object>>) countYjgl(szd).getAttribute("records");
+			mc = "储罐信息统计";
+		} else {
+			dataList = (List<Map<String, Object>>) countYjgl(szd).getAttribute(
+					"records");
 			reportFile = "iReport/yjgl/qsyjglTj-pro.jasper";
-			mc="全省应急管理";
+			mc = "全省应急管理";
 		}
 		ReportExportHelper.exportFromIreport(reportFile, response, parameters,
 				new JRBeanCollectionDataSource(dataList), mc,
@@ -541,10 +562,10 @@ public class CgController extends BaseController {
 			outputStream.close();
 		}
 	}
-	
 
 	/**
 	 * 查询储罐状态信息
+	 * 
 	 * @param pageRequest
 	 * @param functionId
 	 * @param entity
@@ -553,50 +574,208 @@ public class CgController extends BaseController {
 	 * @param tbsj2
 	 * @return
 	 */
-	public BusinessContext listZt(SinglePageRequest pageRequest, Long functionId,
-			CgEntity entity,String hz,Date tbsj1,Date tbsj2) {
+	public BusinessContext listZt(SinglePageRequest pageRequest,
+			Long functionId, CgEntity entity, String hz, Date tbsj1, Date tbsj2) {
 		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
-		//所属储罐
+		// 所属储罐
 		addNotEmptyModel(filterList, "cg", entity.getId(), Operator.EQ);
-		//货种
+		// 货种
 		addNotEmptyModel(filterList, "hz", hz, Operator.LIKE);
-		//填报时间
-		if(tbsj1!=null){
-			addNotEmptyModel(filterList, "tbsj", Utils.getDateFirstTime(tbsj1), Operator.GTE);
+		// 填报时间
+		if (tbsj1 != null) {
+			addNotEmptyModel(filterList, "tbsj", Utils.getDateFirstTime(tbsj1),
+					Operator.GTE);
 		}
-		if(tbsj2!=null){
-			addNotEmptyModel(filterList, "tbsj", Utils.getDateLastTime(tbsj2), Operator.LTE);
+		if (tbsj2 != null) {
+			addNotEmptyModel(filterList, "tbsj", Utils.getDateLastTime(tbsj2),
+					Operator.LTE);
 		}
 		addNotEmptyModel(filterList, "recordStatus",
 				BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
 		Specification<CgztEntity> spec = SpecificationCreater
 				.searchByPredicateModels(filterList);
-		 Page<CgztEntity> page = cgztService.findAll(spec,pageRequest);
-		 return createBusinessContext(page);
+		Page<CgztEntity> page = cgztService.findAll(spec, pageRequest);
+		return createBusinessContext(page);
 	}
-	
+
 	/**
 	 * 保存
+	 * 
 	 * @param functionId
 	 * @param entity
 	 * @return
 	 */
-	public  BusinessContext saveZt(Long functionId,CgztEntity entity){
-		//新增
-		if(entity.getId()==null || entity.getId().equals(0l)){
+	public BusinessContext saveZt(Long functionId, CgztEntity entity) {
+		// 新增
+		if (entity.getId() == null || entity.getId().equals(0l)) {
 			entity.setAddDate(new Date());
 			entity.setAddUser(Utils.getCurrentUser());
-			entity.setRecordCode( getCurrentRoleCode(functionId));
+			entity.setRecordCode(getCurrentRoleCode(functionId));
 		} else {
 			entity.setUpdateDate(new Date());
 			entity.setUpdateUser(Utils.getCurrentUser());
 		}
 		entity = cgztService.save(entity);
+		if (entity.getCg() != null && entity.getZt().equals("2")) {
+			saveGztx(entity);
+		}
 		return createBusinessContext(entity);
 	}
-	
-	public void deleteZt(CgztEntity entity){
+
+	public void deleteZt(CgztEntity entity) {
 		cgztService.logicDelete(entity.getId());
 	}
-	
+
+	/**
+	 * 保存
+	 * 
+	 * @param functionId
+	 * @param entity
+	 * @return
+	 */
+	public BusinessContext saveSy(Long functionId, CgsyEntity entity) {
+		// 新增
+		if (entity.getId() == null || entity.getId().equals(0l)) {
+			entity.setAddDate(new Date());
+			entity.setAddUser(Utils.getCurrentUser());
+			entity.setRecordCode(getCurrentRoleCode(functionId));
+		} else {
+			entity.setUpdateDate(new Date());
+			entity.setUpdateUser(Utils.getCurrentUser());
+		}
+		entity = cgsyService.save(entity);
+		return createBusinessContext(entity);
+	}
+
+	/**
+	 * 保存
+	 * 
+	 * @param entity
+	 * @param jsUser
+	 */
+	public void saveGztx(CgztEntity entity) {
+		CgsyEntity cgsy = cgsyService.findByCg(entity.getCg());
+		String txnr1 = "";
+		String txnr2 = "";
+		if (cgsy != null) {
+			if (null != cgsy.getZdwd()
+					&& !"".equals(cgsy.getZdwd().trim())
+					&& null != entity.getWd()
+					&& !"".equals(cgsy.getZdwd().trim())
+					&& Double.parseDouble(entity.getWd()) > Double
+							.parseDouble(cgsy.getZdwd())) {
+				txnr1 = (entity.getCg().getDwmc() == null ? "" : (entity
+						.getCg().getDwmc().getGkjyr() + "的"))
+						+ entity.getCg().getCgmc() + "高于最高温度！";
+				txnr2 =  "你单位的"
+						+ entity.getCg().getCgmc() + "高于最高温度！";
+			}
+			if (null != cgsy.getZxwd()
+					&& !"".equals(cgsy.getZxwd().trim())
+					&& null != entity.getWd()
+					&& !"".equals(cgsy.getZxwd().trim())
+					&& Double.parseDouble(entity.getWd()) < Double
+							.parseDouble(cgsy.getZxwd())) {
+				txnr1 = (entity.getCg().getDwmc() == null ? "" : (entity
+						.getCg().getDwmc().getGkjyr() + "的"))
+						+ entity.getCg().getCgmc() + "低于最低温度！";
+				txnr2 =  "你单位的"
+						+ entity.getCg().getCgmc() + "低于最低温度！";
+			}
+			if (null != cgsy.getZdyl()
+					&& !"".equals(cgsy.getZdyl().trim())
+					&& null != entity.getYl()
+					&& !"".equals(cgsy.getZdyl().trim())
+					&& Double.parseDouble(entity.getYl()) > Double
+							.parseDouble(cgsy.getZdyl())) {
+				txnr1 = (entity.getCg().getDwmc() == null ? "" : (entity
+						.getCg().getDwmc().getGkjyr() + "的"))
+						+ entity.getCg().getCgmc() + "高于最高压力！";
+				txnr2 =  "你单位的"
+						+ entity.getCg().getCgmc() + "高于最高压力！";
+			}
+			if (null != cgsy.getZxyl()
+					&& !"".equals(cgsy.getZxyl().trim())
+					&& null != entity.getYl()
+					&& !"".equals(cgsy.getZxyl().trim())
+					&& Double.parseDouble(entity.getYl()) < Double
+							.parseDouble(cgsy.getZxyl())) {
+				txnr1 = (entity.getCg().getDwmc() == null ? "" : (entity
+						.getCg().getDwmc().getGkjyr() + "的"))
+						+ entity.getCg().getCgmc() + "低于最低液位！";
+				txnr2 =  "你单位的"
+						+ entity.getCg().getCgmc() + "低于最低液位！";
+			}
+			if (null != cgsy.getZdyw()
+					&& !"".equals(cgsy.getZdyw().trim())
+					&& null != entity.getYw()
+					&& !"".equals(cgsy.getZdyw().trim())
+					&& Double.parseDouble(entity.getYw()) > Double
+							.parseDouble(cgsy.getZdyw())) {
+				txnr1 = (entity.getCg().getDwmc() == null ? "" : (entity
+						.getCg().getDwmc().getGkjyr() + "的"))
+						+ entity.getCg().getCgmc() + "高于最高液位！";
+				txnr2 =  "你单位的"
+						+ entity.getCg().getCgmc() + "高于最高液位！";
+			}
+			if (null != cgsy.getZxyw()
+					&& !"".equals(cgsy.getZxyw().trim())
+					&& null != entity.getYw()
+					&& !"".equals(cgsy.getZxyw().trim())
+					&& Double.parseDouble(entity.getYw()) < Double
+							.parseDouble(cgsy.getZxyw())) {
+				txnr1 = (entity.getCg().getDwmc() == null ? "" : (entity
+						.getCg().getDwmc().getGkjyr() + "的"))
+						+ entity.getCg().getCgmc() + "低于最低液位！";
+				txnr2 =  "你单位的"
+						+ entity.getCg().getCgmc() + "低于最低液位！";
+			}
+			if("".equals(txnr1)) {
+				deleteGztx(entity.getId().toString(),
+						entity.getAddUser(),
+						Constants.BUSTYPE_ZT_CG);
+				setGztx(entity.getId().toString(),txnr1,entity.getAddUser());
+				List<UserEntity> adminList = userService.findPAdminBySzd(entity.getCg().getId());
+				for (UserEntity userEntity : adminList) {
+					deleteGztx(entity.getId().toString(), userEntity,
+							Constants.BUSTYPE_ZT_CG);
+					setGztx(entity.getId().toString(),txnr2,userEntity);
+				}
+				List<UserEntity> qyadminList = userService
+						.findUserForTx(entity.getAddUser().getId());
+				for (UserEntity userEntity : qyadminList) {
+					deleteGztx(entity.getId().toString(), userEntity,
+							Constants.BUSTYPE_ZT_CG);
+					setGztx(entity.getId().toString(),txnr2,userEntity);
+				}
+			}
+		}
+	}
+
+	/**
+	 * 删除已有工作提醒
+	 */
+	private void deleteGztx(String id, UserEntity adduser, String busType) {
+		List<Gztx> list = taskService
+				.findBybdidAndBustype(id, busType, adduser);
+		for (Gztx gztx : list) {
+			taskService.deleteGztx(gztx);
+		}
+	}
+	/**
+	 * 发工作提醒
+	 */
+	public void setGztx(String bdid, String txnr, UserEntity jsUser) {
+		Gztx gztx = new Gztx();
+		gztx.setTxsj(new Date());
+		gztx.setTxzt(Constants.YES);
+		gztx.setBdid(bdid);
+		gztx.setTxnr(txnr);
+		gztx.setBustype(Constants.BUSTYPE_ZT_CG);
+		gztx.setFsUser(Utils.getCurrentUser());
+		gztx.setAddDate(new Date());
+		gztx.setJsUser(jsUser);
+		gztxDao.save(gztx);
+	}
+
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/auth/UserDao.java

@@ -59,5 +59,10 @@ public interface UserDao extends MyRepository<UserEntity, Long> {
 
 	@Query(value = "select * from T_YJPT_USER u  where u.szd=?1 ", nativeQuery = true)
 	public List<UserEntity> findBySzd(Long szd);
+	
+	@Query(value = "select u.* from T_YJPT_USER u,T_YJPT_ROLE_USER ru where u.id = ru.userid and ru.roleid = 1 and u.szd=?1 and u.record_status<>9", nativeQuery = true)
+	public List<UserEntity> findAdminBySzd(Long szd);
 
+	@Query(value = "select u.* from T_YJPT_USER u,T_YJPT_ROLE_USER ru ,T_YJPT_GGDM g  where u.id = ru.userid and ru.roleid = 1 and u.szd=g.id and g.byzd2 =substr(?1,0,5)  and u.record_status<>9", nativeQuery = true)
+	public List<UserEntity> findPAdminBySzd(Long szd);
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/jyr/WxhwpmDao.java

@@ -57,6 +57,6 @@ public interface WxhwpmDao extends MyRepository<WxhwpmEntity, Long> {
 	@Query(value = "select * from T_YJPT_WXHWPMB where rownum<=200", nativeQuery = true)
 	public List<WxhwpmEntity> query();
 	
-	@Query(value = "select * from T_YJPT_WXHWPMB where bh like ?1 and mchsm like ?2 and rownum<=200", nativeQuery = true)
+	@Query(value = "select * from T_YJPT_WXHWPMB where bh like ?1 and mchsm like ?2 ", nativeQuery = true)
 	public List<WxhwpmEntity> queryByBhMc(String bh, String mc);
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/yjgl/zdwxyfb/CgsyDao.java

@@ -0,0 +1,18 @@
+package com.jtgh.yjpt.dao.yjgl.zdwxyfb;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Query;
+
+import com.jtgh.yjpt.dao.common.MyRepository;
+import com.jtgh.yjpt.entity.yjgl.zdwxyfb.CgEntity;
+import com.jtgh.yjpt.entity.yjgl.zdwxyfb.CgsyEntity;
+import com.jtgh.yjpt.entity.yjgl.zdwxyfb.CgztEntity;
+
+public interface CgsyDao extends MyRepository<CgsyEntity, Long> {
+
+	public CgztEntity findById(Long id);
+	
+	@Query("from CgsyEntity where  cg=?1 and recordStatus<>9 order by id desc")
+	public List<CgsyEntity> findByCg(CgEntity cg);
+}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/jyrxxgl/RyjbxxEntity.java

@@ -9,11 +9,13 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import javax.xml.bind.annotation.XmlTransient;
 
 import org.springframework.flex.remoting.RemotingExclude;
 
 import com.jtgh.yjpt.common.Constants;
 import com.jtgh.yjpt.entity.BaseEntity;
+import com.jtgh.yjpt.entity.common.AccessoryEntity;
 import com.jtgh.yjpt.entity.common.CodeEntity;
 import com.jtgh.yjpt.entity.gkgq.GqEntity;
 import com.jtgh.yjpt.entity.jyr.JyrEntity;
@@ -69,6 +71,7 @@ public class RyjbxxEntity extends BaseEntity<Long> {
 	private CodeEntity zjlx;// 证件类型
 	private String bz;// 备注
 	private RyjbxxZSEntity firstZs;
+	private AccessoryEntity zp;
 
 	@Transient
 	public RyjbxxZSEntity getFirstZs() {
@@ -310,4 +313,14 @@ public class RyjbxxEntity extends BaseEntity<Long> {
 		this.bz = bz;
 	}
 
+	@Transient
+	@XmlTransient
+	public AccessoryEntity getZp() {
+		return zp;
+	}
+
+	public void setZp(AccessoryEntity zp) {
+		this.zp = zp;
+	}
+
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/yjgl/zdwxyfb/CgEntity.java

@@ -242,9 +242,11 @@ public class CgEntity extends BaseEntity<Long> implements Cloneable {
 	/** 安全高度 */
 	private Double  aqgd;
 	/** 直径 */
-	private Integer zj;
+	private Double zj;
 	/** 储罐状态*/
-	private String zt;
+	private CgztEntity cgzt;
+	/** 储罐适用范围*/
+	private CgsyEntity cgsy;
 
 	/** 附件 */
 	private AccessoryEntity accessory;
@@ -272,11 +274,11 @@ public class CgEntity extends BaseEntity<Long> implements Cloneable {
 		this.aqgd = aqgd;
 	}
 
-	public Integer getZj() {
+	public Double getZj() {
 		return zj;
 	}
 
-	public void setZj(Integer zj) {
+	public void setZj(Double zj) {
 		this.zj = zj;
 	}
 
@@ -721,24 +723,34 @@ public class CgEntity extends BaseEntity<Long> implements Cloneable {
 	public void setWxydj(CodeEntity wxydj) {
 		this.wxydj = wxydj;
 	}
+	
+	@Transient
+	@XmlTransient
+	public CgztEntity getCgzt() {
+		return cgzt;
+	}
 
-	public CgEntity clone() {
-		try {
-			return (CgEntity) super.clone();
-		} catch (CloneNotSupportedException e) {
-			e.printStackTrace();
-		}
-		return null;
+	public void setCgzt(CgztEntity cgzt) {
+		this.cgzt = cgzt;
 	}
 
 	@Transient
 	@XmlTransient
-	public String getZt() {
-		return zt;
+	public CgsyEntity getCgsy() {
+		return cgsy;
 	}
 
-	public void setZt(String zt) {
-		this.zt = zt;
+	public void setCgsy(CgsyEntity cgsy) {
+		this.cgsy = cgsy;
 	}
 
+	public CgEntity clone() {
+		try {
+			return (CgEntity) super.clone();
+		} catch (CloneNotSupportedException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}	
+
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/yjgl/zdwxyfb/CgsyEntity.java

@@ -0,0 +1,119 @@
+package com.jtgh.yjpt.entity.yjgl.zdwxyfb;
+
+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;
+
+@Entity
+@Table(name="T_YJPT_CGSY")
+public class CgsyEntity extends BaseEntity<Long> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 4505296839386833373L;
+	private Long id;
+	/** 储罐 */
+	private CgEntity cg;
+	/** 温度 */
+	private String zdwd;
+	private String zxwd;
+	/** 压力 */
+	private String zdyl;
+	private String zxyl;
+	/** 液位 */
+	private String zdyw;
+	private String zxyw;
+	@Transient
+	public String getSequenceName() {
+		return Constants.SEQ_T_YJPT_CGSY;
+	}
+	
+	
+    @Id
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CgEntity.class)
+	@JoinColumn(name = "cg")
+	@RemotingExclude
+	public CgEntity getCg() {
+		return cg;
+	}
+	public void setCg(CgEntity cg) {
+		this.cg = cg;
+	}
+	
+	public String getZdwd() {
+		return zdwd;
+	}
+
+
+	public void setZdwd(String zdwd) {
+		this.zdwd = zdwd;
+	}
+
+
+	public String getZxwd() {
+		return zxwd;
+	}
+
+
+	public void setZxwd(String zxwd) {
+		this.zxwd = zxwd;
+	}
+
+
+	public String getZdyl() {
+		return zdyl;
+	}
+
+
+	public void setZdyl(String zdyl) {
+		this.zdyl = zdyl;
+	}
+
+
+	public String getZxyl() {
+		return zxyl;
+	}
+
+
+	public void setZxyl(String zxyl) {
+		this.zxyl = zxyl;
+	}
+
+
+	public String getZdyw() {
+		return zdyw;
+	}
+
+
+	public void setZdyw(String zdyw) {
+		this.zdyw = zdyw;
+	}
+
+
+	public String getZxyw() {
+		return zxyw;
+	}
+
+
+	public void setZxyw(String zxyw) {
+		this.zxyw = zxyw;
+	}
+
+}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/auth/UserService.java

@@ -69,5 +69,9 @@ public interface UserService extends BaseWorkFlowService {
 	public List<UserEntity> findAdmin();
 
 	public List<UserEntity> findUserForTx(Long jyrId);
+	
+	public List<UserEntity> findAdminBySzd(Long szd);
+	
+	public List<UserEntity> findPAdminBySzd(Long szd);
 
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/auth/UserServiceImpl.java

@@ -354,4 +354,14 @@ public class UserServiceImpl extends BaseWorkFlowServiceImpl<UserEntity, Long>
 	public List<UserEntity> findUserForTx(Long jyrId) {
 		return userDao.findUserForTx(jyrId);
 	}
+
+	@Override
+	public List<UserEntity> findAdminBySzd(Long szd) {
+		return userDao.findAdminBySzd(szd);
+	}
+
+	@Override
+	public List<UserEntity> findPAdminBySzd(Long szd) {
+		return userDao.findPAdminBySzd(szd);
+	}
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/jyrxxgl/RyjbxxServiceImpl.java

@@ -119,6 +119,50 @@ public class RyjbxxServiceImpl extends BaseService<RyjbxxEntity, Long>
 		}
 		return ryjbxx;
 	}
+	/**
+	 * 保存记录
+	 * 
+	 * @param jyrxxglEntity
+	 */
+	public RyjbxxEntity save(RyjbxxEntity ryjbxxEntity,
+			List<RyjbxxZSEntity> zsList, List<RyjbxxZSEntity> deleteZsList, Long accId) {
+		RyjbxxEntity ryjbxx = new RyjbxxEntity();
+		ryjbxx = ryjbxxDao.save(ryjbxxEntity);
+		ryjbxxZSDao.delete(deleteZsList);
+		List<AccessoryEntity> fileList = new ArrayList<AccessoryEntity>();
+
+		for (RyjbxxZSEntity zsEntity : zsList) {
+			AccessoryEntity file = null;
+			zsEntity.setRyid(ryjbxxEntity.getSfzh());
+			zsEntity.setByzd5(ryjbxxEntity.getXm());
+			zsEntity.setAddUser(Utils.getCurrentUser());
+			if (null != zsEntity.getAccessory()) {
+				file = accessoryDao.findOne(zsEntity.getAccessory().getId());
+			}
+			fileList.add(file);
+		}
+		zsList = ryjbxxZSDao.save(zsList);
+		List<AccessoryEntity> saveFileList = new ArrayList<AccessoryEntity>();
+		for (int i = 0; i < zsList.size(); i++) {
+			AccessoryEntity file = null;
+			file = fileList.get(i);
+			if (null != file) {
+				file.setEntityId(zsList.get(i).getId());
+				saveFileList.add(file);
+			}
+		}
+		AccessoryEntity file2 = accessoryDao.findOne(accId);
+		file2.setEntityId(ryjbxx.getId());
+		saveFileList.add(file2);
+		saveFileList = accessoryDao.save(saveFileList);
+		// 同步到省级
+		try {
+			saveTbSj(ryjbxx, zsList, deleteZsList, saveFileList);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return ryjbxx;
+	}
 
 	/**
 	 * 根据id查找记录

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/yjgl/zdwxyfb/CgsyServiceImp.java

@@ -0,0 +1,35 @@
+package com.jtgh.yjpt.service.impl.yjgl.zdwxyfb;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.jtgh.yjpt.dao.common.MyRepository;
+import com.jtgh.yjpt.dao.yjgl.zdwxyfb.CgsyDao;
+import com.jtgh.yjpt.entity.yjgl.zdwxyfb.CgEntity;
+import com.jtgh.yjpt.entity.yjgl.zdwxyfb.CgsyEntity;
+import com.jtgh.yjpt.service.BaseService;
+import com.jtgh.yjpt.service.yjgl.zdwxyfb.CgsyService;
+
+@Service
+public class CgsyServiceImp extends BaseService<CgsyEntity, Long> implements
+		CgsyService {
+
+	@Autowired
+	private CgsyDao cgsyDao;
+
+	@Override
+	protected MyRepository<CgsyEntity, Long> getDao() {
+		return cgsyDao;
+	}
+
+	@Override
+	public CgsyEntity findByCg(CgEntity cg) {
+		List<CgsyEntity> list =cgsyDao.findByCg(cg);
+		if(list != null && list.size()>0){
+			return list.get(0);
+		}
+		return null;
+	}
+}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/jyrxxgl/RyjbxxService.java

@@ -48,7 +48,14 @@ public interface RyjbxxService {
 	 * @param jyrxxglEntity
 	 */
 	public RyjbxxEntity save(RyjbxxEntity ryjbxxEntity,
-			List<RyjbxxZSEntity> zsList, List<RyjbxxZSEntity> deleteZsList);
+			List<RyjbxxZSEntity> zsList, List<RyjbxxZSEntity> deleteZsList,Long accId);
+	/**
+	 * 保存记录
+	 * 
+	 * @param jyrxxglEntity
+	 */
+	public RyjbxxEntity save(RyjbxxEntity ryjbxxEntity,
+			List<RyjbxxZSEntity> zsList, List<RyjbxxZSEntity> deleteZsLis);
 
 	/**
 	 * 同步省级

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/yjgl/zdwxyfb/CgsyService.java

@@ -0,0 +1,47 @@
+package com.jtgh.yjpt.service.yjgl.zdwxyfb;
+
+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.yjgl.zdwxyfb.CgEntity;
+import com.jtgh.yjpt.entity.yjgl.zdwxyfb.CgsyEntity;
+
+public interface CgsyService {
+
+	/**
+	 * 分页查询所有记录
+	 * 
+	 * @param spec
+	 * @param page
+	 * @return
+	 */
+	public Page<CgsyEntity> findAll(Specification<CgsyEntity> spec, Pageable page);
+
+	/**
+	 * 保存储罐状态信息
+	 * 
+	 * @param Entity
+	 * @return
+	 */
+	public <S extends CgsyEntity> S save(S Entity);
+
+	/**
+	 * 逻辑删除
+	 * 
+	 * @param entities
+	 */
+	public void logicDelete(Iterable<CgsyEntity> entities);
+
+	public void logicDelete(Long id);
+
+	public List<CgsyEntity> findAll(Specification<CgsyEntity> spec);
+
+	public List<CgsyEntity> findAll(Specification<CgsyEntity> spec, Sort sort);
+	
+	public CgsyEntity findByCg(CgEntity cg);
+
+}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/webService/external/yjgl/cg/CgxxglWebService.java

@@ -0,0 +1,344 @@
+package com.jtgh.yjpt.webService.external.yjgl.cg;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.jws.HandlerChain;
+import javax.jws.WebService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.jtgh.yjpt.common.Constants;
+import com.jtgh.yjpt.common.PredicateModel;
+import com.jtgh.yjpt.common.PredicateModel.Operator;
+import com.jtgh.yjpt.common.SinglePageRequest;
+import com.jtgh.yjpt.common.SpecificationCreater;
+import com.jtgh.yjpt.common.Utils;
+import com.jtgh.yjpt.controller.BaseController;
+import com.jtgh.yjpt.entity.BaseEntity;
+import com.jtgh.yjpt.entity.auth.UserEntity;
+import com.jtgh.yjpt.entity.jyr.JyrEntity;
+import com.jtgh.yjpt.entity.yjgl.zdwxyfb.CgEntity;
+import com.jtgh.yjpt.entity.yjgl.zdwxyfb.CgsyEntity;
+import com.jtgh.yjpt.entity.yjgl.zdwxyfb.CgztEntity;
+import com.jtgh.yjpt.service.yjgl.zdwxyfb.CgService;
+import com.jtgh.yjpt.service.yjgl.zdwxyfb.CgsyService;
+import com.jtgh.yjpt.service.yjgl.zdwxyfb.CgztService;
+import com.jtgh.yjpt.service.yjgl.zdwxyfb.ZbhjjbqkService;
+import com.jtgh.yjpt.webService.WsResult;
+/**
+ * 储罐接口WebService
+ * 
+ * @author chenkf
+ * 
+ */
+@Service
+@WebService(targetNamespace = "http://webService.yjpt.com/", serviceName = "cgxxglService")
+@HandlerChain(file="handle-chain.xml")
+public class CgxxglWebService extends BaseController {
+
+	@Autowired
+	private CgService cgService;
+	@Autowired
+	private ZbhjjbqkService zbhjjbqkService;
+	@Autowired
+	private CgztService cgztService;
+	@Autowired
+	private CgsyService cgsyService;
+
+	/**
+	 * 储罐保存
+	 * @param entity
+	 * @return
+	 */
+	public CgEntity save(CgEntity entity) {
+		if (null == entity.getId() || entity.getId().equals(0l)) {
+			entity.setAddDate(new Date());
+			entity.setAddUser(Utils.getWebServiceUser());
+			entity.setRecordCode("90");
+		} else {
+			entity.setUpdateDate(new Date());
+			entity.setUpdateUser(Utils.getWebServiceUser());
+		}
+		entity = cgService.save(entity);
+		cgService.savetb(entity, null, null);
+		return entity;
+	}
+	
+	/**
+	 * 删除
+	 * @param entity
+	 * @return
+	 */
+	public WsResult delete(CgEntity entity) {
+		WsResult ws = new WsResult();
+		try {
+			cgService.logicDelete(entity.getId());
+			zbhjjbqkService.logicDelete(zbhjjbqkService.findBySscg(entity));
+			ws.setResultCode(WsResult.SUCCESS);
+		} catch (Exception e) {
+			e.printStackTrace();
+			ws.setResultCode(WsResult.FAILURE);
+		}
+		return ws;
+	}
+	
+	/**
+	 * 根据企业和名称查询
+	 * @param jyr
+	 * @param name
+	 * @return
+	 */
+	public CgEntity findByJyrAndName(JyrEntity jyr ,String name){
+		List<CgEntity> list = cgService.findByJyrAndName(jyr,name);
+		if(list!=null&&list.size()>0){
+			return list.get(0);
+		}
+		return null;
+	}
+	
+	/**
+	 * 查询储罐信息
+	 * @param szd
+	 * @param szgq
+	 * @param gkjyr
+	 * @param cgmc
+	 * @return
+	 */
+	public List<CgEntity> findCgByParams(final Long szd,
+			final Long szgq,  final String gkjyr,final String cgmc){
+		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
+		addNotEmptyModel(filterList, "szd.id", szd,
+					Operator.LIKE_R);
+		addNotEmptyModel(filterList, "gq", szgq, Operator.EQ);
+		addNotEmptyModel(filterList, "dwmc", gkjyr, Operator.EQ);
+		addNotEmptyModel(filterList, "cgmc", cgmc, Operator.LIKE);
+		addNotEmptyModel(filterList, "recordStatus",
+				BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
+		if (Utils.getWebServiceUser() != null) {
+			UserEntity user = Utils.getWebServiceUser();
+			// 经营人只能查自己的
+			if (Constants.YES.equals(user.getSfjyr())
+					&& user.getJyrjcxx() != null) {
+				addNotEmptyModel(filterList, "dwmc", user.getJyrjcxx(),
+						Operator.EQ);
+			} else {
+				// 行政人员根据权限过滤(危货列表菜单ID=26)
+				addRecordCodeFilter(19l, filterList);
+			}
+		}
+		Specification<CgEntity> spec = SpecificationCreater
+				.searchByPredicateModels(filterList);
+		List<CgEntity> list= cgService.findAll(spec);
+		return list;
+	}
+	
+	/**
+	 * 分页查询储罐信息
+	 * @param szd
+	 * @param szgq
+	 * @param gkjyr
+	 * @param cgmc
+	 * @param n
+	 * @param pageCount
+	 * @return
+	 */
+	public List<CgEntity> getCgPageListByParams(final Long szd,
+			final Long szgq,  final String gkjyr,final String cgmc,int n, int pageCount){
+		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
+		addNotEmptyModel(filterList, "szd.id", szd,
+					Operator.LIKE_R);
+		addNotEmptyModel(filterList, "gq", szgq, Operator.EQ);
+		addNotEmptyModel(filterList, "dwmc", gkjyr, Operator.EQ);
+		addNotEmptyModel(filterList, "cgmc", cgmc, Operator.LIKE);
+		addNotEmptyModel(filterList, "recordStatus",
+				BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
+		if (Utils.getWebServiceUser() != null) {
+			UserEntity user = Utils.getWebServiceUser();
+			// 经营人只能查自己的
+			if (Constants.YES.equals(user.getSfjyr())
+					&& user.getJyrjcxx() != null) {
+				addNotEmptyModel(filterList, "dwmc", user.getJyrjcxx(),
+						Operator.EQ);
+			} else {
+				// 行政人员根据权限过滤(危货列表菜单ID=26)
+				addRecordCodeFilter(19l, filterList);
+			}
+		}
+		Specification<CgEntity> spec = SpecificationCreater
+				.searchByPredicateModels(filterList);
+		SinglePageRequest page = new SinglePageRequest(pageCount, n, "desc",
+				"id");
+		Page<CgEntity> list= cgService.findAll(spec,page);
+		if(list==null||list.getTotalPages()<pageCount){
+			return  new ArrayList<CgEntity>();
+		}
+		return list.getContent();
+	}
+	
+	
+	/**
+	 * 保存储罐状态
+	 * @param entity
+	 * @return
+	 */
+	public CgztEntity saveCgzt(CgztEntity entity)
+	{
+		if (null == entity.getId() || entity.getId().equals(0l)) {
+			entity.setAddDate(new Date());
+			entity.setAddUser(Utils.getWebServiceUser());
+			entity.setRecordCode("90");
+		} else {
+			entity.setUpdateDate(new Date());
+			entity.setUpdateUser(Utils.getWebServiceUser());
+		}
+		entity.setZt("1");
+		if(entity.getCg()!=null){
+			CgsyEntity cgsy = cgsyService.findByCg(entity.getCg());
+			if(cgsy!=null){
+				if (null != cgsy.getZdwd()
+						&& !"".equals(cgsy.getZdwd().trim())
+						&& null != entity.getWd()
+						&& !"".equals(cgsy.getZdwd().trim())
+						&& Double.parseDouble(entity.getWd()) > Double
+								.parseDouble(cgsy.getZdwd())) {
+					entity.setZt("2");
+				}
+				if (null != cgsy.getZxwd()
+						&& !"".equals(cgsy.getZxwd().trim())
+						&& null != entity.getWd()
+						&& !"".equals(cgsy.getZxwd().trim())
+						&& Double.parseDouble(entity.getWd()) < Double
+								.parseDouble(cgsy.getZxwd())) {
+					entity.setZt("2");
+				}
+				if (null != cgsy.getZdyl()
+						&& !"".equals(cgsy.getZdyl().trim())
+						&& null != entity.getYl()
+						&& !"".equals(cgsy.getZdyl().trim())
+						&& Double.parseDouble(entity.getYl()) > Double
+								.parseDouble(cgsy.getZdyl())) {
+					entity.setZt("2");
+				}
+				if (null != cgsy.getZxyl()
+						&& !"".equals(cgsy.getZxyl().trim())
+						&& null != entity.getYl()
+						&& !"".equals(cgsy.getZxyl().trim())
+						&& Double.parseDouble(entity.getYl()) <Double
+								.parseDouble(cgsy.getZxyl())) {
+					entity.setZt("2");
+				}
+				if (null != cgsy.getZdyw()
+						&& !"".equals(cgsy.getZdyw().trim())
+						&& null != entity.getYw()
+						&& !"".equals(cgsy.getZdyw().trim())
+						&& Double.parseDouble(entity.getYw()) > Double
+								.parseDouble(cgsy.getZdyw())) {
+					entity.setZt("2");
+				}
+				if (null != cgsy.getZxyw()
+						&& !"".equals(cgsy.getZxyw().trim())
+						&& null != entity.getYw()
+						&& !"".equals(cgsy.getZxyw().trim())
+						&& Double.parseDouble(entity.getYw()) < Double
+								.parseDouble(cgsy.getZxyw())) {
+					entity.setZt("2");
+				}
+			}
+		}
+		entity = cgztService.save(entity);
+		return entity;
+	}
+	
+	
+	/**
+	 * 获取储罐 
+	 * @param entity
+	 * @param hz
+	 * @param tbsj1
+	 * @param tbsj2
+	 * @return
+	 */
+	public List<CgztEntity> findCgztByParams(CgEntity entity,String hz,Date tbsj1,Date tbsj2){
+		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
+		//所属储罐
+		addNotEmptyModel(filterList, "cg", entity.getId(), Operator.EQ);
+		//货种
+		addNotEmptyModel(filterList, "hz", hz, Operator.LIKE);
+		//填报时间
+		if(tbsj1!=null){
+			addNotEmptyModel(filterList, "tbsj", Utils.getDateFirstTime(tbsj1), Operator.GTE);
+		}
+		if(tbsj2!=null){
+			addNotEmptyModel(filterList, "tbsj", Utils.getDateLastTime(tbsj2), Operator.LTE);
+		}
+		addNotEmptyModel(filterList, "recordStatus",
+				BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
+		Specification<CgztEntity> spec = SpecificationCreater
+				.searchByPredicateModels(filterList);
+		List<CgztEntity> list= cgztService.findAll(spec);
+		return  list;
+	}
+	
+	/**
+	 * 获取最新状态
+	 * @param cg
+	 * @return
+	 */
+	public CgztEntity findCgztByCg(CgEntity cg){
+		return cgztService.findByCg(cg);
+	}
+	
+	/**
+	 * 保存储罐适用范围
+	 * @param entity
+	 * @return
+	 */
+	public  CgsyEntity saveCgsy(CgsyEntity entity){
+		if (null == entity.getId() || entity.getId().equals(0l)) {
+			entity.setAddDate(new Date());
+			entity.setAddUser(Utils.getWebServiceUser());
+			entity.setRecordCode("90");
+		} else {
+			entity.setUpdateDate(new Date());
+			entity.setUpdateUser(Utils.getWebServiceUser());
+		}
+		entity = cgsyService.save(entity);
+		return entity;
+	}
+	
+	/**
+	 * 获取储罐的适用范围
+	 * @param cg
+	 * @return
+	 */
+	public CgsyEntity findCgsyByCg(CgEntity cg){
+		return  cgsyService.findByCg(cg);
+	}
+
+	/**
+	 * 储罐保存
+	 * @param entity
+	 * @return
+	 */
+	public CgEntity saveCg(CgEntity entity,CgsyEntity cgsy) {
+		entity = save(entity);
+		cgsy.setCg(entity);
+		saveCgsy(cgsy);
+		return entity;
+	}
+	
+	/**
+	 * 获取储罐详细信息
+	 * @param id
+	 * @return
+	 */
+	public CgEntity findCgById(Long id){
+		return cgService.findOne(id);
+	}	
+	
+}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/webService/zyfzbl/ZyfzblWebService.java

@@ -13,10 +13,10 @@ import org.springframework.stereotype.Service;
 
 import com.jtgh.yjpt.common.Constants;
 import com.jtgh.yjpt.common.PredicateModel;
+import com.jtgh.yjpt.common.PredicateModel.Operator;
 import com.jtgh.yjpt.common.SinglePageRequest;
 import com.jtgh.yjpt.common.SpecificationCreater;
 import com.jtgh.yjpt.common.Utils;
-import com.jtgh.yjpt.common.PredicateModel.Operator;
 import com.jtgh.yjpt.controller.BaseController;
 import com.jtgh.yjpt.dao.jlrxxgl.GlzdxxDao;
 import com.jtgh.yjpt.dao.jyrxxgl.RyjbxxDao;
@@ -155,6 +155,9 @@ public class ZyfzblWebService extends BaseController {
 						count, "desc", "id");
 				Page<GkwxhwzyfzblhhzEntity> list = gkwxhwzyfzblhhzService
 						.findAll(spec, page);
+				if(list==null||list.getTotalPages()<pageCount){
+					return  new ArrayList<GkwxhwzyfzblhhzEntity>();
+				}
 				return list.getContent();
 			}
 			String szd = "";
@@ -177,6 +180,9 @@ public class ZyfzblWebService extends BaseController {
 						count, "desc", "id");
 				Page<GkwxhwzyfzblhhzEntity> list = gkwxhwzyfzblhhzService
 						.findAll(spec, page);
+				if(list==null||list.getTotalPages()<pageCount){
+					return  new ArrayList<GkwxhwzyfzblhhzEntity>();
+				}
 				return list.getContent();
 			}
 		} catch (Exception e) {
@@ -241,6 +247,9 @@ public class ZyfzblWebService extends BaseController {
 					"desc", "id");
 			Page<GkwxhwzyfzblhhzEntity> list = gkwxhwzyfzblhhzService.findAll(
 					spec, page);
+			if(list==null||list.getTotalPages()<pageCount){
+				return  new ArrayList<GkwxhwzyfzblhhzEntity>();
+			}
 			return list.getContent();
 		} catch (Exception e) {
 			e.printStackTrace();

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/webService/zysqbp/WhsqbpWebService.java

@@ -171,6 +171,9 @@ public class WhsqbpWebService extends BaseController {
 			SinglePageRequest page = new SinglePageRequest(pageCount, count,
 					"desc", "bgsj");
 			Page<ZysqbpEntity> list = zysqbpService.findAll(spec, page);
+			if(list==null||list.getTotalPages()<pageCount){
+				return  new ArrayList<ZysqbpEntity>();
+			}
 			return list.getContent();
 		}
 		return null;
@@ -247,6 +250,9 @@ public class WhsqbpWebService extends BaseController {
 		SinglePageRequest page = new SinglePageRequest(pageCount, n, "desc",
 				"bgsj");
 		Page<ZysqbpEntity> list = zysqbpService.findAll(spec, page);
+		if(list==null||list.getTotalPages()<pageCount){
+			return  new ArrayList<ZysqbpEntity>();
+		}
 		return list.getContent();
 	}
 

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

@@ -58,7 +58,7 @@ btn.wharf=\u5371\u8d27\u4f01\u4e1a\u4fe1\u606f\u7edf\u8ba1
 btn.storage=\u5b58\u50a8\u8bbe\u65bd\u4fe1\u606f\u7edf\u8ba1
 btn.administrative=\u6cd5\u4eba\u884c\u653f\u8bb8\u53ef
 btn.message=\u6d88\u606f\u7ba1\u7406
-btn.status=\u72b6\u6001
+btn.status=\u50a8\u7f50\u4fe1\u606f\u76d1\u63a7
 
 col.code=\u7f16\u7801
 col.id=ID

gkaq/yjpt-java/trunk/locale/zh_CN/module.properties

@@ -54,7 +54,7 @@ m002002003_c=\u5e94\u6025\u6f14\u7ec3\u586b\u62a5
 m002002_c=\u5e94\u6025\u57f9\u8bad\u3001\u6f14\u7ec3\u548c\u6f14\u4e60\u586b\u62a5
 m002005=\u4e8b\u6545\u6848\u4f8b\u7ba1\u7406
 m002005_c=\u4e8b\u6545\u6848\u4f8b\u586b\u62a5
-m002007=\u91cd\u5927\u5371\u9669\u6e90\u5f55\u5165
+m002007=\u50a8\u7f50\u4fe1\u606f\u7ba1\u7406
 m002007001=\u4fe1\u606f\u5f55\u5165
 m002007001_c=\u4fe1\u606f\u5f55\u5165
 m002007_c=\u50a8\u7f50\u4fe1\u606f\u586b\u62a5

gkaq/yjpt-java/trunk/resources/spring/application.properties

@@ -1,19 +1,17 @@
 #***************************************  jdbc info  ********************************************#
 jdbc.driver                 = oracle.jdbc.driver.OracleDriver
-jdbc.url                      = jdbc:oracle:thin:@10.1.30.104:1521:	jttjjc
-jdbc.username           = yjpttest
+jdbc.url                      = jdbc:oracle:thin:@192.168.39.115:1521:orcl
+jdbc.username           = yjptlyg
 jdbc.password            = yjpt
 hibernate.dialect        = org.hibernate.dialect.Oracle10gDialect
 #********************************** qlyg jdbc info**********************************************#
 jdbc.qlyg.url               = jdbc:oracle:thin:@192.168.39.115:1521:orcl
 jdbc.qlyg.username    = jsgk
 jdbc.qlyg.password     = jsgk
-
 #********************************** xzzx jdbc info**********************************************#
 jdbc.xzzx.url               = jdbc:oracle:thin:@192.168.39.115:1521:orcl
 jdbc.xzzx.username    = xzzx
 jdbc.xzzx.password     = xzzx
-
 #dbcp settings
 dbcp.maxIdle=30
 dbcp.minIdle=5
@@ -23,7 +21,7 @@ hibernate.hbm2ddl.auto=
 
 
 # local WebService
-web.service.url=localhost
+web.service.url=192.168.57.40
 web.service.port=8088
 
 # Province WebService 
@@ -34,7 +32,7 @@ web.province.service.port=8089
 zysb.time=7
 ##\u6e2f\u53e3\u7ecf\u8425\u8bb8\u53ef\u8bc1\u6709\u6548\u671f\u8fc7\u671f \uff0c\u63d0\u524d\u591a\u5c11\u5929\u63d0\u9192
 jyr.gkyxq=7
-#\u7981\u6b62\u4f5c\u4e1a\u63d0\u9192\u53d1\u9001\u7684\u89d2\u8272\u7c7b\u578b-\u5ba1\u67e5004
+# \u53d1\u9001\u201c\u7981\u6b62\u4f5c\u4e1a\u201d\u63d0\u9192\u7684\u89d2\u8272\u7c7b\u578b-\u5ba1\u67e5004
 jyr.jzzy.roleType=004
 #\u4f5c\u4e1a\u7533\u62a5\u7248\u672c\u65f6\u95f4YYYYMMDD
 zysb.version.date=20150508

gkaq/yjpt-java/trunk/resources/spring/applicationContext-datachange.xml

@@ -69,7 +69,7 @@
 				<!-- 001=1 -->
 				<entry key="1" value-ref="entityManagerFactory-qlyg" />
 				<!-- 010=2 -->
-				<!--<entry key="2" value-ref="entityManagerFactory-xzzx" />-->
+				<entry key="2" value-ref="entityManagerFactory-xzzx" />
 				<!-- 100=4 -->
 			</map>
 		</property>

gkaq/yjpt-java/trunk/resources/spring/applicationContext.xml

@@ -263,7 +263,7 @@
 	<!-- 应急管理模块 -->
 	<bean id="yjglSynTimerTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">  
        <property name="jobDetail" ref="yjglSynTimerjobDetail"/>  
-       <property name="cronExpression" value="0 30 2 * * ?"/>
+       <property name="cronExpression" value="0 24 12 * * ?"/>
 	</bean>  
 	<bean id="yjglSynTimerjobDetail" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">   
         <property name="targetObject" ref="yjglSynTimer"/>  

gkaq/yjpt-java/trunk/resources/sql/init/1.table.sql

@@ -9743,4 +9743,101 @@ comment on column T_YJPT_JZXYSBHZ.id
   is '经营人';
   comment on column T_YJPT_JZXYSBHZ.bz
   is '备注'; 
-  
+  
+ --储罐状态 
+  CREATE TABLE t_yjpt_cgzt (
+	ID NUMBER NOT NULL,
+	hz VARCHAR2 (100),
+	cg NUMBER,
+	wd VARCHAR2 (20),
+	yw VARCHAR2 (20),
+	tbsj DATE,
+	add_user VARCHAR2 (50),
+	add_date TIMESTAMP (6),
+	update_user VARCHAR2 (50),
+	update_date TIMESTAMP (6),
+	record_status NUMBER DEFAULT 1,
+	sftb CHAR (1),
+	tbzt CHAR (1),
+	tbdyid NUMBER,
+	qylb CHAR (1),
+	ssqy NUMBER,
+	record_code VARCHAR2 (30),
+	byzd1 VARCHAR2 (100),
+	byzd2 VARCHAR2 (100),
+	byzd3 VARCHAR2 (100),
+	byzd4 VARCHAR2 (100),
+	byzd5 VARCHAR2 (100),
+	szd NUMBER
+);
+COMMENT ON TABLE t_yjpt_cgzt IS '储罐状态';
+COMMENT ON COLUMN t_yjpt_cgzt. ID IS '主键';
+COMMENT ON COLUMN t_yjpt_cgzt.hz IS '货种';
+COMMENT ON COLUMN t_yjpt_cgzt.cg IS '储罐';
+COMMENT ON COLUMN t_yjpt_cgzt.wd IS '温度';
+COMMENT ON COLUMN t_yjpt_cgzt.yw IS '液位';
+COMMENT ON COLUMN t_yjpt_cgzt.tbsj IS '填报时间';
+COMMENT ON COLUMN t_yjpt_cgzt.add_user IS '创建人';
+COMMENT ON COLUMN t_yjpt_cgzt.add_date IS '创建时间';
+COMMENT ON COLUMN t_yjpt_cgzt.update_user IS '修改人';
+COMMENT ON COLUMN t_yjpt_cgzt.update_date IS '修改时间';
+COMMENT ON COLUMN t_yjpt_cgzt.record_status IS '状态';
+COMMENT ON COLUMN t_yjpt_cgzt.record_code IS '角色编码';
+COMMENT ON COLUMN t_yjpt_cgzt.sftb IS '是否同步 Y或者N';
+COMMENT ON COLUMN t_yjpt_cgzt.tbzt IS '同步状态 已同步Y， 未同步N';
+COMMENT ON COLUMN t_yjpt_cgzt.tbdyid IS '同步对应ID';
+COMMENT ON COLUMN t_yjpt_cgzt.qylb IS '区域类别，省级还是市级';
+COMMENT ON COLUMN t_yjpt_cgzt.ssqy IS '所属区域，关联组织架构表的主键';
+COMMENT ON COLUMN t_yjpt_cgzt.szd IS '所在地';
+ALTER TABLE t_yjpt_cgzt ADD CONSTRAINT t_yjpt_cgzt_pk PRIMARY KEY (ID);
+
+--储罐适用范围 
+CREATE TABLE T_YJPT_CGSY (
+	ID NUMBER NOT NULL,
+	cg NUMBER,
+	zdwd VARCHAR2 (20),
+	zdyl VARCHAR2 (20),
+	zdyw VARCHAR2 (20),
+	zxwd VARCHAR2 (20),
+	zxyl VARCHAR2 (20),
+	zxyw VARCHAR2 (20),
+	add_user VARCHAR2 (50),
+	add_date TIMESTAMP (6),
+	update_user VARCHAR2 (50),
+	update_date TIMESTAMP (6),
+	record_status NUMBER DEFAULT 1,
+	sftb CHAR (1),
+	tbzt CHAR (1),
+	tbdyid NUMBER,
+	qylb CHAR (1),
+	ssqy NUMBER,
+	record_code VARCHAR2 (30),
+	byzd1 VARCHAR2 (100),
+	byzd2 VARCHAR2 (100),
+	byzd3 VARCHAR2 (100),
+	byzd4 VARCHAR2 (100),
+	byzd5 VARCHAR2 (100),
+	szd NUMBER
+);
+COMMENT ON TABLE T_YJPT_CGSY IS '储罐适用范围';
+COMMENT ON COLUMN T_YJPT_CGSY. ID IS '主键';
+COMMENT ON COLUMN T_YJPT_CGSY.cg IS '储罐';
+COMMENT ON COLUMN T_YJPT_CGSY.zdwd IS '最大温度';
+COMMENT ON COLUMN T_YJPT_CGSY.zdyw IS '最大液位';
+COMMENT ON COLUMN T_YJPT_CGSY.zdyl IS '最大压力';
+COMMENT ON COLUMN T_YJPT_CGSY.zxwd IS '最小温度';
+COMMENT ON COLUMN T_YJPT_CGSY.zxyw IS '最小液位';
+COMMENT ON COLUMN T_YJPT_CGSY.zxyl IS '最小压力';
+COMMENT ON COLUMN T_YJPT_CGSY.add_user IS '创建人';
+COMMENT ON COLUMN T_YJPT_CGSY.add_date IS '创建时间';
+COMMENT ON COLUMN T_YJPT_CGSY.update_user IS '修改人';
+COMMENT ON COLUMN T_YJPT_CGSY.update_date IS '修改时间';
+COMMENT ON COLUMN T_YJPT_CGSY.record_status IS '状态';
+COMMENT ON COLUMN T_YJPT_CGSY.record_code IS '角色编码';
+COMMENT ON COLUMN T_YJPT_CGSY.sftb IS '是否同步 Y或者N';
+COMMENT ON COLUMN T_YJPT_CGSY.tbzt IS '同步状态 已同步Y， 未同步N';
+COMMENT ON COLUMN T_YJPT_CGSY.tbdyid IS '同步对应ID';
+COMMENT ON COLUMN T_YJPT_CGSY.qylb IS '区域类别，省级还是市级';
+COMMENT ON COLUMN T_YJPT_CGSY.ssqy IS '所属区域，关联组织架构表的主键';
+COMMENT ON COLUMN T_YJPT_CGSY.szd IS '所在地';
+ALTER TABLE T_YJPT_CGSY ADD CONSTRAINT T_YJPT_CGSY_pk PRIMARY KEY (ID);

gkaq/yjpt-java/trunk/resources/sql/init/2.seq-create.sql.ftl

@@ -114,4 +114,6 @@ CREATE SEQUENCE SEQ_T_YJPT_WXHWGKZYZB MINVALUE ${seqMinvalue} MAXVALUE ${seqMaxv
 CREATE SEQUENCE SEQ_T_YJPT_DCZXJC MINVALUE ${seqMinvalue} MAXVALUE ${seqMaxvalue} INCREMENT BY 1 START WITH ${seqStartWith} CACHE ${seqCache} NOORDER NOCYCLE;
 CREATE SEQUENCE SEQ_T_YJPT_GG_VIEW MINVALUE ${seqMinvalue} MAXVALUE ${seqMaxvalue} INCREMENT BY 1 START WITH ${seqStartWith} CACHE ${seqCache} NOORDER NOCYCLE;
 CREATE SEQUENCE SEQ_T_YJPT_JYRSHXX MINVALUE ${seqMinvalue} MAXVALUE ${seqMaxvalue} INCREMENT BY 1 START WITH ${seqStartWith} CACHE ${seqCache} NOORDER NOCYCLE;
-CREATE SEQUENCE SEQ_T_YJPT_JZXYSBHZ MINVALUE ${seqMinvalue} MAXVALUE ${seqMaxvalue} INCREMENT BY 1 START WITH ${seqStartWith} CACHE ${seqCache} NOORDER NOCYCLE;
+CREATE SEQUENCE SEQ_T_YJPT_JZXYSBHZ MINVALUE ${seqMinvalue} MAXVALUE ${seqMaxvalue} INCREMENT BY 1 START WITH ${seqStartWith} CACHE ${seqCache} NOORDER NOCYCLE;
+CREATE SEQUENCE SEQ_T_YJPT_CGZT MINVALUE ${seqMinvalue} MAXVALUE ${seqMaxvalue} INCREMENT BY 1 START WITH ${seqStartWith} CACHE ${seqCache} NOORDER NOCYCLE;
+CREATE SEQUENCE SEQ_T_YJPT_CGSY MINVALUE ${seqMinvalue} MAXVALUE ${seqMaxvalue} INCREMENT BY 1 START WITH ${seqStartWith} CACHE ${seqCache} NOORDER NOCYCLE;

gkaq/yjpt-java/trunk/resources/sql/init/3.T_YJPT_BUTTON.sql.ftl

@@ -1,4 +1,4 @@
---按钮T_YJPT_BUTTON
+--按钮T_YJPT_BUTTON
 delete from T_YJPT_BUTTON;
 Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (101,${szdId},2,'btn.add','add',1,1,null,null,null,null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (102,${szdId},2,'btn.edit','edit',2,1,null,null,null,null,null,'0',null,null,null,null,null);
@@ -116,11 +116,12 @@ Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,
 Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (230,${szdId},42,'btn.edit','edit',2,1,null,null,null,null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (231,${szdId},42,'btn.del','del',3,1,null,null,null,null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (232,${szdId},42,'btn.view','view',4,1,null,null,null,null,null,'0',null,null,null,null,null);
-Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (234, ${szdId}, '42', 'btn.check', 'check', 6, 1,null,null,null,null,null,null,null,null,null,null,null);
+Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (234,${szdId},42,'btn.check','check',6,1,null,null,null,null,null,null,null,null,null,null,null);
 Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (235,${szdId},26,'btn.qxzy','qxzy',12,1,null,null,null,null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (236,${szdId},26,'btn.bgzy','bgzy',13,1,null,null,null,null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (237,${szdId},26,'btn.displayhs','displayhs',14,1,null,null,null,null,null,'0',null,null,null,null,null);
-Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (238, ${szdId},26, 'btn.fz', 'copy', 15, 1,null,null,null,null,null,'0',null,null,null,null,null);
+Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (238,${szdId},26,'btn.fz','copy',15,1,null,null,null,null,null,'0',null,null,null,null,null);
+Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (239,${szdId},19,'btn.status','status',6,1,null,null,null,null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (555,${szdId},29,'btn.link','link',5,1,null,null,null,null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (3150,${szdId},46,'btn.add','add',1,1,null,null,null,null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (3151,${szdId},46,'btn.edit','edit',2,1,null,null,null,null,null,'0',null,null,null,null,null);
@@ -250,10 +251,11 @@ Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,
 Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (100230,${szdId},100042,'btn.edit','edit',2,1,null,null,null,null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (100231,${szdId},100042,'btn.del','del',3,1,null,null,null,null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (100232,${szdId},100042,'btn.view','view',4,1,null,null,null,null,null,'0',null,null,null,null,null);
-Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (100233, ${szdId},100042, 'btn.check', 'check', 5, 1 ,null,null,null,null,null,null,null,null,null,null,null);
+Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (100233,${szdId},100042,'btn.check','check', 5, 1 ,null,null,null,null,null,null,null,null,null,null,null);
 Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (100234,${szdId},100026,'btn.qxzy','qxzy',6,1,null,null,null,null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (100235,${szdId},100026,'btn.bgzy','bgzy',7,1,null,null,null,null,null,'0',null,null,null,null,null);
-Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (100236, ${szdId},100026, 'btn.fz', 'copy', 9, 1,null,null,null,null,null,'0',null,null,null,null,null);
+Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (100236,${szdId},100026,'btn.fz' 'copy', 9, 1,null,null,null,null,null,'0',null,null,null,null,null);
+Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (100239,${szdId},100019,'btn.status','status',5,1,null,null,null,null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (103150,${szdId},100046,'btn.add','add',1,1,null,null,null,null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (103151,${szdId},100046,'btn.edit','edit',2,1,null,null,null,null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (103152,${szdId},100046,'btn.del','del',3,1,null,null,null,null,null,'0',null,null,null,null,null);

gkaq/yjpt-java/trunk/resources/sql/init/6.T_YJPT_GGDM.sql

@@ -5,7 +5,11 @@ Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_US
 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 (4,null,'QYLX',null,1,'qyxz.mtqy',null,null,null,null,1,null,null,null,null,null,null,null,null,'0',null,null,null,null,null);
 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 (2201,null,'SYLX',null,1,'SYLX.HL',null,null,null,null,1,null,null,null,null,null,' 水域类型.内河',null,null,'0',null,null,null,null,null);
 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 (2202,null,'SYLX',null,2,'SYLX.YH',null,null,null,null,1,null,null,null,null,null,' 水域类型.沿海',null,null,'0',null,null,null,null,null);
-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 (2203,null,'SYLX',null,2,'SYLX.YJ',null,null,null,null,1,null,null,null,null,null,' 水域类型.沿江',null,null,'0',null,null,null,null,null);
+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 (2203,null,'SYLX',null,3,'SYLX.YJ',null,null,null,null,1,null,null,null,null,null,' 水域类型.沿江',null,null,'0',null,null,null,null,null);
+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 (2204,null,'SXLX',null,1,'SXLX.CJGL',null,null,null,null,1,null,null,null,null,null,' 长江干流',null,null,'0',null,null,null,null,null);
+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 (2205,null,'SXLX',null,2,'SXLX.HHSX',null,null,null,null,1,null,null,null,null,null,' 淮河水系',null,null,'0',null,null,null,null,null);
+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 (2206,null,'SXLX',null,3,'SXLX.CJZL',null,null,null,null,1,null,null,null,null,null,' 长江支流',null,null,'0',null,null,null,null,null);
+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 (22076,null,'SXLX',null,4,'SXLX.QTSX',null,null,null,null,1,null,null,null,null,null,' 其他水系',null,null,'0',null,null,null,null,null);
 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 (10501,null,'HWXS','null',1,'T_YJPT_WXHWGKZYSBD_BJL',null,null,null,null,1,null,null,null,null,null,'包件类',null,null,'0',null,null,null,null,null);
 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 (10502,null,'HWXS','null',2,'T_YJPT_WXHWGKZYSBD_ZXSHRQ',null,null,null,null,1,null,null,null,null,null,'中型散货容器',null,null,'0',null,null,null,null,null);
 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 (10503,null,'HWXS','null',3,'T_YJPT_WXHWGKZYSBD_JZX',null,null,null,null,1,null,null,null,null,null,'集装箱',null,null,'0',null,null,null,null,null);
@@ -365,6 +369,7 @@ Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_US
 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 (10000362,null,'null','FJSSLX',30,'T_QLYG_APPLY_PROCESS',null,null,null,null,1,null,null,null,null,null,'权力阳光办件过程信息',null,null,'0',null,null,null,null,null);
 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 (10000363,null,'null','FJSSLX',31,'T_QLYG_APPLY_RESULT',null,null,null,null,1,null,null,null,null,null,'权力阳光办件结果信息',null,null,'0',null,null,null,null,null);
 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 (10000365,null,'null','FJSSLX',6,'T_YJPT_JSFXXWH',null,null,null,null,1,null,null,null,null,null,'建设方信息维护',null,null,'0',null,null,null,null,null);
+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 (10000366,null,'null','FJSSLX',6,'T_YJPT_JYRDRYXX',null,null,null,null,1,null,null,null,null,null,'人员基本信息',null,null,'0',null,null,null,null,null);
 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 (10000401,null,'WXHWPM','null',1,'T_YJPT_WXHWGKZYSBD_WXHWPM',null,null,null,null,1,null,null,null,null,null,'危险货物品名',null,null,'0',null,null,null,null,null);
 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 (10000402,10000401,'null','WXHWPM',1,'T_YJPT_WXHWGKZYSBD_BZP',null,null,null,null,1,null,null,null,null,null,'爆炸品',null,null,'0',null,null,null,null,null);
 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 (10000403,10000402,'null','WXHWPM',1,'T_YJPT_WXHWGKZYSBD_JYBZWXWP',null,null,null,null,1,null,null,null,null,null,'具有整体爆炸危险的物质和物品',null,null,'0',null,null,null,null,null);
@@ -1095,6 +1100,7 @@ Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,RECORD_STATUS,BZ,RECORD_COD
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE,BYZD1) values (320381,320300,'XZQH','320381',320381,'新沂市',1,'新沂市','0','2');
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE,BYZD1) values (320382,320300,'XZQH','320382',320382,'邳州市',1,'邳州市','0','2');
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE,BYZD1) values (320400,320000,'XZQH','320400',320400,'常州市',1,'常州市','0','1');
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE,BYZD1) values (320402,320400,'XZQH','320402',320402,'天宁区',1,'天宁区','0','2');
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE,BYZD1) values (320404,320400,'XZQH','320404',320404,'钟楼区',1,'钟楼区','0','2');
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE,BYZD1) values (320405,320400,'XZQH','320405',320405,'戚墅堰区',1,'戚墅堰区','0','2');
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE,BYZD1) values (320411,320400,'XZQH','320411',320411,'新北区',1,'新北区','0','2');
@@ -1175,7 +1181,7 @@ Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,RECORD_STATUS,BZ,RECORD_COD
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE,BYZD1) values (321322,321300,'XZQH','321322',321322,'沭阳县',1,'沭阳县','0','2');
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE,BYZD1) values (321323,321300,'XZQH','321323',321323,'泗阳县',1,'泗阳县','0','2');
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE,BYZD1) values (321324,321300,'XZQH','321324',321324,'泗洪县',1,'泗洪县','0','2');
-Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE,BYZD1) values (320401320402,320400,'XZQH','320402',320402,'天宁区',1,'天宁区','0','2');
+
 
 -- 毒性等级
 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)

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

@@ -8518,3 +8518,130 @@ SELECT ROLE,100235 FROM T_YJPT_ROLE_BUTTON WHERE BUTTON=100177;
 INSERT INTO T_YJPT_ROLE_BUTTON(ROLE, BUTTON)
 SELECT ROLE,100236 FROM T_YJPT_ROLE_BUTTON WHERE BUTTON=100177;
 </#if>
+
+<#if versionDate?date("yyyyMMdd") lt "20160702"?date("yyyyMMdd") >
+--储罐状态
+CREATE TABLE t_yjpt_cgzt (
+	ID NUMBER NOT NULL,
+	hz VARCHAR2 (100),
+	cg NUMBER,
+	wd VARCHAR2 (20),
+	yl VARCHAR2 (20),
+	yw VARCHAR2 (20),
+	zt CHAR(1),
+	tbsj DATE,
+	add_user VARCHAR2 (50),
+	add_date TIMESTAMP (6),
+	update_user VARCHAR2 (50),
+	update_date TIMESTAMP (6),
+	record_status NUMBER DEFAULT 1,
+	sftb CHAR (1),
+	tbzt CHAR (1),
+	tbdyid NUMBER,
+	qylb CHAR (1),
+	ssqy NUMBER,
+	record_code VARCHAR2 (30),
+	byzd1 VARCHAR2 (100),
+	byzd2 VARCHAR2 (100),
+	byzd3 VARCHAR2 (100),
+	byzd4 VARCHAR2 (100),
+	byzd5 VARCHAR2 (100),
+	szd NUMBER
+);
+COMMENT ON TABLE t_yjpt_cgzt IS '储罐状态';
+COMMENT ON COLUMN t_yjpt_cgzt. ID IS '主键';
+COMMENT ON COLUMN t_yjpt_cgzt.hz IS '货种';
+COMMENT ON COLUMN t_yjpt_cgzt.cg IS '储罐';
+COMMENT ON COLUMN t_yjpt_cgzt.wd IS '温度';
+COMMENT ON COLUMN t_yjpt_cgzt.yw IS '液位';
+COMMENT ON COLUMN t_yjpt_cgzt.yl IS '压力';
+COMMENT ON COLUMN t_yjpt_cgzt.zt IS '状态';
+COMMENT ON COLUMN t_yjpt_cgzt.tbsj IS '填报时间';
+COMMENT ON COLUMN t_yjpt_cgzt.add_user IS '创建人';
+COMMENT ON COLUMN t_yjpt_cgzt.add_date IS '创建时间';
+COMMENT ON COLUMN t_yjpt_cgzt.update_user IS '修改人';
+COMMENT ON COLUMN t_yjpt_cgzt.update_date IS '修改时间';
+COMMENT ON COLUMN t_yjpt_cgzt.record_status IS '状态';
+COMMENT ON COLUMN t_yjpt_cgzt.record_code IS '角色编码';
+COMMENT ON COLUMN t_yjpt_cgzt.sftb IS '是否同步 Y或者N';
+COMMENT ON COLUMN t_yjpt_cgzt.tbzt IS '同步状态 已同步Y， 未同步N';
+COMMENT ON COLUMN t_yjpt_cgzt.tbdyid IS '同步对应ID';
+COMMENT ON COLUMN t_yjpt_cgzt.qylb IS '区域类别，省级还是市级';
+COMMENT ON COLUMN t_yjpt_cgzt.ssqy IS '所属区域，关联组织架构表的主键';
+COMMENT ON COLUMN t_yjpt_cgzt.szd IS '所在地';
+ALTER TABLE t_yjpt_cgzt ADD CONSTRAINT t_yjpt_cgzt_pk PRIMARY KEY (ID);
+CREATE SEQUENCE SEQ_T_YJPT_CGZT MINVALUE ${seqMinvalue} MAXVALUE ${seqMaxvalue} INCREMENT BY 1 START WITH ${seqStartWith} CACHE ${seqCache} NOORDER NOCYCLE;
+--增加储罐状态按钮
+Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (239,90013,19,'btn.status','status',6,1,null,null,null,null,null,'0',null,null,null,null,null);
+INSERT into T_YJPT_ROLE_BUTTON(role,button) SELECT r.ROLE,239 from T_YJPT_ROLE_BUTTON r where r.BUTTON=157;
+Insert into T_YJPT_BUTTON (ID,SZD,MENU_ID,NAME,CODE,ORDER_NO,RECORD_STATUS,TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (100239,90013,10019,'btn.status','status',5,1,null,null,null,null,null,'0',null,null,null,null,null);
+INSERT into T_YJPT_ROLE_BUTTON(role,button) SELECT r.ROLE,100239 from T_YJPT_ROLE_BUTTON r where r.BUTTON=100157;
+
+--储罐适用范围 
+CREATE TABLE T_YJPT_CGSY (
+	ID NUMBER NOT NULL,
+	cg NUMBER,
+	zdwd VARCHAR2 (20),
+	zdyl VARCHAR2 (20),
+	zdyw VARCHAR2 (20),
+	zxwd VARCHAR2 (20),
+	zxyl VARCHAR2 (20),
+	zxyw VARCHAR2 (20),
+	add_user VARCHAR2 (50),
+	add_date TIMESTAMP (6),
+	update_user VARCHAR2 (50),
+	update_date TIMESTAMP (6),
+	record_status NUMBER DEFAULT 1,
+	sftb CHAR (1),
+	tbzt CHAR (1),
+	tbdyid NUMBER,
+	qylb CHAR (1),
+	ssqy NUMBER,
+	record_code VARCHAR2 (30),
+	byzd1 VARCHAR2 (100),
+	byzd2 VARCHAR2 (100),
+	byzd3 VARCHAR2 (100),
+	byzd4 VARCHAR2 (100),
+	byzd5 VARCHAR2 (100),
+	szd NUMBER
+);
+COMMENT ON TABLE T_YJPT_CGSY IS '储罐适用范围';
+COMMENT ON COLUMN T_YJPT_CGSY. ID IS '主键';
+COMMENT ON COLUMN T_YJPT_CGSY.cg IS '储罐';
+COMMENT ON COLUMN T_YJPT_CGSY.zdwd IS '最大温度';
+COMMENT ON COLUMN T_YJPT_CGSY.zdyw IS '最大液位';
+COMMENT ON COLUMN T_YJPT_CGSY.zdyl IS '最大压力';
+COMMENT ON COLUMN T_YJPT_CGSY.zxwd IS '最小温度';
+COMMENT ON COLUMN T_YJPT_CGSY.zxyw IS '最小液位';
+COMMENT ON COLUMN T_YJPT_CGSY.zxyl IS '最小压力';
+COMMENT ON COLUMN T_YJPT_CGSY.add_user IS '创建人';
+COMMENT ON COLUMN T_YJPT_CGSY.add_date IS '创建时间';
+COMMENT ON COLUMN T_YJPT_CGSY.update_user IS '修改人';
+COMMENT ON COLUMN T_YJPT_CGSY.update_date IS '修改时间';
+COMMENT ON COLUMN T_YJPT_CGSY.record_status IS '状态';
+COMMENT ON COLUMN T_YJPT_CGSY.record_code IS '角色编码';
+COMMENT ON COLUMN T_YJPT_CGSY.sftb IS '是否同步 Y或者N';
+COMMENT ON COLUMN T_YJPT_CGSY.tbzt IS '同步状态 已同步Y， 未同步N';
+COMMENT ON COLUMN T_YJPT_CGSY.tbdyid IS '同步对应ID';
+COMMENT ON COLUMN T_YJPT_CGSY.qylb IS '区域类别，省级还是市级';
+COMMENT ON COLUMN T_YJPT_CGSY.ssqy IS '所属区域，关联组织架构表的主键';
+COMMENT ON COLUMN T_YJPT_CGSY.szd IS '所在地';
+ALTER TABLE T_YJPT_CGSY ADD CONSTRAINT T_YJPT_CGSY_pk PRIMARY KEY (ID);
+CREATE SEQUENCE SEQ_T_YJPT_CGSY MINVALUE ${seqMinvalue} MAXVALUE ${seqMaxvalue} INCREMENT BY 1 START WITH ${seqStartWith} CACHE ${seqCache} NOORDER NOCYCLE;
+</#if>
+<#if versionDate?date("yyyyMMdd") lt "20160715"?date("yyyyMMdd"）
+--人员基本信息增加照片附件 7.11
+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 (10000366,null,'null','FJSSLX',6,'T_YJPT_JYRDRYXX',null,null,null,null,1,null,null,null,null,null,'人员基本信息',null,null,'0',null,null,null,null,null);
+</#if>
+<#if versionDate?date("yyyyMMdd") lt "20160715"?date("yyyyMMdd") >
+--水域类型0701
+UPDATE T_YJPT_GGDM G SET G.PX=3 WHERE G.ID=2203;
+--港区增加水系类型0701
+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 (2204,null,'SXLX',null,1,'SXLX.CJGL',null,null,null,null,1,null,null,null,null,null,' 长江干流',null,null,'0',null,null,null,null,null);
+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 (2205,null,'SXLX',null,2,'SXLX.HHSX',null,null,null,null,1,null,null,null,null,null,' 淮河水系',null,null,'0',null,null,null,null,null);
+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 (2206,null,'SXLX',null,3,'SXLX.CJZL',null,null,null,null,1,null,null,null,null,null,' 长江支流',null,null,'0',null,null,null,null,null);
+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 (22076,null,'SXLX',null,4,'SXLX.QTSX',null,null,null,null,1,null,null,null,null,null,' 其他水系',null,null,'0',null,null,null,null,null);
+--天宁区的行政区划 修正 0701
+UPDATE T_YJPT_GGDM G SET G.ID=320402 WHERE G.ID=320401320402;
+UPDATE T_YJPT_JYRJCXX J SET J.XZQH=320402 WHERE J.XZQH=320401320402;
+</#if>

gkaq/yjpt-java/trunk/yjpt/WEB-INF/web.xml

@@ -7,7 +7,7 @@
 	<context-param>
 		<description>系统版本</description>
 		<param-name>version</param-name>
-		<param-value>4.0.0</param-value>
+		<param-value>4.1.3</param-value>
 	</context-param>	
 	<context-param>
 		<description>0:省级;1:市级</description>
@@ -17,7 +17,7 @@
 	<context-param>
 		<description>区域代码</description>
 		<param-name>city_code</param-name>
-		<param-value>90011</param-value>
+		<param-value>90013</param-value>
 	</context-param>
 	<context-param>
 		<description>是否使用地图资源系统(Y/N)</description>

gkaq/yjpt-java/trunk/yjpt/WEB-INF/web.xml.ftl

@@ -7,7 +7,7 @@
 	<context-param>
 		<description>系统版本</description>
 		<param-name>version</param-name>
-		<param-value>4.1.2</param-value>
+		<param-value>4.1.3</param-value>
 	</context-param>	
 	<context-param>
 		<description>0:省级;1:市级</description>