修改

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

@@ -75,13 +75,13 @@ public class ExceptionDefinition {
             new ServiceExceptionDefinition(11016, "未认证粮商身份，请完善身份信息");
 
     public static  ServiceExceptionDefinition UNAUTHENTICATED_GRAIN_MERCHANT_DRIVER=
-            new ServiceExceptionDefinition(11016, "未认证司机身份，请完善身份信息");
+            new ServiceExceptionDefinition(11019, "未认证司机身份，请完善身份信息");
 
     public static  ServiceExceptionDefinition IDENTITY_IS_BEING_AUDITED =
             new ServiceExceptionDefinition(11017, "粮商身份正在审核中");
 
     public static  ServiceExceptionDefinition DRIVER_IS_BEING_AUDITED =
-            new ServiceExceptionDefinition(11017, "司机身份正在审核中");
+            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/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}