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

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

@@ -970,9 +970,14 @@ public class JsjdglCtl extends BaseWebCtl {
 	@RequestMapping(value = "/saveFile")
 	@ResponseBody
 	public WebJsonResult saveFile(String ssid, MultipartFile filename, Model model) {
-		AccessoryEntity acc = accessoryService.saveFile(filename, "jsjd");
 		WebJsonResult wr = success();
-		wr.setAttr("acc", acc);
+		if(filename!=null){
+			AccessoryEntity acc = accessoryService.saveFile(filename, "jsjd");
+			wr.setAttr("acc", acc);
+		}else{
+			wr.setSuccess(false);
+			wr.setMessage("请上传附件！");
+		}
 		return wr;
 	}
 
@@ -1764,10 +1769,15 @@ public class JsjdglCtl extends BaseWebCtl {
 	@ResponseBody
 	public WebJsonResult saveQtfj(String opflag, MultipartFile qtfilename, Model model) {
 		WebJsonResult wr = success();
-		AccessoryEntity acc = accessoryService.saveFile(qtfilename, "jsjdqtfj");
-		acc.setRemark(opflag);
-		accessoryService.save(acc);
-		wr.setAttr("acc", acc);
+		if(qtfilename!=null){
+			AccessoryEntity acc = accessoryService.saveFile(qtfilename, "jsjdqtfj");
+			acc.setRemark(opflag);
+			accessoryService.save(acc);
+			wr.setAttr("acc", acc);
+		}else{
+			wr.setSuccess(false);
+			wr.setMessage("请上传附件！");
+		}
 		return wr;
 	}
 
@@ -1810,11 +1820,16 @@ public class JsjdglCtl extends BaseWebCtl {
 		if (fjzd != null) {
 			jsjd.setFbdw(fjzd.getFbdw());
 			jsjd.setWjh(fjzd.getWjh());
-			Date date = fjzd.getFbsj();
-			if (date != null) {
-				String date2 = dateFormater.format(date);
-				jsjd.setFbsj(date2);
+			if(!StringUtils.isEmpty(fjzd.getFbsj())){
+				Date date = fjzd.getFbsj();
+				if (date != null) {
+					String date2 = dateFormater.format(date);
+					jsjd.setFbsj(date2);
+				}
+			}else{
+				jsjd.setFbsj("");
 			}
+		
 			jsjd.setId(fjzd.getId());
 		}
 		jsjd.setFjmc(acc.getName());

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/ctl/XmxxglCtl.java

@@ -2,7 +2,6 @@ package com.xt.jygl.gkjsgl.xmxxgl.ctl;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -37,8 +36,6 @@ import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.common.Constants;
 import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.common.Utils;
-import com.xt.jygl.gkjcxx.ax.entity.AxEntity;
-import com.xt.jygl.gkjcxx.ax.vo.AxVo;
 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
 import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
@@ -330,10 +327,10 @@ public class XmxxglCtl extends BaseWebCtl {
 	@RequestMapping(value = "/save")
 	@RequiresPermissions("xmxxgl:add")
 	@ResponseBody
-	public WebJsonResult save(Model model, XmxxglEntity code, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid, String sylxid) {
+	public WebJsonResult save(Model model, XmxxglEntity code, String ssjyrid, String fjids, String xzqh, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid, String sylxid) {
 		WebJsonResult wr = success();
-		
-		if (StringUtils.isEmpty(code.getXmbm())) {
+
+		if (StringUtils.isEmpty(xzqh)) {
 			wr.setSuccess(false);
 			wr.setMessage("请选择行政区划");
 			return wr;
@@ -516,6 +513,11 @@ public class XmxxglCtl extends BaseWebCtl {
 					sylx.setId(sylxid);
 					code.setSylx(sylx);
 				}
+				SimpleDateFormat data = new SimpleDateFormat("yyyy");
+				String nf = data.format(new Date());
+				String bh = xmxxglService.getxmbm();
+				String xmbm = nf + xzqh + "GK" + bh;
+				code.setXmbm(xmbm);
 				xmxxglService.save(code);
 
 			}
@@ -555,9 +557,9 @@ public class XmxxglCtl extends BaseWebCtl {
 		vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
 		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
 		vo.setZyhbwfl(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getId() : "");
-		
-		if(StringUtils.isNotEmpty(entity.getXmbm())){
-			String codeid = entity.getXmbm().substring(4,10);
+
+		if (StringUtils.isNotEmpty(entity.getXmbm())) {
+			String codeid = entity.getXmbm().substring(4, 10);
 			CodeEntity code = securityMgr.codeService().findOne(codeid);
 			model.addAttribute("xzqhname", code.getText());
 		}
@@ -615,8 +617,8 @@ public class XmxxglCtl extends BaseWebCtl {
 		vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
 		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
 		vo.setZyhbwfl(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getId() : "");
-		if(StringUtils.isNotEmpty(entity.getXmbm())){
-			String codeid = entity.getXmbm().substring(4,10);
+		if (StringUtils.isNotEmpty(entity.getXmbm())) {
+			String codeid = entity.getXmbm().substring(4, 10);
 			CodeEntity code = securityMgr.codeService().findOne(codeid);
 			model.addAttribute("xzqhname", code.getText());
 		}
@@ -685,7 +687,7 @@ public class XmxxglCtl extends BaseWebCtl {
 		List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_AXSPJB);
 		return list;
 	}
-	
+
 	@RequestMapping(value = "/exportExcelAll")
 	public String exportExcelAll(HttpServletResponse response, final String xmmc, final String xmfr, final String szdid, final String szgkid, final String szgqid, final String xmhzjbid, final String sfyzjbzid) {
 		Specification<XmxxglEntity> spec = new Specification<XmxxglEntity>() {
@@ -744,13 +746,12 @@ public class XmxxglCtl extends BaseWebCtl {
 		List<XmxxglEntity> list = query.findAll(spec, XmxxglEntity.class);
 		List<XmxxglVo> voList = new ArrayList<XmxxglVo>();
 		SimpleDateFormat formater = new SimpleDateFormat("yyyyMMdd hh:mm:ss");
-		
+
 		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() : "");
@@ -759,16 +760,18 @@ public class XmxxglCtl extends BaseWebCtl {
 				vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
 				vo.setZyhbwflzw(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getText() : "");
 				vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().getText() : "");
-//				if (entity.getJyrid() != null) {
-//					vo.setSzddzw(entity.getJyrid().getSzd() != null ? entity.getJyrid().getSzd().getText() : "");
-//				}
+				// if (entity.getJyrid() != null) {
+				// vo.setSzddzw(entity.getJyrid().getSzd() != null ?
+				// entity.getJyrid().getSzd().getText() : "");
+				// }
 				vo.setSzddzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
 				if (entity.getBwyt() != null) {
 					String bwytzw = "";
 					String[] s = entity.getBwyt().split(",");
 					/*
 					 * for (String string : s) { bwytzw +=
-					 * securityMgr.codeService().findOne(string).getText() + " "; }
+					 * securityMgr.codeService().findOne(string).getText() +
+					 * " "; }
 					 */
 					for (int i = 0; i < s.length; i++) {
 						CodeEntity code = securityMgr.codeService().findOne(s[i]);
@@ -789,10 +792,10 @@ public class XmxxglCtl extends BaseWebCtl {
 				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.setJyrzw(entity.getJyrid() != null ? entity.getJyrid().getGkjyr() : "");
-				vo.setJcsjstr(entity.getJcsj() !=null ? formater.format(entity.getJcsj()):"");
-				
+				vo.setJcsjstr(entity.getJcsj() != null ? formater.format(entity.getJcsj()) : "");
+
 				voList.add(vo);
 			}
 		}
@@ -808,7 +811,7 @@ public class XmxxglCtl extends BaseWebCtl {
 		}
 		return null;
 	}
-	
+
 	/***
 	 * 解决js传入参数乱码
 	 *