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

gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdcbsj/jsjdcbsjdetail.js

@@ -9,6 +9,98 @@ jsjdcbsj.detail.opflag = null;
 jsjdcbsj.detail.init = function() {
 }
 
+//附件关闭
+jsjdcbsj.detail.guanbipop=function(){
+	var accid=$("#accid").val();
+	if(accid!=null){
+		$.confirm({
+		    title: '提示框',
+		    content: '您已上传附件，是否保存？',
+		    confirm: function(){
+		    jsjdcbsj.detail.xinzengfj();
+		    },
+		    cancel: function(){
+		    	var flag=$("#flag").val();
+		    	var id=$("#accid").val();
+		    	 $.post($.app + "/jsjdgl/delFile?id="+id, {}, function(data, status) {
+	                    if (data.success) {
+	                     $("#fjmc"+flag).html("");
+	                     $("#fjxq").empty();
+	                     $("#scfjbt").removeAttr("style");
+	 	                 $("#delid"+flag).val("");
+	 	                 jsjdgl.detail.delIds(id);
+		                 } else {
+		                	 $.alert({
+		             		    title: '提示',
+		             		    content: data.message,
+		             		    confirm: function(){
+		             		    }
+		             	 });
+		                 }
+		             }, "json");
+		    }
+		});
+	}
+	$('.theme-popover-mask').fadeOut(100);
+	$('.theme-popover').slideUp(0);
+}
+
+
+jsjdcbsj.detail.xinzengfj=function(){
+	var i=$("#flag").val();
+	$('.theme-popover-mask').fadeOut(100);
+	$('.theme-popover').slideUp(0);
+	$("#wjh"+i).text($("#wjh1").val());
+	$("#fbsj"+i).text($("#fbsj1").val());
+	$("#fbdw"+i).text($("#fbdw1").val());
+	 $("#tjbt"+i).toggle();
+	 if(jsjdcbsj.detail.xiugaiflag==1){
+	 $("#scbt"+i).toggle();
+	 }
+	 var strbt="";
+  	 strbt+="删除";
+  	 $("#scbt"+i).empty();
+  	 $("#scbt"+i).append(strbt);
+  	 $("#scbt"+i).attr("class","btn btn-default btn-sm");
+  	 $("#scbt"+i).attr("href","#");
+  	 $("#scbt"+i).attr("onclick","jsjdcgsj.detail.delFile('"+i+"')");
+  	 $("#scbt"+i).removeAttr("style");
+	 $.ajax({
+         url:$.app+"/jsjdcbsj/savefj",
+         data:$("#addform").serialize(),
+         type:"post",
+         dataType:"json",
+         success:function(data){//ajax返回的数据
+	           if (data.success) {
+	        	   var strVal=$("#fjzdids").val()+i+data.message+",";
+  			    	$("#fjzdids").val(strVal);
+  			    	var str = data.message;
+  			    	 $("#fjzdid"+i).val(str);
+	           }else {
+		           	$.alert({
+		       		    title: '提示',
+		       		    content: data.message,
+		       		    confirm: function(){
+		       		    }
+		           	});
+	           }
+	     }
+    }); 
+}
+
+//添加附件弹出				
+jsjdcbsj.detail.tianjiafj=function(i){
+	$("#flag").val(i);
+	$("#wjh1").val("");
+	$("#fbsj1").val("");
+	$("#fbdw1").val("");
+	$("#fjmc1").html("");
+	$("#fjxq").empty();
+	$("#scfjbt").removeAttr("style");
+	$('#theme-popover-mask').fadeIn(100);
+	$('#theme-popover').slideDown(0);
+}
+
 //构建政府投资额占比变化事件	
 function ratesub() {
 	var val = $("#tzlxid").val();
@@ -589,7 +681,7 @@ jsjdcbsj.detail.initgqSelect = function(divid, existVal, szd, gk, changefunc,
 }
 
 jsjdcbsj.detail.audit = function(auditpass, id) {
-	if (auditpass == "Y") {
+	if (auditpass == "Y" && jsjdcbsj.detail.taskKey != 'ldpz') {
 		if (isEmpty($('#userids').val())) {
 			$.alert({
 				title : '提示',
@@ -601,13 +693,7 @@ jsjdcbsj.detail.audit = function(auditpass, id) {
 			return false;
 		}
 	}
-	// 附件
-	var accidName = document.getElementsByName("accid");
-	var accids = [];
-	for (i = 0; i < accidName.length; i++) {
-		accids.push(accidName[i].value)
-	}
-	$('#accids').val(accids);
+	
 	$(".btn").attr("disabled", true);
 	var opflag = $('#opflag').val();
 	var shyj = $('#yj').val();
@@ -622,7 +708,13 @@ jsjdcbsj.detail.audit = function(auditpass, id) {
 		shyj : shyj,
 		flag : audit,
 		userids : $('#userids').val(),
-		accid : $('#accids').val()
+		accid : $('#accids').val(),
+		delid34:$('#delid34').val(),
+		delid35:$('#delid35').val(),
+		delid36:$('#delid36').val(),
+		delid37:$('#delid37').val(),
+		delid38:$('#delid38').val(),
+		fjzdids:$('#fjzdids').val()
 	}, function(data) {
 		if (data.success) {
 			$.alert({
@@ -645,6 +737,62 @@ jsjdcbsj.detail.audit = function(auditpass, id) {
 	}, "json");
 };
 
+
+jsjdcbsj.detail.saveFile = function(){
+	 var i=$("#flag").val();
+	 if($('#fjid').val()==''){
+	        return;
+	    }
+	 $('#addform')
+		.form(
+				'submit',
+				{
+					url : $.app + '/jsjdcbsj/saveFile',
+					onSubmit : function() {
+					},
+					success : function(data, status) {
+	            var file = $('#fjid');
+	            file.after(file.clone().val(""));
+	            file.remove();
+	            if (data) {
+	            	data = data.replace("<audio controls=\"controls\" style=\"display: none;\"></audio>","");
+	                data = $.parseJSON(data);
+	            }
+	            if (data.success) {
+	            	$("#scfjbt").attr("style","display:none;");
+	            	debugger;
+	                var accContect = data.attrs.acc.name;
+	                var accid = data.attrs.acc.id;
+	                var str = "";
+	                str = "<span id='fjmc1'>" 
+	                      + "<input value='"+accid+"' id='accid' name='accid' type='hidden'>" 
+	                      + "<a class='main_title' href='/jsjy/accessory/download?id="+ accid +"'> " + accContect +"</a>"+"</span>";
+	                str+="<a class='main_title' onclick=\"jsjdgl.detail.delFj('"+ accid +"','"+i+"');\" >删除文件</a>"
+	                $("#fjxq").empty();
+	                $("#fjxq").append(str);
+	                //给附件id集文本框赋值
+	                var strVal=$("#accids").val()+i+accid+",";
+ 			    	$("#accids").val(strVal);
+	                $("#fjmc"+i).text(accContect);
+	                //给附件id文本框赋值
+	                $("#delid"+i).val(accid);
+	                accContect = "";
+	                $("#fileid").val("");
+	                $("#scfjbt").hide();
+	            }
+	            else {
+	            	$.alert({
+						title : '提示',
+						content : data.message,
+						confirm : function() {
+						}
+					});
+	            }
+	        }
+	    });
+}
+
+
 jsjdcbsj.detail.submitFile = function() {
 	$('#addform')
 			.form(
@@ -683,7 +831,12 @@ jsjdcbsj.detail.submitFile = function() {
 										+ ')">删除</a>' + "</td></tr>";
 								$('#tableId').append(str);
 							} else {
-								$.messager.showError(data.message);
+								$.alert({
+									title : '提示',
+									content : data.message,
+									confirm : function() {
+									}
+								});
 							}
 						}
 					});

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

@@ -13,7 +13,6 @@ import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import javax.persistence.criteria.Subquery;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +21,6 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -44,6 +42,8 @@ import com.xt.jygl.gkjsgl.jsjdcbsj.entity.JsjdcbsjfjEntity;
 import com.xt.jygl.gkjsgl.jsjdcbsj.service.JsjdcbsjService;
 import com.xt.jygl.gkjsgl.jsjdcbsj.service.JsjdcbsjfjService;
 import com.xt.jygl.gkjsgl.jsjdcbsj.vo.JsjdcbsjVo;
+import com.xt.jygl.gkjsgl.jsjdcbsj.vo.JsjdcbsjfjVo;
+import com.xt.jygl.gkjsgl.jsjdgl.vo.JsjdfjVo;
 import com.xt.jygl.gkjsgl.tzjhgl.entity.TzjhglEntity;
 import com.xt.jygl.gkjsgl.tzjhgl.service.TzjhglService;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
@@ -196,6 +196,8 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 							vo.setCurrentname("退回地市");
 						} else if ("2".equals(entity.getFlowstatus())) {
 							vo.setCurrentname("完成");
+						} else if ("3".equals(entity.getFlowstatus())) {
+							vo.setCurrentname("已同步");
 						}
 					}
 				} else if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {
@@ -254,7 +256,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		model.addAttribute("menuid", menuid);
 		if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
 			model.addAttribute("ssFlag", "1");
-		}else{
+		} else {
 			model.addAttribute("ssFlag", "0");
 		}
 		// 翻页共通
@@ -723,6 +725,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		WebJsonResult wr = success();
 		JsjdcbsjEntity entity = jsjdcbsjService.findOne(id);
 		entity.setSftb(Constants.YES);
+		entity.setFlowstatus("3");
 		jsjdcbsjService.save(entity);
 		String url = "/GK_OPERATION_JSJY_JSJDCBSJ_ONE_CP?condition=ID=" + id;
 		boolean flag = getTbStatus(url);
@@ -741,7 +744,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 	public String edit(Model model, String id, String flag) {
 		model.addAttribute("flag", flag);
 		// 附件
-		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "1");
+		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jsjd");
 		model.addAttribute("fjList", accessoryList);
 
 		JsjdcbsjEntity entity = jsjdcbsjService.findOne(id);
@@ -766,9 +769,10 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		model.addAttribute("record", vo);
 		model.addAttribute("jyr", entity.getJyrid());
 		model.addAttribute("roleCode", Constants.ROLE_LD);
+		model.addAttribute("currName", "领导办理");
 		if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
 			model.addAttribute("ssFlag", "1");
-		}else{
+		} else {
 			model.addAttribute("ssFlag", "0");
 		}
 		return "gkjsgl/jsjdcbsj/jsjdcbsjedit";
@@ -777,6 +781,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 	@RequestMapping(value = "/view")
 	public String view(Model model, String id, String flag, String opflag) {
 		model.addAttribute("flag", flag);
+
 		JsjdcbsjEntity entity = jsjdcbsjService.findOne(id);
 		JsjdcbsjVo vo = new JsjdcbsjVo();
 		BeanUtils.copyProperties(entity, vo);
@@ -815,10 +820,75 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
 		vo.setZyhbwfl(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getId() : "");
 
+		// 附件
+		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jsjd");
+		for (int i = 0; i < accessoryList.size(); i++) {
+			if (StringUtils.isNotEmpty(accessoryList.get(i).getRemark())) {
+				AccessoryEntity acc = accessoryList.get(i);
+				String s = accessoryList.get(i).getRemark().substring(0, 2);
+				String accid = accessoryList.get(i).getId();
+				JsjdfjVo fjnamevo = new JsjdfjVo();
+				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
+				fjnamevo.setFjid(accid);
+				fjnamevo.setFjmc(accessoryList.get(i).getName());
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+					try {
+						Ftp f = getftp();
+						// 本地目录
+						String localBaseDir = GlobalData.UPLOAD_FILE_PATH + acc.getFilepath();
+						File newfile = new File(localBaseDir);
+						// 如果文件夹不存在则创建
+						if (!newfile.exists() && !newfile.isDirectory()) {
+							newfile.mkdirs();
+						}
+						// 远程目录
+						String remoteBaseDir = acc.getFilepath();
+						// 下载ftp文件
+						boolean downflag = FtpUtil.startDown(f, localBaseDir, remoteBaseDir, acc.getFilename());
+						if (downflag) {
+							System.out.println("ok");
+							acc.setFjbz("1");
+							accessoryService.save(acc);
+						}
+
+					} catch (Exception e) {
+						e.printStackTrace();
+					}
+				}
+				model.addAttribute("fjList" + s, fjnamevo);
+				model.addAttribute("xiazaibz", s);
+			}
+		}
+
+		// 附件字段
+		List<JsjdcbsjfjEntity> fjlist = jsjdcbsjfjService.findBySsidandfjlx(id, "ptfj");
+		SimpleDateFormat dateFormater = new SimpleDateFormat("yyyy-MM-dd");
+
+		for (int i = 0; i < fjlist.size(); i++) {
+			// 从发布单位中获取标识位
+			if (StringUtils.isNotEmpty(fjlist.get(i).getFjbz())) {
+				String s = fjlist.get(i).getFjbz().substring(0, 2);
+				Date date = fjlist.get(i).getFbsj();
+
+				JsjdcbsjfjVo fjvo = new JsjdcbsjfjVo();
+				fjvo.setFjbz(fjlist.get(i).getFjbz().substring(2, fjlist.get(i).getFjbz().length()));
+				if (date != null) {
+					String date2 = dateFormater.format(date);
+					fjvo.setFbsj(date2);
+				}
+				fjvo.setFbdw(fjlist.get(i).getFbdw());
+				fjvo.setWjh(fjlist.get(i).getWjh());
+				fjvo.setId(fjlist.get(i).getId());
+				model.addAttribute("recordfj" + s, fjvo);
+			}
+		}
+
 		List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
 		if (lists != null & lists.size() > 0) {
 			String roleCode = "";
 			TaskInfoEntity taskinfo = lists.get(0);
+			String currName = taskinfo.getCurrName();
+			model.addAttribute("currName", currName);
 			if ("ldbl".equals(taskinfo.getTaskKey())) {
 				roleCode = Constants.ROLE_LD;
 			} else if ("fgldbl".equals(taskinfo.getTaskKey())) {
@@ -839,7 +909,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 			} else if ("fgldsh".equals(taskinfo.getTaskKey())) {
 				roleCode = Constants.ROLE_FGLD;
-			}else if ("ldsh".equals(taskinfo.getTaskKey())){
+			} else if ("ldpz".equals(taskinfo.getTaskKey())) {
 				roleCode = Constants.YES;
 			}
 			model.addAttribute("roleCode", roleCode);
@@ -883,39 +953,6 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		}
 		model.addAttribute("list", volist);
 
-		List<JsjdcbsjfjEntity> fjlist = jsjdcbsjfjService.findBySsid(id);
-		if (fjlist != null && fjlist.size() > 0) {
-			if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
-				for (JsjdcbsjfjEntity fj : fjlist) {
-					AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
-					try {
-						Ftp f = getftp();
-						// 本地目录
-						String localBaseDir = GlobalData.UPLOAD_FILE_PATH + acc.getFilepath();
-						File newfile = new File(localBaseDir);
-						// 如果文件夹不存在则创建
-						if (!newfile.exists() && !newfile.isDirectory()) {
-							newfile.mkdirs();
-						}
-						// 远程目录
-						String remoteBaseDir = acc.getFilepath();
-						// 下载ftp文件
-						boolean downflag = FtpUtil.startDown(f, localBaseDir, remoteBaseDir, acc.getFilename());
-						if (downflag) {
-							System.out.println("ok");
-							acc.setFjbz("1");
-							accessoryService.save(acc);
-						}
-
-					} catch (Exception e) {
-						e.printStackTrace();
-					}
-				}
-			}
-
-			model.addAttribute("fjlist", fjlist);
-		}
-
 		model.addAttribute("record", vo);
 		model.addAttribute("jyr", entity.getJyrid());
 		return "gkjsgl/jsjdcbsj/jsjdcbsjview";
@@ -945,7 +982,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		}
 		if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
 			model.addAttribute("ssFlag", "1");
-		}else{
+		} else {
 			model.addAttribute("ssFlag", "0");
 		}
 		model.addAttribute("roleCode", Constants.ROLE_LD);
@@ -982,19 +1019,13 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/audit")
 	@ResponseBody
-	public WebJsonResult audit(String shyj, String id, boolean flag, String accid, String userids) {
+	public WebJsonResult audit(String shyj, String id, boolean flag, String accid, String userids, String delid34, String delid35, String delid36, String delid37, String delid38, String fjzdids) {
 		WebJsonResult wr = success();
 		JsjdcbsjEntity entity = jsjdcbsjService.findOne(id);
 		if (!StringUtils.isEmpty(accid)) {
 			// 关联附件
-			String[] ssids = accid.split(",");
-			for (String ssid : ssids) {
-				JsjdcbsjfjEntity fj = jsjdcbsjfjService.findOne(ssid);
-				if (fj != null) {
-					fj.setSsid(entity.getId());
-					jsjdcbsjfjService.save(fj);
-				}
-			}
+			fjgt(accid, entity);
+			fjzdgt(fjzdids, entity);
 		}
 		try {
 			if (jsjdcbsjService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), id) != null) {
@@ -1031,7 +1062,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 								fjids = acc.getId() + ",";
 							}
 						}
-						fjids = fjids.substring(0, fjids.lastIndexOf(",") - 1);
+						fjids = fjids.substring(0, fjids.length() - 1);
 					}
 					String url = "/GK_OPERATION_JSJY_JSJDCBSJ_ONE_PC?condition=ID=" + entity.getId() + ";FJID_IN=" + fjids;
 					boolean tbflag = getTbStatus(url);
@@ -1059,27 +1090,54 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	// 附件字段保存共通
+	public void fjzdgt(String fjzdids, JsjdcbsjEntity code) {
+		if (fjzdids != null && fjzdids != "") {
+			String[] fjidssz = fjzdids.split(",");
+			for (String fj : fjidssz) {
+				if (!StringUtils.isEmpty(fj)) {
+					// 获取前两个字符（标识位）
+					String s = fj.substring(0, 2);
+					// 去掉前两个标识位查询
+					JsjdcbsjfjEntity jsjdfj = jsjdcbsjfjService.findOne(fj.substring(2, fj.length()));
+					jsjdfj.setSsid(code.getId());
+					// 把附件标识设置成标识位+附件标识
+					jsjdfj.setFjbz(s + jsjdfj.getFjbz());
+					jsjdfj.setFbdw(jsjdfj.getFbdw());
+					jsjdfj.setFjlx("ptfj");
+					jsjdcbsjfjService.save(jsjdfj);
+				}
+			}
+		}
+	}
+
+	// 附件保存共通
+	public void fjgt(String accids, JsjdcbsjEntity xmxxgl) {
+		if (null != accids && "" != accids) {
+			String[] ssids = accids.split(",");
+			for (String ssid : ssids) {
+				// 获取前两个字符（标识位）
+				if (!StringUtils.isEmpty(ssid)) {
+					String s = ssid.substring(0, 2);
+					// 去掉标志位查询
+					AccessoryEntity acc = accessoryService.findOne(ssid.substring(2, ssid.length()));
+					acc.setSsid(xmxxgl.getId());
+					// 把备注设置成标识位+备注
+					acc.setRemark(s + acc.getRemark());
+					accessoryService.save(acc);
+				}
+			}
+		}
+	}
+
 	// 保存附件
 	@RequestMapping(value = "/saveFile")
 	@ResponseBody
-	public WebJsonResult saveFile(@RequestParam("file") List<MultipartFile> file, String fjFlag, Model model, HttpServletRequest request, HttpServletResponse response) {
+	public WebJsonResult saveFile(MultipartFile filename, Model model) {
 		WebJsonResult wr = success();
-		if (file != null && file.size() > 0) {
-			JsjdcbsjfjEntity fjEntity = new JsjdcbsjfjEntity();
-			for (int i = 0; i < file.size(); i++) {
-				MultipartFile f = file.get(i);
-				if (f.getSize() > 0) {
-					AccessoryEntity acc = accessoryService.saveFile(f, "jsjdcbsj");
-					if (acc != null) {
-						fjEntity.setFjid(acc.getId());
-						fjEntity.setFjmc(acc.getName());
-						fjEntity.setType(fjFlag);
-						fjEntity = jsjdcbsjfjService.save(fjEntity);
-						break;
-					}
-				}
-			}
-			wr.setAttr("acc", fjEntity);
+		if (filename != null) {
+			AccessoryEntity acc = accessoryService.saveFile(filename, "jsjd");
+			wr.setAttr("acc", acc);
 		} else {
 			wr.setSuccess(false);
 			wr.setMessage("请上传附件!");
@@ -1087,6 +1145,24 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	@RequestMapping(value = "/savefj")
+	@ResponseBody
+	public WebJsonResult savefj(Model model, JsjdcbsjfjEntity fjzd) {
+		WebJsonResult wr = success();
+		try {
+			// 新增
+			JsjdcbsjfjEntity entity = jsjdcbsjfjService.save(fjzd);
+			String fjid = entity.getId();
+			wr.setMessage(fjid);
+
+		} catch (Exception e) {
+			wr.setSuccess(false);
+			wr.setMessage("操作失败！");
+			e.printStackTrace();
+		}
+		return wr;
+	}
+
 	@RequestMapping(value = "/delFile")
 	@ResponseBody
 	public WebJsonResult delFile(String accid, Model model) {

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/dao/JsjdcbsjfjDao.java

@@ -11,4 +11,7 @@ public interface JsjdcbsjfjDao extends SecRepository<JsjdcbsjfjEntity, String> {
 
 	@Query("SELECT m  FROM JsjdcbsjfjEntity m WHERE  m.ssid =?1  and m.recordStatus <> 9 ")
 	public List<JsjdcbsjfjEntity> findBySsid(String ssid);
+	
+	@Query("SELECT m from JsjdcbsjfjEntity m  where m.ssid =?1 and m.fjlx=?2 and m.recordStatus<>9")
+	public List<JsjdcbsjfjEntity> findBySsidandfjlx(String ssid,String fjlx);
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/entity/JsjdcbsjfjEntity.java

@@ -1,5 +1,7 @@
 package com.xt.jygl.gkjsgl.jsjdcbsj.entity;
 
+import java.util.Date;
+
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
@@ -17,30 +19,17 @@ public class JsjdcbsjfjEntity extends BaseEntity<String> implements Cloneable {
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
-	private String id = null;
-	private String ssid = null;
-	private String fjid = null;
-	private String fjmc = null;
-	private String type = null;
-
+	private String id;/* 唯一标识 */
+	private String ssid;/* 项目id */
+	private String wjh;/* 文件号 */
+	private Date fbsj;/* 发布时间 */
+	private String fbdw;/* 发布单位 */
+	private String fjid;/* 附件id */
+	private String wjlb;/* 文件类别 */
+	private String fjbz;/* 附件标识 */
+	private String fjlx;/* 附件类型 */
 	
 
-	public String getSsid() {
-		return ssid;
-	}
-
-	public void setSsid(String ssid) {
-		this.ssid = ssid;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
 	/**
 	 * ID主键
 	 * 
@@ -57,6 +46,38 @@ public class JsjdcbsjfjEntity extends BaseEntity<String> implements Cloneable {
 		this.id = id;
 	}
 
+	public String getSsid() {
+		return ssid;
+	}
+
+	public void setSsid(String ssid) {
+		this.ssid = ssid;
+	}
+
+	public String getWjh() {
+		return wjh;
+	}
+
+	public void setWjh(String wjh) {
+		this.wjh = wjh;
+	}
+
+	public Date getFbsj() {
+		return fbsj;
+	}
+
+	public void setFbsj(Date fbsj) {
+		this.fbsj = fbsj;
+	}
+
+	public String getFbdw() {
+		return fbdw;
+	}
+
+	public void setFbdw(String fbdw) {
+		this.fbdw = fbdw;
+	}
+
 	public String getFjid() {
 		return fjid;
 	}
@@ -65,12 +86,30 @@ public class JsjdcbsjfjEntity extends BaseEntity<String> implements Cloneable {
 		this.fjid = fjid;
 	}
 
-	public String getFjmc() {
-		return fjmc;
+	public String getWjlb() {
+		return wjlb;
+	}
+
+	public void setWjlb(String wjlb) {
+		this.wjlb = wjlb;
 	}
 
-	public void setFjmc(String fjmc) {
-		this.fjmc = fjmc;
+	public String getFjbz() {
+		return fjbz;
 	}
 
+	public void setFjbz(String fjbz) {
+		this.fjbz = fjbz;
+	}
+
+	public String getFjlx() {
+		return fjlx;
+	}
+
+	public void setFjlx(String fjlx) {
+		this.fjlx = fjlx;
+	}
+
+	
+
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/service/JsjdcbsjfjService.java

@@ -14,4 +14,6 @@ public interface JsjdcbsjfjService {
 	JsjdcbsjfjEntity findOne(String id);
 
 	List<JsjdcbsjfjEntity> findBySsid(String ssid);
+	
+	List<JsjdcbsjfjEntity> findBySsidandfjlx(String ssid,String fjlx);
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/service/impl/JsjdcbsjfjServiceImpl.java

@@ -28,6 +28,12 @@ public class JsjdcbsjfjServiceImpl extends JyglBaseService<JsjdcbsjfjEntity, Str
 		return dao.findBySsid(ssid);
 	}
 
+
+	@Override
+	public List<JsjdcbsjfjEntity> findBySsidandfjlx(String ssid, String fjlx) {
+		return dao.findBySsidandfjlx(ssid, fjlx);
+	}
+
 	
 
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/vo/JsjdcbsjfjVo.java

@@ -0,0 +1,97 @@
+package com.xt.jygl.gkjsgl.jsjdcbsj.vo;
+
+
+import com.xtframe.sec.common.BaseVo;
+
+public class JsjdcbsjfjVo extends BaseVo {
+	private String id;/* 唯一标识 */
+	private String ssid;/* 项目id */
+	private String wjh;/* 唯一标识 */
+	private String fbsj;/* 唯一标识 */
+	private String fbdw;/* 唯一标识 */
+	private String fjid;/* 唯一标识 */
+	private String wjlb;/* 唯一标识 */
+	private String fjmc;
+	private String xhbz;
+	private String fjbz;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getSsid() {
+		return ssid;
+	}
+
+	public void setSsid(String ssid) {
+		this.ssid = ssid;
+	}
+
+	public String getWjh() {
+		return wjh;
+	}
+
+	public void setWjh(String wjh) {
+		this.wjh = wjh;
+	}
+
+	public String getFbsj() {
+		return fbsj;
+	}
+
+	public void setFbsj(String fbsj) {
+		this.fbsj = fbsj;
+	}
+
+	public String getFbdw() {
+		return fbdw;
+	}
+
+	public void setFbdw(String fbdw) {
+		this.fbdw = fbdw;
+	}
+
+	public String getFjid() {
+		return fjid;
+	}
+
+	public void setFjid(String fjid) {
+		this.fjid = fjid;
+	}
+
+	public String getWjlb() {
+		return wjlb;
+	}
+
+	public String getFjmc() {
+		return fjmc;
+	}
+
+	public void setFjmc(String fjmc) {
+		this.fjmc = fjmc;
+	}
+
+	public String getXhbz() {
+		return xhbz;
+	}
+
+	public void setXhbz(String xhbz) {
+		this.xhbz = xhbz;
+	}
+
+	public String getFjbz() {
+		return fjbz;
+	}
+
+	public void setFjbz(String fjbz) {
+		this.fjbz = fjbz;
+	}
+
+	public void setWjlb(String wjlb) {
+		this.wjlb = wjlb;
+	}
+}

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

@@ -215,28 +215,6 @@ public class JsjdglCtl extends BaseWebCtl {
 			}
 		};
 		
-
-		/*String user1 = (String) Utils.getSession().getAttribute("user");
-		String user2 = SecUtils.getCurrUser().getId();
-		if(user2!=null){
-			if(!user2.equals(user1)){
-				SearchCondition.jsjdpage = 1;
-				SearchCondition.jsxmmc = "";
-				SearchCondition.jsszd = "";
-				SearchCondition.jsszgk = "";
-				SearchCondition.jsszgq = "";
-				SearchCondition.jsxmfr = "";
-				SearchCondition.jsdqzt = "";
-				SearchCondition.jslcjd = "";
-			}
-			
-		}
-		Utils.getSession().setAttribute("user", user2);*/
-
-		/*if (page.getPage() < 1) {
-			page.setPage(SearchCondition.jsjdpage);
-		}*/
-		
 		if (page.getPage() < 1) {
 			Object jsjdpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "jsjdpage");
 			if (StringUtils.isEmpty(jsjdpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(jsjdpage))) {
@@ -331,18 +309,6 @@ public class JsjdglCtl extends BaseWebCtl {
 		model.addAttribute("lcjd", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "lcjd"));
 		model.addAttribute("menuid", menuid);
 
-		/*if (isPOST(request)) {
-			SearchCondition.jsjdpage = page.getPage();
-			SearchCondition.jsxmmc = xmmc;
-			SearchCondition.jsszd = szdid;
-			SearchCondition.jsszgk = szgkid;
-			SearchCondition.jsszgq = szgqid;
-			SearchCondition.jsxmfr = xmfr;
-			SearchCondition.jsdqzt = dqzt;
-			SearchCondition.jslcjd = lcjd;
-		}*/
-		
-
 		// 翻页共通
 		putPageInfo(model, page, list);
 		return "gkjsgl/jsjdgl/jsjdglmain";
@@ -581,7 +547,7 @@ public class JsjdglCtl extends BaseWebCtl {
 	@RequiresPermissions("jsjdgl:edit")
 	public String edit(Model model, String id, String flag, String fhbz, String path,String type) {
 		// 附件
-		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "1");
+		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jsjd");
 		for (int i = 0; i < accessoryList.size(); i++) {
 			if (StringUtils.isNotEmpty(accessoryList.get(i).getRemark())) {
 				String s = accessoryList.get(i).getRemark().substring(0, 2);
@@ -740,7 +706,7 @@ public class JsjdglCtl extends BaseWebCtl {
 	@RequiresPermissions("jsjdgl:main")
 	public String view(Model model, String id, String flag, String fhbz, String menuid) {
 		// 附件
-		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "1");
+		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jsjd");
 		for (int i = 0; i < accessoryList.size(); i++) {
 			if (StringUtils.isNotEmpty(accessoryList.get(i).getRemark())) {
 				String s = accessoryList.get(i).getRemark().substring(0, 2);
@@ -921,7 +887,7 @@ public class JsjdglCtl extends BaseWebCtl {
 	@RequestMapping(value = "/saveFile")
 	@ResponseBody
 	public WebJsonResult saveFile(String ssid, MultipartFile filename, Model model) {
-		AccessoryEntity acc = accessoryService.saveFile(filename, "1");
+		AccessoryEntity acc = accessoryService.saveFile(filename, "jsjd");
 		WebJsonResult wr = success();
 		wr.setAttr("acc", acc);
 		return wr;
@@ -1602,7 +1568,7 @@ public class JsjdglCtl extends BaseWebCtl {
 	@RequestMapping(value = "/xiugai")
 	public String xiugai(Model model, String id) {
 		// 附件
-		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "1");
+		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jdjd");
 		List<AccessoryEntity> qtfjlist = accessoryService.queryBySsidAndSstype(id, "jsjdqtfj");
 		qtfjgtview(model, qtfjlist, "1");
 		for (int i = 0; i < accessoryList.size(); i++) {
@@ -1625,7 +1591,7 @@ public class JsjdglCtl extends BaseWebCtl {
 		vo.setAxspjbzw(entity.getAxspjb() != null ? entity.getAxspjb().getText() : "");
 		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
 		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
-
+		vo.setSylx(entity.getSylx() != null ? entity.getSylx().getId() : "");
 		vo.setTzlx(entity.getTzlx() != null ? entity.getTzlx().getId() : "");
 		vo.setXmlx(entity.getXmlx() != null ? entity.getXmlx().getId() : "");
 		vo.setXmhzjb(entity.getXmhzjb() != null ? entity.getXmhzjb().getId() : "");

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdgl/entity/XmxxglfbEntity.java

@@ -1,5 +1,7 @@
 package com.xt.jygl.gkjsgl.jsjdgl.entity;
 
+import java.util.Date;
+
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
@@ -52,6 +54,47 @@ public class XmxxglfbEntity extends BaseEntity<String> implements Cloneable {
 	private String xddy;/* 下端点Y*/
 	private String bwyt;/* 泊位用途*/
 	private CodeEntity zyhbwfl;/* 专业化泊位分类*/
+	
+	private String xmbm;/* 项目编码 */
+	private String zftze;/* 政府投资额 */
+	private CodeEntity sylx;/* 水域类型 */
+	private Date jcsj; /* 建成时间 */
+	
+	
+	public String getXmbm() {
+		return xmbm;
+	}
+
+	public void setXmbm(String xmbm) {
+		this.xmbm = xmbm;
+	}
+
+	public String getZftze() {
+		return zftze;
+	}
+
+	public void setZftze(String zftze) {
+		this.zftze = zftze;
+	}
+
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CodeEntity.class)
+	@JoinColumn(name = "sylx")
+	public CodeEntity getSylx() {
+		return sylx;
+	}
+
+	public void setSylx(CodeEntity sylx) {
+		this.sylx = sylx;
+	}
+
+	public Date getJcsj() {
+		return jcsj;
+	}
+
+	public void setJcsj(Date jcsj) {
+		this.jcsj = jcsj;
+	}
+
 	@Id
 	@GenericGenerator(name = "systemUUID", strategy = "uuid")
 	@GeneratedValue(generator = "systemUUID")

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdgl/vo/XmxxglfbVo.java

@@ -1,5 +1,7 @@
 package com.xt.jygl.gkjsgl.jsjdgl.vo;
 
+import java.util.Date;
+
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
@@ -50,6 +52,52 @@ public class XmxxglfbVo extends BaseVo {
 	private String zyhbwflzw;/* 专业化泊位分类*/
 	private String cljg;/* 处理结果*/
 	private String lcjd;/* 处理结果*/
+	private String xmbm;/* 项目编码 */
+	private String zftze;/* 政府投资额 */
+	private String sylx;/* 水域类型 */
+	private String sylxzw;/* 水域类型中文 */
+	private Date jcsj; /* 建成时间 */
+	
+	public String getXmbm() {
+		return xmbm;
+	}
+
+	public void setXmbm(String xmbm) {
+		this.xmbm = xmbm;
+	}
+
+	public String getZftze() {
+		return zftze;
+	}
+
+	public void setZftze(String zftze) {
+		this.zftze = zftze;
+	}
+
+	public String getSylxzw() {
+		return sylxzw;
+	}
+
+	public void setSylxzw(String sylxzw) {
+		this.sylxzw = sylxzw;
+	}
+
+	public Date getJcsj() {
+		return jcsj;
+	}
+
+	public void setJcsj(Date jcsj) {
+		this.jcsj = jcsj;
+	}
+
+	public String getSylx() {
+		return sylx;
+	}
+
+	public void setSylx(String sylx) {
+		this.sylx = sylx;
+	}
+
 	@Id
 	@GenericGenerator(name = "systemUUID", strategy = "uuid")
 	@GeneratedValue(generator = "systemUUID")

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/entity/XmxxglEntity.java

@@ -60,7 +60,17 @@ public class XmxxglEntity extends BaseEntity<String> implements Cloneable {
 	private CodeEntity sylx;/* 水域类型 */
 	private Date jcsj; /* 建成时间 */
 	
+	private String flowstatus;
 	
+	
+	public String getFlowstatus() {
+		return flowstatus;
+	}
+
+	public void setFlowstatus(String flowstatus) {
+		this.flowstatus = flowstatus;
+	}
+
 	@Id
 	@GenericGenerator(name = "systemUUID", strategy = "uuid")
 	@GeneratedValue(generator = "systemUUID")

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/vo/XmxxglVo.java

@@ -44,7 +44,7 @@ public class XmxxglVo extends BaseVo {
 	private String sylx;/* 水域类型 */
 	private String sylxzw;/* 水域类型中文 */
 	private Date jcsj; /* 建成时间 */
-	
+	private String flowstatus;
 	// 流程历史字段
 	private String currentname;/* 流程节点名 */
 	private String auditusername;/* 审批人 */
@@ -66,6 +66,17 @@ public class XmxxglVo extends BaseVo {
 	private String lcjd;/* 流程节点*/
 	private String sfqswj;/* 是否缺失文件*/
 	private String showjsjd;/* 是否显示建设进度*/
+	
+	
+
+	public String getFlowstatus() {
+		return flowstatus;
+	}
+
+	public void setFlowstatus(String flowstatus) {
+		this.flowstatus = flowstatus;
+	}
+
 	@Id
 	@GenericGenerator(name = "systemUUID", strategy = "uuid")
 	@GeneratedValue(generator = "systemUUID")