Merge remote-tracking branch 'origin/master_sc' into master_sc

pom.xml

@@ -64,6 +64,16 @@
 			<groupId>javax.servlet</groupId>
 			<artifactId>jstl</artifactId>
 		</dependency>
+		<!-- servlet依赖. -->
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-jasper</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>

src/main/resources/application-pro.properties

-spring.datasource.url=jdbc:oracle:thin:@127.0.0.1:1521:orcl
+spring.datasource.url=jdbc:oracle:thin:@47.92.129.99:1600:orcl
 spring.datasource.username=XZXT
 spring.datasource.password=XZXT
 spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver

src/main/resources/mapper/ZczlMapper.xml

@@ -1282,24 +1282,15 @@
     </select>
 
     <select id="getAllTjfpxx" parameterType="java.util.Map"  resultType="com.founder.model.TbYwZczlFp">
-        select fp.* from TB_YW_ZCZL_FP fp,TB_YW_ZCZL zl where  fp.xxscpdbz='0'
-        and zl.xxscpdbz='0' and fp.zczlbh=zl.zczlbh
-        <if test="fbsj_s!=null">and zl.fbsj <![CDATA[>=]]> #{fbsj_s}</if>
-        <if test="fbsj_e!=null">and zl.fbsj <![CDATA[<=]]> #{fbsj_e}</if>
+        select fp.* from TB_YW_ZCZL_FP fp where fp.xxscpdbz='0' and fp.fprgajgdm like '510000%'
+        <if test="fbsj_s!=null">and fp.fpsj <![CDATA[>=]]> #{fbsj_s}</if>
+        <if test="fbsj_e!=null">and fp.fpsj <![CDATA[<=]]> #{fbsj_e}</if>
         <if test="sfbdw==1">
             <if test="dwdm!=null and dwdm!=''">
                 and fp.QSRGAJGDM = #{dwdm}
             </if>
         </if>
         <if test="sfbdw==0">
-            <!--<if test="userUnitcode!=null and userUnitcode!=''">
-                and fp.FPRGAJGDM = #{userUnitcode}
-            </if>
-            <if test="userUnitcode==null or userUnitcode==''">
-                <if test="dadCodes!=null and dadCodes!=''">
-                    and fp.FPRGAJGDM in ${dadCodes}
-                </if>
-            </if>-->
             <if test="inString!=null and inString!=''">
                 and (fp.QSRGAJGDM in ${inString})
             </if>

src/main/resources/static/js/listJszlCount.js

@@ -121,3 +121,17 @@ function toZczlDetail(zczlbh,fpbh){
 function doBack(){
     $("#jszl_count").dialog("close");
 }*/
+
+function exportExcel(){
+    var params = serializeObject($("form[name='jszlCountForm']"));
+    var fbsj_s = params.fbsj_s;
+    var fbsj_e = params.fbsj_e;
+    var dwdm = params.dwdm;
+    var qszt = params.qszt;
+    var hbzt = params.hbzt;
+    var pjdj = params.pjdj;
+
+    if (confirm('确定导出excel附件吗？'))  {
+        location.href = "/exportJszlCntExcel?fbsj_s="+fbsj_s+"&fbsj_e="+fbsj_e+"&dwdm="+dwdm+"&qszt="+qszt+"&hbzt="+hbzt+"&pjdj="+pjdj;
+    }
+}
\ No newline at end of file

src/main/resources/static/js/listZczlTj.js

@@ -41,8 +41,12 @@ function toZlzs(dwdm,fbsj_s,fbsj_e){
 }
 
 function toDwZlxx(dwdm,fbsj_s,fbsj_e){
-    var url = '/toGetDwZlxx?dwdm='+dwdm+"&isZjdw=1&fbsj_s="+fbsj_s+"&fbsj_e="+fbsj_e;
-    window.open(url);
+    if(dwdm.substr(0, 6) == "510000"){
+        return;
+    }else{
+        var url = '/toGetDwZlxx?dwdm='+dwdm+"&isZjdw=1&fbsj_s="+fbsj_s+"&fbsj_e="+fbsj_e;
+        window.open(url);
+    }
 }
 
 function doQuery(obj){
@@ -66,8 +70,8 @@ function doQuery(obj){
         checkOnSelect : false,
         fit:false,
         pagination : true,
-        pageSize : 10,
-        pageList : [10,20], //rows
+        pageSize : 25,
+        pageList : [25,50], //rows
         pageNumber : 1,
         loadFilter: function(data){
             $(".total").html(data.total);

src/main/webapp/WEB-INF/jsp/jszlCount.jsp

@@ -87,6 +87,7 @@
                                     <a class="btn_a btn_search" onclick="doQuery()">查询</a>
                                     <a class="btn_a btn_empty" onclick="doClear()">清空</a>
                                     <%--<a  class="btn_a btn_empty" onclick="doBack()">关闭</a>--%>
+                                    <a class="btn_a btn_add" onclick="exportExcel()" id="exportExcel">导出Excel</a>
                                 </td>
                             </tr>
                         </tbody>