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

gkjsjy/trunk/src/com/cxfws/accessory/service/IAccessoryxxService.java

@@ -0,0 +1,14 @@
+package com.cxfws.accessory.service;
+
+import java.io.IOException;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "accessoryWebServicePort", serviceName = "accessoryWebService")
+public interface IAccessoryxxService {
+	@WebMethod(operationName = "findOne",action="http://service.web.jsjty.com/findOne")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findOne(String id,String type) throws IOException;
+}

gkjsjy/trunk/src/com/cxfws/accessory/service/impl/AccessoryxxService.java

@@ -0,0 +1,73 @@
+package com.cxfws.accessory.service.impl;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+import net.sf.json.JSONArray;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.accessory.service.IAccessoryxxService;
+import com.xt.jygl.accessory.entity.AccessoryEntity;
+import com.xt.jygl.accessory.service.AccessoryService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.common.GlobalData;
+/**
+ * 附件信息
+ * @author b_zhaohang
+ *
+ */
+@Service("accessoryWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "accessoryWebServicePort", serviceName = "accessoryWebService")
+public class AccessoryxxService extends BaseWebCtl implements IAccessoryxxService{
+	@Autowired
+	private AccessoryService accessoryService;
+	/**
+	 * 通过附件主键，返回附件信息
+	 * @throws FileNotFoundException 
+	 */
+	@SuppressWarnings("resource")
+	@Override
+	@WebMethod(operationName = "findOne", action = "http://service.web.jsjty.com/findOne")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findOne(String id,String type) throws IOException {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		//单纯返回附件信息当type为1或空
+		if(type.equals("1")||type.equals("")){
+		AccessoryEntity accessory = accessoryService.findOne(id);
+		JSONArray jsons=JSONArray.fromObject(accessory);
+		return jsons.toString();
+		//当type为2时返回附件流信息
+		}else if(type.equals("2")){
+			AccessoryEntity accessory = accessoryService.findOne(id);
+			String filename = GlobalData.VIEW_FILE_PATH+accessory.getFilepath()+accessory.getFilename();
+			File file = new File(filename);
+			if(filename==null||filename.equals("")){
+				throw new NullPointerException("无效的文件路径");
+			}
+			long len = file.length();
+			byte[] bytes = new byte[(int)len];
+			BufferedInputStream bufferedInputStream=new BufferedInputStream(new FileInputStream(file));
+			int r = bufferedInputStream.read(bytes);
+			if(r!=len){
+				throw new IOException("读取文件不正确");
+			}
+			bufferedInputStream.close();
+			JSONArray jsons = JSONArray.fromObject(bytes);
+			return jsons.toString();
+		}else{
+			return "";
+		}
+	}
+
+}

gkjsjy/trunk/src/com/cxfws/config/utils/CxfwsUtils.java

@@ -0,0 +1,77 @@
+package com.cxfws.config.utils;
+
+import java.util.List;
+
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.handler.MessageContext;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.cxf.binding.soap.SoapHeader;
+import org.apache.cxf.headers.Header;
+import org.w3c.dom.Element;
+
+public final class CxfwsUtils {
+	private final static String VALIDATE_NODE_NAME = "userService";
+
+	public static String userNameFromHeaderInfo(WebServiceContext wscontext) {
+
+		if (null != wscontext) {
+			MessageContext messageContext = wscontext.getMessageContext();
+			@SuppressWarnings("unchecked")
+			List<Header> headers = (List<Header>) messageContext.get(Header.HEADER_LIST);
+			if (null != headers && !headers.isEmpty()) {
+				for (Header header : headers) {
+					SoapHeader soapHeader = (SoapHeader) header;
+					// System.out.println("==================header =" +
+					// header);
+
+					Element element = (Element) soapHeader.getObject();
+					// System.out.println("ELEMENT =" +
+					// element.getNodeName()+":::"+element.getTextContent());
+					if (VALIDATE_NODE_NAME.equalsIgnoreCase(element.getNodeName())) {
+						System.out.println(element.getTextContent());
+						String[] textContent = StringUtils.split(element.getTextContent(), "&");
+						if (null != textContent && textContent.length == 2) {
+
+							return textContent[0];
+						}
+						break;
+					}
+				}
+			}
+		}
+
+		return null;
+	}
+
+	public static String passWordFromHeaderInfo(WebServiceContext wscontext) {
+
+		if (null != wscontext) {
+			MessageContext messageContext = wscontext.getMessageContext();
+			@SuppressWarnings("unchecked")
+			List<Header> headers = (List<Header>) messageContext.get(Header.HEADER_LIST);
+			if (null != headers && !headers.isEmpty()) {
+				for (Header header : headers) {
+					SoapHeader soapHeader = (SoapHeader) header;
+					// System.out.println("==================header =" +
+					// header);
+
+					Element element = (Element) soapHeader.getObject();
+					// System.out.println("ELEMENT =" +
+					// element.getNodeName()+":::"+element.getTextContent());
+					if (VALIDATE_NODE_NAME.equalsIgnoreCase(element.getNodeName())) {
+						System.out.println(element.getTextContent());
+						String[] textContent = StringUtils.split(element.getTextContent(), "&");
+						if (null != textContent && textContent.length == 2) {
+
+							return textContent[1];
+						}
+						break;
+					}
+				}
+			}
+		}
+
+		return null;
+	}
+}

gkjsjy/trunk/src/com/cxfws/gkggxxfw/service/IJzxhxhbglService.java

@@ -0,0 +1,20 @@
+package com.cxfws.gkggxxfw.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+
+
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "hxhbglWebServicePort", serviceName = "hxhbglWebService")
+public interface IJzxhxhbglService {
+	@WebMethod(operationName = "findOne",action="http://service.web.jsjty.com/findOne")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	//通知详情
+	public String findOne(String id);
+	
+	//月份列表
+	public String findHxhbgl(final String ssjyr,final String szdid,final String szgkid,final String szgqid,final String hxlrsjq,final String hxlrsjz);
+	
+}

gkjsjy/trunk/src/com/cxfws/gkggxxfw/service/ITzggService.java

@@ -0,0 +1,22 @@
+package com.cxfws.gkggxxfw.service;
+
+import java.util.List;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+import com.xt.jygl.ggfwxxgl.tzgg.gg.entity.GgEntity;
+
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "tzggWebServicePort", serviceName = "tzggWebService")
+public interface ITzggService {
+	
+	@WebMethod(operationName = "findOne",action="http://service.web.jsjty.com/findOne")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	//通知详情
+	public String findOne(String id);
+	
+	//列表
+	public String findTzgg(String bt);
+}

gkjsjy/trunk/src/com/cxfws/gkggxxfw/service/impl/JzxhxhbglService.java

@@ -0,0 +1,130 @@
+package com.cxfws.gkggxxfw.service.impl;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.gkggxxfw.service.IJzxhxhbglService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.ggfwxxgl.hxhbgl.entity.HxhbglEntity;
+import com.xt.jygl.ggfwxxgl.hxhbgl.service.HxhbglService;
+import com.xt.jygl.ggfwxxgl.hxhbgl.vo.HxhbglVo;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.utils.SecUtils;
+import com.xtframe.util.StringUtils;
+
+import net.sf.json.JSONArray;
+
+@Service("hxhbglWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "hxhbglWebServicePort", serviceName = "hxhbglWebService")
+public class JzxhxhbglService extends BaseWebCtl implements IJzxhxhbglService {
+	
+	@Autowired
+	private QueryService query;
+	@Autowired
+	private HxhbglService hxhbglService;
+
+	//详情
+	public String findOne(String id){
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		HxhbglEntity entity = hxhbglService.findOne(id);
+		HxhbglVo vo = new HxhbglVo();
+		BeanUtils.copyProperties(entity, vo);
+		vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+        vo.setSsgkglbmzw(entity.getSsgkglbm()!=null?entity.getSsgkglbm().getGkglbmqc():""); 
+        String rq=entity.getYear()+"-"+entity.getMonth();
+        vo.setRq(rq);
+        
+        return JSONArray.fromObject(vo).toString();
+	}
+		
+	//月份列表
+	public String findHxhbgl(final String ssjyr,final String szdid,final String szgkid,final String szgqid,final String hxlrsjq,final String hxlrsjz){
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		// 查詢條件
+				Specification<HxhbglEntity> spec = new Specification<HxhbglEntity>() {
+
+					@Override
+					public Predicate toPredicate(Root<HxhbglEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+						List<Predicate> list = new ArrayList<Predicate>();
+						if (StringUtils.isNotEmpty(szdid)) {
+							list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+						}
+						if (StringUtils.isNotEmpty(szgkid)) {
+							list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+						}
+						if (StringUtils.isNotEmpty(szgqid)) {
+							list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
+						}
+						if (StringUtils.isNotEmpty(ssjyr)) {
+							list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + ssjyr + "%"));
+						}
+						SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+						Date date;
+						if (StringUtils.isNotEmpty(hxlrsjq)) {
+							try {
+								date = sdf.parse(hxlrsjq);
+							} catch (ParseException e) {
+								// TODO Auto-generated catch block
+								date = null;
+								e.printStackTrace();
+							}
+							list.add(cb.greaterThanOrEqualTo(root.get("createDateTime").as(Date.class), date));
+						}
+						if (StringUtils.isNotEmpty(hxlrsjz)) {
+							try {
+								date = sdf.parse(hxlrsjz);
+							} catch (ParseException e) {
+								
+								date = null;
+								e.printStackTrace();
+							}
+							list.add(cb.lessThanOrEqualTo(root.get("createDateTime").as(Date.class), date));
+						}
+						// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
+						if (isJyr()) {
+							list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
+						} else {
+							list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SecUtils.getCurrUser().getSzd().getId() + "%"));
+						}
+						list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+						return cb.and(list.toArray(new Predicate[] {}));
+					}
+				};
+				
+				List<HxhbglEntity> list = query.findAll(spec,HxhbglEntity.class);
+				List<HxhbglVo> voList = new ArrayList<HxhbglVo>();
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+				for (HxhbglEntity entity : list) {
+					HxhbglVo vo = new HxhbglVo();
+					if (entity != null) {
+						BeanUtils.copyProperties(entity, vo);
+						vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+						vo.setCreateDateTimeStr(entity.getCreateDateTime() != null ? sdf.format(entity.getCreateDateTime()) : "");
+						voList.add(vo);
+					}
+				}
+				return JSONArray.fromObject(voList).toString();
+				
+	}
+		
+
+}

gkjsjy/trunk/src/com/cxfws/gkggxxfw/service/impl/TzggService.java

@@ -0,0 +1,178 @@
+package com.cxfws.gkggxxfw.service.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.xml.ws.WebServiceContext;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.gkggxxfw.service.ITzggService;
+import com.xt.jygl.accessory.entity.AccessoryEntity;
+import com.xt.jygl.accessory.service.AccessoryService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.ggfwxxgl.tzgg.gg.entity.GgEntity;
+import com.xt.jygl.ggfwxxgl.tzgg.ggxx.entity.GgxxEntity;
+import com.xt.jygl.ggfwxxgl.tzgg.ggxx.entity.GgxxtxEntity;
+import com.xt.jygl.ggfwxxgl.tzgg.ggxx.service.GgxxService;
+import com.xt.jygl.ggfwxxgl.tzgg.ggxx.service.GgxxtxService;
+import com.xt.jygl.ggfwxxgl.tzgg.ggxx.vo.GgxxVo;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
+import com.xtframe.core.support.SecurityMgr;
+import com.xtframe.sec.common.SimplePageRequest;
+import com.xtframe.sec.user.entity.UserEntity;
+import com.xtframe.util.StringUtils;
+
+import cache.CacheSearchCondition;
+import net.sf.json.JSONArray;
+
+@Service("tzggWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "tzggWebServicePort", serviceName = "tzggWebService")
+public class TzggService extends BaseWebCtl implements ITzggService  {
+	
+	@Autowired
+	private GgxxService ggxxService;
+	
+	@Autowired
+	private AccessoryService accessoryService;
+	
+	@Autowired
+	private SecurityMgr securityMgr;
+	
+	@Autowired
+	private GgxxtxService ggxxtxService;
+	
+	@Autowired
+	private GkjyrService gkjyrService;
+	
+	/**
+	 * 根据id获取通知公告详细信息
+	 * */
+	@Override
+	public String findOne(String id){
+		
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		GgxxEntity entity = ggxxService.findOne(id);
+		GgxxVo vo = new GgxxVo();
+		BeanUtils.copyProperties(entity, vo);
+		if (!StringUtils.isEmpty(entity.getFjid())) {
+			AccessoryEntity acc = accessoryService.findOne(entity.getFjid());
+			if (acc != null) {
+				vo.setFjmc(acc.getName());
+			}
+		}
+		if (!StringUtils.isEmpty(entity.getGglx())) {
+			if(!StringUtils.isEmpty(entity.getGglx().getText())){
+				vo.setGglxmc(entity.getGglx().getText());
+			}
+			if(!StringUtils.isEmpty(entity.getGglx().getId())){
+				vo.setGglx(entity.getGglx().getId());
+			}
+		}
+		vo.setFbr(securityMgr.userService().findById(entity.getCreateUser()).getName());
+		UserEntity user = securityMgr.getCurrUser();
+		if (isJyr()) {
+			GgxxtxEntity ggxxtx = ggxxtxService.findByggidandjyr(id, user.getSsjyr().getId(), "1");
+			if (ggxxtx != null) {
+				ggxxtx.setSfyd("1");
+				ggxxtx = ggxxtxService.save(ggxxtx);
+			}
+		} else {
+			if (!StringUtils.isEmpty(user.getSsglry())) {
+				GgxxtxEntity ggxxtx = ggxxtxService.findByggidandjyr(id, user.getSsglry().getId(), "0");
+				if (ggxxtx != null) {
+					ggxxtx.setSfyd("1");
+					ggxxtx = ggxxtxService.save(ggxxtx);
+				}
+			}
+		}
+		
+		List<GgxxtxEntity> list = ggxxtxService.findByggid(id);
+
+		List<GkjyrEntity> jyrlist = new ArrayList<GkjyrEntity>();
+		if (list != null && list.size() > 0) {
+			for (GgxxtxEntity ggtx : list) {
+				GkjyrEntity jyr = gkjyrService.findOne(ggtx.getJyr());
+				jyrlist.add(jyr);
+			}
+		}
+		Map result=new HashMap();
+		result.put("record", vo);
+		result.put("jyrlist", jyrlist);
+		return JSONArray.fromObject(result).toString();
+	}
+	
+	
+	/**
+	 * 根据标题获得通知公告列表
+	 * */
+	
+	@Override
+	public String findTzgg(final String bt){
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		List<GgEntity> list=null;
+		Specification<GgxxEntity> spec = new Specification<GgxxEntity>() {
+			// 查询条件
+			@Override
+			public Predicate toPredicate(Root<GgxxEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+				if (!StringUtils.isEmpty(bt)) {
+					list.add(cb.like(root.get("title").as(String.class), "%" + bt + "%"));
+				}
+				
+				return cb.and(list.toArray(new Predicate[] {}));
+			}
+		};
+		
+
+		List<GgxxEntity> chenyichao = query.findAll(spec,GgxxEntity.class);
+		List<GgxxVo> voList = new ArrayList<GgxxVo>();
+		UserEntity user = securityMgr.getCurrUser();
+		
+		for (GgxxEntity entity : chenyichao) {
+			GgxxVo vo = new GgxxVo();
+			if (null != entity) {
+				BeanUtils.copyProperties(entity, vo);
+				if (!StringUtils.isEmpty(entity.getFjid())) {
+					AccessoryEntity acc = accessoryService.findOne(entity.getFjid());
+					if (acc != null) {
+						vo.setFjmc(acc.getName());
+					}
+				}
+				if (user.getId().equals(entity.getCreateUser())) {
+					vo.setFlag("1");
+				}
+				if (!StringUtils.isEmpty(entity.getGglx())) {
+					vo.setGglxmc(entity.getGglx().getText());
+				}
+
+				Object ydsl = ggxxtxService.selectCount(entity.getId());
+				if (ydsl != null) {
+					vo.setYdsl(ydsl.toString());
+				} else {
+					vo.setYdsl("0");
+				}
+				vo.setFbr(securityMgr.userService().findById(entity.getCreateUser()).getName());
+				voList.add(vo);
+			}
+		}
+		return JSONArray.fromObject(voList).toString();
+	}
+}

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/IAxxxService.java

@@ -0,0 +1,13 @@
+package com.cxfws.gkjcxx.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "axWebServicePort", serviceName = "axWebService")
+public interface IAxxxService {
+	@WebMethod(operationName = "findAx",action="http://service.web.jsjty.com/findAx")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findAx(String szdid,String szgkid,String szgqid,String axmc,String lyztid,String ssjyr);
+	public String findOne(String id);
+}

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/ICbxxService.java

@@ -0,0 +1,12 @@
+package com.cxfws.gkjcxx.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "cbWebServicePort", serviceName = "cbWebService")
+public interface ICbxxService {
+	@WebMethod(operationName = "findCb",action="http://service.web.jsjty.com/findCb")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findCb(String zwcm,String ywcm,String cbsyr);
+	public String findOne(String id);
+}

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/IFbdxxService.java

@@ -0,0 +1,12 @@
+package com.cxfws.gkjcxx.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "fbdWebServicePort", serviceName = "fbdWebService")
+public interface IFbdxxService {
+	@WebMethod(operationName = "findFbd",action="http://service.web.jsjty.com/findFbd")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findFbd(String szdid,String szgkid,String szgqid,String fbdmc,String fbdlx);
+	public String findOne(String id);
+}

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/IGkxxService.java

@@ -0,0 +1,12 @@
+package com.cxfws.gkjcxx.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "gkWebServicePort", serviceName = "gkWebService")
+public interface IGkxxService {
+	@WebMethod(operationName = "findGk",action="http://service.web.jsjty.com/findGk")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findGk(String szd,String ssgkglbm,String gkmc);
+
+}

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/IGqxxService.java

@@ -0,0 +1,13 @@
+package com.cxfws.gkjcxx.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "gqWebServicePort", serviceName = "gqWebService")
+public interface IGqxxService {
+	@WebMethod(operationName = "findGq",action="http://service.web.jsjty.com/findGq")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findGq(String szd,String ssgkglbm,String szgkid,String gqszsylx,String gqmc);
+	public String findOne(String id);
+}

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/IJghdxxService.java

@@ -0,0 +1,13 @@
+package com.cxfws.gkjcxx.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "jghdWebServicePort", serviceName = "jghdWebService")
+public interface IJghdxxService {
+	@WebMethod(operationName = "findJxhd",action="http://service.web.jsjty.com/findJxhd")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findJxhd(String szdid,String szgkid,String hdmc);
+	public String findOne(String id);
+}

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/IMdxxService.java

@@ -0,0 +1,13 @@
+package com.cxfws.gkjcxx.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "mdWebServicePort", serviceName = "mdWebService")
+public interface IMdxxService {
+	@WebMethod(operationName = "findMd",action="http://service.web.jsjty.com/findMd")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findMd(String szdid,String szgkid,String mdmc,String xzhghid);
+	public String findOne(String id);
+}

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/IXzdwryxxService.java

@@ -0,0 +1,12 @@
+package com.cxfws.gkjcxx.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "xzglryWebServicePort", serviceName = "xzglryWebService")
+public interface IXzdwryxxService {
+	@WebMethod(operationName = "findXzglry",action="http://service.web.jsjty.com/findXzglry")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findXzglry(/*String id,String szd,*/String ssbm);
+}

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/IXzdwxxService.java

@@ -0,0 +1,11 @@
+package com.cxfws.gkjcxx.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "xzbmWebServicePort", serviceName = "xzbmWebService")
+public interface IXzdwxxService {
+	@WebMethod(operationName = "findXzbm",action="http://service.web.jsjty.com/findXzbm")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findXzbm(String pid,String szd);
+}

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/IZyqxxService.java

@@ -0,0 +1,13 @@
+package com.cxfws.gkjcxx.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "zyqWebServicePort", serviceName = "zyqWebService")
+public interface IZyqxxService {
+	@WebMethod(operationName = "findZyq",action="http://service.web.jsjty.com/findZyq")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findZyq(String zyqmc,String szgkid,String szgqid,String szdid);
+	public String findOne(String id);
+}

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/impl/AxxxService.java

@@ -0,0 +1,90 @@
+package com.cxfws.gkjcxx.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import net.sf.json.JSONArray;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.gkjcxx.service.IAxxxService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.gkjcxx.ax.dao.AxDao;
+import com.xt.jygl.gkjcxx.ax.entity.AxEntity;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.util.StringUtils;
+/**
+ * 岸线信息查询
+ */
+@Service("axWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "axWebServicePort", serviceName = "axWebService")
+public class AxxxService extends BaseWebCtl  implements IAxxxService{
+	@Autowired
+	private QueryService query;
+	@Autowired
+	private AxDao dao;
+	/**
+	 * 根据条件查询岸线信息
+	 */
+	@Override
+	@WebMethod(operationName = "findAx", action = "http://service.web.jsjty.com/findAx")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findAx(final String szdid, final String szgkid, final String szgqid, final String axmc, final String lyztid, final String ssjyr) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		Specification<AxEntity> spec = new Specification<AxEntity>() {
+			// 查询条件
+			@Override
+			public Predicate toPredicate(Root<AxEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+
+				if (StringUtils.isNotEmpty(axmc)) {
+					list.add(cb.like(root.get("axmc").as(String.class), "%" + axmc + "%"));
+				} 
+				if (StringUtils.isNotEmpty(szdid)) {
+					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(szgkid)) {
+					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(szgqid)) {
+					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(ssjyr)) {
+					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + ssjyr + "%"));
+				} 
+				if (StringUtils.isNotEmpty(lyztid)) {
+					list.add(cb.like(root.get("lyzt").get("id").as(String.class), "%" + lyztid + "%"));
+				} 
+				
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+				return cb.and(list.toArray(new Predicate[] {}));
+			}
+		};
+		List<AxEntity> axlist = query.findAll(spec, AxEntity.class);
+		JSONArray jsons=JSONArray.fromObject(axlist);
+		return jsons.toString();
+	}
+	/**
+	 * 根据id查询岸线信息
+	 */
+	@Override
+	public String findOne(String id) {
+		AxEntity ax = dao.findOne(id);
+		JSONArray jsons=JSONArray.fromObject(ax);
+		return jsons.toString();
+	}
+
+}

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/impl/CbxxService.java

@@ -0,0 +1,77 @@
+package com.cxfws.gkjcxx.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import net.sf.json.JSONArray;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.gkjcxx.service.ICbxxService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.gkjcxx.cb.dao.CbDao;
+import com.xt.jygl.gkjcxx.cb.entity.CbEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.util.StringUtils;
+/**
+ * 船舶信息查询
+ */
+@Service("cbWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "cbWebServicePort", serviceName = "cbWebService")
+public class CbxxService extends BaseWebCtl  implements ICbxxService{
+	@Autowired
+	private QueryService query;
+	@Autowired
+	private CbDao dao;
+	/**
+	 * 根据查询条件查询船舶信息
+	 */
+	@Override
+	@WebMethod(operationName = "findCb", action = "http://service.web.jsjty.com/findCb")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findCb(final String zwcm, final String ywcm, final String cbsyr) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		Specification<CbEntity> spec = new Specification<CbEntity>() {
+
+			@Override
+			public Predicate toPredicate(Root<CbEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+				if (StringUtils.isNotEmpty(zwcm)) {
+					list.add(cb.like(root.get("zwcm").as(String.class), "%" + zwcm + "%"));
+				}
+				if (StringUtils.isNotEmpty(ywcm)) {
+					list.add(cb.like(root.get("ywcm").as(String.class), "%" + ywcm + "%"));
+				}
+				if (StringUtils.isNotEmpty(cbsyr)) {
+					list.add(cb.like(root.get("cbsyr").as(String.class), "%" + cbsyr + "%"));
+				}
+				return cb.and(list.toArray(new Predicate[] {}));
+			}
+		};
+		List<CbEntity> cblist = query.findAll(spec, CbEntity.class);
+		JSONArray jsons=JSONArray.fromObject(cblist);
+		return jsons.toString();
+	}
+	/**
+	 * 根据id查找船舶信息
+	 */
+	@Override
+	public String findOne(String id) {
+		CbEntity cb = dao.findOne(id);
+		JSONArray jsons=JSONArray.fromObject(cb);
+		return jsons.toString();
+	}
+
+}

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/impl/FbdxxService.java

@@ -0,0 +1,85 @@
+package com.cxfws.gkjcxx.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import net.sf.json.JSONArray;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.gkjcxx.service.IFbdxxService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.gkjcxx.fbd.dao.FbdDao;
+import com.xt.jygl.gkjcxx.fbd.entity.FbdEntity;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.util.StringUtils;
+/**
+ * 防波堤信息查询
+ * 
+ */
+@Service("fbdWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "fbdWebServicePort", serviceName = "fbdWebService")
+public class FbdxxService extends BaseWebCtl  implements IFbdxxService{
+	@Autowired
+	private QueryService query;
+	@Autowired
+	private FbdDao dao;
+	/**
+	 * 根据查询条件查询防波堤信息
+	 */
+	@Override
+	@WebMethod(operationName = "findFbd", action = "http://service.web.jsjty.com/findFbd")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findFbd(final String szdid,final String szgkid,final String szgqid,final String fbdmc,final String fbdlx) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		Specification<FbdEntity> spec = new Specification<FbdEntity>() {
+			@Override
+			public Predicate toPredicate(Root<FbdEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+				if (StringUtils.isNotEmpty(fbdmc)) {
+					list.add(cb.like(root.get("fbdmc").as(String.class), "%" + fbdmc + "%"));
+				} 
+				if (StringUtils.isNotEmpty(fbdlx)) {
+					list.add(cb.like(root.get("fbdlx").as(String.class), "%" + fbdlx + "%"));
+				} 
+				if (StringUtils.isNotEmpty(szgkid)) {
+					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(szgqid)) {
+					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(szdid)) {
+					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+				}
+				list.add(cb.notEqual(root.get("recordStatus").as(String.class), BaseEntity.RECORD_STATE_DELETE));
+				return cb.and(list.toArray(new Predicate[] {}));
+			}
+		};
+		List<FbdEntity> fbdlist = query.findAll(spec, FbdEntity.class);
+		JSONArray jsons=JSONArray.fromObject(fbdlist);
+		return jsons.toString();
+	}
+	/**
+	 * 根据id查询防波堤信息
+	 */
+	@Override
+	public String findOne(String id) {
+		FbdEntity fbd = dao.findOne(id);
+		JSONArray jsons=JSONArray.fromObject(fbd);
+		return jsons.toString();
+	}
+
+}

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/impl/GkxxService.java

@@ -0,0 +1,68 @@
+package com.cxfws.gkjcxx.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import net.sf.json.JSONArray;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.gkjcxx.service.IGkxxService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.gkjcxx.gk.dao.GkDao;
+import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.util.StringUtils;
+/**
+ * 根据查询条件所在地，所属部门，港口名称查询
+ *
+ */
+@Service("gkWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "gkWebServicePort", serviceName = "gkWebService")
+public class GkxxService  extends BaseWebCtl implements IGkxxService{
+	@Autowired
+	private GkDao dao;
+	@Autowired
+	private QueryService query;
+	@Override
+	@WebMethod(operationName = "findGk", action = "http://service.web.jsjty.com/findGk")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findGk(final String szd,final String ssgkglbm,final String gkmc) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+				// 查询条件
+				Specification<GkEntity> spec = new Specification<GkEntity>() {
+					@Override
+					public Predicate toPredicate(Root<GkEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+						List<Predicate> list = new ArrayList<Predicate>();
+						if (StringUtils.isNotEmpty(gkmc)) {
+							list.add(cb.like(root.get("gkmc").as(String.class), "%" + gkmc + "%"));
+						} 
+						if (StringUtils.isNotEmpty(szd)) {
+							list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szd + "%"));
+						} 
+						if (StringUtils.isNotEmpty(ssgkglbm)) {
+							list.add(cb.like(root.get("ssgkglbm").get("id").as(String.class), "%" + ssgkglbm + "%"));
+						} 
+						list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+						return cb.and(list.toArray(new Predicate[] {}));
+					}
+				};
+				List<GkEntity> listGk = query.findAll(spec, GkEntity.class);
+				JSONArray jsons=JSONArray.fromObject(listGk);
+		return jsons.toString();
+	}
+	
+}

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/impl/GqxxService.java

@@ -0,0 +1,85 @@
+package com.cxfws.gkjcxx.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import net.sf.json.JSONArray;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.gkjcxx.service.IGqxxService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.gkjcxx.gq.dao.GqDao;
+import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.util.StringUtils;
+/**
+ * 港区信息查询
+ *
+ */
+@Service("gqWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "gqWebServicePort", serviceName = "gqWebService")
+public class GqxxService extends BaseWebCtl  implements IGqxxService{
+	@Autowired
+	private QueryService query;
+	@Autowired
+	private GqDao dao;
+	@Override
+	@WebMethod(operationName = "findGq", action = "http://service.web.jsjty.com/excTable")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findGq(final String szd, final String ssgkglbm, final String szgkid, final String gqszsylx, final String gqmc) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		// 查询条件
+				Specification<GqEntity> spec = new Specification<GqEntity>() {
+					@Override
+					public Predicate toPredicate(Root<GqEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+						List<Predicate> list = new ArrayList<Predicate>();
+						if (StringUtils.isNotEmpty(gqmc)) {
+							list.add(cb.like(root.get("gqmc").as(String.class), "%" + gqmc + "%"));
+						} 
+
+						if (StringUtils.isNotEmpty(gqszsylx)) {
+							list.add(cb.like(root.get("gqszsylx").get("id").as(String.class), "%" + gqszsylx + "%"));
+						} 
+						if (StringUtils.isNotEmpty(szgkid)) {
+							list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+						} 
+
+						if (StringUtils.isNotEmpty(szd)) {
+							list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szd + "%"));
+						} 
+						if (StringUtils.isNotEmpty(ssgkglbm)) {
+							list.add(cb.like(root.get("ssgkglbm").get("id").as(String.class), "%" + ssgkglbm + "%"));
+						} 
+						list.add(cb.notEqual(root.get("recordStatus").as(String.class), BaseEntity.RECORD_STATE_DELETE));
+						return cb.and(list.toArray(new Predicate[] {}));
+					}
+				};
+				List<GqEntity> gqlist = query.findAll(spec, GqEntity.class);
+				JSONArray jsons=JSONArray.fromObject(gqlist);
+				return jsons.toString();
+	}
+	/***
+	 * 根据id
+	 */
+	@Override
+	public String findOne(String id) {
+		GqEntity gq = dao.findOne(id);
+		JSONArray jsons=JSONArray.fromObject(gq);
+		return jsons.toString();
+	}
+
+}

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/impl/JghdxxService.java

@@ -0,0 +1,81 @@
+package com.cxfws.gkjcxx.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import net.sf.json.JSONArray;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.gkjcxx.service.IJghdxxService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.gkjcxx.jghd.dao.JghdDao;
+import com.xt.jygl.gkjcxx.jghd.entity.JghdEntity;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.util.StringUtils;
+/**
+ * 进港航道信息查询
+ */
+@Service("jghdWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "jghdWebServicePort", serviceName = "jghdWebService")
+public class JghdxxService extends BaseWebCtl  implements IJghdxxService{
+	@Autowired
+	private QueryService query;
+	@Autowired
+	private JghdDao dao;
+	/**
+	 * 根据查询条件查询进港航道信息
+	 */
+	@Override
+	@WebMethod(operationName = "findJxhd", action = "http://service.web.jsjty.com/findJxhd")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findJxhd(final String szdid, final String szgkid, final String hdmc) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		Specification<JghdEntity> spec = new Specification<JghdEntity>() {
+
+			// 查询条件
+			@Override
+			public Predicate toPredicate(Root<JghdEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+				if (StringUtils.isNotEmpty(szdid)) {
+					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+				}
+				if (StringUtils.isNotEmpty(szgkid)) {
+					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+				}
+				if (StringUtils.isNotEmpty(hdmc)) {
+					list.add(cb.like(root.get("hdmc").as(String.class), "%" + hdmc + "%"));
+				}
+				
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+				return cb.and(list.toArray(new Predicate[] {}));
+			}
+		};
+		List<JghdEntity> jghdlist = query.findAll(spec, JghdEntity.class);
+		JSONArray jsons=JSONArray.fromObject(jghdlist);
+		return jsons.toString();
+	}
+	/**
+	 * 根据id查询进港航道信息
+	 */
+	@Override
+	public String findOne(String id) {
+		JghdEntity jghd = dao.findOne(id);
+		JSONArray jsons=JSONArray.fromObject(jghd);
+		return jsons.toString();
+	}
+
+}

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/impl/MdxxService.java

@@ -0,0 +1,82 @@
+package com.cxfws.gkjcxx.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import net.sf.json.JSONArray;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.gkjcxx.service.IMdxxService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.gkjcxx.md.dao.MdDao;
+import com.xt.jygl.gkjcxx.md.entity.MdEntity;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.util.StringUtils;
+/**
+ * 锚地信息查询
+ */
+@Service("mdWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "mdWebServicePort", serviceName = "mdWebService")
+public class MdxxService  extends BaseWebCtl implements IMdxxService{
+	@Autowired
+	private QueryService query;
+	@Autowired
+	private MdDao dao;
+	/**
+	 * 根据id查锚地
+	 */
+	@Override
+	public String findOne(String id) {
+		MdEntity md = dao.findOne(id);
+		JSONArray jsons=JSONArray.fromObject(md);
+		return jsons.toString();
+	}
+	/**
+	 * 根据查询条件所在地，所在港口，锚地名称，规划和现状
+	 */
+	@Override
+	@WebMethod(operationName = "findMd", action = "http://service.web.jsjty.com/findMd")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findMd(final String szdid, final String szgkid, final String mdmc, final String xzhghid) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		Specification<MdEntity> spec = new Specification<MdEntity>() {
+
+			@Override
+			public Predicate toPredicate(Root<MdEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+				if (StringUtils.isNotEmpty(mdmc)) {
+					list.add(cb.like(root.get("mdmc").as(String.class), "%" + mdmc + "%"));
+				} 
+				if (StringUtils.isNotEmpty(szgkid)) {
+					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(szdid)) {
+					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(xzhghid)) {
+					list.add(cb.like(root.get("xzhgh").get("id").as(String.class), "%" + xzhghid + "%"));
+				} 
+				list.add(cb.notEqual(root.get("recordStatus").as(String.class), BaseEntity.RECORD_STATE_DELETE));
+				return cb.and(list.toArray(new Predicate[] {}));
+			}
+		};
+		List<MdEntity> mdlist = query.findAll(spec, MdEntity.class);
+		JSONArray jsons=JSONArray.fromObject(mdlist);
+		return jsons.toString();
+	}
+
+}

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/impl/XzdwryxxService.java

@@ -0,0 +1,51 @@
+package com.cxfws.gkjcxx.service.impl;
+
+import java.util.List;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+import net.sf.json.JSONArray;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.gkjcxx.service.IXzdwryxxService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.gkjcxx.xzdwxxgl.xzglryxx.dao.XzglryDao;
+import com.xt.jygl.gkjcxx.xzdwxxgl.xzglryxx.entity.XzglryEntity;
+/***
+ * 行政单位人员信息查询
+ *
+ */
+@Service("xzglryWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "xzglryWebServicePort", serviceName = "xzglryWebService")
+public class XzdwryxxService extends BaseWebCtl  implements IXzdwryxxService{
+	@Autowired
+	private XzglryDao dao;
+	/***
+	 * 根据人员主键，所在地，所属部门查询
+	 */
+	@Override
+	@WebMethod(operationName = "findXzglry", action = "http://service.web.jsjty.com/findXzglry")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findXzglry(/*String id,String szd,*/String ssbm) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		JSONArray jsons = new JSONArray();
+		/*if((!id.equals("") && szd.equals("")) && ssbm.equals("")){
+		   XzglryEntity xzglry = dao.findOne(id);
+		   jsons=JSONArray.fromObject(xzglry);
+		}else */if(/*(id.equals("") && szd.equals("")) && */!ssbm.equals("")){
+		   List<XzglryEntity> glryList =  dao.queryXzglryByBmid(ssbm);
+		   jsons=JSONArray.fromObject(glryList);
+		}/*else if((!szd.equals("")&&id.equals(""))&&ssbm.equals("")){
+		   List<XzglryEntity> glryListszd = dao.findBySzd(szd);
+		   jsons=JSONArray.fromObject(glryListszd);
+		}*/
+		return jsons.toString();
+	}
+	
+}

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/impl/XzdwxxService.java

@@ -0,0 +1,46 @@
+package com.cxfws.gkjcxx.service.impl;
+
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+import net.sf.json.JSONArray;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.gkjcxx.service.IXzdwxxService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.gkjcxx.xzdwxxgl.xzglbmxx.dao.XzglbmxxDao;
+import com.xt.jygl.gkjcxx.xzdwxxgl.xzglbmxx.entity.XzglbmxxEntity;
+/**
+ * 行政单位信息查询(根据所在地)
+ * @author b_zhaohang
+ *
+ */
+@Service("xzbmWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "xzbmWebServicePort", serviceName = "xzbmWebService")
+public class XzdwxxService extends BaseWebCtl  implements IXzdwxxService{
+	@Autowired
+	private XzglbmxxDao dao;
+	@PostConstruct
+	private void init(){
+		//System.out.println("------DiexcService--init-");
+		
+	}
+	@Override
+	@WebMethod(operationName = "findXzbm", action = "http://service.web.jsjty.com/findXZbm")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findXzbm(String pid,String szd) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		List<XzglbmxxEntity> list = dao.queryXzglbm(pid,szd);
+		JSONArray jsons=JSONArray.fromObject(list);
+		return jsons.toString();
+	}
+	
+}

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/impl/ZyqxxService.java

@@ -0,0 +1,82 @@
+package com.cxfws.gkjcxx.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import net.sf.json.JSONArray;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.gkjcxx.service.IZyqxxService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.gkjcxx.zyq.dao.ZyqDao;
+import com.xt.jygl.gkjcxx.zyq.entity.ZyqEntity;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.util.StringUtils;
+/**
+ *作业区信息查询
+ */
+@Service("zyqWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "zyqWebServicePort", serviceName = "zyqWebService")
+public class ZyqxxService extends BaseWebCtl  implements IZyqxxService{
+	@Autowired
+	private QueryService query;
+	@Autowired
+	private ZyqDao dao;
+	/**
+	 * 根据所在港区，所在港口，所在地，作业区名称查询
+	 */
+	@Override
+	@WebMethod(operationName = "findZyq", action = "http://service.web.jsjty.com/findZyq")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findZyq(final String zyqmc, final String szgkid, final String szgqid, final String szdid) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		//封装查询条件
+		Specification<ZyqEntity> spec = new Specification<ZyqEntity>() {
+			@Override
+			public Predicate toPredicate(Root<ZyqEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+				if (StringUtils.isNotEmpty(zyqmc)) {
+					list.add(cb.like(root.get("zyqmc").as(String.class), "%" + zyqmc + "%"));
+				} 
+				if (StringUtils.isNotEmpty(szgkid)) {
+					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(szgqid)) {
+					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(szdid)) {
+					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+				} 
+				list.add(cb.notEqual(root.get("recordStatus").as(String.class), BaseEntity.RECORD_STATE_DELETE));
+				return cb.and(list.toArray(new Predicate[] {}));
+			}
+		};
+		List<ZyqEntity> zyqlist = query.findAll(spec, ZyqEntity.class);
+		JSONArray jsons=JSONArray.fromObject(zyqlist);
+		return jsons.toString();
+	}
+	/**
+	 * 根据id查询作业区
+	 */
+	@Override
+	public String findOne(String id) {
+		ZyqEntity zyq = dao.findOne(id);
+		JSONArray jsons=JSONArray.fromObject(zyq);
+		return jsons.toString();
+	}
+	
+}

gkjsjy/trunk/src/com/cxfws/gkjyxkgl/service/IXkzbgWebService.java

@@ -0,0 +1,13 @@
+package com.cxfws.gkjyxkgl.service;
+
+import javax.jws.WebService;
+
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.entity.XkzbgEntity;
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "xkzbgWebServicePort", serviceName = "xkzbgWebService")
+public interface IXkzbgWebService {
+	public String findXkzbg(String lczt,String szdid,String szgkid,String szgqid,String gkjyr,String fddbr,String bgdd);
+	public String findOne(String id);
+	public Boolean submit(XkzbgEntity code, String[] jydyids, String accid, String mtids, String bwids, String cgids, String ckids, String dcids, String ryids, String sssbids, String qytzids, String zxjxids);
+	public Boolean audit(String shyj, String id, boolean flag);
+}

gkjsjy/trunk/src/com/cxfws/gkjyxkgl/service/IXkzsqWebService.java

@@ -0,0 +1,17 @@
+package com.cxfws.gkjyxkgl.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzsqEntity;
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "xkzsqWebServicePort", serviceName = "xkzsqWebService")
+public interface IXkzsqWebService {
+	@WebMethod(operationName = "findGkjyxksq",action="http://service.web.jsjty.com/findGkjyxksq")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findGkjyxksq(String szdid,  String szgkid,  String szgqid,  String gkjyr,  String fddbr,  String bgdd);
+	public String findOne(String id);
+	public Boolean submit(XkzsqEntity code, String[] jydyids, String accid, String mtids, String bwids, String cgids, String ckids, String dcids, String ryids, String sssbids, String qytzids, String zxjxids);
+	public Boolean audit(String shyj, String id, boolean flag);
+}

gkjsjy/trunk/src/com/cxfws/gkjyxkgl/service/IXkzyxWebService.java

@@ -0,0 +1,12 @@
+package com.cxfws.gkjyxkgl.service;
+
+import javax.jws.WebService;
+
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkyx.entity.XkzyxEntity;
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "xkzyxWebServicePort", serviceName = "xkzyxWebService")
+public interface IXkzyxWebService {
+	public String findXkzyx(String szdid,  String szgkid,  String szgqid,  String gkjyr,  String fddbr,  String bgdd);
+	public String findOne(String id);
+	public Boolean submit(XkzyxEntity code, String[] jydyids, String accid, String mtids, String bwids, String cgids, String ckids, String dcids, String ryids, String sssbids, String qytzids, String zxjxids);
+	public Boolean audit(String shyj, String id, boolean flag);
+}

gkjsjy/trunk/src/com/cxfws/gkjyxkgl/service/IXkzzxWebService.java

@@ -0,0 +1,13 @@
+package com.cxfws.gkjyxkgl.service;
+
+import javax.jws.WebService;
+
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkzx.entity.XkzzxEntity;
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "xkzzxWebServicePort", serviceName = "xkzzxWebService")
+public interface IXkzzxWebService {
+	public String findXkzzx(String szdid,  String szgkid,  String szgqid,  String gkjyr,  String fddbr,  String bgdd);
+	public String findOne(String id);
+	public Boolean submit(XkzzxEntity  code, String[] jydyids, String accid, String mtids, String bwids, String cgids, String ckids, String dcids, String ryids, String sssbids, String qytzids, String zxjxids);
+	public Boolean audit(String shyj, String id, boolean flag);
+}

gkjsjy/trunk/src/com/cxfws/gkjyxkgl/service/impl/XkzbgWebService.java

@@ -0,0 +1,833 @@
+package com.cxfws.gkjyxkgl.service.impl;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaBuilder.In;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+import javax.xml.ws.WebServiceContext;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.config.utils.CxfwsUtils;
+import com.cxfws.gkjyxkgl.service.IXkzbgWebService;
+import com.cxfws.gkjyxkgl.service.vo.XkzbgfVo;
+import com.xt.jygl.accessory.service.AccessoryService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.common.Constants;
+import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
+import com.xt.jygl.gkjcxx.gk.service.GkService;
+import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
+import com.xt.jygl.gkjcxx.gq.service.GqService;
+import com.xt.jygl.gkjcxx.mt.entity.MtEntity;
+import com.xt.jygl.gkjcxx.mt.service.MtService;
+import com.xt.jygl.gkjcxx.xzdwxxgl.xzglbmxx.service.XzglbmxxService;
+import com.xt.jygl.gkjcxx.zyq.entity.ZyqEntity;
+import com.xt.jygl.gkjcxx.zyq.service.ZyqService;
+import com.xt.jygl.gkjygl.gkjyr.jyrbw.service.BwService;
+import com.xt.jygl.gkjygl.gkjyr.jyrcg.entity.CgEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrcg.service.CgService;
+import com.xt.jygl.gkjygl.gkjyr.jyrck.entity.CkEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrck.service.CkService;
+import com.xt.jygl.gkjygl.gkjyr.jyrdc.entity.DcEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrdc.service.DcService;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.BwEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.RyEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
+import com.xt.jygl.gkjygl.gkjyr.qytz.entity.QytzEntity;
+import com.xt.jygl.gkjygl.gkjyr.qytz.service.QytzService;
+import com.xt.jygl.gkjygl.gkjyr.ry.service.RyService;
+import com.xt.jygl.gkjygl.gkjyr.ry.service.RyzsService;
+import com.xt.jygl.gkjygl.gkjyr.sssb.entity.SssbEntity;
+import com.xt.jygl.gkjygl.gkjyr.sssb.service.SssbService;
+import com.xt.jygl.gkjygl.gkjyr.xkzfz.service.XkzfzService;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.entity.XkzglbEntity;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.entity.XkzxxEntity;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.service.XkzglbService;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.service.XkzxxService;
+import com.xt.jygl.gkjygl.gkjyr.zxjx.entity.ZxjxEntity;
+import com.xt.jygl.gkjygl.gkjyr.zxjx.service.ZxjxService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.entity.XkzbgEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.entity.XkzbgfjEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.service.XkzbgService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.service.XkzbgfjService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.service.XkzbgjdsService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.vo.XkzbgVo;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzjyfwEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzsqglbEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzsqzscsEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XzjydyEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzjyfwService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzsqService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzsqfjService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzsqglbService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzsqzscsService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XzjydyService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.vo.XkzsqfjVo;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkyx.service.XkzyxService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkyx.service.XkzyxfjService;
+import com.xt.jygl.workflow.entity.TaskInfoEntity;
+import com.xt.jygl.workflow.service.TaskInfoService;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.user.dao.UserDao;
+import com.xtframe.sec.user.entity.UserEntity;
+import com.xtframe.util.StringUtils;
+@Service("xkzbgWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "xkzbgWebServicePort", serviceName = "xkzbgWebService")
+public class XkzbgWebService extends BaseWebCtl implements IXkzbgWebService{
+	@Autowired
+	private QueryService query;
+	@Autowired
+	private XkzbgService xkzbgService;
+	@Autowired
+	private GkjyrService gkjyrService;
+	@Autowired
+	private XzjydyService xzjydyService;
+	@Autowired
+	private TaskInfoService taskInfoService;
+	@Autowired
+	private GkService gkService;
+	@Autowired
+	private GqService gqService;
+	@Autowired
+	private MtService mtService;
+	@Autowired
+	private ZyqService zyqService;
+	@Autowired
+	private BwService bwService;
+	@Autowired
+	private CgService cgService;
+	@Autowired
+	private CkService ckService;
+	@Autowired
+	private DcService dcService;
+	@Autowired
+	private RyService ryService;
+	@Autowired
+	private SssbService sssbService;
+	@Autowired
+	private QytzService qytzService;
+	@Autowired
+	private XkzsqzscsService xkzsqzscsService;
+	@Autowired
+	private XkzsqglbService xkzsqglbService;
+	@Autowired
+	private XkzbgfjService xkzbgfjService;
+	@Autowired
+	private AccessoryService accessoryService;
+	@Autowired
+	private XkzjyfwService xkzjyfwService;
+	@Autowired
+	private XkzbgjdsService xkzbgjdsService;
+	@Autowired
+	private XkzxxService xkzxxService;
+	@Autowired
+	private XkzglbService xkzglbService;
+	@Autowired
+	private RyzsService ryzsService;
+	@Autowired
+	private ZxjxService zxjxService;
+	@Autowired
+	private XkzfzService xkzfzService;
+	@Autowired
+	private XkzsqService xkzsqService;
+	@Autowired
+	private XkzyxService xkzyxService;
+	@Autowired
+	private XkzyxfjService xkzyxfjService;
+	@Autowired
+	private XkzsqfjService xkzsqfjService;
+	@Autowired
+	private XzglbmxxService xzglbmxxService;
+	@Resource
+	private WebServiceContext wscontext;
+	@Autowired
+	private UserDao userdao;
+	@Override
+	public String findXkzbg(final String lczt,final String szdid, final String szgkid,final  String szgqid,final  String gkjyr, final String fddbr, final String bgdd) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		// 查询条件
+				Specification<XkzbgEntity> spec = new Specification<XkzbgEntity>() {
+					@Override
+					public Predicate toPredicate(Root<XkzbgEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+						List<Predicate> list = new ArrayList<Predicate>();
+						if (StringUtils.isNotEmpty(szdid)) {
+							list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+						}
+						if (StringUtils.isNotEmpty(szgkid)) {
+							list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+						}
+						if (StringUtils.isNotEmpty(szgqid)) {
+							list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
+						}
+						if (StringUtils.isNotEmpty(gkjyr)) {
+							list.add(cb.like(root.get("jyrmc").as(String.class), "%" + gkjyr + "%"));
+						}
+						if (StringUtils.isNotEmpty(fddbr)) {
+							list.add(cb.like(root.get("fddbr").as(String.class), "%" + fddbr + "%"));
+						}
+						if (StringUtils.isNotEmpty(bgdd)) {
+							list.add(cb.like(root.get("bgdd").as(String.class), "%" + bgdd + "%"));
+						}
+
+						list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+						// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
+						if (!isJyr()) {
+							// list.add(cb.like(root.get("szd").get("id").as(String.class),
+							// "%" + getUser().getSzd().getId() + "%"));
+
+							In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
+							List<String> gqlist = getGq();
+							if (gqlist != null && gqlist.size() > 0) {
+								for (int i = 0; i < gqlist.size(); i++) {
+									in.value(gqlist.get(i));
+								}
+								list.add(in);
+							}
+
+						} else {
+							Subquery<GkjyrEntity> subquery = query.subquery(GkjyrEntity.class);
+							Root<GkjyrEntity> dpRoot = subquery.from(GkjyrEntity.class);
+							subquery.select(dpRoot);
+							List<Predicate> subQueryPredicates = new ArrayList<Predicate>();
+							subQueryPredicates.add(cb.equal(root.get("jyrid").as(String.class), dpRoot.get("id").as(String.class)));
+							subQueryPredicates.add(cb.equal(dpRoot.get("yjyrid").as(String.class), getSsjyr().getId()));
+							subquery.where(subQueryPredicates.toArray(new Predicate[] {}));
+							list.add(cb.exists(subquery));
+						}
+
+						return cb.and(list.toArray(new Predicate[] {}));
+					}
+				};
+				List<XkzbgEntity> list = query.findAll(spec, XkzbgEntity.class);
+				List<XkzbgVo> voList = new ArrayList<XkzbgVo>();
+				for (XkzbgEntity entity : list) {
+					XkzbgVo vo = new XkzbgVo();
+					if (entity != null) {
+						BeanUtils.copyProperties(entity, vo);
+						if (entity.getRecordStatus() != 9) {
+							if ((xkzbgService.getTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) || xkzbgService.getCandidateTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) {
+								List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId(), XkzbgEntity.PROCESS_DEFINITION_KEY);
+								if (lists != null & lists.size() > 0) {
+									TaskInfoEntity taskinfo = lists.get(0);
+									if ("申请".equals(taskinfo.getCurrName())) {
+										vo.setTaskState("TH");
+									} else {
+										vo.setTaskState(Constants.IS_MY_TASK);
+									}
+								}
+							}
+							if (!isJyr()) {
+								XkzxxEntity xkz = xkzxxService.findByOpid(entity.getId(), "12");
+								if (xkz != null) {
+									vo.setOpflag("1");
+								}
+							}
+							voList.add(vo);
+						}
+					}
+				}
+		return Object2JsonStr(voList);
+	}
+
+	@Override
+	public String findOne(String id) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		XkzbgfVo xkzvo = new XkzbgfVo();
+		XkzbgEntity xkzbg = xkzbgService.findOne(id);
+		String opflag="";
+		List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, XkzbgEntity.PROCESS_DEFINITION_KEY);
+		if (lists != null & lists.size() > 0) {
+			TaskInfoEntity taskinfo = lists.get(0);
+			if ("材料审查".equals(taskinfo.getCurrName())) {
+				opflag = "1";
+			} else if ("核查".equals(taskinfo.getCurrName())) {
+				opflag = "2";
+			} else if ("复核".equals(taskinfo.getCurrName())) {
+				opflag = "3";
+			} else if ("审批".equals(taskinfo.getCurrName())) {
+				opflag = "4";
+			}
+		}
+		
+		// 经营范围 业务种类
+		List<XzjydyEntity> xzjydylist = xzjydyService.findJydy(id);
+		if (xzjydylist != null && xzjydylist.size() > 0) {
+			String jyfwstr = "";
+			String jds = "";
+			List<String> jyfwids = new ArrayList<String>();
+			for (int i = 0; i < xzjydylist.size(); i++) {
+				XzjydyEntity entity = xzjydylist.get(i);
+				jds = jds + entity.getId() + ",";
+				jyfwstr += entity.getFjdmc() + entity.getJyfwmc() + "(";
+				String str = "";
+				if (!StringUtils.isEmpty(entity.getGkid())) {
+					GkEntity gk = gkService.findOne(entity.getGkid());
+					if (gk != null) {
+						str = str + gk.getGkmc() + ",";
+					}
+				}
+				if (!StringUtils.isEmpty(entity.getGqid())) {
+					GqEntity gq = gqService.findOne(entity.getGqid());
+					if (gq != null) {
+						str = str + gq.getGqmc() + ",";
+					}
+				}
+				if (!StringUtils.isEmpty(entity.getZyqid())) {
+					ZyqEntity zyq = zyqService.findOne(entity.getZyqid());
+					if (zyq != null) {
+						str = str + zyq.getZyqmc() + ",";
+					}
+				}
+				if (!StringUtils.isEmpty(entity.getMtid())) {
+					MtEntity mt = mtService.findOne(entity.getMtid());
+					if (mt != null) {
+						str = str + mt.getMtmc();
+					}
+				}
+				if (!StringUtils.isEmpty(entity.getBwid())) {
+					BwEntity bw = bwService.findOne(entity.getBwid());
+					if (bw != null) {
+						str = str + bw.getBwmc();
+					}
+				}
+				jyfwstr = jyfwstr + str + ")<br/>";
+				jyfwids.add(entity.getJyfwid());
+				// xkzbg.setJydyids(jds);
+			}
+			List<Integer> list = fjlist(jyfwids);
+			if (list.size() > 0 && list != null) {
+				List<XkzsqzscsEntity> fjList = new ArrayList<XkzsqzscsEntity>();
+				for (int i = 0; i < list.size(); i++) {
+					XkzsqzscsEntity entity = xkzsqzscsService.findOne(list.get(i).toString());
+					fjList.add(entity);
+				}
+				List<XkzbgfjEntity> xkzfjList = xkzbgfjService.findByBgid(id);
+
+				List<XkzsqfjVo> voList = new ArrayList<XkzsqfjVo>();
+
+				for (int i = 0; i < fjList.size(); i++) {
+					XkzsqzscsEntity entity = fjList.get(i);
+					XkzsqfjVo vo = new XkzsqfjVo();
+					if (entity != null) {
+						BeanUtils.copyProperties(entity, vo);
+						if (entity.getRecordStatus() != 9) {
+							for (XkzbgfjEntity fj : xkzfjList) {
+								if ((i + 1) == fj.getSortno()) {
+									vo.setFjid(fj.getFjid());
+									vo.setFjmc(fj.getFjmc());
+									vo.setId(fj.getId());
+									break;
+								}
+							}
+							voList.add(vo);
+						}
+					}
+				}
+				xkzvo.setEntityList(voList);
+			}
+		}
+		xkzvo.setXkzbgEntity(xkzbg);
+		xkzvo.setOpflag(opflag);
+		return Object2JsonStr(xkzvo);
+	}
+
+	@Override
+	public Boolean submit(XkzbgEntity code, String[] jydyids, String accid, String mtids, String bwids, String cgids, String ckids, String dcids, String ryids, String sssbids, String qytzids, String zxjxids) {
+		if (!this.checkUser()){
+			return false;
+		}
+		if (jydyids != null && jydyids.length > 0) {
+			for (int i = 0; i < jydyids.length - 1; i++) {
+				XzjydyEntity xzjydyEntity = xzjydyService.findOne(jydyids[i]);
+				if (xzjydyEntity != null) {
+					if ("701".equals(xzjydyEntity.getJyfwid())) {
+						if (StringUtils.isEmpty(mtids) || StringUtils.isEmpty(bwids)) {
+							return false;
+						}
+					} else if ("703".equals(xzjydyEntity.getJyfwid())) {
+						if (StringUtils.isEmpty(ckids) && StringUtils.isEmpty(dcids)) {
+							return false;
+						}
+					} else if ("707".equals(xzjydyEntity.getJyfwid())) {
+						if (StringUtils.isEmpty(zxjxids)) {
+							return false;
+						}
+					}
+				}
+			}
+		}
+		XkzbgEntity xkzbgEntity = new XkzbgEntity();
+		UserEntity user = getUser();
+		try {
+			if (!StringUtils.isEmpty(code.getId())) {
+				xkzbgEntity = xkzbgService.findOne(code.getId());
+				xkzbgEntity.setXbgdz(code.getXbgdz());
+				xkzbgEntity.setXfddbr(code.getXfddbr());
+				xkzbgEntity.setXjydy(code.getXjydy());
+				xkzbgEntity.setXqt(code.getXqt());
+				xkzbgEntity.setXqymc(code.getXqymc());
+				xkzbgEntity.setXsjjyfw(code.getXsjjyfw());
+				xkzbgEntity.setSqyj(code.getSqyj());
+				xkzbgEntity = xkzbgService.submit(xkzbgEntity);
+			} else {
+				code.setSqr(user.getName());
+				code.setSqrq(new Date());
+				GkjyrEntity jyr = gkjyrService.findOne(code.getJyrid());
+				if (jyr != null) {
+					code.setSzgk(jyr.getSzgk());
+					code.setSzgq(jyr.getSzgq());
+					code.setSsgkglbm(jyr.getSsgkglbm());
+					code.setSzd(jyr.getSzd());
+				}
+				xkzbgEntity = xkzbgService.submit(code);
+			}
+			if (jydyids != null && jydyids.length > 0) {
+				for (int i = 0; i < jydyids.length - 1; i++) {
+					XzjydyEntity xzjydyEntity = xzjydyService.findOne(jydyids[i]);
+					if (xzjydyEntity != null) {
+						xzjydyEntity.setXkzsqid(xkzbgEntity.getId());
+						xzjydyEntity.setFlag("0");
+						xzjydyEntity = xzjydyService.save(xzjydyEntity);
+					}
+				}
+			}
+			// 改状态
+			GkjyrEntity jyr = gkjyrService.findOne(xkzbgEntity.getJyrid());
+			jyr.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
+			jyr = gkjyrService.save(jyr);
+			changStatus(jyr.getId(),BaseEntity.RECORE_STATE_BGFLAG);
+
+			GkjyrEntity bgjyr = gkjyrService.findOne(jyr.getBgjyrid());
+			bgjyr.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
+			bgjyr = gkjyrService.save(bgjyr);
+			changStatus(bgjyr.getId(),BaseEntity.RECORE_STATE_BGFLAG);
+
+			// 码头
+			List<XkzglbEntity> xkzglbList = xkzglbService.findByCzid(xkzbgEntity.getId(), "1");
+			if (xkzglbList != null && xkzglbList.size() > 0) {
+				for (XkzglbEntity xkzglb : xkzglbList) {
+					xkzglbService.delete(xkzglb.getId());
+				}
+			}
+			if (!StringUtils.isEmpty(mtids)) {
+				String[] mtid = mtids.split(",");
+				for (String mt : mtid) {
+					if (!StringUtils.isEmpty(mt)) {
+						XkzglbEntity xkzglb = new XkzglbEntity();
+						xkzglb.setJyrid(code.getJyrid());
+						xkzglb.setType("1");
+						xkzglb.setYwid(mt);
+						xkzglb.setCzid(xkzbgEntity.getId());
+						xkzglbService.save(xkzglb);
+					}
+				}
+			}
+			// 泊位
+			xkzglbList = xkzglbService.findByCzid(xkzbgEntity.getId(), "2");
+			if (xkzglbList != null && xkzglbList.size() > 0) {
+				for (XkzglbEntity xkzglb : xkzglbList) {
+					xkzglbService.delete(xkzglb.getId());
+				}
+			}
+			if (!StringUtils.isEmpty(bwids)) {
+				String[] bwid = bwids.split(",");
+				for (String bw : bwid) {
+					if (!StringUtils.isEmpty(bw)) {
+						XkzglbEntity xkzglb = new XkzglbEntity();
+						xkzglb.setJyrid(code.getJyrid());
+						xkzglb.setType("2");
+						xkzglb.setYwid(bw);
+						xkzglb.setCzid(xkzbgEntity.getId());
+						xkzglbService.save(xkzglb);
+					}
+				}
+			}
+			// 储罐
+			xkzglbList = xkzglbService.findByCzid(xkzbgEntity.getId(), "3");
+			if (xkzglbList != null && xkzglbList.size() > 0) {
+				for (XkzglbEntity xkzglb : xkzglbList) {
+					xkzglbService.delete(xkzglb.getId());
+				}
+			}
+			if (!StringUtils.isEmpty(cgids)) {
+				String[] cgid = cgids.split(",");
+				for (String cg : cgid) {
+					if (!StringUtils.isEmpty(cg)) {
+						XkzglbEntity xkzglb = new XkzglbEntity();
+						xkzglb.setJyrid(code.getJyrid());
+						xkzglb.setType("3");
+						xkzglb.setYwid(cg);
+						xkzglb.setCzid(xkzbgEntity.getId());
+						xkzglbService.save(xkzglb);
+					}
+				}
+			}
+			// 仓库
+			xkzglbList = xkzglbService.findByCzid(xkzbgEntity.getId(), "4");
+			if (xkzglbList != null && xkzglbList.size() > 0) {
+				for (XkzglbEntity xkzglb : xkzglbList) {
+					xkzglbService.delete(xkzglb.getId());
+				}
+			}
+			if (!StringUtils.isEmpty(ckids)) {
+				String[] ckid = ckids.split(",");
+				for (String ck : ckid) {
+					if (!StringUtils.isEmpty(ck)) {
+						XkzglbEntity xkzglb = new XkzglbEntity();
+						xkzglb.setJyrid(code.getJyrid());
+						xkzglb.setType("4");
+						xkzglb.setYwid(ck);
+						xkzglb.setCzid(xkzbgEntity.getId());
+						xkzglbService.save(xkzglb);
+					}
+				}
+			}
+			// 堆场
+			xkzglbList = xkzglbService.findByCzid(xkzbgEntity.getId(), "5");
+			if (xkzglbList != null && xkzglbList.size() > 0) {
+				for (XkzglbEntity xkzglb : xkzglbList) {
+					xkzglbService.delete(xkzglb.getId());
+				}
+			}
+			if (!StringUtils.isEmpty(dcids)) {
+				String[] dcid = dcids.split(",");
+				for (String dc : dcid) {
+					if (!StringUtils.isEmpty(dc)) {
+						XkzglbEntity xkzglb = new XkzglbEntity();
+						xkzglb.setJyrid(code.getJyrid());
+						xkzglb.setType("5");
+						xkzglb.setYwid(dc);
+						xkzglb.setCzid(xkzbgEntity.getId());
+						xkzglbService.save(xkzglb);
+					}
+				}
+			}
+			// 人员
+			xkzglbList = xkzglbService.findByCzid(xkzbgEntity.getId(), "6");
+			if (xkzglbList != null && xkzglbList.size() > 0) {
+				for (XkzglbEntity xkzglb : xkzglbList) {
+					xkzglbService.delete(xkzglb.getId());
+				}
+			}
+			if (!StringUtils.isEmpty(ryids)) {
+				String[] ryid = ryids.split(",");
+				for (String ry : ryid) {
+					if (!StringUtils.isEmpty(ry)) {
+						XkzglbEntity xkzglb = new XkzglbEntity();
+						xkzglb.setJyrid(code.getJyrid());
+						xkzglb.setType("6");
+						xkzglb.setYwid(ry);
+						xkzglb.setCzid(xkzbgEntity.getId());
+						xkzglbService.save(xkzglb);
+					}
+				}
+			}
+			// 设备
+			xkzglbList = xkzglbService.findByCzid(xkzbgEntity.getId(), "7");
+			if (xkzglbList != null && xkzglbList.size() > 0) {
+				for (XkzglbEntity xkzglb : xkzglbList) {
+					xkzglbService.delete(xkzglb.getId());
+				}
+			}
+			if (!StringUtils.isEmpty(sssbids)) {
+				String[] sssbid = sssbids.split(",");
+				for (String sssb : sssbid) {
+					if (!StringUtils.isEmpty(sssb)) {
+						XkzglbEntity xkzglb = new XkzglbEntity();
+						xkzglb.setJyrid(code.getJyrid());
+						xkzglb.setType("7");
+						xkzglb.setYwid(sssb);
+						xkzglb.setCzid(xkzbgEntity.getId());
+						xkzglbService.save(xkzglb);
+					}
+				}
+			}
+			// 企业投资
+			xkzglbList = xkzglbService.findByCzid(xkzbgEntity.getId(), "8");
+			if (xkzglbList != null && xkzglbList.size() > 0) {
+				for (XkzglbEntity xkzglb : xkzglbList) {
+					xkzglbService.delete(xkzglb.getId());
+				}
+			}
+			if (!StringUtils.isEmpty(qytzids)) {
+				String[] qytzid = qytzids.split(",");
+				for (String qytz : qytzid) {
+					if (!StringUtils.isEmpty(qytz)) {
+						XkzglbEntity xkzglb = new XkzglbEntity();
+						xkzglb.setJyrid(code.getJyrid());
+						xkzglb.setType("8");
+						xkzglb.setYwid(qytz);
+						xkzglb.setCzid(xkzbgEntity.getId());
+						xkzglbService.save(xkzglb);
+					}
+				}
+			}
+			// 装卸机械
+			xkzglbList = xkzglbService.findByCzid(xkzbgEntity.getId(), "9");
+			if (xkzglbList != null && xkzglbList.size() > 0) {
+				for (XkzglbEntity xkzglb : xkzglbList) {
+					xkzglbService.delete(xkzglb.getId());
+				}
+			}
+			if (!StringUtils.isEmpty(zxjxids)) {
+				String[] zxjxid = zxjxids.split(",");
+				for (String zxjx : zxjxid) {
+					if (!StringUtils.isEmpty(zxjx)) {
+						XkzglbEntity xkzglb = new XkzglbEntity();
+						xkzglb.setJyrid(code.getJyrid());
+						xkzglb.setType("9");
+						xkzglb.setYwid(zxjx);
+						xkzglb.setCzid(xkzbgEntity.getId());
+						xkzglbService.save(xkzglb);
+					}
+				}
+			}
+			if (!StringUtils.isEmpty(accid)) {
+				// 关联附件
+				String[] ssids = accid.split(",");
+				for (String ssid : ssids) {
+					XkzbgfjEntity xkzbgfj = xkzbgfjService.findOne(ssid);
+					if (xkzbgfj != null) {
+						xkzbgfj.setBgid(xkzbgEntity.getId());
+						xkzbgfjService.save(xkzbgfj);
+					}
+				}
+
+			}
+			// rtx提醒
+			// rtxSend(xkzbgEntity.getSzgq().getId(), Constants.ROLE_CLSC,
+			// "你有一条许可证变更待办事务，请及时处理！");
+		} catch (Exception e) {
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public Boolean audit(String shyj, String id, boolean flag) {
+		if (!this.checkUser()){
+			return false;
+		}
+		UserEntity user = getUser();
+		XkzbgEntity entity = new XkzbgEntity();
+		@SuppressWarnings("unused")
+		String role = "";
+		try {
+			entity = xkzbgService.findOne(id);
+			Date today = new Date();
+			List<TaskInfoEntity> list = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, XkzbgEntity.PROCESS_DEFINITION_KEY);
+			if (list != null & list.size() > 0) {
+				TaskInfoEntity taskinfo = list.get(0);
+				if ("材料审查".equals(taskinfo.getCurrName())) {
+					entity.setClscyj(StringUtils.isEmpty(shyj) ? "" : shyj);
+					entity.setClscjbr(user.getName());
+					entity.setClscrq(today);
+					role = Constants.ROLE_HC;
+				} else if ("核查".equals(taskinfo.getCurrName())) {
+					entity.setHcyj(StringUtils.isEmpty(shyj) ? "" : shyj);
+					entity.setHcjbr(user.getName());
+					entity.setHcrq(today);
+					role = Constants.ROLE_FH;
+				} else if ("复核".equals(taskinfo.getCurrName())) {
+					entity.setFhyj(StringUtils.isEmpty(shyj) ? "" : shyj);
+					entity.setFhjbr(user.getName());
+					entity.setFhrq(today);
+					role = Constants.ROLE_SP;
+				} else if ("审批".equals(taskinfo.getCurrName())) {
+					entity.setSpyj(StringUtils.isEmpty(shyj) ? "" : shyj);
+					entity.setSpry(user.getName());
+					entity.setSprq(today);
+				}
+				xkzbgService.save(entity);
+			}
+		} catch (Exception e) {
+			return false;
+		}
+		try {
+			if (xkzbgService.getCandidateTaskByUserAndBusKey(getUser().getId().toString(), id) != null) {
+				xkzbgService.claim(id, getUser().getId().toString());
+			}
+			boolean jflag = xkzbgService.changeAudit(shyj, entity, flag);
+			if (jflag) {
+				List<XzjydyEntity> xzjydylist = xzjydyService.findJydy(id);
+				if (xzjydylist.size() > 0 && xzjydylist != null) {
+					xkzjyfwService.deleteByJyrid(entity.getJyrid());
+					// 删除后同步修改更新时间
+					List<XkzjyfwEntity> xkzjys = xkzjyfwService.findByJyrid(entity.getJyrid());
+					for (XkzjyfwEntity xkzjy : xkzjys) {
+						xkzjy.setUpdateDateTime(new Timestamp(new Date().getTime()));
+						xkzjyfwService.save(xkzjy);
+					}
+					for (XzjydyEntity xzjydyEntity : xzjydylist) {
+						if (xzjydyEntity != null) {
+							// 保存成功后
+							XkzjyfwEntity jyfw = new XkzjyfwEntity();
+							jyfw.setJyrid(entity.getJyrid());
+							jyfw.setFjdid(xzjydyEntity.getFjdid() != null ? xzjydyEntity.getFjdid() : "");
+							jyfw.setFjdmc(xzjydyEntity.getFjdmc() != null ? xzjydyEntity.getFjdmc() : "");
+							jyfw.setJyfwid(xzjydyEntity.getJyfwid() != null ? xzjydyEntity.getJyfwid() : "");
+							jyfw.setJyfwmc(xzjydyEntity.getJyfwmc() != null ? xzjydyEntity.getJyfwmc() : "");
+							jyfw.setBwid(xzjydyEntity.getBwid() != null ? xzjydyEntity.getBwid() : "");
+							jyfw.setGkid(xzjydyEntity.getGkid() != null ? xzjydyEntity.getGkid() : "");
+							jyfw.setGqid(xzjydyEntity.getGqid() != null ? xzjydyEntity.getGqid() : "");
+							jyfw.setZyqid(xzjydyEntity.getZyqid() != null ? xzjydyEntity.getZyqid() : "");
+							jyfw.setMtid(xzjydyEntity.getMtid() != null ? xzjydyEntity.getMtid() : "");
+							xkzjyfwService.save(jyfw);
+						}
+					}
+				}
+			} else {
+				// rtx提醒
+				// rtxSend(entity.getSzgq().getId(), role,
+				// "你有一条许可证变更待办事务，请及时处理！");
+			}
+		} catch (Exception e) {
+			return false;
+		}
+		return true;
+	}
+	// 去重复附件数据
+			public List<Integer> fjlist(List<String> ids) {
+
+				List<Integer> newlist = new ArrayList<Integer>();
+				List<Integer> relist = new ArrayList<Integer>();
+				for (int i = 0; i < ids.size(); i++) {
+					List<XkzsqglbEntity> list = xkzsqglbService.findById(ids.get(i));
+					if (list != null && list.size() > 0) {
+						for (XkzsqglbEntity entity : list) {
+							newlist.add(Integer.parseInt(entity.getFileid()));
+						}
+					}
+				}
+				if (newlist != null && newlist.size() > 0) {
+					relist = array_unique(newlist);
+				}
+
+				return relist;
+
+			}
+			public List<Integer> array_unique(List<Integer> slist) {
+				// array_unique
+				List<Integer> list = new LinkedList<Integer>();
+				for (int i = 0; i < slist.size(); i++) {
+					if (!list.contains(slist.get(i))) {
+						list.add(slist.get(i));
+					}
+				}
+				return list;
+			}
+			// 改变状态
+			public void changStatus(String jyrid, int state) {
+				// 经营范围 业务种类
+				List<XkzjyfwEntity> list = xkzjyfwService.findByJyrid(jyrid);
+				if (list != null && list.size() > 0) {
+					for (int i = 0; i < list.size(); i++) {
+						XkzjyfwEntity entity = list.get(i);
+						entity.setRecordStatus(state);
+						xkzjyfwService.save(entity);
+					}
+				}
+				// 码头
+				List<MtEntity> mtlist = mtService.findByJyrid(jyrid);
+				if (mtlist.size() > 0 && mtlist != null) {
+					for (MtEntity mt : mtlist) {
+						mt.setRecordStatus(state);
+						mtService.save(mt);
+					}
+				}
+				// 泊位
+				List<BwEntity> bwlist = bwService.findByJyrid(jyrid);
+				if (bwlist != null && bwlist.size() > 0) {
+					for (BwEntity bw : bwlist) {
+						bw.setRecordStatus(state);
+						bwService.save(bw);
+					}
+				}
+				// 储罐
+				List<CgEntity> cglist = cgService.findByJyrid(jyrid);
+				if (cglist != null && cglist.size() > 0) {
+					for (CgEntity cg : cglist) {
+						cg.setRecordStatus(state);
+						cgService.save(cg);
+					}
+				}
+				// 仓库
+				List<CkEntity> cklist = ckService.findByJyrid(jyrid);
+				if (cklist != null && cklist.size() > 0) {
+					for (CkEntity ck : cklist) {
+						ck.setRecordStatus(state);
+						ckService.save(ck);
+					}
+				}
+				// 堆场
+				List<DcEntity> dclist = dcService.findByJyrid(jyrid);
+				if (dclist != null && dclist.size() > 0) {
+					for (DcEntity dc : dclist) {
+						dc.setRecordStatus(state);
+						dcService.save(dc);
+					}
+				}
+				// 人员
+				List<RyEntity> rylist = ryService.findByJyrid(jyrid);
+				if (rylist != null && rylist.size() > 0) {
+					for (RyEntity ry : rylist) {
+						ry.setRecordStatus(state);
+						ryService.save(ry);
+					}
+				}
+				// 设备信息
+				List<SssbEntity> sssblist = sssbService.findByJyrid(jyrid);
+				if (sssblist != null && sssblist.size() > 0) {
+					for (SssbEntity sssb : sssblist) {
+						sssb.setRecordStatus(state);
+						sssbService.save(sssb);
+					}
+				}
+				// 企业投资
+				List<QytzEntity> qytzlist = qytzService.findByJyrid(jyrid);
+				if (qytzlist != null && qytzlist.size() > 0) {
+					for (QytzEntity qytz : qytzlist) {
+						qytz.setRecordStatus(state);
+						qytzService.save(qytz);
+					}
+				}
+				// 装卸机械
+				List<ZxjxEntity> zxjxlist = zxjxService.findByJyrid(jyrid);
+				if (zxjxlist != null && zxjxlist.size() > 0) {
+					for (ZxjxEntity zxjx : zxjxlist) {
+						zxjx.setRecordStatus(state);
+						zxjxService.save(zxjx);
+					}
+				}
+			}
+			public List<String>  getGq(){
+				String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
+				UserEntity userEntity = userdao.findByUname(userName);
+				List<String> gqlist = gqService.findGqListByUserId(userEntity.getId());
+				return gqlist;
+			}
+			public UserEntity getUser(){
+				String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
+				UserEntity userEntity = userdao.findByUname(userName);
+				return userEntity;
+			}
+}

gkjsjy/trunk/src/com/cxfws/gkjyxkgl/service/impl/XkzsqWebService.java

@@ -0,0 +1,755 @@
+package com.cxfws.gkjyxkgl.service.impl;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaBuilder.In;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.xml.ws.WebServiceContext;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.config.utils.CxfwsUtils;
+import com.cxfws.gkjyxkgl.service.IXkzsqWebService;
+import com.cxfws.gkjyxkgl.service.vo.XkzsqfVo;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.common.Constants;
+import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
+import com.xt.jygl.gkjcxx.gk.service.GkService;
+import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
+import com.xt.jygl.gkjcxx.gq.service.GqService;
+import com.xt.jygl.gkjcxx.mt.entity.MtEntity;
+import com.xt.jygl.gkjcxx.mt.service.MtService;
+import com.xt.jygl.gkjcxx.xzdwxxgl.xzglbmxx.service.XzglbmxxService;
+import com.xt.jygl.gkjcxx.zyq.entity.ZyqEntity;
+import com.xt.jygl.gkjcxx.zyq.service.ZyqService;
+import com.xt.jygl.gkjygl.gkjyr.jyrbw.service.BwService;
+import com.xt.jygl.gkjygl.gkjyr.jyrcg.entity.CgEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrcg.service.CgService;
+import com.xt.jygl.gkjygl.gkjyr.jyrck.entity.CkEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrck.service.CkService;
+import com.xt.jygl.gkjygl.gkjyr.jyrdc.entity.DcEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrdc.service.DcService;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.BwEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.RyEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
+import com.xt.jygl.gkjygl.gkjyr.qytz.entity.QytzEntity;
+import com.xt.jygl.gkjygl.gkjyr.qytz.service.QytzService;
+import com.xt.jygl.gkjygl.gkjyr.ry.service.RyService;
+import com.xt.jygl.gkjygl.gkjyr.sssb.entity.SssbEntity;
+import com.xt.jygl.gkjygl.gkjyr.sssb.service.SssbService;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.entity.XkzglbEntity;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.entity.XkzxxEntity;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.service.XkzglbService;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.service.XkzxxService;
+import com.xt.jygl.gkjygl.gkjyr.zxjx.entity.ZxjxEntity;
+import com.xt.jygl.gkjygl.gkjyr.zxjx.service.ZxjxService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzjyfwEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzsqEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzsqfjEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzsqglbEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzsqzscsEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XzjydyEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzjyfwService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzsqService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzsqfjService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzsqglbService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzsqzscsService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XzjydyService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.vo.XkzsqVo;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.vo.XkzsqfjVo;
+import com.xt.jygl.workflow.entity.TaskInfoEntity;
+import com.xt.jygl.workflow.service.TaskInfoService;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.user.dao.UserDao;
+import com.xtframe.sec.user.entity.UserEntity;
+import com.xtframe.util.StringUtils;
+
+@Service("xkzsqWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "xkzsqWebServicePort", serviceName = "xkzsqWebService")
+public class XkzsqWebService extends BaseWebCtl implements IXkzsqWebService{
+	@Autowired
+	private XkzsqService xkzsqService;
+	@Autowired
+	private TaskInfoService taskInfoService;
+	@Autowired
+	private GkService gkService;
+	@Autowired
+	private GqService gqService;
+	@Autowired
+	private XzjydyService xzjydyService;
+	@Autowired
+	private MtService mtService;
+	@Autowired
+	private ZyqService zyqService;
+	@Autowired
+	private BwService bwService;
+	@Autowired
+	private XkzsqzscsService xkzsqzscsService;
+	@Autowired
+	private XkzsqfjService xkzsqfjService;
+	@Autowired
+	private XkzsqglbService xkzsqglbService;
+	@Autowired
+	private GkjyrService gkjyrService;
+	@Autowired
+	private XkzxxService xkzxxService;
+	@Autowired
+	private XkzglbService xkzglbService;
+	@Autowired
+	private CgService cgService;
+	@Autowired
+	private CkService ckService;
+	@Autowired
+	private DcService dcService;
+	@Autowired
+	private RyService ryService;
+	@Autowired
+	private SssbService sssbService;
+	@Autowired
+	private QytzService qytzService;
+	@Autowired
+	private ZxjxService zxjxService;
+	@Autowired
+	private XzglbmxxService xzglbmxxService;
+	@Autowired
+	private XkzjyfwService xkzjyfwService;
+	@Resource
+	private WebServiceContext wscontext;
+	@Autowired
+	private UserDao userdao;
+	@Override
+	@WebMethod(operationName = "findGkjyxksq", action = "http://service.web.jsjty.com/findGkjyxksq")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findGkjyxksq(final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		Specification<XkzsqEntity> spec = new Specification<XkzsqEntity>() {
+			@Override
+			public Predicate toPredicate(Root<XkzsqEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+				if (StringUtils.isNotEmpty(szdid)) {
+					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(szgkid)) {
+					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(szgqid)) {
+					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(gkjyr)) {
+					list.add(cb.like(root.get("jyrmc").as(String.class), "%" + gkjyr + "%"));
+				} 
+				if (StringUtils.isNotEmpty(fddbr)) {
+					list.add(cb.like(root.get("fddbr").as(String.class), "%" + fddbr + "%"));
+				} 
+				if (StringUtils.isNotEmpty(bgdd)) {
+					list.add(cb.like(root.get("bgdd").as(String.class), "%" + bgdd + "%"));
+				} 
+				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
+				if (isJyr()) {
+					list.add(cb.like(root.get("jyrid").as(String.class), "%" + getSsjyr().getId() + "%"));
+				} else {
+					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
+					List<String> gqlist = getGq();
+					if (gqlist != null && gqlist.size() > 0) {
+						for (int i = 0; i < gqlist.size(); i++) {
+							in.value(gqlist.get(i));
+						}
+						list.add(in);
+					}
+				}
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+				return cb.and(list.toArray(new Predicate[] {}));
+			}
+		};
+		List<XkzsqEntity> XkzsqEntityList = query.findAll(spec, XkzsqEntity.class);
+		List<XkzsqVo> voList = new ArrayList<XkzsqVo>();
+		for (XkzsqEntity entity : XkzsqEntityList) {
+			XkzsqVo vo1 = new XkzsqVo();
+			if (entity != null) {
+				BeanUtils.copyProperties(entity, vo1);
+				if (entity.getRecordStatus() != 9) {
+					if ((xkzsqService.getTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) || xkzsqService.getCandidateTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) {
+						List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId(), XkzsqEntity.PROCESS_DEFINITION_KEY);
+						if (lists != null & lists.size() > 0) {
+							TaskInfoEntity taskinfo = lists.get(0);
+							if ("申请".equals(taskinfo.getCurrName())) {
+								vo1.setTaskState("TH");
+							} else {
+								vo1.setTaskState(Constants.IS_MY_TASK);
+							}
+						}
+					}
+					if(!isJyr()){
+						XkzxxEntity xkz = xkzxxService.findByOpid(entity.getId(), "11");
+						if (xkz != null) {
+							vo1.setOpflag("1");
+						}
+					}
+					voList.add(vo1);
+				}
+			}
+		}
+		return Object2JsonStr(voList);
+	}
+	public String findOne(String id){
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		XkzsqfVo xkzvo = new XkzsqfVo();
+		//许可证申请详情
+		XkzsqEntity xkzsq = xkzsqService.findOne(id);
+		//opflag申请进度（1，材料审查2，核查3，复核4，审批）
+		String opflag="";
+		List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, XkzsqEntity.PROCESS_DEFINITION_KEY);
+		if (lists != null & lists.size() > 0) {
+			TaskInfoEntity taskinfo = lists.get(0);
+			if ("材料审查".equals(taskinfo.getCurrName())) {
+				opflag = "1";
+			} else if ("核查".equals(taskinfo.getCurrName())) {
+				opflag = "2";
+			} else if ("复核".equals(taskinfo.getCurrName())) {
+				opflag = "3";
+			} else if ("审批".equals(taskinfo.getCurrName())) {
+				opflag = "4";
+			}
+		}
+		// 经营范围 业务种类
+				List<XzjydyEntity> xzjydylist = xzjydyService.findJydy(id);
+				if (xzjydylist != null && xzjydylist.size() > 0) {
+					String jyfwstr = "";
+					@SuppressWarnings("unused")
+					String jylzstr = "";
+					String jds = "";
+					List<String> jyfwids = new ArrayList<String>();
+					for (int i = 0; i < xzjydylist.size(); i++) {
+						XzjydyEntity entity = xzjydylist.get(i);
+						jds = jds + entity.getId() + ",";
+						jyfwstr += entity.getFjdmc() + entity.getJyfwmc() + "(";
+						String jydy = "(" + entity.getFjdmc() + entity.getJyfwmc() + ")";
+						String str = "";
+						if (!StringUtils.isEmpty(entity.getGkid())) {
+							GkEntity gk = gkService.findOne(entity.getGkid());
+							if (gk != null) {
+								str = str + gk.getGkmc() + ",";
+							}
+						}
+						if (!StringUtils.isEmpty(entity.getGqid())) {
+							GqEntity gq = gqService.findOne(entity.getGqid());
+							if (gq != null) {
+								str = str + gq.getGqmc() + ",";
+							}
+						}
+						if (!StringUtils.isEmpty(entity.getZyqid())) {
+							ZyqEntity zyq = zyqService.findOne(entity.getZyqid());
+							if (zyq != null) {
+								str = str + zyq.getZyqmc() + ",";
+							}
+						}
+						if (!StringUtils.isEmpty(entity.getMtid())) {
+							MtEntity mt = mtService.findOne(entity.getMtid());
+							if (mt != null) {
+								str = str + mt.getMtmc();
+							}
+						}
+						if (!StringUtils.isEmpty(entity.getBwid())) {
+							BwEntity bw = bwService.findOne(entity.getBwid());
+							if (bw != null) {
+								str = str + bw.getBwmc();
+							}
+						}
+						if (str != null && str.endsWith(",")) {
+							str = str.substring(0, str.length() - 1);
+						}
+						jyfwstr = jyfwstr + str + ")<br/>";
+						jylzstr += str + jydy + "<br/>";
+						jyfwids.add(entity.getJyfwid());
+						xkzsq.setJydyids(jds);
+					}
+					List<Integer> list = fjlist(jyfwids);
+					if (list.size() > 0 && list != null) {
+						List<XkzsqzscsEntity> fjList = new ArrayList<XkzsqzscsEntity>();
+						for (int i = 0; i < list.size(); i++) {
+							XkzsqzscsEntity entity = xkzsqzscsService.findOne(list.get(i).toString());
+							fjList.add(entity);
+						}
+						List<XkzsqfjEntity> xkzfjList = xkzsqfjService.findBySqid(id);
+
+						List<XkzsqfjVo> voList = new ArrayList<XkzsqfjVo>();
+
+						for (int i = 0; i < fjList.size(); i++) {
+							XkzsqzscsEntity entity = fjList.get(i);
+							XkzsqfjVo vo = new XkzsqfjVo();
+							if (entity != null) {
+								BeanUtils.copyProperties(entity, vo);
+								if (entity.getRecordStatus() != 9) {
+									for (XkzsqfjEntity fj : xkzfjList) {
+
+										if ((i + 1) == fj.getSortno()) {
+											vo.setFjid(fj.getFjid());
+											vo.setFjmc(fj.getFjmc());
+											vo.setId(fj.getId());
+											break;
+										}
+									}
+									voList.add(vo);
+								}
+							}
+						}
+						xkzvo.setEntityList(voList);
+					}
+				}
+				xkzvo.setXkzsqEntity(xkzsq);
+				xkzvo.setOpflag(opflag);
+				return Object2JsonStr(xkzvo);
+	}
+	// 去重复附件数据
+		public List<Integer> fjlist(List<String> ids) {
+
+			List<Integer> newlist = new ArrayList<Integer>();
+			List<Integer> relist = new ArrayList<Integer>();
+			for (int i = 0; i < ids.size(); i++) {
+				List<XkzsqglbEntity> list = xkzsqglbService.findById(ids.get(i));
+				if (list != null && list.size() > 0) {
+					for (XkzsqglbEntity entity : list) {
+						newlist.add(Integer.parseInt(entity.getFileid()));
+					}
+				}
+			}
+			if (newlist != null && newlist.size() > 0) {
+				relist = array_unique(newlist);
+			}
+
+			return relist;
+
+		}
+		public List<Integer> array_unique(List<Integer> slist) {
+			// array_unique
+			List<Integer> list = new LinkedList<Integer>();
+			for (int i = 0; i < slist.size(); i++) {
+				if (!list.contains(slist.get(i))) {
+					list.add(slist.get(i));
+				}
+			}
+			return list;
+		}
+		//港口经营许可申请提交
+		@Override
+		public Boolean submit(XkzsqEntity code, String[] jydyids, String accid, String mtids, String bwids, String cgids, String ckids, String dcids, String ryids, String sssbids, String qytzids, String zxjxids) {
+			if (!this.checkUser()){
+				return false;
+			}
+			if (jydyids != null && jydyids.length > 0) {
+				for (int i = 0; i < jydyids.length - 1; i++) {
+					XzjydyEntity xzjydyEntity = xzjydyService.findOne(jydyids[i]);
+					if (xzjydyEntity != null) {
+						if ("701".equals(xzjydyEntity.getJyfwid())) {
+							if (StringUtils.isEmpty(mtids) || StringUtils.isEmpty(bwids)) {
+								return false;
+							}
+						} else if ("703".equals(xzjydyEntity.getJyfwid())) {
+							if (StringUtils.isEmpty(ckids) && StringUtils.isEmpty(dcids)) {
+								return false;
+							}
+						} else if ("707".equals(xzjydyEntity.getJyfwid())) {
+							if (StringUtils.isEmpty(zxjxids)) {
+								return false;
+							}
+						}
+					}
+				}
+			}
+			UserEntity user = getUser();
+			XkzsqEntity xkzsqEntity = new XkzsqEntity();
+			try {
+				if (!StringUtils.isEmpty(code.getId())) {
+					xkzsqEntity = xkzsqService.findOne(code.getId());
+					xkzsqEntity.setBgdd(code.getBgdd());
+					xkzsqEntity.setFddbr(code.getFddbr());
+					xkzsqEntity.setLxr(code.getLxr());
+					xkzsqEntity.setLxdh(code.getLxdh());
+					xkzsqEntity.setCz(code.getCz());
+					xkzsqEntity.setSqyj(code.getSqyj());
+					xkzsqEntity = xkzsqService.submit(xkzsqEntity);
+				} else {
+					code.setSqr(user.getName());
+					code.setSqrq(new Date());
+					GkjyrEntity jyr = gkjyrService.findOne(code.getJyrid());
+					if (jyr != null) {
+						code.setSzgk(jyr.getSzgk());
+						code.setSzgq(jyr.getSzgq());
+						code.setSsgkglbm(jyr.getSsgkglbm());
+						code.setSzd(jyr.getSzd());
+					}
+					xkzsqEntity = xkzsqService.submit(code);
+				}
+				if (jydyids != null && jydyids.length > 0) {
+					for (int i = 0; i < jydyids.length - 1; i++) {
+						XzjydyEntity xzjydyEntity = xzjydyService.findOne(jydyids[i]);
+						if (xzjydyEntity != null) {
+							xzjydyEntity.setXkzsqid(xkzsqEntity.getId());
+							xzjydyEntity.setFlag("0");
+							xzjydyEntity = xzjydyService.save(xzjydyEntity);
+						}
+					}
+				}
+				// 码头
+				List<XkzglbEntity> xkzglbList = xkzglbService.findByCzid(xkzsqEntity.getId(), "1");
+				if (xkzglbList != null && xkzglbList.size() > 0) {
+					for (XkzglbEntity xkzglb : xkzglbList) {
+						xkzglbService.delete(xkzglb.getId());
+					}
+				}
+				if (!StringUtils.isEmpty(mtids)) {
+					String[] mtid = mtids.split(",");
+					for (String mt : mtid) {
+						if (!StringUtils.isEmpty(mt)) {
+							XkzglbEntity xkzglb = new XkzglbEntity();
+							xkzglb.setJyrid(code.getJyrid());
+							xkzglb.setType("1");
+							xkzglb.setYwid(mt);
+							xkzglb.setCzid(xkzsqEntity.getId());
+							xkzglbService.save(xkzglb);
+
+							MtEntity entity = mtService.findOne(mt);
+							if (entity != null) {
+								entity.setRecordStatus(BaseEntity.RECORD_STATE_SQ);
+							}
+						}
+					}
+				}
+				// 泊位
+				xkzglbList = xkzglbService.findByCzid(xkzsqEntity.getId(), "2");
+				if (xkzglbList != null && xkzglbList.size() > 0) {
+					for (XkzglbEntity xkzglb : xkzglbList) {
+						xkzglbService.delete(xkzglb.getId());
+					}
+				}
+				if (!StringUtils.isEmpty(bwids)) {
+					String[] bwid = bwids.split(",");
+					for (String bw : bwid) {
+						if (!StringUtils.isEmpty(bw)) {
+							XkzglbEntity xkzglb = new XkzglbEntity();
+							xkzglb.setJyrid(code.getJyrid());
+							xkzglb.setType("2");
+							xkzglb.setYwid(bw);
+							xkzglb.setCzid(xkzsqEntity.getId());
+							xkzglbService.save(xkzglb);
+							BwEntity entity = bwService.findOne(bw);
+							if (entity != null) {
+								entity.setRecordStatus(BaseEntity.RECORD_STATE_SQ);
+								bwService.save(entity);
+							}
+						}
+					}
+				}
+				// 储罐
+				xkzglbList = xkzglbService.findByCzid(xkzsqEntity.getId(), "3");
+				if (xkzglbList != null && xkzglbList.size() > 0) {
+					for (XkzglbEntity xkzglb : xkzglbList) {
+						xkzglbService.delete(xkzglb.getId());
+					}
+				}
+				if (!StringUtils.isEmpty(cgids)) {
+					String[] cgid = cgids.split(",");
+					for (String cg : cgid) {
+						if (!StringUtils.isEmpty(cg)) {
+							XkzglbEntity xkzglb = new XkzglbEntity();
+							xkzglb.setJyrid(code.getJyrid());
+							xkzglb.setType("3");
+							xkzglb.setYwid(cg);
+							xkzglb.setCzid(xkzsqEntity.getId());
+							xkzglbService.save(xkzglb);
+							CgEntity entity = cgService.findOne(cg);
+							if (entity != null) {
+								entity.setRecordStatus(BaseEntity.RECORD_STATE_SQ);
+								cgService.save(entity);
+							}
+						}
+					}
+				}
+				// 仓库
+				xkzglbList = xkzglbService.findByCzid(xkzsqEntity.getId(), "4");
+				if (xkzglbList != null && xkzglbList.size() > 0) {
+					for (XkzglbEntity xkzglb : xkzglbList) {
+						xkzglbService.delete(xkzglb.getId());
+					}
+				}
+				if (!StringUtils.isEmpty(ckids)) {
+					String[] ckid = ckids.split(",");
+					for (String ck : ckid) {
+						if (!StringUtils.isEmpty(ck)) {
+							XkzglbEntity xkzglb = new XkzglbEntity();
+							xkzglb.setJyrid(code.getJyrid());
+							xkzglb.setType("4");
+							xkzglb.setYwid(ck);
+							xkzglb.setCzid(xkzsqEntity.getId());
+							xkzglbService.save(xkzglb);
+							CkEntity entity = ckService.findOne(ck);
+							if (entity != null) {
+								entity.setRecordStatus(BaseEntity.RECORD_STATE_SQ);
+								ckService.save(entity);
+							}
+						}
+					}
+				}
+				// 堆场
+				xkzglbList = xkzglbService.findByCzid(xkzsqEntity.getId(), "5");
+				if (xkzglbList != null && xkzglbList.size() > 0) {
+					for (XkzglbEntity xkzglb : xkzglbList) {
+						xkzglbService.delete(xkzglb.getId());
+					}
+				}
+				if (!StringUtils.isEmpty(dcids)) {
+					String[] dcid = dcids.split(",");
+					for (String dc : dcid) {
+						if (!StringUtils.isEmpty(dc)) {
+							XkzglbEntity xkzglb = new XkzglbEntity();
+							xkzglb.setJyrid(code.getJyrid());
+							xkzglb.setType("5");
+							xkzglb.setYwid(dc);
+							xkzglb.setCzid(xkzsqEntity.getId());
+							xkzglbService.save(xkzglb);
+							DcEntity entity = dcService.findOne(dc);
+							if (entity != null) {
+								entity.setRecordStatus(BaseEntity.RECORD_STATE_SQ);
+								dcService.save(entity);
+							}
+						}
+					}
+				}
+				// 人员
+				xkzglbList = xkzglbService.findByCzid(xkzsqEntity.getId(), "6");
+				if (xkzglbList != null && xkzglbList.size() > 0) {
+					for (XkzglbEntity xkzglb : xkzglbList) {
+						xkzglbService.delete(xkzglb.getId());
+					}
+				}
+				if (!StringUtils.isEmpty(ryids)) {
+					String[] ryid = ryids.split(",");
+					for (String ry : ryid) {
+						if (!StringUtils.isEmpty(ry)) {
+							XkzglbEntity xkzglb = new XkzglbEntity();
+							xkzglb.setJyrid(code.getJyrid());
+							xkzglb.setType("6");
+							xkzglb.setYwid(ry);
+							xkzglb.setCzid(xkzsqEntity.getId());
+							xkzglbService.save(xkzglb);
+							RyEntity entity = ryService.findOne(ry);
+							if (entity != null) {
+								entity.setRecordStatus(BaseEntity.RECORD_STATE_SQ);
+								ryService.save(entity);
+							}
+						}
+					}
+				}
+				// 设备
+				xkzglbList = xkzglbService.findByCzid(xkzsqEntity.getId(), "7");
+				if (xkzglbList != null && xkzglbList.size() > 0) {
+					for (XkzglbEntity xkzglb : xkzglbList) {
+						xkzglbService.delete(xkzglb.getId());
+					}
+				}
+				if (!StringUtils.isEmpty(sssbids)) {
+					String[] sssbid = sssbids.split(",");
+					for (String sssb : sssbid) {
+						if (!StringUtils.isEmpty(sssb)) {
+							XkzglbEntity xkzglb = new XkzglbEntity();
+							xkzglb.setJyrid(code.getJyrid());
+							xkzglb.setType("7");
+							xkzglb.setYwid(sssb);
+							xkzglb.setCzid(xkzsqEntity.getId());
+							xkzglbService.save(xkzglb);
+							SssbEntity entity = sssbService.findOne(sssb);
+							if (entity != null) {
+								entity.setRecordStatus(BaseEntity.RECORD_STATE_SQ);
+								sssbService.save(entity);
+							}
+						}
+					}
+				}
+				// 企业投资
+				xkzglbList = xkzglbService.findByCzid(xkzsqEntity.getId(), "8");
+				if (xkzglbList != null && xkzglbList.size() > 0) {
+					for (XkzglbEntity xkzglb : xkzglbList) {
+						xkzglbService.delete(xkzglb.getId());
+					}
+				}
+				if (!StringUtils.isEmpty(qytzids)) {
+					String[] qytzid = qytzids.split(",");
+					for (String qytz : qytzid) {
+						if (!StringUtils.isEmpty(qytz)) {
+							XkzglbEntity xkzglb = new XkzglbEntity();
+							xkzglb.setJyrid(code.getJyrid());
+							xkzglb.setType("8");
+							xkzglb.setYwid(qytz);
+							xkzglb.setCzid(xkzsqEntity.getId());
+							xkzglbService.save(xkzglb);
+							QytzEntity entity = qytzService.findOne(qytz);
+							if (entity != null) {
+								entity.setRecordStatus(BaseEntity.RECORD_STATE_SQ);
+								qytzService.save(entity);
+							}
+						}
+					}
+				}
+				// 装卸机械
+				xkzglbList = xkzglbService.findByCzid(xkzsqEntity.getId(), "9");
+				if (xkzglbList != null && xkzglbList.size() > 0) {
+					for (XkzglbEntity xkzglb : xkzglbList) {
+						xkzglbService.delete(xkzglb.getId());
+					}
+				}
+				if (!StringUtils.isEmpty(zxjxids)) {
+					String[] zxjxid = zxjxids.split(",");
+					for (String zxjx : zxjxid) {
+						if (!StringUtils.isEmpty(zxjx)) {
+							XkzglbEntity xkzglb = new XkzglbEntity();
+							xkzglb.setJyrid(code.getJyrid());
+							xkzglb.setType("9");
+							xkzglb.setYwid(zxjx);
+							xkzglb.setCzid(xkzsqEntity.getId());
+							xkzglbService.save(xkzglb);
+							ZxjxEntity entity = zxjxService.findOne(zxjx);
+							if (entity != null) {
+								entity.setRecordStatus(BaseEntity.RECORD_STATE_SQ);
+								zxjxService.save(entity);
+							}
+						}
+					}
+				}
+				if (!StringUtils.isEmpty(accid)) {
+					// 关联附件
+					String[] ssids = accid.split(",");
+					for (String ssid : ssids) {
+						XkzsqfjEntity xkzsqfj = xkzsqfjService.findOne(ssid);
+						if (xkzsqfj != null) {
+							xkzsqfj.setSqid(xkzsqEntity.getId());
+							xkzsqfjService.save(xkzsqfj);
+						}
+					}
+				}
+				GkjyrEntity jyr = gkjyrService.findOne(code.getJyrid());
+				jyr.setRecordStatus(BaseEntity.RECORD_STATE_SQ);
+				gkjyrService.save(jyr);
+				// rtx提醒
+				// rtxSend(xkzsqEntity.getSzgq().getId(),
+				// Constants.ROLE_CLSC,"你有一条许可证申请待办事务，请及时处理！");
+			} catch (Exception e) {
+				return false;
+			}
+			return true;
+		}
+		//港口经营许可申请审核
+		@Override
+		public Boolean audit(String shyj, String id, boolean flag) {
+			if (!this.checkUser()){
+				return false;
+			}
+			@SuppressWarnings("unused")
+			String role = "";
+			UserEntity user = getUser();
+			XkzsqEntity entity = new XkzsqEntity();
+			try {
+				entity = xkzsqService.findOne(id);
+				Date today = new Date();
+				List<TaskInfoEntity> list = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, XkzsqEntity.PROCESS_DEFINITION_KEY);
+				if (list != null & list.size() > 0) {
+					TaskInfoEntity taskinfo = list.get(0);
+					if ("材料审查".equals(taskinfo.getCurrName())) {
+						entity.setClscyj(StringUtils.isEmpty(shyj) ? "" : shyj);
+						entity.setClscjbr(user.getName());
+						entity.setClscrq(today);
+						role = Constants.ROLE_HC;
+					} else if ("核查".equals(taskinfo.getCurrName())) {
+						entity.setXchcyj(StringUtils.isEmpty(shyj) ? "" : shyj);
+						entity.setXchcry(user.getName());
+						entity.setXchcrq(today);
+						role = Constants.ROLE_FH;
+					} else if ("复核".equals(taskinfo.getCurrName())) {
+						entity.setFhyj(StringUtils.isEmpty(shyj) ? "" : shyj);
+						entity.setFhjbr(user.getName());
+						entity.setFhrq(today);
+						role = Constants.ROLE_SP;
+					} else if ("审批".equals(taskinfo.getCurrName())) {
+						entity.setSpyj(StringUtils.isEmpty(shyj) ? "" : shyj);
+						entity.setSpry(user.getName());
+						entity.setSprq(today);
+					}
+					xkzsqService.save(entity);
+				}
+			} catch (Exception e) {
+				return false;
+			}
+			try {
+				if (xkzsqService.getCandidateTaskByUserAndBusKey(getUser().getId().toString(), id) != null) {
+					xkzsqService.claim(id, getUser().getId().toString());
+				}
+				boolean jflag = xkzsqService.changeAudit(shyj, entity, flag);
+				if (jflag) {
+					List<XzjydyEntity> xzjydylist = xzjydyService.findJydy(id);
+					if (xzjydylist.size() > 0 && xzjydylist != null) {
+						xkzjyfwService.deleteByJyrid(entity.getJyrid());
+						// 删除后同步修改更新时间
+						List<XkzjyfwEntity> xkzjys = xkzjyfwService.findByJyrid(entity.getJyrid());
+						for (XkzjyfwEntity xkzjy : xkzjys) {
+							xkzjy.setUpdateDateTime(new Timestamp(new Date().getTime()));
+							xkzjyfwService.save(xkzjy);
+						}
+						for (XzjydyEntity xzjydyEntity : xzjydylist) {
+							if (xzjydyEntity != null) {
+								// 保存成功后
+								XkzjyfwEntity jyfw = new XkzjyfwEntity();
+								jyfw.setJyrid(entity.getJyrid());
+								jyfw.setFjdid(xzjydyEntity.getFjdid() != null ? xzjydyEntity.getFjdid() : "");
+								jyfw.setFjdmc(xzjydyEntity.getFjdmc() != null ? xzjydyEntity.getFjdmc() : "");
+								jyfw.setJyfwid(xzjydyEntity.getJyfwid() != null ? xzjydyEntity.getJyfwid() : "");
+								jyfw.setJyfwmc(xzjydyEntity.getJyfwmc() != null ? xzjydyEntity.getJyfwmc() : "");
+								jyfw.setBwid(xzjydyEntity.getBwid() != null ? xzjydyEntity.getBwid() : "");
+								jyfw.setGkid(xzjydyEntity.getGkid() != null ? xzjydyEntity.getGkid() : "");
+								jyfw.setGqid(xzjydyEntity.getGqid() != null ? xzjydyEntity.getGqid() : "");
+								jyfw.setZyqid(xzjydyEntity.getZyqid() != null ? xzjydyEntity.getZyqid() : "");
+								jyfw.setMtid(xzjydyEntity.getMtid() != null ? xzjydyEntity.getMtid() : "");
+								xkzjyfwService.save(jyfw);
+							}
+						}
+					}
+				} else {
+					// rtx提醒
+					// rtxSend(entity.getSzgq().getId(),
+					// role,"你有一条许可证申请待办事务，请及时处理！");
+				}
+			} catch (Exception e) {
+				return false;
+			}
+			return true;
+		}
+		public List<String>  getGq(){
+			String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
+			UserEntity userEntity = userdao.findByUname(userName);
+			List<String> gqlist = gqService.findGqListByUserId(userEntity.getId());
+			return gqlist;
+		}
+		public UserEntity getUser(){
+			String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
+			UserEntity userEntity = userdao.findByUname(userName);
+			return userEntity;
+		}
+		
+}

gkjsjy/trunk/src/com/cxfws/gkjyxkgl/service/impl/XkzyxWebService.java

@@ -0,0 +1,527 @@
+package com.cxfws.gkjyxkgl.service.impl;
+
+import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaBuilder.In;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.xml.ws.WebServiceContext;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.config.utils.CxfwsUtils;
+import com.cxfws.gkjyxkgl.service.IXkzyxWebService;
+import com.cxfws.gkjyxkgl.service.vo.XkzyxfVo;
+import com.xt.jygl.accessory.entity.AccessoryEntity;
+import com.xt.jygl.accessory.service.AccessoryService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.common.Constants;
+import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
+import com.xt.jygl.gkjcxx.gk.service.GkService;
+import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
+import com.xt.jygl.gkjcxx.gq.service.GqService;
+import com.xt.jygl.gkjcxx.mt.entity.MtEntity;
+import com.xt.jygl.gkjcxx.mt.service.MtService;
+import com.xt.jygl.gkjcxx.zyq.entity.ZyqEntity;
+import com.xt.jygl.gkjcxx.zyq.service.ZyqService;
+import com.xt.jygl.gkjygl.gkjyr.jyrbw.service.BwService;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.BwEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.entity.XkzxxEntity;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.service.XkzxxService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.service.XkzbgService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.service.XkzbgfjService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzjyfwEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzsqglbEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzsqzscsEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XzjydyEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzjyfwService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzsqService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzsqfjService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzsqglbService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzsqzscsService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XzjydyService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.vo.XkzsqfjVo;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkyx.entity.XkzyxEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkyx.entity.XkzyxfjEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkyx.service.XkzyxService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkyx.service.XkzyxfjService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkyx.service.XkzyxjdsService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkyx.vo.XkzyxVo;
+import com.xt.jygl.workflow.entity.TaskInfoEntity;
+import com.xt.jygl.workflow.service.TaskInfoService;
+import com.xt.jygl.workflow.service.WorkflowMangerService;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.user.dao.UserDao;
+import com.xtframe.sec.user.entity.UserEntity;
+import com.xtframe.util.StringUtils;
+@Service("xkzyxWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "xkzyxWebServicePort", serviceName = "xkzyxWebService")
+public class XkzyxWebService extends BaseWebCtl implements IXkzyxWebService {
+	@Autowired
+	private QueryService query;
+	@Autowired
+	private GkjyrService gkjyrService;
+	@Autowired
+	private AccessoryService accessoryService;
+	@Autowired
+	private XkzsqglbService xkzsqglbService;
+	@Autowired
+	private XkzsqzscsService xkzsqzscsService;
+	@Autowired
+	private XkzyxfjService xkzyxfjService;
+	@Autowired
+	private XkzjyfwService xkzjyfwService;
+	@Autowired
+	private XkzyxService xkzyxService;
+	@Autowired
+	private GkService gkService;
+	@Autowired
+	private GqService gqService;
+	@Autowired
+	private MtService mtService;
+	@Autowired
+	private ZyqService zyqService;
+	@Autowired
+	private BwService bwService;
+	@Autowired
+	private WorkflowMangerService workService;
+	@Autowired
+	private TaskInfoService taskInfoService;
+	@Autowired
+	private XkzyxjdsService xkzyxjdsService;
+	@Autowired
+	private XkzxxService xkzxxService;
+	@Autowired
+	private XzjydyService xzjydyService;
+	@Autowired
+	private XkzsqService xkzsqService;
+	@Autowired
+	private XkzbgService xkzbgService;
+	@Autowired
+	private XkzbgfjService xkzbgfjService;
+	@Autowired
+	private XkzsqfjService xkzsqfjService;
+	@Resource
+	private WebServiceContext wscontext;
+	@Autowired
+	private UserDao userdao;
+	@Override
+	public String findXkzyx(final String szdid,final String szgkid,final String szgqid,final String gkjyr,final String fddbr,final String bgdd) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		// 查询条件
+				Specification<XkzyxEntity> spec = new Specification<XkzyxEntity>() {
+					@Override
+					public Predicate toPredicate(Root<XkzyxEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+						List<Predicate> list = new ArrayList<Predicate>();
+						if (StringUtils.isNotEmpty(szdid)) {
+							list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+						}
+						if (StringUtils.isNotEmpty(szgkid)) {
+							list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+						}
+						if (StringUtils.isNotEmpty(szgqid)) {
+							list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
+						}
+						if (StringUtils.isNotEmpty(gkjyr)) {
+							list.add(cb.like(root.get("jyrmc").as(String.class), "%" + gkjyr + "%"));
+						}
+						if (StringUtils.isNotEmpty(fddbr)) {
+							list.add(cb.like(root.get("fddbr").as(String.class), "%" + fddbr + "%"));
+						}
+						if (StringUtils.isNotEmpty(bgdd)) {
+							list.add(cb.like(root.get("bgdd").as(String.class), "%" + bgdd + "%"));
+						}
+						// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
+						if (isJyr()) {
+							list.add(cb.like(root.get("jyrid").as(String.class), "%" + getSsjyr().getId() + "%"));
+						} else {
+							// list.add(cb.like(root.get("szd").get("id").as(String.class),
+							// "%" + getUser().getSzd().getId() + "%"));
+							In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
+							List<String> gqlist = getGq();
+							if (gqlist != null && gqlist.size() > 0) {
+								for (int i = 0; i < gqlist.size(); i++) {
+									in.value(gqlist.get(i));
+								}
+								list.add(in);
+							}
+						}
+						list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+						return cb.and(list.toArray(new Predicate[] {}));
+					}
+				};
+				List<XkzyxEntity> list = query.findAll(spec,XkzyxEntity.class);
+				List<XkzyxVo> voList = new ArrayList<XkzyxVo>();
+
+				for (XkzyxEntity entity : list) {
+					XkzyxVo vo = new XkzyxVo();
+					if (entity != null) {
+						BeanUtils.copyProperties(entity, vo);
+						if (entity.getRecordStatus() != 9) {
+							if ((xkzyxService.getTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) || xkzyxService.getCandidateTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) {
+								List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId(), XkzyxEntity.PROCESS_DEFINITION_KEY);
+								if (lists != null & lists.size() > 0) {
+									TaskInfoEntity taskinfo = lists.get(0);
+									if ("申请".equals(taskinfo.getCurrName())) {
+										vo.setTaskState("TH");
+									} else {
+										vo.setTaskState(Constants.IS_MY_TASK);
+
+									}
+								}
+
+							}
+							if(!isJyr()){
+								XkzxxEntity xkz = xkzxxService.findByOpid(entity.getId(), "13");
+								if (xkz != null) {
+									vo.setOpflag("1");
+								}
+							}
+							voList.add(vo);
+						}
+					}
+				}
+		return Object2JsonStr(voList);
+	}
+	@Override
+	public String findOne(String id) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		XkzyxfVo xkzyxfvo = new XkzyxfVo();
+		String opflag="";
+		XkzyxEntity xkzyentity = xkzyxService.findOne(id);
+		List<XkzsqfjVo> qtfjvoList = new ArrayList<XkzsqfjVo>();
+		List<AccessoryEntity> acclist = accessoryService.queryBySsidAndSstype(id, "xkzyxqtfj");
+		for (int i = 0; i < acclist.size(); i++) {
+			XkzsqfjVo vo = new XkzsqfjVo();
+			vo.setQtfjmc(acclist.get(i).getName());
+			vo.setQtfjid(acclist.get(i).getId());
+			qtfjvoList.add(vo);
+		}
+		if (xkzyentity != null) {
+			List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, XkzyxEntity.PROCESS_DEFINITION_KEY);
+			if (lists != null & lists.size() > 0) {
+				TaskInfoEntity taskinfo = lists.get(0);
+				if ("材料审查".equals(taskinfo.getCurrName())) {
+					opflag = "1";
+				} else if ("核查".equals(taskinfo.getCurrName())) {
+					opflag = "2";
+				} else if ("复核".equals(taskinfo.getCurrName())) {
+					opflag = "3";
+				} else if ("审批".equals(taskinfo.getCurrName())) {
+					opflag = "4";
+				}
+			}
+			List<XkzjyfwEntity> jyfwlist = xkzjyfwService.findByJyrid(xkzyentity.getJyrid());
+			List<String> jyfwids = new ArrayList<String>();
+			String jyfwstr = "";
+			@SuppressWarnings("unused")
+			String jydystr = "";
+			for (int i = 0; i < jyfwlist.size(); i++) {
+				XkzjyfwEntity entity = jyfwlist.get(i);
+				jyfwstr += entity.getFjdmc() + entity.getJyfwmc() + "(";
+				String jydy = "(" + entity.getFjdmc() + entity.getJyfwmc() + ")";
+				String str = "";
+				if (!StringUtils.isEmpty(entity.getGkid())) {
+					GkEntity gk = gkService.findOne(entity.getGkid());
+					if (gk != null) {
+						str = str + gk.getGkmc() + ",";
+					}
+				}
+				if (!StringUtils.isEmpty(entity.getGqid())) {
+					GqEntity gq = gqService.findOne(entity.getGqid());
+					if (gq != null) {
+						str = str + gq.getGqmc() + ",";
+					}
+				}
+				if (!StringUtils.isEmpty(entity.getZyqid())) {
+					ZyqEntity zyq = zyqService.findOne(entity.getZyqid());
+					if (zyq != null) {
+						str = str + zyq.getZyqmc() + ",";
+					}
+				}
+				if (!StringUtils.isEmpty(entity.getMtid())) {
+					MtEntity mt = mtService.findOne(entity.getMtid());
+					if (mt != null) {
+						str = str + mt.getMtmc();
+					}
+				}
+				if (!StringUtils.isEmpty(entity.getBwid())) {
+					BwEntity bw = bwService.findOne(entity.getBwid());
+					if (bw != null) {
+						str = str + bw.getBwmc();
+					}
+				}
+				if (str != null && str.endsWith(",")) {
+					str = str.substring(0, str.length() - 1);
+				}
+				jyfwstr = jyfwstr + str + ")<br/>";
+				jydystr += str + jydy + "<br/>";
+				jyfwids.add(entity.getJyfwid());
+			}
+			List<Integer> list = fjlist(jyfwids);
+			if (list.size() > 0 && list != null) {
+				List<XkzsqzscsEntity> fjList = new ArrayList<XkzsqzscsEntity>();
+				for (int i = 0; i < list.size(); i++) {
+					XkzsqzscsEntity entity = xkzsqzscsService.findOne(list.get(i).toString());
+					fjList.add(entity);
+				}
+				List<XkzsqfjVo> voList = new ArrayList<XkzsqfjVo>();
+				List<XkzyxfjEntity> xkzfjList = xkzyxfjService.findBySqid(id);
+				for (int i = 0; i < fjList.size(); i++) {
+					XkzsqzscsEntity entity = fjList.get(i);
+					XkzsqfjVo vo = new XkzsqfjVo();
+					if (entity != null) {
+						BeanUtils.copyProperties(entity, vo);
+						if (entity.getRecordStatus() != 9) {
+							for (XkzyxfjEntity fj : xkzfjList) {
+								if ((i + 1) == fj.getSortno()) {
+									vo.setFjid(fj.getFjid());
+									vo.setFjmc(fj.getFjmc());
+									vo.setId(fj.getId());
+									break;
+								}
+							}
+							voList.add(vo);
+						}
+					}
+				}
+				xkzyxfvo.setEntitylist(voList);
+			}
+		}
+		xkzyxfvo.setOpflag(opflag);
+		xkzyxfvo.setXkzyxentity(xkzyentity);
+		return Object2JsonStr(xkzyxfvo);
+	}
+	@Override
+	public Boolean submit(XkzyxEntity code, String[] jydyids, String accid, String mtids, String bwids, String cgids, String ckids, String dcids, String ryids, String sssbids, String qytzids, String zxjxids) {
+		if (!this.checkUser()){
+			return false;
+		}
+		UserEntity user = getUser();
+		XkzyxEntity xkzyxEntity = new XkzyxEntity();
+		try {
+			if (!StringUtils.isEmpty(code.getId())) {
+				xkzyxEntity = xkzyxService.findOne(code.getId());
+				xkzyxEntity.setBgdd(code.getBgdd());
+				xkzyxEntity.setFddbr(code.getFddbr());
+				xkzyxEntity.setLxr(code.getLxr());
+				xkzyxEntity.setLxdh(code.getLxdh());
+				xkzyxEntity.setBz(code.getBz());
+				xkzyxEntity = xkzyxService.submit(xkzyxEntity);
+			} else {
+				code.setSqr(user.getName());
+				Date today = new Date();
+				code.setSqrq(today);
+				GkjyrEntity jyr = gkjyrService.findOne(code.getJyrid());
+				if (jyr != null) {
+					code.setSzgk(jyr.getSzgk());
+					code.setSzgq(jyr.getSzgq());
+					code.setSsgkglbm(jyr.getSsgkglbm());
+				}
+				xkzyxEntity = xkzyxService.submit(code);
+			}
+
+			if (!StringUtils.isEmpty(accid)) {
+				// 关联附件
+				String[] ssids = accid.split(",");
+				for (String ssid : ssids) {
+					XkzyxfjEntity xkzyxfj = xkzyxfjService.findOne(ssid);
+					if (xkzyxfj != null) {
+						xkzyxfj.setSqid(xkzyxEntity.getId());
+						xkzyxfjService.save(xkzyxfj);
+					}
+				}
+			}
+			// rtx提醒
+			//rtxSend(xkzyxEntity.getSzgq().getId(), Constants.ROLE_CLSC, "你有一条许可证延续待办事务，请及时处理！");
+		} catch (Exception e) {
+			return false;
+		}
+		return true;
+	}
+	@Override
+	public Boolean audit(String shyj, String id, boolean flag) {
+		if (!this.checkUser()){
+			return false;
+		}
+		UserEntity user = getUser();
+		XkzyxEntity entity = null;
+		@SuppressWarnings("unused")
+		String role ="";
+		try {
+			entity = xkzyxService.findOne(id);
+			Date today = new Date();
+			List<TaskInfoEntity> list = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, XkzyxEntity.PROCESS_DEFINITION_KEY);
+			if (list != null & list.size() > 0) {
+				TaskInfoEntity taskinfo = list.get(0);
+				if ("材料审查".equals(taskinfo.getCurrName())) {
+					entity.setClscyj(StringUtils.isEmpty(shyj) ? "" : shyj);
+					entity.setClscjbr(user.getName());
+					entity.setClscrq(today);
+					role =Constants.ROLE_HC;
+				} else if ("核查".equals(taskinfo.getCurrName())) {
+					entity.setHcyj(StringUtils.isEmpty(shyj) ? "" : shyj);
+					entity.setHcjbr(user.getName());
+					entity.setHcjbrq(today);
+					role =Constants.ROLE_FH;
+				} else if ("复核".equals(taskinfo.getCurrName())) {
+					entity.setFhyj(StringUtils.isEmpty(shyj) ? "" : shyj);
+					entity.setFhjbr(user.getName());
+					entity.setFhrq(today);
+					role =Constants.ROLE_SP;
+				} else if ("审批".equals(taskinfo.getCurrName())) {
+					entity.setSpyj(StringUtils.isEmpty(shyj) ? "" : shyj);
+					entity.setSpjbr(user.getName());
+					entity.setSprq(today);
+				}
+				xkzyxService.save(entity);
+			}
+		} catch (Exception e) {
+			return false;
+		}
+		try {
+			if (xkzyxService.getCandidateTaskByUserAndBusKey(getUser().getId().toString(), id) != null) {
+				xkzyxService.claim(id, getUser().getId().toString());
+			}
+			boolean jflag = xkzyxService.changeAudit(shyj, entity, flag);
+
+			if (jflag) {
+				// 许可证信息
+				List<XkzxxEntity> xkzlist = xkzxxService.findByJyrid(entity.getJyrid(), Constants.XKZ_SX);
+				if (xkzlist != null && xkzlist.size() > 0) {
+					for (XkzxxEntity xkz : xkzlist) {
+						if ("1".equals(xkz.getSfyx())) {
+							xkz.setIsflag("0");
+							// xkz.setSfyx(Constants.XKZ_WX);
+							xkz = xkzxxService.save(xkz);
+							XkzxxEntity xkzxx = new XkzxxEntity();
+							xkzxx.setCq(xkz.getCq());
+							xkzxx.setDz(xkz.getDz());
+							xkzxx.setFddbr(xkz.getFddbr());
+							xkzxx.setFzjg(xkz.getFzjg());
+							xkzxx.setFzrq(new Date());
+							xkzxx.setYxqq(new Date());
+							xkzxx.setGkjyr(xkz.getGkjyr());
+							xkzxx.setGkjyxkzh(xkz.getGkjyxkzh());
+							xkzxx.setGkjyxkzsmj(xkz.getGkjyxkzsmj());
+							xkzxx.setLxdh(xkz.getLxdh());
+							xkzxx.setQynbbh(xkz.getQynbbh());
+							xkzxx.setSpr(user.getName());
+							xkzxx.setSsgq(xkz.getSsgq());
+							xkzxx.setSzd(xkz.getSzd());
+							xkzxx.setZyfs(xkz.getZyfs());
+							xkzxx.setZyhwpm(xkz.getZyhwpm());
+							xkzxx.setZyqyfw(xkz.getZyqyfw());
+							xkzxx.setSzgk(xkz.getSzgk());
+							//xkzxx.setZmpicid(xkz.getZmpicid());
+							if (xkz.getYxqz() != null) {
+								SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");
+								String date = dateTimeFormat.format(xkz.getYxqz());
+								String t = (Integer.parseInt(date.substring(0, 4)) + 3) + date.substring(4);
+								xkzxx.setYxqz(dateTimeFormat.parse(t));
+							}
+							xkzxx.setSfyx("13");// 未生效
+							xkzxx.setIsflag("0");
+							xkzxx.setOpid(id);
+							xkzxxService.save(xkzxx);
+						}
+					}
+				}
+				// 经营范围
+				List<XzjydyEntity> xzjydylist = xzjydyService.findJydy(id);
+				if (xzjydylist.size() > 0 && xzjydylist != null) {
+					xkzjyfwService.deleteByJyrid(entity.getJyrid());
+					// 删除后同步修改更新时间
+					List<XkzjyfwEntity> xkzjys = xkzjyfwService.findByJyrid(entity.getJyrid());
+					for (XkzjyfwEntity xkzjy : xkzjys) {
+						xkzjy.setUpdateDateTime(new Timestamp(new Date().getTime()));
+						xkzjyfwService.save(xkzjy);
+					}
+					for (XzjydyEntity xzjydyEntity : xzjydylist) {
+						if (xzjydyEntity != null) {
+							// 保存成功后
+							XkzjyfwEntity jyfw = new XkzjyfwEntity();
+							jyfw.setJyrid(entity.getJyrid());
+							jyfw.setFjdid(xzjydyEntity.getFjdid() != null ? xzjydyEntity.getFjdid() : "");
+							jyfw.setFjdmc(xzjydyEntity.getFjdmc() != null ? xzjydyEntity.getFjdmc() : "");
+							jyfw.setJyfwid(xzjydyEntity.getJyfwid() != null ? xzjydyEntity.getJyfwid() : "");
+							jyfw.setJyfwmc(xzjydyEntity.getJyfwmc() != null ? xzjydyEntity.getJyfwmc() : "");
+							jyfw.setBwid(xzjydyEntity.getBwid() != null ? xzjydyEntity.getBwid() : "");
+							jyfw.setGkid(xzjydyEntity.getGkid() != null ? xzjydyEntity.getGkid() : "");
+							jyfw.setGqid(xzjydyEntity.getGqid() != null ? xzjydyEntity.getGqid() : "");
+							jyfw.setZyqid(xzjydyEntity.getZyqid() != null ? xzjydyEntity.getZyqid() : "");
+							jyfw.setMtid(xzjydyEntity.getMtid() != null ? xzjydyEntity.getMtid() : "");
+							xkzjyfwService.save(jyfw);
+						}
+					}
+				}
+			}else{
+				// rtx提醒
+				//rtxSend(entity.getSzgq().getId(), role, "你有一条许可证延续待办事务，请及时处理！");
+			}
+		} catch (Exception e) {
+			return false;
+		}
+		return true;
+	}
+	// 去重复附件数据
+				public List<Integer> fjlist(List<String> ids) {
+
+					List<Integer> newlist = new ArrayList<Integer>();
+					List<Integer> relist = new ArrayList<Integer>();
+					for (int i = 0; i < ids.size(); i++) {
+						List<XkzsqglbEntity> list = xkzsqglbService.findById(ids.get(i));
+						if (list != null && list.size() > 0) {
+							for (XkzsqglbEntity entity : list) {
+								newlist.add(Integer.parseInt(entity.getFileid()));
+							}
+						}
+					}
+					if (newlist != null && newlist.size() > 0) {
+						relist = array_unique(newlist);
+					}
+
+					return relist;
+
+				}
+				public List<Integer> array_unique(List<Integer> slist) {
+					// array_unique
+					List<Integer> list = new LinkedList<Integer>();
+					for (int i = 0; i < slist.size(); i++) {
+						if (!list.contains(slist.get(i))) {
+							list.add(slist.get(i));
+						}
+					}
+					return list;
+				}
+				public List<String>  getGq(){
+					String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
+					UserEntity userEntity = userdao.findByUname(userName);
+					List<String> gqlist = gqService.findGqListByUserId(userEntity.getId());
+					return gqlist;
+				}
+				public UserEntity getUser(){
+					String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
+					UserEntity userEntity = userdao.findByUname(userName);
+					return userEntity;
+				}
+}

gkjsjy/trunk/src/com/cxfws/gkjyxkgl/service/impl/XkzzxWebService.java

@@ -0,0 +1,580 @@
+package com.cxfws.gkjyxkgl.service.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaBuilder.In;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+import javax.xml.ws.WebServiceContext;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.config.utils.CxfwsUtils;
+import com.cxfws.gkjyxkgl.service.IXkzzxWebService;
+import com.cxfws.gkjyxkgl.service.vo.XkzzxfVo;
+import com.xt.jygl.accessory.service.AccessoryService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.common.Constants;
+import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
+import com.xt.jygl.gkjcxx.gk.service.GkService;
+import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
+import com.xt.jygl.gkjcxx.gq.service.GqService;
+import com.xt.jygl.gkjcxx.mt.entity.MtEntity;
+import com.xt.jygl.gkjcxx.mt.service.MtService;
+import com.xt.jygl.gkjcxx.zyq.entity.ZyqEntity;
+import com.xt.jygl.gkjcxx.zyq.service.ZyqService;
+import com.xt.jygl.gkjygl.gkjyr.jyrbw.service.BwService;
+import com.xt.jygl.gkjygl.gkjyr.jyrcg.entity.CgEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrcg.service.CgService;
+import com.xt.jygl.gkjygl.gkjyr.jyrck.entity.CkEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrck.service.CkService;
+import com.xt.jygl.gkjygl.gkjyr.jyrdc.entity.DcEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrdc.service.DcService;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.BwEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.RyEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
+import com.xt.jygl.gkjygl.gkjyr.qytz.entity.QytzEntity;
+import com.xt.jygl.gkjygl.gkjyr.qytz.service.QytzService;
+import com.xt.jygl.gkjygl.gkjyr.ry.service.RyService;
+import com.xt.jygl.gkjygl.gkjyr.ry.service.RyzsService;
+import com.xt.jygl.gkjygl.gkjyr.sssb.entity.SssbEntity;
+import com.xt.jygl.gkjygl.gkjyr.sssb.service.SssbService;
+import com.xt.jygl.gkjygl.gkjyr.xkzfz.service.XkzfzService;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.service.XkzxxService;
+import com.xt.jygl.gkjygl.gkjyr.zxjx.entity.ZxjxEntity;
+import com.xt.jygl.gkjygl.gkjyr.zxjx.service.ZxjxService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.service.XkzbgService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.service.XkzbgfjService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzjyfwEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzsqglbEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzsqzscsEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzjyfwService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzsqService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzsqfjService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzsqglbService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzsqzscsService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.vo.XkzsqfjVo;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkyx.service.XkzyxService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkyx.service.XkzyxfjService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkzx.entity.XkzzxEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkzx.entity.XkzzxfjEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkzx.service.XkzzxService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkzx.service.XkzzxfjService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkzx.service.XkzzxjdsService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkzx.vo.XkzzxVo;
+import com.xt.jygl.workflow.entity.TaskInfoEntity;
+import com.xt.jygl.workflow.service.TaskInfoService;
+import com.xt.jygl.workflow.service.WorkflowMangerService;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.user.dao.UserDao;
+import com.xtframe.sec.user.entity.UserEntity;
+import com.xtframe.util.StringUtils;
+@Service("xkzzxWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "xkzzxWebServicePort", serviceName = "xkzzxWebService")
+public class XkzzxWebService extends BaseWebCtl implements IXkzzxWebService {
+	@Autowired
+	private QueryService query;
+	@Autowired
+	private GkjyrService gkjyrService;
+	@Autowired
+	private AccessoryService accessoryService;
+	@Autowired
+	private XkzsqglbService xkzsqglbService;
+	@Autowired
+	private XkzsqzscsService xkzsqzscsService;
+	@Autowired
+	private XkzzxfjService xkzzxfjService;
+	@Autowired
+	private XkzjyfwService xkzjyfwService;
+	@Autowired
+	private XkzzxService xkzzxService;
+	@Autowired
+	private GkService gkService;
+	@Autowired
+	private GqService gqService;
+	@Autowired
+	private MtService mtService;
+	@Autowired
+	private ZyqService zyqService;
+	@Autowired
+	private BwService bwService;
+	@Autowired
+	private CgService cgService;
+	@Autowired
+	private CkService ckService;
+	@Autowired
+	private DcService dcService;
+	@Autowired
+	private RyService ryService;
+	@Autowired
+	private SssbService sssbService;
+	@Autowired
+	private QytzService qytzService;
+	@Autowired
+	private WorkflowMangerService workService;
+	@Autowired
+	private TaskInfoService taskInfoService;
+	@Autowired
+	private XkzzxjdsService xkzzxjdsService;
+	@Autowired
+	private XkzxxService xkzxxService;
+	@Autowired
+	private RyzsService ryzsService;
+	@Autowired
+	private ZxjxService zxjxService;
+	@Autowired
+	private XkzfzService xkzfzService;
+	@Autowired
+	private XkzsqService xkzsqService;
+	@Autowired
+	private XkzyxService xkzyxService;
+	@Autowired
+	private XkzbgService xkzbgService;
+	@Autowired
+	private XkzbgfjService xkzbgfjService;
+	@Autowired
+	private XkzsqfjService xkzsqfjService;
+	@Autowired
+	private XkzyxfjService xkzyxfjService;
+	@Resource
+	private WebServiceContext wscontext;
+	@Autowired
+	private UserDao userdao;
+	@Override
+	public String findXkzzx(final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		// 查询条件
+				Specification<XkzzxEntity> spec = new Specification<XkzzxEntity>() {
+					@Override
+					public Predicate toPredicate(Root<XkzzxEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+						List<Predicate> list = new ArrayList<Predicate>();
+						if (StringUtils.isNotEmpty(szdid)) {
+							list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+						}
+						if (StringUtils.isNotEmpty(szgkid)) {
+							list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+						}
+						if (StringUtils.isNotEmpty(szgqid)) {
+							list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
+						}
+						if (StringUtils.isNotEmpty(gkjyr)) {
+							list.add(cb.like(root.get("jyrmc").as(String.class), "%" + gkjyr + "%"));
+						}
+						if (StringUtils.isNotEmpty(fddbr)) {
+							list.add(cb.like(root.get("fddbr").as(String.class), "%" + fddbr + "%"));
+						}
+						if (StringUtils.isNotEmpty(bgdd)) {
+							list.add(cb.like(root.get("bgdd").as(String.class), "%" + bgdd + "%"));
+						}
+						list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+						// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
+						if (!isJyr()) {
+							// list.add(cb.like(root.get("szd").get("id").as(String.class),
+							// "%" + getUser().getSzd().getId() + "%"));
+							In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
+							List<String> gqlist = getGq();
+							if (gqlist != null && gqlist.size() > 0) {
+								for (int i = 0; i < gqlist.size(); i++) {
+									in.value(gqlist.get(i));
+								}
+								list.add(in);
+							}
+						} else {
+							Subquery<GkjyrEntity> subquery = query.subquery(GkjyrEntity.class);
+							Root<GkjyrEntity> dpRoot = subquery.from(GkjyrEntity.class);
+							subquery.select(dpRoot);
+							List<Predicate> subQueryPredicates = new ArrayList<Predicate>();
+							subQueryPredicates.add(cb.equal(root.get("jyrid").as(String.class), dpRoot.get("id").as(String.class)));
+							subQueryPredicates.add(cb.equal(dpRoot.get("yjyrid").as(String.class), getSsjyr().getId()));
+							subquery.where(subQueryPredicates.toArray(new Predicate[] {}));
+							list.add(cb.exists(subquery));
+						}
+						return cb.and(list.toArray(new Predicate[] {}));
+					}
+				};
+				List<XkzzxEntity> list = query.findAll(spec,XkzzxEntity.class);
+				List<XkzzxVo> voList = new ArrayList<XkzzxVo>();
+
+				for (XkzzxEntity entity : list) {
+					XkzzxVo vo = new XkzzxVo();
+					if (entity != null) {
+						BeanUtils.copyProperties(entity, vo);
+						if (entity.getRecordStatus() != 9) {
+							if ((xkzzxService.getTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) || xkzzxService.getCandidateTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) {
+								List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId(), XkzzxEntity.PROCESS_DEFINITION_KEY);
+								if (lists != null & lists.size() > 0) {
+									TaskInfoEntity taskinfo = lists.get(0);
+									if ("申请".equals(taskinfo.getCurrName())) {
+										vo.setTaskState("TH");
+									} else {
+										vo.setTaskState(Constants.IS_MY_TASK);
+
+									}
+								}
+
+							}
+							voList.add(vo);
+						}
+					}
+				}
+		return Object2JsonStr(voList);
+	}
+
+	@Override
+	public String findOne(String id) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		String opflag="";
+		XkzzxfVo xkzzxfvo = new XkzzxfVo();
+		@SuppressWarnings("unused")
+		UserEntity user = getUser();
+		XkzzxEntity xkzzxentity = xkzzxService.findOne(id);
+		if (xkzzxentity != null) {
+			List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, XkzzxEntity.PROCESS_DEFINITION_KEY);
+			if (lists != null & lists.size() > 0) {
+				TaskInfoEntity taskinfo = lists.get(0);
+				if ("材料审查".equals(taskinfo.getCurrName())) {
+					opflag = "1";
+				} else if ("核查".equals(taskinfo.getCurrName())) {
+					opflag = "2";
+				} else if ("复核".equals(taskinfo.getCurrName())) {
+					opflag = "3";
+				} else if ("审批".equals(taskinfo.getCurrName())) {
+					opflag = "4";
+				}
+			}
+			List<XkzjyfwEntity> jyfwlist = xkzjyfwService.findByJyrid(xkzzxentity.getJyrid());
+			List<String> jyfwids = new ArrayList<String>();
+			String jyfwstr = "";
+			@SuppressWarnings("unused")
+			String jydystr = "";
+			for (int i = 0; i < jyfwlist.size(); i++) {
+				XkzjyfwEntity entity = jyfwlist.get(i);
+				jyfwstr += entity.getFjdmc() + entity.getJyfwmc() + "(";
+				String jydy = "(" + entity.getFjdmc() + entity.getJyfwmc() + ")";
+				String str = "";
+				if (!StringUtils.isEmpty(entity.getGkid())) {
+					GkEntity gk = gkService.findOne(entity.getGkid());
+					if (gk != null) {
+						str = str + gk.getGkmc() + ",";
+					}
+				}
+				if (!StringUtils.isEmpty(entity.getGqid())) {
+					GqEntity gq = gqService.findOne(entity.getGqid());
+					if (gq != null) {
+						str = str + gq.getGqmc() + ",";
+					}
+				}
+				if (!StringUtils.isEmpty(entity.getZyqid())) {
+					ZyqEntity zyq = zyqService.findOne(entity.getZyqid());
+					if (zyq != null) {
+						str = str + zyq.getZyqmc() + ",";
+					}
+				}
+				if (!StringUtils.isEmpty(entity.getMtid())) {
+					MtEntity mt = mtService.findOne(entity.getMtid());
+					if (mt != null) {
+						str = str + mt.getMtmc();
+					}
+				}
+				if (!StringUtils.isEmpty(entity.getBwid())) {
+					BwEntity bw = bwService.findOne(entity.getBwid());
+					if (bw != null) {
+						str = str + bw.getBwmc();
+					}
+				}
+				if (str != null && str.endsWith(",")) {
+					str = str.substring(0, str.length() - 1);
+				}
+				jyfwstr = jyfwstr + str + ")<br/>";
+				jydystr += str + jydy + "<br/>";
+				jyfwids.add(entity.getJyfwid());
+			}
+			List<Integer> list = fjlist(jyfwids);
+			if (list.size() > 0 && list != null) {
+				List<XkzsqzscsEntity> fjList = new ArrayList<XkzsqzscsEntity>();
+				for (int i = 0; i < list.size(); i++) {
+					XkzsqzscsEntity entity = xkzsqzscsService.findOne(list.get(i).toString());
+					fjList.add(entity);
+				}
+				List<XkzsqfjVo> voList = new ArrayList<XkzsqfjVo>();
+				List<XkzzxfjEntity> xkzfjList = xkzzxfjService.findBySqid(id);
+				for (int i = 0; i < fjList.size(); i++) {
+					XkzsqzscsEntity entity = fjList.get(i);
+					XkzsqfjVo vo = new XkzsqfjVo();
+					if (entity != null) {
+						BeanUtils.copyProperties(entity, vo);
+						if (entity.getRecordStatus() != 9) {
+							for (XkzzxfjEntity fj : xkzfjList) {
+								if ((i + 1) == fj.getSortno()) {
+									vo.setFjid(fj.getFjid());
+									vo.setFjmc(fj.getFjmc());
+									vo.setId(fj.getId());
+									break;
+								}
+							}
+							voList.add(vo);
+						}
+					}
+				}
+				xkzzxfvo.setEntityList(voList);
+			}
+		}
+		xkzzxfvo.setOpflag(opflag);
+		xkzzxfvo.setXkzzxEntity(xkzzxentity);
+		return Object2JsonStr(xkzzxfvo);
+	}
+
+	@Override
+	public Boolean submit(XkzzxEntity code, String[] jydyids, String accid, String mtids, String bwids, String cgids, String ckids, String dcids, String ryids, String sssbids, String qytzids, String zxjxids) {
+		if (!this.checkUser()){
+			return false;
+		}
+		XkzzxEntity xkzzxEntity = new XkzzxEntity();
+		UserEntity user = getUser();
+		try {
+			if (!StringUtils.isEmpty(code.getId())) {
+				xkzzxEntity = xkzzxService.findOne(code.getId());
+				xkzzxEntity.setBgdd(code.getBgdd());
+				xkzzxEntity.setFddbr(code.getFddbr());
+				xkzzxEntity.setLxr(code.getLxr());
+				xkzzxEntity.setLxdh(code.getLxdh());
+				xkzzxEntity.setZxyy(code.getZxyy());
+				xkzzxEntity.setSqyj(code.getSqyj());
+				xkzzxEntity = xkzzxService.submit(xkzzxEntity);
+			} else {
+				code.setSqr(user.getName());
+				Date today = new Date();
+				code.setSqrq(today);
+				GkjyrEntity jyr = gkjyrService.findOne(code.getJyrid());
+				if (jyr != null) {
+					code.setSzgk(jyr.getSzgk());
+					code.setSzgq(jyr.getSzgq());
+					code.setSsgkglbm(jyr.getSsgkglbm());
+				}
+				xkzzxEntity = xkzzxService.submit(code);
+			}
+
+			GkjyrEntity jyr = gkjyrService.findOne(code.getJyrid());
+			GkjyrEntity yjyr = gkjyrService.findOne(jyr.getYjyrid());
+			yjyr.setRecordStatus(BaseEntity.RECORE_STATE_ZXFLAG);
+			yjyr = gkjyrService.save(yjyr);
+			changStatus(yjyr.getId(),BaseEntity.RECORE_STATE_ZXFLAG);
+
+			if (!StringUtils.isEmpty(accid)) {
+				// 关联附件
+				String[] ssids = accid.split(",");
+				for (String ssid : ssids) {
+					XkzzxfjEntity xkzzxfj = xkzzxfjService.findOne(ssid);
+					if (xkzzxfj != null) {
+						xkzzxfj.setSqid(xkzzxEntity.getId());
+						xkzzxfjService.save(xkzzxfj);
+					}
+				}
+			}
+			// rtx提醒
+			// rtxSend(xkzzxEntity.getSzgq().getId(), Constants.ROLE_CLSC,
+			// "你有一条许可证注销待办事务，请及时处理！");
+		} catch (Exception e) {
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public Boolean audit(String shyj, String id, boolean flag) {
+		if (!this.checkUser()){
+			return false;
+		}
+		UserEntity user = getUser();
+		XkzzxEntity entity = null;
+		@SuppressWarnings("unused")
+		String role = "";
+		try {
+			entity = xkzzxService.findOne(id);
+			Date today = new Date();
+			List<TaskInfoEntity> list = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, XkzzxEntity.PROCESS_DEFINITION_KEY);
+			if (list != null & list.size() > 0) {
+				TaskInfoEntity taskinfo = list.get(0);
+				if ("材料审查".equals(taskinfo.getCurrName())) {
+					entity.setClscyj(StringUtils.isEmpty(shyj) ? "" : shyj);
+					entity.setClscjbr(user.getName());
+					entity.setClscrq(today);
+					role = Constants.ROLE_HC;
+				} else if ("核查".equals(taskinfo.getCurrName())) {
+					entity.setHcyj(StringUtils.isEmpty(shyj) ? "" : shyj);
+					entity.setHcjbr(user.getName());
+					entity.setHcjbrq(today);
+					role = Constants.ROLE_FH;
+				} else if ("复核".equals(taskinfo.getCurrName())) {
+					entity.setFhyj(StringUtils.isEmpty(shyj) ? "" : shyj);
+					entity.setFhjbr(user.getName());
+					entity.setFhrq(today);
+					role = Constants.ROLE_SP;
+				} else if ("审批".equals(taskinfo.getCurrName())) {
+					entity.setSpyj(StringUtils.isEmpty(shyj) ? "" : shyj);
+					entity.setSpjbr(user.getName());
+					entity.setSprq(today);
+				}
+				xkzzxService.save(entity);
+			}
+		} catch (Exception e) {
+			return false;
+		}
+		try {
+			if (xkzzxService.getCandidateTaskByUserAndBusKey(getUser().getId().toString(), id) != null) {
+				xkzzxService.claim(id, getUser().getId().toString());
+			}
+			boolean jflag = xkzzxService.changeAudit(shyj, entity, flag);
+			if (!jflag) {
+				// rtx提醒
+				// rtxSend(entity.getSzgq().getId(), role,
+				// "你有一条许可证注销待办事务，请及时处理！");
+			}
+		} catch (Exception e) {
+			return false;
+		}
+		return true;
+	}
+	// 去重复附件数据
+	public List<Integer> fjlist(List<String> ids) {
+
+		List<Integer> newlist = new ArrayList<Integer>();
+		List<Integer> relist = new ArrayList<Integer>();
+		for (int i = 0; i < ids.size(); i++) {
+			List<XkzsqglbEntity> list = xkzsqglbService.findById(ids.get(i));
+			if (list != null && list.size() > 0) {
+				for (XkzsqglbEntity entity : list) {
+					newlist.add(Integer.parseInt(entity.getFileid()));
+				}
+			}
+		}
+		if (newlist != null && newlist.size() > 0) {
+			relist = array_unique(newlist);
+		}
+
+		return relist;
+
+	}
+	public List<Integer> array_unique(List<Integer> slist) {
+		// array_unique
+		List<Integer> list = new LinkedList<Integer>();
+		for (int i = 0; i < slist.size(); i++) {
+			if (!list.contains(slist.get(i))) {
+				list.add(slist.get(i));
+			}
+		}
+		return list;
+	}
+	// 改变状态
+		public void changStatus(String jyrid, int state) {
+			// 经营范围 业务种类
+			List<XkzjyfwEntity> list = xkzjyfwService.findByJyrid(jyrid);
+			if (list != null && list.size() > 0) {
+				for (int i = 0; i < list.size(); i++) {
+					XkzjyfwEntity entity = list.get(i);
+					entity.setRecordStatus(state);
+					xkzjyfwService.save(entity);
+				}
+			}
+			// 码头
+			List<MtEntity> mtlist = mtService.findByJyrid(jyrid);
+			if (mtlist.size() > 0 && mtlist != null) {
+				for (MtEntity mt : mtlist) {
+					mt.setRecordStatus(state);
+					mtService.save(mt);
+				}
+			}
+			// 泊位
+			List<BwEntity> bwlist = bwService.findByJyrid(jyrid);
+			if (bwlist != null && bwlist.size() > 0) {
+				for (BwEntity bw : bwlist) {
+					bw.setRecordStatus(state);
+					bwService.save(bw);
+				}
+			}
+			// 储罐
+			List<CgEntity> cglist = cgService.findByJyrid(jyrid);
+			if (cglist != null && cglist.size() > 0) {
+				for (CgEntity cg : cglist) {
+					cg.setRecordStatus(state);
+					cgService.save(cg);
+				}
+			}
+			// 仓库
+			List<CkEntity> cklist = ckService.findByJyrid(jyrid);
+			if (cklist != null && cklist.size() > 0) {
+				for (CkEntity ck : cklist) {
+					ck.setRecordStatus(state);
+					ckService.save(ck);
+				}
+			}
+			// 堆场
+			List<DcEntity> dclist = dcService.findByJyrid(jyrid);
+			if (dclist != null && dclist.size() > 0) {
+				for (DcEntity dc : dclist) {
+					dc.setRecordStatus(state);
+					dcService.save(dc);
+				}
+			}
+			// 人员
+			List<RyEntity> rylist = ryService.findByJyrid(jyrid);
+			if (rylist != null && rylist.size() > 0) {
+				for (RyEntity ry : rylist) {
+					ry.setRecordStatus(state);
+					ryService.save(ry);
+				}
+			}
+			// 设备信息
+			List<SssbEntity> sssblist = sssbService.findByJyrid(jyrid);
+			if (sssblist != null && sssblist.size() > 0) {
+				for (SssbEntity sssb : sssblist) {
+					sssb.setRecordStatus(state);
+					sssbService.save(sssb);
+				}
+			}
+			// 企业投资
+			List<QytzEntity> qytzlist = qytzService.findByJyrid(jyrid);
+			if (qytzlist != null && qytzlist.size() > 0) {
+				for (QytzEntity qytz : qytzlist) {
+					qytz.setRecordStatus(state);
+					qytzService.save(qytz);
+				}
+			}
+			// 装卸机械
+			List<ZxjxEntity> zxjxlist = zxjxService.findByJyrid(jyrid);
+			if (zxjxlist != null && zxjxlist.size() > 0) {
+				for (ZxjxEntity zxjx : zxjxlist) {
+					zxjx.setRecordStatus(state);
+					zxjxService.save(zxjx);
+				}
+			}
+		}
+		public List<String>  getGq(){
+			String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
+			UserEntity userEntity = userdao.findByUname(userName);
+			List<String> gqlist = gqService.findGqListByUserId(userEntity.getId());
+			return gqlist;
+		}
+		public UserEntity getUser(){
+			String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
+			UserEntity userEntity = userdao.findByUname(userName);
+			return userEntity;
+		}
+}

gkjsjy/trunk/src/com/cxfws/gkjyxkgl/service/vo/XkzbgfVo.java

@@ -0,0 +1,31 @@
+package com.cxfws.gkjyxkgl.service.vo;
+
+import java.util.List;
+
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.entity.XkzbgEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.vo.XkzsqfjVo;
+
+public class XkzbgfVo {
+	private XkzbgEntity xkzbgEntity;
+	private String opflag;
+	private List<XkzsqfjVo> EntityList;
+	public XkzbgEntity getXkzbgEntity() {
+		return xkzbgEntity;
+	}
+	public void setXkzbgEntity(XkzbgEntity xkzbgEntity) {
+		this.xkzbgEntity = xkzbgEntity;
+	}
+	public String getOpflag() {
+		return opflag;
+	}
+	public void setOpflag(String opflag) {
+		this.opflag = opflag;
+	}
+	public List<XkzsqfjVo> getEntityList() {
+		return EntityList;
+	}
+	public void setEntityList(List<XkzsqfjVo> entityList) {
+		EntityList = entityList;
+	}
+	
+}

gkjsjy/trunk/src/com/cxfws/gkjyxkgl/service/vo/XkzsqfVo.java

@@ -0,0 +1,31 @@
+package com.cxfws.gkjyxkgl.service.vo;
+
+import java.util.List;
+
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzsqEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.vo.XkzsqfjVo;
+
+public class XkzsqfVo {
+	private XkzsqEntity xkzsqEntity;
+	private String opflag;
+	private List<XkzsqfjVo> EntityList;
+	public XkzsqEntity getXkzsqEntity() {
+		return xkzsqEntity;
+	}
+	public void setXkzsqEntity(XkzsqEntity xkzsqEntity) {
+		this.xkzsqEntity = xkzsqEntity;
+	}
+	public String getOpflag() {
+		return opflag;
+	}
+	public void setOpflag(String opflag) {
+		this.opflag = opflag;
+	}
+	public List<XkzsqfjVo> getEntityList() {
+		return EntityList;
+	}
+	public void setEntityList(List<XkzsqfjVo> entityList) {
+		EntityList = entityList;
+	}
+	
+}

gkjsjy/trunk/src/com/cxfws/gkjyxkgl/service/vo/XkzyxfVo.java

@@ -0,0 +1,31 @@
+package com.cxfws.gkjyxkgl.service.vo;
+
+import java.util.List;
+
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.vo.XkzsqfjVo;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkyx.entity.XkzyxEntity;
+
+public class XkzyxfVo {
+	private XkzyxEntity xkzyxentity;
+	private String opflag;
+	private List<XkzsqfjVo> entitylist;
+	public XkzyxEntity getXkzyxentity() {
+		return xkzyxentity;
+	}
+	public void setXkzyxentity(XkzyxEntity xkzyxentity) {
+		this.xkzyxentity = xkzyxentity;
+	}
+	public String getOpflag() {
+		return opflag;
+	}
+	public void setOpflag(String opflag) {
+		this.opflag = opflag;
+	}
+	public List<XkzsqfjVo> getEntitylist() {
+		return entitylist;
+	}
+	public void setEntitylist(List<XkzsqfjVo> entitylist) {
+		this.entitylist = entitylist;
+	}
+	
+}

gkjsjy/trunk/src/com/cxfws/gkjyxkgl/service/vo/XkzzxfVo.java

@@ -0,0 +1,31 @@
+package com.cxfws.gkjyxkgl.service.vo;
+
+import java.util.List;
+
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.vo.XkzsqfjVo;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkzx.entity.XkzzxEntity;
+
+public class XkzzxfVo {
+	private XkzzxEntity xkzzxEntity;
+	private String opflag;
+	private List<XkzsqfjVo> entityList;
+	public XkzzxEntity getXkzzxEntity() {
+		return xkzzxEntity;
+	}
+	public void setXkzzxEntity(XkzzxEntity xkzzxEntity) {
+		this.xkzzxEntity = xkzzxEntity;
+	}
+	public String getOpflag() {
+		return opflag;
+	}
+	public void setOpflag(String opflag) {
+		this.opflag = opflag;
+	}
+	public List<XkzsqfjVo> getEntityList() {
+		return entityList;
+	}
+	public void setEntityList(List<XkzsqfjVo> entityList) {
+		this.entityList = entityList;
+	}
+	
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/IBwxxService.java

@@ -0,0 +1,13 @@
+package com.cxfws.jyrxxgl.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "bwWebServicePort", serviceName = "bwWebService")
+public interface IBwxxService {
+	@WebMethod(operationName = "findBw",action="http://service.web.jsjty.com/findBw")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findBw(String szdid,String szgkid,String szgqid,String ssjyr,String bwmc,String wxpbwid,String sfdwkfid,String fwlxid,String bwbwyt);
+	public String findOne(String id);
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/ICgxxService.java

@@ -0,0 +1,12 @@
+package com.cxfws.jyrxxgl.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "cgWebServicePort", serviceName = "cgWebService")
+public interface ICgxxService {
+	@WebMethod(operationName = "findCg",action="http://service.web.jsjty.com/findCg")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findCg(String szdid,String szgkid,String szgqid,String cgmc,String ssjyr);
+	public String findOne(String id);
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/ICkxxService.java

@@ -0,0 +1,13 @@
+package com.cxfws.jyrxxgl.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "ckWebServicePort", serviceName = "ckWebService")
+public interface ICkxxService {
+	@WebMethod(operationName = "findCk",action="http://service.web.jsjty.com/findCk")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findCk(String szdid,String szgkid,String szgqid,String ssmt,String ckmc,String ssjyr,String wxpckid);
+	public String findOne(String id);
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/IDcxxService.java

@@ -0,0 +1,13 @@
+package com.cxfws.jyrxxgl.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "dcWebServicePort", serviceName = "dcWebService")
+public interface IDcxxService {
+	@WebMethod(operationName = "findDc",action="http://service.web.jsjty.com/findDc")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findDc(String szdid,String szgkid,String szgqid,String ssjyr,String dcmc,String wxpdcid);
+	public String findOne(String id);
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/IJyrjbxxService.java

@@ -0,0 +1,15 @@
+package com.cxfws.jyrxxgl.service;
+
+import java.util.Date;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "jyrWebServicePort", serviceName = "jyrWebService")
+public interface IJyrjbxxService {
+	@WebMethod(operationName = "findJyr",action="http://service.web.jsjty.com/findJyr")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findJyr(String szdid,String szgkid,String szgqid,String bwyt,String whfzbh,String qyxz,String sfcswhzy,String sfcyxkz, String gkjyr,String gkjyxkzh,String fddbr,Date xkzstartDate,Date xkzendDate,Date fzstartDate,Date fzendDate,String jyrxkzsfdq);
+	public String findOne(String id);
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/IMtxxService.java

@@ -0,0 +1,13 @@
+package com.cxfws.jyrxxgl.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "mtWebServicePort", serviceName = "mtWebService")
+public interface IMtxxService {
+	@WebMethod(operationName = "findMt",action="http://service.web.jsjty.com/findMt")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findMt(String szdid,String szgkid,String szgqid,String mtmc,String jyr,String sfdwkfid,String sfwhpid,String fwlxid,String mtyt);
+	public String findOne(String id);
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/IQytzxxService.java

@@ -0,0 +1,12 @@
+package com.cxfws.jyrxxgl.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "qytzWebServicePort", serviceName = "qytzWebService")
+public interface IQytzxxService {
+	@WebMethod(operationName = "findQytz",action="http://service.web.jsjty.com/findQytz")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findQytz(String szdid,String szgkid,String szgqid,String jyr,String tzrmc);
+	public String findOne(String id);
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/ISssbxxService.java

@@ -0,0 +1,13 @@
+package com.cxfws.jyrxxgl.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "sssbWebServicePort", serviceName = "sssbWebService")
+public interface ISssbxxService {
+	@WebMethod(operationName = "findSssb",action="http://service.web.jsjty.com/findSssb")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findSssb(String szdid,String szgkid,String szgqid,String jyr,String ssmc);
+	public String findOne(String id);
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/IZxjxxxService.java

@@ -0,0 +1,13 @@
+package com.cxfws.jyrxxgl.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "zxjxWebServicePort", serviceName = "zxjxWebService")
+public interface IZxjxxxService {
+	@WebMethod(operationName = "findZxjx",action="http://service.web.jsjty.com/findZxjx")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findZxjx(String szdid,String szgkid,String szgqid,String jyr,String jxlbmcid);
+	public String findOne(String id);
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/BwxxService.java

@@ -0,0 +1,206 @@
+package com.cxfws.jyrxxgl.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaBuilder.In;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.xml.ws.WebServiceContext;
+
+import net.sf.json.JSONArray;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.config.utils.CxfwsUtils;
+import com.cxfws.jyrxxgl.service.IBwxxService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.gkjcxx.gk.service.GkService;
+import com.xt.jygl.gkjcxx.gq.service.GqService;
+import com.xt.jygl.gkjygl.gkjyr.jyrbw.service.BwService;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.BwEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.vo.BwVo;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.service.XkzglbService;
+import com.xtframe.sec.code.entity.CodeEntity;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.user.dao.UserDao;
+import com.xtframe.sec.user.entity.UserEntity;
+import com.xtframe.util.StringUtils;
+/**
+ * 泊位信息
+ *
+ */
+@Service("bwWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "bwWebServicePort", serviceName = "bwWebService")
+public class BwxxService extends BaseWebCtl implements IBwxxService{
+	@Autowired
+	private QueryService query;
+	@Autowired
+	private BwService bwService;
+	@Autowired
+	private GkService gkService;
+	@Autowired
+	private GqService gqService;
+	@Autowired
+	private GkjyrService gkjyrService;
+	@Autowired
+	private XkzglbService xkzglbService;
+	@Resource
+	private WebServiceContext wscontext;
+	@Autowired
+	private UserDao userdao;
+	@Override
+	@WebMethod(operationName = "findBw", action = "http://service.web.jsjty.com/findBw")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findBw(final String szdid,final  String szgkid,final  String szgqid, final String ssjyr, final String bwmc,final  String wxpbwid,final  String sfdwkfid, final String fwlxid, final String bwbwyt) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		// 查詢條件
+				Specification<BwEntity> spec = new Specification<BwEntity>() {
+
+					@Override
+					public Predicate toPredicate(Root<BwEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+						List<Predicate> list = new ArrayList<Predicate>();
+						
+							
+							if (StringUtils.isNotEmpty(szdid)) {
+								list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+							} 
+							if (StringUtils.isNotEmpty(szgkid)) {
+								list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+							} 
+							
+							if (StringUtils.isNotEmpty(szgqid)) {
+								list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
+							} 
+							if (StringUtils.isNotEmpty(ssjyr)) {
+								list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + ssjyr + "%"));
+							} 
+							
+							if (StringUtils.isNotEmpty(bwmc)) {
+								list.add(cb.like(root.get("bwmc").as(String.class), "%" + bwmc + "%"));
+							} 
+							if (StringUtils.isNotEmpty(wxpbwid)) {
+								list.add(cb.like(root.get("wxpbw").get("id").as(String.class), "%" + wxpbwid + "%"));
+							} 
+							if (StringUtils.isNotEmpty(fwlxid)) {
+								list.add(cb.like(root.get("fwlx").get("id").as(String.class), "%" + fwlxid + "%"));
+							} 
+							
+							if (StringUtils.isNotEmpty(sfdwkfid)) {
+								list.add(cb.like(root.get("sfdwkf").get("id").as(String.class), "%" + sfdwkfid + "%"));
+							} 
+							
+							if (StringUtils.isNotEmpty(bwbwyt)) {
+								list.add(cb.like(root.get("bwyt").as(String.class), "%" + bwbwyt + "%"));
+							} 
+							String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
+							UserEntity userEntity = userdao.findByUname(userName);
+							if (userEntity.getSsjyr()!=null) {
+								list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
+							} else {
+								In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
+								List<String> gqlist = gqService.findGqListByUserId(userEntity.getId());
+								if (gqlist != null && gqlist.size() > 0) {
+									for (int i = 0; i < gqlist.size(); i++) {
+										in.value(gqlist.get(i));
+									}
+									list.add(in);
+								}
+								
+							}
+						// 状态为0,9,10,11不显示
+						list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
+						list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+						list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_BGFLAG));
+						list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_ZXFLAG));
+						return cb.and(list.toArray(new Predicate[] {}));
+					}
+				};
+				List<BwEntity> bwlist = query.findAll(spec, BwEntity.class);
+				return Object2JsonStr(bwlist);
+	}
+
+	@Override
+	public String findOne(String id) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		BwEntity entity = bwService.findOne(id);
+		BwVo vo = new BwVo();
+		if (entity != null) {
+			BeanUtils.copyProperties(entity, vo);
+			vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+			vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+			vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+			vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+			vo.setSsmtzw(entity.getSsmt() != null ? entity.getSsmt().getMtmc() : "");
+			vo.setBwsxzw(entity.getBwsx() != null ? entity.getBwsx().getText() : "");
+			vo.setFwlxzw(entity.getFwlx() != null ? entity.getFwlx().getText() : "");
+			vo.setWxpbwzw(entity.getWxpbw() != null ? entity.getWxpbw().getText() : "");
+			vo.setZyhbwflzw(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getText() : "");
+			vo.setSffzzw(entity.getSffz() != null ? entity.getSffz().getText() : "");
+			vo.setSfdwkfzw(entity.getSfdwkf() != null ? entity.getSfdwkf().getText() : "");
+			vo.setBwszsxzw(entity.getBwszsx() != null ? entity.getBwszsx().getText() : "");
+			vo.setSclxzw(entity.getSclx() != null ? entity.getSclx().getText() : "");
+			vo.setJgxszw(entity.getJgxs() != null ? entity.getJgxs().getText() : "");
+			vo.setKbcblxzw(entity.getKbcblx() != null ? entity.getKbcblx().getText() : "");
+
+			vo.setSszyq(entity.getSszyq() != null ? entity.getSszyq().getId() : "");
+			vo.setSszyqzw(entity.getSszyq() != null ? entity.getSszyq().getZyqmc() : "");
+			vo.setZls(entity.getZls() != null ? entity.getZls().getId() : "");
+			vo.setZlszw(entity.getZls() != null ? entity.getZls().getText() : "");
+			vo.setXp(entity.getXp() != null ? entity.getXp().getId() : "");
+			vo.setXpzw(entity.getXp() != null ? entity.getXp().getText() : "");
+			vo.setBwszhd(entity.getBwszhd() != null ? entity.getBwszhd().getText() : "");
+
+			if (entity.getBwyt() != null) {
+				String bwytzw = "";
+				String[] s = entity.getBwyt().split(",");
+				/*
+				 * for (String string : s) { bwytzw +=
+				 * securityMgr.codeService().findOne(string).getText(); }
+				 */
+				for (int i = 0; i < s.length; i++) {
+					CodeEntity ce = securityMgr.codeService().findOne(s[i]);
+					if (ce != null) {
+						bwytzw += ce.getText();
+						if (i != s.length - 1) {
+							bwytzw += ",";
+						}
+					}
+				}
+				vo.setBwytzw(bwytzw);
+			}
+			vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
+			vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+			vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
+			vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
+			vo.setSsmt(entity.getSsmt() != null ? entity.getSsmt().getId() : "");
+			vo.setBwsx(entity.getBwsx() != null ? entity.getBwsx().getId() : "");
+			vo.setFwlx(entity.getFwlx() != null ? entity.getFwlx().getId() : "");
+			vo.setWxpbw(entity.getWxpbw() != null ? entity.getWxpbw().getId() : "");
+			vo.setZyhbwfl(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getId() : "");
+			vo.setSffz(entity.getSffz() != null ? entity.getSffz().getId() : "");
+			vo.setSfdwkf(entity.getSfdwkf() != null ? entity.getSfdwkf().getId() : "");
+			vo.setBwszsx(entity.getBwszsx() != null ? entity.getBwszsx().getId() : "");
+			vo.setSclx(entity.getSclx() != null ? entity.getSclx().getId() : "");
+			vo.setJgxs(entity.getJgxs() != null ? entity.getJgxs().getId() : "");
+		}
+		JSONArray jsons=JSONArray.fromObject(vo);
+		return jsons.toString();
+	}
+
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/CgxxService.java

@@ -0,0 +1,150 @@
+package com.cxfws.jyrxxgl.service.impl;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaBuilder.In;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.xml.ws.WebServiceContext;
+
+import net.sf.json.JSONArray;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.config.utils.CxfwsUtils;
+import com.cxfws.jyrxxgl.service.ICgxxService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.gkjcxx.gq.service.GqService;
+import com.xt.jygl.gkjygl.gkjyr.jyrcg.entity.CgEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrcg.service.CgService;
+import com.xt.jygl.gkjygl.gkjyr.jyrcg.vo.CgVo;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.user.dao.UserDao;
+import com.xtframe.sec.user.entity.UserEntity;
+import com.xtframe.util.StringUtils;
+/**
+ * 储罐信息
+ */
+@Service("cgWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "cgWebServicePort", serviceName = "cgWebService")
+public class CgxxService extends BaseWebCtl implements ICgxxService{
+	@Autowired
+	private QueryService query;
+	@Autowired
+	private CgService cgService;
+	@Resource
+	private WebServiceContext wscontext;
+	@Autowired
+	private UserDao userdao;
+	@Autowired
+	private GqService gqService;
+	/**
+	 * 储罐信息列表
+	 */
+	@Override
+	@WebMethod(operationName = "findCg", action = "http://service.web.jsjty.com/findCg")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findCg(final String szdid,final String szgkid,final String szgqid,final String cgmc,final String ssjyr) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		Specification<CgEntity> spec = new Specification<CgEntity>() {
+			@Override
+			public Predicate toPredicate(Root<CgEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+				if (StringUtils.isNotEmpty(szdid)) {
+					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(szgkid)) {
+					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(szgqid)) {
+					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(ssjyr)) {
+					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + ssjyr + "%"));
+				} 
+				if (StringUtils.isNotEmpty(cgmc)) {
+					list.add(cb.like(root.get("cgmc").as(String.class), "%" + cgmc + "%"));
+				} 
+				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
+				String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
+				UserEntity userEntity = userdao.findByUname(userName);
+				if (userEntity.getSsjyr()!=null) {
+					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
+				} else {
+					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
+					List<String> gqlist = gqService.findGqListByUserId(userEntity.getId());
+					if (gqlist != null && gqlist.size() > 0) {
+						for (int i = 0; i < gqlist.size(); i++) {
+							in.value(gqlist.get(i));
+						}
+						list.add(in);
+					}
+				}
+				//状态为0,9,10,11不显示
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_BGFLAG));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_ZXFLAG));
+				return cb.and(list.toArray(new Predicate[] {}));
+			}
+		};
+		List<CgEntity> cglist = query.findAll(spec, CgEntity.class);
+		JSONArray jsons=JSONArray.fromObject(cglist);
+		return jsons.toString();
+		}
+	/**
+	 * 储罐信息详情
+	 */
+	@Override
+	public String findOne(String id) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		CgEntity entity = cgService.findOne(id);
+		CgVo vo = new CgVo();
+		if(entity!=null){
+		BeanUtils.copyProperties(entity, vo);
+		vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+		vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+		vo.setCgxszw(entity.getCgxs() != null ? entity.getCgxs().getText() : "");
+		vo.setCgwxzw(entity.getCgwx() != null ? entity.getCgwx().getText() : "");
+		vo.setCgczzw(entity.getCgcz() != null ? entity.getCgcz().getText() : "");
+		vo.setWxydjzw(entity.getWxydj() != null ? entity.getWxydj().getText() : "");
+		vo.setYwfhdzw(entity.getYwfhd() != null ? entity.getYwfhd().getText() : "");
+		vo.setCgazxszw(entity.getCgazxs() != null ? entity.getCgazxs().getText() : "");
+		vo.setWzztzw(entity.getWzzt() != null ? entity.getWzzt().getText() : "");
+		vo.setJlfszw(entity.getJlfs() != null ? entity.getJlfs().getText() : "");
+		vo.setClfszw(entity.getClfs() != null ? entity.getClfs().getText() : "");
+		vo.setSfwxpcgzw(entity.getSfwxpcg() != null ? entity.getSfwxpcg().getText() : "");
+		vo.setTbsjstr(transFormatDate(entity.getTbsj()));
+		vo.setTcsjstr(transFormatDate(entity.getTcsj()));
+		}
+		JSONArray jsons=JSONArray.fromObject(vo);
+		return jsons.toString();
+	}
+	// 时间格式化
+		private String transFormatDate(Date d) {
+			if (d == null) {
+				return "";
+			}
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			return sdf.format(d);
+		}
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/CkxxService.java

@@ -0,0 +1,157 @@
+package com.cxfws.jyrxxgl.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaBuilder.In;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.xml.ws.WebServiceContext;
+
+import net.sf.json.JSONArray;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.config.utils.CxfwsUtils;
+import com.cxfws.jyrxxgl.service.ICkxxService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.gkjcxx.gq.service.GqService;
+import com.xt.jygl.gkjygl.gkjyr.jyrck.entity.CkEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrck.service.CkService;
+import com.xt.jygl.gkjygl.gkjyr.jyrck.vo.CkVo;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.user.dao.UserDao;
+import com.xtframe.sec.user.entity.UserEntity;
+import com.xtframe.util.StringUtils;
+/**
+ * 仓库信息
+ */
+@Service("ckWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "ckWebServicePort", serviceName = "ckWebService")
+public class CkxxService extends BaseWebCtl implements ICkxxService{
+	@Autowired
+	private QueryService query;
+	@Autowired
+	private CkService ckService;
+	@Resource
+	private WebServiceContext wscontext;
+	@Autowired
+	private UserDao userdao;
+	@Autowired
+	private GqService gqService;
+	/**
+	 * 根据查询条件查询仓库信息列表
+	 */
+	@Override
+	@WebMethod(operationName = "findCk", action = "http://service.web.jsjty.com/findCk")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findCk(final String szdid,final String szgkid,final String szgqid,final String ssmt,final String ckmc,final String ssjyr,final String wxpckid) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		Specification<CkEntity> spec = new Specification<CkEntity>() {
+			@Override
+			public Predicate toPredicate(Root<CkEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+				if (StringUtils.isNotEmpty(szdid)) {
+					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+				}
+				if (StringUtils.isNotEmpty(szgkid)) {
+					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(szgqid)) {
+					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(ssjyr)) {
+					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + ssjyr + "%"));
+				} 
+				if (StringUtils.isNotEmpty(ssmt)) {
+					list.add(cb.like(root.get("ssmt").get("mtmc").as(String.class), "%" + ssmt + "%"));
+				} 
+				if (StringUtils.isNotEmpty(wxpckid)) {
+					list.add(cb.like(root.get("wxpck").get("id").as(String.class), "%" + wxpckid + "%"));
+				}
+				if (StringUtils.isNotEmpty(ckmc)) {
+					list.add(cb.like(root.get("ckmc").as(String.class), "%" + ckmc + "%"));
+				} 
+				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
+				String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
+				UserEntity userEntity = userdao.findByUname(userName);
+				if (userEntity.getSsjyr()!=null) {
+					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
+				} else {
+					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
+					List<String> gqlist = gqService.findGqListByUserId(userEntity.getId());
+					if (gqlist != null && gqlist.size() > 0) {
+						for (int i = 0; i < gqlist.size(); i++) {
+							in.value(gqlist.get(i));
+						}
+						list.add(in);
+					}
+				}
+				//状态为0,9,10,11不显示
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_BGFLAG));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_ZXFLAG));
+				return cb.and(list.toArray(new Predicate[] {}));
+			}
+		};
+		List<CkEntity> cklist = query.findAll(spec, CkEntity.class);
+		JSONArray jsons=JSONArray.fromObject(cklist);
+		return jsons.toString();
+	}
+	/**
+	 * 根据id查询仓库信息
+	 */
+	@Override
+	public String findOne(String id) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		CkEntity entity = ckService.findOne(id);
+		CkVo vo = new CkVo();
+		if(entity!=null){
+		BeanUtils.copyProperties(entity, vo);
+		vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+		vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+		vo.setWxpckzw(entity.getWxpck() != null ? entity.getWxpck().getText() : "");
+		vo.setSsmtzw(entity.getSsmt() != null ? entity.getSsmt().getMtmc() : "");
+
+		vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
+		vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
+		vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
+		vo.setWxpck(entity.getWxpck() != null ? entity.getWxpck().getId() : "");
+		vo.setSsmt(entity.getSsmt() != null ? entity.getSsmt().getId() : "");
+		vo.setSzzyq(entity.getSzzyq() != null ?entity.getSzzyq().getId():"");
+		vo.setSzzyqzw(entity.getSzzyq() != null ?entity.getSzzyq().getZyqmc():"");
+		vo.setSsbw(entity.getSsbw() != null ? entity.getSsbw().getId():"");
+		vo.setSsbwzw(entity.getSsbw() != null ? entity.getSsbw().getBwmc():"");
+		vo.setCklx(entity.getCklx() != null ? entity.getCklx().getId() :"");
+		vo.setCklxzw(entity.getCklx() != null ? entity.getCklx().getText() : "");
+		vo.setKcsclx(entity.getKcsclx() != null ? entity.getKcsclx().getId() : "");
+		vo.setKcsclxzw(entity.getKcsclx() != null ? entity.getKcsclx().getText() : "");
+		// 仓库用途名称去掉最后的逗号 ckytmc
+		if (StringUtils.isNotEmpty(vo.getCkytmc())) {
+			String ckytmc = vo.getCkytmc();
+			ckytmc = ckytmc.substring(0, ckytmc.lastIndexOf(","));
+			vo.setCkytmc(ckytmc);
+		}
+		}
+		JSONArray jsons=JSONArray.fromObject(vo);
+		return jsons.toString();
+	}
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/DcxxService.java

@@ -0,0 +1,143 @@
+package com.cxfws.jyrxxgl.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaBuilder.In;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.xml.ws.WebServiceContext;
+
+import net.sf.json.JSONArray;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.config.utils.CxfwsUtils;
+import com.cxfws.jyrxxgl.service.IDcxxService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.gkjcxx.gq.service.GqService;
+import com.xt.jygl.gkjygl.gkjyr.jyrdc.entity.DcEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrdc.service.DcService;
+import com.xt.jygl.gkjygl.gkjyr.jyrdc.vo.DcVo;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.user.dao.UserDao;
+import com.xtframe.sec.user.entity.UserEntity;
+import com.xtframe.util.StringUtils;
+/**
+ * 堆场信息
+ * @author b_zhaohang
+ *
+ */
+@Service("dcWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "dcWebServicePort", serviceName = "dcWebService")
+public class DcxxService extends BaseWebCtl implements IDcxxService{
+	@Autowired
+	private QueryService query;
+	@Autowired
+	private DcService dcService;
+	@Resource
+	private WebServiceContext wscontext;
+	@Autowired
+	private UserDao userdao;
+	@Autowired
+	private GqService gqService;
+	/**
+	 * 根据查询条件查询堆场信息
+	 */
+	@Override
+	@WebMethod(operationName = "findDc", action = "http://service.web.jsjty.com/findDc")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findDc(final String szdid, final String szgkid, final String szgqid, final String ssjyr, final String dcmc, final String wxpdcid) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		Specification<DcEntity> spec = new Specification<DcEntity>() {
+
+			@Override
+			public Predicate toPredicate(Root<DcEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+				if (StringUtils.isNotEmpty(szdid)) {
+					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(szgkid)) {
+					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(szgqid)) {
+					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(ssjyr)) {
+					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + ssjyr + "%"));
+				} 
+				if (StringUtils.isNotEmpty(dcmc)) {
+					list.add(cb.like(root.get("dcmc").as(String.class), "%" + dcmc + "%"));
+				} 
+				if (StringUtils.isNotEmpty(wxpdcid)) {
+					list.add(cb.like(root.get("wxpdc").get("id").as(String.class), "%" + wxpdcid + "%"));
+				}
+				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
+				String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
+				UserEntity userEntity = userdao.findByUname(userName);
+				if (userEntity.getSsjyr()!=null) {
+					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
+				} else {
+					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
+					List<String> gqlist = gqService.findGqListByUserId(userEntity.getId());
+					if (gqlist != null && gqlist.size() > 0) {
+						for (int i = 0; i < gqlist.size(); i++) {
+							in.value(gqlist.get(i));
+						}
+						list.add(in);
+					}
+				}
+				//状态为0,9,10,11不显示
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_BGFLAG));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_ZXFLAG));
+				return cb.and(list.toArray(new Predicate[] {}));
+			}//
+		};
+		List<DcEntity> dclist = query.findAll(spec, DcEntity.class);
+		JSONArray jsons=JSONArray.fromObject(dclist);
+		return jsons.toString();
+	}
+	/**
+	 * 根据id查询堆场详情
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public String findOne(String id) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		DcEntity entity = dcService.findOne(id);
+		DcVo vo = new DcVo();
+		if(entity!=null){
+		BeanUtils.copyProperties(entity, vo);
+		vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+		vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+		vo.setWxpdczw(entity.getWxpdc() != null ? entity.getWxpdc().getText() : "");
+		vo.setSsmtzw(entity.getSsmt() != null ? entity.getSsmt().getMtmc() : "");
+		vo.setDclx(entity.getDclx() != null ? entity.getDclx().getId() : "");
+		vo.setDclxzw(entity.getDclx() != null ? entity.getDclx().getText() : "");
+		if(!StringUtils.isEmpty(vo.getZwdcyt())){
+			vo.setZwdcyt(vo.getZwdcyt().substring(0,vo.getZwdcyt().length()-1));
+		}
+		}
+		JSONArray jsons=JSONArray.fromObject(vo);
+		return jsons.toString();
+	}
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/JyrjbxxService.java

@@ -0,0 +1,408 @@
+package com.cxfws.jyrxxgl.service.impl;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaBuilder.In;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+import javax.xml.ws.WebServiceContext;
+
+import net.sf.json.JSONArray;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.config.utils.CxfwsUtils;
+import com.cxfws.jyrxxgl.service.IJyrjbxxService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.common.Constants;
+import com.xt.jygl.ggfwxxgl.jdtx.service.TxService;
+import com.xt.jygl.ggfwxxgl.tzgg.ggxx.service.GgxxtxService;
+import com.xt.jygl.gkjcxx.ax.entity.AxEntity;
+import com.xt.jygl.gkjcxx.ax.service.AxService;
+import com.xt.jygl.gkjcxx.gk.service.GkService;
+import com.xt.jygl.gkjcxx.gq.service.GqService;
+import com.xt.jygl.gkjcxx.mt.service.MtService;
+import com.xt.jygl.gkjygl.gkjyr.jyrbw.service.BwService;
+import com.xt.jygl.gkjygl.gkjyr.jyrcg.entity.CgEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrcg.service.CgService;
+import com.xt.jygl.gkjygl.gkjyr.jyrck.entity.CkEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrck.service.CkService;
+import com.xt.jygl.gkjygl.gkjyr.jyrdc.entity.DcEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrdc.service.DcService;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.BwEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.vo.GkjyrVo;
+import com.xt.jygl.gkjygl.gkjyr.qytz.service.QytzService;
+import com.xt.jygl.gkjygl.gkjyr.ry.service.RyService;
+import com.xt.jygl.gkjygl.gkjyr.sssb.service.SssbService;
+import com.xt.jygl.gkjygl.gkjyr.xkzfz.service.XkzfzService;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.entity.XkzxxEntity;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.service.XkzglbService;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.service.XkzxxService;
+import com.xt.jygl.gkjygl.gkjyr.zxjx.service.ZxjxService;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.user.dao.UserDao;
+import com.xtframe.sec.user.entity.UserEntity;
+import com.xtframe.util.DateTime;
+import com.xtframe.util.StringUtils;
+/**
+ * 
+ *经营人基本信息
+ */
+@Service("jyrWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "jyrWebServicePort", serviceName = "jyrWebService")
+public class JyrjbxxService extends BaseWebCtl implements IJyrjbxxService {
+	@Autowired
+	private UserDao userdao;
+	@Resource
+	private WebServiceContext wscontext;
+	@Autowired
+	private QueryService query;
+	@Autowired
+	private GkjyrService gkjyrService;
+	@Autowired
+	private GkService gkService;
+	@Autowired
+	private GqService gqService;
+	@Autowired
+	private MtService mtService;
+	@Autowired
+	private BwService bwService;
+	@Autowired
+	private CgService cgService;
+	@Autowired
+	private CkService ckService;
+	@Autowired
+	private DcService dcService;
+	@Autowired
+	private RyService ryService;
+	@Autowired
+	private QytzService qytzService;
+	@Autowired
+	private ZxjxService zxjxService;
+	@Autowired
+	private XkzglbService xkzglbService;
+	@Autowired
+	private XkzxxService xkzxxService;
+	@Autowired
+	private GgxxtxService ggxxtxService;
+	@Autowired
+	private TxService txService;
+	@Autowired
+	private SssbService sssbService;
+	@Autowired
+	private XkzfzService xkzfzService;
+	@Autowired
+	private AxService axService;
+	/**
+	 * 查询详细
+	 */
+	@Override
+	public String findOne(String id) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		GkjyrEntity gkjyr = gkjyrService.findOne(id);
+		GkjyrVo gkjyrVo = new GkjyrVo();
+		BeanUtils.copyProperties(gkjyr, gkjyrVo);
+		gkjyrVo.setSzdzw(null != gkjyr.getSzd() ? gkjyr.getSzd().getText() : "");
+		gkjyrVo.setSzgkzw(null != gkjyr.getSzgk() ? gkjyr.getSzgk().getGkmc() : "");
+		gkjyrVo.setSzgqzw(null != gkjyr.getSzgq() ? gkjyr.getSzgq().getGqmc() : "");
+		if (null != gkjyr.getParentJyrId()) {
+			GkjyrEntity p = gkjyrService.findOne(gkjyr.getParentJyrId());
+			if (null != p) {
+				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
+			}
+		}
+
+		gkjyrVo.setSfwhqy(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
+		gkjyrVo.setXzqh(null != gkjyr.getXzqh() ? gkjyr.getXzqh().getText() : "");
+		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
+		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
+		gkjyrVo.setYwjgyszw(null != gkjyr.getYwjgys() ? gkjyr.getYwjgys().getText() : "");
+		gkjyrVo.setMtjgxs(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getId() : "");
+		gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");
+		gkjyrVo.setQyxzzw(null != gkjyr.getQyxz() ? gkjyr.getQyxz().getText() : "");
+		gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(id);
+		for (XkzxxEntity xkz : xkzs) {
+			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
+				gkjyrVo.setXkzyxq(xkz.getYxqz());
+				gkjyrVo.setXkzyxqfmt(DateTime.toString(xkz.getYxqz()));
+				gkjyrVo.setGkjyxkzh(xkz.getGkjyxkzh());
+				gkjyrVo.setGkjyxkzh(xkz.getGkjyxkzh());
+				gkjyrVo.setFzrqstr(DateTime.toString(xkz.getFzrq()));
+				gkjyrVo.setJyfw(xkz.getZyqyfw());
+				gkjyrVo.setJyqy(xkz.getCq());
+			}
+		}
+
+		// 岸线
+		List<AxEntity> axEntities = axService.findByJyrid(gkjyr.getId());
+		if (axEntities == null) {
+			axEntities = new ArrayList<AxEntity>();
+		}
+		double axcd = 0;
+		for (AxEntity axEntity : axEntities) {
+			axcd += axEntity == null ? 0 : axEntity.getAxcd();
+		}
+		// 岸线长度
+		gkjyrVo.setAxcd(axcd + "");
+
+		// 码头泊位
+		List<BwEntity> bwList = bwService.findByJyrid(gkjyr.getId());
+		if (bwList == null) {
+			bwList = new ArrayList<BwEntity>();
+		}
+		// 码头泊位总数
+		gkjyrVo.setMtbwzs(bwList.size() + "");
+		int scxbw = 0;
+		int fscxbw = 0;
+		double zdkbnl = 0;
+		int wdjysbw = 0;
+		double bwzcd = 0;
+		double sjntgnl = 0;
+		double sjtgnl = 0;
+		for (BwEntity bwEntity : bwList) {
+			if (bwEntity.getSclx() != null) {
+				if (bwEntity.getSclx().getId().equals("2601") && bwEntity.getSclx().getId().equals("2602")) {
+					scxbw++;
+				} else if (bwEntity.getSclx().getId().equals("2603") && bwEntity.getSclx().getId().equals("2604")) {
+					fscxbw++;
+				}
+			}
+
+			sjtgnl = bwEntity.getSjtgnl() == null ? 0 : bwEntity.getSjtgnl();
+			zdkbnl += sjtgnl;
+			if (sjtgnl >= 10000) {
+				wdjysbw++;
+			}
+			bwzcd += bwEntity.getBwcd() == null ? 0 : bwEntity.getBwcd();
+			sjntgnl += bwEntity.getNhwtgnl() == null ? 0 : Double.parseDouble(bwEntity.getNhwtgnl());
+		}
+		// 泊位生产类型
+		gkjyrVo.setScxbw(scxbw + "");
+		gkjyrVo.setFscxbw(fscxbw + "");
+		// 最大靠泊能力
+		gkjyrVo.setZdkbnl(zdkbnl + "");
+		// 万吨级以上泊位
+		gkjyrVo.setWdjysbwsl(wdjysbw + "");
+		// 泊位总长度
+		gkjyrVo.setBwzcd(bwzcd + "");
+		// 设计年通过能力
+		gkjyrVo.setSjntgnl(sjntgnl + "");
+
+		// 仓库
+		List<CkEntity> ckEntities = ckService.findByJyrid(gkjyr.getId());
+		if (ckEntities == null) {
+			ckEntities = new ArrayList<CkEntity>();
+		}
+		double ckzmj = 0;
+		for (CkEntity ckEntity : ckEntities) {
+			ckzmj += ckEntity.getCkzmj() == null ? 0 : ckEntity.getCkzmj();
+		}
+		// 仓库总面积
+		gkjyrVo.setCkzmj(ckzmj + "");
+
+		// 堆场
+		List<DcEntity> dcEntities = dcService.findByJyrid(gkjyr.getId());
+		if (dcEntities == null) {
+			dcEntities = new ArrayList<DcEntity>();
+		}
+		double dczmj = 0;
+		for (DcEntity dcEntity : dcEntities) {
+			dczmj += dcEntity.getDczmj() == null ? 0 : dcEntity.getDczmj();
+		}
+		// 堆场总面积
+		gkjyrVo.setTczmj(dczmj + "");
+		// 储罐
+		List<CgEntity> cgEntities = cgService.findByJyrid(gkjyr.getId());
+		if (cgEntities == null) {
+			cgEntities = new ArrayList<CgEntity>();
+		}
+		double cgzrl = 0;
+		for (CgEntity cgEntity : cgEntities) {
+			cgzrl += cgEntity.getCgqmj() == null ? 0 : cgEntity.getCgqmj();
+		}
+		// 储罐数量
+		gkjyrVo.setCgsl(cgEntities.size() + "");
+		// 储罐总容量
+		gkjyrVo.setCgzrl(cgzrl + "");
+		JSONArray jsons=JSONArray.fromObject(gkjyrVo);
+		return jsons.toString();
+	}
+		// 时间格式化
+		private String transFormatDate(Date d) {
+			if (d == null) {
+				return "";
+			}
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			return sdf.format(d);
+		}
+		/**
+		 * 查询列表
+		 */
+		@Override
+		@WebMethod(operationName = "findJyr", action = "http://service.web.jsjty.com/findJyr")
+		@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+		public String findJyr(final String szdid, final String szgkid, final String szgqid,final String bwyt, final String whfzbh, final String qyxz, final String sfcswhzy, final String sfcyxkz, final String gkjyr,  final String gkjyxkzh, final String fddbr, final Date xkzstartDate, final Date xkzendDate, final Date fzstartDate, final Date fzendDate, final String jyrxkzsfdq) {
+			if (!this.checkUser()){
+				return BaseWebCtl.NOLOGIN;
+			}
+			// 查询条件
+			Specification<GkjyrEntity> spec = new Specification<GkjyrEntity>() {
+
+				@Override
+				public Predicate toPredicate(Root<GkjyrEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+
+					boolean xkzflag = false;
+					boolean bwflag = false;
+
+					List<Predicate> list = new ArrayList<Predicate>();
+					//
+
+					if (StringUtils.isNotEmpty(gkjyr)) {
+
+						list.add(cb.like(root.get("gkjyr").as(String.class), "%" + gkjyr + "%"));
+					} 
+					if (StringUtils.isNotEmpty(szdid)) {
+						list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+					}
+					if (StringUtils.isNotEmpty(szgkid)) {
+						list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+					}
+					if (StringUtils.isNotEmpty(szgqid)) {
+						list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
+					} 
+					if (StringUtils.isNotEmpty(gkjyxkzh)) {
+						list.add(cb.like(root.get("gkjyxkzh").as(String.class), "%" + gkjyxkzh + "%"));
+					} 
+					if (StringUtils.isNotEmpty(fddbr)) {
+						list.add(cb.like(root.get("fddbr").as(String.class), "%" + fddbr + "%"));
+					} 
+					// 危货附证编号
+					if (StringUtils.isNotEmpty(whfzbh)) {
+						list.add(cb.like(root.get("gkwxhwzyfzbh").as(String.class), "%" + whfzbh + "%"));
+					} 
+					// 是否危货企业
+					if (StringUtils.isNotEmpty(sfcswhzy)) {
+						if (!sfcswhzy.equals("all")) {
+							list.add(cb.like(root.get("sfwhqy").get("id").as(String.class), "%" + sfcswhzy + "%"));
+						}
+					}
+					// 是否有许可证
+					if (StringUtils.isNotEmpty(sfcyxkz)) {
+						if (!sfcyxkz.equals("all")) {
+							if (!sfcyxkz.equals("201")) {
+								list.add(cb.isNull(root.get("gkjyxkzh").as(String.class)));
+							} else {
+								list.add(cb.isNotNull(root.get("gkjyxkzh").as(String.class)));
+							}
+
+						}
+					} 
+					Subquery<BwEntity> subquery2 = query.subquery(BwEntity.class);
+					Root<BwEntity> dpRoot2 = subquery2.from(BwEntity.class);
+					subquery2.select(dpRoot2);
+					List<Predicate> subQueryPredicates2 = new ArrayList<Predicate>();
+					subQueryPredicates2.add(cb.equal(root.get("id").as(String.class), dpRoot2.get("ssjyr").get("id").as(String.class)));
+					// 泊位用途
+					if (StringUtils.isNotEmpty(bwyt)) {
+						subQueryPredicates2.add(cb.like(dpRoot2.get("bwyt").as(String.class), "%" + bwyt + "%"));
+						bwflag = true;
+					} 
+					if (bwflag) {
+						subquery2.where(subQueryPredicates2.toArray(new Predicate[] {}));
+						list.add(cb.exists(subquery2));
+					}
+					// 企业性质
+					if (StringUtils.isNotEmpty(qyxz)) {
+						list.add(cb.like(root.get("qyxz").as(String.class), "%" + qyxz + "%"));
+					} 
+
+					// 危货附证有效期
+					if (fzstartDate != null) {
+						list.add(cb.greaterThanOrEqualTo(root.get("fzyxq").as(Date.class), fzstartDate));
+					} 
+					if (fzendDate != null) {
+						list.add(cb.lessThanOrEqualTo(root.get("fzyxq").as(Date.class), fzendDate));
+					} 
+					// 子查询
+					Subquery<XkzxxEntity> subquery = query.subquery(XkzxxEntity.class);
+					Root<XkzxxEntity> dpRoot = subquery.from(XkzxxEntity.class);
+					subquery.select(dpRoot);
+					List<Predicate> subQueryPredicates = new ArrayList<Predicate>();
+					Date now = new Date();
+					subQueryPredicates.add(cb.equal(dpRoot.get("gkjyr").as(String.class), root.get("id").as(String.class)));
+					subQueryPredicates.add(cb.equal(dpRoot.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
+					// 许可证有效期
+					if (xkzstartDate != null) {
+						subQueryPredicates.add(cb.greaterThanOrEqualTo(dpRoot.get("yxqz").as(Date.class), xkzstartDate));
+						xkzflag = true;
+					} 
+					if (xkzendDate != null) {
+						subQueryPredicates.add(cb.lessThanOrEqualTo(dpRoot.get("yxqz").as(Date.class), xkzendDate));
+						xkzflag = true;
+					} 
+					// 许可证是否将到期
+					if (StringUtils.isNotEmpty(jyrxkzsfdq)) {
+						if ((jyrxkzsfdq).equals("6103")) {
+							subQueryPredicates.add(cb.lessThanOrEqualTo(dpRoot.get("yxqz").as(Date.class), now));
+							xkzflag = true;
+						} else if ((jyrxkzsfdq).equals("6101")) {
+							subQueryPredicates.add(cb.greaterThan(dpRoot.get("yxqz").as(Date.class), now));
+							xkzflag = true;
+						} else {
+							// subQueryPredicates.add(cb.lessThanOrEqualTo(dpRoot.get("yxqz").as(Date.class),
+							// DateTime.addDays(now, 30)));
+						}
+					} 
+					if (xkzflag) {
+						subquery.where(subQueryPredicates.toArray(new Predicate[] {}));
+						list.add(cb.exists(subquery));
+					}
+					// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
+					String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
+					UserEntity userEntity = userdao.findByUname(userName);
+					if (isJyr()) {
+						list.add(cb.like(root.get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
+					} else {
+						In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
+						List<String> gqlist = gqService.findGqListByUserId(userEntity.getId());
+						if (gqlist != null && gqlist.size() > 0) {
+							for (int i = 0; i < gqlist.size(); i++) {
+								in.value(gqlist.get(i));
+							}
+							list.add(in);
+						}
+					}
+					// 状态为0,9,10,11不显示
+					list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
+					list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+					list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_BGFLAG));
+					list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_ZXFLAG));
+
+					return cb.and(list.toArray(new Predicate[] {}));
+				}
+				
+			};
+			List<GkjyrEntity> gkjyrlist = query.findAll(spec, GkjyrEntity.class);
+			JSONArray jsons=JSONArray.fromObject(gkjyrlist);
+			return jsons.toString();
+		}
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/MtxxService.java

@@ -0,0 +1,193 @@
+package com.cxfws.jyrxxgl.service.impl;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaBuilder.In;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.xml.ws.WebServiceContext;
+
+import net.sf.json.JSONArray;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.config.utils.CxfwsUtils;
+import com.cxfws.jyrxxgl.service.IMtxxService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.gkjcxx.gq.service.GqService;
+import com.xt.jygl.gkjcxx.mt.entity.MtEntity;
+import com.xt.jygl.gkjcxx.mt.service.MtService;
+import com.xt.jygl.gkjcxx.mt.vo.MtVo;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.user.dao.UserDao;
+import com.xtframe.sec.user.entity.UserEntity;
+import com.xtframe.util.StringUtils;
+/**
+ * 码头信息
+ */
+@Service("mtWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "mtWebServicePort", serviceName = "mtWebService")
+public class MtxxService extends BaseWebCtl implements IMtxxService{
+	@Autowired
+	private QueryService query;
+	@Autowired
+	private MtService mtService;
+	@Resource
+	private WebServiceContext wscontext;
+	@Autowired
+	private UserDao userdao;
+	@Autowired
+	private GqService gqService;
+	/**
+	 * 查询列表
+	 */
+	@Override
+	@WebMethod(operationName = "findMt", action = "http://service.web.jsjty.com/findMt")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findMt(final String szdid, final String szgkid, final String szgqid, final String mtmc, final String jyr, final String sfdwkfid, final String sfwhpid, final String fwlxid, final String mtyt) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		Specification<MtEntity> spec = new Specification<MtEntity>() {
+
+			@Override
+			public Predicate toPredicate(Root<MtEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+				if (StringUtils.isNotEmpty(mtmc)) {
+					list.add(cb.like(root.get("mtmc").as(String.class), "%" + mtmc + "%"));
+				} 
+				if (StringUtils.isNotEmpty(szgqid)) {
+					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
+				}
+
+				if (StringUtils.isNotEmpty(szgkid)) {
+					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+				}
+
+				if (StringUtils.isNotEmpty(szdid)) {
+					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+				}
+				if (StringUtils.isNotEmpty(jyr)) {
+					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + jyr + "%"));
+				}
+				if (StringUtils.isNotEmpty(sfdwkfid)) {
+					list.add(cb.like(root.get("sfdwkf").get("id").as(String.class), "%" + sfdwkfid + "%"));
+				}
+				if (StringUtils.isNotEmpty(sfwhpid)) {
+					list.add(cb.like(root.get("sfwhp").get("id").as(String.class), "%" + sfwhpid + "%"));
+				}
+				if (StringUtils.isNotEmpty(fwlxid)) {
+					list.add(cb.like(root.get("fwlx").get("id").as(String.class), "%" + fwlxid + "%"));
+				}
+				if (StringUtils.isNotEmpty(mtyt)) {
+					In<String> in = cb.in(root.get("mtyt").as(String.class));
+					String[] mtytStr = mtyt.split(",");
+					for(String tmp:mtytStr){
+						in.value(tmp);
+					}
+					list.add(in);
+				}
+				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
+				String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
+				UserEntity userEntity = userdao.findByUname(userName);
+				if (userEntity.getSsjyr()!=null) {
+					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
+				} else {
+					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
+					List<String> gqlist = gqService.findGqListByUserId(userEntity.getId());
+					if (gqlist != null && gqlist.size() > 0) {
+						for (int i = 0; i < gqlist.size(); i++) {
+							in.value(gqlist.get(i));
+						}
+						list.add(in);
+					}
+				}
+				//状态为0,9,10,11不显示
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_BGFLAG));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_ZXFLAG));
+				return cb.and(list.toArray(new Predicate[] {}));
+			}
+		};
+		List<MtEntity> mtlist = query.findAll(spec, MtEntity.class);
+		JSONArray jsons=JSONArray.fromObject(mtlist);
+		return jsons.toString();
+	}
+	/**
+	 * 根据id查详细
+	 */
+	@Override
+	public String findOne(String id) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		MtEntity entity = mtService.findOne(id);
+		MtVo vo = new MtVo();
+		if(entity!=null){
+		BeanUtils.copyProperties(entity, vo);
+		vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+		vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+		vo.setSfdwkfzw(entity.getSfdwkf() != null ? entity.getSfdwkf().getText() : "");
+		vo.setSfwhpzw(entity.getSfwhp() != null ? entity.getSfwhp().getText() : "");
+		vo.setMtsfwarszw(entity.getMtsfwars() != null ? entity.getMtsfwars().getText() : "");
+		vo.setFwlxzw(entity.getFwlx() != null ? entity.getFwlx().getText() : "");
+		/* vo.setMtytzw(entity.getMtyt()!=null?entity.getMtyt().getText():""); */
+		vo.setMtxsdmzw(entity.getMtxsdm() != null ? entity.getMtxsdm().getText() : "");
+		vo.setSzzyqzw(entity.getSzzyq() != null ? entity.getSzzyq().getZyqmc() : "");
+		vo.setSzaxzw(entity.getSzax() != null ? entity.getSzax().getAxmc() : "");
+
+		vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
+		vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
+		vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
+		vo.setSfdwkf(entity.getSfdwkf() != null ? entity.getSfdwkf().getId() : "");
+		vo.setSfwhp(entity.getSfwhp() != null ? entity.getSfwhp().getId() : "");
+		vo.setMtsfwars(entity.getMtsfwars() != null ? entity.getMtsfwars().getId() : "");
+		vo.setFwlx(entity.getFwlx() != null ? entity.getFwlx().getId() : "");
+		/* vo.setMtyt(entity.getMtyt()!=null?entity.getMtyt().getId():""); */
+		vo.setMtxsdm(entity.getMtxsdm() != null ? entity.getMtxsdm().getId() : "");
+		vo.setSzzyq(entity.getSzzyq() != null ? entity.getSzzyq().getId() : "");
+		vo.setSzax(entity.getSzax() != null ? entity.getSzax().getId() : "");
+		if (null != entity.getJcrq()) {
+			vo.setJcrqfmt(new SimpleDateFormat("yyyy-MM-dd").format(entity.getJcrq()));
+		}
+
+		String mtytName = "";
+		if (entity.getMtyt() != null) {
+			String[] mtytNameArray = entity.getMtyt().split(",");
+			/*
+			 * for (String m : mtytNameArray) { mtytName +=
+			 * codeService.findOne(m).getText() + " "; mtytName +=
+			 * securityMgr.codeService().findOne(m).getText() + " "; }
+			 */
+			for (int i = 0; i < mtytNameArray.length; i++) {
+				if (i != mtytNameArray.length - 1) {
+					mtytName += securityMgr.codeService().findOne(mtytNameArray[i]).getText() + ",";
+				} else {
+					mtytName += securityMgr.codeService().findOne(mtytNameArray[i]).getText();
+				}
+
+			}
+		}
+		vo.setMtytzw(mtytName);
+		}
+		JSONArray jsons=JSONArray.fromObject(vo);
+		return jsons.toString();
+	}
+
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/QytzxxService.java

@@ -0,0 +1,138 @@
+package com.cxfws.jyrxxgl.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaBuilder.In;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.xml.ws.WebServiceContext;
+
+import net.sf.json.JSONArray;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.config.utils.CxfwsUtils;
+import com.cxfws.jyrxxgl.service.IQytzxxService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.gkjcxx.gq.service.GqService;
+import com.xt.jygl.gkjygl.gkjyr.qytz.entity.QytzEntity;
+import com.xt.jygl.gkjygl.gkjyr.qytz.service.QytzService;
+import com.xt.jygl.gkjygl.gkjyr.qytz.vo.QytzVo;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.user.dao.UserDao;
+import com.xtframe.sec.user.entity.UserEntity;
+import com.xtframe.util.StringUtils;
+/**
+ * 企业投资信息  
+ */
+@Service("qytzWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "qytzWebServicePort", serviceName = "qytzWebService")
+public class QytzxxService extends BaseWebCtl implements IQytzxxService{
+	@Autowired
+	private QueryService query;
+	@Autowired
+	private QytzService qytzService;
+	@Resource
+	private WebServiceContext wscontext;
+	@Autowired
+	private UserDao userdao;
+	@Autowired
+	private GqService gqService;
+	/**
+	 * 企业投资信息列表
+	 */
+	@Override
+	@WebMethod(operationName = "findQytz", action = "http://service.web.jsjty.com/findQytz")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findQytz(final String szdid, final String szgkid, final String szgqid, final String jyr, final String tzrmc) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		Specification<QytzEntity> spec = new Specification<QytzEntity>() {
+
+			@Override
+			public Predicate toPredicate(Root<QytzEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+				if (StringUtils.isNotEmpty(tzrmc)) {
+					list.add(cb.like(root.get("tzrmc").as(String.class), "%" + tzrmc + "%"));
+				}
+				if (StringUtils.isNotEmpty(szdid)) {
+					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+				}
+				if (StringUtils.isNotEmpty(szgkid)) {
+					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+				}
+				if (StringUtils.isNotEmpty(szgqid)) {
+					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
+				}
+				if (StringUtils.isNotEmpty(jyr)) {
+					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + jyr + "%"));
+				}
+				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
+				String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
+				UserEntity userEntity = userdao.findByUname(userName);
+				if (userEntity.getSsjyr()!=null) {
+					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
+				} else {
+					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
+					List<String> gqlist = gqService.findGqListByUserId(userEntity.getId());
+					if (gqlist != null && gqlist.size() > 0) {
+						for (int i = 0; i < gqlist.size(); i++) {
+							in.value(gqlist.get(i));
+						}
+						list.add(in);
+					}
+				}
+				//状态为0,9,10,11不显示
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_BGFLAG));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_ZXFLAG));
+				return cb.and(list.toArray(new Predicate[] {}));
+			}
+		};
+		List<QytzEntity> qytzlist = query.findAll(spec, QytzEntity.class);
+		JSONArray jsons=JSONArray.fromObject(qytzlist);
+		return jsons.toString();
+	}
+	/**
+	 * 企业投资详情
+	 */
+	@Override
+	public String findOne(String id) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		QytzEntity entity = qytzService.findOne(id);
+		QytzVo vo = new QytzVo();
+		if(entity!=null){
+		BeanUtils.copyProperties(entity, vo);
+		vo.setSfws(entity.getSfws() != null ? entity.getSfws().getId() : "");
+		vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
+		vo.setJjlx(entity.getJjlx() != null ? entity.getJjlx().getId() : "");
+		vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
+		vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
+
+		vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+		vo.setSfwszw(entity.getSfws() != null ? entity.getSfws().getText() : "");
+		vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+		vo.setJjlxzw(entity.getJjlx() != null ? entity.getJjlx().getText() : "");
+		}
+		JSONArray jsons=JSONArray.fromObject(vo);
+		return jsons.toString();
+	}
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/SssbxxService.java

@@ -0,0 +1,146 @@
+package com.cxfws.jyrxxgl.service.impl;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaBuilder.In;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.xml.ws.WebServiceContext;
+
+import net.sf.json.JSONArray;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.config.utils.CxfwsUtils;
+import com.cxfws.jyrxxgl.service.ISssbxxService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.gkjcxx.gq.service.GqService;
+import com.xt.jygl.gkjygl.gkjyr.sssb.entity.SssbEntity;
+import com.xt.jygl.gkjygl.gkjyr.sssb.service.SssbService;
+import com.xt.jygl.gkjygl.gkjyr.sssb.vo.SssbVo;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.user.dao.UserDao;
+import com.xtframe.sec.user.entity.UserEntity;
+import com.xtframe.util.StringUtils;
+/**
+ * 设施设备信息 
+ */
+@Service("sssbWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "sssbWebServicePort", serviceName = "sssbWebService")
+public class SssbxxService extends BaseWebCtl implements ISssbxxService{
+	@Autowired
+	private QueryService query;
+	@Autowired
+	private SssbService sssbService;
+	@Resource
+	private WebServiceContext wscontext;
+	@Autowired
+	private UserDao userdao;
+	@Autowired
+	private GqService gqService;
+	/**
+	 * 根据查询条件查询设施设备信息列表
+	 */
+	@Override
+	@WebMethod(operationName = "findSssb", action = "http://service.web.jsjty.com/findSssb")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findSssb(final String szdid, final String szgkid, final String szgqid, final String jyr, final String ssmc) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		Specification<SssbEntity> spec = new Specification<SssbEntity>() {
+
+			@Override
+			public Predicate toPredicate(Root<SssbEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+				if (StringUtils.isNotEmpty(szdid)) {
+					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(szgkid)) {
+					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(szgqid)) {
+					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(jyr)) {
+					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + jyr + "%"));
+				} 
+				if (StringUtils.isNotEmpty(ssmc)) {
+					list.add(cb.like(root.get("ssmc").as(String.class), "%" + ssmc + "%"));
+				} 
+				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
+				String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
+				UserEntity userEntity = userdao.findByUname(userName);
+				if (userEntity.getSsjyr()!=null) {
+					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
+				} else {
+					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
+					List<String> gqlist = gqService.findGqListByUserId(userEntity.getId());
+					if (gqlist != null && gqlist.size() > 0) {
+						for (int i = 0; i < gqlist.size(); i++) {
+							in.value(gqlist.get(i));
+						}
+						list.add(in);
+					}
+				}
+				// 状态为0,9,10,11不显示
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_BGFLAG));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_ZXFLAG));
+				return cb.and(list.toArray(new Predicate[] {}));
+			}
+		};
+		List<SssbEntity> sssblist = query.findAll(spec, SssbEntity.class);
+		JSONArray jsons=JSONArray.fromObject(sssblist);
+		return jsons.toString();
+	}
+	/**
+	 * 根据id查询设施设备信息详情
+	 */
+	@Override
+	public String findOne(String id) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		SssbEntity entity = sssbService.findOne(id);
+		SssbVo vo = new SssbVo();
+		if(entity!=null){
+		BeanUtils.copyProperties(entity, vo);
+		vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+		vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+		vo.setYjflzw(entity.getYjfl() != null ? entity.getYjfl().getText() : "");
+		vo.setEjflzw(entity.getEjfl() != null ? entity.getEjfl().getText() : "");
+		vo.setSldwzw(entity.getSldw() != null ? entity.getSldw().getText() : "");
+		vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
+		vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
+		vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
+		vo.setYjfl(entity.getYjfl() != null ? entity.getYjfl().getId() : "");
+		vo.setEjfl(entity.getEjfl() != null ? entity.getEjfl().getId() : "");
+		vo.setSldw(entity.getSldw() != null ? entity.getSldw().getId() : "");
+		vo.setSzzyq(entity.getSzzyq() != null ? entity.getSzzyq().getId() : "");
+		vo.setSzzyqzw(entity.getSzzyq() != null ? entity.getSzzyq().getZyqmc() : "");
+		if (null != entity.getYxq()) {
+			vo.setYxqfmt(new SimpleDateFormat("yyyy-MM-dd").format(entity.getYxq()));
+		}
+		}
+		JSONArray jsons=JSONArray.fromObject(vo);
+		return jsons.toString();
+	}
+
+}

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/ZxjxxxService.java

@@ -0,0 +1,144 @@
+package com.cxfws.jyrxxgl.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaBuilder.In;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.xml.ws.WebServiceContext;
+
+import net.sf.json.JSONArray;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.config.utils.CxfwsUtils;
+import com.cxfws.jyrxxgl.service.IZxjxxxService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.gkjcxx.gq.service.GqService;
+import com.xt.jygl.gkjygl.gkjyr.zxjx.entity.ZxjxEntity;
+import com.xt.jygl.gkjygl.gkjyr.zxjx.service.ZxjxService;
+import com.xt.jygl.gkjygl.gkjyr.zxjx.vo.ZxjxVo;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.user.dao.UserDao;
+import com.xtframe.sec.user.entity.UserEntity;
+import com.xtframe.util.DateTime;
+import com.xtframe.util.StringUtils;
+/**
+ * 装卸机械信息
+ */
+@Service("zxjxWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "zxjxWebServicePort", serviceName = "zxjxWebService")
+public class ZxjxxxService extends BaseWebCtl implements IZxjxxxService{
+	@Autowired
+	private QueryService query;
+	@Autowired
+	private ZxjxService zxjxService;
+	@Resource
+	private WebServiceContext wscontext;
+	@Autowired
+	private UserDao userdao;
+	@Autowired
+	private GqService gqService;
+	/**
+	 * 装卸机械信息列表
+	 */
+	@Override
+	@WebMethod(operationName = "findZxjx", action = "http://service.web.jsjty.com/findZxjx")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findZxjx(final String szdid, final String szgkid, final String szgqid, final String jyr, final String jxlbmcid) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		Specification<ZxjxEntity> spec = new Specification<ZxjxEntity>() {
+
+			@Override
+			public Predicate toPredicate(Root<ZxjxEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+				if (StringUtils.isNotEmpty(jxlbmcid)) {
+					list.add(cb.like(root.get("jxlbmc").get("id").as(String.class), "%" + jxlbmcid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(szdid)) {
+					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(szgkid)) {
+					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+				}
+				if (StringUtils.isNotEmpty(szgqid)) {
+					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(jyr)) {
+					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + jyr + "%"));
+				} 
+				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
+				String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
+				UserEntity userEntity = userdao.findByUname(userName);
+				if (userEntity.getSsjyr()!=null) {
+					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
+				} else {
+					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
+					List<String> gqlist = gqService.findGqListByUserId(userEntity.getId());
+					if (gqlist != null && gqlist.size() > 0) {
+						for (int i = 0; i < gqlist.size(); i++) {
+							in.value(gqlist.get(i));
+						}
+						list.add(in);
+					}
+				}
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+				return cb.and(list.toArray(new Predicate[] {}));
+			}
+		};
+		List<ZxjxEntity> zxjxlist = query.findAll(spec, ZxjxEntity.class);
+		JSONArray jsons=JSONArray.fromObject(zxjxlist);
+		return jsons.toString();
+	}
+	/**
+	 * 装卸机械信息详细
+	 */
+	@Override
+	public String findOne(String id) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		ZxjxEntity entity = zxjxService.findOne(id);
+		ZxjxVo vo = new ZxjxVo();
+		if(entity!=null){
+		BeanUtils.copyProperties(entity, vo);
+		vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
+		vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
+		vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
+		vo.setJxlbmc(entity.getJxlbmc() != null ? entity.getJxlbmc().getId() : "");
+		vo.setSzzyq(entity.getSzzyq() != null ? entity.getSzzyq().getId() : "");
+		vo.setSyq(entity.getSyq() != null ? entity.getSyq().getId() : "");
+		
+		vo.setSyqzw(entity.getSyq() != null ? entity.getSyq().getText() : "");
+		vo.setSzzyqzw(entity.getSzzyq() != null ? entity.getSzzyq().getZyqmc() : "");
+		vo.setJxlbmczw(entity.getJxlbmc() != null ? entity.getJxlbmc().getText() : "");
+		vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+		vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+		vo.setXkzid((entity.getXkzid() != null ? entity.getXkzid() : ""));
+		if (null != entity.getSyqxsta()) {
+			vo.setSyqxstafmt(DateTime.toString(entity.getSyqxsta()));
+		}
+		if (null != entity.getSyqxend()) {
+			vo.setSyqxendfmt(DateTime.toString(entity.getSyqxend()));
+		}
+		}
+		JSONArray jsons=JSONArray.fromObject(vo);
+		return jsons.toString();
+	}
+}

gkjsjy/trunk/src/com/cxfws/sjtjfx/service/IDcttltjWebService.java

@@ -0,0 +1,12 @@
+package com.cxfws.sjtjfx.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace="http://service.web.jsjty.com/",portName="dcttltjWebServicePort",serviceName="dcttltjWebService")
+public interface IDcttltjWebService {
+	@WebMethod(operationName = "findDcttltj", action = "http://service.web.jsjty.com/findDcttltj")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findDcttltj(String startDate, String endDate, String nwmid, String szdid, String szgkid, String szgqid, String jcgid, String dydlid, String dedlid);
+}

gkjsjy/trunk/src/com/cxfws/sjtjfx/service/IGkaxzytjWebService.java

@@ -0,0 +1,12 @@
+package com.cxfws.sjtjfx.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace="http://service.web.jsjty.com/",portName="gkaxzytjWebServicePort",serviceName="gkaxzytjWebService")
+public interface IGkaxzytjWebService {
+	@WebMethod(operationName = "lylcharts", action = "http://service.web.jsjty.com/lylcharts")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String lylcharts(String type , String year, String zone, String code);
+}

gkjsjy/trunk/src/com/cxfws/sjtjfx/service/IGkjcssjsfxWebService.java

@@ -0,0 +1,12 @@
+package com.cxfws.sjtjfx.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace="http://service.web.jsjty.com/",portName="gkjcssjsfxWebServicePort",serviceName="gkjcssjsfxWebService")
+public interface IGkjcssjsfxWebService {
+	@WebMethod(operationName = "findGkjcssjsfx", action = "http://service.web.jsjty.com/findGkjcssjsfx")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findGkjcssjsfx(String xmlxid, String tzlxid);
+}

gkjsjy/trunk/src/com/cxfws/sjtjfx/service/IGkttlfxWebService.java

@@ -0,0 +1,12 @@
+package com.cxfws.sjtjfx.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace="http://service.web.jsjty.com/",portName="gkttlfxWebServicePort",serviceName="gkttlfxWebService")
+public interface IGkttlfxWebService {
+	@WebMethod(operationName = "findGkttlfx", action = "http://service.web.jsjty.com/findGkttlfx")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findGkttlfx(String startDate, String szdid, String szgkid, String szgqid, String dydlid, String dedlid);
+}

gkjsjy/trunk/src/com/cxfws/sjtjfx/service/IHxhbtjWebService.java

@@ -0,0 +1,13 @@
+package com.cxfws.sjtjfx.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace="http://service.web.jsjty.com/",portName="hxhbtjWebServicePort",serviceName="hxhbtjWebService")
+public interface IHxhbtjWebService {
+	@WebMethod(operationName = "findHxhbtj", action = "http://service.web.jsjty.com/findHxhbtj")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findHxhbtj(String rq, String szgkid);
+
+}

gkjsjy/trunk/src/com/cxfws/sjtjfx/service/IZysbybWebService.java

@@ -0,0 +1,16 @@
+package com.cxfws.sjtjfx.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace="http://service.web.jsjty.com/",portName="zysbybWebServicePort",serviceName="zysbybWebService")
+public interface IZysbybWebService {
+	@WebMethod(operationName = "findZysbyb", action = "http://service.web.jsjty.com/findZysbyb")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findZysbyb(String gkjyr, String szdid, String szgkid, String jcgid, String nwmid, String dydlid, String zysjq, String zysjz);
+	
+	@WebMethod(operationName = "findOne", action = "http://service.web.jsjty.com/findOne")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findOne(String id);
+}

gkjsjy/trunk/src/com/cxfws/sjtjfx/service/impl/DcttltjWebService.java

@@ -0,0 +1,181 @@
+package com.cxfws.sjtjfx.service.impl;
+
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.List;
+
+import javax.jws.WebService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.sjtjfx.service.IDcttltjWebService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.common.GlobalData;
+import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.service.DcsbService;
+import com.xt.jygl.gkyxtjyfx.dcttltj.vo.DcttltjVo;
+import com.xtframe.util.StringUtils;
+
+@Service("dcttltjWebService")
+@WebService(targetNamespace="http://service.web.jsjty.com/",portName="dcttltjWebServicePort",serviceName="dcttltjWebService")
+public class DcttltjWebService extends BaseWebCtl implements IDcttltjWebService {
+	
+	@Autowired
+	private DcsbService dcsbService;
+
+	/**
+	 * 获取单船吞吐量统计
+	 * @throws ParseException 
+	 */
+
+	@Override
+	public String findDcttltj(String startDateStr, String endDateStr, String nwmid, String szdid, String szgkid, String szgqid, String jcgid, String dydlid, String dedlid){ 
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		Date startDate = null;
+		Date endDate = null;
+		try  
+		{  
+			startDate = sdf.parse(startDateStr);
+			endDate = sdf.parse(endDateStr);
+		}  
+		catch (ParseException e)  
+		{  
+		    System.out.println(e.getMessage());  
+		}  
+		
+		Calendar cal = Calendar.getInstance();
+		cal.set(GregorianCalendar.DAY_OF_MONTH, 1);
+		Date beginTime = cal.getTime();
+		Date dNow = new Date();
+		cal.setTime(dNow);
+		Date endTime = cal.getTime();
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy年MM月");
+		List<DcttltjVo> list = new ArrayList<DcttltjVo>();
+		if("900".equals(GlobalData.CITY_CODE)){
+			if(StringUtils.isNotEmpty(szgqid)||StringUtils.isNotEmpty(szgkid)){
+				List<Object> dcttltjlist = dcsbService.tongjicityValue(startDate == null ? sdf.format(beginTime) : sdf.format(startDate), 
+						endDate == null ? sdf.format(endTime) : sdf.format(endDate),
+								nwmid == null ? "" : nwmid,dydlid == null ? "" : dydlid,szdid==null?"":szdid,szgkid==null?"":szgkid,szgqid==null?"":szgqid,jcgid==null?"":jcgid,dedlid==null?"":dedlid);
+				for (Object entity : dcttltjlist) {
+					Object[] e = (Object[]) entity;
+					DcttltjVo vo = new DcttltjVo();
+					vo.setSbsl(e[0].toString());
+					vo.setSzd((String) e[1]);
+					vo.setSum(e[2].toString());
+					list.add(vo);
+				}	
+			}else{
+			List<Object> dcttltjlist = dcsbService.tongjiproValue(startDate == null ? sdf.format(beginTime) : sdf.format(startDate), 
+					endDate == null ? sdf.format(endTime) : sdf.format(endDate),
+							nwmid == null ? "" : nwmid,dydlid == null ? "" : dydlid,szdid==null?"":szdid,szgkid==null?"":szgkid,szgqid==null?"":szgqid,jcgid==null?"":jcgid,dedlid==null?"":dedlid);
+			for (Object entity : dcttltjlist) {
+				Object[] e = (Object[]) entity;
+				DcttltjVo vo = new DcttltjVo();
+				vo.setSbsl(e[0].toString());
+				vo.setSzd((String) e[1]);
+				vo.setSum(e[2].toString());
+				list.add(vo);
+			}	
+			}
+		}else{
+			List<Object> dcttltjlist = dcsbService.tongjicityValue(startDate == null ? sdf.format(beginTime) : sdf.format(startDate), 
+					endDate == null ? sdf.format(endTime) : sdf.format(endDate),
+							nwmid == null ? "" : nwmid,dydlid == null ? "" : dydlid,szdid==null?"":szdid,szgkid==null?"":szgkid,szgqid==null?"":szgqid,jcgid==null?"":jcgid,dedlid==null?"":dedlid);
+			
+			for (Object entity : dcttltjlist) {
+				Object[] e = (Object[]) entity;
+				DcttltjVo vo = new DcttltjVo();
+				vo.setSbsl(e[0].toString());
+				vo.setSzd((String) e[1]);
+				vo.setSum(e[2].toString());
+				list.add(vo);
+			}	
+		}
+		//表
+		List<DcttltjVo> voList = new ArrayList<DcttltjVo>();
+		List<Object> listtb = dcsbService.dcsbtjbg(startDate == null ? sdf.format(beginTime) : sdf.format(startDate), 
+				endDate == null ? sdf.format(endTime) : sdf.format(endDate), dydlid == null ? "" : dydlid, nwmid == null ? "" : nwmid
+						, szdid==null?"":szdid, szgkid==null ?"":szgkid, szgqid== null ?"":szgqid, jcgid==null?"":jcgid);
+		List<Object> listtb2 = dcsbService.dcsbtjbg2(startDate == null ? sdf.format(beginTime) : sdf.format(startDate), 
+				endDate == null ? sdf.format(endTime) : sdf.format(endDate), dedlid == null ? "" : dedlid, nwmid == null ? "" : nwmid
+						, szdid==null?"":szdid, szgkid==null ?"":szgkid, szgqid== null ?"":szgqid, jcgid==null?"":jcgid);
+		/*for(int i=0;i<listtb2.size();i++){
+			Object[] e=(Object[]) listtb2.get(i);
+			e[0] = "        "+e[0];
+			
+		}*/
+		//合并两个list，把所有第二大类放到相应的第一大类下
+		listtb.add(17, listtb2.get(22));
+		listtb.add(17, listtb2.get(21));
+		listtb.add(17, listtb2.get(20));
+		listtb.add(16, listtb2.get(19));
+		listtb.add(15, listtb2.get(18));
+		listtb.add(15, listtb2.get(17));
+		listtb.add(15, listtb2.get(16));
+		listtb.add(13, listtb2.get(15));
+		listtb.add(13, listtb2.get(14));
+		listtb.add(11, listtb2.get(13));
+		listtb.add(11, listtb2.get(12));
+		listtb.add(11, listtb2.get(11));
+		listtb.add(11, listtb2.get(10));
+		listtb.add(8, listtb2.get(9));
+		listtb.add(7, listtb2.get(8));
+		listtb.add(5, listtb2.get(7));
+		listtb.add(4, listtb2.get(6));
+		listtb.add(4, listtb2.get(5));
+		listtb.add(3, listtb2.get(4));
+		listtb.add(2, listtb2.get(3));
+		listtb.add(2, listtb2.get(2));
+		listtb.add(2, listtb2.get(1));
+		listtb.add(1, listtb2.get(0));
+		
+		for(int i=listtb.size();i>0;i--){
+			Object[] e = (Object[]) listtb.get(listtb.size()-i);
+			DcttltjVo vo = new DcttltjVo();
+			vo.setHwzl(e[0].toString());
+			vo.setJgnmzysl(null!=e[1]?new BigDecimal(e[1].toString()).doubleValue():0);
+			vo.setJgwmzysl(null!=e[2]?new BigDecimal(e[2].toString()).doubleValue():0);
+			vo.setCgnmzysl(null!=e[3]?new BigDecimal(e[3].toString()).doubleValue():0);
+			vo.setCgwmzysl(null!=e[4]?new BigDecimal(e[4].toString()).doubleValue():0);
+			vo.setCghj((vo.getCgnmzysl()==null?0:vo.getCgnmzysl()) + (vo.getCgwmzysl()==null?0:vo.getCgwmzysl()));
+			vo.setJghj((vo.getJgnmzysl()==null?0:vo.getJgnmzysl()) + (vo.getJgwmzysl()==null?0:vo.getJgwmzysl()));
+			vo.setNmhj((vo.getCgnmzysl()==null?0:vo.getCgnmzysl()) + (vo.getJgnmzysl()==null?0:vo.getJgnmzysl()));
+			vo.setWmhj((vo.getCgwmzysl()==null?0:vo.getCgwmzysl()) + (vo.getJgwmzysl()==null?0:vo.getJgwmzysl()));
+			vo.setHj((vo.getNmhj()==null?0:vo.getNmhj()) + (vo.getWmhj()==null?0:vo.getWmhj()));
+			/*if("原油".equals(vo.getHwzl())){
+			   DcttltjVo.yyjgnm=vo.getJgnmzysl();
+			   DcttltjVo.yyjgwm=vo.getJgwmzysl();
+			   DcttltjVo.yycgnm=vo.getCgnmzysl();
+			   DcttltjVo.yycgwm=vo.getCgwmzysl();
+			}
+			if("石油、天然气、及制品".equals(vo.getHwzl())){
+			   vo.setJgnmzysl(vo.getJgnmzysl()+DcttltjVo.yyjgnm);
+			   vo.setJgwmzysl(vo.getJgwmzysl()+DcttltjVo.yyjgwm);
+			   vo.setCgnmzysl(vo.getCgnmzysl()+DcttltjVo.yycgnm);
+			   vo.setCgwmzysl(vo.getCgwmzysl()+DcttltjVo.yycgwm);
+			}
+			if("铁矿石".equals(vo.getHwzl())){
+			   DcttltjVo.tksjgnm=vo.getJgnmzysl();
+			   DcttltjVo.tksjgwm=vo.getJgwmzysl();
+			   DcttltjVo.tkscgnm=vo.getCgnmzysl();
+			   DcttltjVo.tkscgwm=vo.getCgwmzysl();
+			}
+			if("金属矿石".equals(vo.getHwzl())){
+			   vo.setJgnmzysl(vo.getJgnmzysl()+DcttltjVo.tksjgnm);
+			   vo.setJgwmzysl(vo.getJgwmzysl()+DcttltjVo.tksjgwm);
+			   vo.setCgnmzysl(vo.getCgnmzysl()+DcttltjVo.tkscgnm);
+			   vo.setCgwmzysl(vo.getCgwmzysl()+DcttltjVo.tkscgwm);
+			}*/
+			voList.add(vo);
+		}
+		return Object2JsonStr(voList);
+	}
+}

gkjsjy/trunk/src/com/cxfws/sjtjfx/service/impl/GkaxzytjWebService.java

@@ -0,0 +1,39 @@
+package com.cxfws.sjtjfx.service.impl;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.jws.WebService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.sjtjfx.service.IGkaxzytjWebService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.entity.DcsbybbEntity;
+import com.xt.jygl.lyl.service.LylService;
+
+@Service("gkaxzytjWebService")
+@WebService(targetNamespace="http://service.web.jsjty.com/",portName="gkaxzytjWebServicePort",serviceName="gkaxzytjWebService")
+public class GkaxzytjWebService extends BaseWebCtl implements IGkaxzytjWebService {
+
+	@Autowired
+	private LylService lylService;
+	@Override
+	public String lylcharts(String type, String year, String zone, String code) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		Map<String,Object> map=new HashMap<String,Object>();
+		map.put("type", type);
+		map.put("bgsj", year);
+		map.put("zone", zone);
+		map.put("code", code);
+		
+		List<DcsbybbEntity> list = (List<DcsbybbEntity>) lylService.findListData(map);
+		return Object2JsonStr(list);
+	}
+
+	
+}

gkjsjy/trunk/src/com/cxfws/sjtjfx/service/impl/GkjcssjsfxWebService.java

@@ -0,0 +1,60 @@
+package com.cxfws.sjtjfx.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jws.WebService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.sjtjfx.service.IGkjcssjsfxWebService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.common.GlobalData;
+import com.xt.jygl.gkjsgl.tzjhgl.service.TzjhglService;
+import com.xt.jygl.gkyxtjyfx.gkjcssjsfx.vo.GkjcssjsfxVo;
+import com.xtframe.util.StringUtils;
+
+@Service("gkjcssjsfxWebService")
+@WebService(targetNamespace="http://service.web.jsjty.com/",portName="gkjcssjsfxWebServicePort",serviceName="gkjcssjsfxWebService")
+public class GkjcssjsfxWebService extends BaseWebCtl implements IGkjcssjsfxWebService {
+	@Autowired
+	private TzjhglService tzjhglService;
+	@Override
+	public String findGkjcssjsfx(String xmlxid, String tzlxid) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		List<GkjcssjsfxVo> list = new ArrayList<GkjcssjsfxVo>();
+		if ("900".equals(GlobalData.CITY_CODE)) {
+			List<Object> tzjhgllist = tzjhglService.tongjiproValue(StringUtils.isEmpty(xmlxid) ? "" : xmlxid, StringUtils.isEmpty(tzlxid) ? "" : tzlxid);
+			for (Object entity : tzjhgllist) {
+				Object[] e = (Object[]) entity;
+				GkjcssjsfxVo vo = new GkjcssjsfxVo();
+				vo.setZtz(StringUtils.isEmpty(String.valueOf(e[1])) ? "0" : String.valueOf(e[1]));
+				vo.setSzd(String.valueOf(e[0]));
+				list.add(vo);
+			}
+		} else {
+			List<Object> tzjhgllist = tzjhglService.tongjicityValue(StringUtils.isEmpty(xmlxid) ? "" : xmlxid, StringUtils.isEmpty(tzlxid) ? "" : tzlxid);
+			for (Object entity : tzjhgllist) {
+				Object[] e = (Object[]) entity;
+				GkjcssjsfxVo vo = new GkjcssjsfxVo();
+				if(e[1]==null){
+					vo.setZtz("--");
+				}else if(StringUtils.isEmpty(e[1])){
+					vo.setZtz("0");	
+				}else{
+					vo.setZtz(e[1].toString());
+				}
+				vo.setSzd(String.valueOf(e[0]));
+				list.add(vo);
+			}
+		}
+		
+		return Object2JsonStr(list);
+	}
+
+	
+	
+}

gkjsjy/trunk/src/com/cxfws/sjtjfx/service/impl/GkttlfxWebService.java

@@ -0,0 +1,266 @@
+package com.cxfws.sjtjfx.service.impl;
+
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+import javax.jws.WebService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.sjtjfx.service.IGkttlfxWebService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
+import com.xt.jygl.gkjcxx.gk.service.GkService;
+import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
+import com.xt.jygl.gkjcxx.gq.service.GqService;
+import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.service.DcsbybbService;
+import com.xt.jygl.gkyxtjyfx.gkttlfx.vo.GkttlfxVo;
+import com.xt.jygl.gkyxtjyfx.gkttlfx.vo.SttlVo;
+import com.xtframe.core.support.SecurityMgr;
+import com.xtframe.sec.user.entity.UserEntity;
+import com.xtframe.util.StringUtils;
+
+@Service("gkttlfxWebService")
+@WebService(targetNamespace="http://service.web.jsjty.com/",portName="gkttlfxWebServicePort",serviceName="gkttlfxWebService")
+public class GkttlfxWebService extends BaseWebCtl implements IGkttlfxWebService {
+
+	@Autowired
+	private SecurityMgr securityMgr;
+	@Autowired
+	private GkService gkService;
+	@Autowired
+	private GqService gqService;
+	@Autowired
+	private DcsbybbService dcsbybbService;
+	@Override
+	public String findGkttlfx(String startDate, String szdid, String szgkid, String szgqid, String dydlid, String dedlid) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		
+		Date beginTime = null;
+		Date yearTime = null;
+		Date monthTime = null;
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+		SimpleDateFormat sdfy = new SimpleDateFormat("yyyy");
+		SimpleDateFormat sdfm = new SimpleDateFormat("MM");
+		if (StringUtils.isEmpty(startDate)) {
+			Calendar cal = Calendar.getInstance();
+			cal.add(Calendar.YEAR, -1); // 年份减1
+			yearTime = cal.getTime();
+
+			Date dNow = new Date();
+			cal.setTime(dNow);
+			beginTime = cal.getTime();
+
+			cal.setTime(dNow);
+			cal.add(Calendar.MONTH, -1);
+			monthTime = cal.getTime();
+		} else {
+			try {
+				beginTime = sdf.parse(startDate);
+				String year = sdfy.format(beginTime);
+				int y = Integer.parseInt(year) - 1;
+
+				yearTime = sdf.parse(y + startDate.substring(4));
+
+				String month = sdfm.format(beginTime);
+				if (month.substring(0, 1).equals("0")) {
+					month = month.substring(1);
+				}
+				if ("1".equals(month)) {
+					monthTime = sdf.parse(y + "-12");
+				} else {
+					int m = Integer.parseInt(month) - 1;
+					if (m > 9) {
+						monthTime = sdf.parse(startDate.substring(0, 5) + m);
+					} else {
+						monthTime = sdf.parse(startDate.substring(0, 5) + "0" + m);
+					}
+				}
+
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
+
+		}
+		UserEntity user = securityMgr.getCurrUser();
+		if (StringUtils.isEmpty(szdid)) {
+			szdid = user.getSzd().getId();
+		}
+		// 图形数据
+		List<GkttlfxVo> list = new ArrayList<GkttlfxVo>();
+		if (szdid.length() < 4 && StringUtils.isEmpty(szgkid)) {
+			szdid = null;
+			List<Object> nlist = dcsbybbService.sumZyslBySzgk(dydlid, sdf.format(beginTime), sdf.format(monthTime), sdf.format(yearTime), null, szgkid, null,dedlid);
+			if (nlist != null && nlist.size() > 0) {
+				for (Object ob : nlist) {
+					Object[] e = (Object[]) ob;
+					GkttlfxVo vo = new GkttlfxVo();
+					String id = e[0].toString();
+					GkEntity gk = gkService.findOne(id);
+					vo.setName(gk.getGkmc());
+					vo.setZttl(e[1].toString());
+					vo.setHwttltb(e[2].toString());
+					vo.setHwttlhb(e[3].toString());
+					list.add(vo);
+				}
+			}
+		} else {
+			List<Object> nlist = dcsbybbService.sumZyslBySzgq(dydlid, sdf.format(beginTime), sdf.format(monthTime), sdf.format(yearTime), null, szgkid, szgqid,dedlid);
+			if (nlist != null && nlist.size() > 0) {
+				for (Object ob : nlist) {
+					Object[] e = (Object[]) ob;
+					GkttlfxVo vo = new GkttlfxVo();
+					String id = e[0].toString();
+					GqEntity gq = gqService.findOne(id);
+					vo.setName(gq.getGqmc());
+					vo.setZttl(e[1].toString());
+					vo.setHwttltb(e[2].toString());
+					vo.setHwttlhb(e[3].toString());
+					list.add(vo);
+				}
+			}
+		}
+		List<SttlVo> slist = new ArrayList<SttlVo>();
+		SttlVo sum = new SttlVo();
+		List<Object> ttllist = dcsbybbService.sum(sdf.format(beginTime), sdf.format(monthTime), sdf.format(yearTime), null, szgkid, szgqid,dydlid);
+		List<Object> ttllist2 = dcsbybbService.sum2(sdf.format(beginTime), sdf.format(monthTime), sdf.format(yearTime), null, szgkid, szgqid,dedlid);
+		List<Object> allList = new ArrayList<Object>();
+		//合并两个list，把所有第二大类放到相应的第一大类下
+		allList.add(ttllist.get(0));
+		allList.add(ttllist2.get(0));
+		
+		allList.add(ttllist.get(1));
+		allList.add(ttllist2.get(1));
+		allList.add(ttllist2.get(2));
+		allList.add(ttllist2.get(3));
+		
+		allList.add(ttllist.get(2));
+		allList.add(ttllist2.get(4));
+		
+		allList.add(ttllist.get(3));
+		allList.add(ttllist2.get(5));
+		allList.add(ttllist2.get(6));
+		
+		allList.add(ttllist.get(4));
+		allList.add(ttllist2.get(7));
+		
+		allList.add(ttllist.get(5));
+		
+		allList.add(ttllist.get(6));
+		allList.add(ttllist2.get(8));
+		
+		allList.add(ttllist.get(7));
+		allList.add(ttllist2.get(9));
+		
+		allList.add(ttllist.get(8));
+		
+		allList.add(ttllist.get(9));
+		
+		allList.add(ttllist.get(10));
+		allList.add(ttllist2.get(10));
+		allList.add(ttllist2.get(11));
+		allList.add(ttllist2.get(12));
+		allList.add(ttllist2.get(13));
+		
+		allList.add(ttllist.get(11));
+		
+		allList.add(ttllist.get(12));
+		allList.add(ttllist2.get(14));
+		allList.add(ttllist2.get(15));
+		
+		allList.add(ttllist.get(13));
+		
+		allList.add(ttllist.get(14));
+		allList.add(ttllist2.get(16));
+		allList.add(ttllist2.get(17));
+		allList.add(ttllist2.get(18));
+		
+		allList.add(ttllist.get(15));
+		allList.add(ttllist2.get(19));
+		
+		allList.add(ttllist.get(16));
+		allList.add(ttllist2.get(20));
+		allList.add(ttllist2.get(21));
+		allList.add(ttllist2.get(22));
+		
+		if (ttllist != null && ttllist.size() > 0) {
+			for (int i = 0; i < allList.size(); i++) {
+				Object[] e = (Object[]) allList.get(i);
+				SttlVo vo = new SttlVo();
+				vo.setHwzlname(e[0].toString());
+				vo.setZttl(e[1].toString());
+				vo.setZtb(e[2].toString());
+				vo.setZhb(e[3].toString());
+				vo.setJgttl(e[4].toString());
+				vo.setJgtb(e[5].toString());
+				vo.setJghb(e[6].toString());
+				vo.setCgttl(e[7].toString());
+				vo.setCgtb(e[8].toString());
+				vo.setCghb(e[9].toString());
+				slist.add(vo);
+			}
+			BigDecimal zttl = new BigDecimal("0.0000");
+			BigDecimal ztb = new BigDecimal("0.0000");
+			BigDecimal zhb = new BigDecimal("0.0000");
+			BigDecimal jgttl = new BigDecimal("0.0000");
+			BigDecimal jgtb = new BigDecimal("0.0000");
+			BigDecimal jghb = new BigDecimal("0.0000");
+			BigDecimal cgttl = new BigDecimal("0.0000");
+			BigDecimal cgtb = new BigDecimal("0.0000");
+			BigDecimal cghb = new BigDecimal("0.0000");
+			for (int i = 0; i < ttllist.size(); i++) {
+				Object[] e = (Object[]) ttllist.get(i);
+				SttlVo vo = new SttlVo();
+				vo.setHwzlname(e[0].toString());
+				vo.setZttl(e[1].toString());
+				BigDecimal b = (BigDecimal) e[1];
+				zttl = zttl.add(b);
+				vo.setZtb(e[2].toString());
+				b = (BigDecimal) e[2];
+				ztb = ztb.add(b);
+				vo.setZhb(e[3].toString());
+				b = (BigDecimal) e[3];
+				zhb = zhb.add(b);
+				vo.setJgttl(e[4].toString());
+				b = (BigDecimal) e[4];
+				jgttl = jgttl.add(b);
+				vo.setJgtb(e[5].toString());
+				b = (BigDecimal) e[5];
+				jgtb = jgtb.add(b);
+				vo.setJghb(e[6].toString());
+				b = (BigDecimal) e[6];
+				jghb = jghb.add(b);
+				vo.setCgttl(e[7].toString());
+				b = (BigDecimal) e[7];
+				cgttl = cgttl.add(b);
+				vo.setCgtb(e[8].toString());
+				b = (BigDecimal) e[8];
+				cgtb = cgtb.add(b);
+				vo.setCghb(e[9].toString());
+				b = (BigDecimal) e[9];
+				cghb = cghb.add(b);
+				slist.add(vo);
+			}
+			sum.setZttl(zttl.toString());
+			sum.setZhb(zhb.toString());
+			sum.setZtb(ztb.toString());
+			sum.setJgttl(jgttl.toString());
+			sum.setJghb(jghb.toString());
+			sum.setJgtb(jgtb.toString());
+			sum.setCgttl(cgttl.toString());
+			sum.setCghb(cghb.toString());
+			sum.setCgtb(cgtb.toString());
+		}
+		return Object2JsonStr(slist);
+	}
+	
+	
+}

gkjsjy/trunk/src/com/cxfws/sjtjfx/service/impl/HxhbtjWebService.java

@@ -0,0 +1,280 @@
+package com.cxfws.sjtjfx.service.impl;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+import javax.jws.WebService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.sjtjfx.service.IHxhbtjWebService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.ggfwxxgl.hxgl.service.HxglService;
+import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
+import com.xt.jygl.gkjcxx.gk.service.GkService;
+import com.xt.jygl.gkyxtjyfx.hxhbtj.vo.HxhbtjVo;
+import com.xtframe.core.support.SecurityMgr;
+import com.xtframe.util.StringUtils;
+
+@Service("hxhbtjWebService")
+@WebService(targetNamespace="http://service.web.jsjty.com/",portName="hxhbtjWebServicePort",serviceName="hxhbtjWebService")
+public class HxhbtjWebService extends BaseWebCtl implements IHxhbtjWebService {
+
+	@Autowired
+	private HxglService hxglService;
+	@Autowired
+	private SecurityMgr securityMgr;
+	@Autowired
+	private GkService gkService;
+	
+	@Override
+	public String findHxhbtj(String rq, String szgkid) {/*
+				if (!this.checkUser()){
+					return BaseWebCtl.NOLOGIN;
+				}
+		
+				//取到所在地下第一个所在港口
+				List<GkEntity> list = gkService.findBySzd(securityMgr.getCurrUser().getSzd()!=null?securityMgr.getCurrUser().getSzd().getId():"");
+				String dftszgk="";
+				if(list.size()>0){
+					dftszgk=list.get(0).getId();
+				}
+				Date date=new Date();
+				//本月数据
+				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM");
+				String benyue = sdf.format(date);
+				Object[] ob=(Object[]) hxglService.bywcltj(StringUtils.isEmpty(rq)?benyue:rq, StringUtils.isEmpty(szgkid)?dftszgk:szgkid);
+				HxhbtjVo vo=new HxhbtjVo();
+				vo.setBywcl(ob[0]!=null?(ob[0].toString()):"");
+				vo.setBynmwcl(ob[1]!=null?(ob[1].toString()):"");
+				vo.setBywmwcl(ob[2]!=null?(ob[2].toString()):"");
+				//本年数据
+				SimpleDateFormat sdf2=new SimpleDateFormat("yyyy");
+				String bennian=sdf2.format(date);
+				String rq2="";
+				if(!StringUtils.isEmpty(rq)){
+					rq2=rq.substring(0,4);
+				}
+				Object[] ob2=(Object[]) hxglService.bnljltj(StringUtils.isEmpty(rq2)?bennian:rq2, StringUtils.isEmpty(szgkid)?dftszgk:szgkid);
+				vo.setBnljl(ob2[0]!=null?(ob2[0].toString()):"");
+				vo.setBnnmljl(ob2[1]!=null?(ob2[1].toString()):"");
+				vo.setBnwmljl(ob2[2]!=null?(ob2[2].toString()):"");
+				//同比增长数
+				String lastyear="";
+				if(StringUtils.isEmpty(rq)){
+					Integer i = Integer.parseInt(benyue.substring(0, 4))-1;
+					lastyear=i+benyue.substring(4, 7);	
+				}else{
+					Integer i = Integer.parseInt(rq.substring(0, 4))-1;
+					lastyear=i+rq.substring(4, 7);	
+				}
+				Object[] ob3=(Object[]) hxglService.tbzzs(StringUtils.isEmpty(rq)?benyue:rq,lastyear, StringUtils.isEmpty(szgkid)?dftszgk:szgkid);
+				vo.setTbzzs(ob3[0]!=null?(String.format("%.2f", ob3[0])+"%"):"- -");
+				vo.setNmtbzzs(ob3[1]!=null?(String.format("%.2f", ob3[1])+"%"):"- -");
+				vo.setWmtbzzs(ob3[2]!=null?(String.format("%.2f", ob3[2])+"%"):"- -");
+				//航线航班本月营运航线
+				List<Object> list1=hxglService.hxhbyytj(StringUtils.isEmpty(rq)?benyue:rq, StringUtils.isEmpty(szgkid)?dftszgk:szgkid);
+				vo.setByyyhxzs1(()list1.get(0));
+				vo.setByyyhxzs2(list1.get(1).toString());
+				vo.setByyyhxzs3(list1.get(2).toString());
+				vo.setByyyhxzs4(list1.get(3).toString());
+				//本月航班数量按照航线类型分组
+				List<Object> list2=hxglService.hbyytj(StringUtils.isEmpty(rq)?benyue:rq, StringUtils.isEmpty(szgkid)?dftszgk:szgkid);
+				vo.setByyyhbzs1(list2.get(0).toString());
+				vo.setByyyhbzs2(list2.get(1).toString());
+				vo.setByyyhbzs3(list2.get(2).toString());
+				vo.setByyyhbzs4(list2.get(3).toString());
+				//本月停航航班数量按照航线类型分组
+				List<Object> list3=hxglService.bytyhxs(StringUtils.isEmpty(rq)?benyue:rq, StringUtils.isEmpty(szgkid)?dftszgk:szgkid);
+				vo.setBytkhxs1(list3.get(0).toString());
+				vo.setBytkhxs2(list3.get(1).toString());
+				vo.setBytkhxs3(list3.get(2).toString());
+				vo.setBytkhxs4(list3.get(3).toString());
+				//按照日期统计所有本月航线(名称)
+				List<HxglEntity> hxgl=hxglService.findByRqAndSzgk(StringUtils.isEmpty(rq)?benyue:rq,StringUtils.isEmpty(szgkid)?dftszgk:szgkid);
+				String lastmonth="";
+				if(StringUtils.isEmpty(rq)){
+					Integer i = Integer.parseInt(benyue.substring(5, 7))-1;
+					if(i<10){
+					lastmonth=benyue.substring(0, 5)+"0"+i;
+					}else{
+					lastmonth=benyue.substring(0, 5)+i;		
+					}
+				}else{
+					Integer i = Integer.parseInt(rq.substring(5, 7))-1;
+					if(i<10){
+					lastmonth=rq.substring(0, 5)+"0"+i;
+					}else{
+					lastmonth=rq.substring(0, 5)+i;		
+					}
+				}
+				//按照日期统计所有上个月月航线(名称)
+				List<HxglEntity> lasthxgl=hxglService.findByRqAndSzgk(lastmonth,StringUtils.isEmpty(szgkid)?dftszgk:szgkid);
+				//count表示本月航线名称与上月航线名称相同的航线总数
+				int count1 = 0;
+				int count2 = 0;
+				int count3 = 0;
+				int count4 = 0;
+				for(int i=0;i<hxgl.size();i++){
+					for(int j=0;j<lasthxgl.size();j++){
+						if(hxgl.get(i).getHxlx().getId().equals("7001")){
+							if(hxgl.get(i).getHxmc().equals(lasthxgl.get(j).getHxmc())&&lasthxgl.get(j).getHxlx().getId().equals("7001")){
+								count1=count1+1;
+								break;
+							}
+						}else if(hxgl.get(i).getHxlx().getId().equals("7002")&&lasthxgl.get(j).getHxlx().getId().equals("7002")){
+							if(hxgl.get(i).getHxmc().equals(lasthxgl.get(j).getHxmc())){
+								count2=count2+1;
+								break;
+							}
+						}else if(hxgl.get(i).getHxlx().getId().equals("7003")&&lasthxgl.get(j).getHxlx().getId().equals("7003")){
+							if(hxgl.get(i).getHxmc().equals(lasthxgl.get(j).getHxmc())){
+								count3=count3+1;
+								break;
+							}
+						}else if(hxgl.get(i).getHxlx().getId().equals("7004")&&lasthxgl.get(j).getHxlx().getId().equals("7004")){
+							if(hxgl.get(i).getHxmc().equals(lasthxgl.get(j).getHxmc())){
+								count4=count4+1;
+								break;
+							}
+						}
+					}
+				}
+				int hxlxcount1 = 0;
+				int hxlxcount2 = 0;
+				int hxlxcount3 = 0;
+				int hxlxcount4 = 0;
+				for(int i=0;i<hxgl.size();i++){
+					if(hxgl.get(i).getHxlx().getId().equals("7001")){
+						hxlxcount1=hxlxcount1+1;
+					}
+					if(hxgl.get(i).getHxlx().getId().equals("7002")){
+						hxlxcount2=hxlxcount2+1;
+					}
+					if(hxgl.get(i).getHxlx().getId().equals("7003")){
+						hxlxcount3=hxlxcount3+1;
+					}
+					if(hxgl.get(i).getHxlx().getId().equals("7004")){
+						hxlxcount4=hxlxcount4+1;
+					}
+				}
+				vo.setByxkphxs1((hxlxcount1-count1)+"");
+				vo.setByxkphxs2((hxlxcount2-count2)+"");
+				vo.setByxkphxs3((hxlxcount3-count3)+"");
+				vo.setByxkphxs4((hxlxcount4-count4)+"");
+				//填表人跟联系电话
+				vo.setTbr(securityMgr.getCurrUser().getName());
+				if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
+					vo.setLxdh(securityMgr.getCurrUser().getSsjyr().getLxdh());
+				}else{
+					vo.setLxdh(securityMgr.getCurrUser().getSsglbm()!=null?securityMgr.getCurrUser().getSsglbm().getLxdh():"");
+				}
+				
+				return Object2JsonStr(vo);
+		
+	*/
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		// 取到所在地下第一个所在港口
+		List<GkEntity> list = gkService.findBySzd(securityMgr.getCurrUser().getSzd() != null ? securityMgr.getCurrUser().getSzd().getId() : "");
+		String dftszgk = "";
+		if (list.size() > 0) {
+			dftszgk = list.get(0).getId();
+		}
+		Date date = new Date();
+		// 本月数据
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+		String benyue = sdf.format(date);
+		Object[] ob = (Object[]) hxglService.bywcltj(StringUtils.isEmpty(rq) ? benyue : rq, StringUtils.isEmpty(szgkid) ? dftszgk : szgkid);
+		HxhbtjVo vo = new HxhbtjVo();
+		vo.setBywcl(ob[0] != null ? (ob[0].toString()) : "");
+		vo.setBynmwcl(ob[1] != null ? (ob[1].toString()) : "");
+		vo.setBywmwcl(ob[2] != null ? (ob[2].toString()) : "");
+		// 本年数据
+		SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy");
+		String bennian = sdf2.format(date);
+		String rq2 = "";
+		if (!StringUtils.isEmpty(rq)) {
+			rq2 = rq.substring(0, 4);
+		}
+		Object[] ob2 = (Object[]) hxglService.bnljltj(StringUtils.isEmpty(rq2) ? bennian : rq2, StringUtils.isEmpty(szgkid) ? dftszgk : szgkid);
+		vo.setBnljl(ob2[0] != null ? (ob2[0].toString()) : "");
+		vo.setBnnmljl(ob2[1] != null ? (ob2[1].toString()) : "");
+		vo.setBnwmljl(ob2[2] != null ? (ob2[2].toString()) : "");
+		// 同比增长数
+		String lastyear = "";
+		if (StringUtils.isEmpty(rq)) {
+			Integer i = Integer.parseInt(benyue.substring(0, 4)) - 1;
+			lastyear = i + benyue.substring(4, 7);
+		} else {
+			Integer i = Integer.parseInt(rq.substring(0, 4)) - 1;
+			lastyear = i + rq.substring(4, 7);
+		}
+		Object[] ob3 = (Object[]) hxglService.tbzzs(StringUtils.isEmpty(rq) ? benyue : rq, lastyear, StringUtils.isEmpty(szgkid) ? dftszgk : szgkid);
+		vo.setTbzzs(ob3[0] != null ? (String.format("%.2f", ob3[0]) + "%") : "- -");
+		vo.setNmtbzzs(ob3[1] != null ? (String.format("%.2f", ob3[1]) + "%") : "- -");
+		vo.setWmtbzzs(ob3[2] != null ? (String.format("%.2f", ob3[2]) + "%") : "- -");
+		// 集装箱航线航班开辟情况
+		Calendar cal = Calendar.getInstance();
+		if (StringUtils.isNotEmpty(rq)) {
+			String year = rq.substring(0, 4);
+			String month = rq.substring(5, 7);
+			cal.set(Calendar.YEAR, Integer.parseInt(year));
+			cal.set(Calendar.MONTH, Integer.parseInt(month));
+		}
+		String bn = cal.get(Calendar.YEAR) + "";
+		String by = (cal.get(Calendar.MONTH) + 1) + "";
+		cal.add(Calendar.MONTH, -1);
+		String sn = cal.get(Calendar.YEAR) + "";
+		String sy = (cal.get(Calendar.MONTH) + 1) + "";
+		List<Object[]> list1 = hxglService.kbxk(bn, by, sn, sy, StringUtils.isEmpty(szgkid) ? dftszgk : szgkid);
+		if (list1 != null && list1.size() > 0) {
+			for (Object[] obj : list1) {
+				Object[] data = (Object[]) obj;
+				if (data[0].equals(bn + by)) {
+					vo.setByyyhxzs1(Integer.parseInt(data[1] + ""));
+					vo.setByyyhbzs1(Integer.parseInt(data[2] + ""));
+					vo.setByyyhxzs2(Integer.parseInt(data[3] + ""));
+					vo.setByyyhbzs2(Integer.parseInt(data[4] + ""));
+					vo.setByyyhxzs3(Integer.parseInt(data[5] + ""));
+					vo.setByyyhbzs3(Integer.parseInt(data[6] + ""));
+					vo.setByyyhxzs4(Integer.parseInt(data[7] + ""));
+					vo.setByyyhbzs4(Integer.parseInt(data[8] + ""));
+					// 默认新开辟航线数为本月数量
+					vo.setByxkphxs1(vo.getByyyhxzs1());
+					vo.setByxkphxs2(vo.getByyyhxzs2());
+					vo.setByxkphxs3(vo.getByyyhxzs3());
+					vo.setByxkphxs4(vo.getByyyhxzs4());
+				} else if (data[0].equals(sn + sy)) {
+					int t1 = Integer.parseInt(data[1] + "");
+					vo.setByxkphxs1(vo.getByyyhxzs1() - t1 < 0 ? 0 : vo.getByyyhxzs1() - t1);
+					vo.setBytkhxs1(t1 - vo.getByyyhxzs1() < 0 ? 0 : t1 - vo.getByyyhxzs1());
+					int t2 = Integer.parseInt(data[3] + "");
+					vo.setByxkphxs2(vo.getByyyhxzs2() - t2 < 0 ? 0 : vo.getByyyhxzs2() - t2);
+					vo.setBytkhxs2(t2 - vo.getByyyhxzs2() < 0 ? 0 : t2 - vo.getByyyhxzs2());
+					int t3 = Integer.parseInt(data[5] + "");
+					vo.setByxkphxs3(vo.getByyyhxzs3() - t3 < 0 ? 0 : vo.getByyyhxzs3() - t3);
+					vo.setBytkhxs3(t3 - vo.getByyyhxzs3() < 0 ? 0 : t3 - vo.getByyyhxzs3());
+					int t4 = Integer.parseInt(data[7] + "");
+					vo.setByxkphxs4(vo.getByyyhxzs4() - t4 < 0 ? 0 : vo.getByyyhxzs4() - t4);
+					vo.setBytkhxs1(t4 - vo.getByyyhxzs4() < 0 ? 0 : t4 - vo.getByyyhxzs4());
+
+				}
+			}
+		}
+		// 填表人跟联系电话
+		vo.setTbr(securityMgr.getCurrUser().getName());
+		if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
+			vo.setLxdh(securityMgr.getCurrUser().getSsjyr().getLxdh());
+		} else {
+			vo.setLxdh(securityMgr.getCurrUser().getSsglbm() != null ? securityMgr.getCurrUser().getSsglbm().getLxdh() : "");
+		}
+		return Object2JsonStr(vo);
+	}
+
+	
+}

gkjsjy/trunk/src/com/cxfws/sjtjfx/service/impl/ZysbybWebService.java

@@ -0,0 +1,181 @@
+package com.cxfws.sjtjfx.service.impl;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.CriteriaBuilder.In;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.sjtjfx.service.IZysbybWebService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.common.Constants;
+import com.xt.jygl.common.SearchCondition;
+import com.xt.jygl.common.Utils;
+import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.entity.DcsbEntity;
+import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.entity.DcsbybbEntity;
+import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.service.DcsbService;
+import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.vo.DcsbVo;
+import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.vo.DcsbybbVo;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
+import com.xt.jygl.workflow.entity.TaskInfoEntity;
+import com.xt.jygl.workflow.service.TaskInfoService;
+import com.xtframe.core.support.SecurityMgr;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.user.entity.UserEntity;
+import com.xtframe.sec.utils.SecUtils;
+import com.xtframe.util.StringUtils;
+
+import cache.CacheSearchCondition;
+import net.sf.json.JSONObject;
+
+@Service("zysbybWebService")
+@WebService(targetNamespace="http://service.web.jsjty.com/",portName="zysbybWebServicePort",serviceName="zysbybWebService")
+public class ZysbybWebService extends BaseWebCtl implements IZysbybWebService {
+	
+	@Autowired
+	private SecurityMgr securityMgr;
+	@Autowired
+	private QueryService query;
+	@Autowired
+	private DcsbService dcsbService;
+
+	
+	@Override
+	public String findZysbyb(final String gkjyr, final String szdid, final String szgkid, final String jcgid, final String nwmid, final String dydlid, final String zysjq, final String zysjz) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		// 查询条件
+		Specification<DcsbybbEntity> spec = new Specification<DcsbybbEntity>() {
+			@Override
+			public Predicate toPredicate(Root<DcsbybbEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+				if (StringUtils.isNotEmpty(gkjyr)) {
+					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + gkjyr + "%"));
+				} 
+				if (StringUtils.isNotEmpty(szdid)) {
+					list.add(cb.like(root.get("szd").get("id").as(String.class), szdid + "%"));
+				} 
+				if (StringUtils.isNotEmpty(szgkid)) {
+					list.add(cb.equal(root.get("szgk").get("id").as(String.class), szgkid));
+				} 
+
+				if (StringUtils.isNotEmpty(jcgid)) {
+					list.add(cb.equal(root.get("jcg").as(String.class), jcgid));
+				} 
+				if (StringUtils.isNotEmpty(nwmid)) {
+					list.add(cb.equal(root.get("nwm").as(String.class), nwmid));
+				} 
+				if (StringUtils.isNotEmpty(dydlid)) {
+					list.add(cb.equal(root.get("hwzl").get("id").as(String.class), dydlid));
+				} 
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+				Date date;
+				if (StringUtils.isNotEmpty(zysjq)) {
+					try {
+						date = sdf.parse(zysjq);
+					} catch (ParseException e) {
+						date = null;
+						e.printStackTrace();
+					}
+					list.add(cb.greaterThanOrEqualTo(root.get("bgsj").as(Date.class), date));
+				} 
+				
+				
+				if (StringUtils.isNotEmpty(zysjz)) {
+					try {
+						date = sdf.parse(zysjz);
+					} catch (ParseException e) {
+						date = null;
+						e.printStackTrace();
+					}
+					list.add(cb.lessThanOrEqualTo(root.get("bgsj").as(Date.class), date));
+				} 
+				
+				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
+				if (isJyr()) {
+					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
+				} else {
+					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SecUtils.getCurrUser().getSzd().getId() + "%"));
+				}
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+				return cb.and(list.toArray(new Predicate[] {}));
+			}
+		};
+
+		/*String user1 = (String) Utils.getSession().getAttribute("user");
+		String user2 = SecUtils.getCurrUser().getId();
+		if (user2 != null) {
+			if (!user2.equals(user1)) {
+				SearchCondition.ybbpage = 1;
+				SearchCondition.ybbjyr = "";
+				SearchCondition.ybbszd = "";
+				SearchCondition.ybbszgk = "";
+				SearchCondition.ybbszgq = "";
+				SearchCondition.ybbhwzl = "";
+				SearchCondition.ybbzysjq = null;
+				SearchCondition.ybbzysjz = null;
+			}
+		}
+		Utils.getSession().setAttribute("user", user2);
+		if (page.getPage() < 1) {
+			page.setPage(SearchCondition.ybbpage);
+		}*/
+
+		List<DcsbybbEntity> list = query.findAll(spec,  DcsbybbEntity.class);
+		List<DcsbybbVo> voList = new ArrayList<DcsbybbVo>();
+		for (DcsbybbEntity entity : list) {
+			DcsbybbVo vo = new DcsbybbVo();
+			if (entity != null) {
+				BeanUtils.copyProperties(entity, vo);
+				vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
+				vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+				vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+				if (entity.getHwzl() != null) {
+					vo.setHwzlzw(securityMgr.codeService().findOne(entity.getHwzl().getId()).getText());
+				}
+				if (entity.getJcg() != null) {
+					vo.setJcg(securityMgr.codeService().findOne(entity.getJcg()).getText());
+				}
+				if (entity.getNwm() != null) {
+					vo.setNwm(securityMgr.codeService().findOne(entity.getNwm()).getText());
+				}
+				if(!StringUtils.isEmpty(entity.getBgsj())){
+					SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM");
+					vo.setBgsj(dateTimeFormat.format(entity.getBgsj()));
+				}
+				voList.add(vo);
+			}
+		}
+		
+		return Object2JsonStr(voList);
+	}
+
+	@Override
+	public String findOne(String id) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		DcsbEntity entity = dcsbService.findOne(id);
+		
+		return Object2JsonStr(entity);
+
+	}
+
+	
+}

gkjsjy/trunk/src/com/cxfws/syscode/service/ISysCodeService.java

@@ -0,0 +1,12 @@
+package com.cxfws.syscode.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "codeWebServicePort", serviceName = "codeWebService")
+public interface ISysCodeService {
+	@WebMethod(operationName = "findOne",action="http://service.web.jsjty.com/findOne")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findOne(String id);
+	public String findByPid(String id);
+}

gkjsjy/trunk/src/com/cxfws/syscode/service/impl/SysCodeService.java

@@ -0,0 +1,58 @@
+package com.cxfws.syscode.service.impl;
+
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+import javax.jws.WebService;
+
+import net.sf.json.JSONArray;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.syscode.service.ISysCodeService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xtframe.sec.code.dao.CodeDao;
+import com.xtframe.sec.code.entity.CodeEntity;
+/**
+ * 根据字典主键查询字典值
+ *
+ */
+@Service("codeWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "codeWebServicePort", serviceName = "codeWebService")
+public class SysCodeService extends BaseWebCtl implements ISysCodeService{
+	@Autowired
+	private CodeDao dao;
+	@PostConstruct
+	private void init(){
+		//System.out.println("------DiexcService--init-");
+		
+	}
+	/**
+	 * 根据字典主键查询字典值
+	 */
+	@Override
+	public String findOne(String id) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		CodeEntity codeEntity = dao.findOne(id);
+		JSONArray jsons=JSONArray.fromObject(codeEntity);
+
+		return jsons.toString();
+	}
+	@Override
+	public String findByPid(String id) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		List<CodeEntity> codeList = dao.findByPid(id);
+			JSONArray jsonArray = JSONArray.fromObject(codeList);
+		
+		return jsonArray.toString();
+	}
+	
+
+
+
+}

gkjsjy/trunk/src/com/cxfws/todo/service/ITODOService.java

@@ -0,0 +1,12 @@
+package com.cxfws.todo.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "taskInfoWebServicePort", serviceName = "taskInfoWebService")
+public interface ITODOService {
+	@WebMethod(operationName = "findUndoList",action="http://service.web.jsjty.com/findUndoList")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findUndoList(String type) throws Exception;
+}

gkjsjy/trunk/src/com/cxfws/todo/service/impl/TODOService.java

@@ -0,0 +1,809 @@
+package com.cxfws.todo.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.xml.ws.WebServiceContext;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.config.utils.CxfwsUtils;
+import com.cxfws.todo.service.ITODOService;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.common.Constants;
+import com.xt.jygl.common.GlobalData;
+import com.xt.jygl.ggfwxxgl.jdtx.service.TxService;
+import com.xt.jygl.ggfwxxgl.jdtxxx.entity.JdtxxxEntity;
+import com.xt.jygl.ggfwxxgl.jdtxxx.service.JdtxxxService;
+import com.xt.jygl.ggfwxxgl.tzgg.ggxx.service.GgxxtxService;
+import com.xt.jygl.gkjcxx.gk.service.GkService;
+import com.xt.jygl.gkjcxx.gq.service.GqService;
+import com.xt.jygl.gkjsgl.jgsq.entity.JgsqEntity;
+import com.xt.jygl.gkjsgl.jgsq.service.JgsqService;
+import com.xt.jygl.gkjsgl.jgsq.service.JgsqdsService;
+import com.xt.jygl.gkjsgl.jsjdbg.entity.JsjdbgEntity;
+import com.xt.jygl.gkjsgl.jsjdbg.service.JsjdbgService;
+import com.xt.jygl.gkjsgl.jsjdbg.service.JsjdbgdsService;
+import com.xt.jygl.gkjsgl.jsjdcbsj.entity.JsjdcbsjEntity;
+import com.xt.jygl.gkjsgl.jsjdcbsj.service.JsjdcbsjService;
+import com.xt.jygl.gkjsgl.jsjdcbsj.service.JsjdcbsjdsService;
+import com.xt.jygl.gkjsgl.xmxxgl.service.XmxxglService;
+import com.xt.jygl.gkjsgl.xmxxgl.service.XmxxgljggzService;
+import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.entity.DcsbEntity;
+import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.service.DcsbService;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.service.XkzxxService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.entity.XkzbgEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.service.XkzbgService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzsqEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzsqService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkyx.entity.XkzyxEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkyx.service.XkzyxService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkzx.entity.XkzzxEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkzx.service.XkzzxService;
+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhbg.entity.LhbgEntity;
+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhbg.service.LhbgService;
+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.entity.LhsqEntity;
+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.service.LhsqService;
+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhyx.entity.LhyxEntity;
+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhyx.service.LhyxService;
+import com.xt.jygl.workflow.entity.TaskInfoEntity;
+import com.xt.jygl.workflow.param.WorkItem;
+import com.xt.jygl.workflow.service.TaskInfoService;
+import com.xt.jygl.workflow.service.WorkflowMangerService;
+import com.xtframe.sec.user.dao.UserDao;
+import com.xtframe.sec.user.entity.UserEntity;
+import com.xtframe.util.StringUtils;
+
+
+/**
+ * 待办事务
+ */
+@Service("taskInfoWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "taskInfoWebServicePort", serviceName = "taskInfoWebService")
+public class TODOService extends BaseWebCtl implements ITODOService {
+	@Autowired
+	private WorkflowMangerService workflowMangerService;
+	@Autowired
+	private GkService gkService;
+	@Autowired
+	private GkjyrService gkjyrService;
+	@Autowired
+	private GqService gqService;
+	@Autowired
+	private XkzxxService xkzxxService;
+	@Autowired
+	private DcsbService dcsbService;
+	@Autowired
+	private XmxxglService xmxxglService;
+	@Autowired
+	private XmxxgljggzService xmxxgljggzService;
+	@Autowired
+	private XkzsqService xkzsqService;
+	@Autowired
+	private XkzbgService xkzbgService;
+	@Autowired
+	private XkzyxService xkzyxService;
+	@Autowired
+	private XkzzxService xkzzxService;
+	@Autowired
+	private TaskInfoService taskInfoService;
+	@Autowired
+	private TxService txService;
+	@Autowired
+	private GgxxtxService ggxxtxService;
+	@Autowired
+	private LhsqService lhsqService;
+	@Autowired
+	private LhbgService lhbgService;
+	@Autowired
+	private LhyxService lhyxService;
+	@Autowired
+	private JsjdcbsjdsService jsjdcbsjdsService;
+	@Autowired
+	private JsjdbgdsService jsjdbgdsService;
+	@Autowired
+	private JgsqdsService jgsqdsService;
+	@Autowired
+	private JsjdcbsjService jsjdcbsjService;
+	@Autowired
+	private JsjdbgService jsjdbgService;
+	@Autowired
+	private JgsqService jgsqService;
+	@Autowired
+	private JdtxxxService jdtxxxService;
+	@Resource
+	private WebServiceContext wscontext;
+	@Autowired
+	private UserDao userdao;
+	@Override
+	@WebMethod(operationName = "findUndoList", action = "http://service.web.jsjty.com/findUndoList")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findUndoList(String type) throws Exception {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		List<WorkItem> volist = new ArrayList<WorkItem>();
+		if ("dcsb".equals(type)) {
+			volist = getDcsbList();
+		} else if ("xkzsq".equals(type)) {
+			volist = getXkzsqList();
+		} else if ("xkzbg".equals(type)) {
+			volist = getXkzbgList();
+		} else if ("xkzyx".equals(type)) {
+			volist = getXkzyxList();
+		} else if ("xkzzx".equals(type)) {
+			volist = getXkzzxList();
+		} else if ("lhsq".equals(type)) {
+			volist = getLhsqList();
+		} else if ("lhbg".equals(type)) {
+			volist = getLhbgList();
+		} else if ("lhyx".equals(type)) {
+			volist = getLhyxList();
+		} else if ("jsjdcbsj".equals(type)) {
+			volist = getJsjdcbsjList();
+		} else if ("jsjdbg".equals(type)) {
+			volist = getJsjdbgList();
+		} else if ("jgsq".equals(type)) {
+			volist = getJgsqList();
+		} else if ("jdtx".equals(type)){
+			volist = getJdtxxxList();
+		}else if ("qt".equals(type)) {
+			volist = getJsjdcbsjdsList();
+			volist.addAll(getJsjdbgdsList());
+			volist.addAll(getJgsqdsList());
+			
+		}
+
+		// 判断省市区别
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+					if ("all".equals(type) || StringUtils.isEmpty(type)) {
+						type = "all";
+						volist = getDcsbList();
+						volist.addAll(getXkzsqList());
+						volist.addAll(getXkzbgList());
+						volist.addAll(getXkzyxList());
+						volist.addAll(getXkzzxList());
+						volist.addAll(getJsjdcbsjdsList());
+						volist.addAll(getJsjdbgdsList());
+						volist.addAll(getJgsqdsList());
+						volist.addAll(getJdtxxxList());
+					}
+				} else {
+					if ("all".equals(type) || StringUtils.isEmpty(type)) {
+						type = "all";
+						volist = getLhsqList();
+						volist.addAll(getLhbgList());
+						volist.addAll(getLhyxList());
+						volist.addAll(getJsjdcbsjList());
+						volist.addAll(getJsjdbgList());
+						volist.addAll(getJgsqList());
+						// volist.addAll(getJdtxxxList());
+					}
+				}
+	
+		return Object2JsonStr(volist);
+	}
+	// 单船申报
+	public List<WorkItem> getDcsbList() throws JsonProcessingException {
+		List<WorkItem> volist = new ArrayList<WorkItem>();
+		List<Object> list = new ArrayList<Object>();
+		if (isJyr()) {
+			list = dcsbService.findByJyrid(getSsjyr().getId());
+		} else {
+			List<String> gqlist = getGq();
+			list = dcsbService.findByGqids(gqlist);
+		}
+
+		if (list != null && list.size() > 0) {
+			for (Object id : list) {
+				if (id != null) {
+					DcsbEntity entity = dcsbService.findOne(id.toString());
+					WorkItem item = new WorkItem();
+					if ((dcsbService.getTaskByUserAndBusKey(getUser().getId().toString(), id.toString()) != null) || dcsbService.getCandidateTaskByUserAndBusKey(getUser().getId().toString(), id.toString()) != null) {
+						List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id.toString(), DcsbEntity.PROCESS_DEFINITION_KEY);
+						if (lists != null & lists.size() > 0) {
+							TaskInfoEntity taskinfo = lists.get(0);
+							if ("申请".equals(taskinfo.getCurrName())) {
+								item.setStatus("1");
+							} else {
+								item.setStatus("0");
+							}
+							item.setProcessName("单船申报");
+							item.setProcessKey("dcsb");
+							item.setDescription(entity.getSsjyr().getGkjyr());
+							item.setCreateTime(entity.getCreateDateTime().toString());
+							if (!StringUtils.isEmpty(entity.getCreateUser())) {
+								UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
+								item.setSenderName(user.getName());
+							}
+							item.setBusinessKey(entity.getId());
+							volist.add(item);
+						}
+					}
+				}
+			}
+		}
+
+		return volist;
+	}
+	// 许可证申请
+		public List<WorkItem> getXkzsqList() throws JsonProcessingException {
+			List<WorkItem> volist = new ArrayList<WorkItem>();
+
+			List<Object> list = new ArrayList<Object>();
+			if (isJyr()) {
+				list = xkzsqService.findByJyrids(getSsjyr().getId());
+			} else {
+				List<String> gqlist = getGq();
+				list = xkzsqService.findByGqids(gqlist);
+			}
+
+			if (list != null && list.size() > 0) {
+				for (Object id : list) {
+					XkzsqEntity entity = xkzsqService.findOne(id.toString());
+					if (entity != null) {
+						if (entity.getRecordStatus() != 9) {
+							WorkItem item = new WorkItem();
+							if ((xkzsqService.getTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) || xkzsqService.getCandidateTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) {
+								List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId(), XkzsqEntity.PROCESS_DEFINITION_KEY);
+								if (lists != null & lists.size() > 0) {
+									TaskInfoEntity taskinfo = lists.get(0);
+									if ("申请".equals(taskinfo.getCurrName())) {
+										item.setStatus("1");
+									} else {
+										item.setStatus("0");
+									}
+									item.setProcessName("许可证申请");
+									item.setProcessKey("xkzsq");
+									item.setDescription(entity.getJyrmc());
+									item.setCreateTime(entity.getCreateDateTime() != null ? entity.getCreateDateTime().toString() : "");
+									if (!StringUtils.isEmpty(entity.getCreateUser())) {
+										UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
+										item.setSenderName(user.getName());
+									}
+									item.setBusinessKey(entity.getId());
+									volist.add(item);
+								}
+
+							}
+
+						}
+					}
+				}
+			}
+			return volist;
+		}
+		// 许可证变更
+		public List<WorkItem> getXkzbgList() throws JsonProcessingException {
+			List<WorkItem> volist = new ArrayList<WorkItem>();
+			List<Object> list = new ArrayList<Object>();
+			if (isJyr()) {
+				list = xkzbgService.findByJyrids(getSsjyr().getId());
+			} else {
+				List<String> gqlist = getGq();
+				list = xkzbgService.findByGqids(gqlist);
+			}
+			if (list != null && list.size() > 0) {
+				for (Object id : list) {
+					if (id != null) {
+						XkzbgEntity entity = xkzbgService.findOne(id.toString());
+						WorkItem item = new WorkItem();
+						if (entity.getRecordStatus() != 9) {
+							if ((xkzbgService.getTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) || xkzbgService.getCandidateTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) {
+								List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId(), XkzbgEntity.PROCESS_DEFINITION_KEY);
+								if (lists != null & lists.size() > 0) {
+									TaskInfoEntity taskinfo = lists.get(0);
+									if ("申请".equals(taskinfo.getCurrName())) {
+										item.setStatus("1");
+									} else {
+										item.setStatus("0");
+									}
+									item.setProcessName("许可证变更");
+									item.setProcessKey("xkzbg");
+									item.setDescription(entity.getJyrmc());
+									item.setCreateTime(entity.getCreateDateTime() != null ? entity.getCreateDateTime().toString() : "");
+									if (!StringUtils.isEmpty(entity.getCreateUser())) {
+										UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
+										item.setSenderName(user.getName());
+									}
+									item.setBusinessKey(entity.getId());
+									volist.add(item);
+								}
+							}
+						}
+					}
+				}
+
+			}
+			return volist;
+		}
+		// 许可证延续
+		public List<WorkItem> getXkzyxList() throws JsonProcessingException {
+			List<WorkItem> volist = new ArrayList<WorkItem>();
+			List<Object> list = new ArrayList<Object>();
+			if (isJyr()) {
+				list = xkzyxService.findByJyrids(getSsjyr().getId());
+			} else {
+				List<String> gqlist = getGq();
+				list = xkzyxService.findByGqids(gqlist);
+			}
+			if (list != null && list.size() > 0) {
+				for (Object id : list) {
+					XkzyxEntity entity = xkzyxService.findOne(id.toString());
+					if (entity != null) {
+						WorkItem item = new WorkItem();
+						if (entity.getRecordStatus() != 9) {
+							if ((xkzyxService.getTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) || xkzyxService.getCandidateTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) {
+								List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId(), XkzyxEntity.PROCESS_DEFINITION_KEY);
+								if (lists != null & lists.size() > 0) {
+									TaskInfoEntity taskinfo = lists.get(0);
+									if ("申请".equals(taskinfo.getCurrName())) {
+										item.setStatus("1");
+									} else {
+										item.setStatus("0");
+									}
+									item.setProcessName("许可证延续");
+									item.setProcessKey("xkzyx");
+									item.setDescription(entity.getJyrmc());
+									item.setCreateTime(entity.getCreateDateTime() != null ? entity.getCreateDateTime().toString() : "");
+									if (!StringUtils.isEmpty(entity.getCreateUser())) {
+										UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
+										item.setSenderName(user.getName());
+									}
+									item.setBusinessKey(entity.getId());
+									volist.add(item);
+								}
+
+							}
+						}
+					}
+				}
+			}
+
+			return volist;
+		}
+		// 许可证注销
+		public List<WorkItem> getXkzzxList() throws JsonProcessingException {
+			List<WorkItem> volist = new ArrayList<WorkItem>();
+			List<Object> list = new ArrayList<Object>();
+			if (isJyr()) {
+				list = xkzzxService.findByJyrids(getSsjyr().getId());
+			} else {
+				List<String> gqlist = getGq();
+				list = xkzzxService.findByGqids(gqlist);
+			}
+			if (list != null && list.size() > 0) {
+				for (Object id : list) {
+					XkzzxEntity entity = xkzzxService.findOne(id.toString());
+					if (entity != null) {
+						WorkItem item = new WorkItem();
+						if (entity.getRecordStatus() != 9) {
+							if ((xkzzxService.getTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) || xkzzxService.getCandidateTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) {
+								List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId(), XkzzxEntity.PROCESS_DEFINITION_KEY);
+								if (lists != null & lists.size() > 0) {
+									TaskInfoEntity taskinfo = lists.get(0);
+									if ("申请".equals(taskinfo.getCurrName())) {
+										item.setStatus("1");
+									} else {
+										item.setStatus("0");
+									}
+									item.setProcessName("许可证注销");
+									item.setProcessKey("xkzzx");
+									item.setDescription(entity.getJyrmc());
+									item.setCreateTime(entity.getCreateDateTime() != null ? entity.getCreateDateTime().toString() : "");
+									if (!StringUtils.isEmpty(entity.getCreateUser())) {
+										UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
+										item.setSenderName(user.getName());
+									}
+									item.setBusinessKey(entity.getId());
+									volist.add(item);
+
+								}
+
+							}
+						}
+					}
+				}
+			}
+			return volist;
+		}
+		// 理货申请
+		public List<WorkItem> getLhsqList() throws JsonProcessingException {
+			List<WorkItem> volist = new ArrayList<WorkItem>();
+			List<LhsqEntity> lhsqlist = lhsqService.findAll();
+			if (lhsqlist != null && lhsqlist.size() > 0) {
+				for (LhsqEntity entity : lhsqlist) {
+					if (entity != null) {
+						WorkItem item = new WorkItem();
+						if ((lhsqService.getTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) || lhsqService.getCandidateTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) {
+							List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId().toString(), LhsqEntity.PROCESS_DEFINITION_KEY);
+							if (lists != null & lists.size() > 0) {
+								TaskInfoEntity taskinfo = lists.get(0);
+								if ("申请".equals(taskinfo.getCurrName())) {
+									item.setStatus("1");
+								} else {
+									item.setStatus("0");
+								}
+								item.setProcessName("理货申请");
+								item.setProcessKey("lhsq");
+								if (!StringUtils.isEmpty(entity.getJyrid())) {
+									GkjyrEntity gkjyr = gkjyrService.findOne(entity.getJyrid());
+									item.setDescription(gkjyr.getGkjyr());
+								}
+
+								item.setCreateTime(entity.getCreateDateTime().toString());
+								if (!StringUtils.isEmpty(entity.getCreateUser())) {
+									UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
+									item.setSenderName(user.getName());
+								}
+								item.setBusinessKey(entity.getId());
+								volist.add(item);
+							}
+						}
+					}
+				}
+			}
+
+			return volist;
+		}
+		// 理货变更
+		public List<WorkItem> getLhbgList() throws JsonProcessingException {
+			List<WorkItem> volist = new ArrayList<WorkItem>();
+			List<LhbgEntity> list = lhbgService.findAll();
+			if (list != null && list.size() > 0) {
+				for (LhbgEntity entity : list) {
+					if (entity != null) {
+						WorkItem item = new WorkItem();
+						if ((lhbgService.getTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) || lhbgService.getCandidateTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) {
+							List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId().toString(), LhbgEntity.PROCESS_DEFINITION_KEY);
+							if (lists != null & lists.size() > 0) {
+								TaskInfoEntity taskinfo = lists.get(0);
+								if ("申请".equals(taskinfo.getCurrName())) {
+									item.setStatus("1");
+								} else {
+									item.setStatus("0");
+								}
+								item.setProcessName("理货变更");
+								item.setProcessKey("lhbg");
+								if (!StringUtils.isEmpty(entity.getJyrid())) {
+									GkjyrEntity gkjyr = gkjyrService.findOne(entity.getJyrid());
+									item.setDescription(gkjyr.getGkjyr());
+								}
+
+								item.setCreateTime(entity.getCreateDateTime().toString());
+								if (!StringUtils.isEmpty(entity.getCreateUser())) {
+									UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
+									item.setSenderName(user.getName());
+								}
+								item.setBusinessKey(entity.getId());
+								volist.add(item);
+							}
+						}
+					}
+				}
+			}
+			return volist;
+		}
+		// 理货延续
+		public List<WorkItem> getLhyxList() throws JsonProcessingException {
+			List<WorkItem> volist = new ArrayList<WorkItem>();
+			List<LhyxEntity> list = lhyxService.findAll();
+			if (list != null && list.size() > 0) {
+				for (LhyxEntity entity : list) {
+					if (entity != null) {
+						WorkItem item = new WorkItem();
+						if ((lhbgService.getTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) || lhyxService.getCandidateTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) {
+							List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId().toString(), LhbgEntity.PROCESS_DEFINITION_KEY);
+							if (lists != null & lists.size() > 0) {
+								TaskInfoEntity taskinfo = lists.get(0);
+								if ("申请".equals(taskinfo.getCurrName())) {
+									item.setStatus("1");
+								} else {
+									item.setStatus("0");
+								}
+								item.setProcessName("理货延续");
+								item.setProcessKey("lhyx");
+								if (!StringUtils.isEmpty(entity.getJyrid())) {
+									GkjyrEntity gkjyr = gkjyrService.findOne(entity.getJyrid());
+									item.setDescription(gkjyr.getGkjyr());
+								}
+
+								item.setCreateTime(entity.getCreateDateTime().toString());
+								if (!StringUtils.isEmpty(entity.getCreateUser())) {
+									UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
+									item.setSenderName(user.getName());
+								}
+								item.setBusinessKey(entity.getId());
+								volist.add(item);
+							}
+						}
+					}
+				}
+			}
+			return volist;
+		}
+		// 建设进度初步设计申请
+		public List<WorkItem> getJsjdcbsjList() throws JsonProcessingException {
+			List<WorkItem> volist = new ArrayList<WorkItem>();
+			List<JsjdcbsjEntity> list = jsjdcbsjService.findAll();
+			if (list != null && list.size() > 0) {
+				for (JsjdcbsjEntity entity : list) {
+					if (entity != null) {
+						WorkItem item = new WorkItem();
+						if ((jsjdcbsjService.getTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) || jsjdcbsjService.getCandidateTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) {
+							List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId().toString(), JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
+							if (lists != null & lists.size() > 0) {
+								TaskInfoEntity taskinfo = lists.get(0);
+								if ("申请".equals(taskinfo.getCurrName())) {
+									item.setStatus("1");
+								} else {
+									item.setStatus("0");
+								}
+								item.setProcessName("建设进度初步设计申请");
+								item.setProcessKey("jsjdcbsj");
+								item.setDescription(entity.getJyrid().getGkjyr());
+								item.setCreateTime(entity.getCreateDateTime().toString());
+								if (!StringUtils.isEmpty(entity.getCreateUser())) {
+									UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
+									item.setSenderName(user.getName());
+								}
+								item.setBusinessKey(entity.getId());
+								volist.add(item);
+							}
+						}
+					}
+				}
+			}
+			return volist;
+		}
+		// 建设进度初步设计变更
+		public List<WorkItem> getJsjdbgList() throws JsonProcessingException {
+			List<WorkItem> volist = new ArrayList<WorkItem>();
+			List<JsjdbgEntity> list = jsjdbgService.findAll();
+			if (list != null && list.size() > 0) {
+				for (JsjdbgEntity entity : list) {
+					if (entity != null) {
+						WorkItem item = new WorkItem();
+						if ((jsjdbgService.getTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) || jsjdbgService.getCandidateTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) {
+							List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId().toString(), JsjdbgEntity.PROCESS_DEFINITION_KEY);
+							if (lists != null & lists.size() > 0) {
+								TaskInfoEntity taskinfo = lists.get(0);
+								if ("申请".equals(taskinfo.getCurrName())) {
+									item.setStatus("1");
+								} else {
+									item.setStatus("0");
+								}
+								item.setProcessName("建设进度初步设计变更");
+								item.setProcessKey("jsjdbg");
+								item.setDescription(entity.getJyrid().getGkjyr());
+								item.setCreateTime(entity.getCreateDateTime().toString());
+								if (!StringUtils.isEmpty(entity.getCreateUser())) {
+									UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
+									item.setSenderName(user.getName());
+								}
+								item.setBusinessKey(entity.getId());
+								volist.add(item);
+							}
+						}
+					}
+				}
+			}
+			return volist;
+		}
+		// 建设进度竣工申请
+		public List<WorkItem> getJgsqList() throws JsonProcessingException {
+			List<WorkItem> volist = new ArrayList<WorkItem>();
+			List<JgsqEntity> list = jgsqService.findAll();
+
+			if (list != null && list.size() > 0) {
+				for (JgsqEntity entity : list) {
+					if (entity != null) {
+						WorkItem item = new WorkItem();
+						if ((jgsqService.getTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) || jgsqService.getCandidateTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) {
+							List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId().toString(), JgsqEntity.PROCESS_DEFINITION_KEY);
+							if (lists != null & lists.size() > 0) {
+								TaskInfoEntity taskinfo = lists.get(0);
+								if ("申请".equals(taskinfo.getCurrName())) {
+									item.setStatus("1");
+								} else {
+									item.setStatus("0");
+								}
+								item.setProcessName("建设进度竣工申请");
+								item.setProcessKey("jgsq");
+								item.setDescription(entity.getJyrid().getGkjyr());
+								item.setCreateTime(entity.getCreateDateTime().toString());
+								if (!StringUtils.isEmpty(entity.getCreateUser())) {
+									UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
+									item.setSenderName(user.getName());
+								}
+								item.setBusinessKey(entity.getId());
+								volist.add(item);
+							}
+						}
+					}
+				}
+			}
+			return volist;
+		}
+		// 建设进度竣工申请
+		public List<WorkItem> getJdtxxxList() throws JsonProcessingException {
+			List<WorkItem> volist = new ArrayList<WorkItem>();
+			List<JdtxxxEntity> list = jdtxxxService.findAll();
+
+			if (list != null && list.size() > 0) {
+				for (JdtxxxEntity entity : list) {
+					if (entity != null) {
+						WorkItem item = new WorkItem();
+						if ((jdtxxxService.getTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) || jdtxxxService.getCandidateTaskByUserAndBusKey(getUser().getId().toString(), entity.getId().toString()) != null) {
+							List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId().toString(), JdtxxxEntity.PROCESS_DEFINITION_KEY);
+							if (lists != null & lists.size() > 0) {
+								TaskInfoEntity taskinfo = lists.get(0);
+								if ("申请".equals(taskinfo.getCurrName())) {
+									item.setStatus("1");
+								} else {
+									item.setStatus("0");
+								}
+								item.setProcessName("监督提醒申请");
+								item.setProcessKey("jdtx");
+								item.setDescription(entity.getGkjyr().getGkjyr());
+								item.setCreateTime(entity.getCreateDateTime().toString());
+								if (!StringUtils.isEmpty(entity.getCreateUser())) {
+									UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
+									item.setSenderName(user.getName());
+								}
+								item.setBusinessKey(entity.getId());
+								volist.add(item);
+							}
+						}
+					}
+				}
+			}
+			return volist;
+		}
+		// 建设进度初步设计申请地市
+		public List<WorkItem> getJsjdcbsjdsList() throws JsonProcessingException {
+			List<WorkItem> volist = new ArrayList<WorkItem>();
+			List<Object> list = new ArrayList<Object>();
+			if (isJyr()) {
+				list = jsjdcbsjdsService.findByJyrids(getSsjyr().getId());
+			} else {
+				List<String> gqlist = getGq();
+				list = jsjdcbsjdsService.findByGqids(gqlist);
+			}
+
+			if (list != null && list.size() > 0) {
+				for (Object id : list) {
+					if (id != null) {
+						JsjdcbsjEntity entity = jsjdcbsjdsService.findOne(id.toString());
+						WorkItem item = new WorkItem();
+						if ((jsjdcbsjdsService.getTaskByUserAndBusKey(getUser().getId().toString(), id.toString()) != null) || jsjdcbsjdsService.getCandidateTaskByUserAndBusKey(getUser().getId().toString(), id.toString()) != null) {
+							List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id.toString(), JsjdcbsjEntity.PROCESS_DEFINITION_KEYDS);
+							if (lists != null & lists.size() > 0) {
+								TaskInfoEntity taskinfo = lists.get(0);
+								if ("申请".equals(taskinfo.getCurrName())) {
+									item.setStatus("1");
+								} else {
+									item.setStatus("0");
+								}
+								item.setProcessName("建设进度初步设计申请");
+								item.setProcessKey("jsjdcbsjds");
+								item.setDescription(entity.getJyrid().getGkjyr());
+								item.setCreateTime(entity.getCreateDateTime().toString());
+								if (!StringUtils.isEmpty(entity.getCreateUser())) {
+									UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
+									item.setSenderName(user.getName());
+								}
+								item.setBusinessKey(entity.getId());
+								volist.add(item);
+							}
+						}
+					}
+				}
+			}
+			return volist;
+		}
+		// 建设进度初步设计变更地市
+		public List<WorkItem> getJsjdbgdsList() throws JsonProcessingException {
+			List<WorkItem> volist = new ArrayList<WorkItem>();
+			List<Object> list = new ArrayList<Object>();
+			if (isJyr()) {
+				list = jsjdbgdsService.findByJyrids(getSsjyr().getId());
+			} else {
+				List<String> gqlist = getGq();
+				list = jsjdbgdsService.findByGqids(gqlist);
+			}
+
+			if (list != null && list.size() > 0) {
+				for (Object id : list) {
+					if (id != null) {
+						JsjdbgEntity entity = jsjdbgdsService.findOne(id.toString());
+						WorkItem item = new WorkItem();
+						if ((jsjdbgdsService.getTaskByUserAndBusKey(getUser().getId().toString(), id.toString()) != null) || jsjdbgdsService.getCandidateTaskByUserAndBusKey(getUser().getId().toString(), id.toString()) != null) {
+							List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id.toString(), JsjdbgEntity.PROCESS_DEFINITION_KEYDS);
+							if (lists != null & lists.size() > 0) {
+								TaskInfoEntity taskinfo = lists.get(0);
+								if ("申请".equals(taskinfo.getCurrName())) {
+									item.setStatus("1");
+								} else {
+									item.setStatus("0");
+								}
+								item.setProcessName("建设进度初步设计变更");
+								item.setProcessKey("jsjdbgds");
+								item.setDescription(entity.getJyrid().getGkjyr());
+								item.setCreateTime(entity.getCreateDateTime().toString());
+								if (!StringUtils.isEmpty(entity.getCreateUser())) {
+									UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
+									item.setSenderName(user.getName());
+								}
+								item.setBusinessKey(entity.getId());
+								volist.add(item);
+							}
+						}
+					}
+				}
+			}
+			return volist;
+		}
+		// 建设进度竣工申请地市
+		public List<WorkItem> getJgsqdsList() throws JsonProcessingException {
+			List<WorkItem> volist = new ArrayList<WorkItem>();
+			List<Object> list = new ArrayList<Object>();
+			if (isJyr()) {
+				list = jgsqdsService.findByJyrids(getSsjyr().getId());
+			} else {
+				List<String> gqlist = getGq();
+				list = jgsqdsService.findByGqids(gqlist);
+			}
+
+			if (list != null && list.size() > 0) {
+				for (Object id : list) {
+					if (id != null) {
+						JgsqEntity entity = jgsqdsService.findOne(id.toString());
+						WorkItem item = new WorkItem();
+						if ((jgsqdsService.getTaskByUserAndBusKey(getUser().getId().toString(), id.toString()) != null) || jgsqdsService.getCandidateTaskByUserAndBusKey(getUser().getId().toString(), id.toString()) != null) {
+							List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id.toString(), JgsqEntity.PROCESS_DEFINITION_KEYDS);
+							if (lists != null & lists.size() > 0) {
+								TaskInfoEntity taskinfo = lists.get(0);
+								if ("申请".equals(taskinfo.getCurrName())) {
+									item.setStatus("1");
+								} else {
+									item.setStatus("0");
+								}
+								item.setProcessName("建设进度竣工申请");
+								item.setProcessKey("jgsqds");
+								item.setDescription(entity.getJyrid().getGkjyr());
+								item.setCreateTime(entity.getCreateDateTime().toString());
+								if (!StringUtils.isEmpty(entity.getCreateUser())) {
+									UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
+									item.setSenderName(user.getName());
+								}
+								item.setBusinessKey(entity.getId());
+								volist.add(item);
+							}
+						}
+					}
+				}
+			}
+			return volist;
+		}
+		
+		public List<String>  getGq(){
+			String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
+			UserEntity userEntity = userdao.findByUname(userName);
+			List<String> gqlist = gqService.findGqListByUserId(userEntity.getId());
+			return gqlist;
+		}
+		public UserEntity getUser(){
+			String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
+			UserEntity userEntity = userdao.findByUname(userName);
+			return userEntity;
+		}
+}

gkjsjy/trunk/src/com/cxfws/userLogin/service/ILoginService.java

@@ -0,0 +1,12 @@
+package com.cxfws.userLogin.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "loginWebServicePort", serviceName = "loginWebService")
+public interface ILoginService {
+	@WebMethod(operationName = "findUser",action="http://service.web.jsjty.com/findUser")
+	@WebResult(name = "result",targetNamespace = "http://service.web.jsjty.com/")
+	public String findUser(String username);
+}

gkjsjy/trunk/src/com/cxfws/userLogin/service/entity/UserJson.java

@@ -0,0 +1,24 @@
+package com.cxfws.userLogin.service.entity;
+
+import java.util.List;
+
+import com.xtframe.sec.role.entity.RoleEntity;
+import com.xtframe.sec.user.entity.UserEntity;
+
+public class UserJson {
+	private UserEntity user;
+	private List<RoleEntity> rolelist;
+	public UserEntity getUser() {
+		return user;
+	}
+	public void setUser(UserEntity user) {
+		this.user = user;
+	}
+	public List<RoleEntity> getRolelist() {
+		return rolelist;
+	}
+	public void setRolelist(List<RoleEntity> rolelist) {
+		this.rolelist = rolelist;
+	}
+	
+}

gkjsjy/trunk/src/com/cxfws/userLogin/service/impl/LoginService.java

@@ -0,0 +1,43 @@
+package com.cxfws.userLogin.service.impl;
+
+import java.util.List;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.userLogin.service.ILoginService;
+import com.cxfws.userLogin.service.entity.UserJson;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xtframe.sec.role.entity.RoleEntity;
+import com.xtframe.sec.user.dao.UserDao;
+import com.xtframe.sec.user.entity.UserEntity;
+
+@Service("loginWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "loginWebServicePort", serviceName = "loginWebService")
+public class LoginService extends BaseWebCtl implements ILoginService{
+	@Autowired
+	private UserDao userService;
+	@Override
+	@WebMethod(operationName = "findUser", action = "http://service.web.jsjty.com/findUser")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findUser(String username) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		UserEntity user = userService.findByUname(username);
+		UserJson userJson = new UserJson();
+		if(user!=null){
+			user.setSsglryzw(user.getSsglry()!=null?user.getSsglry().getXm(): "");
+			user.setSsjyrzw(user.getSsjyr()!=null?user.getSsjyr().getGkjyr():"");
+			List<RoleEntity> roleList=securityMgr.roleService().findByUserId(user.getId());
+			userJson.setUser(user);
+			userJson.setRolelist(roleList);
+		}
+		return Object2JsonStr(userJson);
+	}
+
+}

gkjsjy/trunk/src/com/cxfws/xmxxgl/service/IJsjdglWebService.java

@@ -0,0 +1,35 @@
+package com.cxfws.xmxxgl.service;
+
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "jsjdglWebServicePort", serviceName = "jsjdglWebService")
+public interface IJsjdglWebService {
+
+	@WebMethod(operationName = "findJsjdgl", action = "http://service.web.jsjty.com/findJsjdgl")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findJsjdgl(final String xmmc, final String szdid, final String szgkid, final String szgqid, final String dqzt, final String xmfr, final String lcjd);
+	
+	
+	@WebMethod(operationName = "findOne", action = "http://service.web.jsjty.com/findOne")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findOne(String id);
+	
+	@WebMethod(operationName = "findHistoryAudit", action = "http://service.web.jsjty.com/findHistoryAudit")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findHistoryAudit(String id,String sortno);
+	
+	@WebMethod(operationName = "findSsgc", action = "http://service.web.jsjty.com/findSsgc")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findSsgc(String xmid);
+	
+	@WebMethod(operationName = "findJsjdByZyid", action = "http://service.web.jsjty.com/findJsjdByZyid")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findJsjdByZyid(String zyid);
+	
+	@WebMethod(operationName = "findLslc", action = "http://service.web.jsjty.com/findLslc")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findLslc(String id);
+}

gkjsjy/trunk/src/com/cxfws/xmxxgl/service/ITzjhglWebService.java

@@ -0,0 +1,16 @@
+package com.cxfws.xmxxgl.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "tzjhglWebServicePort", serviceName = "tzjhglWebService")
+public interface ITzjhglWebService {
+	@WebMethod(operationName = "findTzjhgl", action = "http://service.web.jsjty.com/findTzjhgl")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findTzjhgl(final String xmid, final String szdid, final String xmmc, final String xmfr, final String jhnd, final String ndjhtz1, final String ndjhtz2, final String szgqid, final String szgkid, final String xmlbid, final String sfyzjbzid);
+
+	@WebMethod(operationName = "findOne", action = "http://service.web.jsjty.com/findOne")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findOne(String id);
+}

gkjsjy/trunk/src/com/cxfws/xmxxgl/service/IXmxxglWebService.java

@@ -0,0 +1,16 @@
+package com.cxfws.xmxxgl.service;
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(targetNamespace="http://service.web.jsjty.com/",portName="xmxxglWebServicePort",serviceName="xmxxglWebService")
+public interface IXmxxglWebService {
+	@WebMethod(operationName = "findXmxx", action = "http://service.web.jsjty.com/findXmxx")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findXmxx(final String xmmc, final String szgkid, final String szgqid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid);
+	
+	@WebMethod(operationName = "findOne", action = "http://service.web.jsjty.com/findOne")
+	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
+	public String findOne(String id);
+}

gkjsjy/trunk/src/com/cxfws/xmxxgl/service/impl/JsjdglWebService.java

@@ -0,0 +1,630 @@
+package com.cxfws.xmxxgl.service.impl;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaBuilder.In;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.xmxxgl.service.IJsjdglWebService;
+import com.xt.jygl.accessory.entity.AccessoryEntity;
+import com.xt.jygl.accessory.service.AccessoryService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.common.Constants;
+import com.xt.jygl.common.Utils;
+import com.xt.jygl.gkjsgl.jsjdgl.entity.JsjdfjEntity;
+import com.xt.jygl.gkjsgl.jsjdgl.entity.XmxxglfbEntity;
+import com.xt.jygl.gkjsgl.jsjdgl.entity.XmyjhxxEntity;
+import com.xt.jygl.gkjsgl.jsjdgl.service.JsjdfjService;
+import com.xt.jygl.gkjsgl.jsjdgl.service.XmxxglfbService;
+import com.xt.jygl.gkjsgl.jsjdgl.service.XmyjhxxService;
+import com.xt.jygl.gkjsgl.jsjdgl.vo.JsjdfjVo;
+import com.xt.jygl.gkjsgl.jsjdgl.vo.XmxxglfbVo;
+import com.xt.jygl.gkjsgl.tzjhgl.entity.TzjhglEntity;
+import com.xt.jygl.gkjsgl.tzjhgl.service.TzjhglService;
+import com.xt.jygl.gkjsgl.tzjhgl.vo.TzjhglVo;
+import com.xt.jygl.gkjsgl.xmxxgl.entity.XmbwglbEntity;
+import com.xt.jygl.gkjsgl.xmxxgl.entity.XmxxglEntity;
+import com.xt.jygl.gkjsgl.xmxxgl.service.XmbwglbService;
+import com.xt.jygl.gkjsgl.xmxxgl.service.XmxxglService;
+import com.xt.jygl.gkjsgl.xmxxgl.service.XmxxgljggzService;
+import com.xt.jygl.gkjsgl.xmxxgl.vo.XmxxglVo;
+import com.xt.jygl.gkjygl.gkjyr.jyrbw.service.BwService;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.BwEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.vo.BwVo;
+import com.xt.jygl.workflow.entity.TaskInfoEntity;
+import com.xt.jygl.workflow.service.TaskInfoService;
+import com.xtframe.core.base.ctl.WebJsonResult;
+import com.xtframe.sec.code.entity.CodeEntity;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.utils.SecUtils;
+import com.xtframe.util.StringUtils;
+
+/**
+ * 建设进度管理
+ * 
+ * @author b_zhangdong
+ *
+ */
+@Service("jsjdglWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "jsjdglWebServicePort", serviceName = "jsjdglWebService")
+public class JsjdglWebService extends BaseWebCtl implements IJsjdglWebService {
+
+	@Autowired
+	protected TaskInfoService taskInfoService;
+
+	@Autowired
+	private XmxxglService xmxxglService;
+
+	@Autowired
+	private XmxxgljggzService xmxxgljggzService;
+
+	@Autowired
+	private AccessoryService accessoryService;
+
+	@Autowired
+	private XmbwglbService xmbwglbService;
+
+	@Autowired
+	private JsjdfjService jsjdfjService;
+
+	@Autowired
+	private BwService bwService;
+	
+	@Autowired
+	private TzjhglService tzjhglService;
+	
+	@Autowired
+	private XmyjhxxService xmyjhxxService;
+	
+	@Autowired
+	private XmxxglfbService xmxxglfbService;
+
+	/**
+	 * 获取进度列表
+	 */
+	@Override
+	public String findJsjdgl(final String xmmc, final String szdid, final String szgkid, final String szgqid, final String dqzt, final String xmfr, final String lcjd) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		Specification<XmxxglEntity> spec = new Specification<XmxxglEntity>() {
+			// 查询条件
+			@Override
+			public Predicate toPredicate(Root<XmxxglEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+				if (StringUtils.isNotEmpty(xmmc)) {
+					list.add(cb.like(root.get("xmmc").as(String.class), "%" + xmmc + "%"));
+				}
+				if (StringUtils.isNotEmpty(xmfr)) {
+					list.add(cb.like(root.get("xmfr").as(String.class), "%" + xmfr + "%"));
+				}
+				if (StringUtils.isNotEmpty(szdid)) {
+					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+				}
+				if (StringUtils.isNotEmpty(szgkid)) {
+					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+				}
+				if (StringUtils.isNotEmpty(szgqid)) {
+					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
+				}
+				Subquery<TaskInfoEntity> subquery = query.subquery(TaskInfoEntity.class);
+				Root<TaskInfoEntity> dpRoot = subquery.from(TaskInfoEntity.class);
+				subquery.select(dpRoot);
+				List<Predicate> subQueryPredicates = new ArrayList<Predicate>();
+				if (StringUtils.isNotEmpty(lcjd)) {
+					if (lcjd.equals("已完成")) {
+						list.add(cb.like(root.get("recordStatus").as(String.class), "%" + BaseEntity.RECORD_STATE_COMPLETED + "%"));
+					} else {
+						subQueryPredicates.add(cb.equal(root.get("id").as(String.class), dpRoot.get("busId").as(String.class)));
+						subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + lcjd + "%"));
+						subQueryPredicates.add(cb.equal(dpRoot.get("state").as(String.class), "3"));
+						subquery.where(subQueryPredicates.toArray(new Predicate[] {}));
+						list.add(cb.exists(subquery));
+					}
+				}
+				if (StringUtils.isNotEmpty(dqzt)) {
+					if (dqzt.equals("已完成")) {
+						list.add(cb.like(root.get("recordStatus").as(String.class), "%" + BaseEntity.RECORD_STATE_COMPLETED + "%"));
+					} else {
+						subQueryPredicates.add(cb.equal(root.get("id").as(String.class), dpRoot.get("busId").as(String.class)));
+						subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + dqzt + "%"));
+						if ("岸线利用审批".equals(dqzt)) {
+							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "岸线利用审批支撑文件审查" + "%"));
+						}
+						if ("项目审批、核准、备案".equals(dqzt)) {
+							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "项目审批、核准、备案支撑文件审查" + "%"));
+						}
+						if ("初步设计审批".equals(dqzt)) {
+							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "初步设计审批支撑文件审查" + "%"));
+						}
+						if ("施工图设计审批".equals(dqzt)) {
+							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "施工图设计审批支撑文件审查" + "%"));
+						}
+						if ("开工备案".equals(dqzt)) {
+							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "开工备案支撑文件审查" + "%"));
+						}
+						if ("交工验收".equals(dqzt)) {
+							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "交工验收" + "%"));
+						}
+						if ("试运行备案".equals(dqzt)) {
+							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "试运行备案" + "%"));
+						}
+						if ("竣工验收".equals(dqzt)) {
+							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "竣工验收" + "%"));
+						}
+						subquery.where(subQueryPredicates.toArray(new Predicate[] {}));
+						list.add(cb.exists(subquery));
+					}
+				}
+				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在港区的数据
+				if (isJyr()) {
+					list.add(cb.like(root.get("jyrid").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
+				} else {
+					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
+					@SuppressWarnings("unchecked")
+					List<String> gqlist = (List<String>) Utils.getSession().getAttribute("gqList");
+					if (gqlist != null && gqlist.size() > 0) {
+						for (int i = 0; i < gqlist.size(); i++) {
+							in.value(gqlist.get(i));
+						}
+						list.add(in);
+					}
+				}
+				// 只显示状态为8或者3的
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
+				return cb.and(list.toArray(new Predicate[] {}));
+			}
+		};
+
+		List<XmxxglEntity> list = query.findAll(spec, XmxxglEntity.class);
+
+		List<XmxxglVo> voList = new ArrayList<XmxxglVo>();
+		for (XmxxglEntity entity : list) {
+			XmxxglVo vo = new XmxxglVo();
+			if (null != entity) {
+				BeanUtils.copyProperties(entity, vo);
+				vo.setTzlxzw(entity.getTzlx() != null ? entity.getTzlx().getText() : "");
+				vo.setXmlxzw(entity.getXmlx() != null ? entity.getXmlx().getText() : "");
+				vo.setXmhzjbzw(entity.getXmhzjb() != null ? entity.getXmhzjb().getText() : "");
+				vo.setAxspjbzw(entity.getAxspjb() != null ? entity.getAxspjb().getText() : "");
+				vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+				vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+				vo.setJyrzw(entity.getJyrid() != null ? entity.getJyrid().getGkjyr() : "");
+
+				vo.setJyrid(entity.getJyrid() != null ? entity.getJyrid().getId() : "");
+				vo.setTzlx(entity.getTzlx() != null ? entity.getTzlx().getId() : "");
+				vo.setXmlx(entity.getXmlx() != null ? entity.getXmlx().getId() : "");
+				vo.setXmhzjb(entity.getXmhzjb() != null ? entity.getXmhzjb().getId() : "");
+				vo.setAxspjb(entity.getAxspjb() != null ? entity.getAxspjb().getId() : "");
+				vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+				vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
+				if (entity.getXmlx().getId().equals("2202")) {
+					List<TaskInfoEntity> listtask = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId().toString(), XmxxglEntity.PROCESS_DEFINITION_KEY2);
+					if (listtask.size() != 0) {
+						vo.setDqzt(listtask.get(0).getCurrName());
+						vo.setTaskkey(listtask.get(0).getTaskKey());
+					} else {
+						if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {
+							vo.setDqzt("已完成");
+						}
+						if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_VALID || entity.getRecordStatus() == 8) {
+							vo.setDqzt("未提交");
+						}
+					}
+
+				} else {
+					List<TaskInfoEntity> listtask = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId().toString(), XmxxglEntity.PROCESS_DEFINITION_KEY);
+					if (listtask.size() != 0) {
+						vo.setDqzt(listtask.get(0).getCurrName());
+						vo.setTaskkey(listtask.get(0).getTaskKey());
+					} else {
+						if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {
+							vo.setDqzt("已完成");
+						}
+						if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_VALID || entity.getRecordStatus() == 8) {
+							vo.setDqzt("未提交");
+						}
+					}
+				}
+				if (!isJyr()) {
+					if ((xmxxglService.getTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null) || xmxxgljggzService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null || xmxxglService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null || xmxxgljggzService.getTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null) {
+						vo.setTaskState(Constants.IS_MY_TASK);
+					}
+				} else {
+					if ((xmxxglService.getTaskByUserAndBusKey(SecUtils.getCurrUser().getSsjyr().getId().toString(), entity.getId().toString()) != null) || xmxxgljggzService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null || xmxxglService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null || xmxxgljggzService.getTaskByUserAndBusKey(SecUtils.getCurrUser().getSsjyr().getId().toString(), entity.getId().toString()) != null) {
+						vo.setTaskState(Constants.IS_MY_TASK);
+					}
+				}
+
+				voList.add(vo);
+			}
+		}
+		
+		return Object2JsonStr(voList);
+	}
+
+	/**
+	 * 获取进度详情
+	 */
+	@Override
+	public String findOne(String id) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		Map<String, Object> map = new HashMap<String, Object>();
+		// 附件
+		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jsjd");
+		List<JsjdfjVo> jsjdfjVoList = new ArrayList<>();
+		for (int i = 0; i < accessoryList.size(); i++) {
+			if (StringUtils.isNotEmpty(accessoryList.get(i).getRemark())) {
+				AccessoryEntity acc = accessoryList.get(i);
+				JsjdfjVo fjnamevo = new JsjdfjVo();
+				fjnamevo.setXhbz(acc.getRemark().substring(2, accessoryList.get(i).getRemark().length()));
+				fjnamevo.setFjid(acc.getId());
+				fjnamevo.setFjmc(acc.getName());
+				jsjdfjVoList.add(fjnamevo);
+			}
+		}
+
+		// 项目基本信息
+		XmxxglEntity entity = xmxxglService.findOne(id);
+		XmxxglVo vo = new XmxxglVo();
+		BeanUtils.copyProperties(entity, vo);
+		vo.setTzlxzw(entity.getTzlx() != null ? entity.getTzlx().getText() : "");
+		vo.setXmlxzw(entity.getXmlx() != null ? entity.getXmlx().getText() : "");
+		vo.setXmhzjbzw(entity.getXmhzjb() != null ? entity.getXmhzjb().getText() : "");
+		vo.setAxspjbzw(entity.getAxspjb() != null ? entity.getAxspjb().getText() : "");
+		if (entity.getJyrid() != null) {
+			vo.setSzddzw(entity.getJyrid().getSzd() != null ? entity.getJyrid().getSzd().getText() : "");
+			vo.setSzd(entity.getJyrid().getSzd() != null ? entity.getJyrid().getSzd().getId() : "");
+		}
+
+		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+		vo.setJyrzw(entity.getJyrid() != null ? entity.getJyrid().getGkjyr() : "");
+		vo.setZyhbwflzw(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getText() : "");
+		vo.setTzlx(entity.getTzlx() != null ? entity.getTzlx().getId() : "");
+		vo.setXmlx(entity.getXmlx() != null ? entity.getXmlx().getId() : "");
+		vo.setXmhzjb(entity.getXmhzjb() != null ? entity.getXmhzjb().getId() : "");
+		vo.setAxspjb(entity.getAxspjb() != null ? entity.getAxspjb().getId() : "");
+		vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
+		vo.setJyrid(entity.getJyrid() != null ? entity.getJyrid().getId() : "");
+		vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().getText() : "");
+		if (entity.getBwyt() != null) {
+			String bwytzw = "";
+			String[] s = entity.getBwyt().split(",");
+			for (int i = 0; i < s.length; i++) {
+				if (i != s.length - 1) {
+					bwytzw += securityMgr.codeService().findOne(s[i]).getText() + ",";
+				} else {
+					bwytzw += securityMgr.codeService().findOne(s[i]).getText();
+				}
+			}
+			vo.setBwytzw(bwytzw);
+		}
+		String bwids = "";
+		List<XmbwglbEntity> bwlist = xmbwglbService.findByXmid(entity.getId());
+		if (bwlist != null && bwlist.size() > 0) {
+			for (XmbwglbEntity xmbw : bwlist) {
+				bwids = bwids + xmbw.getBwid() + ",";
+			}
+			bwids = bwids.substring(0, bwids.length() - 1);
+		}
+		vo.setBwids(bwids);
+
+		// 项目泊位关联信息
+		List<XmbwglbEntity> xmbwlist = xmbwglbService.findByXmid(entity.getId());
+		// 泊位信息
+		List<BwEntity> bwList = new ArrayList<BwEntity>();
+		if (xmbwlist != null && xmbwlist.size() > 0) {
+			for (XmbwglbEntity xm : xmbwlist) {
+				BwEntity bw = bwService.findOne(xm.getBwid());
+				bwList.add(bw);
+			}
+		}
+		
+		List<BwVo> voList = new ArrayList<BwVo>();
+		for (BwEntity entitybw : bwList) {
+			BwVo vobw = new BwVo();
+			if (entitybw != null) {
+				BeanUtils.copyProperties(entitybw, vobw);
+				vobw.setSzdzw(entitybw.getSzd() != null ? entitybw.getSzd().getText() : "");
+				vobw.setSzgkzw(entitybw.getSzgk() != null ? entitybw.getSzgk().getGkmc() : "");
+				vobw.setSzgqzw(entitybw.getSzgq() != null ? entitybw.getSzgq().getGqmc() : "");
+				vobw.setSsjyrzw(entitybw.getSsjyr() != null ? entitybw.getSsjyr().getGkjyr() : "");
+				vobw.setSsmtzw(entitybw.getSsmt() != null ? entitybw.getSsmt().getMtmc() : "");
+				vobw.setBwsxzw(entitybw.getBwsx() != null ? entitybw.getBwsx().getText() : "");
+				vobw.setFwlxzw(entitybw.getFwlx() != null ? entitybw.getFwlx().getText() : "");
+				vobw.setWxpbwzw(entitybw.getWxpbw() != null ? entitybw.getWxpbw().getText() : "");
+				vobw.setZyhbwflzw(entitybw.getZyhbwfl() != null ? entitybw.getZyhbwfl().getText() : "");
+				vobw.setSffzzw(entitybw.getSffz() != null ? entitybw.getSffz().getText() : "");
+				vobw.setSfdwkfzw(entitybw.getSfdwkf() != null ? entitybw.getSfdwkf().getText() : "");
+				vobw.setBwszsxzw(entitybw.getBwszsx() != null ? entitybw.getBwszsx().getText() : "");
+				vobw.setSclxzw(entitybw.getSclx() != null ? entitybw.getSclx().getText() : "");
+				vobw.setJgxszw(entitybw.getJgxs() != null ? entitybw.getJgxs().getText() : "");
+				if (entitybw.getBwyt() != null) {
+					String bwytzw = "";
+					String[] s = entitybw.getBwyt().split(",");
+					for (int i = 0; i < s.length; i++) {
+						CodeEntity ce = securityMgr.codeService().findOne(s[i]);
+						if (ce != null) {
+							bwytzw += ce.getText();
+							if (i != s.length - 1) {
+								bwytzw += ",";
+							}
+						}
+					}
+					vobw.setBwytzw(bwytzw);
+				}
+
+				vobw.setSzd(entitybw.getSzd() != null ? entitybw.getSzd().getId() : "");
+				vobw.setSzgk(entitybw.getSzgk() != null ? entitybw.getSzgk().getId() : "");
+				vobw.setSzgq(entitybw.getSzgq() != null ? entitybw.getSzgq().getId() : "");
+				vobw.setSsjyr(entitybw.getSsjyr() != null ? entitybw.getSsjyr().getId() : "");
+				vobw.setSsmt(entitybw.getSsmt() != null ? entitybw.getSsmt().getId() : "");
+				vobw.setBwsx(entitybw.getBwsx() != null ? entitybw.getBwsx().getId() : "");
+				vobw.setFwlx(entitybw.getFwlx() != null ? entitybw.getFwlx().getId() : "");
+				vobw.setWxpbw(entitybw.getWxpbw() != null ? entitybw.getWxpbw().getId() : "");
+				vobw.setZyhbwfl(entitybw.getZyhbwfl() != null ? entitybw.getZyhbwfl().getId() : "");
+				vobw.setSffz(entitybw.getSffz() != null ? entitybw.getSffz().getId() : "");
+				vobw.setSfdwkf(entitybw.getSfdwkf() != null ? entitybw.getSfdwkf().getId() : "");
+				vobw.setBwszsx(entitybw.getBwszsx() != null ? entitybw.getBwszsx().getId() : "");
+				vobw.setSclx(entitybw.getSclx() != null ? entitybw.getSclx().getId() : "");
+				vobw.setJgxs(entitybw.getJgxs() != null ? entitybw.getJgxs().getId() : "");
+				vobw.setXkzid(entitybw.getXkzid() != null ? entitybw.getXkzid() : "");
+
+				vobw.setSszyq(entitybw.getSszyq() != null ? entitybw.getSszyq().getId() : "");
+				vobw.setSszyqzw(entitybw.getSszyq() != null ? entitybw.getSszyq().getZyqmc() : "");
+				vobw.setZls(entitybw.getZls() != null ? entitybw.getZls().getId() : "");
+				vobw.setZlszw(entitybw.getZls() != null ? entitybw.getZls().getText() : "");
+				vobw.setXp(entitybw.getXp() != null ? entitybw.getXp().getId() : "");
+				vobw.setXpzw(entitybw.getXp() != null ? entitybw.getXp().getText() : "");
+
+				voList.add(vobw);
+
+			}
+		}
+
+		// 附件字段
+		List<JsjdfjEntity> fjlist = jsjdfjService.findByEntity(entity, "ptfj");
+		List<JsjdfjVo> jsjdfjVoList1 = new ArrayList<>();
+		SimpleDateFormat dateFormater = new SimpleDateFormat("yyyy-MM-dd");
+		for (int i = 0; i < fjlist.size(); i++) {
+			// 从发布单位中获取标识位
+			if (StringUtils.isNotEmpty(fjlist.get(i).getFjbz())) {
+				String s = fjlist.get(i).getFjbz().substring(0, 2);
+				Date date = fjlist.get(i).getFbsj();
+
+				JsjdfjVo fjvo = new JsjdfjVo();
+				fjvo.setFjbz(fjlist.get(i).getFjbz().substring(2, fjlist.get(i).getFjbz().length()));
+				if (date != null) {
+					String date2 = dateFormater.format(date);
+					fjvo.setFbsj(date2);
+				}
+				fjvo.setFbdw(fjlist.get(i).getFbdw());
+				fjvo.setWjh(fjlist.get(i).getWjh());
+				fjvo.setId(fjlist.get(i).getId());
+				jsjdfjVoList1.add(fjvo);
+			}
+		}
+		// 其他附件和字段
+		List<JsjdfjEntity> qtfjzdlist = jsjdfjService.findByEntity(entity, "jsjdqtfj");
+
+		// 流程历史
+		List<TaskInfoEntity> historyList = new ArrayList<TaskInfoEntity>();
+		if (entity.getXmlx().getId().equals("2202")) {
+			historyList = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, XmxxglEntity.PROCESS_DEFINITION_KEY2);
+		} else {
+			historyList = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, XmxxglEntity.PROCESS_DEFINITION_KEY);
+		}
+		map.put("accessoryList", jsjdfjVoList);
+		map.put("xmxx", vo);
+		map.put("bwList", voList);
+		map.put("qtfjzdlist", qtfjzdlist);
+		map.put("fjlist", jsjdfjVoList1);
+		map.put("historyList", historyList);
+		
+		return Object2JsonStr(map);
+	}
+	
+
+	/**
+	 * 获取流程历史
+	 */
+	@Override
+	public String findHistoryAudit(String id,String sortno) {
+		XmxxglfbVo vo = new XmxxglfbVo();
+		try {
+			XmxxglfbEntity xmxxfb = xmxxglfbService.findByXmidAndSortno(id, sortno);
+			if (xmxxfb != null) {
+				BeanUtils.copyProperties(xmxxfb, vo);
+				vo.setTzlxzw(xmxxfb.getTzlx() != null ? xmxxfb.getTzlx().getText() : "");
+				vo.setXmlxzw(xmxxfb.getXmlx() != null ? xmxxfb.getXmlx().getText() : "");
+				vo.setXmhzjbzw(xmxxfb.getXmhzjb() != null ? xmxxfb.getXmhzjb().getText() : "");
+				vo.setAxspjbzw(xmxxfb.getAxspjb() != null ? xmxxfb.getAxspjb().getText() : "");
+				vo.setSzgkzw(xmxxfb.getSzgk() != null ? xmxxfb.getSzgk().getGkmc() : "");
+				vo.setSzgqzw(xmxxfb.getSzgq() != null ? xmxxfb.getSzgq().getGqmc() : "");
+				vo.setSzdzw(xmxxfb.getSzd() != null ? xmxxfb.getSzd().getText() : "");
+				vo.setZyhbwflzw(xmxxfb.getZyhbwfl() != null ? xmxxfb.getZyhbwfl().getText() : "");
+
+				vo.setTzlx(xmxxfb.getTzlx() != null ? xmxxfb.getTzlx().getId() : "");
+				vo.setXmlx(xmxxfb.getXmlx() != null ? xmxxfb.getXmlx().getId() : "");
+				vo.setXmhzjb(xmxxfb.getXmhzjb() != null ? xmxxfb.getXmhzjb().getId() : "");
+				vo.setAxspjb(xmxxfb.getAxspjb() != null ? xmxxfb.getAxspjb().getId() : "");
+				vo.setSzd(xmxxfb.getSzd() != null ? xmxxfb.getSzd().getId() : "");
+				vo.setSzgk(xmxxfb.getSzgk() != null ? xmxxfb.getSzgk().getId() : "");
+				vo.setSzgq(xmxxfb.getSzgq() != null ? xmxxfb.getSzgq().getId() : "");
+				vo.setYj(xmxxfb.getYj() != null ? xmxxfb.getYj() : "");
+				vo.setZyhbwfl(xmxxfb.getZyhbwfl() != null ? xmxxfb.getZyhbwfl().getId() : "");
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return Object2JsonStr(vo);
+	}
+
+	/**
+	 * 查询实施过程和详情
+	 */
+	@Override
+	public String findSsgc(String xmid) {
+		List<TzjhglVo> voList = new ArrayList<TzjhglVo>();
+
+		List<TzjhglEntity> tzjhlist = tzjhglService.findByXmid(xmid);
+		for (int i = 0; i < tzjhlist.size(); i++) {
+			TzjhglVo vo = new TzjhglVo();
+			vo.setId2(tzjhlist.get(i) != null ? tzjhlist.get(i).getId() : "");
+			vo.setNdjhtz(tzjhlist.get(i).getNdjhtz());
+			vo.setJhnd(tzjhlist.get(i) != null ? tzjhlist.get(i).getJhnd() : "");
+			// 获取当前月份
+			Calendar cal = Calendar.getInstance();
+			int month = cal.get(Calendar.MONTH) + 1;
+			// 根据项目id，年度，月份查询当前数据
+			XmyjhxxEntity entity = xmyjhxxService.findByJhndAndXmidAndYf(xmid, vo.getJhnd(), month + "");
+			if (entity != null) {
+				vo.setDqydtz((entity.getSjwctze() != null ? entity.getSjwctze().toString() : ""));
+				vo.setDqxxjd(entity.getDqxxjd() != null ? entity.getDqxxjd() : "");
+				vo.setXxjdwcqkfx(entity.getXxjdwcqkfx() != null ? entity.getXxjdwcqkfx() : "");
+			}
+			voList.add(vo);
+		}
+		return Object2JsonStr(voList);
+	}
+
+	/**
+	 * 根据资源id查询建设进度信息
+	 */
+	@Override
+	public String findJsjdByZyid(String zyid) {
+		List<XmxxglEntity> xmxxList = new ArrayList<XmxxglEntity>();
+		List<XmxxglVo> xmxxVoList = new ArrayList<>();
+		List<BwEntity> bwList = bwService.findByMtid(zyid);
+		if ( bwList !=null && bwList.size()>0){
+			for (BwEntity bw : bwList){
+				List<XmbwglbEntity> xmbwlist = xmbwglbService.findByBwid(bw.getId());
+				if ( xmbwlist !=null && xmbwlist.size()>0){
+					for (XmbwglbEntity xb : xmbwlist){
+						XmxxglEntity entity = xmxxglService.findOne(xb.getXmid());
+						if(!xmxxList.contains(entity)){
+							xmxxList.add(entity);
+						}
+					}
+				}
+			}
+		}
+		
+		
+		for (XmxxglEntity entity : xmxxList){
+			XmxxglVo vo = new XmxxglVo();
+			BeanUtils.copyProperties(entity, vo);
+			vo.setTzlxzw(entity.getTzlx() != null ? entity.getTzlx().getText() : "");
+			vo.setXmlxzw(entity.getXmlx() != null ? entity.getXmlx().getText() : "");
+			vo.setXmhzjbzw(entity.getXmhzjb() != null ? entity.getXmhzjb().getText() : "");
+			vo.setAxspjbzw(entity.getAxspjb() != null ? entity.getAxspjb().getText() : "");
+			vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+			vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+			vo.setZyhbwflzw(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getText() : "");
+			vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().getText() : "");
+			vo.setSylx(entity.getSylx() != null ? entity.getSylx().getId() : "");
+			vo.setSzddzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
+			if (entity.getBwyt() != null) {
+				String bwytzw = "";
+				String[] s = entity.getBwyt().split(",");
+				for (int i = 0; i < s.length; i++) {
+					CodeEntity code = securityMgr.codeService().findOne(s[i]);
+					if (code != null) {
+						bwytzw += code.getText() + ",";
+					}
+				}
+				if (!StringUtils.isEmpty(bwytzw)) {
+					bwytzw = bwytzw.substring(0, bwytzw.length() - 1);
+				}
+				vo.setBwytzw(bwytzw);
+			}
+			String bwids = "";
+			List<XmbwglbEntity> list = xmbwglbService.findByXmid(entity.getId());
+			if (list != null && list.size() > 0) {
+				for (XmbwglbEntity xmbw : list) {
+					bwids = bwids + xmbw.getBwid() + ",";
+				}
+				bwids = bwids.substring(0, bwids.length() - 1);
+			}
+			vo.setBwids(bwids);
+			vo.setTzlx(entity.getTzlx() != null ? entity.getTzlx().getId() : "");
+			vo.setXmlx(entity.getXmlx() != null ? entity.getXmlx().getId() : "");
+			vo.setXmhzjb(entity.getXmhzjb() != null ? entity.getXmhzjb().getId() : "");
+			vo.setAxspjb(entity.getAxspjb() != null ? entity.getAxspjb().getId() : "");
+			vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+			vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
+			vo.setZyhbwfl(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getId() : "");
+			xmxxVoList.add(vo);
+		}
+		
+		
+		return Object2JsonStr(xmxxVoList);
+	}
+
+	/**
+	 *根据id获取项目历史流程信息
+	 */
+	@Override
+	public String findLslc(String id) {
+		XmxxglEntity xmxxgl = xmxxglService.findOne(id);
+		List<XmxxglfbVo> voList = new ArrayList<XmxxglfbVo>();
+		if (xmxxgl.getXmlx().getId().equals("2202")) {
+			List<TaskInfoEntity> list = taskInfoService.findByBusIdAndBusKeyOrderByIdAsc(id, XmxxglEntity.PROCESS_DEFINITION_KEY2);
+			lclslist(list, voList);
+		} else {
+			List<TaskInfoEntity> list = taskInfoService.findByBusIdAndBusKeyOrderByIdAsc(id, XmxxglEntity.PROCESS_DEFINITION_KEY);
+			lclslist(list, voList);
+		}
+		return Object2JsonStr(voList);
+	}
+	
+	public void lclslist(List<TaskInfoEntity> list, List<XmxxglfbVo> voList) {
+		for (int i = 0; i < list.size(); i++) {
+			XmxxglfbVo vo = new XmxxglfbVo();
+			vo.setCurrentname(list.get(i).getCurrName() != null ? list.get(i).getCurrName() : "");
+			vo.setAuditusername(list.get(i).getAuditUsername() != null ? list.get(i).getAuditUsername() : "");
+			vo.setSpyj(list.get(i).getAuditMsg() != null ? list.get(i).getAuditMsg() : "");
+			vo.setCljg(list.get(i).getAuditResult() != null ? list.get(i).getAuditResult() : "");
+			if (vo.getCljg().equals("false")) {
+				vo.setCljg("退回");
+			} else if (vo.getCljg().equals("true") && vo.getCurrentname().contains("审查")) {
+				vo.setCljg("同意");
+			} else if (vo.getCljg().equals("true") && vo.getCurrentname().contains("提交")) {
+				vo.setCljg("提交");
+			} else if (vo.getCljg().equals("1")) {
+				vo.setCljg("提交");
+			} else {
+				vo.setCljg("");
+			}
+			SimpleDateFormat dateFormater = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			if (list.get(i).getAuditTime() != null) {
+				Date date = list.get(i).getAuditTime();
+				String date2 = dateFormater.format(date);
+				vo.setAudittime(date2 != null ? date2 : "");
+			}
+			voList.add(vo);
+		}
+	}
+}

gkjsjy/trunk/src/com/cxfws/xmxxgl/service/impl/TzjhglWebService.java

@@ -0,0 +1,174 @@
+package com.cxfws.xmxxgl.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaBuilder.In;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.xmxxgl.service.ITzjhglWebService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.common.Utils;
+import com.xt.jygl.gkjsgl.tzjhgl.entity.TzjhglEntity;
+import com.xt.jygl.gkjsgl.tzjhgl.service.TzjhglService;
+import com.xt.jygl.gkjsgl.tzjhgl.vo.TzjhglVo;
+import com.xt.jygl.gkjsgl.xmxxgl.entity.XmxxglEntity;
+import com.xt.jygl.gkjsgl.xmxxgl.service.XmxxglService;
+import com.xt.jygl.workflow.entity.TaskInfoEntity;
+import com.xt.jygl.workflow.service.TaskInfoService;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.util.StringUtils;
+
+/**
+ * 投资计划管理
+ * 
+ * @author b_zhangdong
+ *
+ */
+@Service("tzjhglWebService")
+@WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "tzjhglWebServicePort", serviceName = "tzjhglWebService")
+public class TzjhglWebService extends BaseWebCtl implements ITzjhglWebService {
+
+	@Autowired
+	protected TaskInfoService taskInfoService;
+
+	@Autowired
+	private XmxxglService xmxxglService;
+
+	@Autowired
+	private TzjhglService tzjhglService;
+	
+	/**
+	 * 获取投资计划详情
+	 */
+	@Override
+	public String findOne(String id) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		TzjhglEntity entity = tzjhglService.findOne(id);
+		TzjhglVo vo = new TzjhglVo();
+		BeanUtils.copyProperties(entity, vo);
+		if (!StringUtils.isEmpty(entity.getXmid())) {
+			vo.setSzgkzw(entity.getXmid().getSzgk() != null ? entity.getXmid().getSzgk().getGkmc() : "");
+			vo.setSzgqzw(entity.getXmid().getSzgq() != null ? entity.getXmid().getSzgq().getGqmc() : "");
+		}
+		vo.setXmmczw(entity.getXmid() != null ? entity.getXmid().getXmmc() : "");
+		vo.setXmlbzw(entity.getXmlb() != null ? entity.getXmlb().getText() : "");
+		vo.setXmlb(entity.getXmlb() != null ? entity.getXmlb().getId() : "");
+		vo.setSfyzjbzzw(entity.getSfyzjbz() != null ? entity.getSfyzjbz().getText() : "");
+		vo.setSfyzjbz(entity.getSfyzjbz() != null ? entity.getSfyzjbz().getId() : "");
+		return Object2JsonStr(vo);
+	}
+	
+	/**
+	 * 投资计划列表
+	 */
+	@Override
+	public String findTzjhgl(final String xmid,final String szdid,final String xmmc,final String xmfr,final String jhnd,final String ndjhtz1,final String ndjhtz2,final String szgqid,final String szgkid,final String xmlbid,final String sfyzjbzid) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		Specification<TzjhglEntity> spec = new Specification<TzjhglEntity>() {
+			// 查询条件
+			@Override
+			public Predicate toPredicate(Root<TzjhglEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+
+				if (StringUtils.isNotEmpty(xmid)) {
+					XmxxglEntity xmxx = xmxxglService.findOne(xmid);
+					if (StringUtils.isNotEmpty(xmxx.getXmmc())) {
+						list.add(cb.like(root.get("xmid").get("xmmc").as(String.class), "%" + xmxx.getXmmc() + "%"));
+					}
+				}
+				if (StringUtils.isNotEmpty(xmmc)) {
+					list.add(cb.like(root.get("xmid").get("xmmc").as(String.class), "%" + xmmc + "%"));
+				}
+				if (StringUtils.isNotEmpty(xmfr)) {
+					list.add(cb.like(root.get("xmid").get("xmfr").as(String.class), "%" + xmfr + "%"));
+				}
+				if (StringUtils.isNotEmpty(jhnd)) {
+					list.add(cb.like(root.get("jhnd").as(String.class), "%" + jhnd + "%"));
+				}
+				if (StringUtils.isNotEmpty(szdid)) {
+					list.add(cb.like(root.get("xmid").get("szd").get("id").as(String.class), "%" + szdid + "%"));
+				}
+				if (StringUtils.isNotEmpty(szgkid)) {
+					list.add(cb.like(root.get("xmid").get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+				}
+				if (StringUtils.isNotEmpty(szgqid)) {
+					list.add(cb.like(root.get("xmid").get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
+				}
+				if (StringUtils.isNotEmpty(xmlbid)) {
+					list.add(cb.like(root.get("xmlb").get("id").as(String.class), "%" + xmlbid + "%"));
+				}
+				if (ndjhtz1 != null) {
+					list.add(cb.greaterThanOrEqualTo(root.get("ndjhtz").as(Double.class), Double.parseDouble(ndjhtz1)));
+				}
+				if (ndjhtz2 != null) {
+					list.add(cb.lessThanOrEqualTo(root.get("ndjhtz").as(Double.class), Double.parseDouble(ndjhtz2)));
+				}
+				if (StringUtils.isNotEmpty(sfyzjbzid)) {
+					list.add(cb.like(root.get("sfyzjbz").get("id").as(String.class), "%" + sfyzjbzid + "%"));
+				}
+				if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
+					list.add(cb.like(root.get("createUser").as(String.class), "%" + securityMgr.getCurrUser().getId() + "%"));
+				}
+				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在港区的数据
+				if (isJyr()) {
+					list.add(cb.like(root.get("xmid").get("jyrid").get("id").as(String.class), "%"
+							+ getSsjyr().getId() + "%"));
+				} else {
+					In<String> in = cb.in(root.get("xmid").get("szgq").get("id").as(String.class));
+					@SuppressWarnings("unchecked")
+					List<String> gqlist = (List<String>) Utils.getSession()
+							.getAttribute("gqList");
+					if (gqlist != null && gqlist.size() > 0) {
+						for (int i = 0; i < gqlist.size(); i++) {
+							in.value(gqlist.get(i));
+						}
+						list.add(in);
+					}
+				}
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+				return cb.and(list.toArray(new Predicate[] {}));
+			}
+		};
+		
+		List<TzjhglEntity> list = query.findAll(spec, TzjhglEntity.class);
+		List<TzjhglVo> voList = new ArrayList<TzjhglVo>();
+		for (TzjhglEntity entity : list) {
+			TzjhglVo vo = new TzjhglVo();
+			if (null != entity) {
+				BeanUtils.copyProperties(entity, vo);
+				if (!StringUtils.isEmpty(entity.getXmid())) {
+					vo.setSzgkzw(entity.getXmid().getSzgk() != null ? entity.getXmid().getSzgk().getGkmc() : "");
+					vo.setSzgqzw(entity.getXmid().getSzgq() != null ? entity.getXmid().getSzgq().getGqmc() : "");
+				}
+				vo.setXmfr(entity.getXmid() != null ? entity.getXmid().getXmfr() : "");
+				vo.setXmmczw(entity.getXmid() != null ? entity.getXmid().getXmmc() : "");
+				vo.setXmlbzw(entity.getXmlb() != null ? entity.getXmlb().getText() : "");
+				vo.setXmlb(entity.getXmlb() != null ? entity.getXmlb().getId() : "");
+				vo.setXmid(entity.getXmid() != null ? entity.getXmid().getId() : "");
+				vo.setSfyzjbzzw(entity.getSfyzjbz() != null ? entity.getSfyzjbz().getText() : "");
+				List<TaskInfoEntity> listtask = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(vo.getXmid(), XmxxglEntity.PROCESS_DEFINITION_KEY);
+				String flag = "";
+				if (listtask.size() != 0 || entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {
+					flag = "1";
+					vo.setFlag(flag);
+				}
+				voList.add(vo);
+			}
+		}
+		return Object2JsonStr(voList); 
+	}
+}

gkjsjy/trunk/src/com/cxfws/xmxxgl/service/impl/XmxxglWebService.java

@@ -0,0 +1,340 @@
+package com.cxfws.xmxxgl.service.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.jws.WebService;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaBuilder.In;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import com.cxfws.xmxxgl.service.IXmxxglWebService;
+import com.xt.jygl.accessory.entity.AccessoryEntity;
+import com.xt.jygl.accessory.service.AccessoryService;
+import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.gkjcxx.gq.service.GqService;
+import com.xt.jygl.gkjsgl.jsjdgl.vo.JsjdfjVo;
+import com.xt.jygl.gkjsgl.tzjhgl.entity.TzjhglEntity;
+import com.xt.jygl.gkjsgl.tzjhgl.service.TzjhglService;
+import com.xt.jygl.gkjsgl.xmxxgl.entity.XmbwglbEntity;
+import com.xt.jygl.gkjsgl.xmxxgl.entity.XmxxglEntity;
+import com.xt.jygl.gkjsgl.xmxxgl.service.XmbwglbService;
+import com.xt.jygl.gkjsgl.xmxxgl.service.XmxxglService;
+import com.xt.jygl.gkjsgl.xmxxgl.vo.XmxxglVo;
+import com.xt.jygl.gkjygl.gkjyr.jyrbw.service.BwService;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.BwEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.vo.BwVo;
+import com.xt.jygl.workflow.entity.TaskInfoEntity;
+import com.xt.jygl.workflow.service.TaskInfoService;
+import com.xtframe.core.support.SecurityMgr;
+import com.xtframe.sec.code.entity.CodeEntity;
+import com.xtframe.sec.common.BaseEntity;
+import com.xtframe.sec.common.QueryService;
+import com.xtframe.sec.utils.SecUtils;
+import com.xtframe.util.StringUtils;
+
+@Service("xmxxglWebService")
+@WebService(targetNamespace="http://service.web.jsjty.com/",portName="xmxxglWebServicePort",serviceName="xmxxglWebService")
+public class XmxxglWebService extends BaseWebCtl implements IXmxxglWebService {
+	
+	@Autowired
+	private SecurityMgr securityMgr;
+	@Autowired
+	private QueryService query;
+	@Autowired
+	private XmxxglService xmxxglService;
+	@Autowired
+	private AccessoryService accessoryService;
+	@Autowired
+	protected TaskInfoService taskInfoService;
+	@Autowired
+	private TzjhglService tzjhglService;
+	@Autowired
+	private BwService bwService;
+	@Autowired
+	private XmbwglbService xmbwglbService;
+	@Autowired
+	private GqService gqService;
+	/**
+	 * 获取项目基本信息
+	 */
+	@Override
+	public String findXmxx(final String xmmc,final String szgkid,final String szgqid, final String xmhzjbid,final String xmfr,final String szdid, final String sfyzjbzid) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		Specification<XmxxglEntity> spec = new Specification<XmxxglEntity>() {
+			// 查询条件
+			@Override
+			public Predicate toPredicate(Root<XmxxglEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+				List<Predicate> list = new ArrayList<Predicate>();
+				if (StringUtils.isNotEmpty(xmmc)) {
+					list.add(cb.like(root.get("xmmc").as(String.class), "%" + xmmc + "%"));
+				} 
+				if (StringUtils.isNotEmpty(xmfr)) {
+					list.add(cb.like(root.get("xmfr").as(String.class), "%" + xmfr + "%"));
+				}
+				if (StringUtils.isNotEmpty(xmhzjbid)) {
+					list.add(cb.like(root.get("xmhzjb").get("id").as(String.class), "%" + xmhzjbid + "%"));
+				}
+				if (StringUtils.isNotEmpty(szdid)) {
+					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+				}
+				if (StringUtils.isNotEmpty(szgkid)) {
+					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+				}
+				if (StringUtils.isNotEmpty(szgqid)) {
+					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
+				} 
+				if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
+					list.add(cb.like(root.get("jyrid").get("id").as(String.class), "%" + securityMgr.getCurrUser().getSsjyr().getId() + "%"));
+				}
+
+				Subquery<TzjhglEntity> subquery = query.subquery(TzjhglEntity.class);
+				Root<TzjhglEntity> dpRoot = subquery.from(TzjhglEntity.class);
+				subquery.select(dpRoot);
+				List<Predicate> subQueryPredicates = new ArrayList<Predicate>();
+				if (StringUtils.isNotEmpty(sfyzjbzid)) {
+					subQueryPredicates.add(cb.equal(dpRoot.get("xmid").get("id").as(String.class), root.get("id").as(String.class)));
+					if (sfyzjbzid.equals("201")) {
+						subQueryPredicates.add(cb.equal(dpRoot.get("sfyzjbz").get("id").as(String.class), sfyzjbzid));
+						subquery.where(subQueryPredicates.toArray(new Predicate[] {}));
+						list.add(cb.exists(subquery));
+					} else {
+						subQueryPredicates.add(cb.equal(dpRoot.get("sfyzjbz").get("id").as(String.class), "201"));
+						subquery.where(subQueryPredicates.toArray(new Predicate[] {}));
+						list.add(cb.exists(subquery).not());
+					}
+				} 
+				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在港区的数据
+				if (isJyr()) {
+					list.add(cb.like(root.get("jyrid").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
+				} else {
+					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
+					List<String> gqlist = gqService.findGqListByUserId(SecUtils.getCurrUser().getId());
+					if (gqlist != null && gqlist.size() > 0) {
+						for (int i = 0; i < gqlist.size(); i++) {
+							in.value(gqlist.get(i));
+						}
+						list.add(in);
+					}
+				}
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+				return cb.and(list.toArray(new Predicate[] {}));
+			}
+		};
+
+		List<XmxxglEntity> list = query.findAll(spec, XmxxglEntity.class);
+		List<XmxxglVo> voList = new ArrayList<XmxxglVo>();
+		for (XmxxglEntity entity : list) {
+			XmxxglVo vo = new XmxxglVo();
+			if (null != entity) {
+				BeanUtils.copyProperties(entity, vo);
+				vo.setTzlxzw(entity.getTzlx() != null ? entity.getTzlx().getText() : "");
+				vo.setXmlxzw(entity.getXmlx() != null ? entity.getXmlx().getText() : "");
+				vo.setXmhzjbzw(entity.getXmhzjb() != null ? entity.getXmhzjb().getText() : "");
+				vo.setAxspjbzw(entity.getAxspjb() != null ? entity.getAxspjb().getText() : "");
+				vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+				vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+				if (entity.getJyrid() != null) {
+					vo.setSzddzw(entity.getJyrid().getSzd() != null ? entity.getJyrid().getSzd().getText() : "");
+					vo.setSzd(entity.getJyrid().getSzd() != null ? entity.getJyrid().getSzd().getId() : "");
+				}
+
+				vo.setTzlx(entity.getTzlx() != null ? entity.getTzlx().getId() : "");
+				vo.setXmlx(entity.getXmlx() != null ? entity.getXmlx().getId() : "");
+				vo.setXmhzjb(entity.getXmhzjb() != null ? entity.getXmhzjb().getId() : "");
+				vo.setAxspjb(entity.getAxspjb() != null ? entity.getAxspjb().getId() : "");
+				vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+				vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
+				if (entity.getRecordStatus() == 8) {
+					vo.setShowjsjd("Y");
+				} else {
+					vo.setShowjsjd("N");
+				}
+				List<TzjhglEntity> tzjh = tzjhglService.findByXmid(entity.getId() != null ? entity.getId() : "");
+				if (tzjh.size() != 0) {
+					String flagForYear = "1";
+					vo.setFlagForYear(flagForYear);
+				}
+				List<TaskInfoEntity> listtask = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId().toString(), XmxxglEntity.PROCESS_DEFINITION_KEY);
+				String flag = "";
+				if (listtask.size() != 0 || entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {
+					flag = "1";
+					vo.setFlag(flag);
+				}
+				boolean judge = false;
+				for (TzjhglEntity tz : tzjh) {
+					if (("是").equals(tz.getSfyzjbz().getText())) {
+						judge = true;
+					}
+
+				}
+				if (judge) {
+					vo.setSfyzjbz("是");
+				} else {
+					vo.setSfyzjbz("否");
+				}
+
+				voList.add(vo);
+			}
+		}
+		return Object2JsonStr(voList);
+	}
+
+	@Override
+	public String findOne(String id) {
+		if (!this.checkUser()){
+			return BaseWebCtl.NOLOGIN;
+		}
+		Map<String,Object> map = new HashMap<String,Object>();
+	
+		// 附件
+		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "1");
+		List<JsjdfjVo> jsjdfjVoList = new ArrayList<>();
+		for (int i = 0; i < accessoryList.size(); i++) {
+			if (StringUtils.isNotEmpty(accessoryList.get(i).getRemark())) {
+				AccessoryEntity acc = accessoryList.get(i);
+				JsjdfjVo fjnamevo = new JsjdfjVo();
+				fjnamevo.setXhbz(acc.getRemark().substring(2, accessoryList.get(i).getRemark().length()));
+				fjnamevo.setFjid(acc.getId());
+				fjnamevo.setFjmc(acc.getName());
+				jsjdfjVoList.add(fjnamevo);
+			}
+		}
+		// 项目基本信息
+		XmxxglEntity entity = xmxxglService.findOne(id);
+		XmxxglVo vo = new XmxxglVo();
+		BeanUtils.copyProperties(entity, vo);
+		vo.setTzlxzw(entity.getTzlx() != null ? entity.getTzlx().getText() : "");
+		vo.setXmlxzw(entity.getXmlx() != null ? entity.getXmlx().getText() : "");
+		vo.setXmhzjbzw(entity.getXmhzjb() != null ? entity.getXmhzjb().getText() : "");
+		vo.setAxspjbzw(entity.getAxspjb() != null ? entity.getAxspjb().getText() : "");
+		if (entity.getJyrid() != null) {
+			vo.setSzddzw(entity.getJyrid().getSzd() != null ? entity.getJyrid().getSzd().getText() : "");
+			vo.setSzd(entity.getJyrid().getSzd() != null ? entity.getJyrid().getSzd().getId() : "");
+		}
+
+		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
+		vo.setJyrzw(entity.getJyrid() != null ? entity.getJyrid().getGkjyr() : "");
+		vo.setZyhbwflzw(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getText() : "");
+		vo.setTzlx(entity.getTzlx() != null ? entity.getTzlx().getId() : "");
+		vo.setXmlx(entity.getXmlx() != null ? entity.getXmlx().getId() : "");
+		vo.setXmhzjb(entity.getXmhzjb() != null ? entity.getXmhzjb().getId() : "");
+		vo.setAxspjb(entity.getAxspjb() != null ? entity.getAxspjb().getId() : "");
+		vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
+		vo.setJyrid(entity.getJyrid() != null ? entity.getJyrid().getId() : "");
+		vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().getText() : "");
+		if (entity.getBwyt() != null) {
+			String bwytzw = "";
+			String[] s = entity.getBwyt().split(",");
+			for (int i = 0; i < s.length; i++) {
+				if (i != s.length - 1) {
+					bwytzw += securityMgr.codeService().findOne(s[i]).getText() + ",";
+				} else {
+					bwytzw += securityMgr.codeService().findOne(s[i]).getText();
+				}
+			}
+			vo.setBwytzw(bwytzw);
+		}
+		String bwids = "";
+		List<XmbwglbEntity> bwlist = xmbwglbService.findByXmid(entity.getId());
+		if (bwlist != null && bwlist.size() > 0) {
+			for (XmbwglbEntity xmbw : bwlist) {
+				bwids = bwids + xmbw.getBwid() + ",";
+			}
+			bwids = bwids.substring(0, bwids.length() - 1);
+		}
+		vo.setBwids(bwids);
+		// 项目泊位关联信息
+		List<XmbwglbEntity> xmbwglblist = xmbwglbService.findByXmid(entity.getId());
+		// 泊位信息
+		List<BwEntity> bwList = new ArrayList<BwEntity>();
+		if(xmbwglblist!=null && xmbwglblist.size()>0){
+			for (XmbwglbEntity xb : xmbwglblist ){
+				BwEntity bw = bwService.findOne(xb.getBwid());
+				bwList.add(bw);
+			}
+		}  
+		
+		List<BwVo> voList = new ArrayList<BwVo>();
+		for (BwEntity entitybw : bwList) {
+			BwVo vobw = new BwVo();
+			if (entitybw != null) {
+				BeanUtils.copyProperties(entitybw, vobw);
+				vobw.setSzdzw(entitybw.getSzd() != null ? entitybw.getSzd().getText() : "");
+				vobw.setSzgkzw(entitybw.getSzgk() != null ? entitybw.getSzgk().getGkmc() : "");
+				vobw.setSzgqzw(entitybw.getSzgq() != null ? entitybw.getSzgq().getGqmc() : "");
+				vobw.setSsjyrzw(entitybw.getSsjyr() != null ? entitybw.getSsjyr().getGkjyr() : "");
+				vobw.setSsmtzw(entitybw.getSsmt() != null ? entitybw.getSsmt().getMtmc() : "");
+				vobw.setBwsxzw(entitybw.getBwsx() != null ? entitybw.getBwsx().getText() : "");
+				vobw.setFwlxzw(entitybw.getFwlx() != null ? entitybw.getFwlx().getText() : "");
+				vobw.setWxpbwzw(entitybw.getWxpbw() != null ? entitybw.getWxpbw().getText() : "");
+				vobw.setZyhbwflzw(entitybw.getZyhbwfl() != null ? entitybw.getZyhbwfl().getText() : "");
+				vobw.setSffzzw(entitybw.getSffz() != null ? entitybw.getSffz().getText() : "");
+				vobw.setSfdwkfzw(entitybw.getSfdwkf() != null ? entitybw.getSfdwkf().getText() : "");
+				vobw.setBwszsxzw(entitybw.getBwszsx() != null ? entitybw.getBwszsx().getText() : "");
+				vobw.setSclxzw(entitybw.getSclx() != null ? entitybw.getSclx().getText() : "");
+				vobw.setJgxszw(entitybw.getJgxs() != null ? entitybw.getJgxs().getText() : "");
+				if (entitybw.getBwyt() != null) {
+					String bwytzw = "";
+					String[] s = entitybw.getBwyt().split(",");
+					for (int i = 0; i < s.length; i++) {
+						CodeEntity ce = securityMgr.codeService().findOne(s[i]);
+						if (ce != null) {
+							bwytzw += ce.getText();
+							if (i != s.length - 1) {
+								bwytzw += ",";
+							}
+						}
+					}
+					vobw.setBwytzw(bwytzw);
+				}
+
+				vobw.setSzd(entitybw.getSzd() != null ? entitybw.getSzd().getId() : "");
+				vobw.setSzgk(entitybw.getSzgk() != null ? entitybw.getSzgk().getId() : "");
+				vobw.setSzgq(entitybw.getSzgq() != null ? entitybw.getSzgq().getId() : "");
+				vobw.setSsjyr(entitybw.getSsjyr() != null ? entitybw.getSsjyr().getId() : "");
+				vobw.setSsmt(entitybw.getSsmt() != null ? entitybw.getSsmt().getId() : "");
+				vobw.setBwsx(entitybw.getBwsx() != null ? entitybw.getBwsx().getId() : "");
+				vobw.setFwlx(entitybw.getFwlx() != null ? entitybw.getFwlx().getId() : "");
+				vobw.setWxpbw(entitybw.getWxpbw() != null ? entitybw.getWxpbw().getId() : "");
+				vobw.setZyhbwfl(entitybw.getZyhbwfl() != null ? entitybw.getZyhbwfl().getId() : "");
+				vobw.setSffz(entitybw.getSffz() != null ? entitybw.getSffz().getId() : "");
+				vobw.setSfdwkf(entitybw.getSfdwkf() != null ? entitybw.getSfdwkf().getId() : "");
+				vobw.setBwszsx(entitybw.getBwszsx() != null ? entitybw.getBwszsx().getId() : "");
+				vobw.setSclx(entitybw.getSclx() != null ? entitybw.getSclx().getId() : "");
+				vobw.setJgxs(entitybw.getJgxs() != null ? entitybw.getJgxs().getId() : "");
+				vobw.setXkzid(entitybw.getXkzid() != null ? entitybw.getXkzid() : "");
+
+				vobw.setSszyq(entitybw.getSszyq() != null ? entitybw.getSszyq().getId() : "");
+				vobw.setSszyqzw(entitybw.getSszyq() != null ? entitybw.getSszyq().getZyqmc() : "");
+				vobw.setZls(entitybw.getZls() != null ? entitybw.getZls().getId() : "");
+				vobw.setZlszw(entitybw.getZls() != null ? entitybw.getZls().getText() : "");
+				vobw.setXp(entitybw.getXp() != null ? entitybw.getXp().getId() : "");
+				vobw.setXpzw(entitybw.getXp() != null ? entitybw.getXp().getText() : "");
+
+				voList.add(vobw);
+
+			}
+		}
+		map.put("accessoryList", jsjdfjVoList);
+		map.put("xmxx", vo);
+		map.put("bwList", voList);
+	
+		return Object2JsonStr(map);
+	}
+
+}

gkjsjy/trunk/src/com/xt/jygl/common/BaseWebCtl.java

@@ -12,9 +12,9 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-
-import net.sf.json.JsonConfig;
+import javax.xml.ws.WebServiceContext;
 
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -29,8 +29,7 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
 
-import rtx.RTXSvrApi;
-
+import com.cxfws.config.utils.CxfwsUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.liandi.encrypt.Des;
@@ -55,6 +54,9 @@ import com.xtframe.sec.user.entity.UserEntity;
 import com.xtframe.sec.utils.SecUtils;
 import com.xtframe.util.DateTime;
 
+import net.sf.json.JsonConfig;
+import rtx.RTXSvrApi;
+
 public class BaseWebCtl extends BaseCtl {
 	/**
 	 * 安全服务接口
@@ -66,6 +68,9 @@ public class BaseWebCtl extends BaseCtl {
 	@Autowired
 	protected QueryService query;
 
+	@Resource
+	private WebServiceContext wscontexts;
+	public static final String NOLOGIN = "NO LOGIN";
 	public static final String ALGORITHM = "SHA-256";
 	public static JsonConfig config = new JsonConfig();
 
@@ -474,5 +479,31 @@ public class BaseWebCtl extends BaseCtl {
 		f.setPath(GlobalData.FTP_UPLOAD_PATH);
 		return f;
 	}
+	
+	/**
+	 * 校验用户信息
+	 * @param userName
+	 * @param pwd
+	 * @return
+	 */
+	public boolean checkUser(){
+		String userName = CxfwsUtils.userNameFromHeaderInfo(wscontexts);
+		String pwd = CxfwsUtils.passWordFromHeaderInfo(wscontexts);
+		if ( StringUtils.isNotEmpty(userName) && StringUtils.isNotEmpty(pwd)){
+			UserEntity user = securityMgr.userService().findByUname(userName);
+			if (user != null) {
+				if (pwd.equals(user.getPassword())) {
+					AuthHandler.setCurrentUser(user);
+					return true;
+				} else {
+					return false;
+				}
+			} else {
+				return false;
+			}
+		} else {
+			return false;
+		}
+	}
 
 }

gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/hxgl/dao/CopyOfHxglDao.java

@@ -0,0 +1,39 @@
+package com.xt.jygl.ggfwxxgl.hxgl.dao;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import com.xt.jygl.ggfwxxgl.hxgl.entity.HxglEntity;
+import com.xtframe.sec.common.SecRepository;
+
+public interface CopyOfHxglDao extends SecRepository<HxglEntity, String> {
+	@Query(value = "SELECT * from GK_OPERATION_JSJY_GGFWXX_HX t  where t.rq =?1 and t.RECORD_STATUS<>9", nativeQuery = true)
+	public List<HxglEntity> findByRq(String rq);
+
+	@Query(value = "select sum(t1.a + t1.b), sum(t1.a), sum(t1.b) from (SELECT t.nmjzxttl a, t.wmjzxttl b from GK_OPERATION_JSJY_HXHBGL t  where to_char(t.year||'-'||t.month) = ?1 and t.szgk = ?2 and t.RECORD_STATUS <> 9) t1", nativeQuery = true)
+	public Object bywcltj(String rq, String szgk);
+
+	@Query(value = "select sum(t1.a + t1.b), sum(t1.a), sum(t1.b) from (SELECT t.nmjzxttl a, t.wmjzxttl b from GK_OPERATION_JSJY_HXHBGL t  where t.year =?1 and t.szgk = ?2 and t.RECORD_STATUS <> 9) t1", nativeQuery = true)
+	public Object bnljltj(String rq, String szgk);
+
+	@Query(value = "select ((t1.a1 - t2.a1) / t2.a1) * 100, ((t1.a2 - t2.a2) / t2.a2) * 100, ((t1.a3 - t2.a3) / t2.a3) * 100 from (select (sum(t.nmjzxttl) + sum(t.wmjzxttl)) a1, sum(t.nmjzxttl) a2, sum(t.wmjzxttl) a3 from GK_OPERATION_JSJY_HXHBGL t where rq = ? 1 and t.szgk = ? 3) t1, (select (sum(t.nmjzxttl) + sum(t.wmjzxttl)) a1, sum(t.nmjzxttl) a2, sum(t.wmjzxttl) a3 from GK_OPERATION_JSJY_HXHBGL t where rq = ? 2 and t.szgk = ? 3) t2", nativeQuery = true)
+	public Object tbzzs(String rq, String lastyear, String szgk);
+
+	@Query(value = "select  count(t1.hxlx) con  from GK_OPERATION_JSJY_CODE c left join (select t.hxlx hxlx from GK_OPERATION_JSJY_GGFWXX_HX t where t.rq like ?1% and t.szgk like ?2% and sfth='202' and t.RECORD_STATUS<>9) t1  on t1.hxlx=c.id  where c.pid='70' group by c.id  order by c.id", nativeQuery = true)
+	public List<Object> hxhbyytj(String rq, String szgk);
+
+	@Query(value = "select  count(t1.hxlx) con  from GK_OPERATION_JSJY_CODE c left join (select t.hxlx hxlx from GK_OPERATION_JSJY_GGFWXX_HX t,GK_OPERATION_JSJY_GGFWXX_HXCQ t2 where t.rq like ?1% and t.szgk like ?2% and sfth='202' and  t.id=t2.hxid and t.RECORD_STATUS<>9 and t2.RECORD_STATUS<>9) t1  on t1.hxlx=c.id  where c.pid='70' group by c.id  order by c.id", nativeQuery = true)
+	public List<Object> hbyytj(String rq, String szgk);
+
+	@Query(value = "SELECT * from GK_OPERATION_JSJY_GGFWXX_HX t  where t.rq =?1 and t.szgk like ?2% and t.RECORD_STATUS<>9", nativeQuery = true)
+	public List<HxglEntity> findByRqAndSzgk(String rq, String szgk);
+
+	@Query(value = "select  count(t2.hxlx) from GK_OPERATION_JSJY_CODE c left join (select t.hxlx hxlx from GK_OPERATION_JSJY_GGFWXX_HX t where t.rq =?1 and t.szgk like ?2% and t.sfth = '201' and t.record_status <> 9) t2  on t2.hxlx = c.id where c.pid = '70' group by c.id order by  c.id", nativeQuery = true)
+	public List<Object> bytyhxs(String rq, String szgk);
+
+	@Modifying
+	@Query(value = "update GK_OPERATION_JSJY_GGFWXX_HX t set t.sfth='201' where t.id =?1", nativeQuery = true)
+	public void tingHang(String id);
+}

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/dao/XmbwglbDao.java

@@ -10,4 +10,7 @@ import com.xtframe.sec.common.SecRepository;
 public interface XmbwglbDao extends SecRepository<XmbwglbEntity, String> {
 	@Query("SELECT m from XmbwglbEntity m  where m.xmid =?1 and m.recordStatus<>9")
 	List<XmbwglbEntity> findByXmid(String xmid);
+	
+	@Query("SELECT m from XmbwglbEntity m  where m.bwid =?1 and m.recordStatus<>9")
+	List<XmbwglbEntity> findByBwid(String bwid);
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/service/XmbwglbService.java

@@ -15,4 +15,6 @@ public interface XmbwglbService {
 	void delete(String id);
 
 	List<XmbwglbEntity> findByXmid(String xmid);
+	
+	List<XmbwglbEntity> findByBwid(String bwid);
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/service/impl/XmbwglbServiceImpl.java

@@ -29,7 +29,9 @@ public class XmbwglbServiceImpl extends JyglBaseService<XmbwglbEntity, String> i
 		return dao.findByXmid(xmid);
 	}
 
-	
-	
+	@Override
+	public List<XmbwglbEntity> findByBwid(String bwid) {
+		return dao.findByBwid(bwid);
+	}
 	
 }