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

gkaq/yjpt-java/trunk/java_src/com/jtgh/qlyg/sync/QlygSyncApply.java

@@ -103,7 +103,7 @@ public class QlygSyncApply extends BaseController {
 				.findAll(specApplyProcess);
 		if (listApplyProcess != null && listApplyProcess.size() > 0) {
 			for (ApplyProcessEntity applyProcess : listApplyProcess) {
-				// 保存办件过程
+				// 保存办件过程 保存到权力阳光库
 				infApplyProcessService.save(applyProcess);
 			}
 		}

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

@@ -405,15 +405,15 @@ public class Constants {
 	/** 自动审批用户ID */
 	public final static Long GGDM_ID_AUTO_AUDIT_AUDITOR = 10001003l;
 	/** 作业地点类型-泊位码头 */
-	public final static Long GGDM_ID_ZYDD_BW = 10000501l;
+	public final static Long GGDM_ID_ZYDD_BW = 10000501L;
 	/** 作业地点类型-储罐 */
-	public final static Long GGDM_ID_ZYDD_CG = 10000502l;
+	public final static Long GGDM_ID_ZYDD_CG = 10000502L;
 	/** 作业地点类型-堆场 */
-	public final static Long GGDM_ID_ZYDD_DC = 10000503l;
+	public final static Long GGDM_ID_ZYDD_DC = 10000503L;
 	/** 作业地点类型-仓库 */
-	public final static Long GGDM_ID_ZYDD_CK = 10000504l;
+	public final static Long GGDM_ID_ZYDD_CK = 10000504L;
 	/** 作业地点类型-过驳区 */
-	public final static Long GGDM_ID_ZYDD_GBQ = 10000505l;
+	public final static Long GGDM_ID_ZYDD_GBQ = 10000505L;
 	/** 水域类型.内河 */
 	public final static String GGDM_ID_SYLX_NH = "2201";
 	/** 水域类型.沿海 */

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

@@ -734,25 +734,16 @@ public abstract class Utils {
 			// 根据流程状态过滤
 			if (null != lcStatus && !"".equals(lcStatus)) {
 				if (String.valueOf(BaseEntity.RECORD_STATE_VALID).equals(lcStatus)
-						|| String.valueOf(BaseEntity.RECORD_STATE_COMPLETED)
-								.equals(lcStatus)) {
-					list.add(cb.equal(root.get("recordStatus").as(String.class),
-							lcStatus));
+						|| String.valueOf(BaseEntity.RECORD_STATE_COMPLETED).equals(lcStatus)) {
+					list.add(cb.equal(root.get("recordStatus").as(String.class),lcStatus));
 				} else {
-					Subquery<TaskInfoEntity> subquery = query
-							.subquery(TaskInfoEntity.class);
-					Root<TaskInfoEntity> taskRoot = subquery
-							.from(TaskInfoEntity.class);
+					Subquery<TaskInfoEntity> subquery = query.subquery(TaskInfoEntity.class);
+					Root<TaskInfoEntity> taskRoot = subquery.from(TaskInfoEntity.class);
 					subquery.select(taskRoot);
 					List<Predicate> subQueryPredicates = new ArrayList<Predicate>();
-					subQueryPredicates.add(cb.equal(
-							root.get("id").as(String.class), taskRoot.get("busId")
-									.as(String.class)));
-					subQueryPredicates.add(cb.equal(
-							taskRoot.get("currName").as(String.class), lcStatus));
-					subQueryPredicates.add(cb.notEqual(
-							taskRoot.get("state").as(Long.class),
-							BaseEntity.RECORD_STATE_COMPLETED));
+					subQueryPredicates.add(cb.equal(root.get("id").as(String.class), taskRoot.get("busId").as(String.class)));
+					subQueryPredicates.add(cb.equal(taskRoot.get("currName").as(String.class), lcStatus));
+					subQueryPredicates.add(cb.notEqual(taskRoot.get("state").as(Long.class),BaseEntity.RECORD_STATE_COMPLETED));
 					subquery.where(subQueryPredicates.toArray(new Predicate[] {}));
 					list.add(cb.exists(subquery));
 				}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/check/DcController.java

@@ -7,6 +7,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -96,14 +97,13 @@ public class DcController extends BaseController {
 	 * @throws ParseException
 	 */
 	@Log(Type.QUERY)
-	public BusinessContext list(SinglePageRequest pageRequest, Long functionId,
-			DcEntity entity, Date jcsjK, Date jcsjZ) throws ParseException {
+	public BusinessContext list(SinglePageRequest pageRequest, Long functionId,DcEntity entity, Date jcsjK, Date jcsjZ) 
+			throws ParseException {
 		BusinessContext bc = new BusinessContext();
 		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
 		addRecordCodeFilter(functionId, filterList, null, "bdcdw");
 		if (null != entity.getSzd()) {
-			addNotEmptyModel(filterList, "szd.id", entity.getSzd().getId(),
-					Operator.LIKE_R);
+			addNotEmptyModel(filterList, "szd.id", entity.getSzd().getId(),Operator.LIKE_R);
 		}
 		addNotEmptyModel(filterList, "szgq", entity.getSzgq(), Operator.EQ);
 		addNotEmptyModel(filterList, "bdcdw", entity.getBdcdw(), Operator.EQ);
@@ -111,17 +111,18 @@ public class DcController extends BaseController {
 		addNotEmptyModel(filterList, "mqzt", entity.getMqzt(), Operator.EQ);
 		addNotEmptyModel(filterList, "original", "original", Operator.NL);
 		if (jcsjK != null) {
-			addNotEmptyModel(filterList, "sj", Utils.getDateFirstTime(jcsjK),
-					Operator.GTE);
+			addNotEmptyModel(filterList, "sj", Utils.getDateFirstTime(jcsjK),Operator.GTE);
 		}
 		if (jcsjZ != null) {
-			addNotEmptyModel(filterList, "sj", Utils.getDateLastTime(jcsjZ),
-					Operator.LTE);
+			addNotEmptyModel(filterList, "sj", Utils.getDateLastTime(jcsjZ),Operator.LTE);
+		}
+		addNotEmptyModel(filterList, "bdcdwfzr", entity.getBdcdwfzr(),Operator.LIKE);
+		addNotEmptyModel(filterList, "recordStatus",BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
+		//plus by xuhao 20160208
+		//经营人不要看到未提交的数据
+		if(Utils.getCurrentUser().getSfjyr().equals(Constants.YES)){
+			addNotEmptyModel(filterList, "recordStatus",BaseEntity.RECORD_STATE_VALID, Operator.NEQ);
 		}
-		addNotEmptyModel(filterList, "bdcdwfzr", entity.getBdcdwfzr(),
-				Operator.LIKE);
-		addNotEmptyModel(filterList, "recordStatus",
-				BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
 		Specification<DcEntity> spec = SpecificationCreater.searchByPredicateModels(filterList);
 		
 		List<Order> orders = new ArrayList<Order>();
@@ -132,12 +133,9 @@ public class DcController extends BaseController {
 		
 		Page<DcEntity> page = dcService.findAll(spec, pageAble);
 		for (DcEntity ba : page) {
-			if (dcService.getTaskByUserAndBusKey(Utils.getCurrentUser().getId()
-					.toString(), ba.getId().toString()) != null) {
+			if (dcService.getTaskByUserAndBusKey(Utils.getCurrentUser().getId().toString(), ba.getId().toString()) != null) {
 				ba.setTaskState(Constants.TASK_ASSIGN);
-			} else if (dcService
-					.getCandidateTaskByUserAndBusKey(Utils.getCurrentUser()
-							.getId().toString(), ba.getId().toString()) != null) {
+			} else if (dcService.getCandidateTaskByUserAndBusKey(Utils.getCurrentUser().getId().toString(), ba.getId().toString()) != null) {
 				ba.setTaskState(Constants.TASK_CANDIDATE);
 			}
 			if (ba.getTaskList() != null && ba.getTaskList().size() > 0) {
@@ -288,8 +286,7 @@ public class DcController extends BaseController {
 	 * @return
 	 */
 	@Log(Type.ADD)
-	public BusinessContext submit_add(Long functionId, DcEntity entity,
-			List<AccessoryEntity> accessoryList) {
+	public BusinessContext submit_add(Long functionId, DcEntity entity,List<AccessoryEntity> accessoryList) {
 		return submit(functionId, entity, accessoryList);
 	}
 
@@ -302,8 +299,7 @@ public class DcController extends BaseController {
 	 * @return
 	 */
 	@Log(Type.EDIT)
-	public BusinessContext submit_edit(Long functionId, DcEntity entity,
-			List<AccessoryEntity> accessoryList) {
+	public BusinessContext submit_edit(Long functionId, DcEntity entity,List<AccessoryEntity> accessoryList) {
 		return submit(functionId, entity, accessoryList);
 	}
 
@@ -489,10 +485,9 @@ public class DcController extends BaseController {
 	 * @param accessoryList
 	 * @return
 	 */
-	public BusinessContext submit(Long functionId, DcEntity entity,
-			List<AccessoryEntity> accessoryList) {
+	public BusinessContext submit(Long functionId, DcEntity entity,List<AccessoryEntity> accessoryList) {
 		boolean init = false;
-		if (null == entity.getId() || entity.getId().equals(0l)) {
+		if (null == entity.getId() || entity.getId().equals(0L)) {
 			// if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY))
 			// {// 市级新增的添加人设置为当前登录用户
 			entity.setAddUser(Utils.getCurrentUser());
@@ -1065,5 +1060,46 @@ public class DcController extends BaseController {
 	}
 	
 	
+	//dcService.submit(dcEntity);// 市级提交发起流程
+	public BusinessContext batchSubmitDc(){
+		String curUserSzd = Utils.getCurrentUser().getSzd().getId().toString();
+		//获得当前登录用户所在地及下级所在地，所有处于“未提交”状态的数据
+		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
+		addNotEmptyModel(filterList, "szd.id", curUserSzd,Operator.LIKE_R);
+		addNotEmptyModel(filterList, "recordStatus",BaseEntity.RECORD_STATE_VALID, Operator.EQ);
+		Specification<DcEntity> spec = SpecificationCreater.searchByPredicateModels(filterList);
+		Collection<DcEntity> colDc = dcService.findAll(spec);
+		Iterator<DcEntity> iter = colDc.iterator();
+		int submitErrorCount=0;
+		while(iter.hasNext()){
+			DcEntity dcEntity = iter.next();
+			try {
+				//submit
+				dcService.submit(dcEntity);
+			} catch (Exception e) {
+				//save error entity's id
+				submitErrorCount++;
+			}
+		}
+		String rtnMsg = "";
+		
+		if(colDc.isEmpty()){
+			rtnMsg = "无需要下发的数据！";
+		}
+		else{
+			if(submitErrorCount==0){
+				//没有下发失败的
+				rtnMsg = "下发成功！";
+			}
+			else{
+				rtnMsg = "有"+submitErrorCount+"条督查数据下发失败！";
+			}
+		}
+		
+		BusinessContext bc = new BusinessContext();
+		bc.setResult(rtnMsg);
+		return bc;
+	}
+	
 	
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/check/ZcController.java

@@ -104,15 +104,14 @@ public class ZcController extends BaseController {
 	private JyrService jyrService;
 
 	@Log(Type.QUERY)
-	public BusinessContext list(SinglePageRequest pageRequest, Long functionId,
-			ZcEntity entity, Date jcsjK, Date jcsjZ) throws ParseException {
+	public BusinessContext list(SinglePageRequest pageRequest, Long functionId,ZcEntity entity, Date jcsjK, Date jcsjZ) 
+			throws ParseException {
 		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
 		jcsjK = Utils.getDateFirstTime(jcsjK);
 		jcsjZ = Utils.getDateLastTime(jcsjZ);
 		addRecordCodeFilter(functionId, filterList, null, "qymc");
 		if (null != entity.getSzd()) {
-			addNotEmptyModel(filterList, "szd.id", entity.getSzd().getId(),
-					Operator.LIKE_R);
+			addNotEmptyModel(filterList, "szd.id", entity.getSzd().getId(),Operator.LIKE_R);
 		}
 		addNotEmptyModel(filterList, "szgq", entity.getSzgq(), Operator.EQ);
 		addNotEmptyModel(filterList, "qymc", entity.getQymc(), Operator.EQ);
@@ -125,10 +124,8 @@ public class ZcController extends BaseController {
 		addNotEmptyModel(filterList, "aqfzr", entity.getAqfzr(), Operator.LIKE);
 		// addNotEmptyModel(filterList, "wzgyy", entity.getWzgyy(),
 		// Operator.LIKE);
-		addNotEmptyModel(filterList, "recordStatus",
-				BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
-		Specification<ZcEntity> spec = SpecificationCreater
-				.searchByPredicateModels(filterList);
+		addNotEmptyModel(filterList, "recordStatus",BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
+		Specification<ZcEntity> spec = SpecificationCreater.searchByPredicateModels(filterList);
 		Page<ZcEntity> page = zcService.findAll(spec, pageRequest);
 		for (ZcEntity zc : page) {
 			List<ZcyhEntity> list = zcyhService.findBySszc(zc);
@@ -136,8 +133,7 @@ public class ZcController extends BaseController {
 			for (ZcyhEntity zcyh : list) {
 				zgzj += (null == zcyh.getZgtrzj() ? 0d : zcyh.getZgtrzj());
 				if ("-1".equals(zcyh.getMqzt()) && zcyh.getJhwcsj() != null) {
-					if (Calendar.getInstance().getTime()
-							.compareTo(zcyh.getJhwcsj()) > 0) {// 未处理超时
+					if (Calendar.getInstance().getTime().compareTo(zcyh.getJhwcsj()) > 0) {// 未处理超时
 						zc.setMqzt("-1");
 						break;
 					} else {// 未处理未超时

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

@@ -871,21 +871,17 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 		try {
 			GkwxhwzyfzblhhzEntity entity = gkwxhwzyfzblhhzService.findOne(id);
 			if (entity != null) {
-				if (entity.getTaskList() != null
-						&& entity.getTaskList().size() > 0)
+				if (entity.getTaskList() != null && entity.getTaskList().size() > 0){
 					entity.getTaskList().get(0);
+				}
 				BusinessContext bc = doEditInit(entity);
 				bc.setResult(entity);
 				// 附件查询
 				List<PredicateModel> filterList = new ArrayList<PredicateModel>();
-				addNotEmptyModel(filterList, "recordStatus",
-						BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
-				addNotEmptyModel(filterList, "entityId", entity.getId(),
-						Operator.EQ);
-				addNotEmptyModel(filterList, "entityType",
-						Constants.GGDM_ID_GKWXHWZYFZBLHHZ, Operator.EQ);
-				Specification<AccessoryEntity> sspec = SpecificationCreater
-						.searchByPredicateModels(filterList);
+				addNotEmptyModel(filterList, "recordStatus",BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
+				addNotEmptyModel(filterList, "entityId", entity.getId(),Operator.EQ);
+				addNotEmptyModel(filterList, "entityType",Constants.GGDM_ID_GKWXHWZYFZBLHHZ, Operator.EQ);
+				Specification<AccessoryEntity> sspec = SpecificationCreater.searchByPredicateModels(filterList);
 				List<AccessoryEntity> list = accessoryService.findAll(sspec);
 				bc.setAttribute("fileList", list);
 				return bc;
@@ -951,8 +947,7 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 		if (alist != null && alist.size() > 0) {
 			for (GkwxhwzyfzblhhzzbEntity gkwxhwzyfzblhhzzbEntity : alist) {
 				if (gkwxhwzyfzblhhzzbEntity.getZdid() != null) {
-					GlzdxxEntity x = glzdxxService
-							.findOne(gkwxhwzyfzblhhzzbEntity.getZdid().getId());
+					GlzdxxEntity x = glzdxxService.findOne(gkwxhwzyfzblhhzzbEntity.getZdid().getId());
 					if (x.getRecordStatus() != BaseEntity.RECORD_STATE_DELETE) {
 						list.add(x);
 					}
@@ -981,8 +976,7 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 		if (alist != null && alist.size() > 0) {
 			for (GkwxhwzyfzblhhzzbEntity gkwxhwzyfzblhhzzbEntity : alist) {
 				if (gkwxhwzyfzblhhzzbEntity.getRyid() != null) {
-					RyjbxxEntity x = ryxxService
-							.findOne(gkwxhwzyfzblhhzzbEntity.getRyid().getId());
+					RyjbxxEntity x = ryxxService.findOne(gkwxhwzyfzblhhzzbEntity.getRyid().getId());
 					if (x.getRecordStatus() != BaseEntity.RECORD_STATE_DELETE) {
 						list.add(x);
 					}
@@ -1012,8 +1006,7 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 		if (alist != null && alist.size() > 0) {
 			for (GkwxhwzyfzblhhzzbEntity gkwxhwzyfzblhhzzbEntity : alist) {
 				if (gkwxhwzyfzblhhzzbEntity.getYaid() != null) {
-					YjyaEntity x = yaxxService.findOne(gkwxhwzyfzblhhzzbEntity
-							.getYaid().getId());
+					YjyaEntity x = yaxxService.findOne(gkwxhwzyfzblhhzzbEntity.getYaid().getId());
 					if (x.getRecordStatus() != BaseEntity.RECORD_STATE_DELETE) {
 						list.add(x);
 					}
@@ -1040,8 +1033,7 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 		if (alist != null && alist.size() > 0) {
 			for (GkwxhwzyfzblhhzzbEntity gkwxhwzyfzblhhzzbEntity : alist) {
 				if (gkwxhwzyfzblhhzzbEntity.getSsid() != null) {
-					YjwzFlxxEntity x = wzService
-							.findOne(gkwxhwzyfzblhhzzbEntity.getSsid().getId());
+					YjwzFlxxEntity x = wzService.findOne(gkwxhwzyfzblhhzzbEntity.getSsid().getId());
 					if (x.getRecordStatus() != BaseEntity.RECORD_STATE_DELETE) {
 						list.add(x);
 					}

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

@@ -316,7 +316,9 @@ public interface JyrDao extends MyRepository<JyrEntity, Long> {
 			+ " SELECT SUM(T.RS) FROM T_YJPT_JYRJCXX T WHERE T.RECORD_STATUS<> 9 AND (T.SZD like ?1 OR ?1 is null) AND T.SFWHQY<>'N' "
 			+ " UNION ALL "
 			+ " SELECT COUNT(*) FROM T_YJPT_JYRDRYXX G WHERE  G.RECORD_STATUS<>9 "
-			+ " AND G.SSJYR IN ( SELECT T.ID FROM  T_YJPT_JYRJCXX T  WHERE T.RECORD_STATUS<> 9 AND (T.SZD like ?1 OR ?1 is null) AND T.SFWHQY<>'N') AND G.RYLX=80097 ", nativeQuery = true)
+			+ " AND G.SSJYR IN ( SELECT T.ID FROM  T_YJPT_JYRJCXX T  WHERE T.RECORD_STATUS<> 9 AND (T.SZD like ?1 OR ?1 is null) AND T.SFWHQY<>'N') AND G.RYLX=80097 "
+			+ " UNION ALL "
+			+ " SELECT COUNT(DISTINCT(A.jyr)) FROM T_YJPT_GKWXHWZYFZBL_FZ B LEFT JOIN T_YJPT_GKWXHWZYFZBLHHZ A ON B.FZSQ = A.ID WHERE B.RECORD_STATUS!=9 AND B.FZCSBH IS NOT NULL AND A.RECORD_STATUS=2 AND trunc(sysdate)>=A.YXQKSSJ and trunc(sysdate)<=A.YXQJSSJ AND (A.SZD like ?1 OR ?1 is null)", nativeQuery = true)
 	public List<Object[]> getherJyr(String szd);
 
 	/***

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

@@ -861,17 +861,17 @@ public interface ZysqbpDao extends MyRepository<ZysqbpEntity, Long> {
 	 * @param szd
 	 * @return
 	 */
-	@Query(value = "  SELECT COUNT(*)  FROM (SELECT T.ZYDW zydw, SUM(T.ZYSL) sl FROM T_YJPT_WXHWGKZYSBD T WHERE T.ZYDD='10000501' AND (T.RECORD_STATUS=2 OR T.RECORD_STATUS=10) AND (T.SZD like ?1 ) AND TO_CHAR(T.BGSJ,'YYYY')=TO_CHAR(SYSDATE,'YYYY') "
+	@Query(value = "  SELECT COUNT(*)  FROM (SELECT T.ZYDW zydw, SUM(T.ZYSL) sl FROM T_YJPT_WXHWGKZYSBD T WHERE T.ZYDD='10000501' AND (T.RECORD_STATUS=2 OR T.RECORD_STATUS=10) AND (T.SZD like ?1 ) AND TO_CHAR(T.BGSJ,'YYYY')=?2 "
 			+ " GROUP BY T.ZYDW )  c   WHERE C.SL> 1000000 "
 			+ " UNION  ALL  "
-			+ "  SELECT COUNT(*)  FROM (SELECT T.ZYDW zydw, SUM(T.ZYSL) sl FROM T_YJPT_WXHWGKZYSBD T WHERE T.ZYDD='10000501' AND (T.RECORD_STATUS=2 OR T.RECORD_STATUS=10) AND (T.SZD like ?1 ) AND TO_CHAR(T.BGSJ,'YYYY')=TO_CHAR(SYSDATE,'YYYY') "
+			+ "  SELECT COUNT(*)  FROM (SELECT T.ZYDW zydw, SUM(T.ZYSL) sl FROM T_YJPT_WXHWGKZYSBD T WHERE T.ZYDD='10000501' AND (T.RECORD_STATUS=2 OR T.RECORD_STATUS=10) AND (T.SZD like ?1 ) AND TO_CHAR(T.BGSJ,'YYYY')=?2 "
 			+ " GROUP BY T.ZYDW )  c  WHERE C.SL < =1000000 AND C.SL> 500000 "
 			+ " UNION ALL "
-			+ "  SELECT COUNT(*)  FROM (SELECT T.ZYDW zydw, SUM(T.ZYSL) sl FROM T_YJPT_WXHWGKZYSBD T WHERE T.ZYDD='10000501' AND (T.RECORD_STATUS=2 OR T.RECORD_STATUS=10) AND (T.SZD like ?1 ) AND TO_CHAR(T.BGSJ,'YYYY')=TO_CHAR(SYSDATE,'YYYY') "
+			+ "  SELECT COUNT(*)  FROM (SELECT T.ZYDW zydw, SUM(T.ZYSL) sl FROM T_YJPT_WXHWGKZYSBD T WHERE T.ZYDD='10000501' AND (T.RECORD_STATUS=2 OR T.RECORD_STATUS=10) AND (T.SZD like ?1 ) AND TO_CHAR(T.BGSJ,'YYYY')=?2 "
 			+ " GROUP BY T.ZYDW )  c  WHERE C.SL < =500000 AND C.SL> 100000 "
 			+ " UNION ALL "
-			+ " SELECT  SUM(T.ZYSL) sl FROM T_YJPT_WXHWGKZYSBD T WHERE T.ZYDD='10000501' AND (T.RECORD_STATUS=2 OR T.RECORD_STATUS=10) AND T.QXZYSJ IS NULL AND (T.SZD like ?1 ) AND TO_CHAR(T.BGSJ,'YYYY')=TO_CHAR(SYSDATE,'YYYY')", nativeQuery = true)
-	public List<Object[]> gatherNttl(String szd);
+			+ " SELECT  SUM(T.ZYSL) sl FROM T_YJPT_WXHWGKZYSBD T WHERE T.ZYDD='10000501' AND (T.RECORD_STATUS=2 OR T.RECORD_STATUS=10) AND T.QXZYSJ IS NULL AND (T.SZD like ?1 ) AND TO_CHAR(T.BGSJ,'YYYY')=?2 ", nativeQuery = true)
+	public List<Object[]> gatherNttl(String szd,String nd);
 
 	/***
 	 * 危险作业情况汇总储罐及重大危险源信息的汇总
@@ -887,7 +887,9 @@ public interface ZysqbpDao extends MyRepository<ZysqbpEntity, Long> {
 			+ " UNION ALL "
 			+ " SELECT COUNT(G.ID) FROM T_YJPT_JYRJCXX T LEFT JOIN T_YJPT_CG G ON T.ID=G.DWMC WHERE T.RECORD_STATUS<> 9 AND (T.SZD like ?1 ) AND T.SFWHQY<>'N' AND G.RECORD_STATUS<>9  AND G.CGXS='sc' "
 			+ " UNION ALL "
-			+ " SELECT COUNT(G.ID) FROM T_YJPT_JYRJCXX T LEFT JOIN T_YJPT_CG G ON T.ID=G.DWMC WHERE T.RECORD_STATUS<> 9 AND (T.SZD like ?1 ) AND T.SFWHQY<>'N' AND G.RECORD_STATUS<>9  AND G.WHZYFZBH IS NOT NULL "
+			+ " select count(DISTINCT(QYNBBH)) FROM (select C.YXQKSSJ,C.YXQJSSJ,C.QYNBBH,G.SZD from "
+			+ " (SELECT A.YXQKSSJ,A.YXQJSSJ,B.QYNBBH FROM T_YJPT_GKWXHWZYFZBLHHZ A INNER JOIN T_YJPT_GKWXHWZYFZBL_FZ B ON A.ID=B.FZSQ WHERE B.ZYCS=10000502 AND A.RECORD_STATUS=2 AND B.RECORD_STATUS!=9 ) c"
+			+ " INNER JOIN T_YJPT_CG G ON C.QYNBBH=G.ID WHERE G.RECORD_STATUS!=9) cgxk where trunc(sysdate)>=cgxk.YXQKSSJ and trunc(sysdate)<=cgxk.YXQJSSJ AND (cgxk.SZD like ?1 OR ?1 is null) "
 			+ " UNION ALL "
 			+ " SELECT COUNT(G.ID) FROM T_YJPT_JYRJCXX T LEFT JOIN T_YJPT_CG G ON T.ID=G.DWMC WHERE T.RECORD_STATUS<> 9 AND (T.SZD like ?1 ) AND T.SFWHQY<>'N' AND G.RECORD_STATUS<>9 AND   G.ZDWXYCGGS =1 "
 			+ " UNION ALL "
@@ -923,9 +925,9 @@ public interface ZysqbpDao extends MyRepository<ZysqbpEntity, Long> {
 	 */
 	@Query(value = " SELECT t.COUNT_NUM,g.ID,g.MC FROM "
 			+ " (SELECT COUNT(1) COUNT_NUM,jyr.XZQH XZQH FROM T_YJPT_WXHWGKZYSBD zy "
-			+ " JOIN T_YJPT_GKWXHWZYFZBL_FZ fz ON fz.ID=zy.ZYDDQYBH AND fz.ZYCS=10000501  "
+			+ " JOIN T_YJPT_GKWXHWZYFZBL_FZ fz ON fz.ID=zy.ZYDDQYBH AND fz.ZYCS=?12  "
 			+ " JOIN T_YJPT_JYRJCXX jyr ON jyr.ID=zy.ZYDW "
-			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
+			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=4 OR zy.RECORD_STATUS=5 OR zy.RECORD_STATUS=6 OR zy.RECORD_STATUS=7 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
 			+ " AND (?1=0 OR zy.RECORD_STATUS=?1) AND (?2 IS NULL OR zy.INOROUT=?2) AND (?3 IS NULL OR zy.MAO=?3) "
 			+ " AND (zy.SZD like ?4) AND (?5=0 OR zy.SZGQ=?5) AND (?6=0 OR EXISTS (SELECT ID FROM T_YJPT_GGDM g WHERE g.ID=jyr.XZQH START WITH g.ID=?6 CONNECT BY PRIOR g.ID=g.FID)) "
 			+ " AND (?7=0 OR zy.ZYDW=?7) AND (?8=0 OR fz.qynbbh=?8) AND (?9 IS NULL OR zy.WPBH=?9) "
@@ -934,16 +936,16 @@ public interface ZysqbpDao extends MyRepository<ZysqbpEntity, Long> {
 			+ " JOIN T_YJPT_GGDM g ON g.ID=t.XZQH " + " ORDER BY g.MC ", nativeQuery = true)
 	public List<Object[]> countByXzqhExist(int recordStatus, String inorout,
 			String mao, String szdId, Long gqId, Long xzqh, Long jyrId,
-			Long bwId, String whbh, Date startTime, Date stopTime);
+			Long bwId, String whbh, Date startTime, Date stopTime,Long zycs);
 
 	/**
 	 * 根据 审批状态/进出港/内外贸/所在地/所在港区/行政区划/经营人/泊位/危货编号，统计经营人行政区划的危货作业数量
 	 */
 	@Query(value = " SELECT SUM(t.COUNT_NUM),x.PID,x.PMC FROM "
 			+ " (SELECT COUNT(1) COUNT_NUM,jyr.XZQH XZQH FROM T_YJPT_WXHWGKZYSBD zy "
-			+ " JOIN T_YJPT_GKWXHWZYFZBL_FZ fz ON fz.ID=zy.ZYDDQYBH AND fz.ZYCS=10000501  "
+			+ " JOIN T_YJPT_GKWXHWZYFZBL_FZ fz ON fz.ID=zy.ZYDDQYBH AND fz.ZYCS=?13  "
 			+ " JOIN T_YJPT_JYRJCXX jyr ON jyr.ID=zy.ZYDW "
-			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
+			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=4 OR zy.RECORD_STATUS=5 OR zy.RECORD_STATUS=6 OR zy.RECORD_STATUS=7 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
 			+ " AND (?1=0 OR zy.RECORD_STATUS=?1) AND (?2 IS NULL OR zy.INOROUT=?2) AND (?3 IS NULL OR zy.MAO=?3) "
 			+ " AND (zy.SZD like ?4) AND (?5=0 OR zy.SZGQ=?5) AND (?6=0 OR EXISTS (SELECT ID FROM T_YJPT_GGDM g WHERE g.ID=jyr.XZQH START WITH g.ID=?6 CONNECT BY PRIOR g.ID=g.FID)) "
 			+ " AND (?7=0 OR zy.ZYDW=?7) AND (?8=0 OR fz.qynbbh=?8) AND (?9 IS NULL OR zy.WPBH=?9) "
@@ -957,16 +959,16 @@ public interface ZysqbpDao extends MyRepository<ZysqbpEntity, Long> {
 			+ " GROUP BY x.PID,x.PMC " + " ORDER BY x.PMC ", nativeQuery = true)
 	public List<Object[]> countByXzqh(int recordStatus, String inorout,
 			String mao, String szdId, Long gqId, Long xzqh, Long jyrId,
-			Long bwId, String whbh, Date startTime, Date stopTime, Long szd);
+			Long bwId, String whbh, Date startTime, Date stopTime, Long szd,Long zycs);
 
 	/**
 	 * 根据 审批状态/进出港/内外贸/所在地/所在港区/行政区划/经营人/泊位/危货编号，统计经营人行政区划的危货作业数量(大于0)
 	 */
 	@Query(value = " SELECT t.COUNT_NUM,g.ID,g.GQMC FROM "
 			+ " (SELECT COUNT(1) COUNT_NUM,zy.SZGQ SZGQ FROM T_YJPT_WXHWGKZYSBD zy "
-			+ " JOIN T_YJPT_GKWXHWZYFZBL_FZ fz ON fz.ID=zy.ZYDDQYBH AND fz.ZYCS=10000501  "
+			+ " JOIN T_YJPT_GKWXHWZYFZBL_FZ fz ON fz.ID=zy.ZYDDQYBH AND fz.ZYCS=?12  "
 			+ " JOIN T_YJPT_JYRJCXX jyr ON jyr.ID=zy.ZYDW "
-			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
+			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=4 OR zy.RECORD_STATUS=5 OR zy.RECORD_STATUS=6 OR zy.RECORD_STATUS=7 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
 			+ " AND (?1=0 OR zy.RECORD_STATUS=?1) AND (?2 IS NULL OR zy.INOROUT=?2) AND (?3 IS NULL OR zy.MAO=?3) "
 			+ " AND (zy.SZD like ?4) AND (?5=0 OR zy.SZGQ=?5) AND (?6=0 OR EXISTS (SELECT ID FROM T_YJPT_GGDM g WHERE g.ID=jyr.XZQH START WITH g.ID=?6 CONNECT BY PRIOR g.ID=g.FID)) "
 			+ " AND (?7=0 OR zy.ZYDW=?7) AND (?8=0 OR fz.qynbbh=?8) AND (?9 IS NULL OR zy.WPBH=?9) "
@@ -975,16 +977,16 @@ public interface ZysqbpDao extends MyRepository<ZysqbpEntity, Long> {
 			+ " JOIN T_YJPT_GQ g ON g.ID=t.SZGQ " + " ORDER BY g.GQMC ", nativeQuery = true)
 	public List<Object[]> countByGqExist(int recordStatus, String inorout,
 			String mao, String szdId, Long gqId, Long xzqh, Long jyrId,
-			Long bwId, String whbh, Date startTime, Date stopTime);
+			Long bwId, String whbh, Date startTime, Date stopTime,Long zycs);
 
 	/**
 	 * 根据 审批状态/进出港/内外贸/所在地/所在港区/行政区划/经营人/泊位/危货编号，统计经营人行政区划的危货作业数量
 	 */
 	@Query(value = " SELECT t.COUNT_NUM,g.ID,g.GQMC FROM "
 			+ " (SELECT COUNT(1) COUNT_NUM,zy.SZGQ SZGQ FROM T_YJPT_WXHWGKZYSBD zy "
-			+ " JOIN T_YJPT_GKWXHWZYFZBL_FZ fz ON fz.ID=zy.ZYDDQYBH AND fz.ZYCS=10000501  "
+			+ " JOIN T_YJPT_GKWXHWZYFZBL_FZ fz ON fz.ID=zy.ZYDDQYBH AND fz.ZYCS=?12  "
 			+ " JOIN T_YJPT_JYRJCXX jyr ON jyr.ID=zy.ZYDW "
-			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
+			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=4 OR zy.RECORD_STATUS=5 OR zy.RECORD_STATUS=6 OR zy.RECORD_STATUS=7 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
 			+ " AND (?1=0 OR zy.RECORD_STATUS=?1) AND (?2 IS NULL OR zy.INOROUT=?2) AND (?3 IS NULL OR zy.MAO=?3) "
 			+ " AND (zy.SZD like ?4) AND (?5=0 OR zy.SZGQ=?5) AND (?6=0 OR EXISTS (SELECT ID FROM T_YJPT_GGDM g WHERE g.ID=jyr.XZQH START WITH g.ID=?6 CONNECT BY PRIOR g.ID=g.FID)) "
 			+ " AND (?7=0 OR zy.ZYDW=?7) AND (?8=0 OR fz.qynbbh=?8) AND (?9 IS NULL OR zy.WPBH=?9) "
@@ -992,16 +994,16 @@ public interface ZysqbpDao extends MyRepository<ZysqbpEntity, Long> {
 			+ " JOIN T_YJPT_GQ g ON g.ID=t.SZGQ " + " ORDER BY g.GQMC ", nativeQuery = true)
 	public List<Object[]> countByGq(int recordStatus, String inorout,
 			String mao, String szdId, Long gqId, Long xzqh, Long jyrId,
-			Long bwId, String whbh, Date startTime, Date stopTime);
+			Long bwId, String whbh, Date startTime, Date stopTime,Long zycs);
 
 	/**
 	 * 根据 审批状态/进出港/内外贸/所在地/所在港区/行政区划/经营人/泊位/危货编号，统计经营人泊位的危货作业数量(大于0)
 	 */
 	@Query(value = " SELECT t.COUNT_NUM,bw.ID,bw.BWMC FROM "
 			+ " (SELECT COUNT(1) COUNT_NUM,fz.QYNBBH QYNBBH FROM T_YJPT_WXHWGKZYSBD zy "
-			+ " JOIN T_YJPT_GKWXHWZYFZBL_FZ fz ON fz.ID=zy.ZYDDQYBH AND fz.ZYCS=10000501  "
+			+ " JOIN T_YJPT_GKWXHWZYFZBL_FZ fz ON fz.ID=zy.ZYDDQYBH AND fz.ZYCS=?12  "
 			+ " JOIN T_YJPT_JYRJCXX jyr ON jyr.ID=zy.ZYDW "
-			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
+			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=4 OR zy.RECORD_STATUS=5 OR zy.RECORD_STATUS=6 OR zy.RECORD_STATUS=7 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
 			+ " AND (?1=0 OR zy.RECORD_STATUS=?1) AND (?2 IS NULL OR zy.INOROUT=?2) AND (?3 IS NULL OR zy.MAO=?3) "
 			+ " AND (zy.SZD like ?4) AND (?5=0 OR zy.SZGQ=?5) AND (?6=0 OR EXISTS (SELECT ID FROM T_YJPT_GGDM g WHERE g.ID=jyr.XZQH START WITH g.ID=?6 CONNECT BY PRIOR g.ID=g.FID)) "
 			+ " AND (?7=0 OR zy.ZYDW=?7) AND (?8=0 OR fz.qynbbh=?8) AND (?9 IS NULL OR zy.WPBH=?9) "
@@ -1011,7 +1013,7 @@ public interface ZysqbpDao extends MyRepository<ZysqbpEntity, Long> {
 			+ " ORDER BY bw.BWMC ", nativeQuery = true)
 	public List<Object[]> countByBwExist(int recordStatus, String inorout,
 			String mao, String szdId, Long gqId, Long xzqh, Long jyrId,
-			Long bwId, String whbh, Date startTime, Date stopTime);
+			Long bwId, String whbh, Date startTime, Date stopTime,Long zycs);
 
 	/**
 	 * 根据 审批状态/进出港/内外贸/所在地/所在港区/行政区划/经营人/泊位/危货编号，统计经营人泊位的危货作业数量
@@ -1020,7 +1022,7 @@ public interface ZysqbpDao extends MyRepository<ZysqbpEntity, Long> {
 			+ " (SELECT COUNT(1) COUNT_NUM,fz.QYNBBH QYNBBH FROM T_YJPT_WXHWGKZYSBD zy "
 			+ " JOIN T_YJPT_GKWXHWZYFZBL_FZ fz ON fz.ID=zy.ZYDDQYBH AND fz.ZYCS=10000501  "
 			+ " JOIN T_YJPT_JYRJCXX jyr ON jyr.ID=zy.ZYDW "
-			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
+			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=4 OR zy.RECORD_STATUS=5 OR zy.RECORD_STATUS=6 OR zy.RECORD_STATUS=7 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
 			+ " AND (?1=0 OR zy.RECORD_STATUS=?1) AND (?2 IS NULL OR zy.INOROUT=?2) AND (?3 IS NULL OR zy.MAO=?3) "
 			+ " AND (zy.SZD like ?4) AND (?5=0 OR zy.SZGQ=?5) AND (?6=0 OR EXISTS (SELECT ID FROM T_YJPT_GGDM g WHERE g.ID=jyr.XZQH START WITH g.ID=?6 CONNECT BY PRIOR g.ID=g.FID)) "
 			+ " AND (?7=0 OR zy.ZYDW=?7) AND (?8=0 OR fz.qynbbh=?8) AND (?9 IS NULL OR zy.WPBH=?9) "
@@ -1030,14 +1032,89 @@ public interface ZysqbpDao extends MyRepository<ZysqbpEntity, Long> {
 	public List<Object[]> countByBw(int recordStatus, String inorout,
 			String mao, String szdId, Long gqId, Long xzqh, Long jyrId,
 			Long bwId, String whbh, Date startTime, Date stopTime);
+	
+	
+	/**
+	 * 根据 审批状态/进出港/内外贸/所在地/所在港区/行政区划/经营人/泊位/危货编号，统计经营人储罐的危货作业数量
+	 */
+	@Query(value = " SELECT t.COUNT_NUM,cg.ID,cg.CGMC FROM "
+			+ " (SELECT COUNT(1) COUNT_NUM,fz.QYNBBH QYNBBH FROM T_YJPT_WXHWGKZYSBD zy "
+			+ " JOIN T_YJPT_GKWXHWZYFZBL_FZ fz ON fz.ID=zy.ZYDDQYBH AND fz.ZYCS=10000502  "
+			+ " JOIN T_YJPT_JYRJCXX jyr ON jyr.ID=zy.ZYDW "
+			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=4 OR zy.RECORD_STATUS=5 OR zy.RECORD_STATUS=6 OR zy.RECORD_STATUS=7 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
+			+ " AND (?1=0 OR zy.RECORD_STATUS=?1) AND (?2 IS NULL OR zy.INOROUT=?2) AND (?3 IS NULL OR zy.MAO=?3) "
+			+ " AND (zy.SZD like ?4) AND (?5=0 OR zy.SZGQ=?5) AND (?6=0 OR EXISTS (SELECT ID FROM T_YJPT_GGDM g WHERE g.ID=jyr.XZQH START WITH g.ID=?6 CONNECT BY PRIOR g.ID=g.FID)) "
+			+ " AND (?7=0 OR zy.ZYDW=?7) AND (?8=0 OR fz.qynbbh=?8) AND (?9 IS NULL OR zy.WPBH=?9) "
+			+ " AND zy.BGSJ>=?10 AND zy.BGSJ<=?11 " + " GROUP BY fz.QYNBBH) t "
+			+ " JOIN T_YJPT_CG cg ON cg.ID=t.QYNBBH "
+			+ " ORDER BY cg.CGMC ", nativeQuery = true)
+	public List<Object[]> countByCg(int recordStatus, String inorout,
+			String mao, String szdId, Long gqId, Long xzqh, Long jyrId,
+			Long bwId, String whbh, Date startTime, Date stopTime);
 
+	
+	/**
+	 * 根据 审批状态/进出港/内外贸/所在地/所在港区/行政区划/经营人/泊位/危货编号，统计经营人堆场的危货作业数量
+	 */
+	@Query(value = " SELECT t.COUNT_NUM,dc.ID,dc.DCMC FROM "
+			+ " (SELECT COUNT(1) COUNT_NUM,fz.QYNBBH QYNBBH FROM T_YJPT_WXHWGKZYSBD zy "
+			+ " JOIN T_YJPT_GKWXHWZYFZBL_FZ fz ON fz.ID=zy.ZYDDQYBH AND fz.ZYCS=10000503  "
+			+ " JOIN T_YJPT_JYRJCXX jyr ON jyr.ID=zy.ZYDW "
+			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=4 OR zy.RECORD_STATUS=5 OR zy.RECORD_STATUS=6 OR zy.RECORD_STATUS=7 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
+			+ " AND (?1=0 OR zy.RECORD_STATUS=?1) AND (?2 IS NULL OR zy.INOROUT=?2) AND (?3 IS NULL OR zy.MAO=?3) "
+			+ " AND (zy.SZD like ?4) AND (?5=0 OR zy.SZGQ=?5) AND (?6=0 OR EXISTS (SELECT ID FROM T_YJPT_GGDM g WHERE g.ID=jyr.XZQH START WITH g.ID=?6 CONNECT BY PRIOR g.ID=g.FID)) "
+			+ " AND (?7=0 OR zy.ZYDW=?7) AND (?8=0 OR fz.qynbbh=?8) AND (?9 IS NULL OR zy.WPBH=?9) "
+			+ " AND zy.BGSJ>=?10 AND zy.BGSJ<=?11 " + " GROUP BY fz.QYNBBH) t "
+			+ " JOIN T_YJPT_JYRXX_DC dc ON dc.ID=t.QYNBBH "
+			+ " ORDER BY dc.DCMC ", nativeQuery = true)
+	public List<Object[]> countByDc(int recordStatus, String inorout,
+			String mao, String szdId, Long gqId, Long xzqh, Long jyrId,
+			Long bwId, String whbh, Date startTime, Date stopTime);
+	
+	/**
+	 * 根据 审批状态/进出港/内外贸/所在地/所在港区/行政区划/经营人/泊位/危货编号，统计经营人仓库的危货作业数量
+	 */
+	@Query(value = " SELECT t.COUNT_NUM,ck.ID,ck.CKMC FROM "
+			+ " (SELECT COUNT(1) COUNT_NUM,fz.QYNBBH QYNBBH FROM T_YJPT_WXHWGKZYSBD zy "
+			+ " JOIN T_YJPT_GKWXHWZYFZBL_FZ fz ON fz.ID=zy.ZYDDQYBH AND fz.ZYCS=10000504  "
+			+ " JOIN T_YJPT_JYRJCXX jyr ON jyr.ID=zy.ZYDW "
+			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=4 OR zy.RECORD_STATUS=5 OR zy.RECORD_STATUS=6 OR zy.RECORD_STATUS=7 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
+			+ " AND (?1=0 OR zy.RECORD_STATUS=?1) AND (?2 IS NULL OR zy.INOROUT=?2) AND (?3 IS NULL OR zy.MAO=?3) "
+			+ " AND (zy.SZD like ?4) AND (?5=0 OR zy.SZGQ=?5) AND (?6=0 OR EXISTS (SELECT ID FROM T_YJPT_GGDM g WHERE g.ID=jyr.XZQH START WITH g.ID=?6 CONNECT BY PRIOR g.ID=g.FID)) "
+			+ " AND (?7=0 OR zy.ZYDW=?7) AND (?8=0 OR fz.qynbbh=?8) AND (?9 IS NULL OR zy.WPBH=?9) "
+			+ " AND zy.BGSJ>=?10 AND zy.BGSJ<=?11 " + " GROUP BY fz.QYNBBH) t "
+			+ " JOIN T_YJPT_JYRXX_CK ck ON ck.ID=t.QYNBBH "
+			+ " ORDER BY ck.CKMC ", nativeQuery = true)
+	public List<Object[]> countByCk(int recordStatus, String inorout,
+			String mao, String szdId, Long gqId, Long xzqh, Long jyrId,
+			Long bwId, String whbh, Date startTime, Date stopTime);
+	
+	
+	/**
+	 * 根据 审批状态/进出港/内外贸/所在地/所在港区/行政区划/经营人/泊位/危货编号，统计经营人过驳区的危货作业数量
+	 */
+	@Query(value = " SELECT t.COUNT_NUM,t.QYNBBH,t.QYNBBH FROM "
+			+ " (SELECT COUNT(1) COUNT_NUM,fz.QYNBBH QYNBBH FROM T_YJPT_WXHWGKZYSBD zy "
+			+ " JOIN T_YJPT_GKWXHWZYFZBL_FZ fz ON fz.ID=zy.ZYDDQYBH AND fz.ZYCS=10000505 "
+			+ " JOIN T_YJPT_JYRJCXX jyr ON jyr.ID=zy.ZYDW "
+			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=4 OR zy.RECORD_STATUS=5 OR zy.RECORD_STATUS=6 OR zy.RECORD_STATUS=7 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
+			+ " AND (?1=0 OR zy.RECORD_STATUS=?1) AND (?2 IS NULL OR zy.INOROUT=?2) AND (?3 IS NULL OR zy.MAO=?3) "
+			+ " AND (zy.SZD like ?4) AND (?5=0 OR zy.SZGQ=?5) AND (?6=0 OR EXISTS (SELECT ID FROM T_YJPT_GGDM g WHERE g.ID=jyr.XZQH START WITH g.ID=?6 CONNECT BY PRIOR g.ID=g.FID)) "
+			+ " AND (?7=0 OR zy.ZYDW=?7) AND (?8=0 OR fz.qynbbh=?8) AND (?9 IS NULL OR zy.WPBH=?9) "
+			+ " AND zy.BGSJ>=?10 AND zy.BGSJ<=?11 " + " GROUP BY fz.QYNBBH) t "
+			 , nativeQuery = true)
+	public List<Object[]> countByGbq(int recordStatus, String inorout,
+			String mao, String szdId, Long gqId, Long xzqh, Long jyrId,
+			Long bwId, String whbh, Date startTime, Date stopTime);
+	
+	
 	/**
 	 * 根据 审批状态/进出港/内外贸/所在地/所在港区/行政区划/经营人/泊位/危货编号，统计危货品名的危货作业数量
 	 */
 	@Query(value = " SELECT COUNT(1) COUNT_NUM,zy.WPBH WXWPMC,zy.WXHWMCBH WXHWMCBH FROM T_YJPT_WXHWGKZYSBD zy "
-			+ " JOIN T_YJPT_GKWXHWZYFZBL_FZ fz ON fz.ID=zy.ZYDDQYBH AND fz.ZYCS=10000501  "
+			+ " JOIN T_YJPT_GKWXHWZYFZBL_FZ fz ON fz.ID=zy.ZYDDQYBH AND fz.ZYCS=?12  "
 			+ " JOIN T_YJPT_JYRJCXX jyr ON jyr.ID=zy.ZYDW "
-			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
+			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=4 OR zy.RECORD_STATUS=5 OR zy.RECORD_STATUS=6 OR zy.RECORD_STATUS=7 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
 			+ " AND (?1=0 OR zy.RECORD_STATUS=?1) AND (?2 IS NULL OR zy.INOROUT=?2) AND (?3 IS NULL OR zy.MAO=?3) "
 			+ " AND (zy.SZD like ?4) AND (?5=0 OR zy.SZGQ=?5) AND (?6=0 OR EXISTS (SELECT ID FROM T_YJPT_GGDM g WHERE g.ID=jyr.XZQH START WITH g.ID=?6 CONNECT BY PRIOR g.ID=g.FID)) "
 			+ " AND (?7=0 OR zy.ZYDW=?7) AND (?8=0 OR fz.qynbbh=?8) AND (?9 IS NULL OR zy.WPBH=?9) "
@@ -1045,16 +1122,16 @@ public interface ZysqbpDao extends MyRepository<ZysqbpEntity, Long> {
 			+ " GROUP BY zy.WPBH,zy.WXHWMCBH ORDER BY COUNT_NUM DESC ", nativeQuery = true)
 	public List<Object[]> countByWhpm(int recordStatus, String inorout,
 			String mao, String szdId, Long gqId, Long xzqh, Long jyrId,
-			Long bwId, String whbh, Date startTime, Date stopTime);
+			Long bwId, String whbh, Date startTime,Date stopTime,Long zycs);
 
 	/**
 	 * 根据 审批状态/进出港/内外贸/所在地/所在港区/行政区划/经营人/泊位/危货编号，统计危货品名的危货作业数量(前n条)
 	 */
 	@Query(value = " SELECT COUNT_NUM,WXWPMC,WXHWMCBH FROM "
 			+ " (SELECT COUNT(1) COUNT_NUM,zy.WPBH WXWPMC,zy.WXHWMCBH WXHWMCBH FROM T_YJPT_WXHWGKZYSBD zy "
-			+ " JOIN T_YJPT_GKWXHWZYFZBL_FZ fz ON fz.ID=zy.ZYDDQYBH AND fz.ZYCS=10000501  "
+			+ " JOIN T_YJPT_GKWXHWZYFZBL_FZ fz ON fz.ID=zy.ZYDDQYBH AND fz.ZYCS=?13  "
 			+ " JOIN T_YJPT_JYRJCXX jyr ON jyr.ID=zy.ZYDW "
-			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
+			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=4 OR zy.RECORD_STATUS=5 OR zy.RECORD_STATUS=6 OR zy.RECORD_STATUS=7 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
 			+ " AND (?1=0 OR zy.RECORD_STATUS=?1) AND (?2 IS NULL OR zy.INOROUT=?2) AND (?3 IS NULL OR zy.MAO=?3) "
 			+ " AND (zy.SZD like ?4) AND (?5=0 OR zy.SZGQ=?5) AND (?6=0 OR EXISTS (SELECT ID FROM T_YJPT_GGDM g WHERE g.ID=jyr.XZQH START WITH g.ID=?6 CONNECT BY PRIOR g.ID=g.FID)) "
 			+ " AND (?7=0 OR zy.ZYDW=?7) AND (?8=0 OR fz.qynbbh=?8) AND (?9 IS NULL OR zy.WPBH=?9) "
@@ -1063,16 +1140,16 @@ public interface ZysqbpDao extends MyRepository<ZysqbpEntity, Long> {
 			+ " WHERE ROWNUM<?12 ", nativeQuery = true)
 	public List<Object[]> countByWhpmTop(int recordStatus, String inorout,
 			String mao, String szdId, Long gqId, Long xzqh, Long jyrId,
-			Long bwId, String whbh, Date startTime, Date stopTime, int n);
+			Long bwId, String whbh, Date startTime, Date stopTime, int n,Long zycs);
 
 	/**
 	 * 根据 审批状态/进出港/内外贸/所在地/所在港区/行政区划/经营人/泊位/危货编号，统计经营人的危货作业数量(大于0)
 	 */
 	@Query(value = " SELECT t.COUNT_NUM,jyr.ID,jyr.GKJYR FROM "
 			+ " (SELECT COUNT(1) COUNT_NUM,zy.ZYDW ZYDW FROM T_YJPT_WXHWGKZYSBD zy "
-			+ " JOIN T_YJPT_GKWXHWZYFZBL_FZ fz ON fz.ID=zy.ZYDDQYBH AND fz.ZYCS=10000501  "
+			+ " JOIN T_YJPT_GKWXHWZYFZBL_FZ fz ON fz.ID=zy.ZYDDQYBH AND fz.ZYCS=?12  "
 			+ " JOIN T_YJPT_JYRJCXX jyr ON jyr.ID=zy.ZYDW "
-			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
+			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=4 OR zy.RECORD_STATUS=5 OR zy.RECORD_STATUS=6 OR zy.RECORD_STATUS=7 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
 			+ " AND (?1=0 OR zy.RECORD_STATUS=?1) AND (?2 IS NULL OR zy.INOROUT=?2) AND (?3 IS NULL OR zy.MAO=?3) "
 			+ " AND (zy.SZD like ?4) AND (?5=0 OR zy.SZGQ=?5) AND (?6=0 OR EXISTS (SELECT ID FROM T_YJPT_GGDM g WHERE g.ID=jyr.XZQH START WITH g.ID=?6 CONNECT BY PRIOR g.ID=g.FID)) "
 			+ " AND (?7=0 OR zy.ZYDW=?7) AND (?8=0 OR fz.qynbbh=?8) AND (?9 IS NULL OR zy.WPBH=?9) "
@@ -1082,16 +1159,16 @@ public interface ZysqbpDao extends MyRepository<ZysqbpEntity, Long> {
 			+ " ORDER BY jyr.GKJYR ", nativeQuery = true)
 	public List<Object[]> countByJyrExist(int recordStatus, String inorout,
 			String mao, String szdId, Long gqId, Long xzqh, Long jyrId,
-			Long bwId, String whbh, Date startTime, Date stopTime);
+			Long bwId, String whbh, Date startTime, Date stopTime,Long zycs);
 
 	/**
 	 * 根据 审批状态/进出港/内外贸/所在地/所在港区/行政区划/经营人/泊位/危货编号，统计经营人的危货作业数量
 	 */
 	@Query(value = " SELECT t.COUNT_NUM,jyr.ID,jyr.GKJYR FROM "
 			+ " (SELECT COUNT(1) COUNT_NUM,zy.ZYDW ZYDW FROM T_YJPT_WXHWGKZYSBD zy "
-			+ " JOIN T_YJPT_GKWXHWZYFZBL_FZ fz ON fz.ID=zy.ZYDDQYBH AND fz.ZYCS=10000501  "
+			+ " JOIN T_YJPT_GKWXHWZYFZBL_FZ fz ON fz.ID=zy.ZYDDQYBH AND fz.ZYCS=?12  "
 			+ " JOIN T_YJPT_JYRJCXX jyr ON jyr.ID=zy.ZYDW "
-			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
+			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=4 OR zy.RECORD_STATUS=5 OR zy.RECORD_STATUS=6 OR zy.RECORD_STATUS=7 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
 			+ " AND (?1=0 OR zy.RECORD_STATUS=?1) AND (?2 IS NULL OR zy.INOROUT=?2) AND (?3 IS NULL OR zy.MAO=?3) "
 			+ " AND (zy.SZD like ?4) AND (?5=0 OR zy.SZGQ=?5) AND (?6=0 OR EXISTS (SELECT ID FROM T_YJPT_GGDM g WHERE g.ID=jyr.XZQH START WITH g.ID=?6 CONNECT BY PRIOR g.ID=g.FID)) "
 			+ " AND (?7=0 OR zy.ZYDW=?7) AND (?8=0 OR fz.qynbbh=?8) AND (?9 IS NULL OR zy.WPBH=?9) "
@@ -1100,7 +1177,7 @@ public interface ZysqbpDao extends MyRepository<ZysqbpEntity, Long> {
 			+ " ORDER BY jyr.GKJYR ", nativeQuery = true)
 	public List<Object[]> countByJyr(int recordStatus, String inorout,
 			String mao, String szdId, Long gqId, Long xzqh, Long jyrId,
-			Long bwId, String whbh, Date startTime, Date stopTime);
+			Long bwId, String whbh, Date startTime, Date stopTime,Long zycs);
 
 	/**
 	 * 根据 审批状态/进出港/内外贸/所在地/所在港区/行政区划/经营人/泊位/危货编号，统计危货作业数量
@@ -1113,16 +1190,16 @@ public interface ZysqbpDao extends MyRepository<ZysqbpEntity, Long> {
 	 *            1内贸/2外贸
 	 */
 	@Query(value = " SELECT COUNT(1) FROM T_YJPT_WXHWGKZYSBD zy "
-			+ "  JOIN T_YJPT_GKWXHWZYFZBL_FZ fz ON fz.ID=zy.ZYDDQYBH AND fz.ZYCS=10000501 "
+			+ "  JOIN T_YJPT_GKWXHWZYFZBL_FZ fz ON fz.ID=zy.ZYDDQYBH AND fz.ZYCS=?12 "
 			+ "  JOIN T_YJPT_JYRJCXX jyr ON jyr.ID=zy.ZYDW "
-			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
+			+ " WHERE (zy.RECORD_STATUS=2 OR zy.RECORD_STATUS=3 OR zy.RECORD_STATUS=4 OR zy.RECORD_STATUS=5 OR zy.RECORD_STATUS=6 OR zy.RECORD_STATUS=7 OR zy.RECORD_STATUS=8 OR zy.RECORD_STATUS=10) "
 			+ " AND (?1=0 OR zy.RECORD_STATUS=?1) AND (?2 IS NULL OR zy.INOROUT=?2) AND (?3 IS NULL OR zy.MAO=?3) "
 			+ " AND (zy.SZD like ?4) AND (?5=0 OR zy.SZGQ=?5) AND (?6=0 OR EXISTS (SELECT ID FROM T_YJPT_GGDM g WHERE g.ID=jyr.XZQH START WITH g.ID=?6 CONNECT BY PRIOR g.ID=g.FID)) "
 			+ " AND (?7=0 OR zy.ZYDW=?7) AND (?8=0 OR fz.qynbbh=?8) AND (?9 IS NULL OR zy.WPBH=?9) "
 			+ " AND zy.BGSJ>=?10 AND zy.BGSJ<=?11 ", nativeQuery = true)
 	public List<Object> countTotalByAll(int recordStatus, String inorout,
 			String mao, String szdId, Long gqId, Long xzqh, Long jyrId,
-			Long bwId, String whbh, Date startTime, Date stopTime);
+			Long bwId, String whbh, Date startTime, Date stopTime,Long zycs);
 
 	@Query(value = "select * from T_YJPT_WXHWGKZYSBD where add_date>=?1 and add_date<=?2 and rownum<=200", nativeQuery = true)
 	public List<ZysqbpEntity> query(Timestamp kssj, Timestamp jssj);

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

@@ -5,6 +5,7 @@ public class ZysqbpGatherEntity {
 	private String yfxkz;
 	private String xkzzb;
 	private String yfwhzyz;
+	private String yfwhzyzqys;//plus by xuhao 2017-03-15 已发危货作业附证的企业数（一家企业可以有多个附证）
 	private String yfwhzb;
 	private String qyzrs;
 	private String aqglrs;
@@ -53,6 +54,12 @@ public class ZysqbpGatherEntity {
 	public void setYfwhzyz(String yfwhzyz) {
 		this.yfwhzyz = yfwhzyz;
 	}
+	public String getYfwhzyzqys() {
+		return yfwhzyzqys;
+	}
+	public void setYfwhzyzqys(String yfwhzyzqys) {
+		this.yfwhzyzqys = yfwhzyzqys;
+	}
 	public String getYfwhzb() {
 		return yfwhzb;
 	}

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

@@ -138,8 +138,7 @@ public abstract class BaseWorkFlowServiceImpl<T extends BaseEntity<ID>, ID exten
 		String key = getProcessDefinitionKey();
 		Assert.hasLength(key);
 		inCreate(param, variables);
-		String processInstanceId = workflowMangerService.create(param,
-				variables, key);
+		String processInstanceId = workflowMangerService.create(param,variables, key);
 		workflowMangerService.autoComplete(param, processInstanceId, variables);
 		return processInstanceId;
 	}
@@ -170,8 +169,7 @@ public abstract class BaseWorkFlowServiceImpl<T extends BaseEntity<ID>, ID exten
 	 * @return
 	 */
 	public Task getTaskByUserAndBusKey(String user, String businessKey) {
-		return workflowMangerService.getTaskByUserAndBusKey(user, businessKey,
-				getProcessDefinitionKey());
+		return workflowMangerService.getTaskByUserAndBusKey(user, businessKey,getProcessDefinitionKey());
 	}
 
 	/**
@@ -182,8 +180,7 @@ public abstract class BaseWorkFlowServiceImpl<T extends BaseEntity<ID>, ID exten
 	 * @return
 	 */
 	public Task getCandidateTaskByUserAndBusKey(String user, String businessKey) {
-		return workflowMangerService.getCandidateTaskByUserAndBusKey(user,
-				businessKey, getProcessDefinitionKey());
+		return workflowMangerService.getCandidateTaskByUserAndBusKey(user,businessKey, getProcessDefinitionKey());
 	}
 
 	/**

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

@@ -450,28 +450,24 @@ public class DcServiceImpl extends BaseWorkFlowServiceImpl<DcEntity, Long>
 		data = this.save(data);
 		Map<String, Object> variables = new HashMap<String, Object>();
 		variables.put(TaskVarListener.KEY_AUTO_COMPLETE, "true");
-		variables.put("role_jyr", Constants.ROLE_TYPE_PTJYR + ":"
-				+ data.getBdcdw().getId());
+		variables.put("role_jyr", Constants.ROLE_TYPE_PTJYR + ":" + data.getBdcdw().getId());
 		variables.put("wf.kzsc", Constants.ROLE_TYPE_CITY_KZSC);
 		variables.put("wf.sh", Constants.ROLE_TYPE_CITY_SH);
 		variables.put("wf.pz", Constants.ROLE_TYPE_CITY_PZ);
 		variables.put("wf.sc", Constants.ROLE_TYPE_CITY_SC);
 		// 开关控制是否需要市级领导审批还是直接下发
-		variables.put(WorkFlowParam.AUDIT_PASS,
-				Constants.DC_SJSH.equals(Constants.YES));
+		variables.put(WorkFlowParam.AUDIT_PASS,Constants.DC_SJSH.equals(Constants.YES));
 		variables.put(WorkflowMangerServiceImpl.KEY_SZD_ID, data.getBdcdw().getSzd().getId());
 		WorkFlowParam param = new WorkFlowParam();
 		param.put(WorkFlowParam.DESCRIPTION, data.getBdcdw().getGkjyr() +  "的督查");
 		// 设置流程发起人
 		if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
 			if (StringUtils.isEmpty(param.getString(WorkFlowParam.AUDIT_USER))) {
-				param.put(WorkFlowParam.AUDIT_USER, Utils.getCurrentUser()
-						.getId().toString());
+				param.put(WorkFlowParam.AUDIT_USER, Utils.getCurrentUser().getId().toString());
 			}
 		} else {
 			if (StringUtils.isEmpty(param.getString(WorkFlowParam.AUDIT_USER))) {
-				param.put(WorkFlowParam.AUDIT_USER, GlobalData.TB_USER.getId()
-						.toString());
+				param.put(WorkFlowParam.AUDIT_USER, GlobalData.TB_USER.getId().toString());
 			}
 		}
 		param.put(WorkFlowParam.BUSINESS_KEY, data.getId());

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

@@ -510,13 +510,11 @@ public class WorkflowMangerServiceImpl implements WorkflowMangerService {
 	}
 
 	@Override
-	public String create(WorkFlowParam param, Map<String, Object> variables,
-			String processDefinitionKey) {
+	public String create(WorkFlowParam param, Map<String, Object> variables, String processDefinitionKey) {
 		// 流程定义key存在判断
 		Assert.hasLength(processDefinitionKey);
 		// 设置流程启动人
-		identityService.setAuthenticatedUserId(param.get(
-				WorkFlowParam.AUDIT_USER).toString());
+		identityService.setAuthenticatedUserId(param.get(WorkFlowParam.AUDIT_USER).toString());
 		ProcessInstance processInstance = null;
 		String businessKey = param.get(WorkFlowParam.BUSINESS_KEY).toString();
 		if (!StringUtils.hasLength(businessKey)) {
@@ -530,52 +528,36 @@ public class WorkflowMangerServiceImpl implements WorkflowMangerService {
 				.processInstanceBusinessKey(businessKey, processDefinitionKey)
 				.list();
 		if (null != processList_0 && processList_0.size() > 0) {
-			throw new SysException("record had already started process!"
-					+ processList_0);
+			throw new SysException("record had already started process!" + processList_0);
 		}
 		if (Utils.getCurrentUser() != null) {
 			UserEntity user = Utils.getCurrentUser();
-			variables.put(WorkflowMangerServiceImpl.KEY_SENDER_ID, user.getId()
-					.toString());
-			variables.put(WorkflowMangerServiceImpl.KEY_SENDER_NAME,
-					user.getName());
+			variables.put(WorkflowMangerServiceImpl.KEY_SENDER_ID, user.getId().toString());
+			variables.put(WorkflowMangerServiceImpl.KEY_SENDER_NAME,user.getName());
 			if (variables.get(WorkflowMangerServiceImpl.KEY_SZD_ID) == null) {
 				if (user.getSzd() != null) {
-					variables.put(WorkflowMangerServiceImpl.KEY_SZD_ID, user
-							.getSzd().getId());
+					variables.put(WorkflowMangerServiceImpl.KEY_SZD_ID, user.getSzd().getId());
 				}
 			}
 			if (Constants.YES.equals(user.getSfjyr())) {
 				if (user.getJyrjcxx() != null) {
-					variables.put(WorkflowMangerServiceImpl.KEY_SEND_DEPT, user
-							.getJyrjcxx().getGkjyr());
+					variables.put(WorkflowMangerServiceImpl.KEY_SEND_DEPT, user.getJyrjcxx().getGkjyr());
 				} else if (user.getJsdw() != null) {
-					variables.put(WorkflowMangerServiceImpl.KEY_SEND_DEPT, user
-							.getJsdw().getName());
+					variables.put(WorkflowMangerServiceImpl.KEY_SEND_DEPT, user.getJsdw().getName());
 				} else if (user.getAqpjjg() != null) {
-					variables.put(WorkflowMangerServiceImpl.KEY_SEND_DEPT, user
-							.getAqpjjg().getJgmc());
+					variables.put(WorkflowMangerServiceImpl.KEY_SEND_DEPT, user.getAqpjjg().getJgmc());
 				}
-			} else if (Constants.DEPLOY_MODE_PROVINCE
-					.equals(GlobalData.DEPLOY_MODE)) {
-				variables.put(WorkflowMangerServiceImpl.KEY_SEND_DEPT,
-						Utils.getResource("common", "main.ssd.province"));
-			} else if (Constants.DEPLOY_MODE_CITY
-					.equals(GlobalData.DEPLOY_MODE)) {
-				CodeEntity szd = codeDao
-						.findOne(new Long(GlobalData.CITY_CODE));
+			} else if (Constants.DEPLOY_MODE_PROVINCE.equals(GlobalData.DEPLOY_MODE)) {
+				variables.put(WorkflowMangerServiceImpl.KEY_SEND_DEPT,Utils.getResource("common", "main.ssd.province"));
+			} else if (Constants.DEPLOY_MODE_CITY.equals(GlobalData.DEPLOY_MODE)) {
+				CodeEntity szd = codeDao.findOne(new Long(GlobalData.CITY_CODE));
 				if (szd != null) {
-					variables.put(
-							WorkflowMangerServiceImpl.KEY_SEND_DEPT,
-							Utils.getResource("select", szd.getName())
-									+ Utils.getResource("common",
-											"main.ssd.city"));
+					variables.put(WorkflowMangerServiceImpl.KEY_SEND_DEPT,Utils.getResource("select", szd.getName())+ Utils.getResource("common","main.ssd.city"));
 				}
 			}
 		}
 		// 启动流程
-		processInstance = runtimeService.startProcessInstanceByKey(
-				processDefinitionKey, businessKey, variables);
+		processInstance = runtimeService.startProcessInstanceByKey(processDefinitionKey, businessKey, variables);
 		// 查询当前任务
 		List<Task> taskList = getProcessActiveTasks(processInstance.getId());
 		if (null != taskList) {
@@ -586,39 +568,30 @@ public class WorkflowMangerServiceImpl implements WorkflowMangerService {
 				// 保存工作流记录
 				taskInfoService.save(getTaskInfoFromTask(t));
 				// 更新权力阳光办件过程信息
-				String processKey = t.getProcessDefinitionId().substring(0,
-						t.getProcessDefinitionId().indexOf(":"));
-				String internalNo = param
-						.getString(WorkFlowParam.QLYG_INTERNAL_NO);
+				String processKey = t.getProcessDefinitionId().substring(0,t.getProcessDefinitionId().indexOf(":"));
+				String internalNo = param.getString(WorkFlowParam.QLYG_INTERNAL_NO);
 				List<ApplyEntity> al = applyDao.findByInternalNo(internalNo);
 				ApplyEntity apply = null;
 				if (al != null && al.size() > 0) {
 					apply = al.get(0);
 				}
 				if (Constants.YES.equals(GlobalData.QLYG_SYNC)) {
-					if (GlobalData.qlygApplyItemMap.get(processKey) != null
-							&& GlobalData.qlygApplyItemMap.get(processKey).get(
-									t.getTaskDefinitionKey()) != null) {
+					if (GlobalData.qlygApplyItemMap.get(processKey) != null && GlobalData.qlygApplyItemMap.get(processKey).get(t.getTaskDefinitionKey()) != null) {
 						ApplyProcessEntity newProcess = new ApplyProcessEntity();
-						newProcess
-								.setId(generateEntityId(Constants.SEQ_T_QLYG_APPLY_PROCESS));
+						newProcess.setId(generateEntityId(Constants.SEQ_T_QLYG_APPLY_PROCESS));
 						String dept_code = GlobalData.DEPT_CODE;
 						if (Utils.getCurrentUser() != null) {
-							dept_code = Utils.getCurrentUser().getSzd()
-									.getByzd4()
-									+ "JT";
+							dept_code = Utils.getCurrentUser().getSzd().getByzd4()+ "JT";
 						}
 						newProcess.setOrgId(dept_code);
 						// 流水号
-						newProcess.setNo(generateQlygNo(dept_code,
-								newProcess.getId()));
+						newProcess.setNo(generateQlygNo(dept_code,newProcess.getId()));
 						newProcess.setNoOrd(1);
 						newProcess.setInternalNo(internalNo);
 						newProcess.setInfApplyId(apply);
 						newProcess.setItemId(apply.getItemId());
 						newProcess.setCreateDate(new Date());
-						Utils.setApplyItemProperties(newProcess, processKey,
-								t.getTaskDefinitionKey());
+						Utils.setApplyItemProperties(newProcess, processKey,t.getTaskDefinitionKey());
 						// 环节到期时间
 						newProcess.setApplyDueDate(Utils.getDueDate(
 								newProcess.getCreateDate(),
@@ -864,16 +837,14 @@ public class WorkflowMangerServiceImpl implements WorkflowMangerService {
 	 * @param processDefinitionKey
 	 * @return
 	 */
-	public Task getTaskByUserAndBusKey(String user, String businessKey,
-			String processDefinitionKey) {
+	public Task getTaskByUserAndBusKey(String user, String businessKey,String processDefinitionKey) {
 		Task task = taskService
 				.createTaskQuery()
 				.processDefinitionKey(processDefinitionKey)
 				.taskAssignee(user)
 				.active()
 				.orderByTaskPriority()
-				.processInstanceBusinessKey(
-						processDefinitionKey + BUSKEYSEP + businessKey).desc()
+				.processInstanceBusinessKey(processDefinitionKey + BUSKEYSEP + businessKey).desc()
 				.orderByTaskCreateTime().desc().singleResult();
 		if (task != null) {
 			Object szdId = taskService.getVariable(task.getId(), KEY_SZD_ID);
@@ -882,8 +853,7 @@ public class WorkflowMangerServiceImpl implements WorkflowMangerService {
 					&& null != Utils.getCurrentUser().getSzd()
 					&& null != szdId
 					// && !szdId.equals(Utils.getCurrentUser().getSzd().getId())
-					&& String.valueOf(szdId).indexOf(
-							Utils.getCurrentUser().getSzd().getByzd2()) != 0) {
+					&& String.valueOf(szdId).indexOf(Utils.getCurrentUser().getSzd().getByzd2()) != 0) {
 				return null;
 			}
 		}
@@ -898,16 +868,14 @@ public class WorkflowMangerServiceImpl implements WorkflowMangerService {
 	 * @param processDefinitionKey
 	 * @return
 	 */
-	public Task getCandidateTaskByUserAndBusKey(String user,
-			String businessKey, String processDefinitionKey) {
+	public Task getCandidateTaskByUserAndBusKey(String user,String businessKey, String processDefinitionKey) {
 		Task task = taskService
 				.createTaskQuery()
 				.processDefinitionKey(processDefinitionKey)
 				.taskCandidateUser(user)
 				.active()
 				.orderByTaskPriority()
-				.processInstanceBusinessKey(
-						processDefinitionKey + BUSKEYSEP + businessKey).desc()
+				.processInstanceBusinessKey(processDefinitionKey + BUSKEYSEP + businessKey).desc()
 				.orderByTaskCreateTime().desc().singleResult();
 		if (task != null) {
 			Object szdId = taskService.getVariable(task.getId(), KEY_SZD_ID);
@@ -916,8 +884,7 @@ public class WorkflowMangerServiceImpl implements WorkflowMangerService {
 					&& null != Utils.getCurrentUser().getSzd()
 					&& null != szdId
 					// && !szdId.equals(Utils.getCurrentUser().getSzd().getId())
-					&& String.valueOf(szdId).indexOf(
-							Utils.getCurrentUser().getSzd().getByzd2()) != 0) {
+					&& String.valueOf(szdId).indexOf(Utils.getCurrentUser().getSzd().getByzd2()) != 0) {
 				return null;
 			}
 		}

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

@@ -217,35 +217,30 @@ public class ZysqbpServiceImpl extends
 
 	@Override
 	public <S extends ZysqbpEntity> S submit(String currentRoleCode, S data) {
-		String url = Thread.currentThread().getStackTrace()[2].getClassName()
-				+ "."
-				+ Thread.currentThread().getStackTrace()[2].getMethodName();
+		String url = Thread.currentThread().getStackTrace()[2].getClassName() + "." + Thread.currentThread().getStackTrace()[2].getMethodName();
 		String zyddString;
-		if (data.getZyddqybh() != null)
-			zyddString = data.getZyddqybh().getQynbmc() != null ? data
-					.getZyddqybh().getQynbmc() : "";
+		if (data.getZyddqybh() != null){
+			zyddString = data.getZyddqybh().getQynbmc() != null ? data.getZyddqybh().getQynbmc() : "";
+		}
 		else {
 			zyddString = data.getZyddqt() != null ? data.getZyddqt() : "";
 		}
 		String cmString = data.getCm() != null ? data.getCm() : "";
 		SimpleDateFormat sdf = new SimpleDateFormat(" yyyy-MM-dd HH:mm:ss ");
-		String kasj = data.getZysjq() != null ? sdf.format(data.getZysjq())
-				: "";
+		String kasj = data.getZysjq() != null ? sdf.format(data.getZysjq()) : "";
+		
 		if (data.getRecordStatus() == BaseEntity.RECORD_STATE_REJECT) {
+			//被退回的数据重新提交
 			data.setRecordStatus(BaseEntity.RECORD_STATE_SUBMIT);
-			String str = sdf.format(data.getAddDate()).concat(
-					data.getId().toString());
+			String str = sdf.format(data.getAddDate()).concat(data.getId().toString());
 			data.setBh(str);
 			data = this.save(data);
 			Map<String, Object> variables = new HashMap<String, Object>();
 			WorkFlowParam param = new WorkFlowParam();
 			param.put(WorkFlowParam.BUSINESS_KEY, data.getId());
 			param.put(WorkFlowParam.IS_AUDIT, "false");
-			param.put(WorkFlowParam.DESCRIPTION, "船名为" + cmString + ",在作业地点"
-					+ zyddString + "于" + kasj + "开始作业的申报");
-			Task task = workService.getTaskByUserAndBusKey(Utils
-					.getCurrentUser().getId().toString(), data.getId()
-					.toString(), ZysqbpEntity.PROCESS_DEFINITION_KEY);
+			param.put(WorkFlowParam.DESCRIPTION, "船名为" + cmString + ",在作业地点" + zyddString + "于" + kasj + "开始作业的申报");
+			Task task = workService.getTaskByUserAndBusKey(Utils.getCurrentUser().getId().toString(), data.getId().toString(), ZysqbpEntity.PROCESS_DEFINITION_KEY);
 			// if(flag==false){
 			// Authentication.setAuthenticatedUserId(Utils.getCurrentUser().getId().toString());
 			// }
@@ -259,31 +254,32 @@ public class ZysqbpServiceImpl extends
 				LOGGER.equals(url + "<EORROR> 获取编号 generateNoByNoRule  ");
 				e.printStackTrace();
 			}
+			
+			//权力阳光
 			if (Constants.YES.equals(GlobalData.QLYG_SYNC)) {
 				// 同步生成办件信息
 				this.saveApply(data);
 			}
+			
 			// 自动审批
 			Date startTime = null;
 			Date stopTime = null;
 			Date nowTime = new Date();
-			List<UserEntity> userlist = userDao
-					.queryByzd(data.getSzd().getId());
+			//获得被设置为自动审批人的人员entity，同一级所在地，应该只设置一个人，此处也只取一人
+			List<UserEntity> userlist = userDao.queryByzd(data.getSzd().getId());
 			UserEntity auditor = null;
 			if (userlist != null && userlist.size() > 0) {
 				auditor = userlist.get(0);
 			} 
 			SimpleDateFormat sdf2 = new SimpleDateFormat("yyyyMMdd HHmmss");
-			List<CodeEntity> codeList = InitServlet.groupcodeMap
-					.get(Constants.GROUP_CODE_AUTO_AUDIT);
+			//获得公共代码中设置的自动审批启用时间范围
+			List<CodeEntity> codeList = InitServlet.groupcodeMap.get(Constants.GROUP_CODE_AUTO_AUDIT);
 			if (codeList != null && codeList.size() > 0) {
 				try {
 					for (CodeEntity code : codeList) {
-						if (Constants.GGDM_ID_AUTO_AUDIT_START_TIME.equals(code
-								.getId())) {
+						if (Constants.GGDM_ID_AUTO_AUDIT_START_TIME.equals(code.getId())) {
 							startTime = sdf2.parse(code.getCode());
-						} else if (Constants.GGDM_ID_AUTO_AUDIT_STOP_TIME
-								.equals(code.getId())) {
+						} else if (Constants.GGDM_ID_AUTO_AUDIT_STOP_TIME.equals(code.getId())) {
 							stopTime = sdf2.parse(code.getCode());
 						}
 					}
@@ -291,6 +287,8 @@ public class ZysqbpServiceImpl extends
 					e.printStackTrace();
 				}
 			}
+			
+			//获得单独给此单位设置的自动审批启用时间范围，有则覆盖公共代码中的全局设置
 			if(data.getZydw()!=null && data.getZydw().getZdspsjq()!=null) {
 				startTime = data.getZydw().getZdspsjq();
 			}
@@ -299,29 +297,27 @@ public class ZysqbpServiceImpl extends
 			}
 			Boolean flag = true;
 			Boolean sfsb = true;
+			//是否允许作业货种判断
 			if (data.getZyddqybh().getWxhwm().indexOf("LB") != -1) {
-				sfsb = doCheckJyrAndWxp(data.getZydw().getId(),
-						data.getWxwpmc());
-			}
-			if (startTime != null && nowTime.after(startTime)
-					&& stopTime != null && nowTime.before(stopTime)
-					&& auditor != null && data.getZydw() != null
-					&& Constants.YES.equals(data.getZydw().getSfzdsp()) && flag
-					&& sfsb) {
+				sfsb = doCheckJyrAndWxp(data.getZydw().getId(),data.getWxwpmc());
+			}
+			if (startTime != null 
+				&& nowTime.after(startTime)
+				&& stopTime != null && nowTime.before(stopTime)
+				&& auditor != null && data.getZydw() != null
+				&& Constants.YES.equals(data.getZydw().getSfzdsp()) 
+				&& flag
+				&& sfsb) {
 				// 自动审批添加判断逻辑--------------------
 				Map<String, Object> variables = new HashMap<String, Object>();
-				variables.put("user_pz", auditor.getId() == null ? "" : auditor
-						.getId().toString());
+				variables.put("user_pz", auditor.getId() == null ? "" : auditor.getId().toString());
 				WorkFlowParam param = new WorkFlowParam();
 				param.put(WorkFlowParam.BUSINESS_KEY, data.getId());
 				// 设置流程发起人
-				param.put(WorkFlowParam.AUDIT_USER, Utils.getCurrentUser()
-						.getId().toString());
+				param.put(WorkFlowParam.AUDIT_USER, Utils.getCurrentUser().getId().toString());
 				autoAuditService.create(param, variables);
 				// 自动完成下一步
-				param.put(WorkFlowParam.AUDIT_USER,
-						auditor.getId() == null ? "" : auditor.getId()
-								.toString());
+				param.put(WorkFlowParam.AUDIT_USER,auditor.getId() == null ? "" : auditor.getId().toString());
 				param.put(WorkFlowParam.IS_AUDIT, "true");
 				param.put(WorkFlowParam.AUDIT_DATE, new Date());
 				param.put(WorkFlowParam.AUDIT_TEXT, "同意作业");
@@ -335,16 +331,12 @@ public class ZysqbpServiceImpl extends
 				variables.put("role_xssc", Constants.ROLE_TYPE_CITY_XSSC);
 				WorkFlowParam param = new WorkFlowParam();
 				// 设置流程发起人
-				if (StringUtils.isEmpty(param
-						.getString(WorkFlowParam.AUDIT_USER))) {
-					param.put(WorkFlowParam.AUDIT_USER, Utils.getCurrentUser()
-							.getId().toString());
+				if (StringUtils.isEmpty(param.getString(WorkFlowParam.AUDIT_USER))) {
+					param.put(WorkFlowParam.AUDIT_USER, Utils.getCurrentUser().getId().toString());
 				}
 				param.put(WorkFlowParam.BUSINESS_KEY, data.getId());
 				param.put(WorkFlowParam.QLYG_INTERNAL_NO, data.getBh());
-				param.put(WorkFlowParam.DESCRIPTION, "编号为：" + data.getBh()
-						+ ",船名为" + cmString + ",在作业地点" + zyddString + "于"
-						+ kasj + "开始作业的申报");
+				param.put(WorkFlowParam.DESCRIPTION, "编号为：" + data.getBh() + ",船名为" + cmString + ",在作业地点" + zyddString + "于" + kasj + "开始作业的申报");
 				// 提交流程
 				create(param, variables);
 			}
@@ -1913,27 +1905,52 @@ public class ZysqbpServiceImpl extends
 
 	public List<ZysqbpCountEntity1> countByJyr(int recordStatus,
 			String inorout, String mao, Long szdId, Long gqId, Long xzqh,
-			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime) {
-		return parseZysqbpCountEntity1List(zysqbpDao.countByJyr(recordStatus,
-				inorout, mao, szdId + "%", gqId, xzqh, jyrId, bwId, whbh,
-				startTime, stopTime), false);
+			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime,Long zycs) {
+		return parseZysqbpCountEntity1List(
+				zysqbpDao.countByJyr(recordStatus,inorout, mao, szdId + "%", gqId, xzqh, jyrId, bwId, whbh,startTime, stopTime,zycs),
+				false);
 	}
 
 	public List<ZysqbpCountEntity1> countByJyrBw(int recordStatus,
 			String inorout, String mao, Long szdId, Long gqId, Long xzqh,
-			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime) {
+			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime,Long zycs) {
 		List<ZysqbpCountEntity1> result = new ArrayList<ZysqbpCountEntity1>();
 		List<ZysqbpCountEntity1> jyrList = parseZysqbpCountEntity1List(
-				zysqbpDao.countByJyr(recordStatus, inorout, mao, szdId + "%",
-						gqId, xzqh, jyrId, bwId, whbh, startTime, stopTime),
+				zysqbpDao.countByJyr(recordStatus, inorout, mao, szdId + "%",gqId, xzqh, jyrId, bwId, whbh, startTime, stopTime,zycs),
 				true);
 		if (jyrList != null && jyrList.size() > 0) {
 			for (ZysqbpCountEntity1 jyr : jyrList) {
 				result.add(jyr);
-				result.addAll(parseZysqbpCountEntity1List(
-						zysqbpDao.countByBw(recordStatus, inorout, mao, szdId
-								+ "%", gqId, xzqh, new Long(jyr.getId()), bwId,
-								whbh, startTime, stopTime), false));
+				if(zycs.equals(Constants.GGDM_ID_ZYDD_BW)){
+					//泊位
+					result.addAll(parseZysqbpCountEntity1List(
+							zysqbpDao.countByBw(recordStatus, inorout, mao, szdId+ "%", gqId, xzqh, new Long(jyr.getId()), bwId,whbh, startTime, stopTime),
+							false));
+				}
+				else if(zycs.equals(Constants.GGDM_ID_ZYDD_CG)){
+					//储罐
+					result.addAll(parseZysqbpCountEntity1List(
+							zysqbpDao.countByCg(recordStatus, inorout, mao, szdId+ "%", gqId, xzqh, new Long(jyr.getId()), bwId,whbh, startTime, stopTime),
+							false));
+				}
+				else if(zycs.equals(zycs== Constants.GGDM_ID_ZYDD_DC)){
+					//堆场
+					result.addAll(parseZysqbpCountEntity1List(
+							zysqbpDao.countByDc(recordStatus, inorout, mao, szdId+ "%", gqId, xzqh, new Long(jyr.getId()), bwId,whbh, startTime, stopTime),
+							false));
+				}
+				else if(zycs.equals(zycs== Constants.GGDM_ID_ZYDD_CK)){
+					//仓库
+					result.addAll(parseZysqbpCountEntity1List(
+							zysqbpDao.countByCk(recordStatus, inorout, mao, szdId+ "%", gqId, xzqh, new Long(jyr.getId()), bwId,whbh, startTime, stopTime),
+							false));
+				}
+				else if(zycs.equals(zycs==Constants.GGDM_ID_ZYDD_GBQ)){
+					//过驳区
+					result.addAll(parseZysqbpCountEntity1List(
+							zysqbpDao.countByGbq(recordStatus, inorout, mao, szdId+ "%", gqId, xzqh, new Long(jyr.getId()), bwId,whbh, startTime, stopTime),
+							false));
+				}
 			}
 		}
 		return result;
@@ -1941,19 +1958,17 @@ public class ZysqbpServiceImpl extends
 
 	public List<ZysqbpCountEntity1> countByJyrBwExist(int recordStatus,
 			String inorout, String mao, Long szdId, Long gqId, Long xzqh,
-			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime) {
+			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime,Long zycs) {
 		List<ZysqbpCountEntity1> result = new ArrayList<ZysqbpCountEntity1>();
 		List<ZysqbpCountEntity1> jyrList = parseZysqbpCountEntity1List(
-				zysqbpDao.countByJyrExist(recordStatus, inorout, mao, szdId
-						+ "%", gqId, xzqh, jyrId, bwId, whbh, startTime,
-						stopTime), true);
+						zysqbpDao.countByJyrExist(recordStatus, inorout, mao, szdId+ "%", gqId, xzqh, jyrId, bwId, whbh, startTime,stopTime,zycs),
+						true);
 		if (jyrList != null && jyrList.size() > 0) {
 			for (ZysqbpCountEntity1 jyr : jyrList) {
 				result.add(jyr);
-				result.addAll(parseZysqbpCountEntity1List(zysqbpDao
-						.countByBwExist(recordStatus, inorout, mao,
-								szdId + "%", gqId, xzqh, new Long(jyr.getId()),
-								bwId, whbh, startTime, stopTime), false));
+				result.addAll(parseZysqbpCountEntity1List(
+						zysqbpDao.countByBwExist(recordStatus, inorout, mao,szdId + "%", gqId, xzqh, new Long(jyr.getId()),bwId, whbh, startTime, stopTime,zycs),
+						false));
 			}
 		}
 		return result;
@@ -1961,19 +1976,17 @@ public class ZysqbpServiceImpl extends
 
 	public List<ZysqbpCountEntity1> countByGqJyr(int recordStatus,
 			String inorout, String mao, Long szdId, Long gqId, Long xzqh,
-			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime) {
+			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime,Long zycs) {
 		List<ZysqbpCountEntity1> result = new ArrayList<ZysqbpCountEntity1>();
 		List<ZysqbpCountEntity1> gqList = parseZysqbpCountEntity1List(
-				zysqbpDao.countByGq(recordStatus, inorout, mao, szdId + "%",
-						gqId, xzqh, jyrId, bwId, whbh, startTime, stopTime),
+				zysqbpDao.countByGq(recordStatus, inorout, mao, szdId + "%",gqId, xzqh, jyrId, bwId, whbh, startTime, stopTime,zycs),
 				true);
 		if (gqList != null && gqList.size() > 0) {
 			for (ZysqbpCountEntity1 gq : gqList) {
 				result.add(gq);
-				result.addAll(parseZysqbpCountEntity1List(zysqbpDao.countByJyr(
-						recordStatus, inorout, mao, szdId + "%",
-						new Long(gq.getId()), xzqh, jyrId, bwId, whbh,
-						startTime, stopTime), false));
+				result.addAll(parseZysqbpCountEntity1List(
+						zysqbpDao.countByJyr(recordStatus, inorout, mao, szdId + "%",new Long(gq.getId()), xzqh, jyrId, bwId, whbh,startTime, stopTime,zycs), 
+						false));
 			}
 		}
 		return result;
@@ -1981,19 +1994,17 @@ public class ZysqbpServiceImpl extends
 
 	public List<ZysqbpCountEntity1> countByGqJyrExist(int recordStatus,
 			String inorout, String mao, Long szdId, Long gqId, Long xzqh,
-			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime) {
+			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime,Long zycs) {
 		List<ZysqbpCountEntity1> result = new ArrayList<ZysqbpCountEntity1>();
 		List<ZysqbpCountEntity1> gqList = parseZysqbpCountEntity1List(
-				zysqbpDao.countByGqExist(recordStatus, inorout, mao, szdId
-						+ "%", gqId, xzqh, jyrId, bwId, whbh, startTime,
-						stopTime), true);
+						zysqbpDao.countByGqExist(recordStatus, inorout, mao, szdId+ "%", gqId, xzqh, jyrId, bwId, whbh, startTime,stopTime,zycs), 
+						true);
 		if (gqList != null && gqList.size() > 0) {
 			for (ZysqbpCountEntity1 gq : gqList) {
 				result.add(gq);
-				result.addAll(parseZysqbpCountEntity1List(zysqbpDao
-						.countByJyrExist(recordStatus, inorout, mao, szdId
-								+ "%", new Long(gq.getId()), xzqh, jyrId, bwId,
-								whbh, startTime, stopTime), false));
+				result.addAll(parseZysqbpCountEntity1List(
+						zysqbpDao.countByJyrExist(recordStatus, inorout, mao, szdId+ "%", new Long(gq.getId()), xzqh, jyrId, bwId,whbh, startTime, stopTime,zycs),
+						false));
 			}
 		}
 		return result;
@@ -2001,19 +2012,17 @@ public class ZysqbpServiceImpl extends
 
 	public List<ZysqbpCountEntity1> countByXzqhJyr(int recordStatus,
 			String inorout, String mao, Long szdId, Long gqId, Long xzqh,
-			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime) {
+			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime,Long zycs) {
 		List<ZysqbpCountEntity1> result = new ArrayList<ZysqbpCountEntity1>();
 		List<ZysqbpCountEntity1> xzqhList = parseZysqbpCountEntity1List(
-				zysqbpDao.countByXzqh(recordStatus, inorout, mao, szdId + "%",
-						gqId, xzqh, jyrId, bwId, whbh, startTime, stopTime,
-						szdId), true);
+				zysqbpDao.countByXzqh(recordStatus, inorout, mao, szdId + "%",gqId, xzqh, jyrId, bwId, whbh, startTime, stopTime,szdId,zycs),
+				true);
 		if (xzqhList != null && xzqhList.size() > 0) {
 			for (ZysqbpCountEntity1 qh : xzqhList) {
 				result.add(qh);
-				result.addAll(parseZysqbpCountEntity1List(zysqbpDao.countByJyr(
-						recordStatus, inorout, mao, szdId + "%", gqId,
-						new Long(qh.getId()), jyrId, bwId, whbh, startTime,
-						stopTime), false));
+				result.addAll(parseZysqbpCountEntity1List(
+						zysqbpDao.countByJyr(recordStatus, inorout, mao, szdId + "%", gqId,new Long(qh.getId()), jyrId, bwId, whbh, startTime,stopTime,zycs),
+						false));
 			}
 		}
 		return result;
@@ -2021,10 +2030,10 @@ public class ZysqbpServiceImpl extends
 
 	public List<ZysqbpCountEntity1> countByXzqh(int recordStatus,
 			String inorout, String mao, Long szdId, Long gqId, Long xzqh,
-			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime) {
-		return parseZysqbpCountEntity1List(zysqbpDao.countByXzqh(recordStatus,
-				inorout, mao, szdId + "%", gqId, xzqh, jyrId, bwId, whbh,
-				startTime, stopTime, szdId), false);
+			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime,Long zycs) {
+		return parseZysqbpCountEntity1List(
+				zysqbpDao.countByXzqh(recordStatus,inorout, mao, szdId + "%", gqId, xzqh, jyrId, bwId, whbh,startTime, stopTime, szdId,zycs), 
+				false);
 		// return
 		// parseZysqbpCountEntityxzList(zysqbpDao.countByXzqh(recordStatus,
 		// inorout, mao, szdId + "%", gqId, xzqh, jyrId, bwId, whbh,
@@ -2070,27 +2079,26 @@ public class ZysqbpServiceImpl extends
 
 	public List<ZysqbpCountEntity1> countByXzqhExist(int recordStatus,
 			String inorout, String mao, Long szdId, Long gqId, Long xzqh,
-			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime) {
-		return parseZysqbpCountEntity1List(zysqbpDao.countByXzqhExist(
-				recordStatus, inorout, mao, szdId + "%", gqId, xzqh, jyrId,
-				bwId, whbh, startTime, stopTime), false);
+			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime,Long zycs) {
+		return parseZysqbpCountEntity1List(
+				zysqbpDao.countByXzqhExist(recordStatus, inorout, mao, szdId + "%", gqId, xzqh, jyrId,bwId, whbh, startTime, stopTime,zycs), 
+				false);
 	}
 
 	public List<ZysqbpCountEntity1> countByWhpm(int recordStatus,
 			String inorout, String mao, Long szdId, Long gqId, Long xzqh,
-			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime) {
-		return parseZysqbpCountEntity1List(zysqbpDao.countByWhpm(recordStatus,
-				inorout, mao, szdId + "%", gqId, xzqh, jyrId, bwId, whbh,
-				startTime, stopTime), false);
+			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime,Long zycs) {
+		return parseZysqbpCountEntity1List(
+				zysqbpDao.countByWhpm(recordStatus,inorout, mao, szdId + "%", gqId, xzqh, jyrId, bwId, whbh,startTime, stopTime,zycs), 
+				false);
 	}
 
 	public List<ZysqbpCountEntity1> countByJyrWhpm(int recordStatus,
 			String inorout, String mao, Long szdId, Long gqId, Long xzqh,
-			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime) {
+			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime,Long zycs) {
 		List<ZysqbpCountEntity1> result = new ArrayList<ZysqbpCountEntity1>();
 		List<ZysqbpCountEntity1> jyrList = parseZysqbpCountEntity1List(
-				zysqbpDao.countByJyr(recordStatus, inorout, mao, szdId + "%",
-						gqId, xzqh, jyrId, bwId, whbh, startTime, stopTime),
+				zysqbpDao.countByJyr(recordStatus, inorout, mao, szdId + "%",gqId, xzqh, jyrId, bwId, whbh, startTime, stopTime,zycs),
 				true);
 		if (jyrList != null && jyrList.size() > 0) {
 			int i = 0;
@@ -2100,10 +2108,9 @@ public class ZysqbpServiceImpl extends
 				if (i > 3)
 					break;
 				result.add(jyr);
-				result.addAll(parseZysqbpCountEntity1List(zysqbpDao
-						.countByWhpm(recordStatus, inorout, mao, szdId + "%",
-								gqId, xzqh, new Long(jyr.getId()), bwId, whbh,
-								startTime, stopTime), false));
+				result.addAll(parseZysqbpCountEntity1List(
+						zysqbpDao.countByWhpm(recordStatus, inorout, mao, szdId + "%",gqId, xzqh, new Long(jyr.getId()), bwId, whbh,startTime, stopTime,zycs),
+						false));
 			}
 		}
 		return result;
@@ -2112,18 +2119,16 @@ public class ZysqbpServiceImpl extends
 	public List<ZysqbpCountEntity1> countByWhpmTop(int recordStatus,
 			String inorout, String mao, Long szdId, Long gqId, Long xzqh,
 			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime,
-			int n) {
-		return parseZysqbpCountEntity1List(zysqbpDao.countByWhpmTop(
-				recordStatus, inorout, mao, szdId + "%", gqId, xzqh,
-				(Long) jyrId, bwId, whbh, startTime, stopTime, n), false);
+			int n,Long zycs) {
+		return parseZysqbpCountEntity1List(
+				zysqbpDao.countByWhpmTop(recordStatus, inorout, mao, szdId + "%", gqId, xzqh,(Long) jyrId, bwId, whbh, startTime, stopTime, n,zycs), 
+				false);
 	}
 
 	public int countTotalByAll(int recordStatus, String inorout, String mao,
 			Long szdId, Long gqId, Long xzqh, Long jyrId, Long bwId,
-			String whbh, Date startTime, Date stopTime) {
-		List<Object> result = zysqbpDao.countTotalByAll(recordStatus, inorout,
-				mao, szdId + "%", gqId, xzqh, jyrId, bwId, whbh, startTime,
-				stopTime);
+			String whbh, Date startTime, Date stopTime,Long zycs) {
+		List<Object> result = zysqbpDao.countTotalByAll(recordStatus, inorout,mao, szdId + "%", gqId, xzqh, jyrId, bwId, whbh, startTime,stopTime,zycs);
 		if (result != null && result.size() > 0) {
 			return ((BigDecimal) result.get(0)).intValue();
 		}
@@ -2289,47 +2294,83 @@ public class ZysqbpServiceImpl extends
 	
 
 	@Override
-	public ZysqbpGatherEntity gatherImformattion(Long szd) {
+	public ZysqbpGatherEntity gatherImformattion(Long szd,int nd) {
 		ZysqbpGatherEntity entity = new ZysqbpGatherEntity();
-		// 经营人中危货企业和已发港口认证和已发危货认证 ,企业总数
+		// 1  经营人中危货企业和已发港口认证和已发危货认证 ,企业总数
 		List<Object[]> jyrList = jyrDao.getherJyr(szd + "%");
+		//港口危货企业个数
 		entity.setGkwhqys(prase(jyrList.get(0)));
+		//发给危货企业的经营许可证个数
 		entity.setYfxkz(prase(jyrList.get(1)));
-		entity.setYfwhzyz(prase(jyrList.get(2)));
+		//已发经营许可证的危货企业占比
 		entity.setXkzzb(getbl(entity.getGkwhqys(), entity.getYfxkz()));
-		entity.setYfwhzb(getbl(entity.getGkwhqys(), entity.getYfwhzyz()));
+		
+		//已发危货作业许可证个数
+		entity.setYfwhzyz(prase(jyrList.get(2)));
+		//已发危货作业许可证企业数
+		entity.setYfwhzyzqys(prase(jyrList.get(5)));
+		//已发危货作业许可证企业占比
+		entity.setYfwhzb(getbl(entity.getGkwhqys(), entity.getYfwhzyzqys()));
+		
+		//危货企业填报人数合计
 		entity.setQyzrs(prase(jyrList.get(3)));
-		// 安全管理人员
+		// 人员类型：管理人员 数据条数
 		entity.setAqglrs(prase(jyrList.get(4)));
-		// 码头泊位
+		
+		
+		
+		// 2  码头泊位
 		jyrList = jyrDao.gatherMtbw(szd + "%");
+		//码头泊位总个数
 		entity.setMtbwzs(prase(jyrList.get(0)));
+		//万吨级以上泊位个数
 		entity.setWdysbw(prase(jyrList.get(1)));
+		//五千至一万吨级个数
 		entity.setWqdwabw(prase(jyrList.get(2)));
+		//五千吨级一下泊位个数
 		entity.setWqyxbw(prase(jyrList.get(3)));
-		jyrList = zysqbpDao.gatherNttl(szd + "%");
-		// 规模以上的年货物吞吐量
+		
+		
+		// 3  “泊位作业” 年货物吞吐量企业数
+		jyrList = zysqbpDao.gatherNttl(szd + "%",String.valueOf(nd));
+		//大于100万吨年货物吞吐量企业数
 		entity.setNwhttlbwd(prase(jyrList.get(0)));
+		//50~100万吨年货物吞吐量企业数
 		entity.setNwhttlwsd(prase(jyrList.get(1)));
+		//10~50万吨年货物吞吐量企业数
 		entity.setNwhttlwqx(prase(jyrList.get(2)));
-		// Double ttl = Double.parseDouble(prase(jyrList.get(3)));
-		entity.setWxzyzttl((Math.round(Double.parseDouble(prase(jyrList.get(3))) / 100) / 100.0)
-				+ "");
-		// 储罐及重大危险源内容
+		// 辖区内企业年泊位危险货物总吞吐量(万吨)
+		entity.setWxzyzttl((Math.round(Double.parseDouble(prase(jyrList.get(3))) / 100) / 100.0)+ "");
+		
+		
+		// 4  储罐及重大危险源内容
 		jyrList = zysqbpDao.gatherCgxx(szd + "%");
+		//危货企业拥有储罐总个数
 		entity.setCgzs(prase(jyrList.get(0)));
+		//危货企业拥有储罐总容量
 		entity.setCgrl(prase(jyrList.get(1)));
+		//危货企业拥有生产性储罐个数
 		entity.setQzccxcg(prase(jyrList.get(2)));
+		//危货企业拥有存储性储罐个数
 		entity.setQzscxcg(prase(jyrList.get(3)));
+		//拥有有效危货作业附证的储罐个数
 		entity.setYfcgwhzs(prase(jyrList.get(4)));
+		//重大危险源个数
 		entity.setZdwxys(prase(jyrList.get(5)));
+		//重大危险源存储总容量
 		entity.setZdwxycczrl(prase(jyrList.get(6)));
+		//拥有有效危货作业附证的储罐占比
 		entity.setCgwhzb(getbl(entity.getCgzs(), entity.getYfcgwhzs()));
-		// 开展安全评价报告的企业
+		
+		
+		// 5  开展安全评价报告的企业
 		jyrList = zysqbpDao.gatherAqpjjg(szd);
+		//开展安全评价企业个数
 		entity.setKzaqpjqy(prase(jyrList.get(0)));
+		//开展安全评价企业占比
 		entity.setKaappjqyzb(getbl(entity.getGkwhqys(), entity.getKzaqpjqy()));
-		// 排行前十的货物和吞吐量
+		
+		// 6 泊位作业 排行前十的货物和作业量
 		jyrList = zysqbpDao.gatherTopTenHzttl(szd + "%");
 		StringBuffer hzttl = new StringBuffer();
 		for (int i = 0; i < jyrList.size(); i++) {
@@ -2338,11 +2379,9 @@ public class ZysqbpServiceImpl extends
 			if (object[2] != null)
 				bhhmc = bhhmc + object[2].toString();
 			if (i != jyrList.size() - 1) {
-				hzttl.append(bhhmc).append(":").append(prase(object[1]))
-						.append("吨、");
+				hzttl.append(bhhmc).append(":").append(prase(object[1])).append("吨、");
 			} else
-				hzttl.append(bhhmc).append(":").append(prase(object[1]))
-						.append("吨");
+				hzttl.append(bhhmc).append(":").append(prase(object[1])).append("吨");
 		}
 		entity.setQszyhz(hzttl.toString());
 		return entity;
@@ -2357,9 +2396,7 @@ public class ZysqbpServiceImpl extends
 			double c;
 			c = (Math.round(yzgs / yhs) / 100.0);
 			return c + "%";
-
 		}
-
 	}
 
 	@Override

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

@@ -102,7 +102,7 @@ public interface ZysqbpService extends BaseWorkFlowService {
 			Date bgsj1, Date bgsj2, Date kgsj1, Date kgsj2, Date wgsj1,
 			Date wgsj2, String hzName, Boolean ttlOrTeu);
 
-	public ZysqbpGatherEntity gatherImformattion(Long szd);
+	public ZysqbpGatherEntity gatherImformattion(Long szd,int nd);
 
 	/***
 	 * 开工或者完工情况填写后同步到省级
@@ -138,11 +138,12 @@ public interface ZysqbpService extends BaseWorkFlowService {
 	 * @param whbh
 	 * @param startTime
 	 * @param stopTime
+	 * @param zycs  作业场所：泊位、储罐、堆场、仓库、过驳区
 	 * @return
 	 */
 	public int countTotalByAll(int recordStatus, String inorout, String mao,
 			Long szdId, Long gqId, Long xzqh, Long jyrId, Long bwId,
-			String whbh, Date startTime, Date stopTime);
+			String whbh, Date startTime, Date stopTime,Long zycs);
 
 	/**
 	 * 根据 审批状态/进出港/内外贸/所在地/所在港区/行政区划/经营人/泊位/危货编号，统计危货品名的危货作业数量(前n条)
@@ -166,7 +167,7 @@ public interface ZysqbpService extends BaseWorkFlowService {
 	public List<ZysqbpCountEntity1> countByWhpmTop(int recordStatus,
 			String inorout, String mao, Long szdId, Long gqId, Long xzqh,
 			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime,
-			int n);
+			int n,Long zycs);
 
 	/**
 	 * 根据 审批状态/进出港/内外贸/所在地/所在港区/行政区划/经营人/泊位/危货编号，统计经营人泊位危货作业数量
@@ -180,7 +181,7 @@ public interface ZysqbpService extends BaseWorkFlowService {
 	 */
 	public List<ZysqbpCountEntity1> countByJyrBw(int recordStatus,
 			String inorout, String mao, Long szdId, Long gqId, Long xzqh,
-			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime);
+			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime,Long zycs);
 
 	/**
 	 * 根据 审批状态/进出港/内外贸/所在地/所在港区/行政区划/经营人/泊位/危货编号，统计经营人危货作业数量
@@ -194,7 +195,7 @@ public interface ZysqbpService extends BaseWorkFlowService {
 	 */
 	public List<ZysqbpCountEntity1> countByJyr(int recordStatus,
 			String inorout, String mao, Long szdId, Long gqId, Long xzqh,
-			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime);
+			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime,Long zycs);
 
 	/**
 	 * 根据 审批状态/进出港/内外贸/所在地/所在港区/行政区划/经营人/泊位/危货编号，统计经营人泊位危货作业数量(>0)
@@ -208,7 +209,7 @@ public interface ZysqbpService extends BaseWorkFlowService {
 	 */
 	public List<ZysqbpCountEntity1> countByJyrBwExist(int recordStatus,
 			String inorout, String mao, Long szdId, Long gqId, Long xzqh,
-			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime);
+			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime,Long zycs);
 
 	/**
 	 * 根据 审批状态/进出港/内外贸/所在地/所在港区/行政区划/经营人/泊位/危货编号，统计行政区划危货作业数量
@@ -222,7 +223,7 @@ public interface ZysqbpService extends BaseWorkFlowService {
 	 */
 	public List<ZysqbpCountEntity1> countByXzqh(int recordStatus,
 			String inorout, String mao, Long szdId, Long gqId, Long xzqh,
-			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime);
+			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime,Long zycs);
 
 	/**
 	 * 根据 审批状态/进出港/内外贸/所在地/所在港区/行政区划/经营人/泊位/危货编号，统计行政区划经营人危货作业数量
@@ -236,7 +237,7 @@ public interface ZysqbpService extends BaseWorkFlowService {
 	 */
 	public List<ZysqbpCountEntity1> countByXzqhJyr(int recordStatus,
 			String inorout, String mao, Long szdId, Long gqId, Long xzqh,
-			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime);
+			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime,Long zycs);
 
 	/**
 	 * 根据 审批状态/进出港/内外贸/所在地/所在港区/行政区划/经营人/泊位/危货编号，统计经营人行政区划危货作业数量(>0)
@@ -250,7 +251,7 @@ public interface ZysqbpService extends BaseWorkFlowService {
 	 */
 	public List<ZysqbpCountEntity1> countByXzqhExist(int recordStatus,
 			String inorout, String mao, Long szdId, Long gqId, Long xzqh,
-			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime);
+			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime,Long zycs);
 
 	/**
 	 * 根据 审批状态/进出港/内外贸/所在地/所在港区/行政区划/经营人/泊位/危货编号，统计危货品名的危货作业数量
@@ -264,7 +265,7 @@ public interface ZysqbpService extends BaseWorkFlowService {
 	 */
 	public List<ZysqbpCountEntity1> countByWhpm(int recordStatus,
 			String inorout, String mao, Long szdId, Long gqId, Long xzqh,
-			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime);
+			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime,Long zycs);
 
 	/**
 	 * 根据 审批状态/进出港/内外贸/所在地/所在港区/行政区划/经营人/泊位/危货编号，统计前三名经营人危货品名的危货作业数量
@@ -278,7 +279,7 @@ public interface ZysqbpService extends BaseWorkFlowService {
 	 */
 	public List<ZysqbpCountEntity1> countByJyrWhpm(int recordStatus,
 			String inorout, String mao, Long szdId, Long gqId, Long xzqh,
-			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime);
+			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime,Long zycs);
 
 	/**
 	 * 根据 审批状态/进出港/内外贸/所在地/所在港区/行政区划/经营人/泊位/危货编号，统计港区经营人危货作业数量
@@ -292,7 +293,7 @@ public interface ZysqbpService extends BaseWorkFlowService {
 	 */
 	public List<ZysqbpCountEntity1> countByGqJyr(int recordStatus,
 			String inorout, String mao, Long szdId, Long gqId, Long xzqh,
-			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime);
+			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime,Long zycs);
 
 	/**
 	 * 根据 审批状态/进出港/内外贸/所在地/所在港区/行政区划/经营人/泊位/危货编号，统计港区经营人危货作业数量(>0)
@@ -306,7 +307,7 @@ public interface ZysqbpService extends BaseWorkFlowService {
 	 */
 	public List<ZysqbpCountEntity1> countByGqJyrExist(int recordStatus,
 			String inorout, String mao, Long szdId, Long gqId, Long xzqh,
-			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime);
+			Long jyrId, Long bwId, String whbh, Date startTime, Date stopTime,Long zycs);
 
 	public List<ZysqbpEntity> doquery(Timestamp kssj, Timestamp jssj);
 

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

@@ -478,9 +478,16 @@ public class WhsqbpWebService extends BaseController {
 
 		//校验作业数量和泊位核查靠泊能力
 		if(sqbp.getZyddqybh()!=null && sqbp.getZyddqybh().getZycs()!=null && sqbp.getZyddqybh().getZycs().getId()==10000501L){
-			if(sqbp.getZyddqybh().getQynbbh()!=null && !sqbp.getZyddqybh().getQynbbh().equals("")){
+			if(sqbp.getZyddqybh().getQynbbh()!=null && !sqbp.getZyddqybh().getQynbbh().equals("")){//泊位企业内部编号
 				BwEntity bwEntity = bwService.findOne(Long.parseLong(sqbp.getZyddqybh().getQynbbh()));
-				if((Double.parseDouble(bwEntity.getHckpnl())*10000)<sqbp.getZysl()){
+				//做是否船队申报判断
+				if(sqbp!=null && sqbp.getByzd3()!=null&& !sqbp.getByzd3().equals("") && Integer.valueOf(sqbp.getByzd3())>0){//船队
+					//是船队，平均到每条船上的作业数量也应小于泊位核查靠泊能力，与web验证方式一致
+					if((Double.parseDouble(bwEntity.getHckpnl())*10000)<(sqbp.getZysl()/Integer.valueOf(sqbp.getByzd3()))){
+						return "5";
+					}
+				}
+				else if((Double.parseDouble(bwEntity.getHckpnl())*10000)<sqbp.getZysl()){//非船队
 					return "5";
 				}
 			}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/workflow/MyGroupEntityManager.java

@@ -76,11 +76,9 @@ public class MyGroupEntityManager extends GroupEntityManager {
 		UserEntity user = userDao.findOne(new Long(userId));
 		for (RoleEntity r : roles) {
 			if (r != null && r.getRoleType() != null) {
-				if (Constants.ROLE_TYPE_PTJYR.equals(r.getRoleType())
-						&& user.getJyrjcxx() != null) {
+				if (Constants.ROLE_TYPE_PTJYR.equals(r.getRoleType()) && user.getJyrjcxx() != null) {
 					// 经营人角色{001:经营人id}
-					groupList.add(new GroupEntity(Constants.ROLE_TYPE_PTJYR
-							+ ":" + user.getJyrjcxx().getId()));
+					groupList.add(new GroupEntity(Constants.ROLE_TYPE_PTJYR + ":" + user.getJyrjcxx().getId()));
 				} else {
 					groupList.add(new GroupEntity(r.getRoleType()));
 				}

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

@@ -66,5 +66,5 @@ zysqbp.wgsj.invalidated=\u60a8\u6709\u5c1a\u672a\u586b\u5199\u7684\u5f00\u5de5\u
 zysqbp.fzns.invalidated=\u60a8\u9009\u62e9\u7684\u4f5c\u4e1a\u573a\u6240\u7684\u9644\u8bc1\u672a\u8fdb\u884c\u5e74\u5ba1\uff0c\u8bf7\u5148\u4fdd\u5b58\u672c\u6761\u6570\u636e\uff0c\u5e76\u8fdb\u884c\u76f8\u5e94\u7684\u9644\u8bc1\u5e74\u5ba1\uff01
 zysqbp.check.invalidated=\u60a8\u597d\uff0c\u6839\u636e\u300a\u6e2f\u53e3\u5371\u9669\u8d27\u7269\u5b89\u5168\u7ba1\u7406\u89c4\u5b9a\u300b\uff0c\u5371\u9669\u8d27\u7269\u6e2f\u53e3\u7ecf\u8425\u4eba\u5728\u5371\u9669\u8d27\u7269\u6e2f\u53e3\u88c5\u5378\u3001\u8fc7\u9a73\u4f5c\u4e1a\u5f00\u59cb24\u5c0f\u65f6\u524d\uff0c\u5e94\u5f53\u5411\u6240\u5728\u5730\u6e2f\u53e3\u884c\u653f\u7ba1\u7406\u90e8\u95e8\u62a5\u544a\u3002\u62a5\u544a\u4eba\u5728\u53d6\u5f97\u4f5c\u4e1a\u6279\u51c6\u540e72\u5c0f\u65f6\u5185\u672a\u5f00\u59cb\u4f5c\u4e1a\u7684\uff0c\u5e94\u5f53\u91cd\u65b0\u62a5\u544a\u3002\u73b0\u95f4\u9694\u8d85\u8fc772\u5c0f\u65f6\uff0c\u8bf7\u91cd\u65b0\u586b\u5199\uff01
 #\u5371\u8d27\u4f5c\u4e1a\u7edf\u8ba1
-zysqbp.count.startTime.empty=\u7edf\u8ba1\u7533\u8bf7\u5f00\u59cb\u65f6\u95f4\u4e0d\u80fd\u4e3a\u7a7a\uff01
-zysqbp.count.stopTime.empty=\u7edf\u8ba1\u7533\u8bf7\u7ed3\u675f\u65f6\u95f4\u4e0d\u80fd\u4e3a\u7a7a\uff01
+zysqbp.count.startTime.empty=\u7edf\u8ba1\u62a5\u544a\u5f00\u59cb\u65f6\u95f4\u4e0d\u80fd\u4e3a\u7a7a\uff01
+zysqbp.count.stopTime.empty=\u7edf\u8ba1\u62a5\u544a\u7ed3\u675f\u65f6\u95f4\u4e0d\u80fd\u4e3a\u7a7a\uff01

gkaq/yjpt-java/trunk/resources/deployments/zysbsp-city.bpmn

@@ -12,12 +12,12 @@
       <bpmndi:BPMNShape bpmnElement="startevent1" id="BPMNShape_startevent1">
         <omgdc:Bounds height="35.0" width="35.0" x="228.0" y="210.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="endevent1" id="BPMNShape_endevent1">
-        <omgdc:Bounds height="35.0" width="35.0" x="478.0" y="210.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="xssc" id="BPMNShape_xssc">
         <omgdc:Bounds height="55.0" width="105.0" x="320.0" y="200.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="endevent1" id="BPMNShape_endevent1">
+        <omgdc:Bounds height="35.0" width="35.0" x="478.0" y="210.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1">
         <omgdi:waypoint x="263.0" y="227.0"></omgdi:waypoint>
         <omgdi:waypoint x="320.0" y="227.0"></omgdi:waypoint>

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

@@ -1,6 +1,6 @@
 #***************************************  jdbc info  ********************************************#
 jdbc.driver                 = oracle.jdbc.driver.OracleDriver
-jdbc.url                      = jdbc:oracle:thin:@192.168.57.36:1521:orcl
+jdbc.url                      = jdbc:oracle:thin:@localhost:1521:orcl
 jdbc.username           = yjptzj
 jdbc.password            = yjpt
 hibernate.dialect        = org.hibernate.dialect.Oracle10gDialect

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

@@ -12,7 +12,9 @@
 		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd
 		http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd
 		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
-	<description>数据交换配置 </description>
+		
+	<description>数据交换配置</description>
+	
 	<!-- 权利阳光 Jpa Entity Manager 配置 -->
 	<bean id="entityManagerFactory-qlyg" 
 		class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
@@ -30,6 +32,21 @@
 			</props>
 		</property>
 	</bean>
+	<bean id="dataSource-qlyg" class="org.apache.commons.dbcp.BasicDataSource"
+		  destroy-method="close" lazy-init="false">
+		<property name="driverClassName" value="${jdbc.driver}" />
+		<property name="url" value="${jdbc.qlyg.url}" />
+		<property name="username" value="${jdbc.qlyg.username}" />
+		<property name="password" value="${jdbc.qlyg.password}" />
+		<property name="validationQuery" value="SELECT 1 FROM DUAL" />
+		<property name="testOnBorrow" value="true" />
+		<property name="maxIdle" value="${dbcp.maxIdle}" />
+		<property name="maxActive" value="${dbcp.maxActive}" />
+		<property name="defaultAutoCommit" value="false" />
+		<property name="timeBetweenEvictionRunsMillis" value="3600000" />
+		<property name="minEvictableIdleTimeMillis" value="3600000" />
+	</bean>
+	
 	<!-- 行政中心数据源，适用地市：镇江 -->
 	<bean id="entityManagerFactory-xzzx"
 		  class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
@@ -62,6 +79,9 @@
 		<property name="minEvictableIdleTimeMillis" value="3600000" />
 	</bean>
 	<!-- 行政中心数据源End -->
+	
+	
+	
 	<!-- 数据交换服务配置 -->
 	<bean id="dataChangeService" class="com.jtgh.qlyg.service.impl.DataChangeServiceImpl">
 		<property name="emList">
@@ -80,22 +100,10 @@
 					  entity-manager-factory-ref="entityManagerFactory-qlyg"
 					  factory-class="com.jtgh.qlyg.dao.common.QlygRepositoryFactoryBean" />
 
-	<bean id="dataSource-qlyg" class="org.apache.commons.dbcp.BasicDataSource"
-		  destroy-method="close" lazy-init="false">
-		<property name="driverClassName" value="${jdbc.driver}" />
-		<property name="url" value="${jdbc.qlyg.url}" />
-		<property name="username" value="${jdbc.qlyg.username}" />
-		<property name="password" value="${jdbc.qlyg.password}" />
-		<property name="validationQuery" value="SELECT 1 FROM DUAL" />
-		<property name="testOnBorrow" value="true" />
-		<property name="maxIdle" value="${dbcp.maxIdle}" />
-		<property name="maxActive" value="${dbcp.maxActive}" />
-		<property name="defaultAutoCommit" value="false" />
-		<property name="timeBetweenEvictionRunsMillis" value="3600000" />
-		<property name="minEvictableIdleTimeMillis" value="3600000" />
-	</bean>
-	<bean id="hibernateJpaVendorAdapter"
-		  class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" />
+	
+	<bean id="hibernateJpaVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" />
+		  
+		  
 	<!-- 定时任务 -权力阳光 -->
 	<bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
 		<property name="triggers">
@@ -112,46 +120,7 @@
 		</property>
 		<property name="autoStartup" value="true"/>
 	</bean>
-	<!-- 生成异常信息 -->
-	<bean id="alertTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
-		<property name="jobDetail" ref="alertJobDetail"/>
-		<!-- 每天执行一次 -->
-		<property name="cronExpression" value="0 30 1 * * ?"/>
-	</bean>
-	<bean id="alertJobDetail" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
-		<property name="targetObject" ref="alertJob"/>
-		<property name="targetMethod" value="execute"/>
-		<property name="concurrent" value="false"/>
-		<!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->
-	</bean>
-	<bean id="alertJob" class="com.jtgh.qlyg.sync.QlygSyncAlert"/>
-	<!-- 同步反馈信息 -->
-	<bean id="supinfoTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
-		<property name="jobDetail" ref="supinfoJobDetail"/>
-		<!-- 每天执行一次 -->
-		<property name="cronExpression" value="0 35 1 * * ?"/>
-	</bean>
-	<bean id="supinfoJobDetail" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
-		<property name="targetObject" ref="supinfoJob"/>
-		<property name="targetMethod" value="execute"/>
-		<property name="concurrent" value="false"/>
-		<!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->
-	</bean>
-	<bean id="supinfoJob" class="com.jtgh.qlyg.sync.QlygSyncSupinfo"/>
-	<!-- 同步督督察督办信息 -->
-	<bean id="superviseTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
-		<property name="jobDetail" ref="superviseJobDetail"/>
-		<!-- 每天执行一次 -->
-		<property name="cronExpression" value="0 40 1 * * ?"/>
-	</bean>
-	<bean id="superviseJobDetail" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
-		<property name="targetObject" ref="superviseJob"/>
-		<property name="targetMethod" value="execute"/>
-		<property name="concurrent" value="false"/>
-		<!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->
-	</bean>
-	<bean id="superviseJob" class="com.jtgh.qlyg.sync.QlygSyncSupervise"/>
-	<!-- 同步登录信息 -->
+	<!-- 1 同步登录信息 -->
 	<bean id="loginLogTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
 		<property name="jobDetail" ref="loginLogJobDetail"/>
 		<!-- 每天执行一次 -->
@@ -164,7 +133,7 @@
 		<!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->
 	</bean>
 	<bean id="loginLogJob" class="com.jtgh.qlyg.sync.QlygSyncLoginLog"/>
-	<!-- 同步查看信息 -->
+	<!-- 2 同步查看信息 -->
 	<bean id="checkLogTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
 		<property name="jobDetail" ref="checkLogJobDetail"/>
 		<!-- 每天执行一次 -->
@@ -177,7 +146,7 @@
 		<!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->
 	</bean>
 	<bean id="checkLogJob" class="com.jtgh.qlyg.sync.QlygSyncCheckLog"/>
-	<!-- 同步办件信息 -->
+	<!-- 3 同步办件信息 -->
 	<bean id="applyTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
 		<property name="jobDetail" ref="applyJobDetail"/>
 		<!-- 每天执行一次 -->
@@ -190,7 +159,7 @@
 		<!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->
 	</bean>
 	<bean id="applyJob" class="com.jtgh.qlyg.sync.QlygSyncApply"/>
-	<!-- 同步异常信息 -->
+	<!-- 4 同步异常信息 -->
 	<bean id="monitorAlertTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
 		<property name="jobDetail" ref="monitorAlertJobDetail"/>
 		<!-- 每天执行一次 -->
@@ -203,7 +172,7 @@
 		<!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->
 	</bean>
 	<bean id="monitorAlertJob" class="com.jtgh.qlyg.sync.QlygSyncMonitorAlert"/>
-	<!-- 同步检查统计信息 -->
+	<!-- 5 同步检查统计信息 -->
 	<bean id="superviseStatTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
 		<property name="jobDetail" ref="superviseStatJobDetail"/>
 		<!-- 每月5号执行一次 -->
@@ -216,4 +185,43 @@
 		<!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->
 	</bean>
 	<bean id="superviseStatJob" class="com.jtgh.qlyg.sync.QlygSyncSuperviseStat"/>
+	<!-- 6 同步督督察督办信息 -->
+	<bean id="superviseTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
+		<property name="jobDetail" ref="superviseJobDetail"/>
+		<!-- 每天执行一次 -->
+		<property name="cronExpression" value="0 40 1 * * ?"/>
+	</bean>
+	<bean id="superviseJobDetail" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<property name="targetObject" ref="superviseJob"/>
+		<property name="targetMethod" value="execute"/>
+		<property name="concurrent" value="false"/>
+		<!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->
+	</bean>
+	<bean id="superviseJob" class="com.jtgh.qlyg.sync.QlygSyncSupervise"/>
+	<!-- 7 同步反馈信息 -->
+	<bean id="supinfoTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
+		<property name="jobDetail" ref="supinfoJobDetail"/>
+		<!-- 每天执行一次 -->
+		<property name="cronExpression" value="0 35 1 * * ?"/>
+	</bean>
+	<bean id="supinfoJobDetail" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<property name="targetObject" ref="supinfoJob"/>
+		<property name="targetMethod" value="execute"/>
+		<property name="concurrent" value="false"/>
+		<!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->
+	</bean>
+	<bean id="supinfoJob" class="com.jtgh.qlyg.sync.QlygSyncSupinfo"/>
+	<!-- 8 生成异常信息 -->
+	<bean id="alertTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
+		<property name="jobDetail" ref="alertJobDetail"/>
+		<!-- 每天执行一次 -->
+		<property name="cronExpression" value="0 30 1 * * ?"/>
+	</bean>
+	<bean id="alertJobDetail" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<property name="targetObject" ref="alertJob"/>
+		<property name="targetMethod" value="execute"/>
+		<property name="concurrent" value="false"/>
+		<!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->
+	</bean>
+	<bean id="alertJob" class="com.jtgh.qlyg.sync.QlygSyncAlert"/>
 </beans>

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

@@ -103,7 +103,7 @@
 	<context-param>
 		<description>是否jax-ws同步(Y/N)</description>
 		<param-name>jaxws_sync</param-name>
-		<param-value>Y</param-value>
+		<param-value>N</param-value>
 	</context-param>
 	<context-param>
 		<description>同步UserId</description>