From 34f587564c9a34515e7deda4dcd02eb748480e1f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 13 一月 2025 18:05:24 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java |  145 +++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 118 insertions(+), 27 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 29d38af..d17348e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -14,11 +14,10 @@
 import com.doumee.core.haikang.model.param.respose.*;
 import com.doumee.core.haikang.service.HKCarOpenService;
 import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.tms.model.request.TmsFacrotyCodeListRequest;
-import com.doumee.core.tms.model.request.TmsOrderNoFinishListRequest;
-import com.doumee.core.tms.model.request.TmsOutQtyAndVehicleQtyRequest;
-import com.doumee.core.tms.model.request.TmsSevenArrivalDetailsRequest;
-import com.doumee.core.tms.model.response.*;
+import com.doumee.service.business.third.model.request.TmsFacrotyCodeListRequest;
+import com.doumee.service.business.third.model.request.TmsOrderNoFinishListRequest;
+import com.doumee.service.business.third.model.request.TmsOutQtyAndVehicleQtyRequest;
+import com.doumee.service.business.third.model.request.TmsSevenArrivalDetailsRequest;
 import com.doumee.core.utils.Constants;
 import com.doumee.core.utils.DateUtil;
 import com.doumee.core.utils.Utils;
@@ -36,8 +35,10 @@
 import com.doumee.service.business.third.BoardService;
 import com.doumee.service.business.third.TmsService;
 import com.doumee.service.business.third.WmsService;
+import com.doumee.service.business.third.model.response.*;
 import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -488,7 +489,7 @@
         List<WaningEventDataListVO> list = new ArrayList<>();
         RuleEventSearchRequest request = new RuleEventSearchRequest();
         request.setPageNo(1);
-        request.setPageSize(10);
+        request.setPageSize(1000);
         request.setFiledOptions(new ArrayList<>());
         request.setSorts(new ArrayList<>());
         RuleEventFiledOptionsRequest file = new RuleEventFiledOptionsRequest();
@@ -498,7 +499,6 @@
         if(type == 1){
             file.setFieldValue("131588");//瀹夐槻鍛婅
         }else  if(type == 2){
-
             file.setFieldValue("131593");//浜哄憳鍛婅
         }
         request.getFiledOptions().add(file);
@@ -506,28 +506,36 @@
         sort.setSortField("happen_time");
         sort.setSortType("desc");
         request.getSorts().add(sort);
+        int total =0;
         BaseResponse<BaseListPageResponse< RuleEventSearchDataResponse>> result = HKService.ruleEventSearch(request);
         if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) && result.getData()!=null){
             List<RuleEventSearchDataResponse> rlist = result.getData().getList();
-            lastResult.setTotal(result.getData().getTotal());
             if(rlist!=null){
                 String privateIp =systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.EVENT_FILES_PRIVATE_DOMAIN).getCode();
                 String publicIp =systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.EVENT_FILES_PUBLIC_DOMAIN).getCode();
                 for(RuleEventSearchDataResponse r :rlist){
+                    try {
+                        if(DateUtil.getISO8601DateByStr(r.getHappen_time()).getTime() < Utils.Date.getStart(new Date()).getTime()){
+                            continue;
+                        }
+                    }catch (Exception e){
+                    }
+                    total ++;
                     WaningEventDataListVO data = new WaningEventDataListVO();
+                    data.setCreateDate(DateUtil.getPlusTime(DateUtil.getISO8601DateByStr(r.getHappen_time())));
                     data.setAddr(r.getSrc_name());
                     data.setImg(r.getImage_url());
                     if(data.getImg()!=null){
                         data.setImg(data.getImg().replace(privateIp,publicIp));
                     }
                     data.setTitle(r.getEvent_type_name());
-                    data.setCreateDate(DateUtil.getPlusTime(DateUtil.getISO8601DateByStr(r.getHappen_time())));
 //                data.setContent(r.get);
                     list.add(data);
                 }
             }
 
         }
+        lastResult.setTotal(total);
         lastResult.setList(list);
         return lastResult;
     }
@@ -1620,27 +1628,50 @@
                 energyDataVOList.add(data);
             }
         }else{
+            String lastYear = null;
+            int lastMonths = 0,curMonths =0;
+            String curYear =DateUtil.getFomartDate(new Date(),"yyyy");
             for (int i = 0; i < 12; i++) {
                 Date tempDate = DateUtil.increaseMonth(lastMonth,i);
+                String tt =DateUtil.getFomartDate(tempDate,"yyyy");
+                if(!StringUtils.equals(curYear,tt)){
+                   lastYear = tt;
+                   lastMonths = i+1;//鍘诲勾鐨勬湀浠芥暟
+                }
                 EnergyDataVO data = new EnergyDataVO();
                 data.setTimeData(DateUtil.getFomartDate(tempDate,"YYYY-MM"));
 //                data.setTimeData(DateUtil.getFomartDate(tempDate,(i+1)+"鏈�"));
                 data.setEnergy(new BigDecimal(0));
                 energyDataVOList.add(data);
             }
-            //濡傛灉鏄敤鐢垫暟鎹�
+            curMonths = 12 - lastMonths;//浠婂勾鐨勬湀浠芥暟
             EnergyTrendRequest param = new EnergyTrendRequest();
-            param.setDate(DateUtil.getFomartDate(new Date(),"yyyy"));//骞翠唤
             param.setMeterType(1);
             param.setNodeType(2);
             param.setNodeId("root000000");
             param.setPeriodType("year");
+            if(lastYear!=null){
+                //濡傛灉鏄敤鐢垫暟鎹�
+                param.setDate(lastYear);//鏌ヨ鍘诲勾骞翠唤
+                BaseResponse<EnergyTrendResponse> response = HKService.energyTrend(param);
+                if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null&& response.getData().getYvalues()!=null ){
+                    for (int i = 0; i < lastMonths; i++) { //0,11锛屽彇鍊�1-12
+                        if(response.getData().getYvalues().size()>0 &&response.getData().getYvalues().get(0).getValue().length>curMonths+i){
+                            //鍙栫浉搴旂殑鍙傛暟鍊�
+                            energyDataVOList.get(i).setEnergy(new BigDecimal(StringUtils.defaultString(response.getData().getYvalues().get(0).getValue()[curMonths+i],"0")));
+                        }
+                    }
+
+                }
+            }
+            //濡傛灉鏄敤鐢垫暟鎹�
+            param.setDate(curYear);//骞翠唤
             BaseResponse<EnergyTrendResponse> response = HKService.energyTrend(param);
             if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null&& response.getData().getYvalues()!=null ){
-                for (int i = 0; i < 12; i++) {
-                    if(response.getData().getYvalues().size()>0 &&response.getData().getYvalues().get(0).getValue().length>i){
+                for (int i = lastMonths; i < 12; i++) { //12 鍙栧�� 0
+                    if(response.getData().getYvalues().size()>0 &&response.getData().getYvalues().get(0).getValue().length>i-lastMonths){
                         //鍙栫浉搴旂殑鍙傛暟鍊�
-                        energyDataVOList.get(i).setEnergy(new BigDecimal(StringUtils.defaultString(response.getData().getYvalues().get(0).getValue()[i],"0")));
+                        energyDataVOList.get(i).setEnergy(new BigDecimal(StringUtils.defaultString(response.getData().getYvalues().get(0).getValue()[i-lastMonths],"0")));
                     }
                 }
 
@@ -2150,6 +2181,11 @@
                     if(t.getTotalNum().compareTo(new BigDecimal(0)) !=0){
                         t.setUseRate(t.getCurrentNum().divide(t.getTotalNum(),4,BigDecimal.ROUND_HALF_UP));
                     }
+                    if(Constants.UNIT_TYPE == 1) {
+                        //澶勭悊鍗曚綅鎴愨�滅鈥濓紝涓�绠�=5涓囨敮
+                        t.setCurrentNum(Constants.formatBigdecimal(t.getCurrentNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+                        t.setTotalNum(Constants.formatBigdecimal(t.getTotalNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+                    }
                 }
                 result.getDetailList().add(t);
                 result.setCurrentNum(result.getCurrentNum().add(t.getCurrentNum()));
@@ -2292,6 +2328,15 @@
         if(data.getCrrentRestCarNum()<=0){
             data.setCrrentRestCarNum(0);
         }
+        //澶勭悊鍗曚綅鎴愨�滅鈥濓紝涓�绠�=5涓囨敮
+        if(Constants.UNIT_TYPE == 1) {
+            data.setMaxAbility(Constants.formatBigdecimal(data.getMaxAbility()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setHoursAbility(Constants.formatBigdecimal(data.getHoursAbility()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setCrrentRestNum(Constants.formatBigdecimal(data.getCrrentRestNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setCurrentPlanNum(Constants.formatBigdecimal(data.getCurrentPlanNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setCrrentOutNum(Constants.formatBigdecimal(data.getCrrentOutNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setCurrentOrderNum(Constants.formatBigdecimal(data.getCurrentOrderNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+        }
     }
 
     private boolean notInList(String transportCode, List<String> planCodes) {
@@ -2312,7 +2357,10 @@
         TotalOutQtyNumVO  data = new TotalOutQtyNumVO();
         data.setCurrentInNum(new BigDecimal(0));
         data.setLastInNum(new BigDecimal(0));
+        data.setCurrentProvinceNum(new BigDecimal(0));
+        data.setCurrentOtherNum(new BigDecimal(0));
         data.setSameInNum(new BigDecimal(0));
+
         //---------鐪佸----------------
         data.setCurrentOutNum(new BigDecimal(0));
         data.setLastOutNum(new BigDecimal(0));
@@ -2352,6 +2400,8 @@
             List<TmsOutQtyAndVehicleQtyResponse> listSame=  tmsService.getOutQtyAndVehicleQty(param);//鍘诲勾鍚屾湡
             if(listSame!=null ){
                 for(TmsOutQtyAndVehicleQtyResponse model : listSame){
+                    model.setOutSideProvinceOutQty(Constants.formatBigdecimal(model.getOutSideProvinceOutT03Qty()).add(Constants.formatBigdecimal(model.getOutSideProvinceOutT01Qty())));//鐪佸绱
+                    model.setInSideProvinceOutQty(Constants.formatBigdecimal(model.getInSideProvinceOutT03Qty()).add(Constants.formatBigdecimal(model.getInSideProvinceOutT01Qty())));//鐪佸唴绱
                     data.setSameOutNum(data.getSameOutNum().add(Constants.formatBigdecimal(model.getOutSideProvinceOutQty())));
                     data.setSameInNum(data.getSameInNum().add(Constants.formatBigdecimal(model.getInSideProvinceOutQty())));
                 }
@@ -2362,9 +2412,13 @@
         List<TmsOutQtyAndVehicleQtyResponse> listCur =  tmsService.getOutQtyAndVehicleQty(param);//鏈懆鏈�
         if(listCur!=null ){
             for(TmsOutQtyAndVehicleQtyResponse model : listCur){
+                model.setOutSideProvinceOutQty(Constants.formatBigdecimal(model.getOutSideProvinceOutT03Qty()).add(Constants.formatBigdecimal(model.getOutSideProvinceOutT01Qty())));//鐪佸绱
+                model.setInSideProvinceOutQty(Constants.formatBigdecimal(model.getInSideProvinceOutT03Qty()).add(Constants.formatBigdecimal(model.getInSideProvinceOutT01Qty())));//鐪佸唴绱
                 data.setCurrentOutNum(data.getCurrentOutNum().add(Constants.formatBigdecimal(model.getOutSideProvinceOutQty())));
                 data.setCurrentInNum(data.getCurrentInNum().add(Constants.formatBigdecimal(model.getInSideProvinceOutQty())));
                 data.setTotalCarNum(data.getTotalCarNum()+Constants.formatIntegerNum(model.getVehicleQty()));//绱杞︽
+                data.setCurrentProvinceNum(data.getCurrentProvinceNum().add(model.getOutSideProvinceOutQty()).add(model.getInSideProvinceOutT01Qty()));//鐪佸唴鐪佸閿�鍞噺
+                data.setCurrentOtherNum(data.getCurrentOtherNum().add(model.getOutSideProvinceOutT03Qty()).add(model.getInSideProvinceOutT03Qty()));//鐪佸唴鐪佸鍏朵粬鍑哄簱閲�
             }
         }
         param.setDateEnd(DateUtil.getShortTime(lastEnd));
@@ -2372,6 +2426,8 @@
         List<TmsOutQtyAndVehicleQtyResponse> listLast =  tmsService.getOutQtyAndVehicleQty(param);//涓婂懆鏈�
         if(listCur!=null ){
             for(TmsOutQtyAndVehicleQtyResponse model : listLast){
+                model.setOutSideProvinceOutQty(Constants.formatBigdecimal(model.getOutSideProvinceOutT03Qty()).add(Constants.formatBigdecimal(model.getOutSideProvinceOutT01Qty())));//鐪佸绱
+                model.setInSideProvinceOutQty(Constants.formatBigdecimal(model.getInSideProvinceOutT03Qty()).add(Constants.formatBigdecimal(model.getInSideProvinceOutT01Qty())));//鐪佸唴绱
                 data.setLastOutNum(data.getLastOutNum().add(Constants.formatBigdecimal(model.getOutSideProvinceOutQty())));
                 data.setLastInNum(data.getLastInNum().add(Constants.formatBigdecimal(model.getInSideProvinceOutQty())));
             }
@@ -2379,6 +2435,18 @@
         if(type == 2){//鏈勾鐨�
             data.setSameOutNum(data.getLastOutNum());
             data.setSameInNum(data.getLastInNum());
+        }
+
+        //澶勭悊鍗曚綅鎴愨�滅鈥濓紝涓�绠�=5涓囨敮
+        if(Constants.UNIT_TYPE == 1) {
+            data.setCurrentInNum(Constants.formatBigdecimal(data.getCurrentInNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setCurrentOutNum(Constants.formatBigdecimal(data.getCurrentOutNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setCurrentOtherNum(Constants.formatBigdecimal(data.getCurrentOtherNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setCurrentProvinceNum(Constants.formatBigdecimal(data.getCurrentProvinceNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setLastInNum(Constants.formatBigdecimal(data.getLastInNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setLastOutNum(Constants.formatBigdecimal(data.getLastOutNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setSameInNum(Constants.formatBigdecimal(data.getSameInNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+            data.setSameOutNum(Constants.formatBigdecimal(data.getSameOutNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
         }
         return data;
     }
@@ -2397,14 +2465,20 @@
         List<TmsDistributionOfDeliveryLocResponse> response  = tmsService.getDistributionOfDeliveryLocations(param);//鏌ヨ鍑哄簱閲�
         if(response!=null &&response.size()>0){
             for(TmsDistributionOfDeliveryLocResponse model : response){
-                WholeProvinceMapVO tt = getFromProvinceResultList(model ,result);
-                if(tt == null){
-                    tt =new WholeProvinceMapVO();
-                    tt.setMonthNum( Constants.formatBigdecimal0Float(model.getMonthOutboundQuantity()));
-                    tt.setYearNum( Constants.formatBigdecimal0Float(model.getYearOutboundQuantity()));
-                    tt.setProvinceCode(model.getToProvinceCode());
-                    tt.setProvinceName(model.getToProvinceName());
-                    result.add(tt);
+                WholeProvinceMapVO t = getFromProvinceResultList(model ,result);
+                if(t == null){
+                    t =new WholeProvinceMapVO();
+                    t.setMonthNum( Constants.formatBigdecimal0Float(model.getMonthOutboundQuantity()));
+                    t.setYearNum( Constants.formatBigdecimal0Float(model.getYearOutboundQuantity()));
+
+                    if(Constants.UNIT_TYPE == 1) {
+                        //澶勭悊鍗曚綅鎴愨�滅鈥濓紝涓�绠�=5涓囨敮
+                        t.setMonthNum(Constants.formatBigdecimal(t.getMonthNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+                        t.setYearNum(Constants.formatBigdecimal(t.getYearNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+                    }
+                    t.setProvinceCode(model.getToProvinceCode());
+                    t.setProvinceName(model.getToProvinceName());
+                    result.add(t);
                 }
             }
         }
@@ -2513,6 +2587,7 @@
         WholeProvinceZXTVO result = new WholeProvinceZXTVO();
         result.setCurrentNum(new BigDecimal(0));
         result.setTotalNum(new BigDecimal(0));
+        result.setZtNum(new BigDecimal(0));
         result.setUseRate(new BigDecimal(0));
         result.setDetailList(new ArrayList<>());
         List<TmsFactoryParam> paramList =factoryList();
@@ -2522,41 +2597,52 @@
                 WholeProvinceZxtDetailVO t = new WholeProvinceZxtDetailVO();
                 t.setFactoryName(p.getName());
                 t.setCurrentNum(new BigDecimal(0));
+                t.setZaituNum(new BigDecimal(0));
                 t.setTotalNum(Constants.formatBigdecimal(p.getNum1()));//鎬诲簱瀛橀噺
                 getFromReportVehicleQtyList(p.getCode(),t,response);//澶勭悊鎻愭姤杩愬姏鍜屾�昏繍鍔涙暟鎹�
                 t.setUseRate(new BigDecimal(0));
-                if(t.getTotalNum().compareTo(new BigDecimal(0)) !=0){
-                    t.setUseRate(t.getCurrentNum().divide(t.getTotalNum(),4,BigDecimal.ROUND_HALF_UP));
+                if((t.getTotalNum().subtract(t.getZaituNum())).compareTo(new BigDecimal(0)) !=0){
+                    t.setUseRate(t.getCurrentNum().divide(t.getTotalNum().subtract(t.getZaituNum()),4,BigDecimal.ROUND_HALF_UP));
                 }
+                /*if(Constants.UNIT_TYPE == 1) {
+                    //澶勭悊鍗曚綅鎴愨�滅鈥濓紝涓�绠�=5涓囨敮
+                    t.setCurrentNum(Constants.formatBigdecimal(t.getCurrentNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+                    t.setTotalNum(Constants.formatBigdecimal(t.getTotalNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+                }*/
                 result.getDetailList().add(t);
                 result.setCurrentNum(result.getCurrentNum().add(t.getCurrentNum()));
                 result.setTotalNum(result.getTotalNum().add(t.getTotalNum()));
+                result.setZtNum(result.getZtNum().add(t.getZaituNum()));
             }
         }
-        if(result.getTotalNum().compareTo(new BigDecimal(0)) !=0){
-            result.setUseRate(result.getCurrentNum().divide(result.getTotalNum(),4,BigDecimal.ROUND_HALF_UP));
+        if((result.getTotalNum().subtract(result.getZtNum())).compareTo(new BigDecimal(0)) !=0){
+            result.setUseRate(result.getCurrentNum().divide(result.getTotalNum().subtract(result.getZtNum()),4,BigDecimal.ROUND_HALF_UP));
         }
         return result;
     }
     private void getFromReportVehicleQtyList(String code,WholeProvinceZxtDetailVO t, List<TmsTotalAndReportVehicleQtyResponse> responses) {
         BigDecimal current = new BigDecimal(0);
         BigDecimal total= new BigDecimal(0);
+        BigDecimal ztTotal= new BigDecimal(0);
         if(responses!=null && responses.size()>0){
             for(TmsTotalAndReportVehicleQtyResponse model: responses){
                 if(StringUtils.equals(model.getFactoryCode(),code)){
+                    ztTotal = ztTotal.add(Constants.formatBigdecimal(model.getInTransitQty()));
                     total = total.add(Constants.formatBigdecimal(model.getTotalQty()));
                     current = current.add(Constants.formatBigdecimal(model.getReportQty()));
                 }
             }
         }
         t.setCurrentNum(current);
+        t.setZaituNum(ztTotal);
         t.setTotalNum(total);
     }
     private BigDecimal getCurrentOutQryByList(List<TmsOutQtyAndVehicleQtyResponse> response) {
         BigDecimal r = new BigDecimal(0);
         if(response!=null && response.size()>0){
             for(TmsOutQtyAndVehicleQtyResponse model: response){
-                    r = r.add(Constants.formatBigdecimal(model.getTotalOutQty()));
+//                model.setTotalOutQty(Constants.formatBigdecimal(model.getTotalOutT03Qty()).add(Constants.formatBigdecimal(model.getTotalOutT01Qty())));
+                r = r.add(Constants.formatBigdecimal(model.getTotalOutQty()));
             }
         }
         return r ;
@@ -2586,6 +2672,11 @@
                 if(t.getTotalNum().compareTo(new BigDecimal(0)) !=0){
                     t.setUseRate(t.getCurrentNum().divide(t.getTotalNum(),4,BigDecimal.ROUND_HALF_UP));
                 }
+                if(Constants.UNIT_TYPE == 1){
+                    //澶勭悊鍗曚綅鎴愨�滅鈥濓紝涓�绠�=5涓囨敮
+                    t.setCurrentNum(Constants.formatBigdecimal(t.getCurrentNum()).divide(new BigDecimal(5),2,BigDecimal.ROUND_HALF_UP));
+                    t.setTotalNum(Constants.formatBigdecimal(t.getTotalNum()).divide(new BigDecimal(5),2,BigDecimal.ROUND_HALF_UP));
+                }
                 result.getDetailList().add(t);
                 result.setCurrentNum(result.getCurrentNum().add(t.getCurrentNum()));
                 result.setTotalNum(result.getTotalNum().add(t.getTotalNum()));

--
Gitblit v1.9.3