Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverViewInfoController.java

@@ -1,15 +1,12 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
-import com.aliyun.oss.ServiceException;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.DriverCarInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.DriverViewInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.IdentityAuthenticationInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseBaseInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.view.DistinguishView;
 import com.yh.saas.plugin.yiliangyiyun.exception.AppServiceException;
-import com.yh.saas.plugin.yiliangyiyun.service.IDriverCarInfoService;
+import com.yh.saas.plugin.yiliangyiyun.exception.ServiceException;
 import com.yh.saas.plugin.yiliangyiyun.service.IDriverViewInfoService;
 import com.yh.saas.plugin.yiliangyiyun.util.EntityAnalyse;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -149,6 +146,13 @@ public class DriverViewInfoController {
     public String modifyPhone(@RequestBody DriverViewInfo driverViewInfo) {
         return driverViewInfoService.modifyPhone(driverViewInfo);
     }
+    /**
+     * 根据用户id查看司机
+     */
+    @GetMapping("/getInfo")
+    public DriverViewInfo getInfo(@RequestParam String commonId) throws ServiceException {
+        return driverViewInfoService.getInfo(commonId);
+    }
 
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/DriverViewInfo.java

@@ -140,6 +140,8 @@ public class DriverViewInfo extends BaseModel<DriverViewInfo> {
 
         public static final String COMP_ID = "comp_id";
 
+        public static final String COMMON_ID = "common_id";
+
         public static final String DELETE_FLAG = "delete_flag";
 
         public static final String DISABLE_STATUS_FLAG ="disable_status_flag";

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/exception/ExceptionDefinition.java

@@ -74,9 +74,15 @@ public class ExceptionDefinition {
     public static  ServiceExceptionDefinition UNAUTHENTICATED_GRAIN_MERCHANT_IDENTITY=
             new ServiceExceptionDefinition(11016, "未认证粮商身份，请完善身份信息");
 
+    public static  ServiceExceptionDefinition UNAUTHENTICATED_GRAIN_MERCHANT_DRIVER=
+            new ServiceExceptionDefinition(11019, "未认证司机身份，请完善身份信息");
+
     public static  ServiceExceptionDefinition IDENTITY_IS_BEING_AUDITED =
             new ServiceExceptionDefinition(11017, "粮商身份正在审核中");
 
+    public static  ServiceExceptionDefinition DRIVER_IS_BEING_AUDITED =
+            new ServiceExceptionDefinition(11020, "司机身份正在审核中");
+
     public static  ServiceExceptionDefinition PHONE_NUMBER_ALREADY_EXISTS=
             new ServiceExceptionDefinition(11018, "手机号已存在，是否覆盖");
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IDriverViewInfoService.java

@@ -4,8 +4,8 @@ import com.yh.saas.plugin.yiliangyiyun.entity.DriverCarInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.DriverViewInfo;
 import com.baomidou.mybatisplus.service.IService;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.yh.saas.plugin.yiliangyiyun.entity.IdentityAuthenticationInfo;
 import com.yh.saas.plugin.yiliangyiyun.exception.AppServiceException;
+import com.yh.saas.plugin.yiliangyiyun.exception.ServiceException;
 
 import java.util.List;
 
@@ -87,6 +87,12 @@ public interface IDriverViewInfoService extends IService<DriverViewInfo> {
      */
     String modifyPhone(DriverViewInfo driverViewInfo);
 
+    /**
+     * 根据用户id查看司机
+     * @param
+     */
+    DriverViewInfo getInfo(String commonId) throws ServiceException;
+
 
 
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ContractManagementInfoServiceImpl.java

@@ -592,6 +592,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                         //已完货的粮款结算阶段
                         TranProcessInfo tranProcessInfo=tranProcessInfoService.selectOne(new EntityWrapper<TranProcessInfo>()
                                 .eq("end_flag","1")
+                                .eq("contract_no",contractManagementInfo1.getContractNo())
                                 .eq("receiving_status_flag","1"));
                         if (tranProcessInfo!=null){
                             //完成量等于完货净重

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/DriverViewInfoServiceImpl.java

@@ -6,10 +6,7 @@ import com.google.common.collect.Lists;
 import com.yh.saas.common.support.util.StringUtils;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
-import com.yh.saas.plugin.yiliangyiyun.exception.AppServiceException;
-import com.yh.saas.plugin.yiliangyiyun.exception.ExceptionDefinition;
-import com.yh.saas.plugin.yiliangyiyun.exception.YException;
-import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
+import com.yh.saas.plugin.yiliangyiyun.exception.*;
 import com.yh.saas.plugin.yiliangyiyun.mapper.DriverViewInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.ICommonUserService;
 import com.yh.saas.plugin.yiliangyiyun.service.IDriverCarInfoService;
@@ -502,4 +499,49 @@ public class DriverViewInfoServiceImpl extends ServiceImpl<DriverViewInfoMapper,
             e.printStackTrace();
         }
     }
+
+    /**
+     * 根据用户id查看司机
+     * @param
+     */
+    @Override
+    public DriverViewInfo getInfo(String commonId) throws ServiceException{
+        //判断司机是否存在
+        DriverViewInfo driverViewInfo =
+                this.selectOne(new EntityWrapper<DriverViewInfo>()
+                        .eq(DriverViewInfo.QueryFiles.COMMON_ID, commonId)
+                        .eq("cover", NumberConstant.CONSTANT0)
+                        .eq(DriverViewInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        if (driverViewInfo != null) {
+            //判断司机是否存在
+            DriverViewInfo driverViewInfo1 =
+                    this.selectOne(new EntityWrapper<DriverViewInfo>()
+                            .eq(DriverViewInfo.QueryFiles.COMMON_ID, commonId)
+                            .eq("authentication_status_key", "7")
+                            .eq("cover", NumberConstant.CONSTANT0)
+                            .eq(DriverViewInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+            //身份审核中
+            if (driverViewInfo1 == null) {
+                throw new AppServiceException(ExceptionDefinition.DRIVER_IS_BEING_AUDITED);
+            }
+            DriverViewInfo driverViewInfo2 =
+                    this.selectOne(new EntityWrapper<DriverViewInfo>()
+                            .eq(DriverViewInfo.QueryFiles.COMMON_ID, commonId)
+                            .eq("authentication_status_key", "7")
+                            .eq("cover", NumberConstant.CONSTANT0)
+                            .eq("default_flag", "1")
+                            .eq(DriverViewInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+            //有默认
+            if (driverViewInfo2 != null) {
+                return driverViewInfo2;
+            } else {
+                return driverViewInfo1;
+            }
+
+        }
+        //司机不存在
+        else {
+            throw new AppServiceException(ExceptionDefinition.UNAUTHENTICATED_GRAIN_MERCHANT_DRIVER);
+        }
+    }
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -1201,15 +1201,18 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         if(contractManagementInfo == null){
             InOutWarehouseTask inOutWarehouseTask = iInOutWarehouseTaskService.selectOne(
                     new EntityWrapper<InOutWarehouseTask>()
-                            .eq("in_out_task_no",warehouseInOutInfo.getContractNo())
+                            .eq("move_task_no",warehouseInOutInfo.getContractNo())
+                            .eq("in_out_flag","1")
                             .eq("delete_flag",0));
             contractManagementInfo = contractManagementInfoService.selectOne(
                     new EntityWrapper<ContractManagementInfo>()
-                            .eq("contract_no",inOutWarehouseTask.getContractNo())
+                            .eq("contract_no",inOutWarehouseTask.getWarehouseName())
                             .eq("delete_flag",0));
         }
         warehouseInOutInfo.setContractManagementInfo(contractManagementInfo);
-        CommonCompany commonCompany = commonCompanyService.selectById(contractManagementInfo.getCompId());
+        CommonCompany commonCompany = commonCompanyService.selectOne(new EntityWrapper<CommonCompany>()
+                .eq("comp_id", contractManagementInfo.getCompId())
+                .eq("delete_flag", "0"));
         warehouseInOutInfo.setCompanyName(commonCompany.getCompName());
         return warehouseInOutInfo;
     }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseInOutInfoMapper.xml

@@ -3,6 +3,8 @@
 <mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.WarehouseInOutInfoMapper">
     <!-- 获得流转记录总数 -->
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
+        SELECT COUNT(*) FROM
+        (
         SELECT
         COUNT(w.id)
         FROM warehouse_in_out_info w
@@ -31,6 +33,7 @@
         <if test="statusFlag != null and statusFlag != ''">
             AND w.status_flag = #{statusFlag}
         </if>
+        group by d.id )groups
     </select>
     <!-- 流转记录列表查询 -->
     <select id="getListByCondition" parameterType="Map"
@@ -100,6 +103,7 @@
         <if test="statusFlag != null and statusFlag != ''">
             AND w.status_flag = #{statusFlag}
         </if>
+        group by d.id
         ORDER BY w.update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}