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

gkaq/yjpt-java/trunk/.classpath

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

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

@@ -541,14 +541,12 @@ public abstract class Utils {
 	public static String getWsPortBySsqy(Long ssqyId) {
 		if (ssqyId == null)
 			return "";
+		
 		String wsPort = "";
 		if (InitServlet.groupcodeMap.get(Constants.GROUP_CODE_SZD_WS_PORT) != null) {
-			List<CodeEntity> ports = InitServlet.groupcodeMap
-					.get(Constants.GROUP_CODE_SZD_WS_PORT);
+			List<CodeEntity> ports = InitServlet.groupcodeMap .get(Constants.GROUP_CODE_SZD_WS_PORT);
 			for (CodeEntity port : ports) {
-				if (port.getParent() != null
-						&& ssqyId.toString().indexOf(
-								port.getParent().getId().toString()) == 0) {
+				if (port.getParent() != null && ssqyId.toString().indexOf(port.getParent().getId().toString()) == 0) {
 					wsPort = port.getCode();
 					break;
 				}
@@ -564,38 +562,26 @@ public abstract class Utils {
 	 * @return
 	 */
 	public static String getParentRole(String currRole) {
-		if (StringUtils.isEmpty(currRole)
-				|| currRole.length() <= Constants.ROLE_LENGTH) {
+		if (StringUtils.isEmpty(currRole) || currRole.length() <= Constants.ROLE_LENGTH) {
 			return "";
 		}
 		return currRole.substring(0, currRole.length() - Constants.ROLE_LENGTH);
 	}
 
-	public static List<Predicate> setWorkflowSpec(List<Predicate> list,
-			CriteriaBuilder cb, CriteriaQuery<?> query,
-			Root<? extends BaseEntity<?>> root, String lcStatus) {
+	public static List<Predicate> setWorkflowSpec(List<Predicate> list, CriteriaBuilder cb, CriteriaQuery<?> query, Root<? extends BaseEntity<?>> root, String lcStatus) {
+		
 		// 根据流程状态过滤
 		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));
+			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));
 			} 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));
 				// List<Predicate> subOrList = new
 				// ArrayList<Predicate>();
 				// subOrList.add(cb.equal(taskRoot
@@ -628,16 +614,17 @@ public abstract class Utils {
 		// 兼容空
 		subOrList.add(cb.isNull(root.get("ssqy").as(Long.class)));
 		// 省市级皆可见
-		subOrList.add(cb.equal(root.get("ssqy").as(Long.class),
-				Constants.SSQY_ALL));
+		subOrList.add(cb.equal(root.get("ssqy").as(Long.class), Constants.SSQY_ALL));
 		if (getCurrentUserSzd().equals(Constants.SZD_ID_PROVINCE)) {
 			// 省级可见
-			subOrList.add(cb.equal(root.get("ssqy").as(Long.class),
-					Constants.SSQY_PROVINCE));
+			subOrList.add(cb.equal(root.get("ssqy").as(Long.class), Constants.SSQY_PROVINCE));
+			
+		    //省级可见所有，加上可见市级 edit by xh 2016-10-24
+			// 市级可见
+			subOrList.add(cb.equal(root.get("ssqy").as(Long.class), Constants.SSQY_CITY));
 		} else {
 			// 市级可见
-			subOrList.add(cb.equal(root.get("ssqy").as(Long.class),
-					Constants.SSQY_CITY));
+			subOrList.add(cb.equal(root.get("ssqy").as(Long.class), Constants.SSQY_CITY));
 		}
 
 		list.add(cb.or(subOrList.toArray(new Predicate[] {})));
@@ -654,17 +641,17 @@ public abstract class Utils {
 		if (list != null && list.size() > 0) {
 			for (AccessoryEntity accessoryEntity : list) {
 				sbf.append("<DOCUMENT>");
-				sbf.append("<DOCUMENT_ID>").append(accessoryEntity.getId())
-						.append("</DOCUMENT_ID>");
+				sbf.append("<DOCUMENT_ID>")
+				   .append(accessoryEntity.getId())
+				   .append("</DOCUMENT_ID>");
 				sbf.append("<DOCUMENT_NAME>")
-						.append(getResource("fileType", accessoryEntity
-								.getType().getName()))
-						.append("</DOCUMENT_NAME>");
+				   .append(getResource("fileType", accessoryEntity.getType().getName()))
+				   .append("</DOCUMENT_NAME>");
 				sbf.append("<FILE_NAME>").append(accessoryEntity.getName())
-						.append("</FILE_NAME>");
+				   .append("</FILE_NAME>");
 				sbf.append("<FILE_CONTENT>")
-						.append(encodeBase64(accessoryEntity.getContent()
-								.getValue())).append("</FILE_CONTENT>");
+				   .append(encodeBase64(accessoryEntity.getContent().getValue()))
+				   .append("</FILE_CONTENT>");
 				sbf.append("</DOCUMENT>");
 			}
 		}

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

@@ -102,7 +102,7 @@ public class DcController extends BaseController {
 					Operator.LIKE_R);
 		}
 		if (Constants.SZD_ID_PROVINCE.equals(Utils.getCurrentUserSzd())) {
-			addNotEmptyModel(filterList, "pkj", "1", Operator.NEQ);
+			//addNotEmptyModel(filterList, "pkj", "1", Operator.NEQ);//让省里能看到所有的
 		} else {
 			addNotEmptyModel(filterList, "pkj", "0", Operator.NEQ);
 		}

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

@@ -115,8 +115,7 @@ public class ZcController extends BaseController {
 		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);
@@ -1017,57 +1016,45 @@ public class ZcController extends BaseController {
 	}
 	
 	@Log(Type.QUERY)
-	public BusinessContext listZcyh(SinglePageRequest pageRequest, final Long functionId,
-			 final CodeEntity szd,final GqEntity szgq,final String dwmc, final String xmmc,final Date wcsjK, final Date wcsjZ ) throws ParseException {		
+	public BusinessContext listZcyh(SinglePageRequest pageRequest, final Long functionId, 
+			final CodeEntity szd,final GqEntity szgq,final String dwmc, final String xmmc,final Date wcsjK, final Date wcsjZ ) throws ParseException {		
+		
 		try {
 			Specification<ZcyhEntity> spec = new Specification<ZcyhEntity>() {
 
 				@Override
-				public Predicate toPredicate(Root<ZcyhEntity> root,
-						CriteriaQuery<?> query, CriteriaBuilder cb) {	
-					List<Predicate> list = new ArrayList<Predicate>();
-				/*	addRecordCodeFilter(functionId, cb, root, list, null,
-							"sszc.qymc");*/
-					list.add(cb.notEqual(
-							root.get("recordStatus").as(String.class),
-							BaseEntity.RECORD_STATE_DELETE));
-					if (null !=szd)
-						list.add(cb.like(
-								root.get("sszc").get("szd").get("id").as(String.class),
-							szd.getId() + "%"));
+				public Predicate toPredicate(Root<ZcyhEntity> root,CriteriaQuery<?> query, CriteriaBuilder cb) {	
 					
-					if (null != szgq)
-						list.add(cb.equal(root.get("sszc").get("szgq").as(GqEntity.class),
-								szgq));
+					List<Predicate> list = new ArrayList<Predicate>();
+			 
+					list.add(cb.notEqual(root.get("recordStatus").as(String.class), BaseEntity.RECORD_STATE_DELETE));
+					if (null !=szd){
+						list.add(cb.like(root.get("sszc").get("szd").get("id").as(String.class),szd.getId() + "%"));
+					}
+					if (null != szgq){
+						list.add(cb.equal(root.get("sszc").get("szgq").as(GqEntity.class),szgq));
+					}
 					if(null != dwmc){
-						list.add(cb.like(root.get("sszc").get("qymc").get("gkjyr").as(String.class),
-								"%"+dwmc + "%"));
+						list.add(cb.like(root.get("sszc").get("qymc").get("gkjyr").as(String.class), "%"+dwmc + "%"));
 					}	
-					if(null != dwmc){
-						list.add(cb.like(root.get("xmmc").as(String.class),
-								"%"+xmmc + "%"));
+					if(null != xmmc){
+						list.add(cb.like(root.get("xmmc").as(String.class), "%"+xmmc + "%"));
 					}	
 					if (wcsjK != null){
-						list.add(cb.greaterThanOrEqualTo(
-								root.get("jhwcsj").as(Date.class), wcsjK));
+						list.add(cb.greaterThanOrEqualTo(root.get("jhwcsj").as(Date.class), wcsjK));
 					}						
 					if (wcsjZ != null) {
-						list.add(cb.lessThan(root.get("jhwcsj").as(Date.class),
-								DateUtil.addDate(wcsjZ, 1)));
+						list.add(cb.lessThan(root.get("jhwcsj").as(Date.class),DateUtil.addDate(wcsjZ, 1)));
 					}						
-					list = Utils.setWorkflowSpec(list, cb, query, root,
-							null);					
+					list = Utils.setWorkflowSpec(list, cb, query, root,null);					
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
 			Page<ZcyhEntity> pageList = zcyhService.findAll(spec, pageRequest);
 			for (ZcyhEntity ba : pageList) {
-				if (zcyhService.getTaskByUserAndBusKey(Utils.getCurrentUser().getId()
-						.toString(), ba.getId().toString()) != null) {
+				if (zcyhService.getTaskByUserAndBusKey(Utils.getCurrentUser().getId().toString(), ba.getId().toString()) != null) {
 					ba.setTaskState(Constants.TASK_ASSIGN);
-				} else if (zcyhService
-						.getCandidateTaskByUserAndBusKey(Utils.getCurrentUser()
-								.getId().toString(), ba.getId().toString()) != null) {
+				} else if (zcyhService.getCandidateTaskByUserAndBusKey(Utils.getCurrentUser().getId().toString(), ba.getId().toString()) != null) {
 					ba.setTaskState(Constants.TASK_CANDIDATE);
 				}
 				if (ba.getTaskList() != null && ba.getTaskList().size() > 0) {

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

@@ -88,55 +88,42 @@ public class ZxjcController extends BaseController {
 	 * 初始化查询
 	 */
 	@Log(Type.QUERY)
-	public BusinessContext list(SinglePageRequest pageRequest,
-			final CodeEntity szd, final GqEntity szgq, final JyrEntity jyr,
-			final String ggmc) throws ParseException {
+	public BusinessContext list(SinglePageRequest pageRequest, final CodeEntity szd, final GqEntity szgq, final JyrEntity jyr,final String ggmc) throws ParseException {
+		
 		Specification<DcZxjcEntity> spec = new Specification<DcZxjcEntity>() {
 			@Override
-			public Predicate toPredicate(Root<DcZxjcEntity> root,
-					CriteriaQuery<?> query, CriteriaBuilder cb) {
+			public Predicate toPredicate(Root<DcZxjcEntity> root,CriteriaQuery<?> query, CriteriaBuilder cb) {
 				List<Predicate> list = new ArrayList<Predicate>();
 				// 只检索非删除状态记录
-				list.add(cb.notEqual(root.get("recordStatus").as(String.class),
-						BaseEntity.RECORD_STATE_DELETE));
-				if (!StringUtils.isEmpty(ggmc))
-					list.add(cb.like(root.get("ggmc").as(String.class), "%"
-							+ ggmc + "%"));
-				if (szgq != null
-						|| jyr != null
-						|| (szd != null && !GlobalData.CITY_CODE.equals(szd
-								.getId().toString()))) {
-					Subquery<DcEntity> subquery = query
-							.subquery(DcEntity.class);
+				list.add(cb.notEqual(root.get("recordStatus").as(String.class),BaseEntity.RECORD_STATE_DELETE));
+				if (!StringUtils.isEmpty(ggmc)){
+					list.add(cb.like(root.get("ggmc").as(String.class), "%"+ ggmc + "%"));
+				}
+				if (szgq != null|| jyr != null|| (szd != null && !GlobalData.CITY_CODE.equals(szd.getId().toString()))) {
+					Subquery<DcEntity> subquery = query.subquery(DcEntity.class);
 					Root<DcEntity> subRoot = subquery.from(DcEntity.class);
 					subquery.select(subRoot);
 					List<Predicate> subQueryPredicates = new ArrayList<Predicate>();
-					subQueryPredicates.add(cb.equal(
-							root.get("id").as(String.class),
-							subRoot.get("zxjcid").as(String.class)));
-					if (szd != null
-							&& !GlobalData.CITY_CODE.equals(szd.getId()
-									.toString()))
-						subQueryPredicates.add(cb.like(
-								subRoot.get("szd").get("id").as(String.class),
-								szd.getId() + "%"));
-					if (szgq != null)
-						subQueryPredicates.add(cb.equal(
-								subRoot.get("szgq").as(GqEntity.class), szgq));
-					if (jyr != null)
-						subQueryPredicates.add(cb.equal(subRoot.get("bdcdw")
-								.as(JyrEntity.class), jyr));
-					subquery.where(subQueryPredicates
-							.toArray(new Predicate[] {}));
+					subQueryPredicates.add(cb.equal(root.get("id").as(String.class),subRoot.get("zxjcid").as(String.class)));
+					if (szd != null&& !GlobalData.CITY_CODE.equals(szd.getId().toString())){
+						subQueryPredicates.add(cb.like(subRoot.get("szd").get("id").as(String.class),szd.getId() + "%"));
+					}
+					if (szgq != null){
+						subQueryPredicates.add(cb.equal(subRoot.get("szgq").as(GqEntity.class), szgq));
+					}
+					if (jyr != null){
+						subQueryPredicates.add(cb.equal(subRoot.get("bdcdw").as(JyrEntity.class), jyr));
+					}
+					subquery.where(subQueryPredicates.toArray(new Predicate[] {}));
 					list.add(cb.exists(subquery));
 				}
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
+		
 		Page<DcZxjcEntity> page = zxjcService.findAll(spec, pageRequest);
 		for (DcZxjcEntity dcZxjcEntity : page) {
-			if (dcZxjcEntity.getDcList() != null
-					&& dcZxjcEntity.getDcList().size() > 0) {
+			if (dcZxjcEntity.getDcList() != null && dcZxjcEntity.getDcList().size() > 0) {
 				dcZxjcEntity.getDcList().get(0);
 			}
 			int zgs = 0;
@@ -146,18 +133,15 @@ public class ZxjcController extends BaseController {
 				if (dcEntity.getMqzt().equals("1")) {
 					zgs += 1;
 				}
-				zgzj += (dcEntity.getZgtrzj() == null ? 0.0 : dcEntity
-						.getZgtrzj());
+				zgzj += (dcEntity.getZgtrzj() == null ? 0.0 : dcEntity.getZgtrzj());
 			}
 			String zgl = "";
-			if (dcZxjcEntity.getDcList() == null
-					|| dcZxjcEntity.getDcList().size() <= 0) {
+			if (dcZxjcEntity.getDcList() == null || dcZxjcEntity.getDcList().size() <= 0) {
 
-			} else {
-				BigDecimal bg = new BigDecimal((double) zgs
-						/ dcZxjcEntity.getDcList().size());
-				zgl = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()
-						* 100 + "%";
+			} 
+			else {
+				BigDecimal bg = new BigDecimal((double) zgs / dcZxjcEntity.getDcList().size());
+				zgl = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue() * 100 + "%";
 			}
 			dcZxjcEntity.setYhs(dcZxjcEntity.getDcList().size());
 			dcZxjcEntity.setZgs(zgs);

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

@@ -24,7 +24,7 @@ public interface BwDao extends MyRepository<BwEntity, Long> {
 	/**
 	 *根据所在地获得泊位数 
 	 */
-	@Query(value="select count(*) from T_YJPT_JYRXX_BW where RECORD_STATUS<>9 and SZD like ?1% ",nativeQuery = true)
+	@Query(value="select count(*) from T_YJPT_JYRXX_BW where RECORD_STATUS!=9 and QYMC in (select ID from T_YJPT_JYRJCXX where RECORD_STATUS!=9 AND SFWHQY!='N' AND SZD like ?1% )",nativeQuery = true)
 	public List<Object[]> GetBW_Num_By_Szd(String szd);