1

nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/DepartmentItemRankServiceImpl.java

@@ -1,4 +1,5 @@
 package com.example.nngkxxdp.service.impl;
+import java.time.LocalDateTime;
 
 import com.alibaba.fastjson.JSON;
 import com.example.nngkxxdp.dao.*;
@@ -80,7 +81,13 @@ public class DepartmentItemRankServiceImpl implements DepartmentItemRankService
 
     public BaseResult getOfficeNumberByAreaInfo(Integer area, Integer timeType) {
         OfficeNumber officeNumberApproval = this.officeNumberDao.getOfficeNumberByAreaInfo(area, timeType, Integer.valueOf(1));
+        OfficeNumber officeNumberApproval2 = this.officeNumberDao.getOfficeNumberByAreaInfo(area, timeType, Integer.valueOf(2));
 
+        officeNumberApproval.setApplicationNumberNetwork(officeNumberApproval.getApplicationNumberNetwork()+officeNumberApproval2.getApplicationNumberNetwork());
+        officeNumberApproval.setApplicationNumberWindow(officeNumberApproval.getApplicationNumberWindow()+officeNumberApproval2.getApplicationNumberWindow());
+        officeNumberApproval.setAcceptNumber(officeNumberApproval.getAcceptNumber()+officeNumberApproval2.getAcceptNumber());
+        officeNumberApproval.setSerialNumber(officeNumberApproval.getSerialNumber()+officeNumberApproval2.getSerialNumber());
+        //
         OfficeNumber officeNumber = new OfficeNumber();
 
         Integer applicationNumberNetwork = Integer.valueOf(officeNumberApproval.getApplicationNumberNetwork().intValue());

nngkxxdp/src/main/resources/mapper/OfficeNumberDao.xml

@@ -6,6 +6,7 @@
         from office_number
         where area = #{area}
           and time_type = #{timeType}
+          and app_type = #{appType}
         order by id DESC LIMIT 0,1
     </select>
 </mapper>

nngkxxdp/src/main/resources/static/natj/enter_show(jingkai).html

@@ -542,9 +542,9 @@
                         <span>0</span>
                         <span>0</span>
                         <span>0</span>
+                        <span style="color:#87dfff;">3</span>
+                        <span style="color:#87dfff;">3</span>
                         <span style="color:#87dfff;">6</span>
-                        <span style="color:#87dfff;">8</span>
-                        <span style="color:#87dfff;">5</span>
                         <span>项</span>
                     </div>
                 </div>
@@ -554,45 +554,39 @@
                     </div>
                     <div class="detailCon">
                         <div class="detailConList">
+
                             <div class="oneList">
-                                <span>公共服务</span>
-                                <span id="service">65</span>
-                            </div>
-                            <div class="oneList">
-                                <span>许可</span>
-                                <span id="permit">154</span>
+                                <span>行政许可</span>
+                                <span >720</span>
                             </div>
                             <div class="oneList">
-                                <span>处罚</span>
-                                <span id="punish">299</span>
+                                <span>行政给付</span>
+                                <span >31</span>
                             </div>
                         </div>
                         <div class="detailConList">
                             <div class="twoList">
-                                <span>强制</span>
-                                <span id="force">2</span>
+                                <span>行政奖励</span>
+                                <span >30</span>
                             </div>
                             <div class="twoList">
-                                <span>征收</span>
-                                <span id="collection">101</span>
+                                <span>行政确认</span>
+                                <span >152</span>
                             </div>
                             <div class="twoList">
-                                <span>检查</span>
-                                <span id="inspect">1</span>
+                                <span>行政裁决</span>
+                                <span >13</span>
+                            </div>
+                            <div class="oneList">
+                                <span>公共服务</span>
+                                <span >65</span>
                             </div>
                         </div>
                         <div class="detailConList">
-                            <div class="thriList">
-                                <span>确认</span>
-                                <span id="confirm">14</span>
-                            </div>
-                            <div class="thriList">
-                                <span>裁决</span>
-                                <span id="adjudication">1</span>
-                            </div>
+
                             <div class="thriList">
                                 <span>其他</span>
-                                <span id="other">48</span>
+                                <span id="other">162</span>
                             </div>
                         </div>
                         <!-- <table border="0" cellspacing="0" cellpadding="0">

nngkxxdp/src/main/resources/static/natj/enter_show.html

@@ -430,27 +430,40 @@
 
             </div>
             <div class="Bottomtwo">
+<!--                todo-->
                 <div class="allInOne">
-                    <div class="title">一窗通办</div>
+                    <div class="title">四减情况</div>
                     <div class="allInOne-con">
                         <div class="allInOne-conT">
-                            <div><span style="color: #84b5ff;font-size: 20px;">申请数</span>
+                            <div><span style="color: #84b5ff;font-size: 20px;">即办占比</span>
                                 <i id="timer10" class="numChange"
-                                   style="color: #87dfff;font-size: 30px;font-weight: bold;">52400</i>
+                                   style="color: #87dfff;font-size: 30px;font-weight: bold;">
+                                    <span>48.11</span>
+                                    <span style="color: #87dfff;font-size: 20px;">%</span>
+                                </i>
                             </div>
-                            <div><span style="color: #84b5ff;font-size: 20px;">办件数</span>
+                            <div><span style="color: #84b5ff;font-size: 20px;">跑动次数</span>
                                 <i id="timer11" class="numChange"
-                                   style="color: #87dfff;font-size: 30px;font-weight: bold;">52387</i>
+                                   style="color: #87dfff;font-size: 30px;font-weight: bold;">
+                                    <span>0.03</span>
+                                    <span style="color: #87dfff;font-size: 20px;">次</span>
+                                </i>
                             </div>
                         </div>
                         <div class="allInOne-conB">
-                            <div><span style="color: #84b5ff;font-size: 20px; ">不予受理数</span>
+                            <div><span style="color: #84b5ff;font-size: 20px;">全程网办</span>
                                 <i id="timer12" class="numChange"
-                                   style="color: #87dfff;font-size: 30px;font-weight: bold;margin-left: -43px;">13</i>
+                                   style="color: #87dfff;font-size: 30px;font-weight: bold;">
+                                    <span>81.11</span>
+                                    <span style="color: #87dfff;font-size: 20px;">%</span>
+                                </i>
                             </div>
-                            <div><span style="color: #84b5ff;font-size: 20px;">办结数</span>
+                            <div><span style="color: #84b5ff;font-size: 20px;">承诺压缩比</span>
                                 <i id="timer13" class="numChange"
-                                   style="color: #87dfff;font-size: 30px;font-weight: bold;">52307</i>
+                                   style="color: #87dfff;font-size: 30px;font-weight: bold;">
+                                    <span>83.28</span>
+
+                                </i>
                             </div>
                         </div>
                     </div>
@@ -518,41 +531,111 @@
                         <span>0</span>
                         <span style="color:#87dfff;">1</span>
                         <span style="color:#87dfff;">3</span>
-                        <span style="color:#87dfff;">7</span>
-                        <span style="color:#87dfff;">9</span>
+                        <span style="color:#87dfff;">5</span>
+                        <span style="color:#87dfff;">5</span>
                         <span>项</span>
                     </div>
                 </div>
+<!--                <div class="line">-->
+<!--                    <div class="title">-->
+<!--                        一件事一次办-->
+<!--                    </div>-->
+<!--                    <div class="lineCon">-->
+<!--                        <img src="img/组%2083.png">-->
+<!--                        <div class="listCon">-->
+<!--                            <p style="color: #1585f7;font-size: 24px;">套餐数量</p>-->
+<!--                            <p><span id="timer16" class="numChange"-->
+<!--                                     style="color: #87dfff;font-size: 34px;">49</span><span-->
+<!--                                    style="color: #1585f7;margin-left: 8px;font-size: 19px;">件</span></p>-->
+<!--                        </div>-->
+<!--                        <div class="OneList" style="margin-top: 5px;">-->
+<!--                            <span style="margin-left:15px;color: #1585f7;font-size: 19px;">减环节</span>-->
+<!--                            <span id="timer17" class="numChange"-->
+<!--                                  style="color: #87dfff;font-size: 24px;">308</span>-->
+<!--                            <span style="color: #1585f7;font-size: 18px;">个</span>-->
+<!--                        </div>-->
+<!--                        <div class="TwoList" style="margin-top: 5px;">-->
+<!--                            <span style="margin-right:15px;color: #1585f7;font-size: 19px;">减跑动</span>-->
+<!--                            <span id="timer18" class="numChange"-->
+<!--                                  style="color: #87dfff;font-size: 24px;">151</span>-->
+<!--                            <span style="color: #1585f7;font-size: 18px;">次</span>-->
+<!--                        </div>-->
+<!--                        <div class="ThriList">-->
+<!--                            <span style="margin-right:15px;color: #1585f7;font-size: 19px;">减材料</span>-->
+<!--                            <span id="timer19" class="numChange"-->
+<!--                                  style="color: #87dfff;font-size: 24px;">89</span>-->
+<!--                            <span style="color: #1585f7;font-size: 18px;">件</span>-->
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                </div>-->
                 <div class="line">
                     <div class="title">
-                        一件事一次办
+                        南岸区事项明细
                     </div>
-                    <div class="lineCon">
-                        <img src="img/组%2083.png">
-                        <div class="listCon">
-                            <p style="color: #1585f7;font-size: 24px;">套餐数量</p>
-                            <p><span id="timer16" class="numChange"
-                                     style="color: #87dfff;font-size: 34px;">49</span><span
-                                    style="color: #1585f7;margin-left: 8px;font-size: 19px;">件</span></p>
-                        </div>
-                        <div class="OneList" style="margin-top: 5px;">
-                            <span style="margin-left:15px;color: #1585f7;font-size: 19px;">减环节</span>
-                            <span id="timer17" class="numChange"
-                                  style="color: #87dfff;font-size: 24px;">308</span>
-                            <span style="color: #1585f7;font-size: 18px;">个</span>
+                    <div class="detailCon">
+                        <div class="detailConList">
+
+                            <div class="oneList">
+                                <span>行政许可</span>
+                                <span id="permit">720</span>
+                            </div>
+                            <div class="oneList">
+                                <span>行政给付</span>
+                                <span id="punish">31</span>
+                            </div>
                         </div>
-                        <div class="TwoList" style="margin-top: 5px;">
-                            <span style="margin-right:15px;color: #1585f7;font-size: 19px;">减跑动</span>
-                            <span id="timer18" class="numChange"
-                                  style="color: #87dfff;font-size: 24px;">151</span>
-                            <span style="color: #1585f7;font-size: 18px;">次</span>
+                        <div class="detailConList">
+                            <div class="twoList">
+                                <span>行政奖励</span>
+                                <span id="force">30</span>
+                            </div>
+                            <div class="twoList">
+                                <span>行政确认</span>
+                                <span id="collection">152</span>
+                            </div>
+                            <div class="twoList">
+                                <span>行政裁决</span>
+                                <span id="inspect">13</span>
+                            </div>
+                            <div class="oneList">
+                                <span>公共服务</span>
+                                <span id="service">247</span>
+                            </div>
                         </div>
-                        <div class="ThriList">
-                            <span style="margin-right:15px;color: #1585f7;font-size: 19px;">减材料</span>
-                            <span id="timer19" class="numChange"
-                                  style="color: #87dfff;font-size: 24px;">89</span>
-                            <span style="color: #1585f7;font-size: 18px;">件</span>
+                        <div class="detailConList">
+
+                            <div class="thriList">
+                                <span>其他</span>
+                                <span id="other">162</span>
+                            </div>
                         </div>
+                        <!-- <table border="0" cellspacing="0" cellpadding="0">
+
+                                <tr>
+                                    <td>全部</td>
+                                    <td>627</td>
+                                    <td>许可</td>
+                                    <td>159</td>
+                                    <td>处罚</td>
+                                    <td>300</td>
+                                </tr>
+                                <tr>
+                                    <td>强制</td>
+                                    <td>2</td>
+                                    <td>征收</td>
+                                    <td>102</td>
+                                    <td>检查</td>
+                                    <td>1</td>
+                                </tr>
+                                <tr>
+                                    <td>确认</td>
+                                    <td>14</td>
+                                    <td>裁决</td>
+                                    <td>1</td>
+                                    <td>其他</td>
+                                    <td>48</td>
+                                </tr>
+                            </table> -->
                     </div>
                 </div>
             </div>

nngkxxdp/src/main/resources/static/natj/js/jingkai.js

@@ -92,7 +92,7 @@ function total(conutNumbers) {
 		}
 	}
 	coutent = coutent + "<span>项</span>"
-	$("#jingkai_service").html(coutent)
+	// $("#jingkai_service").html(coutent)
 }
 //加载渝快办
 function handlingInfo(processingList){

nngkxxdp/src/main/resources/static/natj/js/south.js

@@ -102,10 +102,10 @@ function loadDataSort(listRank, listMatterRank) {
 }
 //加载南岸区四窗同办
 function application(listWeb) {
-    $("#timer10").html(listWeb.applicationNumber);
-    $("#timer11").html(listWeb.acceptNumber);
-    $("#timer12").html(listWeb.rejectionNumber);
-    $("#timer13").html(listWeb.serialNumber);
+    // $("#timer10").html(listWeb.applicationNumber);
+    // $("#timer11").html(listWeb.acceptNumber);
+    // $("#timer12").html(listWeb.rejectionNumber);
+    // $("#timer13").html(listWeb.serialNumber);
 
 }
 //加载总数

nngkxxdp/src/main/resources/static/zwsjtjfx/index.html

@@ -1,4 +0,0 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>my-project</title><style>body{
-        margin:0;
-        padding:0
-      }</style><script defer="defer" src="/js/chunk-vendors.9c919608.js"></script><script defer="defer" src="/js/app.e064e7b5.js"></script><link href="/css/chunk-vendors.ab49d789.css" rel="stylesheet"><link href="/css/app.7db730bc.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but my-project doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>