123

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/rest/VehicleController.java

@@ -91,7 +91,7 @@ public class VehicleController extends BaseController<VehicleBiz> {
 
             UserDTO userDTO = userFeign.userinfoByToken(userAuthConfig.getToken(request)).getData();
             if (userDTO != null) {
-                if (userDTO.getDataAll() == 2) {
+                    if (userDTO.getDataAll() == 2) {
                     List<Integer> companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
                     return RestResponse.data(baseBiz.getByPageNotAllData(vehiclePageQueryVo, companyList));
                 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/config/XxlJobConfig.java

@@ -13,7 +13,7 @@ import org.springframework.context.annotation.Configuration;
  * @author xuxueli 2017-04-28
  */
 @Slf4j
-@Configuration
+//@Configuration
 public class XxlJobConfig {
 
     @Value("${xxl.job.admin.addresses}")

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderTourVerificationController.java

 package com.xxfc.platform.order.rest;
 
-import cn.hutool.core.bean.BeanUtil;
+
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
-import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
-import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.rest.CommonBaseController;
-import com.xxfc.platform.order.biz.OrderTourDetailBiz;
 import com.xxfc.platform.order.biz.OrderTourVerificationBiz;
 import com.xxfc.platform.order.entity.BaseOrder;
-import com.xxfc.platform.order.entity.OrderTourDetail;
-import com.xxfc.platform.order.pojo.AddTourDTO;
-import com.xxfc.platform.order.pojo.order.TourBO;
-import com.xxfc.platform.order.pojo.price.TourPriceVO;
-import com.xxfc.platform.order.service.OrderTourService;
-import com.xxfc.platform.tour.feign.TourFeign;
 import com.xxfc.platform.tour.vo.TourGoodOrderFindVo;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
-import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
@@ -39,12 +28,13 @@ public class OrderTourVerificationController extends CommonBaseController {
     @Autowired
     protected UserAuthConfig userAuthConfig;
 
+    @Autowired
+    VehicleFeign vehicleFeign;
+
     @Autowired
     UserFeign userFeign;
 
-    public AppUserDTO getUserInfo(){
-        return  userFeign.userDetailByToken(userAuthConfig.getToken(request)).getData();
-    }
+    public UserDTO getUserInfo(){ return   userFeign.userinfoByToken(userAuthConfig.getToken(request)).getData();}
 
     @RequestMapping(value = "/verification/orderlist",method = RequestMethod.GET)
     @ApiOperation(value = "旅游核销订单列表")
@@ -73,7 +63,7 @@ public class OrderTourVerificationController extends CommonBaseController {
 
     @RequestMapping(value = "/verification/list",method = RequestMethod.GET)
     @ApiOperation(value = "旅游核销订单列表")
-    public ObjectRestResponse list(TourGoodOrderFindVo tourGoodOrderFindVo){
+    public ObjectRestResponse list(@RequestBody TourGoodOrderFindVo tourGoodOrderFindVo) {
         return verificationBiz.getVerifications(tourGoodOrderFindVo);
     }
 
@@ -81,4 +71,6 @@ public class OrderTourVerificationController extends CommonBaseController {
 
 
 
+
+
 }
\ No newline at end of file

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/feign/TourFeign.java

 package com.xxfc.platform.tour.feign;
 
 
-import com.github.wxiaoqi.security.common.annotation.BeanValid;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.tour.dto.TourSpePriceDTO;
@@ -13,7 +12,6 @@ import com.xxfc.platform.tour.vo.TourGoodOrderVo;
 import com.xxfc.platform.tour.vo.TourSpePriceVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
 import java.util.Map;
 
@@ -79,6 +77,6 @@ public interface TourFeign {
      * @param tourGoodOrderFindVo
      * @return
      */
-    @GetMapping("/orders")
-    ObjectRestResponse<PageDataVO<TourGoodOrderVo>> findTourGoodOrders(@BeanValid  TourGoodOrderFindVo tourGoodOrderFindVo);
+    @GetMapping("/tourGood/verfication/orders")
+    ObjectRestResponse<PageDataVO<TourGoodOrderVo>> findTourGoodOrders(@RequestBody  TourGoodOrderFindVo tourGoodOrderFindVo);
 }

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/vo/TourGoodOrderFindVo.java

 package com.xxfc.platform.tour.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.github.wxiaoqi.security.common.vo.PageParam;
 import lombok.Data;
-
 import javax.validation.constraints.NotNull;
 import java.util.Date;
 
@@ -32,6 +32,7 @@ public class TourGoodOrderFindVo extends PageParam {
      *出发时间
      */
     @NotNull(message = "出发时间不断能空")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date trvaelTime;
 
     private String travelDate;

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourGoodVerificationController.java

 package com.xxfc.platform.tour.rest;
 
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
-import com.github.wxiaoqi.security.common.annotation.BeanValid;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
@@ -23,7 +22,7 @@ public class TourGoodVerificationController extends BaseController<TourGoodVerif
      */
     @ApiOperation("订单列表的查询")
     @GetMapping("/orders")
-    public ObjectRestResponse<PageDataVO<TourGoodOrderVo>> findTourGoodOrders(@BeanValid TourGoodOrderFindVo tourGoodOrderFindVo){
+    public ObjectRestResponse<PageDataVO<TourGoodOrderVo>> findTourGoodOrders(@RequestBody TourGoodOrderFindVo tourGoodOrderFindVo){
         PageDataVO<TourGoodOrderVo> tourGoodOrderPageDataVo = getBaseBiz().findTourGoodOrdersPage(tourGoodOrderFindVo);
         return ObjectRestResponse.succ(tourGoodOrderPageDataVo);
     }

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

@@ -44,4 +44,8 @@ public interface VehicleFeign {
 
     @RequestMapping(value = "/book/4employee/prove/{bookRecordId}", method = RequestMethod.PUT)
     public RestResponse<Integer> proveVehicleBooking(@PathVariable Long bookRecordId);
+
+    //获取分公司列表
+    @GetMapping("/branchCompany/list")
+    public List<Integer> companyList(@RequestParam(value = "dataZone") String dataZone,@RequestParam(value = "dataCompany")String dataCompany);
 }

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

@@ -248,4 +248,21 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
         return RestResponse.suc();
     }
 
+    public List<BranchCompany> getListByUser(UserDTO userDTO){
+        if(userDTO != null && DATA_ALL_FALSE.equals(userDTO.getDataAll())) {
+            Example example = new Example(BranchCompany.class);
+            Example.Criteria criteria = example.createCriteria();
+            if (StringUtils.isNotBlank(userDTO.getDataZone())) {
+                criteria.andIn(COMPANY_ZONE_ID, userDTO.dataZone2List());
+            }
+            if (StringUtils.isNotBlank(userDTO.getDataCompany())) {
+                criteria.andIn(ID, userDTO.dataCompany2List());
+            }
+            example.setOrderByClause("`id` asc");
+            return mapper.selectByExample(example);
+        }
+        return  getAll();
+
+    }
+
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/BranchCompanyController.java

@@ -127,5 +127,10 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> {
                                     HttpServletRequest request) {
         return baseBiz.importExcel(multipartfile,request);
     }
-
+    //获取分公司列表
+    @GetMapping("list")
+    public  RestResponse<List<BranchCompany>>  companyList() {
+        UserDTO userDTO = userFeign.userinfoByToken(userAuthConfig.getToken(request)).getData();
+        return RestResponse.data(baseBiz.getListByUser(userDTO));
+    }
 }