Forráskód Böngészése

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

ld_lixh 8 éve
szülő
commit
fae160ab6b

+ 155 - 8
gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/JyrjcxxCtl.java

@@ -1,28 +1,175 @@
 package com.xt.js.gkaq.web.ctl;
 
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.alibaba.fastjson.JSONArray;
 import com.xt.js.gkaq.common.BaseCtl;
+import com.xt.js.gkaq.common.BaseUUIDModel;
+import com.xt.js.gkaq.dwxx.model.JyrjcxxInfol;
 import com.xt.js.gkaq.dwxx.model.JyrjcxxModel;
 import com.xt.js.gkaq.dwxx.service.JyrjcxxService;
-import com.xt.js.gkaq.web.vo.UserVo;
+import com.xt.js.gkaq.frame.model.ComboBoxDto;
+import com.xt.js.gkaq.frame.service.CodeService;
+import com.xt.js.gkaq.dwxx.model.*;
+import com.xt.js.gkaq.web.model.GqModel;
+import com.xt.js.gkaq.web.service.GqService;
+import com.xt.js.gkaq.web.vo.JyrjcxxVo;
+import com.yuanxd.tools.pagehelper.PageHelper;
+import com.yuanxd.tools.pagehelper.PageInfo;
+import com.yuanxd.tools.utils.WebJsonResult;
+import com.yuanxd.tools.utils.string.StringUtils;
 
 @Controller
-@RequestMapping(value = "/jyr")
+@RequestMapping(value = "/jyr", produces = "application/json; charset=utf-8")
 public class JyrjcxxCtl extends BaseCtl {
     @Autowired
     private JyrjcxxService jyrjcxxService;
+    @Autowired
+    private CodeService codeService;
+    @Autowired
+    private GqService gqService;
 
     //    @RequiresPermissions("jyr:main")
     @RequestMapping("")
-    public String main(Model model, UserVo vo) {
-        JyrjcxxModel jyr = new JyrjcxxModel();
-        jyr.setSfzdsp("N");
-        jyr.setGkjyr("test");
-        jyrjcxxService.add(jyr);
+    public String main(HttpServletRequest request) {
+    	//加载所在地
+    	List<ComboBoxDto> list = codeService.findByPcode("DM_SZD");
+    	request.setAttribute("code", list);
         return "dwxx/jyr/main";
     }
+    /**
+     * 加载所在地
+     * @return
+     */
+    @RequestMapping("getszd")
+    @ResponseBody
+    public String getszd() {
+    	//加载所在地
+    	List<ComboBoxDto> list = codeService.findByPcode("DM_SZD");
+    	return JSONArray.toJSONString(list);
+    }
+    /***
+     * 动态关联下拉框数据
+     * @param request
+     * @param szd
+     * @return
+     */
+    @RequestMapping("getGq")
+    @ResponseBody
+    public String getGq(HttpServletRequest request,String szd) {
+//    	model.setSzd("");
+    	GqModel model = new GqModel();
+    	model.setSzd(szd);
+    	//获取港区
+    	List<ComboBoxDto> gqlist = gqService.selectByInfo(model);
+    	return JSONArray.toJSONString(gqlist);
+    }
+    /**
+     * 数据表格
+     * @param vo
+     * @return
+     */
+    @RequestMapping("list")
+    @ResponseBody
+    public PageInfo<JyrjcxxInfol> list(JyrjcxxVo vo) {
+		if (null == vo.getPage() || vo.getPage() < 1) {
+			vo.setPage(1);
+		}
+		if (null == vo.getRows() || vo.getRows() < 1) {
+			vo.setRows(1);
+		}
+		PageHelper.startPage(vo.getPage(), vo.getRows());
+		JyrjcxxModel model = new JyrjcxxModel();
+		BeanUtils.copyProperties(vo, model);
+//		model.setSzd(vo.getSzd());
+//		model.setSzgq(vo.getSzgq());
+//		model.setQylx(vo.getQylx());
+//		model.setGkjyr(vo.getGkjyr());
+//		model.setFddbr(vo.getFddbr());
+//		model.setSfwhqy(vo.getSfwhqy());
+//		model.setByzd1(vo.getByzd1());
+//		model.setByzd2(vo.getByzd2());
+//		model.setByzd3(vo.getByzd3());
+//		model.setByzd4(vo.getByzd4());
+//		model.setByzd5(vo.getByzd5());
+		
+		List<JyrjcxxInfol> list = jyrjcxxService.selectList(model);
+		PageInfo<JyrjcxxInfol> pageResult = new PageInfo<>(list);
+		return pageResult;
+    }
+    
+    /**
+     * 编辑详情
+     * @return
+     */
+    @RequestMapping("initEdit")
+    @ResponseBody
+    public String initEdit (String id,HttpServletRequest request) {
+    	JyrjcxxModel model = new JyrjcxxModel();
+    	model.setId(id);
+    	List<JyrjcxxInfol> jyrjcxxModel = jyrjcxxService.selectList(model);
+    	request.setAttribute("jyr", jyrjcxxModel);
+    	return JSONArray.toJSONString(jyrjcxxModel);
+    } 
+    /**
+     * 加载上级港口经营人信息
+     * @param szd
+     * @return
+     */
+    @RequestMapping("getSelect")
+    @ResponseBody
+    public String getSelect (String szd) {
+    	List<com.xt.js.gkaq.dwxx.model.ComboBoxDto> list = jyrjcxxService.getSelect(szd);
+    	return JSONArray.toJSONString(list);
+    }
+    
+    /**
+     * 加载所属行业大类
+     * @return
+     */
+    @RequestMapping("gethydl")
+    @ResponseBody
+    public String gethydl () {
+    	List<ComboBoxDto> list = codeService.findByPcode("SSHYDL");
+    	return JSONArray.toJSONString(list);
+    }
+    /**
+     * 加载所属行业中类
+     * @return
+     */
+    @RequestMapping("gethyz")
+    @ResponseBody
+    public String gethyz () {
+    	List<ComboBoxDto> list = codeService.findByPcode("SSHYDL.HYZL");
+    	return JSONArray.toJSONString(list);
+    }
+    /**
+     * 添加或修改
+     * @param vo
+     * @return
+     */
+    @RequestMapping("save")
+    @ResponseBody
+    public WebJsonResult save (JyrjcxxVo vo) {
+    	if (StringUtils.isEmpty(vo.getId())) {
+    		//添加
+    		JyrjcxxModel model = new JyrjcxxModel();
+    		BeanUtils.copyProperties(vo, model);
+    		jyrjcxxService.add(model);
+    	} else {
+    		//修改
+    		JyrjcxxModel model = jyrjcxxService.findById(vo.getId());
+    		BeanUtils.copyProperties(vo, model);
+    		jyrjcxxService.update(model);
+    	}
+    	return success();
+    } 
 }

+ 5 - 5
gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/XzqhCtl.java

@@ -35,13 +35,13 @@ public class XzqhCtl extends BaseCtl {
     }
 
     /**
-     * 初始化页面加载数据
+     * 锟斤拷始锟斤拷页锟斤拷锟斤拷锟斤拷锟斤拷
      * @throws UnsupportedEncodingException 
      */
     @RequestMapping("list")
     @ResponseBody
     public PageInfo<XzqhModel> getPageInfo(XzqhVo vo) throws UnsupportedEncodingException {
-        // 初始化参数
+        // 锟斤拷始锟斤拷锟斤拷锟斤拷
         if (null == vo.getPage() || vo.getPage() < 1) {
             vo.setPage(1);
         }
@@ -88,7 +88,7 @@ public class XzqhCtl extends BaseCtl {
     }
 
     /**
-     * 保存
+     * 锟斤拷锟斤拷
      * 
      * @param vo
      * @return
@@ -98,12 +98,12 @@ public class XzqhCtl extends BaseCtl {
     public WebJsonResult save(XzqhVo vo) {
 
         if (StringUtils.isEmpty(vo.getId())) {
-            // 新增
+            // 锟斤拷锟斤拷
             XzqhModel model = new XzqhModel();
             BeanUtils.copyProperties(vo, model);
             xzqhService.add(model);
         } else {
-            // 更新
+            // 锟斤拷锟斤拷
             XzqhModel model = xzqhService.findById(vo.getId());
             BeanUtils.copyProperties(vo, model);
             xzqhService.update(model);

+ 1 - 1
gkaqv2/trunk/modules/web/src/main/resources/log4j/log4j.xml

@@ -139,7 +139,7 @@
 	</logger>
 	<root>
 		<!-- 设置输出范围,默认只输出ERROR以上的,ERROR级别, FATAL级别的LOG -->
-		<priority value="WARN" />
+		<priority value="DEBUG" />
 		<!-- 上边设置的输出通道,使用的在这里定义 -->
 		<appender-ref ref="STDOUT" />
 		<appender-ref ref="DEBUG" />

+ 143 - 7
gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyr/main.jsp

@@ -1,12 +1,148 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<%@ page language="java" contentType="text/html;charset=GBK"
+	pageEncoding="GBK"%>
+<!DOCTYPE html>
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>缁忚惀浜哄熀纭€淇℃伅</title>
+<title>经营人管理</title>
+<%@ include file="../../layouts/header.jsp"%>
+<link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/static/js/common/bootstrap-select/css/bootstrap-select.min.css" />
+<script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/bootstrap-select/js/bootstrap-select.min.js"></script>
+<script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
+
+<script src="<%=base%>/static/js/jyr/index.js"></script>
+	<style type="text/css">
+		.tdname{font-weight: bolder;}
+	</style>
 </head>
-<body>
-缁忚惀浜哄熀纭€淇℃伅
+
+<body class="p_body">
+<div class="easyui-layout" data-options="fit:true">
+<!-- 内容部分 -->
+<div id="regionCenter" data-options="region:'center'" class="regionCenterStyle">
+	<div class="p_all">
+	<div class="p_block">
+		<div class="p_headdiv">
+			<div class="p_headblock">
+				<div class="p_headleft">经营人管理</div>
+			</div>
+		</div>
+		<div class="p_buttondiv">
+			<div class="p_buttonbg">
+				<img class="p_buttonimg" src="<%=base%>/static/images/list/add.png" 
+					onclick="addInfo()" title="新增"/>
+			</div>
+			<div class="p_buttonbg">
+				<img class="p_buttonimg" src="<%=base%>/static/images/list/delete.png" 
+					onclick="delInfo()" title="删除"/>
+			</div>
+			<div class="p_buttonbg">
+				<img class="p_buttonimg" src="<%=base%>/static/images/list/edit.png" 
+					onclick="editInfo()" title="修改"/>
+			</div>
+			<div class="p_buttonbg">
+				<img class="p_buttonimg" src="<%=base%>/static/images/list/search.png" 
+					onclick="showSearch()" title="查询"/>
+			</div>
+			<div class="p_buttonbg">
+				<img class="p_buttonimg" src="<%=base%>/static/images/list/print.png" 
+					onclick="printInfo()" title="打印"/>
+			</div>
+		</div>
+		<div class="p_searchdiv">
+			<table class="tabsearch">
+				<tr class="trsearch">
+					<td class="tdname">所在地</td>
+					<td class="tdcontent">
+						<select class="p_txt" id ="szd" name = "szd" onchange="getgq()">
+							<option value = "">--请选择--</option>
+							<c:forEach items="${code }" var="code">
+								<option value = "${code.optVal }">${code.optName}</option>
+							</c:forEach>	
+										
+						</select>
+					</td>
+					<td class="tdname">所在区域</td>
+					<td class="tdcontent">
+						<select class="p_txt" id ="qylx" name = "qylx">
+							<option value = "">--请选择--</option>
+							<option value = "1">沿江</option>
+							<option value = "2">沿海</option>
+							<option value = "3">内河</option>				
+						</select>
+					</td>
+					<td class="tdname">所在港区 </td>
+					<td class="tdcontent">
+						<select class="p_txt" id ="szgq" name = "szgq">
+						</select>
+					</td>
+				</tr>
+				<tr class="trsearch">
+					<td class="tdname">港口经营人名称</td>
+					<td class="tdcontent">
+						<input type="text" id="gkjyr" name="gkjyr" class="p_txt"/>
+					</td>
+					<td class="tdname">法定代表人</td>
+					<td class="tdcontent">
+						<input type="text" id="fddbr" name="fddbr" class="p_txt"/>
+					</td>
+					<td class="tdname">是否危贷企业 </td>
+					<td class="tdcontent">
+						<select id="sfwhqy" name = "sfwhqy" class="p_txt" >
+							<option value= "">--请选择--</option>
+							<option value= "Y">是(有重大危险源)</option>
+							<option value= "W">是(无重大危险源)</option>
+							<option value= "N">否</option>
+						</select>	
+					</td>
+				</tr>
+				<tr class="trsearch">
+					<td class="tdname">码头企业类别</td>
+					<td class="tdcontent" colspan="4">
+						<input type="checkbox" name="byzd1" value= "危险货物集装箱码头"/>危险货物集装箱码头
+						<input type="checkbox" name="byzd1" value= "、石油化工码头、"/>石油化工码头
+						<input type="checkbox" name="byzd1" value= "危险货物非石油化工码头"/>危险货物非石油化工码头
+					</td>
+				</tr>
+				<tr class="trsearch">
+					<td class="tdname">仓储企业类别</td>
+					<td class="tdcontent" colspan="2">
+						<input type="checkbox" name="byzd1" value= "石油库"/>石油库
+						<input type="checkbox" name="byzd1" value= "港口危险货物库区"/>港口危险货物库区
+					</td>
+					<td></td>
+					<td class="tdname">
+						<img class="p_searchbtn" src="<%=base%>/static/images/list/btn_query.png" title="查询"
+							onclick="searchRecord()"/>
+					</td>
+				</tr>
+				
+			</table>
+		</div>
+		<div class="page-content">
+			<!--列表部分-->
+			<table id="grid-table"></table>
+			<div id="grid-pager"></div>
+		</div>
+	</div>
+	</div>
+		<div id="win" class="easyui-window" title="编辑" style="width:75%;height: 90%;"    
+       		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false"> 
+					<%@ include file="../jyr/EditOrAdd.jsp"%>
+					
+				</div>
+			</div>
+<!-- 头部 -->
+<div id="regionNorth" data-options="region:'north'" class="regionNorthStyle">
+	<%@ include file="../../layouts/navbar.jsp"%>
+</div>
+<!-- 左边部分 -->
+<div id="regionWest" data-options="region:'west'" class="regionWestStyle">
+	<%@ include file="../../layouts/sidebar.jsp"%>
+</div>
+<!-- 底部 -->
+<div id="regionFooter" data-options="region:'south'" class="regionFooterStyle">
+	<%@ include file="../../layouts/footer.jsp"%>
+</div>
+</div>
 </body>
 </html>

+ 1 - 0
gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/layouts/scripts.jsp

@@ -18,6 +18,7 @@
 <script src="<%=request.getContextPath()%>/static/js/common/jqgrid/i18n/grid.locale-cn.js"></script>
 
 <script type="text/javascript" src="<%=request.getContextPath()%>/static/jquery-easyui-1.5/jquery.easyui.min.js"></script>
+<script type="text/javascript" src="<%=request.getContextPath()%>/static/js/easyui-lang-zh_CN.js"></script>
 
 <script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/common.js"></script>
 <script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/util.js"></script>

+ 3 - 1
gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/layouts/sidebar.jsp

@@ -3,9 +3,11 @@
 [系统管理]<br>
 &emsp;&emsp;<a href="#" onclick="linkUrl('user')">用户管理</a><br>
 &emsp;&emsp;<a href="#" onclick="linkUrl('menu')">菜单管理</a><br>
+&emsp;&emsp;<a href="#" onclick="linkUrl('jyr')">经营人管理</a><br>
+&emsp;&emsp;<a href="#" onclick="linkUrl('menu')">菜单管理</a><br>
 &emsp;&emsp;<a href="#" onclick="linkUrl('dict')">字典管理</a><br>
 &emsp;&emsp;<a href="#" onclick="linkUrl('xzqh')">行政区划管理</a><br>
 &emsp;&emsp;<a href="#" onclick="linkUrl('param')">参数管理</a><br>
 &emsp;&emsp;<a href="#" onclick="linkUrl('org')">组织管理</a><br>
 &emsp;&emsp;<a href="#" onclick="linkUrl('role')">角色管理</a><br>
-&emsp;&emsp;<a href="#" onclick="linkUrl('group')">分组管理</a><br>
+&emsp;&emsp;<a href="#" onclick="linkUrl('group')">分组管理</a><br>