瀏覽代碼

git-svn-id: https://192.168.57.71/svn/lyggkj@112 1a6f6e3a-4066-fe46-b609-79c204482ece

ld_liufl 8 年之前
父節點
當前提交
b2834ddd40
共有 1 個文件被更改,包括 302 次插入187 次删除
  1. 302 187
      gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/zysqbp/ZysqbpController.java

+ 302 - 187
gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/zysqbp/ZysqbpController.java

@@ -32,6 +32,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.task.Task;
 import org.activiti.engine.task.Task;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
@@ -133,6 +134,8 @@ import flex.messaging.io.amf.ASObject;
 @SuppressWarnings("unchecked")
 @SuppressWarnings("unchecked")
 @Log(menuCode = "004001", menuCodeJyr = "004001_c")
 @Log(menuCode = "004001", menuCodeJyr = "004001_c")
 public class ZysqbpController extends BaseController {
 public class ZysqbpController extends BaseController {
+	private final static Logger LOGGER = Logger
+			.getLogger(ZysqbpController.class);
 	@Autowired
 	@Autowired
 	private ThreadPoolTaskExecutor threadPool;
 	private ThreadPoolTaskExecutor threadPool;
 	@Autowired
 	@Autowired
@@ -215,6 +218,7 @@ public class ZysqbpController extends BaseController {
 
 
 	/**
 	/**
 	 * 一览查询
 	 * 一览查询
+	 * 
 	 * @param pageable
 	 * @param pageable
 	 * @param functionId
 	 * @param functionId
 	 * @param entity
 	 * @param entity
@@ -235,6 +239,11 @@ public class ZysqbpController extends BaseController {
 			final Date bgsj2, final Date kgsj1, final Date kgsj2,
 			final Date bgsj2, final Date kgsj1, final Date kgsj2,
 			final Date wgsj1, final Date wgsj2, final String name,
 			final Date wgsj1, final Date wgsj2, final String name,
 			final String gkdw) {
 			final String gkdw) {
+		long startTime = System.currentTimeMillis();
+		String url = Thread.currentThread().getStackTrace()[2].getClassName()
+				+ "."
+				+ Thread.currentThread().getStackTrace()[2].getMethodName();
+
 		BusinessContext bc = new BusinessContext();
 		BusinessContext bc = new BusinessContext();
 		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
 		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
 		try {
 		try {
@@ -269,7 +278,7 @@ public class ZysqbpController extends BaseController {
 							&& !"".equals(entity.getWxhwmcbh()))
 							&& !"".equals(entity.getWxhwmcbh()))
 						list.add(cb.like(root.get("wxhwmcbh").as(String.class),
 						list.add(cb.like(root.get("wxhwmcbh").as(String.class),
 								"%" + entity.getWxhwmcbh() + "%"));
 								"%" + entity.getWxhwmcbh() + "%"));
-					if(null!=entity.getZydw()) {
+					if (null != entity.getZydw()) {
 						list.add(cb.equal(
 						list.add(cb.equal(
 								root.get("zydw").get("id").as(String.class),
 								root.get("zydw").get("id").as(String.class),
 								entity.getZydw().getId()));
 								entity.getZydw().getId()));
@@ -318,6 +327,10 @@ public class ZysqbpController extends BaseController {
 				}
 				}
 			};
 			};
 			Page<ZysqbpEntity> pageList = zysqbpService.findAll(spec, pageable);
 			Page<ZysqbpEntity> pageList = zysqbpService.findAll(spec, pageable);
+			long cost = System.currentTimeMillis() - startTime;
+			// System.err.println(url + ",cost:"+cost);
+			LOGGER.info(url + "<SUCCESS> (findAll()) cost:" + cost);
+			//
 			List<Boolean> sfsbList = new ArrayList<Boolean>();
 			List<Boolean> sfsbList = new ArrayList<Boolean>();
 			for (ZysqbpEntity ba : pageList) {
 			for (ZysqbpEntity ba : pageList) {
 				sfsbList.add(zysqbpService.doCheckJyrAndWxp(ba.getZydw()
 				sfsbList.add(zysqbpService.doCheckJyrAndWxp(ba.getZydw()
@@ -377,16 +390,24 @@ public class ZysqbpController extends BaseController {
 			}
 			}
 			bc = createBusinessContext(pageList);
 			bc = createBusinessContext(pageList);
 			bc.setAttribute("sfsbList", sfsbList);
 			bc.setAttribute("sfsbList", sfsbList);
+			cost = System.currentTimeMillis() - startTime;
+			// System.err.println(url + ",cost:"+cost);
+			LOGGER.info(url + "<SUCCESS> cost:" + cost);
 			return bc;
 			return bc;
 		} catch (Exception e) {
 		} catch (Exception e) {
+			LOGGER.error("error occured,url:" + url);
 			e.printStackTrace();
 			e.printStackTrace();
 		}
 		}
+		long cost = System.currentTimeMillis() - startTime;
+		System.err.println(url + ",cost:" + cost);
+		LOGGER.info(url + "<ERROR> cost:" + cost);
 		return null;
 		return null;
 
 
 	}
 	}
-	
+
 	/**
 	/**
-	 *计算不通过和被退回的数量 
+	 * 计算不通过和被退回的数量
+	 * 
 	 * @param functionId
 	 * @param functionId
 	 * @param entity
 	 * @param entity
 	 * @param lcStatus
 	 * @param lcStatus
@@ -407,7 +428,7 @@ public class ZysqbpController extends BaseController {
 			final Date wgsj1, final Date wgsj2, final String name,
 			final Date wgsj1, final Date wgsj2, final String name,
 			final String gkdw) {
 			final String gkdw) {
 		BusinessContext bc = new BusinessContext();
 		BusinessContext bc = new BusinessContext();
-		try {		
+		try {
 			Specification<ZysqbpEntity> spec1 = new Specification<ZysqbpEntity>() {
 			Specification<ZysqbpEntity> spec1 = new Specification<ZysqbpEntity>() {
 				@Override
 				@Override
 				public Predicate toPredicate(Root<ZysqbpEntity> root,
 				public Predicate toPredicate(Root<ZysqbpEntity> root,
@@ -437,7 +458,7 @@ public class ZysqbpController extends BaseController {
 							&& !"".equals(entity.getWxhwmcbh()))
 							&& !"".equals(entity.getWxhwmcbh()))
 						list.add(cb.like(root.get("wxhwmcbh").as(String.class),
 						list.add(cb.like(root.get("wxhwmcbh").as(String.class),
 								"%" + entity.getWxhwmcbh() + "%"));
 								"%" + entity.getWxhwmcbh() + "%"));
-					if(null!=entity.getZydw()) {
+					if (null != entity.getZydw()) {
 						list.add(cb.equal(
 						list.add(cb.equal(
 								root.get("zydw").get("id").as(String.class),
 								root.get("zydw").get("id").as(String.class),
 								entity.getZydw().getId()));
 								entity.getZydw().getId()));
@@ -516,7 +537,7 @@ public class ZysqbpController extends BaseController {
 							&& !"".equals(entity.getWxhwmcbh()))
 							&& !"".equals(entity.getWxhwmcbh()))
 						list.add(cb.like(root.get("wxhwmcbh").as(String.class),
 						list.add(cb.like(root.get("wxhwmcbh").as(String.class),
 								"%" + entity.getWxhwmcbh() + "%"));
 								"%" + entity.getWxhwmcbh() + "%"));
-					if(null!=entity.getZydw()) {
+					if (null != entity.getZydw()) {
 						list.add(cb.equal(
 						list.add(cb.equal(
 								root.get("zydw").get("id").as(String.class),
 								root.get("zydw").get("id").as(String.class),
 								entity.getZydw().getId()));
 								entity.getZydw().getId()));
@@ -567,6 +588,7 @@ public class ZysqbpController extends BaseController {
 			bc.setAttribute("ths", zysqbpService.count(spec2));
 			bc.setAttribute("ths", zysqbpService.count(spec2));
 			return bc;
 			return bc;
 		} catch (Exception e) {
 		} catch (Exception e) {
+
 			e.printStackTrace();
 			e.printStackTrace();
 		}
 		}
 
 
@@ -788,7 +810,7 @@ public class ZysqbpController extends BaseController {
 					if (!"".equals(param.get(17)))
 					if (!"".equals(param.get(17)))
 						list.add(cb.equal(
 						list.add(cb.equal(
 								root.get("zydw").get("id").as(Long.class),
 								root.get("zydw").get("id").as(Long.class),
-								Long.parseLong(param.get(17) ) ));
+								Long.parseLong(param.get(17))));
 					if (!"null".equals(param.get(7))
 					if (!"null".equals(param.get(7))
 							&& !"".equals(param.get(7))) {
 							&& !"".equals(param.get(7))) {
 						list.add(cb.equal(root.get("mao").as(String.class),
 						list.add(cb.equal(root.get("mao").as(String.class),
@@ -1008,6 +1030,10 @@ public class ZysqbpController extends BaseController {
 			ZysqbpEntity entity, String lcStatus, final Date bgsj1,
 			ZysqbpEntity entity, String lcStatus, final Date bgsj1,
 			final Date bgsj2, final Date kgsj1, final Date kgsj2,
 			final Date bgsj2, final Date kgsj1, final Date kgsj2,
 			final Date wgsj1, final Date wgsj2) {
 			final Date wgsj1, final Date wgsj2) {
+		long startTime = System.currentTimeMillis();
+		String url = Thread.currentThread().getStackTrace()[2].getClassName()
+				+ "."
+				+ Thread.currentThread().getStackTrace()[2].getMethodName();
 		try {
 		try {
 			BusinessContext bc = new BusinessContext();
 			BusinessContext bc = new BusinessContext();
 			// zysqbpService.wxhwSqValid();
 			// zysqbpService.wxhwSqValid();
@@ -1038,6 +1064,9 @@ public class ZysqbpController extends BaseController {
 			Specification<ZysqbpEntity> spec = SpecificationCreater
 			Specification<ZysqbpEntity> spec = SpecificationCreater
 					.searchByPredicateModels(filterList);
 					.searchByPredicateModels(filterList);
 			Page<ZysqbpEntity> pageList = zysqbpService.findAll(spec, pageable);
 			Page<ZysqbpEntity> pageList = zysqbpService.findAll(spec, pageable);
+			long cost = System.currentTimeMillis() - startTime;
+			// System.err.println(url + ",cost:"+cost);
+			LOGGER.info(url + " <SUCCESS> (findAll()) cost:" + cost);
 			List<Boolean> sfsbList = new ArrayList<Boolean>();
 			List<Boolean> sfsbList = new ArrayList<Boolean>();
 			for (ZysqbpEntity ba : pageList) {
 			for (ZysqbpEntity ba : pageList) {
 				sfsbList.add(zysqbpService.doCheckJyrAndWxp(ba.getZydw()
 				sfsbList.add(zysqbpService.doCheckJyrAndWxp(ba.getZydw()
@@ -1045,10 +1074,16 @@ public class ZysqbpController extends BaseController {
 			}
 			}
 			bc = createBusinessContext(pageList);
 			bc = createBusinessContext(pageList);
 			bc.setAttribute("sfsbList", sfsbList);
 			bc.setAttribute("sfsbList", sfsbList);
+			cost = System.currentTimeMillis() - startTime;
+			LOGGER.info(url + "<SUCCESS>cost:" + cost);
 			return bc;
 			return bc;
 		} catch (Exception e) {
 		} catch (Exception e) {
+			LOGGER.error("error occured,url:" + url);
 			e.printStackTrace();
 			e.printStackTrace();
 		}
 		}
+		long cost = System.currentTimeMillis() - startTime;
+		System.err.println(url + ",cost:" + cost);
+		LOGGER.info(url + " <ERROR> cost:" + cost);
 		return null;
 		return null;
 	}
 	}
 
 
@@ -1140,33 +1175,23 @@ public class ZysqbpController extends BaseController {
 	}
 	}
 
 
 	public BusinessContext save(ZysqbpEntity vo, Long functionId, Long accId) {
 	public BusinessContext save(ZysqbpEntity vo, Long functionId, Long accId) {
+		long startTime = System.currentTimeMillis();
+		String url = Thread.currentThread().getStackTrace()[2].getClassName()
+				+ "."
+				+ Thread.currentThread().getStackTrace()[2].getMethodName();
 		try {
 		try {
 			BusinessContext bc = createBusinessContext();
 			BusinessContext bc = createBusinessContext();
 			if (null == vo.getId() || vo.getId().equals(0l)) {
 			if (null == vo.getId() || vo.getId().equals(0l)) {
 				vo.setAddDate(new Date());
 				vo.setAddDate(new Date());
 				vo.setAddUser(Utils.getCurrentUser());
 				vo.setAddUser(Utils.getCurrentUser());
 				vo.setRecordCode(getCurrentRoleCode(functionId));
 				vo.setRecordCode(getCurrentRoleCode(functionId));
-				// SimpleDateFormat sdf = new SimpleDateFormat(
-				// "yyyy-MM-dd");
-				// StringBuffer bf=new StringBuffer();
-				// CodeEntity codeEntiy;
-				// if(Constants.DEPLOY_MODE_CITY.equals(GlobalData.DEPLOY_MODE)){
-				// codeEntiy=codeService.findOne(Long.parseLong(GlobalData.CITY_CODE));
-				// bf.append(codeEntiy.getByzd1());
-				// }
-				// String str = sdf.format(vo.getAddDate());
-				// bf.append(str);
-				// int count=zysqbpService.countTodaEntities();
-				// for (int i = 0; i < 4-(count+1+"").length(); i++) {
-				// bf.append("0");
-				// }
-				// bf.append(count+1+"");
-
 			} else {
 			} else {
 				vo.setUpdateDate(new Date());
 				vo.setUpdateDate(new Date());
 				vo.setUpdateUser(Utils.getCurrentUser());
 				vo.setUpdateUser(Utils.getCurrentUser());
 			}
 			}
 			vo = zysqbpService.saveEntity(vo);
 			vo = zysqbpService.saveEntity(vo);
+			long cost = System.currentTimeMillis() - startTime;
+			LOGGER.info(url + "<SUCCESS> (save ) cost:" + cost);
 			bc.setResult(vo);
 			bc.setResult(vo);
 			AccessoryEntity acc = accessoryService.findOne(accId);
 			AccessoryEntity acc = accessoryService.findOne(accId);
 			if (acc != null) {
 			if (acc != null) {
@@ -1174,18 +1199,31 @@ public class ZysqbpController extends BaseController {
 				accessoryService.save(acc);
 				accessoryService.save(acc);
 			}
 			}
 			bc.addMsg("save.success", "common", MsgLevel.INFO);
 			bc.addMsg("save.success", "common", MsgLevel.INFO);
+			cost = System.currentTimeMillis() - startTime;
+			LOGGER.info(url + "<SUCCESS> cost:" + cost);
 			return bc;
 			return bc;
 		} catch (Exception e) {
 		} catch (Exception e) {
+			LOGGER.error("error occured,url:" + url);
 			e.printStackTrace();
 			e.printStackTrace();
 		}
 		}
+		long cost = System.currentTimeMillis() - startTime;
+		System.err.println(url + ",cost:" + cost);
+		LOGGER.info(url + "<ERROR> cost:" + cost);
 		return null;
 		return null;
 	}
 	}
 
 
 	public BusinessContext save(ZysqbpEntity vo) {
 	public BusinessContext save(ZysqbpEntity vo) {
+		long startTime = System.currentTimeMillis();
+		String url = Thread.currentThread().getStackTrace()[2].getClassName()
+				+ "."
+				+ Thread.currentThread().getStackTrace()[2].getMethodName();
 		BusinessContext bc = createBusinessContext();
 		BusinessContext bc = createBusinessContext();
 		vo = zysqbpService.kgwgSave(vo);
 		vo = zysqbpService.kgwgSave(vo);
 		bc.setResult(vo);
 		bc.setResult(vo);
 		bc.addMsg("save.success", "common", MsgLevel.INFO);
 		bc.addMsg("save.success", "common", MsgLevel.INFO);
+		long cost = System.currentTimeMillis() - startTime;
+		// System.err.println(url + ",cost:"+cost);
+		LOGGER.info(url + "<SUCCESS> cost:" + cost);
 		return bc;
 		return bc;
 	}
 	}
 
 
@@ -1382,6 +1420,10 @@ public class ZysqbpController extends BaseController {
 	}
 	}
 
 
 	public BusinessContext submit(ZysqbpEntity vo, Long functionId, Long accId) {
 	public BusinessContext submit(ZysqbpEntity vo, Long functionId, Long accId) {
+		long startTime = System.currentTimeMillis();
+		String url = Thread.currentThread().getStackTrace()[2].getClassName()
+				+ "."
+				+ Thread.currentThread().getStackTrace()[2].getMethodName();
 		BusinessContext bc = createBusinessContext();
 		BusinessContext bc = createBusinessContext();
 		int nsns = 0;
 		int nsns = 0;
 		Date fzDate = vo.getZyddqybh().getFzsq().getYxqkssj();
 		Date fzDate = vo.getZyddqybh().getFzsq().getYxqkssj();
@@ -1461,6 +1503,8 @@ public class ZysqbpController extends BaseController {
 		// vo = compareService.doCompare(vo.getId().toString());
 		// vo = compareService.doCompare(vo.getId().toString());
 		// }
 		// }
 		bc.setResult(vo);
 		bc.setResult(vo);
+		long cost = System.currentTimeMillis() - startTime;
+		LOGGER.info(url + "<SUCCESS>  (submit)  cost:" + cost);
 		AccessoryEntity acc = accessoryService.findOne(accId);
 		AccessoryEntity acc = accessoryService.findOne(accId);
 		if (acc != null) {
 		if (acc != null) {
 			acc.setEntityId(vo.getId());
 			acc.setEntityId(vo.getId());
@@ -1498,6 +1542,7 @@ public class ZysqbpController extends BaseController {
 						zysqbpService.save(vo);
 						zysqbpService.save(vo);
 					}
 					}
 				} catch (Exception e) {
 				} catch (Exception e) {
+					LOGGER.error("error occured,url:" + url +" (ZysqbpWebService.save) ");
 					e.printStackTrace();
 					e.printStackTrace();
 					vo.setTbzt(Constants.NO);
 					vo.setTbzt(Constants.NO);
 					zysqbpService.save(vo);
 					zysqbpService.save(vo);
@@ -1511,6 +1556,7 @@ public class ZysqbpController extends BaseController {
 							acc.setTbzt(Constants.YES);
 							acc.setTbzt(Constants.YES);
 							accessoryService.save(acc);
 							accessoryService.save(acc);
 						} catch (Exception e) {
 						} catch (Exception e) {
+							LOGGER.error("error occured,url:" + url +" (AccessoryWebService.save) ");
 							e.printStackTrace();
 							e.printStackTrace();
 							acc.setTbzt(Constants.NO);
 							acc.setTbzt(Constants.NO);
 							accessoryService.save(acc);
 							accessoryService.save(acc);
@@ -1569,6 +1615,8 @@ public class ZysqbpController extends BaseController {
 
 
 		}
 		}
 		bc.addMsg("save.success", "common", MsgLevel.INFO);
 		bc.addMsg("save.success", "common", MsgLevel.INFO);
+		cost = System.currentTimeMillis() - startTime - cost;
+		LOGGER.info(url + "<ERROR> ( tb )cost:" + cost);
 		return bc;
 		return bc;
 	}
 	}
 
 
@@ -1708,6 +1756,10 @@ public class ZysqbpController extends BaseController {
 	 */
 	 */
 	public void aduit(String shyj, Date shsj, boolean auditflag,
 	public void aduit(String shyj, Date shsj, boolean auditflag,
 			ZysqbpEntity entity) throws CloneNotSupportedException {
 			ZysqbpEntity entity) throws CloneNotSupportedException {
+		long startTime = System.currentTimeMillis();
+		String url = Thread.currentThread().getStackTrace()[2].getClassName()
+				+ "."
+				+ Thread.currentThread().getStackTrace()[2].getMethodName();
 		if (zysqbpService
 		if (zysqbpService
 				.getCandidateTaskByUserAndBusKey(Utils.getCurrentUser().getId()
 				.getCandidateTaskByUserAndBusKey(Utils.getCurrentUser().getId()
 						.toString(), entity.getId().toString()) != null) {
 						.toString(), entity.getId().toString()) != null) {
@@ -1736,6 +1788,11 @@ public class ZysqbpController extends BaseController {
 				.getId().toString(), entity.getId().toString().toString(),
 				.getId().toString(), entity.getId().toString().toString(),
 				ZysqbpEntity.PROCESS_DEFINITION_KEY);
 				ZysqbpEntity.PROCESS_DEFINITION_KEY);
 		zysqbpService.audit(param, variables, task);
 		zysqbpService.audit(param, variables, task);
+
+		// 审批
+		long cost = System.currentTimeMillis() - startTime;
+		LOGGER.info(url + "<SUCCESS> (audit ) cost:" + cost);
+
 		// 查询任务表中否还存在状态值为3 的数据,不存在则修改实体的recordStatus
 		// 查询任务表中否还存在状态值为3 的数据,不存在则修改实体的recordStatus
 		List<TaskInfoEntity> list = taskService
 		List<TaskInfoEntity> list = taskService
 				.findByBusIdAndBusKeyAndRecordStatus(entity.getId().toString(),
 				.findByBusIdAndBusKeyAndRecordStatus(entity.getId().toString(),
@@ -1823,6 +1880,9 @@ public class ZysqbpController extends BaseController {
 				threadPool.execute(thread);
 				threadPool.execute(thread);
 			}
 			}
 		}
 		}
+		// 审批
+		cost = System.currentTimeMillis() - startTime - cost;
+		LOGGER.info(url + "<SUCCESS>  (tb ) cost:" + cost);
 		// if (auditflag == false) {
 		// if (auditflag == false) {
 		// ZysqbpEntity entity1 = zysqbpService.findOne(entity.getId());
 		// ZysqbpEntity entity1 = zysqbpService.findOne(entity.getId());
 		// entity1.setRecordStatus(ZysqbpEntity.RECORD_STATE_REJECT);
 		// entity1.setRecordStatus(ZysqbpEntity.RECORD_STATE_REJECT);
@@ -3691,20 +3751,26 @@ public class ZysqbpController extends BaseController {
 					entity.setXmmc(p.get("xmmc").toString());
 					entity.setXmmc(p.get("xmmc").toString());
 					entity.setSplb(p.get("splb").toString());
 					entity.setSplb(p.get("splb").toString());
 					if (null != ba.getSzd()) {
 					if (null != ba.getSzd()) {
-						if(p.containsKey("xkjg-" + ba.getSzd().getId())){
+						if (p.containsKey("xkjg-" + ba.getSzd().getId())) {
 							entity.setXkjg(p.get("xkjg-" + ba.getSzd().getId())
 							entity.setXkjg(p.get("xkjg-" + ba.getSzd().getId())
 									.toString());
 									.toString());
-						} else if (p.containsKey("xkjg-" + ba.getSzd().getParent().getId())) {
-							entity.setXkjg(p.get("xkjg-" + ba.getSzd().getParent().getId())
+						} else if (p.containsKey("xkjg-"
+								+ ba.getSzd().getParent().getId())) {
+							entity.setXkjg(p.get(
+									"xkjg-" + ba.getSzd().getParent().getId())
 									.toString());
 									.toString());
 						}
 						}
-						
-						if(p.containsKey("xzxkqlbm-" + ba.getSzd().getId())){
+
+						if (p.containsKey("xzxkqlbm-" + ba.getSzd().getId())) {
 							entity.setXzxkqlbm(p.get(
 							entity.setXzxkqlbm(p.get(
-									"xzxkqlbm-" + ba.getSzd().getId()).toString());
-						} else if (p.containsKey("xzxkqlbm-" + ba.getSzd().getParent().getId())) {
+									"xzxkqlbm-" + ba.getSzd().getId())
+									.toString());
+						} else if (p.containsKey("xzxkqlbm-"
+								+ ba.getSzd().getParent().getId())) {
 							entity.setXzxkqlbm(p.get(
 							entity.setXzxkqlbm(p.get(
-									"xzxkqlbm-" + ba.getSzd().getParent().getId()).toString());
+									"xzxkqlbm-"
+											+ ba.getSzd().getParent().getId())
+									.toString());
 						}
 						}
 						entity.setDfbm(ba.getSzd().getCode());
 						entity.setDfbm(ba.getSzd().getCode());
 					}
 					}
@@ -3858,21 +3924,27 @@ public class ZysqbpController extends BaseController {
 					entity.setXmmc(p.get("xmmc").toString());
 					entity.setXmmc(p.get("xmmc").toString());
 					entity.setSplb(p.get("splb").toString());
 					entity.setSplb(p.get("splb").toString());
 					if (null != zysqbpEntity.getSzd()) {
 					if (null != zysqbpEntity.getSzd()) {
-						//许可机关
-						if(p.containsKey("xkjg-" + ba.getSzd().getId())){
+						// 许可机关
+						if (p.containsKey("xkjg-" + ba.getSzd().getId())) {
 							entity.setXkjg(p.get("xkjg-" + ba.getSzd().getId())
 							entity.setXkjg(p.get("xkjg-" + ba.getSzd().getId())
 									.toString());
 									.toString());
-						} else if (p.containsKey("xkjg-" + ba.getSzd().getParent().getId())) {
-							entity.setXkjg(p.get("xkjg-" + ba.getSzd().getParent().getId())
+						} else if (p.containsKey("xkjg-"
+								+ ba.getSzd().getParent().getId())) {
+							entity.setXkjg(p.get(
+									"xkjg-" + ba.getSzd().getParent().getId())
 									.toString());
 									.toString());
 						}
 						}
-						//行政许可权利编码
-						if(p.containsKey("xzxkqlbm-" + ba.getSzd().getId())){
+						// 行政许可权利编码
+						if (p.containsKey("xzxkqlbm-" + ba.getSzd().getId())) {
 							entity.setXzxkqlbm(p.get(
 							entity.setXzxkqlbm(p.get(
-									"xzxkqlbm-" + ba.getSzd().getId()).toString());
-						} else if (p.containsKey("xzxkqlbm-" + ba.getSzd().getParent().getId())) {
+									"xzxkqlbm-" + ba.getSzd().getId())
+									.toString());
+						} else if (p.containsKey("xzxkqlbm-"
+								+ ba.getSzd().getParent().getId())) {
 							entity.setXzxkqlbm(p.get(
 							entity.setXzxkqlbm(p.get(
-									"xzxkqlbm-" + ba.getSzd().getParent().getId()).toString());
+									"xzxkqlbm-"
+											+ ba.getSzd().getParent().getId())
+									.toString());
 						}
 						}
 						entity.setDfbm(zysqbpEntity.getSzd().getCode());
 						entity.setDfbm(zysqbpEntity.getSzd().getCode());
 					}
 					}
@@ -4203,13 +4275,13 @@ public class ZysqbpController extends BaseController {
 		String type = MemType.TYPE_FRXZXK;
 		String type = MemType.TYPE_FRXZXK;
 		switch (index) {
 		switch (index) {
 		case 0:
 		case 0:
-			 type = MemType.TYPE_FRXZXK;
+			type = MemType.TYPE_FRXZXK;
 			break;
 			break;
 		case 1:
 		case 1:
-			 type = MemType.TYPE_DSJFX;
+			type = MemType.TYPE_DSJFX;
 			break;
 			break;
 		case 2:
 		case 2:
-			 type = MemType.TYPE_SBXK;
+			type = MemType.TYPE_SBXK;
 			break;
 			break;
 		default:
 		default:
 			break;
 			break;
@@ -4292,9 +4364,10 @@ public class ZysqbpController extends BaseController {
 		}
 		}
 		return createBusinessContext();
 		return createBusinessContext();
 	}
 	}
-	
+
 	/**
 	/**
 	 * 危险货物作业许可
 	 * 危险货物作业许可
+	 * 
 	 * @param page
 	 * @param page
 	 * @param functioniId
 	 * @param functioniId
 	 * @param szdId
 	 * @param szdId
@@ -4302,7 +4375,8 @@ public class ZysqbpController extends BaseController {
 	 * @param stop
 	 * @param stop
 	 * @return
 	 * @return
 	 */
 	 */
-	public BusinessContext listOfXksb( SinglePageRequest page,Long functioniId,final Long szdId,final Date start,final Date stop) {
+	public BusinessContext listOfXksb(SinglePageRequest page, Long functioniId,
+			final Long szdId, final Date start, final Date stop) {
 		BusinessContext bc = new BusinessContext();
 		BusinessContext bc = new BusinessContext();
 		try {
 		try {
 			Specification<TaskInfoEntity> spec = new Specification<TaskInfoEntity>() {
 			Specification<TaskInfoEntity> spec = new Specification<TaskInfoEntity>() {
@@ -4374,8 +4448,7 @@ public class ZysqbpController extends BaseController {
 			};
 			};
 			page = new SinglePageRequest(page.getPageNumber(),
 			page = new SinglePageRequest(page.getPageNumber(),
 					page.getPageSize(), "desc", "auditTime");
 					page.getPageSize(), "desc", "auditTime");
-			Page<TaskInfoEntity> pageList = taskService
-					.findAll1(spec, page);
+			Page<TaskInfoEntity> pageList = taskService.findAll1(spec, page);
 			List<XksbEntity> list2 = new ArrayList<XksbEntity>();
 			List<XksbEntity> list2 = new ArrayList<XksbEntity>();
 			InputStream in = ZysqbpController.class
 			InputStream in = ZysqbpController.class
 					.getResourceAsStream("/frxzxk/frxzxk.properties");
 					.getResourceAsStream("/frxzxk/frxzxk.properties");
@@ -4394,49 +4467,57 @@ public class ZysqbpController extends BaseController {
 				entity.setBjh(zysqbpEntity.getBh());
 				entity.setBjh(zysqbpEntity.getBh());
 				if (in != null) {
 				if (in != null) {
 					if (null != ba.getSzd()) {
 					if (null != ba.getSzd()) {
-						if(p.containsKey("xzxkqlbm-" + ba.getSzd().getId())){
+						if (p.containsKey("xzxkqlbm-" + ba.getSzd().getId())) {
 							entity.setQlsxbm(p.get(
 							entity.setQlsxbm(p.get(
-									"xzxkqlbm-" + ba.getSzd().getId()).toString());
-						} else if (p.containsKey("xzxkqlbm-" + ba.getSzd().getParent().getId())) {
+									"xzxkqlbm-" + ba.getSzd().getId())
+									.toString());
+						} else if (p.containsKey("xzxkqlbm-"
+								+ ba.getSzd().getParent().getId())) {
 							entity.setQlsxbm(p.get(
 							entity.setQlsxbm(p.get(
-									"xzxkqlbm-" + ba.getSzd().getParent().getId()).toString());
+									"xzxkqlbm-"
+											+ ba.getSzd().getParent().getId())
+									.toString());
 						}
 						}
-						if(p.containsKey("xkjg-" + ba.getSzd().getId())){
+						if (p.containsKey("xkjg-" + ba.getSzd().getId())) {
 							entity.setYwcs(p.get("xkjg-" + ba.getSzd().getId())
 							entity.setYwcs(p.get("xkjg-" + ba.getSzd().getId())
 									.toString());
 									.toString());
-						} else if (p.containsKey("xkjg-" + ba.getSzd().getParent().getId())) {
-							entity.setYwcs(p.get("xkjg-" + ba.getSzd().getParent().getId())
+						} else if (p.containsKey("xkjg-"
+								+ ba.getSzd().getParent().getId())) {
+							entity.setYwcs(p.get(
+									"xkjg-" + ba.getSzd().getParent().getId())
 									.toString());
 									.toString());
 						}
 						}
-						
-						//承诺时限
-						if(p.containsKey("cnsx-" + ba.getSzd().getId())){
+
+						// 承诺时限
+						if (p.containsKey("cnsx-" + ba.getSzd().getId())) {
 							entity.setCnsx(p.get("cnsx-" + ba.getSzd().getId())
 							entity.setCnsx(p.get("cnsx-" + ba.getSzd().getId())
 									.toString());
 									.toString());
-						} else if (p.containsKey("cnsx-" + ba.getSzd().getParent().getId())) {
-							entity.setCnsx(p.get("cnsx-" + ba.getSzd().getParent().getId())
+						} else if (p.containsKey("cnsx-"
+								+ ba.getSzd().getParent().getId())) {
+							entity.setCnsx(p.get(
+									"cnsx-" + ba.getSzd().getParent().getId())
 									.toString());
 									.toString());
 						}
 						}
 					}
 					}
 				}
 				}
-				//联系人
+				// 联系人
 				entity.setLxr(zysqbpEntity.getBgr());
 				entity.setLxr(zysqbpEntity.getBgr());
-				//联系电话
+				// 联系电话
 				entity.setLxdh(zysqbpEntity.getLxfs());
 				entity.setLxdh(zysqbpEntity.getLxfs());
 				if (null != zysqbpEntity.getZydw()) {
 				if (null != zysqbpEntity.getZydw()) {
-					//申请单位
-					entity.setSqdw(zysqbpEntity.getZydw().getGkjyr());		
-					//申请人联系地址
+					// 申请单位
+					entity.setSqdw(zysqbpEntity.getZydw().getGkjyr());
+					// 申请人联系地址
 					entity.setSqrlxdz(zysqbpEntity.getZydw().getBgdz());
 					entity.setSqrlxdz(zysqbpEntity.getZydw().getBgdz());
 				}
 				}
 				Date time = ba.getAuditTime();
 				Date time = ba.getAuditTime();
-				//受理时间
+				// 受理时间
 				entity.setSlsj(time);
 				entity.setSlsj(time);
-				//办结人姓名
+				// 办结人姓名
 				entity.setBlryxm(ba.getAuditUsername());
 				entity.setBlryxm(ba.getAuditUsername());
-				//办结状态
-				entity.setBjzt(zysqbpEntity.getRecordStatus()+"");
-				//办结意见
+				// 办结状态
+				entity.setBjzt(zysqbpEntity.getRecordStatus() + "");
+				// 办结意见
 				entity.setBjyj(ba.getAuditMsg());
 				entity.setBjyj(ba.getAuditMsg());
 				if (zysqbpEntity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {// 已完成作业对应的流程
 				if (zysqbpEntity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {// 已完成作业对应的流程
 					entity.setBjyj("同意办结");
 					entity.setBjyj("同意办结");
@@ -4447,7 +4528,7 @@ public class ZysqbpController extends BaseController {
 				} else if (zysqbpEntity.getRecordStatus() == BaseEntity.RECORD_STATE_REJECT) {// 作废作业对应的流程
 				} else if (zysqbpEntity.getRecordStatus() == BaseEntity.RECORD_STATE_REJECT) {// 作废作业对应的流程
 					entity.setBjyj("不同意办结");
 					entity.setBjyj("不同意办结");
 				}
 				}
-				//办结时间
+				// 办结时间
 				entity.setBjsj(time);
 				entity.setBjsj(time);
 				list2.add(entity);
 				list2.add(entity);
 			}
 			}
@@ -4459,9 +4540,10 @@ public class ZysqbpController extends BaseController {
 		}
 		}
 		return null;
 		return null;
 	}
 	}
-	
+
 	/**
 	/**
 	 * 作业申报许可打印
 	 * 作业申报许可打印
+	 * 
 	 * @param param
 	 * @param param
 	 * @return
 	 * @return
 	 * @throws ParseException
 	 * @throws ParseException
@@ -4574,49 +4656,57 @@ public class ZysqbpController extends BaseController {
 				entity.setBjh(zysqbpEntity.getBh());
 				entity.setBjh(zysqbpEntity.getBh());
 				if (in != null) {
 				if (in != null) {
 					if (null != ba.getSzd()) {
 					if (null != ba.getSzd()) {
-						if(p.containsKey("xzxkqlbm-" + ba.getSzd().getId())){
+						if (p.containsKey("xzxkqlbm-" + ba.getSzd().getId())) {
 							entity.setQlsxbm(p.get(
 							entity.setQlsxbm(p.get(
-									"xzxkqlbm-" + ba.getSzd().getId()).toString());
-						} else if (p.containsKey("xzxkqlbm-" + ba.getSzd().getParent().getId())) {
+									"xzxkqlbm-" + ba.getSzd().getId())
+									.toString());
+						} else if (p.containsKey("xzxkqlbm-"
+								+ ba.getSzd().getParent().getId())) {
 							entity.setQlsxbm(p.get(
 							entity.setQlsxbm(p.get(
-									"xzxkqlbm-" + ba.getSzd().getParent().getId()).toString());
+									"xzxkqlbm-"
+											+ ba.getSzd().getParent().getId())
+									.toString());
 						}
 						}
-						if(p.containsKey("xkjg-" + ba.getSzd().getId())){
+						if (p.containsKey("xkjg-" + ba.getSzd().getId())) {
 							entity.setYwcs(p.get("xkjg-" + ba.getSzd().getId())
 							entity.setYwcs(p.get("xkjg-" + ba.getSzd().getId())
 									.toString());
 									.toString());
-						} else if (p.containsKey("xkjg-" + ba.getSzd().getParent().getId())) {
-							entity.setYwcs(p.get("xkjg-" + ba.getSzd().getParent().getId())
+						} else if (p.containsKey("xkjg-"
+								+ ba.getSzd().getParent().getId())) {
+							entity.setYwcs(p.get(
+									"xkjg-" + ba.getSzd().getParent().getId())
 									.toString());
 									.toString());
 						}
 						}
-						
-						//承诺时限
-						if(p.containsKey("cnsx-" + ba.getSzd().getId())){
+
+						// 承诺时限
+						if (p.containsKey("cnsx-" + ba.getSzd().getId())) {
 							entity.setCnsx(p.get("cnsx-" + ba.getSzd().getId())
 							entity.setCnsx(p.get("cnsx-" + ba.getSzd().getId())
 									.toString());
 									.toString());
-						} else if (p.containsKey("cnsx-" + ba.getSzd().getParent().getId())) {
-							entity.setCnsx(p.get("cnsx-" + ba.getSzd().getParent().getId())
+						} else if (p.containsKey("cnsx-"
+								+ ba.getSzd().getParent().getId())) {
+							entity.setCnsx(p.get(
+									"cnsx-" + ba.getSzd().getParent().getId())
 									.toString());
 									.toString());
 						}
 						}
 					}
 					}
 				}
 				}
-				//联系人
+				// 联系人
 				entity.setLxr(zysqbpEntity.getBgr());
 				entity.setLxr(zysqbpEntity.getBgr());
-				//联系电话
+				// 联系电话
 				entity.setLxdh(zysqbpEntity.getLxfs());
 				entity.setLxdh(zysqbpEntity.getLxfs());
 				if (null != zysqbpEntity.getZydw()) {
 				if (null != zysqbpEntity.getZydw()) {
-					//申请单位
-					entity.setSqdw(zysqbpEntity.getZydw().getGkjyr());		
-					//申请人联系地址
+					// 申请单位
+					entity.setSqdw(zysqbpEntity.getZydw().getGkjyr());
+					// 申请人联系地址
 					entity.setSqrlxdz(zysqbpEntity.getZydw().getBgdz());
 					entity.setSqrlxdz(zysqbpEntity.getZydw().getBgdz());
 				}
 				}
 				Date time = ba.getAuditTime();
 				Date time = ba.getAuditTime();
-				//受理时间
+				// 受理时间
 				entity.setSlsj(time);
 				entity.setSlsj(time);
-				//办理人姓名
+				// 办理人姓名
 				entity.setBlryxm(ba.getAuditUsername());
 				entity.setBlryxm(ba.getAuditUsername());
-				//办结状态
-				entity.setBjzt(zysqbpEntity.getRecordStatus()+"");
-				//办结意见
+				// 办结状态
+				entity.setBjzt(zysqbpEntity.getRecordStatus() + "");
+				// 办结意见
 				entity.setBjyj(ba.getAuditMsg());
 				entity.setBjyj(ba.getAuditMsg());
 				if (zysqbpEntity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {// 已完成作业对应的流程
 				if (zysqbpEntity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {// 已完成作业对应的流程
 					entity.setBjyj("同意办结");
 					entity.setBjyj("同意办结");
@@ -4627,7 +4717,7 @@ public class ZysqbpController extends BaseController {
 				} else if (zysqbpEntity.getRecordStatus() == BaseEntity.RECORD_STATE_REJECT) {// 作废作业对应的流程
 				} else if (zysqbpEntity.getRecordStatus() == BaseEntity.RECORD_STATE_REJECT) {// 作废作业对应的流程
 					entity.setBjyj("不同意办结");
 					entity.setBjyj("不同意办结");
 				}
 				}
-				//办结时间
+				// 办结时间
 				entity.setBjsj(time);
 				entity.setBjsj(time);
 				int i = 1;
 				int i = 1;
 				if (true) {
 				if (true) {
@@ -4641,13 +4731,14 @@ public class ZysqbpController extends BaseController {
 							entity.getSqrlxdz(),
 							entity.getSqrlxdz(),
 							entity.getLxdh(),
 							entity.getLxdh(),
 							entity.getCnsx(),
 							entity.getCnsx(),
-							null == entity.getSlsj()? "" : sdf3.format(entity
-									.getSlsj()), 
+							null == entity.getSlsj() ? "" : sdf3.format(entity
+									.getSlsj()),
 							entity.getBlryxm(),
 							entity.getBlryxm(),
-							entity.getBlrygh(), 
-							entity.getBjzt(), entity.getBjyj(),
-							null == entity.getBjsj()? "" : sdf3.format(entity
-									.getBjsj())};
+							entity.getBlrygh(),
+							entity.getBjzt(),
+							entity.getBjyj(),
+							null == entity.getBjsj() ? "" : sdf3.format(entity
+									.getBjsj()) };
 					strings.add(ss);
 					strings.add(ss);
 					i++;
 					i++;
 				}
 				}
@@ -4655,84 +4746,97 @@ public class ZysqbpController extends BaseController {
 		}
 		}
 		return strings;
 		return strings;
 	}
 	}
-	
+
 	/*
 	/*
-	 * 批量签章时,获取所要保护的数据 
-	 * xh 2016.7.4
-	 * (  public String GetmSignatureData(@RequestParam String documentID,HttpSession session)  )
+	 * 批量签章时,获取所要保护的数据 xh 2016.7.4 ( public String
+	 * GetmSignatureData(@RequestParam String documentID,HttpSession session) )
 	 */
 	 */
 	@RequestMapping(value = "GetmSignatureData", method = RequestMethod.GET)
 	@RequestMapping(value = "GetmSignatureData", method = RequestMethod.GET)
-	@ResponseBody 
-	public String GetmSignatureData(@RequestParam String documentID){ 
+	@ResponseBody
+	public String GetmSignatureData(@RequestParam String documentID) {
 		ZysqbpEntity data = zysqbpService.findOne(Long.parseLong(documentID));
 		ZysqbpEntity data = zysqbpService.findOne(Long.parseLong(documentID));
-		
-		String audit_user="",audit_date="",audit_op="";
-		SimpleDateFormat myFmt=new SimpleDateFormat("yyyy-M-d");
-		SimpleDateFormat myFmt2=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		
-		//审批信息
+
+		String audit_user = "", audit_date = "", audit_op = "";
+		SimpleDateFormat myFmt = new SimpleDateFormat("yyyy-M-d");
+		SimpleDateFormat myFmt2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+		// 审批信息
 		if (data.getTaskList() != null && data.getTaskList().size() > 0) {
 		if (data.getTaskList() != null && data.getTaskList().size() > 0) {
 			for (TaskInfoEntity task : data.getTaskList()) {
 			for (TaskInfoEntity task : data.getTaskList()) {
 				if ("wf.sc".equals(task.getCurrName())) {
 				if ("wf.sc".equals(task.getCurrName())) {
-//					parameters.put("audit_user", task.getAuditUsername());
-//					parameters.put("audit_date", task.getAuditTime());
-//					parameters.put("audit_op", task.getAuditMsg());
-//					parameters.put("audit_dept", task.getByzd2());
+					// parameters.put("audit_user", task.getAuditUsername());
+					// parameters.put("audit_date", task.getAuditTime());
+					// parameters.put("audit_op", task.getAuditMsg());
+					// parameters.put("audit_dept", task.getByzd2());
 					audit_user = task.getAuditUsername();
 					audit_user = task.getAuditUsername();
-					if(task.getAuditTime()!=null)
+					if (task.getAuditTime() != null)
 						audit_date = myFmt.format(task.getAuditTime());
 						audit_date = myFmt.format(task.getAuditTime());
-					audit_op =  task.getAuditMsg();	
+					audit_op = task.getAuditMsg();
 				}
 				}
 			}
 			}
 		}
 		}
-		
-		
-		String div = "\r\n";//分隔符
+
+		String div = "\r\n";// 分隔符
 		StringBuffer sb = new StringBuffer();
 		StringBuffer sb = new StringBuffer();
-		sb.append("BH="+ ((data.getBh()==null)?"":data.getBh())+ div);
-		sb.append("ZYDW="+((data.getZydw()==null)?"":data.getZydw().getGkjyr())+div);
-		sb.append("ZYWTR="+((data.getZywtr()==null)?"":data.getZywtr())+div);
-		sb.append("CM="+((data.getCm()==null)?"":data.getCm())+div);
-		sb.append("XCGLFZR="+((data.getXcglfzr()==null)?"":data.getXcglfzr())+div);
-		sb.append("WXHWMCBH="+((data.getWxhwmcbh()==null)?"":data.getWxhwmcbh())+div);
-		sb.append("WPBH="+((data.getWpbh()==null)?"":data.getWpbh())+div);
-		sb.append("JSPM="+((data.getJspm()==null)?"":data.getJspm())+div);
-		sb.append("BZ="+((data.getBz()==null)?"":data.getBz())+div);
-		sb.append("WXPLB="+((data.getWxplb()==null)?"":data.getWxplb())+div);
-		sb.append("BYZD4="+((data.getByzd4()==null)?"":data.getByzd4())+div);
-	 
-		String inorout ="";
+		sb.append("BH=" + ((data.getBh() == null) ? "" : data.getBh()) + div);
+		sb.append("ZYDW="
+				+ ((data.getZydw() == null) ? "" : data.getZydw().getGkjyr())
+				+ div);
+		sb.append("ZYWTR=" + ((data.getZywtr() == null) ? "" : data.getZywtr())
+				+ div);
+		sb.append("CM=" + ((data.getCm() == null) ? "" : data.getCm()) + div);
+		sb.append("XCGLFZR="
+				+ ((data.getXcglfzr() == null) ? "" : data.getXcglfzr()) + div);
+		sb.append("WXHWMCBH="
+				+ ((data.getWxhwmcbh() == null) ? "" : data.getWxhwmcbh())
+				+ div);
+		sb.append("WPBH=" + ((data.getWpbh() == null) ? "" : data.getWpbh())
+				+ div);
+		sb.append("JSPM=" + ((data.getJspm() == null) ? "" : data.getJspm())
+				+ div);
+		sb.append("BZ=" + ((data.getBz() == null) ? "" : data.getBz()) + div);
+		sb.append("WXPLB=" + ((data.getWxplb() == null) ? "" : data.getWxplb())
+				+ div);
+		sb.append("BYZD4=" + ((data.getByzd4() == null) ? "" : data.getByzd4())
+				+ div);
+
+		String inorout = "";
 		// 1进港/2出港
 		// 1进港/2出港
-		if(data.getInorout().equals("1")){ 
+		if (data.getInorout().equals("1")) {
 			inorout = "进港";
 			inorout = "进港";
+		} else if (data.getInorout().equals("2")) {
+			inorout = "出港";
 		}
 		}
-		else if(data.getInorout().equals("2")){ 
-			inorout="出港";
-		} 
-		sb.append("INOROUT="+inorout+div);
-		
-		sb.append("ZYSL="+((data.getZysl()==null)?"":data.getZysl())+div);
-		sb.append("SG="+((data.getSg()==null)?"":data.getSg())+div);
-		sb.append("XG="+((data.getXg()==null)?"":data.getXg())+div);
-		
-		String mao="";
-		//1内贸/2外贸 
-		if(data.getMao().equals("1")){ 
+		sb.append("INOROUT=" + inorout + div);
+
+		sb.append("ZYSL=" + ((data.getZysl() == null) ? "" : data.getZysl())
+				+ div);
+		sb.append("SG=" + ((data.getSg() == null) ? "" : data.getSg()) + div);
+		sb.append("XG=" + ((data.getXg() == null) ? "" : data.getXg()) + div);
+
+		String mao = "";
+		// 1内贸/2外贸
+		if (data.getMao().equals("1")) {
 			mao = "内贸";
 			mao = "内贸";
-		}
-		else if(data.getMao().equals("2")){ 
+		} else if (data.getMao().equals("2")) {
 			mao = "外贸 ";
 			mao = "外贸 ";
 		}
 		}
-		sb.append("MAO="+mao+div);
-		
-		 
-		sb.append("HZWXX="+(data.getHzwxx()==null?"": resource.getString(data.getHzwxx().getName()))+div);
-		sb.append("DXDJ="+((data.getDxdj()==null)?"":data.getDxdj())+div);
-		sb.append("WRLB="+((data.getWrlb()==null)?"":data.getWrlb())+div);
-		sb.append("JZXSL="+((data.getWrlb()==null)?"":data.getWrlb())+div);
-		sb.append("HC="+((data.getHc()==null)?"":data.getHc())+div);
-		sb.append("HWZL="+  (data.getHwzl()==null?"": resource.getString(data.getHwzl().getName()))+div);
-		 	
+		sb.append("MAO=" + mao + div);
+
+		sb.append("HZWXX="
+				+ (data.getHzwxx() == null ? "" : resource.getString(data
+						.getHzwxx().getName())) + div);
+		sb.append("DXDJ=" + ((data.getDxdj() == null) ? "" : data.getDxdj())
+				+ div);
+		sb.append("WRLB=" + ((data.getWrlb() == null) ? "" : data.getWrlb())
+				+ div);
+		sb.append("JZXSL=" + ((data.getWrlb() == null) ? "" : data.getWrlb())
+				+ div);
+		sb.append("HC=" + ((data.getHc() == null) ? "" : data.getHc()) + div);
+		sb.append("HWZL="
+				+ (data.getHwzl() == null ? "" : resource.getString(data
+						.getHwzl().getName())) + div);
+
 		String hwxs = data.getHwxs();
 		String hwxs = data.getHwxs();
 		String hwxs1 = "";
 		String hwxs1 = "";
 		if (hwxs != null && hwxs != "") {
 		if (hwxs != null && hwxs != "") {
@@ -4820,35 +4924,46 @@ public class ZysqbpController extends BaseController {
 			}
 			}
 			hwxs1 = hwxs1.substring(0, hwxs1.length() - 1);
 			hwxs1 = hwxs1.substring(0, hwxs1.length() - 1);
 		}
 		}
-		
-		sb.append("HWXS="+hwxs1+div);
-		sb.append("LHXZ="+((data.getLhxz()==null)?"":data.getLhxz())+div);
-		 
-		String zydd = ((data.getZydd()==null)?"":resource.getString(data.getZydd().getName()))+
-				((data.getZyddqybh()==null) ? "" : data.getZyddqybh().getQynbmc());
-		sb.append("ZYDD="+zydd+div);
-		  
-		sb.append("ZYSJQ="+((data.getZysjq()==null)?"":myFmt2.format(data.getZysjq()))+div);
-		sb.append("ZYSJZ="+((data.getZysjz()==null)?"":myFmt2.format(data.getZysjz()))+div);
-		sb.append("AQFFCS="+((data.getAqffcs()==null)?"":data.getAqffcs())+div);
-		sb.append("BGR="+((data.getBgr()==null)?"":data.getBgr())+div);
-		sb.append("LXFS="+((data.getLxfs()==null)?"":data.getLxfs())+div);
-		sb.append("BGSJ="+((data.getBgsj()==null)?"":myFmt2.format(data.getBgsj()))+div);
-		sb.append("BYZD2="+((data.getByzd2()==null)?"":data.getByzd2())+div);
- 
-		//审核意见 
-		sb.append("SHYJ="+audit_op+div);
-		sb.append("SHR="+audit_user+div);
-		sb.append("SHSJ="+audit_date+div);
- 
-	     
-	    try {
-			return  java.net.URLEncoder.encode(sb.toString(),"gb2312");
-		} catch (UnsupportedEncodingException e) { 
+
+		sb.append("HWXS=" + hwxs1 + div);
+		sb.append("LHXZ=" + ((data.getLhxz() == null) ? "" : data.getLhxz())
+				+ div);
+
+		String zydd = ((data.getZydd() == null) ? "" : resource.getString(data
+				.getZydd().getName()))
+				+ ((data.getZyddqybh() == null) ? "" : data.getZyddqybh()
+						.getQynbmc());
+		sb.append("ZYDD=" + zydd + div);
+
+		sb.append("ZYSJQ="
+				+ ((data.getZysjq() == null) ? "" : myFmt2.format(data
+						.getZysjq())) + div);
+		sb.append("ZYSJZ="
+				+ ((data.getZysjz() == null) ? "" : myFmt2.format(data
+						.getZysjz())) + div);
+		sb.append("AQFFCS="
+				+ ((data.getAqffcs() == null) ? "" : data.getAqffcs()) + div);
+		sb.append("BGR=" + ((data.getBgr() == null) ? "" : data.getBgr()) + div);
+		sb.append("LXFS=" + ((data.getLxfs() == null) ? "" : data.getLxfs())
+				+ div);
+		sb.append("BGSJ="
+				+ ((data.getBgsj() == null) ? ""
+						: myFmt2.format(data.getBgsj())) + div);
+		sb.append("BYZD2=" + ((data.getByzd2() == null) ? "" : data.getByzd2())
+				+ div);
+
+		// 审核意见
+		sb.append("SHYJ=" + audit_op + div);
+		sb.append("SHR=" + audit_user + div);
+		sb.append("SHSJ=" + audit_date + div);
+
+		try {
+			return java.net.URLEncoder.encode(sb.toString(), "gb2312");
+		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
 			e.printStackTrace();
-		}  
-	     
-	    return "error";
+		}
+
+		return "error";
 	}
 	}
 
 
 }
 }