Home Explore Help
Register Sign In
hs
/
jsgkj
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

ld_xuhx 8 years ago
parent
f9557e4d21
commit
8f72172f3f
10 changed files with 215 additions and 8 deletions
Unified View Show Diff Stats
  1. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqdsmain.jsp
  2. 50 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqedit.jsp
  3. 33 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqview.jsp
  4. 29 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgdsedit.jsp
  5. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgdsmain.jsp
  6. 3 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgdsview.jsp
  7. 0 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjedit.jsp
  8. 76 1
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqCtl.java
  9. 4 0
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqdsCtl.java
  10. 18 0
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/vo/JsjdbgVo.java

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqdsmain.jsp
View File 

@@ -158,7 +158,7 @@
 
 										class="glyphicon glyphicon-retweet"></i>

 										class="glyphicon glyphicon-retweet"></i>

 									</a>

 									</a>

 								</c:if>

 								</c:if>

-							 <c:if test="${jgsqds.taskState =='Y'}">

+							 <c:if test="${jgsqds.taskState =='Y' && jgsqds.sftb == 'N'}">

 							 <a class="btn btn-default btn-xs" href="#"  onclick="jgsqds.main.banli('${jgsqds.id}')" title="办理">

 							 <a class="btn btn-default btn-xs" href="#"  onclick="jgsqds.main.banli('${jgsqds.id}')" title="办理">

 									   <i class="glyphicon glyphicon-check"></i> 

 									   <i class="glyphicon glyphicon-check"></i> 

 									          </a>

 									          </a>

+ 50 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqedit.jsp
View File 

@@ -71,6 +71,7 @@
 
 <body>

 <body>

 <jsp:include page="../../jyrselect.jsp"></jsp:include>

 <jsp:include page="../../jyrselect.jsp"></jsp:include>

 <jsp:include page="../../showRy.jsp"></jsp:include>

 <jsp:include page="../../showRy.jsp"></jsp:include>

+<jsp:include page="../../showbwview.jsp"></jsp:include>

 	<div class="box" >

 	<div class="box" >

 		<div class="box-content" >

 		<div class="box-content" >

 			<div class="apply_fill">

 			<div class="apply_fill">

@@ -220,6 +221,39 @@
 
 							</td>

 							</td>

 						   

 						   

 						</tr>

 						</tr>

+						

+						</table>

+						

+					 <table id="bwtableID" class="main_table" cellpadding="0" cellspacing="0">

+				     <thead>

+					    <tr>

+					    	<th width="5%">序号</th>

+			    			<th width="10%">泊位名称</th>

+			        		<th width="10%">港口经营人</th>

+							<th width="10%">码头名称</th>

+							<th width="10%">所在港口</th>

+							<th width="10%">所在港区</th>

+							<th width="15%">泊位用途</th>

+							<th width="5%">是否<br>危险品泊位</th>

+							<th width="5%">是否<br>对外开放泊位</th>

+					    </tr>

+				    </thead>

+				      <c:forEach items="${bwlist}" var="bw" varStatus="status">

+					    <tr >

+					    	<td >${status.count }</td>

+							<td ><a href="#" onclick="jsjdcbsj.detail.viewBw('${bw.id}')">${bw.bwmc }</a></td>

+					        <td >${bw.ssjyrzw }</td>

+							<td >${bw.ssmtzw }</td>

+							<td >${bw.szgkzw }</td>

+							<td >${bw.szgqzw }</td>

+							<td >${bw.bwytzw }</td>

+							<td >${bw.wxpbwzw }</td>

+							<td >${bw.sfdwkfzw }</td>

+					    </tr>

+				    </c:forEach>

+				    </table>		

+							

+					<table class="apply3" cellpadding="0" cellspacing="0" style="table-layout: fixed;">

 							<tr>

 							<tr>

                     <th>地市附件与专家评审附件：&nbsp;</th>

                     <th>地市附件与专家评审附件：&nbsp;</th>

 							<td colspan="3">

 							<td colspan="3">

@@ -319,7 +353,22 @@
 
 								</table>

 								</table>

 							</td>

 							</td>

 						</tr>

 						</tr>

-				

+				<c:forEach items="${qtfjlist}" var="qtfj" varStatus="status">

+										<tr id="${qtfj.fjid }">

+											<td>${status.index+3}</td>

+											<td>其他附件</td>

+											<td><a class="main_title"

+												href='/jsjy/accessory/download?id=${qtfj.fjid }'>${qtfj.fjmc }</a></td>

+											<td>${qtfj.fbdw }</td>

+											<td>${qtfj.wjh }</td>

+											<td>${qtfj.fbsj }</td>

+											<td  align="center">

+											<a class="btn btn-default btn-sm" href="#" 

+											onclick="jgsqds.detail.delqtfj('${qtfj.fjid }','${qtfj.id }')">删除</a>

+  											          

+											</td>

+										</tr>

+									</c:forEach>

 					</table>

 					</table>

+ 33 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqview.jsp
View File 

@@ -211,6 +211,38 @@
 
 							</td>

 							</td>

 						   

 						   

 						</tr>

 						</tr>

+						</table>

+						

+					 <table id="bwtableID" class="main_table" cellpadding="0" cellspacing="0">

+				     <thead>

+					    <tr>

+					    	<th width="5%">序号</th>

+			    			<th width="10%">泊位名称</th>

+			        		<th width="10%">港口经营人</th>

+							<th width="10%">码头名称</th>

+							<th width="10%">所在港口</th>

+							<th width="10%">所在港区</th>

+							<th width="15%">泊位用途</th>

+							<th width="5%">是否<br>危险品泊位</th>

+							<th width="5%">是否<br>对外开放泊位</th>

+					    </tr>

+				    </thead>

+				      <c:forEach items="${bwlist}" var="bw" varStatus="status">

+					    <tr >

+					    	<td >${status.count }</td>

+							<td ><a href="#" onclick="jsjdcbsj.detail.viewBw('${bw.id}')">${bw.bwmc }</a></td>

+					        <td >${bw.ssjyrzw }</td>

+							<td >${bw.ssmtzw }</td>

+							<td >${bw.szgkzw }</td>

+							<td >${bw.szgqzw }</td>

+							<td >${bw.bwytzw }</td>

+							<td >${bw.wxpbwzw }</td>

+							<td >${bw.sfdwkfzw }</td>

+					    </tr>

+				    </c:forEach>

+				    </table>		

+							

+					<table class="apply3" cellpadding="0" cellspacing="0" style="table-layout: fixed;">

 						<tr>

 						<tr>

                     <th>地市附件与专家评审附件：&nbsp;</th>

                     <th>地市附件与专家评审附件：&nbsp;</th>

 							<td colspan="3">

 							<td colspan="3">

@@ -435,6 +467,7 @@
 
 </form>

 </form>

 <jsp:include page="../../showRy.jsp"></jsp:include>

 <jsp:include page="../../showRy.jsp"></jsp:include>

 <jsp:include page="../../showViewOption.jsp"></jsp:include>

 <jsp:include page="../../showViewOption.jsp"></jsp:include>

+<jsp:include page="../../showbwview.jsp"></jsp:include>

 </body>

 </body>

 

 

 </html>

 </html>

+ 29 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgdsedit.jsp
View File 

@@ -68,6 +68,7 @@
 
 </head>

 </head>

 

 

 <body>

 <body>

+<jsp:include page="../../showbwview.jsp"></jsp:include>

 <jsp:include page="../../showRy.jsp"></jsp:include>

 <jsp:include page="../../showRy.jsp"></jsp:include>

 	<div class="box" >

 	<div class="box" >

 		<div class="box-content" >

 		<div class="box-content" >

@@ -214,7 +215,34 @@
 
 						</tr>

 						</tr>

 				

 				

 					</table>

 					</table>

-					

+						 <table id="bwtableID" class="main_table" cellpadding="0" cellspacing="0">

+				     <thead>

+					    <tr>

+					    	<th width="5%">序号</th>

+			    			<th width="10%">泊位名称</th>

+			        		<th width="10%">港口经营人</th>

+							<th width="10%">码头名称</th>

+							<th width="10%">所在港口</th>

+							<th width="10%">所在港区</th>

+							<th width="15%">泊位用途</th>

+							<th width="5%">是否<br>危险品泊位</th>

+							<th width="5%">是否<br>对外开放泊位</th>

+					    </tr>

+				    </thead>

+				      <c:forEach items="${bwlist}" var="bw" varStatus="status">

+					    <tr >

+					    	<td >${status.count }</td>

+							<td ><a href="#" onclick="jsjdbgds.detail.viewBw('${bw.id}')">${bw.bwmc }</a></td>

+					        <td >${bw.ssjyrzw }</td>

+							<td >${bw.ssmtzw }</td>

+							<td >${bw.szgkzw }</td>

+							<td >${bw.szgqzw }</td>

+							<td >${bw.bwytzw }</td>

+							<td >${bw.wxpbwzw }</td>

+							<td >${bw.sfdwkfzw }</td>

+					    </tr>

+				    </c:forEach>

+				    </table>			

 

 

 					<div  id="buttons">

 					<div  id="buttons">

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgdsmain.jsp
View File 

@@ -155,7 +155,7 @@
 
 									</a>

 									</a>

 								</c:if>

 								</c:if>

 					        

 					        

-							 <c:if test="${jsjdbgds.taskState =='Y'}">

+							 <c:if test="${jsjdbgds.taskState =='Y' && jsjdbgds.sftb == 'N'}">

 							 <a class="btn btn-default btn-xs" href="#"  onclick="jsjdbgds.main.banli('${jsjdbgds.id}')" title="办理">

 							 <a class="btn btn-default btn-xs" href="#"  onclick="jsjdbgds.main.banli('${jsjdbgds.id}')" title="办理">

 									   <i class="glyphicon glyphicon-check"></i> 

 									   <i class="glyphicon glyphicon-check"></i> 

 									          </a>

 									          </a>

+ 3 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgdsview.jsp
View File 

@@ -269,11 +269,12 @@
 
 					<a class="btn btn-default btn-sm" href="#"  onclick="showYj()">

 					<a class="btn btn-default btn-sm" href="#"  onclick="showYj()">

 							   <i class="glyphicon glyphicon-check"></i> 

 							   <i class="glyphicon glyphicon-check"></i> 

 							            意见</a>

 							            意见</a>

-							          

+					<c:if test="${record.flowstatus != '2' }"> 		          

 					 <a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdbgds.detail.saveTbzt('${record.id}')">

 					 <a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdbgds.detail.saveTbzt('${record.id}')">

 												   <i class="glyphicon glyphicon-ok-sign"></i> 

 												   <i class="glyphicon glyphicon-ok-sign"></i> 

 												    转报省级</a>

 												    转报省级</a>

-					<c:if test="${record.flowstatus != '0' }"> 

+					</c:if>

+					<c:if test="${record.flowstatus == '2' }"> 

 					 <a class="btn btn-default btn-sm" href="#"  onclick="jsjdbgds.detail.audit('Y','${record.id}')">

 					 <a class="btn btn-default btn-sm" href="#"  onclick="jsjdbgds.detail.audit('Y','${record.id}')">

 							   <i class="glyphicon glyphicon-ok-sign"></i> 

 							   <i class="glyphicon glyphicon-ok-sign"></i> 

 							            同意</a>

 							            同意</a>

+ 0 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjedit.jsp
View File 

@@ -69,7 +69,6 @@
 
 </head>

 </head>

 

 

 <body>

 <body>

-<jsp:include page="../../jyrselect.jsp"></jsp:include>

 <jsp:include page="../../showRy.jsp"></jsp:include>

 <jsp:include page="../../showRy.jsp"></jsp:include>

 <jsp:include page="../../showbwview.jsp"></jsp:include>

 <jsp:include page="../../showbwview.jsp"></jsp:include>

 	<div class="box" >

 	<div class="box" >

+ 76 - 1
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqCtl.java
View File 

@@ -48,8 +48,11 @@ import com.xt.jygl.gkjsgl.tzjhgl.entity.TzjhglEntity;
 
 import com.xt.jygl.gkjsgl.tzjhgl.service.TzjhglService;

 import com.xt.jygl.gkjsgl.tzjhgl.service.TzjhglService;

 import com.xt.jygl.gkjsgl.xmxxgl.entity.XmbwglbEntity;

 import com.xt.jygl.gkjsgl.xmxxgl.entity.XmbwglbEntity;

 import com.xt.jygl.gkjsgl.xmxxgl.service.XmbwglbService;

 import com.xt.jygl.gkjsgl.xmxxgl.service.XmbwglbService;

+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.entity.GkjyrEntity;

 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;

 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;

+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.vo.BwVo;

 import com.xt.jygl.workflow.entity.TaskInfoEntity;

 import com.xt.jygl.workflow.entity.TaskInfoEntity;

 import com.xt.jygl.workflow.service.TaskInfoService;

 import com.xt.jygl.workflow.service.TaskInfoService;

 import com.xt.jygl.workflow.vo.TaskInfoVo;

 import com.xt.jygl.workflow.vo.TaskInfoVo;

@@ -87,7 +90,8 @@ public class JgsqCtl extends BaseWebCtl {
 
 	private JgsqfjService jgsqfjService;

 	private JgsqfjService jgsqfjService;

 	@Autowired

 	@Autowired

 	private XmbwglbService xmbwglbService;

 	private XmbwglbService xmbwglbService;

-

+	@Autowired

+	private BwService bwService;

 	@RequestMapping(value = "/main")

 	@RequestMapping(value = "/main")

 	@RequiresPermissions("jgsq: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 {

 	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 {

@@ -763,6 +767,7 @@ public class JgsqCtl extends BaseWebCtl {
 
 				bwids = bwids + xmbw.getBwid() + ",";

 				bwids = bwids + xmbw.getBwid() + ",";

 			}

 			}

 			bwids = bwids.substring(0, bwids.length() - 1);

 			bwids = bwids.substring(0, bwids.length() - 1);

+			getbwlist(model, bwids);

 		}

 		}

 		// 附件

 		// 附件

 		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jgsq");

 		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jgsq");

@@ -861,6 +866,75 @@ public class JgsqCtl extends BaseWebCtl {
 
 		return "gkjsgl/jgsq/jgsqedit";

 		return "gkjsgl/jgsq/jgsqedit";

 	}

 	}

 

 

+	public void getbwlist(Model model, String bwids) {

+		if (!StringUtils.isEmpty(bwids)) {

+			List<BwVo> slist = new ArrayList<BwVo>();

+			String[] bwlists = bwids.split(",");

+			for (String bw : bwlists) {

+				BwEntity bwentity = bwService.findOne(bw);

+				BwVo bwvo = new BwVo();

+				if (bwentity != null) {

+					BeanUtils.copyProperties(bwentity, bwvo);

+					bwvo.setSzdzw(bwentity.getSzd() != null ? bwentity.getSzd().getText() : "");

+					bwvo.setSzgkzw(bwentity.getSzgk() != null ? bwentity.getSzgk().getGkmc() : "");

+					bwvo.setSzgqzw(bwentity.getSzgq() != null ? bwentity.getSzgq().getGqmc() : "");

+					bwvo.setSsjyrzw(bwentity.getSsjyr() != null ? bwentity.getSsjyr().getGkjyr() : "");

+					bwvo.setSsmtzw(bwentity.getSsmt() != null ? bwentity.getSsmt().getMtmc() : "");

+					bwvo.setBwsxzw(bwentity.getBwsx() != null ? bwentity.getBwsx().getText() : "");

+					bwvo.setFwlxzw(bwentity.getFwlx() != null ? bwentity.getFwlx().getText() : "");

+					bwvo.setWxpbwzw(bwentity.getWxpbw() != null ? bwentity.getWxpbw().getText() : "");

+					bwvo.setZyhbwflzw(bwentity.getZyhbwfl() != null ? bwentity.getZyhbwfl().getText() : "");

+					bwvo.setSffzzw(bwentity.getSffz() != null ? bwentity.getSffz().getText() : "");

+					bwvo.setSfdwkfzw(bwentity.getSfdwkf() != null ? bwentity.getSfdwkf().getText() : "");

+					bwvo.setBwszsxzw(bwentity.getBwszsx() != null ? bwentity.getBwszsx().getText() : "");

+					bwvo.setSclxzw(bwentity.getSclx() != null ? bwentity.getSclx().getText() : "");

+					bwvo.setJgxszw(bwentity.getJgxs() != null ? bwentity.getJgxs().getText() : "");

+					bwvo.setKbcblxzw(bwentity.getKbcblx() != null ? bwentity.getKbcblx().getText() : "");

+

+					bwvo.setSszyq(bwentity.getSszyq() != null ? bwentity.getSszyq().getId() : "");

+					bwvo.setSszyqzw(bwentity.getSszyq() != null ? bwentity.getSszyq().getZyqmc() : "");

+					bwvo.setZls(bwentity.getZls() != null ? bwentity.getZls().getId() : "");

+					bwvo.setZlszw(bwentity.getZls() != null ? bwentity.getZls().getText() : "");

+					bwvo.setXp(bwentity.getXp() != null ? bwentity.getXp().getId() : "");

+					bwvo.setXpzw(bwentity.getXp() != null ? bwentity.getXp().getText() : "");

+					bwvo.setBwszhd(bwentity.getBwszhd() != null ? bwentity.getBwszhd().getText() : "");

+

+					if (bwentity.getBwyt() != null) {

+						String bwytzw = "";

+						String[] s = bwentity.getBwyt().split(",");

+

+						for (int i = 0; i < s.length; i++) {

+							CodeEntity ce = securityMgr.codeService().findOne(s[i]);

+							if (ce != null) {

+								bwytzw += ce.getText();

+								if (i != s.length - 1) {

+									bwytzw += ",";

+								}

+							}

+						}

+						bwvo.setBwytzw(bwytzw);

+					}

+					bwvo.setSzd(bwentity.getSzd() != null ? bwentity.getSzd().getId() : "");

+					bwvo.setSzgk(bwentity.getSzgk() != null ? bwentity.getSzgk().getId() : "");

+					bwvo.setSzgq(bwentity.getSzgq() != null ? bwentity.getSzgq().getId() : "");

+					bwvo.setSsjyr(bwentity.getSsjyr() != null ? bwentity.getSsjyr().getId() : "");

+					bwvo.setSsmt(bwentity.getSsmt() != null ? bwentity.getSsmt().getId() : "");

+					bwvo.setBwsx(bwentity.getBwsx() != null ? bwentity.getBwsx().getId() : "");

+					bwvo.setFwlx(bwentity.getFwlx() != null ? bwentity.getFwlx().getId() : "");

+					bwvo.setWxpbw(bwentity.getWxpbw() != null ? bwentity.getWxpbw().getId() : "");

+					bwvo.setZyhbwfl(bwentity.getZyhbwfl() != null ? bwentity.getZyhbwfl().getId() : "");

+					bwvo.setSffz(bwentity.getSffz() != null ? bwentity.getSffz().getId() : "");

+					bwvo.setSfdwkf(bwentity.getSfdwkf() != null ? bwentity.getSfdwkf().getId() : "");

+					bwvo.setBwszsx(bwentity.getBwszsx() != null ? bwentity.getBwszsx().getId() : "");

+					bwvo.setSclx(bwentity.getSclx() != null ? bwentity.getSclx().getId() : "");

+					bwvo.setJgxs(bwentity.getJgxs() != null ? bwentity.getJgxs().getId() : "");

+					slist.add(bwvo);

+				}

+			}

+			model.addAttribute("bwlist", slist);

+		}

+	}

+	

 	@RequestMapping(value = "/view")

 	@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) {

 		model.addAttribute("flag", flag);

 		model.addAttribute("flag", flag);

@@ -914,6 +988,7 @@ public class JgsqCtl extends BaseWebCtl {
 
 				bwids = bwids + xmbw.getBwid() + ",";

 				bwids = bwids + xmbw.getBwid() + ",";

 			}

 			}

 			bwids = bwids.substring(0, bwids.length() - 1);

 			bwids = bwids.substring(0, bwids.length() - 1);

+			getbwlist(model, bwids);

 		}

 		}

 		// 附件

 		// 附件

 		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jgsq");

 		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jgsq");

+ 4 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqdsCtl.java
View File 

@@ -408,6 +408,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 
 				} else {

 				} else {

 					jgsq.setAxspjb(null);

 					jgsq.setAxspjb(null);

 				}

 				}

+				jgsq.setSftb(Constants.NO);

 				jgsq = jgsqdsService.submit(jgsq);

 				jgsq = jgsqdsService.submit(jgsq);

 			} else {

 			} else {

 				if (!StringUtils.isEmpty(ssjyrid)) {

 				if (!StringUtils.isEmpty(ssjyrid)) {

@@ -456,6 +457,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 
 					axspjbdx.setId(axspjbid);

 					axspjbdx.setId(axspjbid);

 					code.setAxspjb(axspjbdx);

 					code.setAxspjb(axspjbdx);

 				}

 				}

+				code.setSftb(Constants.NO);

 				jgsq = jgsqdsService.submit(code);

 				jgsq = jgsqdsService.submit(code);

 

 

 			}

 			}

@@ -674,6 +676,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 
 				} else {

 				} else {

 					jgsq.setAxspjb(null);

 					jgsq.setAxspjb(null);

 				}

 				}

+				jgsq.setSftb(Constants.NO);

 				jgsq = jgsqdsService.save(jgsq);

 				jgsq = jgsqdsService.save(jgsq);

 			} else {

 			} else {

 				if (!StringUtils.isEmpty(ssjyrid)) {

 				if (!StringUtils.isEmpty(ssjyrid)) {

@@ -722,6 +725,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 
 					axspjbdx.setId(axspjbid);

 					axspjbdx.setId(axspjbid);

 					code.setAxspjb(axspjbdx);

 					code.setAxspjb(axspjbdx);

 				}

 				}

+				code.setSftb(Constants.NO);

 				jgsq = jgsqdsService.save(code);

 				jgsq = jgsqdsService.save(code);

 

 

 			}

 			}

+ 18 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/vo/JsjdbgVo.java
View File 

@@ -62,6 +62,24 @@ public class JsjdbgVo extends BaseVo {
 
 	private Date jcsj; /* 建成时间 */

 	private Date jcsj; /* 建成时间 */

 	private String sylxzw;

 	private String sylxzw;

 	private String xmgk;

 	private String xmgk;

+	private String tbzt;

+	private String sftb;

+

+	public String getTbzt() {

+		return tbzt;

+	}

+

+	public void setTbzt(String tbzt) {

+		this.tbzt = tbzt;

+	}

+

+	public String getSftb() {

+		return sftb;

+	}

+

+	public void setSftb(String sftb) {

+		this.sftb = sftb;

+	}

 

 

 	public String getXmid() {

 	public String getXmid() {

 		return xmid;

 		return xmid;