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

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/jyr/JyrController.java

@@ -28,6 +28,8 @@ import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.flex.remoting.RemotingDestination;
 import org.springframework.flex.remoting.RemotingExclude;
@@ -550,7 +552,8 @@ public class JyrController extends BaseController {
 		} else {
 			Specification<JyrEntity> spec = SpecificationCreater
 					.searchByPredicateModels(filterList);
-			list = service.findAll(spec);
+			Sort sort2 = new Sort(Direction.ASC, "gkjyr");
+			list.addAll(service.findAll(spec,sort2)) ;
 		}
 		bc.setResult(list);
 		return bc;
@@ -575,7 +578,8 @@ public class JyrController extends BaseController {
 		List<JyrEntity> list = new ArrayList<JyrEntity>();
 		Specification<JyrEntity> spec = SpecificationCreater
 				.searchByPredicateModels(filterList);
-		list = service.findAll(spec);
+		Sort sort2 = new Sort(Direction.ASC, "gkjyr");
+		list.addAll(service.findAll(spec,sort2)) ;
 		bc.setResult(list);
 		return bc;
 	}
@@ -600,7 +604,8 @@ public class JyrController extends BaseController {
 					BaseEntity.RECORD_STATE_DRAFT, Operator.NEQ);
 			Specification<JyrEntity> spec = SpecificationCreater
 					.searchByPredicateModels(filterList);
-			list = service.findAll(spec);
+			Sort sort2 = new Sort(Direction.ASC, "gkjyr");
+			list.addAll(service.findAll(spec,sort2)) ;
 		}
 		bc.setResult(list);
 		return bc;
@@ -629,7 +634,8 @@ public class JyrController extends BaseController {
 					BaseEntity.RECORD_STATE_DRAFT, Operator.NEQ);
 			Specification<JyrEntity> spec = SpecificationCreater
 					.searchByPredicateModels(filterList);
-			list = service.findAll(spec);
+			Sort sort2 = new Sort(Direction.ASC, "gkjyr");
+			list.addAll(service.findAll(spec,sort2)) ;
 		}
 		bc.setResult(list);
 		return bc;
@@ -663,7 +669,9 @@ public class JyrController extends BaseController {
 		addNotEmptyModel(filterList, "sfwhqy", Constants.YES, Operator.EQ);
 		Specification<JyrEntity> spec = SpecificationCreater
 				.searchByPredicateModels(filterList);
-		List<JyrEntity> list = service.findAll(spec);
+		List<JyrEntity> list = new ArrayList<JyrEntity>();
+		Sort sort2 = new Sort(Direction.ASC, "gkjyr");
+		list.addAll(service.findAll(spec,sort2)) ;
 		bc.setResult(list);
 		return bc;
 	}
@@ -685,7 +693,9 @@ public class JyrController extends BaseController {
 		addNotEmptyModel(filterList, "sfwhqy", Constants.YES, Operator.EQ);
 		Specification<JyrEntity> spec = SpecificationCreater
 				.searchByPredicateModels(filterList);
-		List<JyrEntity> list = service.findAll(spec);
+		List<JyrEntity> list = new ArrayList<JyrEntity>();
+		Sort sort2 = new Sort(Direction.ASC, "gkjyr");
+		list.addAll(service.findAll(spec,sort2)) ;
 		bc.setResult(list);
 		return bc;
 	}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/zysqbp/ZysqbpController.java

@@ -91,6 +91,7 @@ import com.jtgh.yjpt.entity.jyrxxgl.RyjbxxEntity;
 import com.jtgh.yjpt.entity.task.Gztx;
 import com.jtgh.yjpt.entity.zyfzndjy.GkwxhwzyfzblFzEntity;
 import com.jtgh.yjpt.entity.zysqbp.FrxzxkEntity;
+import com.jtgh.yjpt.entity.zysqbp.XksbEntity;
 import com.jtgh.yjpt.entity.zysqbp.ZysqbpBgEntity;
 import com.jtgh.yjpt.entity.zysqbp.ZysqbpCountEntity;
 import com.jtgh.yjpt.entity.zysqbp.ZysqbpCountEntity1;
@@ -251,6 +252,11 @@ public class ZysqbpController extends BaseController {
 							&& !"".equals(entity.getWxhwmcbh()))
 						list.add(cb.like(root.get("wxhwmcbh").as(String.class),
 								"%" + entity.getWxhwmcbh() + "%"));
+					if(null!=entity.getZydw()) {
+						list.add(cb.equal(
+								root.get("zydw").get("id").as(String.class),
+								entity.getZydw().getId()));
+					}
 					if (null != gkdw && !"".equals(gkdw))
 						list.add(cb.like(
 								root.get("zydw").get("gkjyr").as(String.class),
@@ -384,6 +390,11 @@ public class ZysqbpController extends BaseController {
 							&& !"".equals(entity.getWxhwmcbh()))
 						list.add(cb.like(root.get("wxhwmcbh").as(String.class),
 								"%" + entity.getWxhwmcbh() + "%"));
+					if(null!=entity.getZydw()) {
+						list.add(cb.equal(
+								root.get("zydw").get("id").as(String.class),
+								entity.getZydw().getId()));
+					}
 					if (null != gkdw && !"".equals(gkdw))
 						list.add(cb.like(
 								root.get("zydw").get("gkjyr").as(String.class),
@@ -458,6 +469,11 @@ public class ZysqbpController extends BaseController {
 							&& !"".equals(entity.getWxhwmcbh()))
 						list.add(cb.like(root.get("wxhwmcbh").as(String.class),
 								"%" + entity.getWxhwmcbh() + "%"));
+					if(null!=entity.getZydw()) {
+						list.add(cb.equal(
+								root.get("zydw").get("id").as(String.class),
+								entity.getZydw().getId()));
+					}
 					if (null != gkdw && !"".equals(gkdw))
 						list.add(cb.like(
 								root.get("zydw").get("gkjyr").as(String.class),
@@ -722,6 +738,10 @@ public class ZysqbpController extends BaseController {
 						list.add(cb.like(
 								root.get("zydw").get("gkjyr").as(String.class),
 								"%" + param.get(2) + "%"));
+					if (!"".equals(param.get(17)))
+						list.add(cb.equal(
+								root.get("zydw").get("id").as(Long.class),
+								Long.parseLong(param.get(17) ) ));
 					if (!"null".equals(param.get(7))
 							&& !"".equals(param.get(7))) {
 						list.add(cb.equal(root.get("mao").as(String.class),
@@ -3624,10 +3644,21 @@ public class ZysqbpController extends BaseController {
 					entity.setXmmc(p.get("xmmc").toString());
 					entity.setSplb(p.get("splb").toString());
 					if (null != ba.getSzd()) {
-						entity.setXkjg(p.get("xkjg-" + ba.getSzd().getId())
-								.toString());
-						entity.setXzxkqlbm(p.get(
-								"xzxkqlbm-" + ba.getSzd().getId()).toString());
+						if(p.containsKey("xkjg-" + ba.getSzd().getId())){
+							entity.setXkjg(p.get("xkjg-" + ba.getSzd().getId())
+									.toString());
+						} else if (p.containsKey("xkjg-" + ba.getSzd().getParent().getId())) {
+							entity.setXkjg(p.get("xkjg-" + ba.getSzd().getParent().getId())
+									.toString());
+						}
+						
+						if(p.containsKey("xzxkqlbm-" + ba.getSzd().getId())){
+							entity.setXzxkqlbm(p.get(
+									"xzxkqlbm-" + ba.getSzd().getId()).toString());
+						} else if (p.containsKey("xzxkqlbm-" + ba.getSzd().getParent().getId())) {
+							entity.setXzxkqlbm(p.get(
+									"xzxkqlbm-" + ba.getSzd().getParent().getId()).toString());
+						}
 						entity.setDfbm(ba.getSzd().getCode());
 					}
 					entity.setXxsyfw(p.get("xxsyfw").toString());
@@ -3780,11 +3811,22 @@ public class ZysqbpController extends BaseController {
 					entity.setXmmc(p.get("xmmc").toString());
 					entity.setSplb(p.get("splb").toString());
 					if (null != zysqbpEntity.getSzd()) {
-						entity.setXkjg(p.get("xkjg-" + ba.getSzd().getId())
-								.toString());
-						entity.setXzxkqlbm(p.get(
-								"xzxkqlbm-" + zysqbpEntity.getSzd().getId())
-								.toString());
+						//许可机关
+						if(p.containsKey("xkjg-" + ba.getSzd().getId())){
+							entity.setXkjg(p.get("xkjg-" + ba.getSzd().getId())
+									.toString());
+						} else if (p.containsKey("xkjg-" + ba.getSzd().getParent().getId())) {
+							entity.setXkjg(p.get("xkjg-" + ba.getSzd().getParent().getId())
+									.toString());
+						}
+						//行政许可权利编码
+						if(p.containsKey("xzxkqlbm-" + ba.getSzd().getId())){
+							entity.setXzxkqlbm(p.get(
+									"xzxkqlbm-" + ba.getSzd().getId()).toString());
+						} else if (p.containsKey("xzxkqlbm-" + ba.getSzd().getParent().getId())) {
+							entity.setXzxkqlbm(p.get(
+									"xzxkqlbm-" + ba.getSzd().getParent().getId()).toString());
+						}
 						entity.setDfbm(zysqbpEntity.getSzd().getCode());
 					}
 					entity.setXxsyfw(p.get("xxsyfw").toString());
@@ -4110,8 +4152,21 @@ public class ZysqbpController extends BaseController {
 		return strings;
 	}
 
-	public BusinessContext saveDataMenu(String columns, boolean flag) {
-		String type = flag ? MemType.TYPE_FRXZXK : MemType.TYPE_DSJFX;
+	public BusinessContext saveDataMenu(String columns, int index) {
+		String type = MemType.TYPE_FRXZXK;
+		switch (index) {
+		case 0:
+			 type = MemType.TYPE_FRXZXK;
+			break;
+		case 1:
+			 type = MemType.TYPE_DSJFX;
+			break;
+		case 2:
+			 type = MemType.TYPE_SBXK;
+			break;
+		default:
+			break;
+		}
 		List<MemEntity> memList = memService.findMem(type, Utils
 				.getCurrentUser().getId());
 		if (CollectionUtils.isEmpty(memList)) {
@@ -4133,6 +4188,8 @@ public class ZysqbpController extends BaseController {
 				zysqbpService.findDataMenu(MemType.TYPE_FRXZXK));
 		bContext.setAttribute("bd",
 				zysqbpService.findDataMenu(MemType.TYPE_DSJFX));
+		bContext.setAttribute("xk",
+				zysqbpService.findDataMenu(MemType.TYPE_SBXK));
 		return bContext;
 	}
 
@@ -4188,5 +4245,368 @@ public class ZysqbpController extends BaseController {
 		}
 		return createBusinessContext();
 	}
+	
+	/**
+	 * 危险货物作业许可
+	 * @param page
+	 * @param functioniId
+	 * @param szdId
+	 * @param start
+	 * @param stop
+	 * @return
+	 */
+	public BusinessContext listOfXksb( SinglePageRequest page,Long functioniId,final Long szdId,final Date start,final Date stop) {
+		BusinessContext bc = new BusinessContext();
+		try {
+			Specification<TaskInfoEntity> spec = new Specification<TaskInfoEntity>() {
+				@Override
+				public Predicate toPredicate(Root<TaskInfoEntity> root,
+						CriteriaQuery<?> query, CriteriaBuilder cb) {
+					List<Predicate> list = new ArrayList<Predicate>();
+					list.add(cb.or(new Predicate[] {
+							cb.and(new Predicate[] {
+									cb.like(root.get("busKey").as(String.class),
+											"zysbsp-city"),
+									cb.equal(
+											root.get("taskKey")
+													.as(String.class), "xssc") }),
+							cb.and(new Predicate[] {
+									cb.like(root.get("busKey").as(String.class),
+											"autoAudit"),
+									cb.equal(
+											root.get("taskKey")
+													.as(String.class), "pz") }) }));
+					list.add(cb.equal(root.get("state").as(String.class), "2"));
+					if (null != start) {
+						list.add(cb.isNotNull(root.get("auditTime")));
+						list.add(cb.greaterThanOrEqualTo(root.get("auditTime")
+								.as(Date.class), start));
+					}
+					if (null != stop) {
+						list.add(cb.isNotNull(root.get("auditTime")));
+						list.add(cb.lessThan(
+								root.get("auditTime").as(Date.class),
+								DateUtil.addDate(stop, 1)));
+					}
+					Subquery<ZysqbpEntity> subquery = query
+							.subquery(ZysqbpEntity.class);
+					Root<ZysqbpEntity> zysqbpRoot = subquery
+							.from(ZysqbpEntity.class);
+					subquery.select(zysqbpRoot);
+					List<Predicate> subQueryPredicates = new ArrayList<Predicate>();
+					subQueryPredicates.add(cb.equal(
+							root.get("busId").as(String.class),
+							zysqbpRoot.get("id").as(String.class)));
+					if (null != szdId) {
+						subQueryPredicates.add(cb.like(zysqbpRoot.get("szd")
+								.get("id").as(String.class), szdId + "%"));
+					}
+					subQueryPredicates.add(cb.or(new Predicate[] {
+							cb.equal(
+									zysqbpRoot.get("recordStatus").as(
+											String.class),
+									BaseEntity.RECORD_STATE_BGCOMPLETED),
+							cb.equal(
+									zysqbpRoot.get("recordStatus").as(
+											String.class),
+									BaseEntity.RECORD_STATE_CALEL),
+							cb.equal(
+									zysqbpRoot.get("recordStatus").as(
+											String.class),
+									BaseEntity.RECORD_STATE_COMPLETED),
+							cb.equal(
+									zysqbpRoot.get("recordStatus").as(
+											String.class),
+									BaseEntity.RECORD_STATE_REJECT) }));
+					subquery.where(subQueryPredicates
+							.toArray(new Predicate[] {}));
+					list.add(cb.exists(subquery));
+
+					return cb.and(list.toArray(new Predicate[] {}));
+				}
+			};
+			page = new SinglePageRequest(page.getPageNumber(),
+					page.getPageSize(), "desc", "auditTime");
+			Page<TaskInfoEntity> pageList = taskService
+					.findAll1(spec, page);
+			List<XksbEntity> list2 = new ArrayList<XksbEntity>();
+			InputStream in = ZysqbpController.class
+					.getResourceAsStream("/frxzxk/frxzxk.properties");
+			Properties p = new Properties();
+			if (in != null) {
+				try {
+					p.load(in);
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+			for (TaskInfoEntity ba : pageList) {
+				XksbEntity entity = new XksbEntity();
+				ZysqbpEntity zysqbpEntity = zysqbpService.findOne(Long
+						.parseLong(ba.getBusId()));
+				entity.setBjh(zysqbpEntity.getBh());
+				if (in != null) {
+					if (null != ba.getSzd()) {
+						if(p.containsKey("xzxkqlbm-" + ba.getSzd().getId())){
+							entity.setQlsxbm(p.get(
+									"xzxkqlbm-" + ba.getSzd().getId()).toString());
+						} else if (p.containsKey("xzxkqlbm-" + ba.getSzd().getParent().getId())) {
+							entity.setQlsxbm(p.get(
+									"xzxkqlbm-" + ba.getSzd().getParent().getId()).toString());
+						}
+						if(p.containsKey("xkjg-" + ba.getSzd().getId())){
+							entity.setYwcs(p.get("xkjg-" + ba.getSzd().getId())
+									.toString());
+						} else if (p.containsKey("xkjg-" + ba.getSzd().getParent().getId())) {
+							entity.setYwcs(p.get("xkjg-" + ba.getSzd().getParent().getId())
+									.toString());
+						}
+						
+						//承诺时限
+						if(p.containsKey("cnsx-" + ba.getSzd().getId())){
+							entity.setCnsx(p.get("cnsx-" + ba.getSzd().getId())
+									.toString());
+						} else if (p.containsKey("cnsx-" + ba.getSzd().getParent().getId())) {
+							entity.setCnsx(p.get("cnsx-" + ba.getSzd().getParent().getId())
+									.toString());
+						}
+					}
+				}
+				//联系人
+				entity.setLxr(zysqbpEntity.getBgr());
+				//联系电话
+				entity.setLxdh(zysqbpEntity.getLxfs());
+				if (null != zysqbpEntity.getZydw()) {
+					//申请单位
+					entity.setSqdw(zysqbpEntity.getZydw().getGkjyr());		
+					//申请人联系地址
+					entity.setSqrlxdz(zysqbpEntity.getZydw().getBgdz());
+				}
+				Date time = ba.getAuditTime();
+				//受理时间
+				entity.setSlsj(time);
+				//办结人姓名
+				entity.setBlryxm(ba.getAuditUsername());
+				//办结状态
+				entity.setBjzt(zysqbpEntity.getRecordStatus()+"");
+				//办结意见
+				entity.setBjyj(ba.getAuditMsg());
+				if (zysqbpEntity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {// 已完成作业对应的流程
+					entity.setBjyj("同意办结");
+				} else if (zysqbpEntity.getRecordStatus() == BaseEntity.RECORD_STATE_BGCOMPLETED) {// 变更完成作业对应的流程
+					entity.setBjyj("同意办结");
+				} else if (zysqbpEntity.getRecordStatus() == BaseEntity.RECORD_STATE_CALEL) {// 作废作业对应的流程
+					entity.setBjyj("不同意办结");
+				} else if (zysqbpEntity.getRecordStatus() == BaseEntity.RECORD_STATE_REJECT) {// 作废作业对应的流程
+					entity.setBjyj("不同意办结");
+				}
+				//办结时间
+				entity.setBjsj(time);
+				list2.add(entity);
+			}
+			bc = createBusinessContext(pageList);
+			bc.setAttribute("list", list2);
+			return bc;
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+	
+	/**
+	 * 作业申报许可打印
+	 * @param param
+	 * @return
+	 * @throws ParseException
+	 */
+	public Collection<String[]> printXksb(final List<String> param)
+			throws ParseException {
+		Collection<TaskInfoEntity> dataset = null;
+		try {
+			Specification<TaskInfoEntity> spec = new Specification<TaskInfoEntity>() {
+				@Override
+				public Predicate toPredicate(Root<TaskInfoEntity> root,
+						CriteriaQuery<?> query, CriteriaBuilder cb) {
+					List<Predicate> list = new ArrayList<Predicate>();
+					list.add(cb.or(new Predicate[] {
+							cb.and(new Predicate[] {
+									cb.like(root.get("busKey").as(String.class),
+											"zysbsp-city"),
+									cb.equal(
+											root.get("taskKey")
+													.as(String.class), "xssc") }),
+							cb.and(new Predicate[] {
+									cb.like(root.get("busKey").as(String.class),
+											"autoAudit"),
+									cb.equal(
+											root.get("taskKey")
+													.as(String.class), "pz") }) }));
+					list.add(cb.equal(root.get("state").as(String.class), "2"));
+					if (null != param.get(2) && !"".equals(param.get(2))) {
+						try {
+							list.add(cb.isNotNull(root.get("auditTime")));
+							list.add(cb.greaterThanOrEqualTo(
+									root.get("auditTime").as(Date.class),
+									sdf.parse(param.get(2))));
+						} catch (ParseException e) {
+							e.printStackTrace();
+						}
+					}
+					if (null != param.get(3) && !"".equals(param.get(3))) {
+						try {
+							list.add(cb.isNotNull(root.get("auditTime")));
+							list.add(cb
+									.lessThan(
+											root.get("auditTime")
+													.as(Date.class), DateUtil
+													.addDate(sdf.parse(param
+															.get(3)), 1)));
+						} catch (ParseException e) {
+							e.printStackTrace();
+						}
+					}
+					Subquery<ZysqbpEntity> subquery = query
+							.subquery(ZysqbpEntity.class);
+					Root<ZysqbpEntity> zysqbpRoot = subquery
+							.from(ZysqbpEntity.class);
+					subquery.select(zysqbpRoot);
+					List<Predicate> subQueryPredicates = new ArrayList<Predicate>();
+					subQueryPredicates.add(cb.equal(
+							root.get("busId").as(String.class),
+							zysqbpRoot.get("id").as(String.class)));
+					if (null != param.get(0) && !"".equals(param.get(0))) {
+						subQueryPredicates
+								.add(cb.like(zysqbpRoot.get("szd").get("id")
+										.as(String.class), param.get(0) + "%"));
+					}
+					subQueryPredicates.add(cb.or(new Predicate[] {
+							cb.equal(
+									zysqbpRoot.get("recordStatus").as(
+											String.class),
+									BaseEntity.RECORD_STATE_BGCOMPLETED),
+							cb.equal(
+									zysqbpRoot.get("recordStatus").as(
+											String.class),
+									BaseEntity.RECORD_STATE_CALEL),
+							cb.equal(
+									zysqbpRoot.get("recordStatus").as(
+											String.class),
+									BaseEntity.RECORD_STATE_COMPLETED),
+							cb.equal(
+									zysqbpRoot.get("recordStatus").as(
+											String.class),
+									BaseEntity.RECORD_STATE_REJECT) }));
+					subquery.where(subQueryPredicates
+							.toArray(new Predicate[] {}));
+					list.add(cb.exists(subquery));
+
+					return cb.and(list.toArray(new Predicate[] {}));
+				}
+			};
+			Sort sort1 = new Sort(Direction.ASC, "auditTime");
+			dataset = taskService.findAll2(spec, sort1);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		Collection<String[]> strings = new ArrayList<String[]>();
+		if (dataset != null) {
+			InputStream in = ZysqbpController.class
+					.getResourceAsStream("/frxzxk/frxzxk.properties");
+			Properties p = new Properties();
+			if (in != null) {
+				try {
+					p.load(in);
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+			for (TaskInfoEntity ba : dataset) {
+				XksbEntity entity = new XksbEntity();
+				ZysqbpEntity zysqbpEntity = zysqbpService.findOne(Long
+						.parseLong(ba.getBusId()));
+				entity.setBjh(zysqbpEntity.getBh());
+				if (in != null) {
+					if (null != ba.getSzd()) {
+						if(p.containsKey("xzxkqlbm-" + ba.getSzd().getId())){
+							entity.setQlsxbm(p.get(
+									"xzxkqlbm-" + ba.getSzd().getId()).toString());
+						} else if (p.containsKey("xzxkqlbm-" + ba.getSzd().getParent().getId())) {
+							entity.setQlsxbm(p.get(
+									"xzxkqlbm-" + ba.getSzd().getParent().getId()).toString());
+						}
+						if(p.containsKey("xkjg-" + ba.getSzd().getId())){
+							entity.setYwcs(p.get("xkjg-" + ba.getSzd().getId())
+									.toString());
+						} else if (p.containsKey("xkjg-" + ba.getSzd().getParent().getId())) {
+							entity.setYwcs(p.get("xkjg-" + ba.getSzd().getParent().getId())
+									.toString());
+						}
+						
+						//承诺时限
+						if(p.containsKey("cnsx-" + ba.getSzd().getId())){
+							entity.setCnsx(p.get("cnsx-" + ba.getSzd().getId())
+									.toString());
+						} else if (p.containsKey("cnsx-" + ba.getSzd().getParent().getId())) {
+							entity.setCnsx(p.get("cnsx-" + ba.getSzd().getParent().getId())
+									.toString());
+						}
+					}
+				}
+				//联系人
+				entity.setLxr(zysqbpEntity.getBgr());
+				//联系电话
+				entity.setLxdh(zysqbpEntity.getLxfs());
+				if (null != zysqbpEntity.getZydw()) {
+					//申请单位
+					entity.setSqdw(zysqbpEntity.getZydw().getGkjyr());		
+					//申请人联系地址
+					entity.setSqrlxdz(zysqbpEntity.getZydw().getBgdz());
+				}
+				Date time = ba.getAuditTime();
+				//受理时间
+				entity.setSlsj(time);
+				//办理人姓名
+				entity.setBlryxm(ba.getAuditUsername());
+				//办结状态
+				entity.setBjzt(zysqbpEntity.getRecordStatus()+"");
+				//办结意见
+				entity.setBjyj(ba.getAuditMsg());
+				if (zysqbpEntity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {// 已完成作业对应的流程
+					entity.setBjyj("同意办结");
+				} else if (zysqbpEntity.getRecordStatus() == BaseEntity.RECORD_STATE_BGCOMPLETED) {// 变更完成作业对应的流程
+					entity.setBjyj("同意办结");
+				} else if (zysqbpEntity.getRecordStatus() == BaseEntity.RECORD_STATE_CALEL) {// 作废作业对应的流程
+					entity.setBjyj("不同意办结");
+				} else if (zysqbpEntity.getRecordStatus() == BaseEntity.RECORD_STATE_REJECT) {// 作废作业对应的流程
+					entity.setBjyj("不同意办结");
+				}
+				//办结时间
+				entity.setBjsj(time);
+				int i = 1;
+				if (true) {
+					String[] ss = new String[] {
+							i + "",
+							entity.getBjh(),
+							entity.getQlsxbm(),
+							entity.getYwcs(),
+							entity.getSqdw(),
+							entity.getLxr(),
+							entity.getSqrlxdz(),
+							entity.getLxdh(),
+							entity.getCnsx(),
+							null == entity.getSlsj()? "" : sdf3.format(entity
+									.getSlsj()), 
+							entity.getBlryxm(),
+							entity.getBlrygh(), 
+							entity.getBjzt(), entity.getBjyj(),
+							null == entity.getBjsj()? "" : sdf3.format(entity
+									.getBjsj())};
+					strings.add(ss);
+					i++;
+				}
+			}
+		}
+		return strings;
+	}
 
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/zysqbp/ZysqbpBgDao.java

@@ -18,6 +18,8 @@ public interface ZysqbpBgDao extends MyRepository<ZysqbpBgEntity, Long> {
 	@Query("from ZysqbpBgEntity where zysq =?1 order by addDate desc")
 	public List<ZysqbpBgEntity> findByZysq(ZysqbpEntity vo);
 
-	
+	@Query("from ZysqbpBgEntity where id =?1 order by addDate desc")
+	public List<ZysqbpBgEntity>  findById(Long id);
+
 
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/common/MemType.java

@@ -8,6 +8,7 @@ public interface MemType {
 	String TYPE_WXWPM = "wxwpm";
 	String TYPE_FRXZXK = "frxzxk";
 	String TYPE_DSJFX = "dsjfx";
+	String TYPE_SBXK = "sbxk";
 	String TYPE_LHXZ="lhxz";
 	String TYPE_AQFFCS="aqffcs";
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/sgalgl/SgalglwzddEntity.java

@@ -314,7 +314,6 @@ public class SgalglwzddEntity extends BaseEntity<Long> implements Cloneable {
 
 	@Override
 	public SgalglwzddEntity clone() throws CloneNotSupportedException {
-		// TODO Auto-generated method stub
 		return (SgalglwzddEntity) super.clone();
 	}
 }

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

@@ -0,0 +1,152 @@
+package com.jtgh.yjpt.entity.zysqbp;
+
+import java.util.Date;
+
+
+/**
+ * 危险货物港口作业申报许可
+ */
+public class XksbEntity{
+
+	/**办件号*/
+	private String bjh;
+	/**权利事项编码*/
+	private String qlsxbm;
+	/**业务处室*/
+	private String ywcs;
+	/**申请人或申请单位*/
+	private String sqdw;
+	/**联系人*/
+	private String lxr;
+	/**申请人联系地址*/
+	private String sqrlxdz;
+	/**联系电话*/
+	private String lxdh;
+	/**承诺时限（单位工作日）*/
+	private String cnsx;
+	/**受理时间（精确到时分秒）*/
+	private Date slsj;
+	/**办理人员姓名*/
+	private String blryxm;
+	/**办理人员工号*/
+	private String blrygh;
+	/**办结状态*/
+	private String bjzt;
+	/**办结意见*/
+	private String bjyj;
+	/**办结时间*/
+	private Date bjsj;	
+	public String getBjh() {
+		return bjh;
+	}
+	public void setBjh(String bjh) {
+		this.bjh = bjh;
+	}
+	public String getQlsxbm() {
+		return qlsxbm;
+	}
+	public void setQlsxbm(String qlsxbm) {
+		this.qlsxbm = qlsxbm;
+	}
+	public String getYwcs() {
+		return ywcs;
+	}
+	public void setYwcs(String ywcs) {
+		this.ywcs = ywcs;
+	}
+	public String getSqdw() {
+		return sqdw;
+	}
+	public void setSqdw(String sqdw) {
+		this.sqdw = sqdw;
+	}
+	public String getLxr() {
+		return lxr;
+	}
+	public void setLxr(String lxr) {
+		this.lxr = lxr;
+	}
+	public String getSqrlxdz() {
+		return sqrlxdz;
+	}
+	public void setSqrlxdz(String sqrlxdz) {
+		this.sqrlxdz = sqrlxdz;
+	}
+	public String getLxdh() {
+		return lxdh;
+	}
+	public void setLxdh(String lxdh) {
+		this.lxdh = lxdh;
+	}
+	public Date getSlsj() {
+		return slsj;
+	}
+	public void setSlsj(Date slsj) {
+		this.slsj = slsj;
+	}
+	public String getBlryxm() {
+		return blryxm;
+	}
+	public void setBlryxm(String blryxm) {
+		this.blryxm = blryxm;
+	}
+	public String getBlrygh() {
+		return blrygh;
+	}
+	public void setBlrygh(String blrygh) {
+		this.blrygh = blrygh;
+	}
+	public String getBjzt() {
+		return bjzt;
+	}
+	public void setBjzt(String bjzt) {
+		this.bjzt = bjzt;
+	}
+	public String getBjyj() {
+		return bjyj;
+	}
+	public void setBjyj(String bjyj) {
+		this.bjyj = bjyj;
+	}
+	public Date getBjsj() {
+		return bjsj;
+	}
+	public void setBjsj(Date bjsj) {
+		this.bjsj = bjsj;
+	}
+	public String getCnsx() {
+		return cnsx;
+	}
+	public void setCnsx(String cnsx) {
+		this.cnsx = cnsx;
+	}
+	
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/zysqbp/ZysqbgServiceImpl.java

@@ -89,6 +89,15 @@ public class ZysqbgServiceImpl extends
 		return zysqbpBgDao.save(entity);
 	}
 
+	@Override
+	public ZysqbpBgEntity findById(Long id) {
+		List<ZysqbpBgEntity> list = zysqbpBgDao.findById(id);
+		if (list != null && list.size() > 0) {
+			return list.get(0);
+		}
+		return null;
+	}
+	
 	public ZysqbpBgEntity findBgzyByZysqbp(ZysqbpEntity entity) {
 		List<ZysqbpBgEntity> list = zysqbpBgDao.findByZysq(entity);
 		if (list != null && list.size() > 0) {

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/zysqbp/ZysqbgService.java

@@ -16,4 +16,6 @@ public interface ZysqbgService extends BaseWorkFlowService {
 	public void submitBgWebService(ZysqbpEntity vo);
 
 	public ZysqbpBgEntity findBgzyByZysqbp(ZysqbpEntity entity);
+	
+	public ZysqbpBgEntity findById(Long id);
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/webService/common/accessory/AccessoryWebService.java

@@ -49,6 +49,13 @@ public class AccessoryWebService {
 		return accessoryService.findOne(id);
 	}
 
+	/**
+	 * 获取附件
+	 * @param entityId 所属对象id
+	 * @param sslx  所属对象类型
+	 * @param lx 附件类型
+	 * @return
+	 */
 	public List<AccessoryEntity> findByEntityIdAndEntityTypeAndType(
 			long entityId, long sslx, long lx) {
 		List<AccessoryEntity> list = accessoryService

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/webService/fz/FzService.java

@@ -20,50 +20,63 @@ import com.jtgh.yjpt.service.zyfzndjy.GkwxhwzyfzblhhzService;
 
 @Service
 @WebService(targetNamespace = "http://webService.yjpt.com/", serviceName = "fzService")
-@HandlerChain(file="handle-chain.xml")
-public class FzService extends BaseController{
-	
+@HandlerChain(file = "handle-chain.xml")
+public class FzService extends BaseController {
+
 	@Autowired
 	private GkwxhwzyfzblhhzService gkwxhwzyfzblhhzService;
-	public List<GkwxhwzyfzblhhzEntity> list( String szd,String ssgq,String gkjyr,String whdj,String fddbr) {
-		
-		try {
 
+	/**
+	 * 一览查询列表
+	 * 
+	 * @param szd
+	 *            所在地
+	 * @param ssgq
+	 *            港区
+	 * @param gkjyr
+	 *            经营人名称
+	 * @param whdj
+	 *            危货等级
+	 * @param fddbr
+	 *            法定代表人
+	 * @return
+	 */
+	public List<GkwxhwzyfzblhhzEntity> list(String szd, String ssgq,
+			String gkjyr, String whdj, String fddbr) {
+		try {
 			List<PredicateModel> filterList = new ArrayList<PredicateModel>();
 			// 只检索非删除状态记录
 			addNotEmptyModel(filterList, "recordStatus",
 					BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
 			// 根据所在地过滤
 			if (szd != null)
-				addNotEmptyModel(filterList, "szd.id", szd,
-						Operator.EQ);
+				addNotEmptyModel(filterList, "szd.id", szd, Operator.EQ);
 			// 根据港区过滤
-			if(ssgq != null && !ssgq.equals("")){
+			if (ssgq != null && !ssgq.equals("")) {
 				addNotEmptyModel(filterList, "ssgq.id", ssgq, Operator.EQ);
 			}
-			if(gkjyr != null && !gkjyr.equals("")){
-				addNotEmptyModel(filterList, "jyrVo.id",gkjyr, Operator.EQ);
-						}
-			if(whdj != null && !whdj.equals("")){
+			// 根据港口经营人过滤
+			if (gkjyr != null && !gkjyr.equals("")) {
+				addNotEmptyModel(filterList, "jyrVo.id", gkjyr, Operator.EQ);
+			}
+			// 根据危货等级过滤
+			if (whdj != null && !whdj.equals("")) {
 				addNotEmptyModel(filterList, "whdj.id", whdj, Operator.EQ);
 			}
-			if(fddbr != null && !fddbr.equals("")){
+			// 根据法定代表人过滤
+			if (fddbr != null && !fddbr.equals("")) {
 				addNotEmptyModel(filterList, "fddbr", fddbr, Operator.LIKE);
 			}
 			Specification<GkwxhwzyfzblhhzEntity> spec = SpecificationCreater
 					.searchByPredicateModels(filterList);
 			List<GkwxhwzyfzblhhzEntity> list = gkwxhwzyfzblhhzService
 					.findAll(spec);
-			/*for(GkwxhwzyfzblhhzEntity gkwxhwzyfzblhhzEntity :list){
-				if(gkwxhwzyfzblhhzEntity.getTaskList() != null && gkwxhwzyfzblhhzEntity.getTaskList().size()>0){
-					gkwxhwzyfzblhhzEntity.getTaskList().get(0);
-				}
-			}*/
 			return list;
-		
+
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
 		return null;
 	}
+	
 }

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

@@ -1,14 +1,23 @@
 package com.jtgh.yjpt.webService.zyfzbl;
 
+import java.util.ArrayList;
 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.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;
 import com.jtgh.yjpt.dao.yjgl.YjyaDao;
@@ -18,6 +27,8 @@ import com.jtgh.yjpt.dao.zyfzndjy.GkwxhwzyfzDao;
 import com.jtgh.yjpt.dao.zyfzndjy.Gkwxhwzyfzbl_fzbDao;
 import com.jtgh.yjpt.dao.zyfzndjy.GkwxhwzyfzblhhzbDao;
 import com.jtgh.yjpt.dao.zyfzndjy.GkwxhwzyfzblhhzbzbDao;
+import com.jtgh.yjpt.entity.BaseEntity;
+import com.jtgh.yjpt.entity.auth.UserEntity;
 import com.jtgh.yjpt.entity.jlrxxgl.GlzdxxEntity;
 import com.jtgh.yjpt.entity.jyrxxgl.RyjbxxEntity;
 import com.jtgh.yjpt.entity.yjgl.YjyaEntity;
@@ -36,7 +47,7 @@ import com.jtgh.yjpt.service.zyfzndjy.GkwxhwzyfzblhhzService;
 @Service
 @WebService(targetNamespace = "http://webService.yjpt.com/", serviceName = "zyfzblService")
 @HandlerChain(file = "handle-chain.xml")
-public class ZyfzblWebService {
+public class ZyfzblWebService extends BaseController {
 	@Autowired
 	private GkwxhwzyfzblhhzbDao gkwxhwzyfzblhhzDao;
 	@Autowired
@@ -108,11 +119,6 @@ public class ZyfzblWebService {
 			List<GkwxhwzyfzblFzEntity> saveList) {
 		List<GkwxhwzyfzblFzEntity> list = dao.findByFzsq(vo);
 		vo = gkwxhwzyfzblhhzService.saveAllFz(vo, saveList, list);
-		// vo = gkwxhwzyfzblhhzDao.save(vo);
-		// for (int i = 0; i < saveList.size(); i++) {
-		// GkwxhwzyfzblFzEntity zd = saveList.get(i);
-		// dao.save(zd);
-		// }
 		return vo;
 	}
 
@@ -122,4 +128,133 @@ public class ZyfzblWebService {
 				name);
 		return list;
 	}
+	
+	/**
+	 * 初始化分页查询
+	 * 
+	 * @param count
+	 * @param pageCount
+	 * @return
+	 */
+	public List<GkwxhwzyfzblhhzEntity> findPageList(int count, int pageCount) {
+		try {
+			UserEntity user = Utils.getWebServiceUser();
+			// 经营人
+			if (user != null && user.getSfjyr().equals("Y")
+					&& user.getJyrjcxx() != null) {
+				List<PredicateModel> filterList = new ArrayList<PredicateModel>();
+				// 根据 申请单位 过滤
+				addNotEmptyModel(filterList, "zydw", user.getJyrjcxx(),
+						Operator.EQ);
+				// 只检索非删除状态记录
+				addNotEmptyModel(filterList, "recordStatus",
+						BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
+				Specification<GkwxhwzyfzblhhzEntity> spec = SpecificationCreater
+						.searchByPredicateModels(filterList);
+				SinglePageRequest page = new SinglePageRequest(pageCount,
+						count, "desc", "id");
+				Page<GkwxhwzyfzblhhzEntity> list = gkwxhwzyfzblhhzService
+						.findAll(spec, page);
+				return list.getContent();
+			}
+			String szd = "";
+			if (user.getSzd() == null)
+				szd = "";
+			else
+				szd = user.getSzd().getByzd2();
+			// 行政人员
+			if (user != null && user.getSfjyr().equals("N")
+					&& user.getSfcd().equals("N")) {
+				List<PredicateModel> filterList = new ArrayList<PredicateModel>();
+				// 过滤掉已删除的附证
+				addNotEmptyModel(filterList, "recordStatus",
+						BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
+				// 根据所在地过滤
+				addNotEmptyModel(filterList, "szd.id", szd, Operator.LIKE);
+				Specification<GkwxhwzyfzblhhzEntity> spec = SpecificationCreater
+						.searchByPredicateModels(filterList);
+				SinglePageRequest page = new SinglePageRequest(pageCount,
+						count, "desc", "id");
+				Page<GkwxhwzyfzblhhzEntity> list = gkwxhwzyfzblhhzService
+						.findAll(spec, page);
+				return list.getContent();
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	/**
+	 * 根据条件分页查询
+	 * @param szd
+	 * @param ssgq
+	 * @param gkjyr
+	 * @param whdj
+	 * @param fddbr
+	 * @param count
+	 * @param pageCount
+	 * @return
+	 */
+	public List<GkwxhwzyfzblhhzEntity> findPageListByParmas(String szd,
+			String ssgq, String gkjyr, String whdj, String fddbr, int count,
+			int pageCount) {
+		try {
+			List<PredicateModel> filterList = new ArrayList<PredicateModel>();
+			// 只检索非删除状态记录
+			addNotEmptyModel(filterList, "recordStatus",
+					BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
+			// 根据所在地过滤
+			if (szd != null)
+				addNotEmptyModel(filterList, "szd.id", szd, Operator.EQ);
+			// 根据港区过滤
+			if (ssgq != null && !ssgq.equals("")) {
+				addNotEmptyModel(filterList, "ssgq.id", ssgq, Operator.EQ);
+			}
+			// 根据港口经营人过滤
+			if (gkjyr != null && !gkjyr.equals("")) {
+				addNotEmptyModel(filterList, "jyrVo.gkjyr", gkjyr, Operator.LIKE);
+			}
+			// 根据危货等级过滤
+			if (whdj != null && !whdj.equals("")) {
+				addNotEmptyModel(filterList, "whdj.id", whdj, Operator.EQ);
+			}
+			// 根据法定代表人过滤
+			if (fddbr != null && !fddbr.equals("")) {
+				addNotEmptyModel(filterList, "fddbr", fddbr, Operator.LIKE);
+			}
+			if (Utils.getWebServiceUser() != null) {
+				UserEntity user = Utils.getWebServiceUser();
+				// 经营人只能查自己的
+				if (Constants.YES.equals(user.getSfjyr())
+						&& user.getJyrjcxx() != null) {
+					addNotEmptyModel(filterList, "zydw", user.getJyrjcxx(),
+							Operator.EQ);
+				} else {
+					// 行政人员根据权限过滤(附证列表菜单ID=29)
+					addRecordCodeFilter(29l, filterList);
+				}
+			}
+			Specification<GkwxhwzyfzblhhzEntity> spec = SpecificationCreater
+					.searchByPredicateModels(filterList);
+			SinglePageRequest page = new SinglePageRequest(pageCount, count,
+					"desc", "id");
+			Page<GkwxhwzyfzblhhzEntity> list = gkwxhwzyfzblhhzService.findAll(
+					spec, page);
+			return list.getContent();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+	
+	/**
+	 * 根据附证id查询附证信息
+	 * @param id
+	 * @return
+	 */
+	public List<GkwxhwzyfzblFzEntity> findByFzsq(Long id){
+		return gkwxhwzyfzblhhzService.findByFzsq(id);	
+	}
+		
 }

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

@@ -4,8 +4,12 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import javax.jws.HandlerChain;
 import javax.jws.WebService;
@@ -28,12 +32,17 @@ import com.jtgh.yjpt.controller.BaseController;
 import com.jtgh.yjpt.controller.zysqbp.ZysqbpController;
 import com.jtgh.yjpt.entity.BaseEntity;
 import com.jtgh.yjpt.entity.auth.UserEntity;
+import com.jtgh.yjpt.entity.hs.CbEntity;
+import com.jtgh.yjpt.entity.hs.ZysqbphsdbEntity;
+import com.jtgh.yjpt.entity.jyr.BwEntity;
 import com.jtgh.yjpt.entity.jyr.JyrEntity;
 import com.jtgh.yjpt.entity.jyr.JyrNsEntity;
 import com.jtgh.yjpt.entity.jyr.WxhwpmEntity;
 import com.jtgh.yjpt.entity.zyfzndjy.GkwxhwzyfzblFzEntity;
 import com.jtgh.yjpt.entity.zysqbp.ZysqbpBgEntity;
 import com.jtgh.yjpt.entity.zysqbp.ZysqbpEntity;
+import com.jtgh.yjpt.service.hs.CbService;
+import com.jtgh.yjpt.service.hs.HsCompareService;
 import com.jtgh.yjpt.service.jyr.BwService;
 import com.jtgh.yjpt.service.jyr.CkService;
 import com.jtgh.yjpt.service.jyr.DcService;
@@ -79,8 +88,11 @@ public class WhsqbpWebService extends BaseController {
 	@Autowired
 	private DcService dcService;
 	@Autowired
-	private CkService ckService;
-
+	private CkService ckService;	
+	@Autowired
+	private CbService cbService;
+	@Autowired
+	private HsCompareService compareService;
 	// @Autowired
 	// private WorkflowMangerService workService;
 	// @Autowired
@@ -186,7 +198,7 @@ public class WhsqbpWebService extends BaseController {
 		addNotEmptyModel(filterList, "szd.id", szd, Operator.LIKE);
 		// 根据港区过滤
 		addNotEmptyModel(filterList, "szgq.id", szgq, Operator.EQ);
-		// 根据危货品编号
+		// 根据船名
 		addNotEmptyModel(filterList, "cm", cm, Operator.LIKE);
 		// 根据危货品编号
 		addNotEmptyModel(filterList, "wxwpmc", wxhwbh, Operator.LIKE);
@@ -498,6 +510,7 @@ public class WhsqbpWebService extends BaseController {
 
 	public ZysqbpEntity qxAudit(String shyj, boolean auditflag,
 			ZysqbpEntity entity) throws CloneNotSupportedException {
+		entity = zysqbpService.findOne(entity.getId());
 		zysqbpController.qxAduit(shyj, new Date(), auditflag, entity);
 		entity = zysqbpService.findOne(entity.getId());
 		return entity;
@@ -506,6 +519,8 @@ public class WhsqbpWebService extends BaseController {
 	public ZysqbpBgEntity bgAudit(String shyj, boolean auditflag,
 			ZysqbpEntity entity, ZysqbpBgEntity bgVo)
 			throws CloneNotSupportedException {
+		entity = zysqbpService.findOne(entity.getId());
+		bgVo = zysqbgService.findBgzyByZysqbp(entity);
 		zysqbpController.bgAduit(shyj, new Date(), auditflag, entity, bgVo);
 		bgVo = zysqbgService.findBgzyByZysqbp(entity);
 		return bgVo;
@@ -513,6 +528,7 @@ public class WhsqbpWebService extends BaseController {
 
 	public ZysqbpEntity aduit(String shyj, String shsj, boolean auditflag,
 			ZysqbpEntity entity) throws CloneNotSupportedException {
+		entity =zysqbpService.findOne(entity.getId());
 		// 确保entity有重新查一下
 		zysqbpController.aduit(shyj, new Date(), auditflag, entity);
 		entity = zysqbpService.findOne(entity.getId());
@@ -625,8 +641,11 @@ public class WhsqbpWebService extends BaseController {
 	 * 取消作业
 	 * 
 	 */
-	public ZysqbpEntity doQxzy(ZysqbpEntity entity) {
+	public ZysqbpEntity doQxzy(ZysqbpEntity vo) {
+		ZysqbpEntity entity =  zysqbpService.findOne(vo.getId());
 		try {
+			//存取取消原因
+			entity.setByzd1(vo.getByzd1());
 			zysqqxService.submitQxWebService(entity);
 			entity.setRecordStatus(BaseEntity.RECORD_STATE_QXSUBMIT);// 提交过后，状态改为取消审核中
 			entity.setUpdateDate(new Date());
@@ -711,10 +730,10 @@ public class WhsqbpWebService extends BaseController {
 	}
 
 	/**
-	 * 判断当前用户是否有审批权限 之判断 提交（不判断取消变更）
+	 * 判断当前用户是否有审批权限 之判断 
 	 * 
 	 * @param id
-	 * @return
+	 * @return 0 表示未签收，代办理，1表示已签收待办理 ，""表示 无流程
 	 */
 	public String getTaskStateByid(Long id) {
 		ZysqbpEntity ba = zysqbpService.findOne(id);
@@ -748,5 +767,81 @@ public class WhsqbpWebService extends BaseController {
 		}
 		return "";
 	}
+	
+	/**
+	 * 获取泊位信息
+	 * @param zycs 作业场所类型
+	 * @param id 场所id
+	 * @return
+	 */
+	public BwEntity findByZycsAndId(String zycs,Long id) {
+		//只查询泊位的信息
+		if(Constants.GGDM_ID_ZYDD_BW.equals(Long.parseLong(zycs))) {
+			return bwService.findOne(id);
+		}
+		return null;
+	}
 
+	
+	/**
+	 * 根据中文 船名和英文船名分页获取船舶信息
+	 * @param zwcm
+	 * @param ywcm
+	 * @param n
+	 * @param pageCount
+	 * @return
+	 */
+	public List<CbEntity> getCbPageListByCm(String zwcm,String ywcm,int n ,int pageCount){
+		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
+		addNotEmptyModel(filterList, "zwcm", zwcm, PredicateModel.Operator.LIKE);
+		addNotEmptyModel(filterList, "ywcm", ywcm, PredicateModel.Operator.LIKE);
+		Specification<CbEntity> spec = SpecificationCreater
+				.searchByPredicateModels(filterList);
+		SinglePageRequest page = new SinglePageRequest(pageCount, n,
+				"asc", "cbbh");
+		Page<CbEntity> list =cbService.findAll(spec,
+				page);	
+		return list.getContent();
+	}
+	
+	/**
+	 * 查询对比结果详细
+	 * 
+	 * @param id 作业申报id
+	 * @return
+	 */
+	public List<ZysqbphsdbEntity>  queryDb(Long id) {
+		List<ZysqbphsdbEntity> list = new ArrayList<ZysqbphsdbEntity>();
+		Map<String, Map<String, String>> map = compareService.mergeInfo(id);
+		if (map == null) {
+			return list;
+		}
+		Set<String> set = map.keySet();
+		if (set != null && set.size() > 0) {
+			for (String str : set) {
+				ZysqbphsdbEntity temp = new ZysqbphsdbEntity();
+				temp.setName(str);
+				temp.setGkj(map.get(str).get("GK"));
+				temp.setHs(map.get(str).get("HS"));
+				temp.setZt(map.get(str).get("ZT"));
+				String xh = map.get(str).get("XH");
+				if (org.springframework.util.StringUtils.hasText(xh)) {
+					temp.setXh(new Integer(xh));
+				} else {
+					temp.setXh(Integer.MAX_VALUE);
+				}
+				list.add(temp);
+			}
+			Collections.sort(list, new Comparator<ZysqbphsdbEntity>() {
+
+				@Override
+				public int compare(ZysqbphsdbEntity o1, ZysqbphsdbEntity o2) {
+					return o1.getXh().compareTo(o2.getXh());
+				}
+			});
+		}
+		return list;
+	}
+	
+	
 }

gkaq/yjpt-java/trunk/resources/frxzxk/frxzxk.properties

@@ -7,15 +7,47 @@ xzxdrmc-90014=\u5357\u4eac\u5e02\u6e2f\u653f\u5904
 xzxdrmc-9001401=\u5357\u4eac\u5e02\u6e2f\u653f\u5904
 xzxdrmc-9001402=\u5357\u4eac\u5e02\u6e2f\u653f\u5904
 xzxdrmc-90011=\u9547\u6c5f\u5e02\u4ea4\u901a\u8fd0\u8f93\u5c40
+xzxdrmc-9001101=\u9547\u6c5f\u5e02\u4ea4\u901a\u8fd0\u8f93\u5c40
+xzxdrmc-9001102=\u9547\u6c5f\u5e02\u4ea4\u901a\u8fd0\u8f93\u5c40
 #\u8bb8\u53ef\u673a\u5173
 xkjg-90014=\u5357\u4eac\u5e02\u4ea4\u901a\u8fd0\u8f93\u5c40
 xkjg-9001401=\u5357\u4eac\u5e02\u4ea4\u901a\u8fd0\u8f93\u5c40
 xkjg-9001402=\u5357\u4eac\u5e02\u4ea4\u901a\u8fd0\u8f93\u5c40
 xkjg-90011=\u9547\u6c5f\u5e02\u4ea4\u901a\u8fd0\u8f93\u5c40
+xkjg-9001101=\u9547\u6c5f\u5e02\u4ea4\u901a\u8fd0\u8f93\u5c40
+xkjg-9001102=\u9547\u6c5f\u5e02\u4ea4\u901a\u8fd0\u8f93\u5c40
+xkjg-90015=\u5b89\u76d1\u5904
+xkjg-9001501=\u5b89\u76d1\u5904
+xkjg-9001502=\u5b89\u76d1\u5904
+xkjg-9001503=\u5b89\u76d1\u5904
+xkjg-9001504=\u5b89\u76d1\u5904
+xkjg-9001505=\u5b89\u76d1\u5904
+xkjg-9001506=\u5b89\u76d1\u5904
+xkjg-9001507=\u5b89\u76d1\u5904
+xkjg-9001508=\u5b89\u76d1\u5904
+xkjg-9001509=\u5b89\u76d1\u5904
+xkjg-9001510=\u5b89\u76d1\u5904
 #\u884c\u653f\u8bb8\u53ef\u6743\u5229\u7f16\u7801
+xzxkqlbm-90011=JS01000-XK-2015
+xzxkqlbm-9001101=JS01000-XK-2015
+xzxkqlbm-9001102=JS01000-XK-2015
 xzxkqlbm-90014=JS01000-XK-2015
 xzxkqlbm-9001401=JS01000-XK-2015
 xzxkqlbm-9001402=JS01000-XK-2015
-xzxkqlbm-90011=JS01000-XK-2015
+xzxkqlbm-90015=JS060000GW-XK-0005
+xzxkqlbm-9001501=JS060000GW-XK-0005
+xzxkqlbm-9001502=JS060000GW-XK-0005
+xzxkqlbm-9001503=JS060000GW-XK-0005
+xzxkqlbm-9001504=JS060000GW-XK-0005
+xzxkqlbm-9001505=JS060000GW-XK-0005
+xzxkqlbm-9001506=JS060000GW-XK-0005
+xzxkqlbm-9001507=JS060000GW-XK-0005
+xzxkqlbm-9001508=JS060000GW-XK-0005
+xzxkqlbm-9001509=JS060000GW-XK-0005
+xzxkqlbm-9001510=JS060000GW-XK-0005
 #\u4fe1\u606f\u4f7f\u7528\u8303\u56f4
 xxsyfw=\u516c\u793a
+#\u627f\u8bfa\u65f6\u9650
+cnsx-90011=1
+cnsx-90014=1
+cnsx-90015=1