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@1887 931142cf-59ea-a443-aa0e-51397b428577
ld_jiangxf 8 years ago
parent
581420469d
commit
c74afd01e8
5 changed files with 50 additions and 22 deletions
Split View Show Diff Stats
  1. 30 16
      znjg/trunk/WebContent/WEB-INF/view/jsp/dcttl/dcttlcx.jsp
  2. 2 2
      znjg/trunk/WebContent/WEB-INF/view/jsp/dcttl/dcttltj.jsp
  3. 2 1
      znjg/trunk/WebContent/static/biz/js/dcttl/dcttlcxmain.js
  4. 12 1
      znjg/trunk/src/com/jsjty/dcttlcx/entity/DcttlcxEntity.java
  5. 4 2
      znjg/trunk/src/com/jsjty/dcttlcx/xml/DcttlcxMapper.xml

+ 30 - 16
znjg/trunk/WebContent/WEB-INF/view/jsp/dcttl/dcttlcx.jsp
View File 

@@ -26,6 +26,7 @@
 
 			dcttlcx.main.szgqData="${szgq}";

 			dcttlcx.main.shztData="${shzt}";

 			dcttlcx.main.hwzlData="${hwzl}";

+			initshztSelect("shztsel");

 		});

 	</script>

 <body>

@@ -89,6 +90,17 @@
 
                         </td>

                         </tr> 

                        <tr style="height:42px;">

+                       	<td align="right">

+						 <div class="form-inline  has-feedback">

+	                        <label class="control-label1" for="inputSuccess4">当前状态：

+	                        </label>

+	                        </div>

+						</td>

+						<td style="width:25%">

+	                        <select name="shzt" id='shzt' class="selectpicker">

+	                        <option value="">请选择</option>	

+	                        </select>

+						</td>

 						<td align="right">

 						 <div class="form-inline  has-feedback">

                         <label class="control-label1" for="inputSuccess4">报告时间起：

@@ -115,25 +127,27 @@
 
 							<!-- 列表 -->

 							<table class="table_ud">

 								<tr >

-									<th nowrap="nowrap">序号</th>

-									<th nowrap="nowrap">经营人</th>

-									<th nowrap="nowrap">作业品</th>

-									<th nowrap="nowrap">所在港口</th>

-									<th nowrap="nowrap">所在港区</th>

-									<th nowrap="nowrap">报告时间</th>

-									<th nowrap="nowrap">货物种类</th>

-									<th nowrap="nowrap">当前状态</th>

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

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

+									<th width="10%">作业品名称</th>

+									<th width="10%">作业数量（吨）</th>

+									<th width="6%">货物种类<br>第一大类</th>

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

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

+									<th width="8%">报告时间</th>

+									<th width="8%">当前状态</th>

 								</tr>

 								<c:forEach items="${dcttlcxList}" var="dcttlcx" varStatus="s">

 										<tr>

-											<td style="width:8%">${s.count}</td>

-											<td style="width:25%">${dcttlcx.ssjyr}</td>

-											<td style="width:15%">${dcttlcx.zypmc}</td>

-											<td style="width:10%">${dcttlcx.szgk}</td>

-											<td style="width:10%">${dcttlcx.szgq}</td>

-											<td style="width:10%"><fmt:formatDate value='${dcttlcx.bgsj}' pattern="yyyy-MM-dd" type="date" dateStyle="long" /></td>

-											<td style="width:13%">${dcttlcx.hwzl}</td>

-											<td style="width:12%">${dcttlcx.shzt}</td>

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

+											<td>${dcttlcx.ssjyr}</td>

+											<td>${dcttlcx.zypmc}</td>

+											<td>${dcttlcx.zysl}</td>

+											<td>${dcttlcx.hwzl}</td>

+											<td>${dcttlcx.szgk}</td>

+											<td>${dcttlcx.szgq}</td>

+											<td><fmt:formatDate value='${dcttlcx.bgsj}' pattern="yyyy-MM-dd" type="date" dateStyle="long" /></td>

+											<td>${dcttlcx.shzt}</td>

 										</tr>

 									</c:forEach>

 									<tr>

+ 2 - 2
znjg/trunk/WebContent/WEB-INF/view/jsp/dcttl/dcttltj.jsp
View File 

@@ -94,14 +94,14 @@
 
 	                }

 	            },

 	            title: {

-	                text: '',

+	                text: '单船作业吞吐量（万吨）',

 	                style: {

 	                    color: '#262626'

 	                }

 	            }

 	        }, { // Secondary yAxis

 	            title: {

-	                text: '',

+	                text: '单船作业申报数量（个）',

 	                style: {

 	                    color: '#262626'

 	                }

+ 2 - 1
znjg/trunk/WebContent/static/biz/js/dcttl/dcttlcxmain.js
View File 

@@ -182,4 +182,5 @@ dcttlcx.main.init = function() {
 
 dcttlcx.main.search = function() {

 	$('#currentpage').val(1);

 	$("#dcttlcxform").submit();

-}
 
+}

+

+ 12 - 1
znjg/trunk/src/com/jsjty/dcttlcx/entity/DcttlcxEntity.java
View File 

@@ -25,6 +25,8 @@ public class DcttlcxEntity implements RowMapper<Object>{
 
 	private Date bgsj;

 	/**当前状态*/

 	private String shzt;

+	/**作业数量 */

+	private Double zysl;

 	

 	public String getSzd() {

 		return szd;

@@ -97,6 +99,14 @@ public class DcttlcxEntity implements RowMapper<Object>{
 
 	public void setShzt(String shzt) {

 		this.shzt = shzt;

 	}

+	

+	public Double getZysl() {

+		return zysl;

+	}

+

+	public void setZysl(Double zysl) {

+		this.zysl = zysl;

+	}

 

 	@Override

 	public Object mapRow(ResultSet rs, int rowNum) throws SQLException {

@@ -110,7 +120,8 @@ public class DcttlcxEntity implements RowMapper<Object>{
 
 		dcttl.setSzgk(rs.getString("szgk"));

 		dcttl.setSzgq(rs.getString("szgq"));

 		dcttl.setZypmc(rs.getString("zyqmc"));

+		dcttl.setZysl(rs.getDouble("zysl"));

 		return dcttl;

 	}

-

+	

 }

+ 4 - 2
znjg/trunk/src/com/jsjty/dcttlcx/xml/DcttlcxMapper.xml
View File 

@@ -12,6 +12,7 @@
 
 		<result column="HWZL" property="hwzl" jdbcType="VARCHAR" />

 		<result column="BGSJ" property="bgsj" jdbcType="DATE" />

 		<result column="SHZT" property="shzt" jdbcType="VARCHAR" />

+		<result column="ZYSL" property="zysl" jdbcType="DOUBLE" />

 	</resultMap>

 	<resultMap type="map" id="shztResultType" autoMapping="true">

     	<id column="ID" property="id" />

@@ -119,7 +120,7 @@
 
 	<select id="findValidByPage" resultMap="dcttlcxResultMap" parameterType="java.util.HashMap">

 		SELECT * FROM (SELECT tt.*, ROWNUM AS rowno FROM (

 		<![CDATA[

-		select D.BH, J.GKJYR SSJYR, K.GKMC SZGK, Q.Gqmc SZGQ, D.Zypmc, D.Bgsj, E.Text Hwzl, C.Text shzt

+		select D.BH, J.GKJYR SSJYR, K.GKMC SZGK, Q.Gqmc SZGQ, D.ZYPMC,D.ZYSL, D.Bgsj, E.Text Hwzl, C.Text shzt

   		from Gk_Operation_Jsjy_Dcsb D

   		left join gk_basic_jsjy_jyr J

     	on D.Ssjyr = J.Id

@@ -157,8 +158,9 @@
 
 		<if test="bh!=null and bh!=''">  

 			AND D.BH LIKE CONCAT(CONCAT('%', '${bh}'),'%')  

 		</if>

+		ORDER BY D.BGSJ DESC

    		<![CDATA[

-   		) tt WHERE ROWNUM <= ${dataend} ) table_alias WHERE table_alias.rowno >= ${datafrom}

+   		) tt WHERE ROWNUM <= ${dataend} ) table_alias WHERE table_alias.rowno >= ${datafrom} 

    		]]>

 	</select>

 </mapper>