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

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdgl/ctl/JsjdglCtl.java

@@ -18,6 +18,7 @@ import javax.persistence.criteria.Root;
 import javax.persistence.criteria.Subquery;
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.poi.hssf.util.HSSFColor.GOLD;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -184,12 +185,15 @@ public class JsjdglCtl extends BaseWebCtl {
 						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)));
-						if("initJsjdgl".equals(dqzt)){
-							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "岸线利用审批支撑文件审查" + "%"));
-						}else{
+						// 初始化查询条件，企业默认空，管理部门默认岸线审批之后
+						if ("initJsjdgl".equals(dqzt)) {
+							if (!isJyr()) {
+								subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "岸线利用审批支撑文件审查" + "%"));
+							}
+						} else {
 							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + dqzt + "%"));
 						}
-						
+
 						if ("岸线利用审批".equals(dqzt)) {
 							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "岸线利用审批支撑文件审查" + "%"));
 						}
@@ -317,7 +321,7 @@ public class JsjdglCtl extends BaseWebCtl {
 		}
 		if (isPOST(request)) {
 			SearchCondition.jsjdpage = page.getPage();
-			//cacheSCmap.put("jsjdpage", page.getPage());
+			// cacheSCmap.put("jsjdpage", page.getPage());
 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
 			// System.out.println(JSONObject.fromObject(cacheSCmap));
 		}
@@ -328,7 +332,7 @@ public class JsjdglCtl extends BaseWebCtl {
 			isjyr = "0";
 			if ("admin".equals(securityMgr.getCurrUser().getUname())) {
 				isjyr = "2";
-			} 
+			}
 		}
 		model.addAttribute("isjyr", isjyr);
 		model.addAttribute("list", voList);
@@ -738,122 +742,121 @@ public class JsjdglCtl extends BaseWebCtl {
 		return "gkjsgl/jsjdgl/jsjdgledit";
 	}
 
-	
 	// 编辑数据
-		@RequestMapping(value = "/edittest")
-		@RequiresPermissions("jsjdgl:edit")
-		public String edittest(Model model, String id, String flag, String fhbz, String path, String type) {
-			// 附件
-			List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jsjd");
-			for (int i = 0; i < accessoryList.size(); i++) {
-				if (StringUtils.isNotEmpty(accessoryList.get(i).getRemark())) {
-					AccessoryEntity acc = accessoryList.get(i);
-					String s = accessoryList.get(i).getRemark().substring(0, 2);
-					String accid = accessoryList.get(i).getId();
-					JsjdfjVo fjnamevo = new JsjdfjVo();
-					fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
-					fjnamevo.setFjid(accid);
-					fjnamevo.setFjmc(accessoryList.get(i).getName());
-					model.addAttribute("fjList" + s, fjnamevo);
-					model.addAttribute("xiazaibz", s);
-				}
-			}
-			// 工作流参数
-			model.addAttribute("flag", flag);
-			model.addAttribute("fhbz", fhbz);
-			model.addAttribute("path", path);
-			model.addAttribute("type", type);
-			XmxxglEntity entity = xmxxglService.findOne(id);
-			XmxxglfbVo vo = new XmxxglfbVo();
-			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.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() : "");
-			vo.setSylx(entity.getSylx() != null ? entity.getSylx().getId() : "");
-			vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().getText() : "");
-			if (StringUtils.isNotEmpty(entity.getXmbm())) {
-				String codeid = entity.getXmbm().substring(4, 10);
-				CodeEntity code = securityMgr.codeService().findOne(codeid);
-				model.addAttribute("xzqhname", code.getText());
-			}
-			String bwids = "";
-			List<XmbwglbEntity> bwlist = xmbwglbService.findByXmid(entity.getId());
-			if (bwlist != null && bwlist.size() > 0) {
-				model.addAttribute("bwgs", bwlist.size());
-				for (XmbwglbEntity xmbw : bwlist) {
-					bwids = bwids + xmbw.getBwid() + ",";
-				}
-				bwids = bwids.substring(0, bwids.length() - 1);
-				getbwlist(model, bwids);
-			}
-			vo.setBwids(bwids);
-			model.addAttribute("record", vo);
-			model.addAttribute("jyr", entity.getJyrid());
-
-			// 附件字段
-			List<JsjdfjEntity> fjlist = jsjdfjService.findByEntity(entity, "jsjd");
-			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();
-					if (date != null) {
-						dateFormater.format(date);
-					}
+	@RequestMapping(value = "/edittest")
+	@RequiresPermissions("jsjdgl:edit")
+	public String edittest(Model model, String id, String flag, String fhbz, String path, String type) {
+		// 附件
+		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jsjd");
+		for (int i = 0; i < accessoryList.size(); i++) {
+			if (StringUtils.isNotEmpty(accessoryList.get(i).getRemark())) {
+				AccessoryEntity acc = accessoryList.get(i);
+				String s = accessoryList.get(i).getRemark().substring(0, 2);
+				String accid = accessoryList.get(i).getId();
+				JsjdfjVo fjnamevo = new JsjdfjVo();
+				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
+				fjnamevo.setFjid(accid);
+				fjnamevo.setFjmc(accessoryList.get(i).getName());
+				model.addAttribute("fjList" + s, fjnamevo);
+				model.addAttribute("xiazaibz", s);
+			}
+		}
+		// 工作流参数
+		model.addAttribute("flag", flag);
+		model.addAttribute("fhbz", fhbz);
+		model.addAttribute("path", path);
+		model.addAttribute("type", type);
+		XmxxglEntity entity = xmxxglService.findOne(id);
+		XmxxglfbVo vo = new XmxxglfbVo();
+		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() : "");
 
-					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());
-					model.addAttribute("recordfj" + s, fjvo);
-				}
-			}
-			// 其他附件和字段
-			List<JsjdfjEntity> qtfjzdlist = jsjdfjService.findByEntity(entity, "jsjdqtfj");
-			qtfjview(model, qtfjzdlist);
-			if (entity.getXmlx().getId().equals("2202")) {
-				List<TaskInfoEntity> list = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, XmxxglEntity.PROCESS_DEFINITION_KEY2);
-				Tasklist(model, list, id);
-			} else {
-				List<TaskInfoEntity> list = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, XmxxglEntity.PROCESS_DEFINITION_KEY);
-				Tasklist(model, list, id);
+		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() : "");
+		vo.setSylx(entity.getSylx() != null ? entity.getSylx().getId() : "");
+		vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().getText() : "");
+		if (StringUtils.isNotEmpty(entity.getXmbm())) {
+			String codeid = entity.getXmbm().substring(4, 10);
+			CodeEntity code = securityMgr.codeService().findOne(codeid);
+			model.addAttribute("xzqhname", code.getText());
+		}
+		String bwids = "";
+		List<XmbwglbEntity> bwlist = xmbwglbService.findByXmid(entity.getId());
+		if (bwlist != null && bwlist.size() > 0) {
+			model.addAttribute("bwgs", bwlist.size());
+			for (XmbwglbEntity xmbw : bwlist) {
+				bwids = bwids + xmbw.getBwid() + ",";
 			}
+			bwids = bwids.substring(0, bwids.length() - 1);
+			getbwlist(model, bwids);
+		}
+		vo.setBwids(bwids);
+		model.addAttribute("record", vo);
+		model.addAttribute("jyr", entity.getJyrid());
 
-			String sfjyr = "";
-			if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
-				sfjyr = "1";
-				model.addAttribute("sfjyr", sfjyr);
-			} else {
+		// 附件字段
+		List<JsjdfjEntity> fjlist = jsjdfjService.findByEntity(entity, "jsjd");
+		SimpleDateFormat dateFormater = new SimpleDateFormat("yyyy-MM-dd");
 
-				if ("admin".equals(securityMgr.getCurrUser().getUname())) {
-					model.addAttribute("sfjyr", "2");
-				} else {
-					model.addAttribute("sfjyr", "");
+		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();
+				if (date != null) {
+					dateFormater.format(date);
 				}
+
+				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());
+				model.addAttribute("recordfj" + s, fjvo);
 			}
-			model.addAttribute("opflag", 10);
-			model.addAttribute("spflag", 10);
-			return "gkjsgl/jsjdgl/jsjdgledittest";
 		}
-	
+		// 其他附件和字段
+		List<JsjdfjEntity> qtfjzdlist = jsjdfjService.findByEntity(entity, "jsjdqtfj");
+		qtfjview(model, qtfjzdlist);
+		if (entity.getXmlx().getId().equals("2202")) {
+			List<TaskInfoEntity> list = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, XmxxglEntity.PROCESS_DEFINITION_KEY2);
+			Tasklist(model, list, id);
+		} else {
+			List<TaskInfoEntity> list = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, XmxxglEntity.PROCESS_DEFINITION_KEY);
+			Tasklist(model, list, id);
+		}
+
+		String sfjyr = "";
+		if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
+			sfjyr = "1";
+			model.addAttribute("sfjyr", sfjyr);
+		} else {
+
+			if ("admin".equals(securityMgr.getCurrUser().getUname())) {
+				model.addAttribute("sfjyr", "2");
+			} else {
+				model.addAttribute("sfjyr", "");
+			}
+		}
+		model.addAttribute("opflag", 10);
+		model.addAttribute("spflag", 10);
+		return "gkjsgl/jsjdgl/jsjdgledittest";
+	}
+
 	// 流程历史
 	public void Tasklist(Model model, List<TaskInfoEntity> list, String id) {
 		if (list != null & list.size() > 0) {
@@ -929,7 +932,7 @@ public class JsjdglCtl extends BaseWebCtl {
 	// 查看
 	@RequestMapping(value = "/view")
 	@RequiresPermissions("jsjdgl:main")
-	public String view(Model model, String id, String flag, String fhbz, String menuid,String tzflag) {
+	public String view(Model model, String id, String flag, String fhbz, String menuid, String tzflag) {
 		model.addAttribute("tzflag", tzflag);
 		// 附件
 		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jsjd");
@@ -1817,108 +1820,45 @@ public class JsjdglCtl extends BaseWebCtl {
 		}
 		WebJsonResult wr = success();
 		// 如果是经营人，需要做附件上传check
-		/*if ("1".equals(sfjyr)) {
-			if ("1".equals(opflag)) {
-				if (StringUtils.isEmpty(delid11)) {
-					wr.setSuccess(false);
-					wr.setMessage("请上传岸线使用批复文件复印件!");
-					return wr;
-				}
-			}
-			if ("2".equals(opflag)) {
-				if (StringUtils.isEmpty(delid21)) {
-					wr.setSuccess(false);
-					wr.setMessage("请上传项目批准或者核准、备案文件的复印件!");
-					return wr;
-				}
-			}
-			if ("3".equals(opflag)) {
-				if (StringUtils.isEmpty(delid31)) {
-					wr.setSuccess(false);
-					wr.setMessage("请上传初步设计文件!");
-					return wr;
-				}
-				if (StringUtils.isEmpty(delid32)) {
-					wr.setSuccess(false);
-					wr.setMessage("初步设计批复文件!");
-					return wr;
-				}
-				
-				 * if (StringUtils.isEmpty(delid33)) { wr.setSuccess(false);
-				 * wr.setMessage("请上传港口建设项目批准或者核准、备案文件!"); return wr; }
-				 
-			}
-			if ("4".equals(opflag)) {
-				if (StringUtils.isEmpty(delid41)) {
-					wr.setSuccess(false);
-					wr.setMessage("请上传施工图设计文件!");
-					return wr;
-				}
-				if (StringUtils.isEmpty(delid42)) {
-					wr.setSuccess(false);
-					wr.setMessage("请上传施工图设计批复文件!");
-					return wr;
-				}
-			}
-			if ("5".equals(opflag)) {
-				if (StringUtils.isEmpty(delid52)) {
-					wr.setSuccess(false);
-					wr.setMessage("请上传与施工单位和监理单位签订的合同复印件!");
-					return wr;
-				}
-				if (StringUtils.isEmpty(delid53)) {
-					wr.setSuccess(false);
-					wr.setMessage("请上传质量监督手续材料复印件!");
-					return wr;
-				}
-				if (StringUtils.isEmpty(delid54)) {
-					wr.setSuccess(false);
-					wr.setMessage("请上传建设资金落实证明复印件!");
-					return wr;
-				}
-				if (StringUtils.isEmpty(delid56)) {
-					wr.setSuccess(false);
-					wr.setMessage("请上传《开工备案表》!");
-					return wr;
-				}
-			}
-			if ("6".equals(opflag)) {
-				if (StringUtils.isEmpty(delid61)) {
-					wr.setSuccess(false);
-					wr.setMessage("请上传质监机构关于工程质量鉴定意见书!");
-					return wr;
-				}
-				if (StringUtils.isEmpty(delid62)) {
-					wr.setSuccess(false);
-					wr.setMessage("请上传交工验收证书!");
-					return wr;
-				}
-			}
-			if ("7".equals(opflag)) {
-				if (StringUtils.isEmpty(delid71)) {
-					wr.setSuccess(false);
-					wr.setMessage("请上传环境保护、劳动安全卫生、消防主管部门关于试运行的准许意见!");
-					return wr;
-				}
-				if (StringUtils.isEmpty(delid72)) {
-					wr.setSuccess(false);
-					wr.setMessage("请上传试运行备案表!");
-					return wr;
-				}
-			}
-			if ("8".equals(opflag)) {
-				if (StringUtils.isEmpty(delid81)) {
-					wr.setSuccess(false);
-					wr.setMessage("请上传竣工资料汇编!");
-					return wr;
-				}
-				if (StringUtils.isEmpty(delid82)) {
-					wr.setSuccess(false);
-					wr.setMessage("请上传竣工验收证书(多个，新码头，老码头改造)!");
-					return wr;
-				}
-			}
-		}*/
+		/*
+		 * if ("1".equals(sfjyr)) { if ("1".equals(opflag)) { if
+		 * (StringUtils.isEmpty(delid11)) { wr.setSuccess(false);
+		 * wr.setMessage("请上传岸线使用批复文件复印件!"); return wr; } } if
+		 * ("2".equals(opflag)) { if (StringUtils.isEmpty(delid21)) {
+		 * wr.setSuccess(false); wr.setMessage("请上传项目批准或者核准、备案文件的复印件!"); return
+		 * wr; } } if ("3".equals(opflag)) { if (StringUtils.isEmpty(delid31)) {
+		 * wr.setSuccess(false); wr.setMessage("请上传初步设计文件!"); return wr; } if
+		 * (StringUtils.isEmpty(delid32)) { wr.setSuccess(false);
+		 * wr.setMessage("初步设计批复文件!"); return wr; }
+		 * 
+		 * if (StringUtils.isEmpty(delid33)) { wr.setSuccess(false);
+		 * wr.setMessage("请上传港口建设项目批准或者核准、备案文件!"); return wr; }
+		 * 
+		 * } if ("4".equals(opflag)) { if (StringUtils.isEmpty(delid41)) {
+		 * wr.setSuccess(false); wr.setMessage("请上传施工图设计文件!"); return wr; } if
+		 * (StringUtils.isEmpty(delid42)) { wr.setSuccess(false);
+		 * wr.setMessage("请上传施工图设计批复文件!"); return wr; } } if
+		 * ("5".equals(opflag)) { if (StringUtils.isEmpty(delid52)) {
+		 * wr.setSuccess(false); wr.setMessage("请上传与施工单位和监理单位签订的合同复印件!"); return
+		 * wr; } if (StringUtils.isEmpty(delid53)) { wr.setSuccess(false);
+		 * wr.setMessage("请上传质量监督手续材料复印件!"); return wr; } if
+		 * (StringUtils.isEmpty(delid54)) { wr.setSuccess(false);
+		 * wr.setMessage("请上传建设资金落实证明复印件!"); return wr; } if
+		 * (StringUtils.isEmpty(delid56)) { wr.setSuccess(false);
+		 * wr.setMessage("请上传《开工备案表》!"); return wr; } } if ("6".equals(opflag))
+		 * { if (StringUtils.isEmpty(delid61)) { wr.setSuccess(false);
+		 * wr.setMessage("请上传质监机构关于工程质量鉴定意见书!"); return wr; } if
+		 * (StringUtils.isEmpty(delid62)) { wr.setSuccess(false);
+		 * wr.setMessage("请上传交工验收证书!"); return wr; } } if ("7".equals(opflag)) {
+		 * if (StringUtils.isEmpty(delid71)) { wr.setSuccess(false);
+		 * wr.setMessage("请上传环境保护、劳动安全卫生、消防主管部门关于试运行的准许意见!"); return wr; } if
+		 * (StringUtils.isEmpty(delid72)) { wr.setSuccess(false);
+		 * wr.setMessage("请上传试运行备案表!"); return wr; } } if ("8".equals(opflag)) {
+		 * if (StringUtils.isEmpty(delid81)) { wr.setSuccess(false);
+		 * wr.setMessage("请上传竣工资料汇编!"); return wr; } if
+		 * (StringUtils.isEmpty(delid82)) { wr.setSuccess(false);
+		 * wr.setMessage("请上传竣工验收证书(多个，新码头，老码头改造)!"); return wr; } } }
+		 */
 		XmxxglEntity xmxxgl = null;
 		try {
 			// 修改
@@ -1992,10 +1932,10 @@ public class JsjdglCtl extends BaseWebCtl {
 			wr.setMessage("操作失败!");
 			return wr;
 		}
-		
+
 		return wr;
 	}
-	
+
 	public void auditlist(List<TaskInfoEntity> list, XmxxglEntity xmxxgl, String shyj) {
 		if (list != null & list.size() > 0) {
 			TaskInfoEntity taskinfo = list.get(0);
@@ -2277,7 +2217,7 @@ public class JsjdglCtl extends BaseWebCtl {
 			}
 			bwids = bwids.substring(0, bwids.length() - 1);
 			getbwlist(model, bwids);
-		}else{
+		} else {
 			model.addAttribute("bwlist", null);
 		}
 		vo.setBwids(bwids);
@@ -2450,14 +2390,14 @@ public class JsjdglCtl extends BaseWebCtl {
 		XmxxglEntity entity = xmxxglService.findOne(xmid);
 		XmxxglVo vo = new XmxxglVo();
 		BeanUtils.copyProperties(entity, vo);
-		
+
 		vo.setJsgm(entity.getJsgm() != null ? entity.getJsgm() : "");
 		vo.setXmgk(entity.getXmgk() != null ? entity.getXmgk() : "");
-		//vo.setZtz(entity.getZtz() != null ? entity.getZtz() : 0);
-		//vo.setAxcd(entity.getAxcd() != null ? entity.getAxcd() : 0);
-		//vo.setBwdj(entity.getBwdj() != null ? entity.getBwdj() : 0);
+		// vo.setZtz(entity.getZtz() != null ? entity.getZtz() : 0);
+		// vo.setAxcd(entity.getAxcd() != null ? entity.getAxcd() : 0);
+		// vo.setBwdj(entity.getBwdj() != null ? entity.getBwdj() : 0);
 		vo.setBwyt(entity.getBwyt() != null ? entity.getBwyt() : null);
-		//vo.setTgnl(entity.getTgnl() != null ? entity.getTgnl() : 0);
+		// vo.setTgnl(entity.getTgnl() != null ? entity.getTgnl() : 0);
 		vo.setSddx(entity.getSddx() != null ? entity.getSddx() : "");
 		vo.setSddy(entity.getSddy() != null ? entity.getSddy() : "");
 		vo.setXddx(entity.getXddx() != null ? entity.getXddx() : "");