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

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

@@ -30,6 +30,8 @@ import com.xt.jygl.accessory.service.AccessoryService;
 import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.common.Constants;
 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.gkjsgl.jsjdgl.entity.JsjdfjEntity;
 import com.xt.jygl.gkjsgl.jsjdgl.entity.XmxxglfbEntity;
 import com.xt.jygl.gkjsgl.jsjdgl.entity.XmyjhxxEntity;
@@ -62,7 +64,7 @@ import com.xtframe.util.StringUtils;
  * 建设进度管理
  * 
  * @author b_zhangdong
- *
+ * 
  */
 @Service("jsjdglWebService")
 @WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "jsjdglWebServicePort", serviceName = "jsjdglWebService")
@@ -88,16 +90,19 @@ public class JsjdglWebService extends BaseWebCtl implements IJsjdglWebService {
 
 	@Autowired
 	private BwService bwService;
-	
+
+	@Autowired
+	private MtService mtService;
+
 	@Autowired
 	private TzjhglService tzjhglService;
-	
+
 	@Autowired
 	private XmyjhxxService xmyjhxxService;
-	
+
 	@Autowired
 	private XmxxglfbService xmxxglfbService;
-	
+
 	@Resource
 	private WebServiceContext wscontext;
 
@@ -108,13 +113,13 @@ public class JsjdglWebService extends BaseWebCtl implements IJsjdglWebService {
 	 * 获取进度列表
 	 */
 	@Override
-	public String findJsjdgl(int pages,int rows,final String xmmc, final String szdid, final String szgkid, final String szgqid, final String dqzt, final String xmfr, final String lcjd) {
-		if (!this.checkUser()){
+	public String findJsjdgl(int pages, int rows, 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;
 		}
-		
+
 		SimplePageRequest page = new SimplePageRequest(pages, rows);
-		
+
 		Specification<XmxxglEntity> spec = new Specification<XmxxglEntity>() {
 			// 查询条件
 			@Override
@@ -189,8 +194,9 @@ public class JsjdglWebService extends BaseWebCtl implements IJsjdglWebService {
 					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");
+					// @SuppressWarnings("unchecked")
+					// List<String> gqlist = (List<String>)
+					// Utils.getSession().getAttribute("gqList");
 					List<String> gqlist = gqService.findGqListByUserId(SecUtils.getCurrUser().getId());
 					if (gqlist != null && gqlist.size() > 0) {
 						for (int i = 0; i < gqlist.size(); i++) {
@@ -206,7 +212,7 @@ public class JsjdglWebService extends BaseWebCtl implements IJsjdglWebService {
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
-		
+
 		if (page.getPage() < 1) {
 			page.setPage(1);
 		}
@@ -215,7 +221,7 @@ public class JsjdglWebService extends BaseWebCtl implements IJsjdglWebService {
 		page.setOrder("desc");
 		Page<XmxxglEntity> list = query.findAll(spec, toPageRequest(page), XmxxglEntity.class);
 
-		//List<XmxxglEntity> list = query.findAll(spec, XmxxglEntity.class);
+		// List<XmxxglEntity> list = query.findAll(spec, XmxxglEntity.class);
 
 		List<XmxxglVo> voList = new ArrayList<XmxxglVo>();
 		for (XmxxglEntity entity : list) {
@@ -278,7 +284,7 @@ public class JsjdglWebService extends BaseWebCtl implements IJsjdglWebService {
 				voList.add(vo);
 			}
 		}
-		
+
 		return Object2JsonStr(voList);
 	}
 
@@ -287,7 +293,7 @@ public class JsjdglWebService extends BaseWebCtl implements IJsjdglWebService {
 	 */
 	@Override
 	public String findOne(String id) {
-		if (!this.checkUser()){
+		if (!this.checkUser()) {
 			return BaseWebCtl.NOLOGIN;
 		}
 		Map<String, Object> map = new HashMap<String, Object>();
@@ -362,7 +368,7 @@ public class JsjdglWebService extends BaseWebCtl implements IJsjdglWebService {
 				bwList.add(bw);
 			}
 		}
-		
+
 		List<BwVo> voList = new ArrayList<BwVo>();
 		for (BwEntity entitybw : bwList) {
 			BwVo vobw = new BwVo();
@@ -463,16 +469,15 @@ public class JsjdglWebService extends BaseWebCtl implements IJsjdglWebService {
 		map.put("qtfjzdlist", qtfjzdlist);
 		map.put("fjlist", jsjdfjVoList1);
 		map.put("historyList", historyList);
-		
+
 		return Object2JsonStr(map);
 	}
-	
 
 	/**
 	 * 获取流程历史
 	 */
 	@Override
-	public String findHistoryAudit(String id,String sortno) {
+	public String findHistoryAudit(String id, String sortno) {
 		XmxxglfbVo vo = new XmxxglfbVo();
 		try {
 			XmxxglfbEntity xmxxfb = xmxxglfbService.findByXmidAndSortno(id, sortno);
@@ -539,23 +544,27 @@ public class JsjdglWebService extends BaseWebCtl implements IJsjdglWebService {
 	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);
+		List<MtEntity> mtList = mtService.findByZyid(zyid);
+		if (mtList != null && mtList.size() > 0) {
+			for (MtEntity mt : mtList) {
+				List<BwEntity> bwList = bwService.findByMtid(mt.getId());
+				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){
+
+		for (XmxxglEntity entity : xmxxList) {
 			XmxxglVo vo = new XmxxglVo();
 			BeanUtils.copyProperties(entity, vo);
 			vo.setTzlxzw(entity.getTzlx() != null ? entity.getTzlx().getText() : "");
@@ -600,13 +609,12 @@ public class JsjdglWebService extends BaseWebCtl implements IJsjdglWebService {
 			vo.setZyhbwfl(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getId() : "");
 			xmxxVoList.add(vo);
 		}
-		
-		
+
 		return Object2JsonStr(xmxxVoList);
 	}
 
 	/**
-	 *根据id获取项目历史流程信息
+	 * 根据id获取项目历史流程信息
 	 */
 	@Override
 	public String findLslc(String id) {
@@ -621,7 +629,7 @@ public class JsjdglWebService extends BaseWebCtl implements IJsjdglWebService {
 		}
 		return Object2JsonStr(voList);
 	}
-	
+
 	public void lclslist(List<TaskInfoEntity> list, List<XmxxglfbVo> voList) {
 		for (int i = 0; i < list.size(); i++) {
 			XmxxglfbVo vo = new XmxxglfbVo();