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

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqedit.jsp

@@ -225,7 +225,7 @@
 										<td><input type="hidden" name="delid81" id="delid81"
 											value="${fjList81.fjid }"> <input type="hidden"
 											id="fjzdid81"> <a class='main_title' href="#"
-											onclick="jsjdcbsj.detail.download('81')"><span id="fjmc81">${fjList81.fjmc }</span></a>
+											onclick="jgsq.detail.download('81')"><span id="fjmc81">${fjList81.fjmc }</span></a>
 										</td>
 										<td><span id="fbdw81">${recordfj81.fbdw }</span></td>
 										<td><span id="wjh81">${recordfj81.wjh }</span></td>
@@ -240,7 +240,7 @@
 											name="delid82" id="delid82" value="${fjList82.fjid }">
 											<input type="hidden" class="form-control" id="fjzdid82">
 											<a class='main_title' href="#"
-											onclick="jsjdcbsj.detail.download('82')"><span id="fjmc82">${fjList82.fjmc }</span></a>
+											onclick="jgsq.detail.download('82')"><span id="fjmc82">${fjList82.fjmc }</span></a>
 										</td>
 										<td><span id="fbdw82">${recordfj82.fbdw }</span></td>
 										<td><span id="wjh82">${recordfj82.wjh }</span></td>
@@ -254,7 +254,7 @@
 											name="delid83" id="delid83" value="${fjList83.fjid }">
 											<input type="hidden" class="form-control" id="fjzdid83">
 											<a class='main_title' href="#"
-											onclick="jsjdcbsj.detail.download('83')"><span id="fjmc83">${fjList83.fjmc }</span></a>
+											onclick="jgsq.detail.download('83')"><span id="fjmc83">${fjList83.fjmc }</span></a>
 										</td>
 										<td><span id="fbdw83">${recordfj83.fbdw }</span></td>
 										<td><span id="wjh83">${recordfj83.wjh }</span></td>
@@ -268,7 +268,7 @@
 											name="delid84" id="delid84" value="${fjList84.fjid }">
 											<input type="hidden" class="form-control" id="fjzdid84">
 											<a class='main_title' href="#"
-											onclick="jsjdcbsj.detail.download('84')"><span id="fjmc84">${fjList84.fjmc }</span></a>
+											onclick="jgsq.detail.download('84')"><span id="fjmc84">${fjList84.fjmc }</span></a>
 										</td>
 										<td><span id="fbdw84">${recordfj84.fbdw }</span></td>
 										<td><span id="wjh84">${recordfj84.wjh }</span></td>
@@ -282,7 +282,7 @@
 											name="delid85" id="delid85" value="${fjList85.fjid }">
 											<input type="hidden" class="form-control" id="fjzdid85">
 											<a class='main_title' href="#"
-											onclick="jsjdcbsj.detail.download('85')"><span id="fjmc85">${fjList85.fjmc }</span></a>
+											onclick="jgsq.detail.download('85')"><span id="fjmc85">${fjList85.fjmc }</span></a>
 										</td>
 										<td><span id="fbdw85">${recordfj85.fbdw }</span></td>
 										<td><span id="wjh85">${recordfj85.wjh }</span></td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqmain.jsp

@@ -137,12 +137,12 @@
 							<td>${jgsq.szgqzw }</td>
 							<td>${jgsq.xmfr }</td>
 						    <td>${jgsq.xmlxzw }</td>
-						    <td>${jgbg.currentname }</td>
+						    <td>${jgsq.currentname }</td>
 							<td class="operatetd">
 								<a class="btn btn-default btn-xs" href="#" onclick="jgsq.main.view('${jgsq.id}')" title="查看">
 							            <i class="glyphicon glyphicon-search"></i> 
 							            </a>
-							             <c:if test="${jgsq.recordStatus == 1 && jsjdcbsj.tbzt == 'N' }">
+							             <c:if test="${jgsq.recordStatus == 1 && jgsq.sftb == 'N' }">
 								 <a class="btn btn-default btn-xs" href="#"  onclick="jgsq.main.edit('${jgsq.id}')" title="修改">
 									   <i class="glyphicon glyphicon-wrench"></i> 
 									          </a>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjmain.jsp

@@ -143,7 +143,7 @@
 								<a class="btn btn-default btn-xs" href="#" onclick="jsjdcbsj.main.view('${jsjdcbsj.id}')" title="查看">
 							            <i class="glyphicon glyphicon-search"></i> 
 							            </a>
-							             <c:if test="${jsjdcbsj.recordStatus == 1 && jsjdcbsj.tbzt == 'N'}">
+							             <c:if test="${jsjdcbsj.recordStatus == 1 && jsjdcbsj.sftb == 'N'}">
 							              
 								 <a class="btn btn-default btn-xs" href="#"  onclick="jsjdcbsj.main.edit('${jsjdcbsj.id}')" title="修改">
 									   <i class="glyphicon glyphicon-wrench"></i> 

gkjsjy/trunk/WebContent/WEB-INF/web.xml

@@ -20,12 +20,12 @@
    <context-param>
 		<description>0:省级;1:市级</description>
 		<param-name>deploy_mode</param-name>
-		<param-value>1</param-value>
+		<param-value>0</param-value>
 	</context-param>
 	<context-param>
 		<description>区域代码</description>
 		<param-name>city_code</param-name>
-		<param-value>90012</param-value>
+		<param-value>900</param-value>
 	</context-param>
   
   <context-param>

gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jgsq/jgsqdetail.js

@@ -720,7 +720,6 @@ jgsq.detail.saveFile = function(){
 	            }
 	            if (data.success) {
 	            	$("#scfjbt").attr("style","display:none;");
-	            	debugger;
 	                var accContect = data.attrs.acc.name;
 	                var accid = data.attrs.acc.id;
 	                var str = "";

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

@@ -846,7 +846,6 @@ jsjdcbsj.detail.saveFile = function(){
 	            }
 	            if (data.success) {
 	            	$("#scfjbt").attr("style","display:none;");
-	            	debugger;
 	                var accContect = data.attrs.acc.name;
 	                var accid = data.attrs.acc.id;
 	                var str = "";

gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdgl/jsjdgldetail.js

@@ -206,7 +206,6 @@ jsjdgl.detail.saveFile = function(){
 	           
 	            file.after(file.clone().val(""));
 	            file.remove();
-	            debugger;
 	            if (data) {
 	            	data = data.replace("<audio controls=\"controls\" style=\"display: none;\"></audio>","");
 	                data = $.parseJSON(data);

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/cghzyxxgl/hsjcgzyxx/hsjcgzyxxmain.js

@@ -13,7 +13,6 @@ hsjcgzyxx.main.search = function() {
 };
 
 hsjcgzyxx.main.view = function(data, sbdlbzw) {
-	//debugger;
 	if (sbdlbzw == "包装货物") {
 		location.href = $.app + "/hsjcgzyxx/bzhwview?sbdbh=" + data;
 	}

gkjsjy/trunk/WebContent/static/biz/js/set/user/usermain.js

@@ -66,7 +66,6 @@ user.main.add=function(){
 }
 
 user.main.reset=function(data){
-	debugger;
 	$.confirm({
 	    title: '提示框',
 	    content: '您是否重置密码？',

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

@@ -193,14 +193,11 @@ public class JgsqCtl extends BaseWebCtl {
 							}
 						}
 					} else {
-
-						if ("1".equals(entity.getFlowstatus())) {
+						if ("3".equals(entity.getFlowstatus())) {
 							vo.setCurrentname("退回地市");
-						} else if ("2".equals(entity.getFlowstatus())) {
-							vo.setCurrentname("完成");
-						} else if ("3".equals(entity.getFlowstatus())) {
-							vo.setCurrentname("已同步");
-						}
+						} else if ("4".equals(entity.getFlowstatus())) {
+							vo.setCurrentname("完成且数据已同步");
+						} 
 					}
 				} else if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {
 					vo.setCurrentname("完成");
@@ -1089,15 +1086,15 @@ public class JgsqCtl extends BaseWebCtl {
 			boolean flowflag = jgsqService.changeAudit(shyj, entity, flag, userids);
 			if (flowflag) {
 				if (flag) {
-					entity.setFlowstatus("2");
+					entity.setFlowstatus("4");
 				} else {
-					entity.setFlowstatus("1");
+					entity.setFlowstatus("3");
 				}
 				entity.setSftb(Constants.YES);
 				entity = jgsqService.save(entity);
 				// 如果是省级审核通过或不通过后同步到市级
 				try {
-					String url = "/GK_OPERATION_JSJY_JSJDCBSJ_ONE_PC?condition=ID=" + entity.getId();
+					String url = "/GK_OPERATION_JSJY_JGSQ_ONE_PC?condition=ID=" + entity.getId();
 					boolean tbflag = getTbStatus(url);
 					if (tbflag) {
 						entity.setTbzt("Y");

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/vo/JgsqVo.java

@@ -65,7 +65,25 @@ public class JgsqVo extends BaseVo {
 	private String sylx;/* 水域类型 */
 	private Date jcsj; /* 建成时间 */
 	private String sylxzw;
+	private String sftb;
+	private String tbzt;
 	
+	public String getSftb() {
+		return sftb;
+	}
+
+	public void setSftb(String sftb) {
+		this.sftb = sftb;
+	}
+
+	public String getTbzt() {
+		return tbzt;
+	}
+
+	public void setTbzt(String tbzt) {
+		this.tbzt = tbzt;
+	}
+
 	public String getXmbm() {
 		return xmbm;
 	}

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

@@ -195,9 +195,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 						if ("1".equals(entity.getFlowstatus())) {
 							vo.setCurrentname("退回地市");
 						} else if ("2".equals(entity.getFlowstatus())) {
-							vo.setCurrentname("完成");
-						} else if ("3".equals(entity.getFlowstatus())) {
-							vo.setCurrentname("已同步");
+							vo.setCurrentname("完成且数据已同步");
 						}
 					}
 				} else if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {

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

@@ -62,7 +62,17 @@ public class JsjdcbsjVo extends BaseVo {
 	private String sylxzw;
 	private String bl;
 	private String tbzt;
+	private String sftb;
 	
+	
+	public String getSftb() {
+		return sftb;
+	}
+
+	public void setSftb(String sftb) {
+		this.sftb = sftb;
+	}
+
 	public String getTbzt() {
 		return tbzt;
 	}