Strona główna Odkrywaj Pomoc
Zaloguj się
wuye
/
MicroCommunity
Obserwuj 2
Polub 0
Forkuj 0
Pliki Problemy 0 Oczekujące zmiany 0 Wiki
Przeglądaj źródła

修改倒序查询时的bug

吴学文 7 lat temu
rodzic
e9258084e9
commit
81649b4cd2
9 zmienionych plików z 28 dodań i 16 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 0 4
      Api/src/main/java/com/java110/api/listener/fee/QueryFeeDetailListener.java
  2. 2 2
      WebService/src/main/resources/components/common/commonBottom.html
  3. 2 0
      WebService/src/main/resources/components/common/commonTop.html
  4. 4 4
      WebService/src/main/resources/components/property-fee/propertyFee.html
  5. 5 3
      WebService/src/main/resources/components/property-fee/propertyFee.js
  6. 9 0
      WebService/src/main/resources/static/css/bootstrap/bootstrap-datetimepicker.min.css
  7. 1 0
      WebService/src/main/resources/static/js/bootstrap/bootstrap-datetimepicker.min.js
  8. 2 1
      WebService/src/main/resources/views/propertyFeeFlow.html
  9. 3 2
      java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml

+ 0 - 4
Api/src/main/java/com/java110/api/listener/fee/QueryFeeDetailListener.java
Wyświetl plik 

@@ -9,15 +9,11 @@ import com.java110.common.util.BeanConvertUtil;
 
 import com.java110.common.util.DateUtil;
 
 import com.java110.core.annotation.Java110Listener;
 
 import com.java110.core.context.DataFlowContext;
 
-import com.java110.core.smo.fee.IFeeConfigInnerServiceSMO;
 
 import com.java110.core.smo.fee.IFeeDetailInnerServiceSMO;
 
-import com.java110.dto.FeeConfigDto;
 
 import com.java110.dto.FeeDetailDto;
 
-import com.java110.dto.RoomDto;
 
 import com.java110.event.service.api.ServiceDataFlowEvent;
 
 import com.java110.vo.api.ApiFeeDetailDataVo;
 
 import com.java110.vo.api.ApiFeeDetailVo;
 
-import com.java110.vo.api.ApiRoomDataVo;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.http.HttpMethod;
 
 import org.springframework.http.HttpStatus;

+ 2 - 2
WebService/src/main/resources/components/common/commonBottom.html
Wyświetl plik 

@@ -1,10 +1,10 @@
 
-<script src="/js/bootstrap/bootstrap.min.js" ></script>
 
 <script src="/js/common.js" ></script>
 
 
 
 <!-- Mainly scripts -->
 
 <script src="/js/popper.min.js"></script>
 
-<script src="/js/bootstrap/bootstrap.js"></script>
 
+<!--
 
+<script src="/js/bootstrap/bootstrap.js"></script>-->
 
 <!--
 
 <script src="/js/plugins/metisMenu/jquery.metisMenu.js"></script>
 
 -->

+ 2 - 0
WebService/src/main/resources/components/common/commonTop.html
Wyświetl plik 

@@ -13,4 +13,6 @@
 
 <script src="/js/core.js" ></script>
 
 <script src="/js/vc-constant.js" ></script>
 
 <script src="/js/vc-validate.js" ></script>
 
+<script src="/js/bootstrap/bootstrap.min.js" ></script>
 
+

+ 4 - 4
WebService/src/main/resources/components/property-fee/propertyFee.html
Wyświetl plik 

@@ -13,11 +13,11 @@
 
                 <div class="ibox-content">
 
 
                     <div class="row">
 
-                        <div class="col-sm-4 m-b-xs">
 
-                            <input size="16" type="text" placeholder="请选择开始时间"  value="" readonly class="start_time">
 
+                        <div class="col-sm-4 input-group">
 
+                            <input size="16" type="text" placeholder="请选择开始时间"  v-model="feeDetailInfo.startTime" readonly class="form-control form-control-sm start_time">
 
                         </div>
 
-                        <div class="col-sm-3 m-b-xs">
 
-                            <input size="16" type="text" placeholder="请选择结束时间"  value="" readonly class="end_time">
 
+                        <div class="col-sm-3 input-group">
 
+                            <input size="16" type="text" placeholder="请选择结束时间" v-model="feeDetailInfo.endTime" readonly class="form-control form-control-sm end_time">
 
                         </div>
 
 
                         <div class="col-sm-3">

+ 5 - 3
WebService/src/main/resources/components/property-fee/propertyFee.js
Wyświetl plik 

@@ -10,7 +10,9 @@
 
                 feeDetails:[],
 
                 total:0,
 
                 records:1,
 
-                feeId:''
 
+                feeId:'',
 
+                startTime:'',
 
+                endTime:''
 
             }
 
         },
 
         _initMethod:function(){
 
@@ -28,8 +30,8 @@
 
         },
 
         methods:{
 
             initDate:function(){
 
-                $(".start_time").datetimepicker({format: 'yyyy-mm-dd'});
 
-                $(".end_time").datetimepicker({format: 'yyyy-mm-dd'});
 
+                $(".start_time").datetimepicker({format: 'yyyy-mm-dd', language: 'zh-CN'});
 
+                $(".end_time").datetimepicker({format: 'yyyy-mm-dd', language: 'zh-CN'});
 
             },
 
             listFeeDetail:function(_page,_row){
 
                 var param = {

Plik diff jest za duży
+ 9 - 0
WebService/src/main/resources/static/css/bootstrap/bootstrap-datetimepicker.min.css


Plik diff jest za duży
+ 1 - 0
WebService/src/main/resources/static/js/bootstrap/bootstrap-datetimepicker.min.js


+ 2 - 1
WebService/src/main/resources/views/propertyFeeFlow.html
Wyświetl plik 

@@ -7,6 +7,7 @@
 
     <meta charset="UTF-8"/>
 
     <title>物业费 |java110</title>
 
     <vc:create name="commonTop"></vc:create>
 
+    <link rel="stylesheet" href="/css/bootstrap/bootstrap-datetimepicker.min.css"/>
 
 </head>
 
 <body>
 
 <vc:create name="bodyTop"></vc:create>
 
@@ -27,7 +28,7 @@
 
 
     </div>
 
 </div>
 
-
 
+<script src="/js/bootstrap/bootstrap-datetimepicker.min.js"></script>
 
 <vc:create name="commonBottom"></vc:create>
 
 </body>
 
 </html>

+ 3 - 2
java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml
Wyświetl plik 

@@ -130,11 +130,12 @@ where 1 =1
 
 </if> 
 <if test="feeId !=null and feeId != ''">
 
    and t.fee_id= #{feeId}
 
-</if> 
+</if>
 
+   order by t.create_time desc
 
 <if test="page != -1 and page != null ">
 
    limit #{page}, #{row}
 
 </if>
 
-        order by t.create_time desc
 
+
 
 
     </select>