粮商列表

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

@@ -118,5 +118,15 @@ public class IdentityAuthenticationInfoController {
         return iIdentityAuthenticationInfoService.setDefault(identityAuthenticationInfo);
     }
 
+    /**
+     * 粮商认证列表PC端
+     * @param identityAuthenticationInfo
+     * @return
+     */
+    @GetMapping("/selectIdentityAuthenticationInfoPc")
+    public Page<IdentityAuthenticationInfo> selectIdentityAuthenticationInfoPc(IdentityAuthenticationInfo identityAuthenticationInfo) {
+        return iIdentityAuthenticationInfoService.selectIdentityAuthenticationInfoPc(identityAuthenticationInfo);
+    }
+
 }
 

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

@@ -126,6 +126,10 @@ public class IdentityAuthenticationInfo extends BaseModel<IdentityAuthentication
      */
     @TableField(exist = false)
     private Integer flag;
+    /**
+     * PC端(传1)
+     */
+    private String pcFlag;
 
     /**
      * 查询类型
@@ -155,5 +159,7 @@ public class IdentityAuthenticationInfo extends BaseModel<IdentityAuthentication
         public static final String DELETE_FLAG = "delete_flag";
 
         public static final String DEFAULT_FLAG = "default_flag";
+
+        public static final String COMP_ID = "comp_id";
     }
 }

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

@@ -66,4 +66,11 @@ public interface IIdentityAuthenticationInfoService extends IService<IdentityAut
      * @param identityAuthenticationInfo
      */
     String setDefault(IdentityAuthenticationInfo identityAuthenticationInfo);
+    /**
+     *
+     * 粮商认证列表PC端
+     * @param identityAuthenticationInfo
+     */
+    Page<IdentityAuthenticationInfo> selectIdentityAuthenticationInfoPc(IdentityAuthenticationInfo identityAuthenticationInfo);
+
 }

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

@@ -160,7 +160,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                 .eq(WarehouseBaseInfo.QueryFiles.COMP_ID,AuthSecurityUtils.getCurrentUserInfo().getCompId())
                 .eq(WarehouseBaseInfo.QueryFiles.WAREHOUSE_NAME, contractManagementInfo.getContractNo())
                 .eq(WarehouseBaseInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
-        if(!StringUtils.isEmpty(warehouseBaseInfo.getId())){
+        if(warehouseBaseInfo!=null){
             warehouseBaseInfo.setPersonChargeKey(contractManagementInfo.getPersonChargeKey());
             warehouseBaseInfo.setPersonCharge(contractManagementInfo.getPersonCharge());
             warehouseBaseInfo.setPersonPhone(contractManagementInfo.getPersonPhone());
@@ -292,7 +292,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     TranTaskInfo tranTaskInfo = tranTaskInfoService.selectOne(new EntityWrapper<TranTaskInfo>()
                             .eq("contract_no",contractManagementInfo1.getContractNo())
                             .eq("delete_flag","0"));
-                    if (!StringUtils.isEmpty(tranTaskInfo.getId())) {
+                    if (tranTaskInfo!=null) {
                         //定义装车净重
                         Float loadNetWeight = 0.0f;
                         //定义卸车净重

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

@@ -173,7 +173,7 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
                 this.selectOne(new EntityWrapper<IdentityAuthenticationInfo>()
                         .eq(IdentityAuthenticationInfo.QueryFiles.COMMON_ID, commonId)
                         .eq(IdentityAuthenticationInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
-        if(!StringUtils.isEmpty(identityAuthenticationInfo.getId())){
+        if(identityAuthenticationInfo!=null){
             //身份审核中
             if ("1".equals(identityAuthenticationInfo.getAuthenticationStatusKey())){
                 throw new AppServiceException(ExceptionDefinition.IDENTITY_IS_BEING_AUDITED);
@@ -238,6 +238,22 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
         }
     }
 
+    /**
+     *
+     * 粮商认证列表PC端
+     * @param identityAuthenticationInfo
+     */
+    @Override
+    public Page<IdentityAuthenticationInfo> selectIdentityAuthenticationInfoPc(IdentityAuthenticationInfo identityAuthenticationInfo) {
+        Page<IdentityAuthenticationInfo> recommendedIdentityAuthenticationInfoPage = this.selectPage(identityAuthenticationInfo.getQueryPage(), new EntityWrapper<IdentityAuthenticationInfo>()
+                .eq(IdentityAuthenticationInfo.QueryFiles.COMP_ID,identityAuthenticationInfo.getCompId())
+                .eq(IdentityAuthenticationInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
+                .orderBy("update_date", false));
+        List<IdentityAuthenticationInfo> identityAuthenticationInfoList = recommendedIdentityAuthenticationInfoPage.getRecords();
+        recommendedIdentityAuthenticationInfoPage.setRecords(identityAuthenticationInfoList);
+        return recommendedIdentityAuthenticationInfoPage;
+    }
+
     public void DBConnection(){
         try{
             //加载驱动程序

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

@@ -303,7 +303,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         .eq("contract_no", warehouseInOutInfo.getContractNo())
                         .eq("car_no",warehouseInOutInfo.getCarNo())
                         .eq(TranCarInfo.QueryFiles.DELETE_FLAG,NumberConstant.CONSTANT0));
-                    if (!StringUtils.isEmpty(tranCarInfo.getId())){
+                    if (tranCarInfo!=null){
                         //将到货数据同步到派车表
                         tranCarInfo.setUnloadNetWeight(warehouseInOutInfo.getNetWeight());
                         tranCarInfo.setUnloadPoundImg(warehouseInOutInfo.getAddressUrl());