用远程dev覆盖本地dev

xx-order/xx-order-server/src/main/resources/mapper/OrderAccountMapper.xml

@@ -50,7 +50,28 @@
         <if test="subdivide !=null and subdivide ==1">
             AND date( FROM_UNIXTIME( a.crt_time / 1000 ) ) = date( DATE_SUB( now( ), INTERVAL #{day} DAY ) )
         </if>
-
+    </select>
+    <select id="outStatisticalData" resultType="com.xxfc.platform.order.pojo.ReturnOrderAmount">
+        select oa.crt_time as time ,oupc.no,oupc.type,oa.account_detail as accountDetail ,oupc.realname,oupc.username,oa.account_type
+        from order_account oa
+        left join order_user_position_company oupc ON oa.order_id=oupc.id
+        WHERE oa.account_type!=101
+        <if test="startTime != null">
+            and oa.crt_time <![CDATA[>=]]>  #{startTime}
+        </if>
+        <if test="endTime != null">
+            and oa.crt_time <![CDATA[<=]]>  #{endTime}
+        </if>
+        <if test="queryCriteria.jurisdiction != null and queryCriteria.jurisdiction.size() !=0 ">
+            and oupc.company_id in
+            <foreach collection="queryCriteria.jurisdiction" index="index" item="companyId" open="(" separator="," close=")">
+                #{companyId}
+            </foreach>
+        </if>
+        <if test="queryCriteria.orderType != null">
+            and oupc.type = #{queryCriteria.orderType}
+        </if>
+        order by oa.crt_time DESC
     </select>
 
     <select id="selectOrderAccountByOrderTypeAndStartTimeAndEndTime"

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/UploadService.java

 package com.xxfc.platform.universal.service;
 
 
-import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.SystemConfig;
 import com.xxfc.platform.universal.constant.RedisKey;
 import com.xxfc.platform.universal.utils.ImgBase64Util;
@@ -166,7 +165,7 @@ public class    UploadService {
         //文件存放路径
         String filePath = videoUploadPath + realFileRelPath;
         //将文件写入指定位置
-        FileUtils.copyInputStreamToFile(file.getInputStream(), new File(filePath));
+       FileUtils.copyInputStreamToFile(file.getInputStream(), new File(filePath));
         realFileRelPath=xx_url+SystemConfig.VIDEO_URL+realFileRelPath;
         return realFileRelPath;
     }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -16,9 +16,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Created by ace on 2017/9/15.
@@ -154,8 +152,10 @@ public interface VehicleFeign {
 
 
     //cata
+
     /**
      * 查询当前车型拥有的标签
+     *
      * @param ids
      * @return
      */
@@ -167,6 +167,7 @@ public interface VehicleFeign {
 
     /**
      * 根据位置查询
+     *
      * @param branchCompanyFindDTO
      * @return
      */
@@ -179,11 +180,6 @@ public interface VehicleFeign {
     @RequestMapping(value = "/vehicleInfo/bookRecord/update", method = RequestMethod.POST)
     public ObjectRestResponse update(@RequestBody BookRecordUpdateLog bookRecordUpdateLog);
 
-    @GetMapping(value ="/branchCompany/getCompanyIds")
-    RestResponse<List<Integer>> getCompanyIds(@RequestParam(value = "dataZone")String dataZone ,@RequestParam(value = "dataCompany")String dataCompany);
-    @GetMapping(value = "/bookRecord/get")
-    public ObjectRestResponse<List<BookRecordUpdateLog>> get(@RequestParam(value = "bookRecordId")Long bookRecordId);
-
 
     /**
      * 车型日历价格
@@ -200,6 +196,12 @@ public interface VehicleFeign {
                                                                                                @RequestParam(value = "vehicleModelId") Integer vehicleModelId,
                                                                                                @RequestParam(value = "userId") Integer userId);
 
+    @GetMapping(value ="/branchCompany/getCompanyIds")
+    RestResponse<List<Integer>> getCompanyIds(@RequestParam(value = "dataZone")String dataZone ,@RequestParam(value = "dataCompany")String dataCompany);
+
+    @GetMapping(value = "/bookRecord/get")
+    public ObjectRestResponse<List<BookRecordUpdateLog>> get(@RequestParam(value = "bookRecordId")Long bookRecordId);
+
     @GetMapping("/branchCompany/company_info")
     Map<Integer, String> findCompanyMap();
     /**

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyBiz.java

@@ -277,7 +277,7 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
         //文件存放路径
         String filePath = baseUploadPath + realFileRelPath;
         //将文件写入指定位置
-  //      FileUtils.copyInputStreamToFile(file.getInputStream(), new File(filePath));
+        FileUtils.copyInputStreamToFile(file.getInputStream(), new File(filePath));
         return RestResponse.suc(realFileRelPath);
     }
 
@@ -405,7 +405,7 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
         return pageDataVO;
     }
     public  List<JSONObject> getList(){
-     return  mapper.getList();
+        return  mapper.getList();
     }
 
     public ObjectRestResponse branchCompans() {

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -129,7 +129,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         //文件存放路径
         String filePath = baseUploadPath + realFileRelPath;
         //将文件写入指定位置
- //       FileUtils.copyInputStreamToFile(file.getInputStream(), new File(filePath));
+        FileUtils.copyInputStreamToFile(file.getInputStream(), new File(filePath));
         return RestResponse.suc(realFileRelPath);
     }
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java

@@ -333,32 +333,32 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
     }
 
     public ObjectRestResponse addBookRecord(VehicleBookRecord vehicleBookRecord) {
-        if (vehicleBookRecord == null) {
-            return ObjectRestResponse.paramIsEmpty();
-        }
-        save(vehicleBookRecord);
-        if (vehicleBookRecord != null) {
-            //添加交还车记录
-            VehicleDepartureLog vehicleDepartureLog = new VehicleDepartureLog();
-            vehicleDepartureLog.setBookRecordId(vehicleBookRecord.getId());
-            vehicleDepartureLog.setArrivalBranchCompanyId(vehicleBookRecord.getRetCompany());
-            vehicleDepartureLog.setArrivalRemark("后台修改停靠分公司，车辆调度");
-            vehicleDepartureLog.setArrivalTime(new Date());
-            vehicleDepartureLog.setCheckMan(vehicleBookRecord.getBookUserName());
-            vehicleDepartureLog.setCheckManTel(vehicleBookRecord.getBookUserName());
-            vehicleDepartureLog.setCreateTime(new Date());
-            vehicleDepartureLog.setDepartureBranchCompanyId(vehicleBookRecord.getLiftCompany());
-            vehicleDepartureLog.setDepartureRemark("后台修改停靠分公司，车辆调度");
-            vehicleDepartureLog.setDepartureTime(new Date());
-            vehicleDepartureLog.setRecycleMan(vehicleBookRecord.getBookUserName());
-            vehicleDepartureLog.setRecycleManTel(vehicleBookRecord.getBookUserName());
-            vehicleDepartureLog.setState(1);
-            vehicleDepartureLog.setVehicleId(vehicleBookRecord.getVehicleId());
-            vehicleDepartureLog.setUse("调度");
-            vehicleDepartureLog.setUser(vehicleBookRecord.getBookUserName());
-            vehicleDepartureLog.setUserTel(vehicleBookRecord.getBookUserName());
-            vehicleActiveService.save(vehicleDepartureLog);
-        }
+            if (vehicleBookRecord == null) {
+                return ObjectRestResponse.paramIsEmpty();
+            }
+            save(vehicleBookRecord);
+            if (vehicleBookRecord != null) {
+                //添加交还车记录
+                VehicleDepartureLog vehicleDepartureLog = new VehicleDepartureLog();
+                vehicleDepartureLog.setBookRecordId(vehicleBookRecord.getId());
+                vehicleDepartureLog.setArrivalBranchCompanyId(vehicleBookRecord.getRetCompany());
+                vehicleDepartureLog.setArrivalRemark("后台修改停靠分公司，车辆调度");
+                vehicleDepartureLog.setArrivalTime(new Date());
+                vehicleDepartureLog.setCheckMan(vehicleBookRecord.getBookUserName());
+                vehicleDepartureLog.setCheckManTel(vehicleBookRecord.getBookUserName());
+                vehicleDepartureLog.setCreateTime(new Date());
+                vehicleDepartureLog.setDepartureBranchCompanyId(vehicleBookRecord.getLiftCompany());
+                vehicleDepartureLog.setDepartureRemark("后台修改停靠分公司，车辆调度");
+                vehicleDepartureLog.setDepartureTime(new Date());
+                vehicleDepartureLog.setRecycleMan(vehicleBookRecord.getBookUserName());
+                vehicleDepartureLog.setRecycleManTel(vehicleBookRecord.getBookUserName());
+                vehicleDepartureLog.setState(1);
+                vehicleDepartureLog.setVehicleId(vehicleBookRecord.getVehicleId());
+                vehicleDepartureLog.setUse("调度");
+                vehicleDepartureLog.setUser(vehicleBookRecord.getBookUserName());
+                vehicleDepartureLog.setUserTel(vehicleBookRecord.getBookUserName());
+                vehicleActiveService.save(vehicleDepartureLog);
+            }
 
         return ObjectRestResponse.succ();
     }

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleDepartureLogMapper.xml

@@ -38,7 +38,7 @@
     </select>
     <select id="selectAllDepartureLog" resultType="java.lang.Integer" parameterType="Map">
         SELECT
-        count(*)
+            count(*)
         FROM
         vehicle_departure_log v1
         LEFT JOIN vehicle_book_record v2 on v1.book_record_id = v2.id