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

gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/jdtxxx/ctl/JdtxxxCtl.java

@@ -658,8 +658,10 @@ public class JdtxxxCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag) {
+	public String view(Model model, String id, String flag, String opflag,String path,String type) {
 		model.addAttribute("flag", flag);
+		model.addAttribute("path", path);
+		model.addAttribute("type", type);
 		JdtxxxEntity entity = jdtxxxService.findOne(id);
 		JdtxxxVo vo = new JdtxxxVo();
 		BeanUtils.copyProperties(entity, vo);

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqCtl.java

@@ -92,6 +92,7 @@ public class JgsqCtl extends BaseWebCtl {
 	private XmbwglbService xmbwglbService;
 	@Autowired
 	private BwService bwService;
+
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("jgsq:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szgkid, final String szgqid, String menuid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid) throws JsonProcessingException {
@@ -934,10 +935,13 @@ public class JgsqCtl extends BaseWebCtl {
 			model.addAttribute("bwlist", slist);
 		}
 	}
-	
+
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag) {
+	public String view(Model model, String id, String flag, String opflag, String type, String path) {
 		model.addAttribute("flag", flag);
+		// 返回标志
+		model.addAttribute("type", type);
+		model.addAttribute("path", path);
 		JgsqEntity entity = jgsqService.findOne(id);
 		JgsqVo vo = new JgsqVo();
 		BeanUtils.copyProperties(entity, vo);
@@ -1001,7 +1005,7 @@ public class JgsqCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -1290,7 +1294,7 @@ public class JgsqCtl extends BaseWebCtl {
 				// 如果是省级审核通过或不通过后同步到市级
 				try {
 					String url = "GK_OPERATION_JSJY_JGSQ_ONE_PC?condition=ID=" + entity.getId();
-					boolean tbflag = getTbStatus(url,entity.getSzd().getId());
+					boolean tbflag = getTbStatus(url, entity.getSzd().getId());
 					if (tbflag) {
 						entity.setTbzt("Y");
 						jgsqService.save(entity);
@@ -1345,13 +1349,13 @@ public class JgsqCtl extends BaseWebCtl {
 					String s = ssid.substring(0, 2);
 					// 去掉标志位查询
 					AccessoryEntity acc = accessoryService.findOne(ssid.substring(2, ssid.length()));
-					if(acc != null){
+					if (acc != null) {
 						acc.setSsid(xmxxgl.getId());
 						// 把备注设置成标识位+备注
 						acc.setRemark(s + acc.getRemark());
 						accessoryService.save(acc);
 					}
-					
+
 				}
 			}
 		}
@@ -1362,7 +1366,7 @@ public class JgsqCtl extends BaseWebCtl {
 	@ResponseBody
 	public WebJsonResult saveFile(MultipartFile filename, Model model) {
 		WebJsonResult wr = success();
-		if (filename != null && filename.getSize()>0) {
+		if (filename != null && filename.getSize() > 0) {
 			AccessoryEntity acc = accessoryService.saveFile(filename, "jgsq");
 			wr.setAttr("acc", acc);
 		} else {
@@ -1394,10 +1398,10 @@ public class JgsqCtl extends BaseWebCtl {
 	@ResponseBody
 	public WebJsonResult delFile(String id, Model model) {
 		AccessoryEntity acc = accessoryService.findOne(id);
-		if(acc != null ){
+		if (acc != null) {
 			accessoryService.delete(acc);
 		}
-		
+
 		WebJsonResult wr = success();
 		return wr;
 	}

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqdsCtl.java

@@ -796,7 +796,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -883,8 +883,11 @@ public class JgsqdsCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag) {
+	public String view(Model model, String id, String flag, String opflag, String path, String type) {
 		model.addAttribute("flag", flag);
+		// 返回标志
+		model.addAttribute("type", type);
+		model.addAttribute("path", path);
 		JgsqEntity entity = jgsqdsService.findOne(id);
 		JgsqVo vo = new JgsqVo();
 		BeanUtils.copyProperties(entity, vo);
@@ -948,7 +951,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -1391,9 +1394,9 @@ public class JgsqdsCtl extends BaseWebCtl {
 
 			jsjd.setId(fjzd.getId());
 		}
-		if(acc != null){
-		jsjd.setFjmc(acc.getName());
-		jsjd.setFjid(acc.getId());
+		if (acc != null) {
+			jsjd.setFjmc(acc.getName());
+			jsjd.setFjid(acc.getId());
 		}
 		return jsjd;
 	}

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgCtl.java

@@ -287,11 +287,11 @@ public class JsjdbgCtl extends BaseWebCtl {
 	public WebJsonResult logicdelete(Model model, String id) {
 		WebJsonResult wr = success();
 		JsjdbgEntity entity = jsjdbgService.findOne(id);
-		if (entity.getRecordStatus() != 1 && entity.getRecordStatus() != 8 && entity.getRecordStatus() != 9) {
+		/*if (entity.getRecordStatus() != 1 && entity.getRecordStatus() != 8 && entity.getRecordStatus() != 9) {
 			wr.setSuccess(false);
 			wr.setMessage("该项目在流程中，无法删除！");
 			return wr;
-		}
+		}*/
 		try {
 			// 逻辑删除
 			jsjdbgService.logicDelete(id);
@@ -906,8 +906,11 @@ public class JsjdbgCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag) {
+	public String view(Model model, String id, String flag, String opflag, String path, String type) {
 		model.addAttribute("flag", flag);
+		// 返回标志
+		model.addAttribute("type", type);
+		model.addAttribute("path", path);
 		JsjdbgEntity entity = jsjdbgService.findOne(id);
 		JsjdbgVo vo = new JsjdbgVo();
 		BeanUtils.copyProperties(entity, vo);

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgdsCtl.java

@@ -278,11 +278,11 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 	public WebJsonResult logicdelete(Model model, String id) {
 		WebJsonResult wr = success();
 		JsjdbgEntity entity = jsjdbgdsService.findOne(id);
-		if (entity.getRecordStatus() != 1 && entity.getRecordStatus() != 8 && entity.getRecordStatus() != 9) {
+		/*if (entity.getRecordStatus() != 1 && entity.getRecordStatus() != 8 && entity.getRecordStatus() != 9) {
 			wr.setSuccess(false);
 			wr.setMessage("该项目在流程中，无法删除！");
 			return wr;
-		}
+		}*/
 		try {
 			// 逻辑删除
 			jsjdbgdsService.logicDelete(id);
@@ -878,8 +878,11 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag) {
+	public String view(Model model, String id, String flag, String opflag, String path, String type) {
 		model.addAttribute("flag", flag);
+		// 返回标志
+		model.addAttribute("type", type);
+		model.addAttribute("path", path);
 		JsjdbgEntity entity = jsjdbgdsService.findOne(id);
 		JsjdbgVo vo = new JsjdbgVo();
 		BeanUtils.copyProperties(entity, vo);
@@ -941,7 +944,7 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 			SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
 
 			String opStr = "";
-			int voflag = 0;
+			int voflag = -1;
 			for (int j = 0; j < volist.size(); j++) {
 				TaskInfoVo taskvo = volist.get(j);
 				if (taskvo.getTaskKey().equals(taskentity.getTaskKey())) {
@@ -959,7 +962,7 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 				opStr += "<div id='" + taskentity.getTaskKey() + "' style = 'float:left;width:100%;text-align: left;'>" + "</div><div style = 'float:left;width:100%;text-align: right;'>" + securityMgr.getCurrUser().getName() + "<br/>" + formatter.format(new Date()) + "</div>";
 				opvo.setYj(opStr);
 			}
-			if (voflag > 0) {
+			if (voflag > -1) {
 				volist.remove(voflag);
 			}
 			volist.add(opvo);

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjCtl.java

@@ -945,9 +945,11 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag) {
+	public String view(Model model, String id, String flag, String opflag,String path,String type) {
 		model.addAttribute("flag", flag);
-
+		//返回标志
+		model.addAttribute("type", type);
+		model.addAttribute("path", path);
 		JsjdcbsjEntity entity = jsjdcbsjService.findOne(id);
 		JsjdcbsjVo vo = new JsjdcbsjVo();
 		BeanUtils.copyProperties(entity, vo);

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjdsCtl.java

@@ -816,7 +816,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -969,9 +969,11 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag) {
+	public String view(Model model, String id, String flag, String opflag, String path, String type) {
 		model.addAttribute("flag", flag);
-
+		// 返回标志
+		model.addAttribute("type", type);
+		model.addAttribute("path", path);
 		JsjdcbsjEntity entity = jsjdcbsjdsService.findOne(id);
 		JsjdcbsjVo vo = new JsjdcbsjVo();
 		BeanUtils.copyProperties(entity, vo);
@@ -1172,36 +1174,39 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 		List<TaskInfoVo> volist = new ArrayList<TaskInfoVo>();
 		for (int i = 0; i < slist.size(); i++) {
 			TaskInfoEntity taskentity = slist.get(i);
-			TaskInfoVo opvo = new TaskInfoVo();
-			opvo.setCurrName(taskentity.getCurrName());
-			opvo.setTaskKey(taskentity.getTaskKey());
-			opvo.setState(taskentity.getState());
-			SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
-
-			String opStr = "";
-			int voflag = 0;
-			for (int j = 0; j < volist.size(); j++) {
-				TaskInfoVo taskvo = volist.get(j);
-				if (taskvo.getTaskKey().equals(taskentity.getTaskKey())) {
-					if ("2".equals(taskvo.getState())) {
-						opStr += taskvo.getYj();
+			if ("2".equals(taskentity.getState())) {
+				TaskInfoVo opvo = new TaskInfoVo();
+				opvo.setCurrName(taskentity.getCurrName());
+				opvo.setTaskKey(taskentity.getTaskKey());
+				opvo.setState(taskentity.getState());
+				SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+
+				String opStr = "";
+				int voflag = -1;
+				for (int j = 0; j < volist.size(); j++) {
+					TaskInfoVo taskvo = volist.get(j);
+					if (taskvo.getTaskKey().equals(taskentity.getTaskKey())) {
+						if ("2".equals(taskvo.getState())) {
+							opStr += taskvo.getYj();
+						}
+						voflag = j;
+						break;
 					}
-					voflag = j;
-					break;
 				}
+				if ("2".equals(taskentity.getState())) {
+					opStr += "<div  style = 'float:left;width:100%;text-align: left;'>" + taskentity.getAuditMsg() + "</div><div style = 'float:left;width:100%;text-align: right;'>" + taskentity.getAuditUsername() + "<br/>" + formatter.format(taskentity.getAuditTime()) + "</div>";
+					opvo.setYj(opStr);
+				} else {
+					opStr += "<div id='" + taskentity.getTaskKey() + "' style = 'float:left;width:100%;text-align: left;'>" + "</div><div style = 'float:left;width:100%;text-align: right;'>" + securityMgr.getCurrUser().getName() + "<br/>" + formatter.format(new Date()) + "</div>";
+					opvo.setYj(opStr);
+				}
+				if (voflag > -1) {
+					volist.remove(voflag);
+				}
+				volist.add(opvo);
 			}
-			if ("2".equals(taskentity.getState())) {
-				opStr += "<div  style = 'float:left;width:100%;text-align: left;'>" + taskentity.getAuditMsg() + "</div><div style = 'float:left;width:100%;text-align: right;'>" + taskentity.getAuditUsername() + "<br/>" + formatter.format(taskentity.getAuditTime()) + "</div>";
-				opvo.setYj(opStr);
-			} else {
-				opStr += "<div id='" + taskentity.getTaskKey() + "' style = 'float:left;width:100%;text-align: left;'>" + "</div><div style = 'float:left;width:100%;text-align: right;'>" + securityMgr.getCurrUser().getName() + "<br/>" + formatter.format(new Date()) + "</div>";
-				opvo.setYj(opStr);
-			}
-			if (voflag > 0) {
-				volist.remove(voflag);
-			}
-			volist.add(opvo);
 		}
+		
 		model.addAttribute("list", volist);
 
 		model.addAttribute("record", vo);
@@ -1598,7 +1603,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 
 		String url = "GK_OPERATION_JSJY_JSJDCBSJ_ONE_CP?condition=ID=" + id;
 
-		boolean flag = getTbStatus(url,null);
+		boolean flag = getTbStatus(url, null);
 		if (flag) {
 			entity.setFlowstatus("0");
 			entity.setTbzt(Constants.YES);

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/ctl/DcsbCtl.java

@@ -32,9 +32,13 @@ 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.gkjcxx.mt.entity.MtEntity;
+import com.xt.jygl.gkjcxx.mt.service.MtService;
 import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.entity.DcsbEntity;
 import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.service.DcsbService;
 import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.vo.DcsbVo;
+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.gkjyxkgl.gkjyxksq.entity.XkzsqEntity;
@@ -63,6 +67,10 @@ public class DcsbCtl extends BaseWebCtl {
 	@Autowired
 	private DcsbService dcsbService;
 	@Autowired
+	private BwService bwService;
+	@Autowired
+	private MtService mtService;
+	@Autowired
 	private TaskInfoService taskInfoService;
 
 	@RequestMapping(value = "/main")
@@ -446,6 +454,30 @@ public class DcsbCtl extends BaseWebCtl {
 			entity.setShr(user.getName());
 		}
 		model.addAttribute("record", entity);
+		if(!StringUtils.isEmpty(entity.getBw())){
+			BwEntity bw = bwService.findOne(entity.getBw());
+			if(bw != null){
+				vo.setBwmc(bw.getBwmc()!= null ? bw.getBwmc():"");
+			}
+		}
+		if(!StringUtils.isEmpty(entity.getMt())){
+			MtEntity mt = mtService.findOne(entity.getMt());
+			if(mt != null){
+				vo.setMtmc(mt.getMtmc()!= null ? mt.getMtmc():"");
+			}
+		}
+		if(!StringUtils.isEmpty(entity.getJcg())){
+			CodeEntity code = securityMgr.codeService().findOne(entity.getJcg());
+			if(code != null){
+				vo.setJcgmc(code.getText());
+			}
+		}
+		if(!StringUtils.isEmpty(entity.getNwm())){
+			CodeEntity code = securityMgr.codeService().findOne(entity.getJcg());
+			if(code != null){
+				vo.setNwmmc(code.getText());
+			}
+		}
 		model.addAttribute("recordvo", vo);
 		/*
 		 * List<CodeEntity> hwzlList = securityMgr.codeService()

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/vo/DcsbVo.java

@@ -18,13 +18,17 @@ public class DcsbVo extends BaseVo {
 	private String zypmc = null;
 	private Double zysl;
 	private String jcg = null;
+	private String jcgmc = null;
 	private Date bgsj = null;
 	private String xg = null;
 	private String sg = null;
 	private String zyfs = null;
 	private String nwm = null;
+	private String nwmmc = null;
 	private String mt = null;
+	private String mtmc = null;
 	private String bw = null;
+	private String bwmc = null;
 	private String mtlb = null;
 	private Integer jzxsl;
 	private String hwzl = null;
@@ -53,12 +57,45 @@ public class DcsbVo extends BaseVo {
 	private String gk40 = null;
 	private Integer gksl40 = null;
 	private String taskState;
-	private String sfg=null;
-	private String mdg=null;
+	private String sfg = null;
+	private String mdg = null;
 	private String flag;
-	//货物种类第二大类
+	// 货物种类第二大类
 	private String hwzldedl = null;
 	private String hwzldedlzw = null;
+
+	public String getJcgmc() {
+		return jcgmc;
+	}
+
+	public void setJcgmc(String jcgmc) {
+		this.jcgmc = jcgmc;
+	}
+
+	public String getNwmmc() {
+		return nwmmc;
+	}
+
+	public void setNwmmc(String nwmmc) {
+		this.nwmmc = nwmmc;
+	}
+
+	public String getMtmc() {
+		return mtmc;
+	}
+
+	public void setMtmc(String mtmc) {
+		this.mtmc = mtmc;
+	}
+
+	public String getBwmc() {
+		return bwmc;
+	}
+
+	public void setBwmc(String bwmc) {
+		this.bwmc = bwmc;
+	}
+
 	public String getSfg() {
 		return sfg;
 	}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/ctl/GkjyrCtl.java

@@ -21,9 +21,6 @@ import javax.servlet.http.HttpServletResponse;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
-import oracle.net.aso.f;
-
-import org.apache.commons.lang.ObjectUtils.Null;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -51,11 +48,9 @@ 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.ctl.MtCtl;
 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.xt.jygl.gkjygl.gkjyr.jyrbw.ctl.BwCtl;
 import com.xt.jygl.gkjygl.gkjyr.jyrbw.service.BwService;
 import com.xt.jygl.gkjygl.gkjyr.jyrcg.ctl.CgCtl;
 import com.xt.jygl.gkjygl.gkjyr.jyrcg.entity.CgEntity;
@@ -83,18 +78,15 @@ import com.xt.jygl.gkjygl.gkjyr.qytz.ctl.QytzCtl;
 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.xt.jygl.gkjygl.gkjyr.ry.ctl.RyCtl;
 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.ctl.SssbCtl;
 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.xt.jygl.gkjygl.gkjyr.xkzfz.ctl.XkzfzCtl;
 import com.xt.jygl.gkjygl.gkjyr.xkzfz.entity.XkzfzEntity;
 import com.xt.jygl.gkjygl.gkjyr.xkzfz.service.XkzfzService;
 import com.xt.jygl.gkjygl.gkjyr.xkzfz.vo.XkzfzVo;
-import com.xt.jygl.gkjygl.gkjyr.xkzxx.ctl.XkzxxCtl;
 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;
@@ -790,7 +782,7 @@ public class GkjyrCtl extends BaseWebCtl {
 		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()));
+		// 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())) {
@@ -1064,7 +1056,7 @@ public class GkjyrCtl extends BaseWebCtl {
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getId() : "");
 		gkjyrVo.setYwcqzm(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getId() : "");
 		gkjyrVo.setYwjgys(null != gkjyr.getYwjgys() ? gkjyr.getYwjgys().getId() : "");
-		gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		// gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		gkjyrVo.setMtjgxs(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getId() : "");
 		gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");
 		gkjyrVo.setQyxz(null != gkjyr.getQyxz() ? gkjyr.getQyxz().getId() : "");
@@ -1145,7 +1137,7 @@ public class GkjyrCtl extends BaseWebCtl {
 		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.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		// gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		gkjyrVo.setMtjgxs(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getId() : "");
 		gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");
 
@@ -1297,6 +1289,7 @@ public class GkjyrCtl extends BaseWebCtl {
 				gkjyrVo.setFzrqstr(DateTime.toString(xkz.getFzrq()));
 				gkjyrVo.setJyfw(xkz.getZyqyfw());
 				gkjyrVo.setJyqy(xkz.getCq());
+				gkjyrVo.setFzjg(xkz.getFzjg());
 			}
 		}
 		// 岸线
@@ -1407,7 +1400,7 @@ public class GkjyrCtl extends BaseWebCtl {
 		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.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		// gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 
 		gkjyrVo.setMtjgxs(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getId() : "");
 		gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");
@@ -2242,12 +2235,24 @@ public class GkjyrCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-
+		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());
+				gkjyrVo.setFzjg(xkz.getFzjg());
+			}
+		}
 		gkjyrVo.setSfwhqy(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().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.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		// gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		model.addAttribute("gkjyrxx", gkjyrVo);
 
 		return "gkjygl/gkjyr/jyrjbxx/print";
@@ -2661,7 +2666,19 @@ public class GkjyrCtl extends BaseWebCtl {
 						gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 					}
 				}
-
+				List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(entity.getId());
+				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());
+						gkjyrVo.setFzjg(xkz.getFzjg());
+					}
+				}
 				gkjyrVo.setSfwhqy(null != entity.getSfwhqy() ? entity.getSfwhqy().getText() : "");
 				gkjyrVo.setSfzdsp(null != entity.getSfzdsp() ? entity.getSfzdsp().getText() : "");
 				gkjyrVo.setYwcqzmzw(null != entity.getYwcqzm() ? entity.getYwcqzm().getText() : "");
@@ -2669,7 +2686,7 @@ public class GkjyrCtl extends BaseWebCtl {
 				gkjyrVo.setMtjgxs(null != entity.getMtjgxs() ? entity.getMtjgxs().getId() : "");
 				gkjyrVo.setMtjgxszw(null != entity.getMtjgxs() ? entity.getMtjgxs().getText() : "");
 				gkjyrVo.setQyxzzw(null != entity.getQyxz() ? entity.getQyxz().getText() : "");
-				gkjyrVo.setFzrqstr(transFormatDate(entity.getFzrq()));
+				// gkjyrVo.setFzrqstr(transFormatDate(entity.getFzrq()));
 
 				voList.add(gkjyrVo);
 			}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/ctl/XkzbgCtl.java

@@ -413,7 +413,7 @@ public class XkzbgCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getId());
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getYjyrid());
 		for (XkzxxEntity xkz : xkzs) {
 			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
 				gkjyrVo.setXkzyxq(xkz.getYxqz());
@@ -423,13 +423,14 @@ public class XkzbgCtl extends BaseWebCtl {
 				gkjyrVo.setFzrqstr(DateTime.toString(xkz.getFzrq()));
 				gkjyrVo.setJyfw(xkz.getZyqyfw());
 				gkjyrVo.setJyqy(xkz.getCq());
+				gkjyrVo.setFzjg(xkz.getFzjg());
 			}
 		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().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.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		//gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		model.addAttribute("gkjyr", gkjyrVo);
 
 		// 经营范围 业务种类
@@ -1119,7 +1120,7 @@ public class XkzbgCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getId());
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getYjyrid());
 		for (XkzxxEntity xkz : xkzs) {
 			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
 				gkjyrVo.setXkzyxq(xkz.getYxqz());
@@ -1129,13 +1130,14 @@ public class XkzbgCtl extends BaseWebCtl {
 				gkjyrVo.setFzrqstr(DateTime.toString(xkz.getFzrq()));
 				gkjyrVo.setJyfw(xkz.getZyqyfw());
 				gkjyrVo.setJyqy(xkz.getCq());
+				gkjyrVo.setFzjg(xkz.getFzjg());
 			}
 		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().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.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		//gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		model.addAttribute("gkjyrxx", gkjyrVo);
 		return "gkjygl/gkjyxkgl/gkjyxkbg/xkzbgviewmain";
 	}
@@ -1377,7 +1379,7 @@ public class XkzbgCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getId());
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getYjyrid());
 		for (XkzxxEntity xkz : xkzs) {
 			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
 				gkjyrVo.setXkzyxq(xkz.getYxqz());
@@ -1387,13 +1389,14 @@ public class XkzbgCtl extends BaseWebCtl {
 				gkjyrVo.setFzrqstr(DateTime.toString(xkz.getFzrq()));
 				gkjyrVo.setJyfw(xkz.getZyqyfw());
 				gkjyrVo.setJyqy(xkz.getCq());
+				gkjyrVo.setFzjg(xkz.getFzjg());
 			}
 		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().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.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		//gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		model.addAttribute("gkjyr", gkjyrVo);
 		return "gkjygl/gkjyxkgl/gkjyxkbg/xkzbgeditmain";
 	}
@@ -1639,7 +1642,11 @@ public class XkzbgCtl extends BaseWebCtl {
 			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(entity != null){
+						if(StringUtils.isEmpty(entity.getCreateUser()) || "1".equals(entity.getCreateUser())){
+							newlist.add(Integer.parseInt(entity.getFileid()));
+						}
+					}
 				}
 			}
 		}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxksq/ctl/XkzsqCtl.java

@@ -329,7 +329,7 @@ public class XkzsqCtl extends BaseWebCtl {
 							}
 						}
 					}
-					if(!isJyr()){
+					if (!isJyr()) {
 						XkzxxEntity xkz = xkzxxService.findByOpid(entity.getId(), "11");
 						if (xkz != null) {
 							vo.setOpflag("1");
@@ -413,7 +413,7 @@ public class XkzsqCtl extends BaseWebCtl {
 		GkjyrEntity jyr = new GkjyrEntity();
 		if (user.getSsjyr() != null) {
 			jyr = gkjyrService.findOne(user.getSsjyr().getId());
-			
+
 		}
 		model.addAttribute("jyr", jyr);
 		model.addAttribute("sqr", user.getName());
@@ -2349,7 +2349,11 @@ public class XkzsqCtl extends BaseWebCtl {
 			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 (entity != null) {
+						if (StringUtils.isEmpty(entity.getCreateUser())) {
+							newlist.add(Integer.parseInt(entity.getFileid()));
+						}
+					}
 				}
 			}
 		}
@@ -2658,7 +2662,7 @@ public class XkzsqCtl extends BaseWebCtl {
 				code = securityMgr.codeService().findOne(code.getPid());
 			}
 			szd = szd + "港经证";
-			
+
 			xkz.setGkjyxkzh("");
 			xkz.setFzrq(new Date());
 			xkz.setYxqq(new Date());
@@ -2675,83 +2679,51 @@ public class XkzsqCtl extends BaseWebCtl {
 			xkz = xkzxxService.save(xkz);
 
 			// 经营人许可证更新
-			/*jyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-			jyr.setFddbr(xkzsq.getFddbr());
-			jyr.setLxdh(xkzsq.getLxdh());
-			jyr.setCz(xkzsq.getCz());
-			jyr.setGkjyxkzh(xkzbh);
-			jyr.setJyfw(jyfwstr2);
-			jyr.setJyqy(jylzstr);
-			jyr.setFzrq(dateTimeFormat.parse(date));
-			jyr.setFzrq(xkz.getFzrq());
-			jyr.setFzjg(xkz.getFzjg());
-			gkjyrService.save(jyr);*/
+			/*
+			 * jyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+			 * jyr.setFddbr(xkzsq.getFddbr()); jyr.setLxdh(xkzsq.getLxdh());
+			 * jyr.setCz(xkzsq.getCz()); jyr.setGkjyxkzh(xkzbh);
+			 * jyr.setJyfw(jyfwstr2); jyr.setJyqy(jylzstr);
+			 * jyr.setFzrq(dateTimeFormat.parse(date));
+			 * jyr.setFzrq(xkz.getFzrq()); jyr.setFzjg(xkz.getFzjg());
+			 * gkjyrService.save(jyr);
+			 */
 
 			// xkzglb表操作
 			// 码头泊位储罐仓库堆场人员设备信息企业投资
-			/*List<XkzglbEntity> xkzglblist = xkzglbService.findByCzid(sqid);
-			if (xkzglblist != null && xkzglblist.size() > 0) {
-				for (XkzglbEntity xkzglb : xkzglblist) {
-					xkzglb.setXkzid(xkz.getId());
-					xkzglb.setXkzbh(xkz.getGkjyxkzh());
-					xkzglbService.save(xkzglb);
-					if (xkzglb.getType().equals("1")) {
-						MtEntity mt = mtService.findOne(xkzglb.getYwid());
-						if (mt != null) {
-							mt.setXkzid(xkz.getId());
-							mtService.save(mt);
-						}
-					} else if (xkzglb.getType().equals("2")) {
-						BwEntity bw = bwService.findOne(xkzglb.getYwid());
-						if (bw != null) {
-							bw.setXkzid(xkz.getId());
-							bwService.save(bw);
-						}
-					} else if (xkzglb.getType().equals("3")) {
-						CgEntity cg = cgService.findOne(xkzglb.getYwid());
-						if (cg != null) {
-							cg.setXkzid(xkz.getId());
-							cgService.save(cg);
-						}
-					} else if (xkzglb.getType().equals("4")) {
-						CkEntity ck = ckService.findOne(xkzglb.getYwid());
-						if (ck != null) {
-							ck.setXkzid(xkz.getId());
-							ckService.save(ck);
-						}
-					} else if (xkzglb.getType().equals("5")) {
-						DcEntity dc = dcService.findOne(xkzglb.getYwid());
-						if (dc != null) {
-							dc.setXkzid(xkz.getId());
-							dcService.save(dc);
-						}
-					} else if (xkzglb.getType().equals("6")) {
-						RyEntity ry = ryService.findOne(xkzglb.getYwid());
-						if (ry != null) {
-							ry.setXkzid(xkz.getId());
-							ryService.save(ry);
-						}
-					} else if (xkzglb.getType().equals("7")) {
-						SssbEntity sssb = sssbService.findOne(xkzglb.getId());
-						if (sssb != null) {
-							sssb.setXkzid(xkz.getId());
-							sssbService.save(sssb);
-						}
-					} else if (xkzglb.getType().equals("8")) {
-						QytzEntity qytz = qytzService.findOne(xkzglb.getId());
-						if (qytz != null) {
-							qytz.setXkzid(xkz.getId());
-							qytzService.save(qytz);
-						}
-					} else if (xkzglb.getType().equals("9")) {
-						ZxjxEntity zxjx = zxjxService.findOne(xkzglb.getId());
-						if (zxjx != null) {
-							zxjx.setXkzid(xkz.getId());
-							zxjxService.save(zxjx);
-						}
-					}
-				}
-			}*/
+			/*
+			 * List<XkzglbEntity> xkzglblist = xkzglbService.findByCzid(sqid);
+			 * if (xkzglblist != null && xkzglblist.size() > 0) { for
+			 * (XkzglbEntity xkzglb : xkzglblist) {
+			 * xkzglb.setXkzid(xkz.getId()); xkzglb.setXkzbh(xkz.getGkjyxkzh());
+			 * xkzglbService.save(xkzglb); if (xkzglb.getType().equals("1")) {
+			 * MtEntity mt = mtService.findOne(xkzglb.getYwid()); if (mt !=
+			 * null) { mt.setXkzid(xkz.getId()); mtService.save(mt); } } else if
+			 * (xkzglb.getType().equals("2")) { BwEntity bw =
+			 * bwService.findOne(xkzglb.getYwid()); if (bw != null) {
+			 * bw.setXkzid(xkz.getId()); bwService.save(bw); } } else if
+			 * (xkzglb.getType().equals("3")) { CgEntity cg =
+			 * cgService.findOne(xkzglb.getYwid()); if (cg != null) {
+			 * cg.setXkzid(xkz.getId()); cgService.save(cg); } } else if
+			 * (xkzglb.getType().equals("4")) { CkEntity ck =
+			 * ckService.findOne(xkzglb.getYwid()); if (ck != null) {
+			 * ck.setXkzid(xkz.getId()); ckService.save(ck); } } else if
+			 * (xkzglb.getType().equals("5")) { DcEntity dc =
+			 * dcService.findOne(xkzglb.getYwid()); if (dc != null) {
+			 * dc.setXkzid(xkz.getId()); dcService.save(dc); } } else if
+			 * (xkzglb.getType().equals("6")) { RyEntity ry =
+			 * ryService.findOne(xkzglb.getYwid()); if (ry != null) {
+			 * ry.setXkzid(xkz.getId()); ryService.save(ry); } } else if
+			 * (xkzglb.getType().equals("7")) { SssbEntity sssb =
+			 * sssbService.findOne(xkzglb.getId()); if (sssb != null) {
+			 * sssb.setXkzid(xkz.getId()); sssbService.save(sssb); } } else if
+			 * (xkzglb.getType().equals("8")) { QytzEntity qytz =
+			 * qytzService.findOne(xkzglb.getId()); if (qytz != null) {
+			 * qytz.setXkzid(xkz.getId()); qytzService.save(qytz); } } else if
+			 * (xkzglb.getType().equals("9")) { ZxjxEntity zxjx =
+			 * zxjxService.findOne(xkzglb.getId()); if (zxjx != null) {
+			 * zxjx.setXkzid(xkz.getId()); zxjxService.save(zxjx); } } } }
+			 */
 
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -2877,5 +2849,4 @@ public class XkzsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	
 }

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkyx/ctl/XkzyxCtl.java

@@ -374,13 +374,14 @@ public class XkzyxCtl extends BaseWebCtl {
 				gkjyrVo.setFzrqstr(DateTime.toString(xkz.getFzrq()));
 				gkjyrVo.setJyfw(xkz.getZyqyfw());
 				gkjyrVo.setJyqy(xkz.getCq());
+				gkjyrVo.setFzjg(xkz.getFzjg());
 			}
 		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().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.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		//gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		model.addAttribute("gkjyr", gkjyrVo);
 
 		List<XkzjyfwEntity> jyfwlist = xkzjyfwService.findByJyrid(gkjyr.getId());
@@ -541,7 +542,7 @@ public class XkzyxCtl extends BaseWebCtl {
 			List<XkzyxfjEntity> list = xkzyxfjService.findBySqid(yx.getId());
 			if (list != null && list.size() > 0) {
 				for (XkzyxfjEntity fj : list) {
-					if (fj != null) {
+					if (fj != null && fj.getFjid() != null) {
 						XkzyxfjEntity xkzyxfj = new XkzyxfjEntity();
 						AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
 						if (!StringUtils.isEmpty(acc)) {
@@ -841,13 +842,14 @@ public class XkzyxCtl extends BaseWebCtl {
 				gkjyrVo.setFzrqstr(DateTime.toString(xkz.getFzrq()));
 				gkjyrVo.setJyfw(xkz.getZyqyfw());
 				gkjyrVo.setJyqy(xkz.getCq());
+				gkjyrVo.setFzjg(xkz.getFzjg());
 			}
 		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().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.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		//gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		model.addAttribute("gkjyrxx", gkjyrVo);
 		return "gkjygl/gkjyxkgl/gkjyxkyx/xkzyxviewmain";
 	}
@@ -1107,13 +1109,14 @@ public class XkzyxCtl extends BaseWebCtl {
 				gkjyrVo.setFzrqstr(DateTime.toString(xkz.getFzrq()));
 				gkjyrVo.setJyfw(xkz.getZyqyfw());
 				gkjyrVo.setJyqy(xkz.getCq());
+				gkjyrVo.setFzjg(xkz.getFzjg());
 			}
 		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().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.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		//gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		model.addAttribute("gkjyr", gkjyrVo);
 		return "gkjygl/gkjyxkgl/gkjyxkyx/xkzyxeditmain";
 	}
@@ -1217,7 +1220,9 @@ public class XkzyxCtl extends BaseWebCtl {
 			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(StringUtils.isEmpty(entity.getCreateUser()) || "2".equals(entity.getCreateUser())){
+						newlist.add(Integer.parseInt(entity.getFileid()));
+					}
 				}
 			}
 		}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkzx/ctl/XkzzxCtl.java

@@ -413,7 +413,7 @@ public class XkzzxCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getId());
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getYjyrid());
 		for (XkzxxEntity xkz : xkzs) {
 			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
 				gkjyrVo.setXkzyxq(xkz.getYxqz());
@@ -423,13 +423,14 @@ public class XkzzxCtl extends BaseWebCtl {
 				gkjyrVo.setFzrqstr(DateTime.toString(xkz.getFzrq()));
 				gkjyrVo.setJyfw(xkz.getZyqyfw());
 				gkjyrVo.setJyqy(xkz.getCq());
+				gkjyrVo.setFzjg(xkz.getFzjg());
 			}
 		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().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.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		//gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		model.addAttribute("gkjyr", gkjyrVo);
 		List<XkzjyfwEntity> jyfwlist = xkzjyfwService.findByJyrid(gkjyr.getId());
 		List<String> jyfwids = new ArrayList<String>();
@@ -1090,7 +1091,7 @@ public class XkzzxCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getId());
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getYjyrid());
 		for (XkzxxEntity xkz : xkzs) {
 			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
 				gkjyrVo.setXkzyxq(xkz.getYxqz());
@@ -1100,13 +1101,14 @@ public class XkzzxCtl extends BaseWebCtl {
 				gkjyrVo.setFzrqstr(DateTime.toString(xkz.getFzrq()));
 				gkjyrVo.setJyfw(xkz.getZyqyfw());
 				gkjyrVo.setJyqy(xkz.getCq());
+				gkjyrVo.setFzjg(xkz.getFzjg());
 			}
 		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().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.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		//gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		model.addAttribute("gkjyrxx", gkjyrVo);
 
 		return "gkjygl/gkjyxkgl/gkjyxkzx/xkzzxviewmain";
@@ -1293,7 +1295,7 @@ public class XkzzxCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getId());
+		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getYjyrid());
 		for (XkzxxEntity xkz : xkzs) {
 			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
 				gkjyrVo.setXkzyxq(xkz.getYxqz());
@@ -1303,13 +1305,14 @@ public class XkzzxCtl extends BaseWebCtl {
 				gkjyrVo.setFzrqstr(DateTime.toString(xkz.getFzrq()));
 				gkjyrVo.setJyfw(xkz.getZyqyfw());
 				gkjyrVo.setJyqy(xkz.getCq());
+				gkjyrVo.setFzjg(xkz.getFzjg());
 			}
 		}
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().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.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
+		//gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		model.addAttribute("gkjyr", gkjyrVo);
 		model.addAttribute("xkzzx", xkzzxentity);
 		return "gkjygl/gkjyxkgl/gkjyxkzx/xkzzxeditmain";

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/ctl/LhbgCtl.java

@@ -90,6 +90,7 @@ public class LhbgCtl extends BaseWebCtl {
 	private XkzxxService xkzxxService;
 	@Autowired
 	private XzglbmxxService xzglbmxxService;
+
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("lhbg:main")
 	public String main(SimplePageRequest page, Model model, final String lczt, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {
@@ -218,8 +219,11 @@ public class LhbgCtl extends BaseWebCtl {
 
 	// 新增
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag) {
+	public String view(Model model, String id, String flag, String opflag, String path, String type) {
 		model.addAttribute("flag", flag);
+		// 返回标志
+		model.addAttribute("type", type);
+		model.addAttribute("path", path);
 		LhbgEntity lhbg = lhbgService.findOne(id);
 
 		List<LhbgfjEntity> list = lhbgfjService.findByBgid(lhbg.getId());
@@ -227,7 +231,7 @@ public class LhbgCtl extends BaseWebCtl {
 			model.addAttribute("fjlist", list);
 			for (LhbgfjEntity fj : list) {
 				AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -663,7 +667,7 @@ public class LhbgCtl extends BaseWebCtl {
 				// entity.setSftb(Constants.YES);
 				entity = lhbgService.save(entity);
 				if (flag && StringUtils.isEmpty(entity.getTyyy())) {
-					if(StringUtils.isEmpty(entity.getTyyy())){
+					if (StringUtils.isEmpty(entity.getTyyy())) {
 						UserEntity user = securityMgr.getCurrUser();
 						GkjyrEntity jyr = gkjyrService.findOne(entity.getJyrid());
 						XkzxxEntity xkz = new XkzxxEntity();
@@ -687,7 +691,7 @@ public class LhbgCtl extends BaseWebCtl {
 							xkz.setSzgk(jyr.getSzgk().getId());
 							xkz.setSzd(jyr.getSzd());
 						}
-						
+
 						xkz.setLxdh(entity.getLxr());
 						xkz.setZyqyfw(jyr.getJyfw());
 						xkz.setCq(jyr.getJyqy());
@@ -717,18 +721,18 @@ public class LhbgCtl extends BaseWebCtl {
 				if (!flag || !StringUtils.isEmpty(entity.getTyyy())) {
 					entity.setSftb(Constants.YES);
 					entity = lhbgService.save(entity);
-					
+
 					List<XkzxxEntity> list = xkzxxService.findByJyrid(entity.getJyrid());
 					if (list != null && list.size() > 0) {
 						for (XkzxxEntity xkzxxentity : list) {
-							if("1".equals(xkzxxentity.getSfyx())){
+							if ("1".equals(xkzxxentity.getSfyx())) {
 								xkzxxentity.setSfyx(Constants.XKZ_WX);
 								xkzxxentity.setIsflag("0");
 								xkzxxService.save(xkzxxentity);
 							}
 						}
 					}
-					
+
 					// 如果是省级审核通过或不通过后同步到市级
 					try {
 						List<LhbgfjEntity> fjlist = lhbgfjService.findByBgid(id);
@@ -739,7 +743,7 @@ public class LhbgCtl extends BaseWebCtl {
 							}
 							fjid = fjid.substring(0, fjid.length() - 1);
 						}
-						String url = "GK_OPERATION_JSJY_LHBG_ONE_PC?condition=ID=" + entity.getId() + ";FJID=" + fjid+";JYRID="+entity.getJyrid();
+						String url = "GK_OPERATION_JSJY_LHBG_ONE_PC?condition=ID=" + entity.getId() + ";FJID=" + fjid + ";JYRID=" + entity.getJyrid();
 						boolean tbflag = getTbStatus(url, entity.getSzd().getId());
 						if (tbflag) {
 							entity.setTbzt("Y");

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/ctl/LhsqCtl.java

@@ -258,8 +258,11 @@ public class LhsqCtl extends BaseWebCtl {
 
 	// 新增
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag) {
+	public String view(Model model, String id, String flag, String type, String path) {
 		model.addAttribute("flag", flag);
+		// 返回标志
+		model.addAttribute("type", type);
+		model.addAttribute("path", path);
 		LhsqEntity lhsq = lhsqService.findOne(id);
 		model.addAttribute("record", lhsq);
 
@@ -268,7 +271,7 @@ public class LhsqCtl extends BaseWebCtl {
 			model.addAttribute("fjlist", list);
 			for (LhsqfjEntity fj : list) {
 				AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -757,7 +760,7 @@ public class LhsqCtl extends BaseWebCtl {
 
 					// 许可证信息
 					GkjyrEntity jyr = gkjyrService.findOne(entity.getJyrid());
-					if(jyr != null){
+					if (jyr != null) {
 						XkzxxEntity xkz = new XkzxxEntity();
 						xkz.setGkjyr(jyr.getId());
 						// xkz.setZyqyfw(jyfwstr2);
@@ -786,7 +789,7 @@ public class LhsqCtl extends BaseWebCtl {
 							code = securityMgr.codeService().findOne(code.getPid());
 						}
 						szd = szd + "港经证";
-						
+
 						xkz.setGkjyxkzh("");
 						xkz.setFzrq(new Date());
 						xkz.setYxqq(new Date());
@@ -802,9 +805,9 @@ public class LhsqCtl extends BaseWebCtl {
 						xkz.setOpid(entity.getId());
 						xkz = xkzxxService.save(xkz);
 					}
-					
+
 				}
-				//退回地市，同步
+				// 退回地市，同步
 				if (!flag) {
 					entity.setSftb(Constants.YES);
 					entity = lhsqService.save(entity);

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/ctl/LhyxCtl.java

@@ -226,8 +226,11 @@ public class LhyxCtl extends BaseWebCtl {
 
 	// 新增
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag) {
+	public String view(Model model, String id, String flag, String opflag, String type, String path) {
 		model.addAttribute("flag", flag);
+		// 返回标志
+		model.addAttribute("type", type);
+		model.addAttribute("path", path);
 		LhyxEntity lhyx = lhyxService.findOne(id);
 		model.addAttribute("record", lhyx);
 		List<LhyxfjEntity> list = lhyxfjService.findByYxid(lhyx.getId());
@@ -235,7 +238,7 @@ public class LhyxCtl extends BaseWebCtl {
 			model.addAttribute("fjlist", list);
 			for (LhyxfjEntity fj : list) {
 				AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -650,11 +653,11 @@ public class LhyxCtl extends BaseWebCtl {
 				}
 				// entity.setSftb(Constants.YES);
 				entity = lhyxService.save(entity);
-				if(flag){
+				if (flag) {
 					List<XkzxxEntity> list = xkzxxService.findByJyrid(entity.getJyrid());
-					if(list != null && list.size()>0){
-						for(XkzxxEntity xkz:list){
-							if("1".equals(xkz.getSfyx())){
+					if (list != null && list.size() > 0) {
+						for (XkzxxEntity xkz : list) {
+							if ("1".equals(xkz.getSfyx())) {
 								xkz.setIsflag("0");
 								xkz = xkzxxService.save(xkz);
 								XkzxxEntity xkzxx = new XkzxxEntity();
@@ -676,7 +679,7 @@ public class LhyxCtl extends BaseWebCtl {
 								xkzxx.setZyhwpm(xkz.getZyhwpm());
 								xkzxx.setZyqyfw(xkz.getZyqyfw());
 								xkzxx.setSzgk(xkz.getSzgk());
-								//xkzxx.setZmpicid(xkz.getZmpicid());
+								// xkzxx.setZmpicid(xkz.getZmpicid());
 								if (xkz.getYxqz() != null) {
 									SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");
 									String date = dateTimeFormat.format(xkz.getYxqz());
@@ -692,7 +695,7 @@ public class LhyxCtl extends BaseWebCtl {
 						}
 					}
 				}
-				
+
 				if (!flag) {
 					entity.setSftb(Constants.YES);
 					entity = lhyxService.save(entity);

gkjsjy/trunk/src/com/xt/jygl/set/user/ctl/UserCtl.java

@@ -86,7 +86,7 @@ public class UserCtl extends BaseWebCtl {
 	 */
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("user:main")
-	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String menuid, final String username, final String uname, final String sfjyr) throws JsonProcessingException {
+	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String menuid, final String username, final String uname, final String sfjyr,final String jyrname) throws JsonProcessingException {
 		// 查詢條件
 		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "user");
 		Specification<UserEntity> spec = new Specification<UserEntity>() {
@@ -109,6 +109,9 @@ public class UserCtl extends BaseWebCtl {
 				} else if (isGET(request)) {
 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "sfjyr");
 				}
+				if (StringUtils.isNotEmpty(jyrname)) {
+					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + jyrname + "%"));
+				} 
 				if (isJyr()) {
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
 				}
@@ -144,6 +147,7 @@ public class UserCtl extends BaseWebCtl {
 		model.addAttribute("username", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "username"));
 		model.addAttribute("uname", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "uname"));
 		model.addAttribute("sfjyr", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfjyr"));
+		model.addAttribute("jyrname", jyrname);
 		model.addAttribute("menuid", menuid);
 		// 翻页共通
 		putPageInfo(model, page, list);