修改首页展示

liujun001
1 parent 87a4f724
Showing 7 changed files with 86 additions and 32 deletions
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMapper.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderMapper.xml
trash-unit/src/main/java/com/trash/enterprise/domain/TransportationEnterprise.java
trash-unit/src/main/java/com/trash/enterprise/mapper/TransportationEnterpriseMapper.java
 package com.trash.garbage.controller;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
 import com.github.pagehelper.PageHelper;
 import com.trash.common.annotation.Log;
 import com.trash.common.config.trashConfig;
 import com.trash.common.core.domain.AjaxResult;
+import com.trash.common.core.domain.entity.SysUser;
+import com.trash.common.core.domain.model.LoginUser;
 import com.trash.common.core.page.PageDomain;
 import com.trash.common.core.page.TableSupport;
 import com.trash.common.enums.BusinessType;
+import com.trash.common.utils.ServletUtils;
 import com.trash.common.utils.StringUtils;
 import com.trash.common.utils.file.FileUploadUtils;
 import com.trash.common.utils.poi.ExcelUtil;
 import com.trash.common.utils.sql.SqlUtil;
 import com.trash.enterprise.domain.TransportationEnterprise;
 import com.trash.framework.config.ServerConfig;
+import com.trash.framework.web.service.TokenService;
 import com.trash.garbage.custom.BizException;
 import com.trash.garbage.global.Result;
 import com.trash.garbage.global.ResultCode;
 import com.trash.garbage.pojo.domain.GarOrder;
-import com.trash.garbage.pojo.dto.AskTransportDto;
-import com.trash.garbage.pojo.dto.DispatchDto;
-import com.trash.garbage.pojo.dto.DisposalDispatchDto;
-import com.trash.garbage.pojo.dto.EvaluateDto;
-import com.trash.garbage.pojo.dto.OrderDto;
-import com.trash.garbage.pojo.dto.OrderUpdateDto;
-import com.trash.garbage.pojo.dto.OrderWebDto;
-import com.trash.garbage.pojo.dto.UploadDto;
+import com.trash.garbage.pojo.dto.*;
 import com.trash.garbage.pojo.vo.GarOrderMatchAskVo;
 import com.trash.garbage.pojo.vo.OrderDetailTransportVo;
 import com.trash.garbage.pojo.vo.OrderDetailVo;
 import com.trash.garbage.pojo.vo.ScanDriverDetailVo;
 import com.trash.garbage.service.GarOrderService;
+import com.trash.garbage.service.GarUserService;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 /**
  * 订单控制
@@ -63,6 +55,12 @@ public class GarbageOrderController {
     private GarOrderService garOrderService;
     @Autowired
     private ServerConfig serverConfig;
+    @Autowired
+    private TokenService tokenService;
+    @Autowired
+    private GarUserService garUserService;
+
+    private final static Integer[] USER_TYP_SELF_COMPANY = {2, 3};
     @PostMapping("/add")
     @Log(title = "创建订单", businessType = BusinessType.INSERT)
@@ -217,6 +215,23 @@ public class GarbageOrderController {
     @GetMapping("/company")
     public Result<?> queryEnterpriseList(TransportationEnterprise dto) {
+        dto.setId(null);
+        if (ArrayUtils.contains(USER_TYP_SELF_COMPANY, dto.getUserTypeValue())) {
+            LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+            if (Objects.nonNull(loginUser)) {
+                SysUser user = loginUser.getUser();
+                if (Objects.nonNull(user)) {
+                    if (Objects.equals(dto.getUserTypeValue(), 2)) {
+                        Long id = garOrderService.queryCarIdOfDriver(user.getPhonenumber());
+                        dto.setId(id);
+                    } else if (Objects.equals(dto.getUserTypeValue(), 3)) {
+                        dto.setServicePhone(user.getPhonenumber());
+                    }
+                }
+            }
+        }
+
+
         return Result.OK(garOrderService.queryEnterpriseList(dto));
     }
@@ -226,7 +241,7 @@ public class GarbageOrderController {
     }
     @GetMapping("/queryBadgeByType/{type}")
-    public Result<?> queryBadgeByType(@PathVariable("type")Integer type) {
+    public Result<?> queryBadgeByType(@PathVariable("type") Integer type) {
         return Result.OK(garOrderService.queryBadgeByType(type));
     }
@@ -37,6 +37,8 @@ public interface GarOrderMapper extends BaseMapper&lt;GarOrder&gt; {
     Integer queryDriverOrderListByTelWithTypeCount(@Param("garUserTel") String garUserTel, @Param("type") Integer type, @Param("cancelFlag") Integer cancelFlag);
     Integer queryDisposalOrderListByTelWithTypeCount(@Param("garUserTel") String garUserTel, @Param("type") Integer type, @Param("cancelFlag") Integer value);
+
+    Long queryCompanyIdByPhone(@Param("phone")String phone);
 }
@@ -102,4 +102,6 @@ public interface GarOrderService extends IService&lt;GarOrder&gt; {
     void updateTimeOutOrderStatus(List<GarOrder> timeOutList);
     MyBargeVo queryBadgeByType(Integer type);
+
+    Long queryCarIdOfDriver(String  phone);
 }
@@ -1118,6 +1118,13 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         return vo;
     }
+    @Override
+    public Long queryCarIdOfDriver(String  phone) {
+        return  baseMapper.queryCompanyIdByPhone(phone);
+    }
+
+
+
     private void handleCleanNumber(TransportationEnterpriseVo vo, List<GarOrder> orderList) {
         Long cleanNumber = 0L;
         for (GarOrder order : orderList) {
@@ -254,4 +254,8 @@
         </where>
         order by `disposal`.gar_create_time desc
     </select>
+
+    <select id="queryCompanyIdByPhone" parameterType="java.lang.String" resultType="java.lang.Long">
+        select company_id from driver d where phoneNo=#{phone}
+    </select>
 </mapper>
 package com.trash.enterprise.domain;
-import java.math.BigDecimal;
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.trash.common.annotation.Excel;
 import com.trash.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+import java.util.Date;
 /**
  * 运输企业管理对象 transportation_enterprise
@@ -137,6 +138,12 @@ public class TransportationEnterprise extends BaseEntity
      * 公司logo，公司头像
      */
     private String companyLogo;
+    /***
+     * 1是用户，2是清运车辆驾驶员，3是企业负责人，4是处置场所负责人
+     */
+    private Integer userTypeValue;
+
+    private String userType;
     public String getCompanyLogo() {
@@ -425,6 +432,22 @@ public class TransportationEnterprise extends BaseEntity
         return qrCode;
     }
+    public Integer getUserTypeValue() {
+        return userTypeValue;
+    }
+
+    public void setUserTypeValue(Integer userTypeValue) {
+        this.userTypeValue = userTypeValue;
+    }
+
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
 package com.trash.enterprise.mapper;
-import java.util.List;
 import com.trash.enterprise.domain.TransportationEnterprise;
+import java.util.List;
+
 /**
  * 运输企业管理Mapper接口
  *