更新

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

@@ -2,6 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.winsea.svc.base.base.entity.CommonCompany;
 import com.winsea.svc.base.base.entity.CommonStaff;
@@ -280,7 +281,11 @@ public class CommonUserController {
                         request.getServerName());
 
                 if (StringUtils.isEmpty(compId)) {
-                    compId = userService.findPhoneCompId(authUser.getMobilePhone());
+//                    compId = userService.findPhoneCompId(authUser.getMobilePhone());
+                    CommonUser commonUser = commonUserService.selectOne((new EntityWrapper()).eq("phone",authUser.getMobilePhone())
+                    .eq("delete_flag","0"));
+                    CommonStaff commonStaff = staffService.selectById(commonUser.getId());
+                    compId = commonStaff.getCompId();
                 }
             }
         }

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

@@ -172,7 +172,6 @@ public class AcquisitionInfoServiceImpl extends ServiceImpl<AcquisitionInfoMappe
             return acquisitionInfo1;
         }
         AcquisitionInfo acquisitionInfo1 = this.selectOne(new EntityWrapper<AcquisitionInfo>()
-                .eq("common_id",acquisitionInfo.getCommonId())
                 .eq("warehouse_name",acquisitionInfo.getWarehouseName()));
         return acquisitionInfo1;
     }

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

@@ -304,7 +304,16 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
         List<CommonCompany> commonCompanyList = new ArrayList<>();
         if(!CollectionUtils.isEmpty(staffs)){
             for(int i=0;i<staffs.size();i++) {
-                commonCompanyList.add(commonCompanyService.selectById(staffs.get(i).getCompId()));
+                CommonCompany commonCompany = commonCompanyService.selectById(staffs.get(i).getCompId());
+                if(commonCompany.getCompName().contains("中天昊元")){
+                    commonCompanyList.add(commonCompany);
+                }
+            }
+            for(int i=0;i<staffs.size();i++) {
+                CommonCompany commonCompany = commonCompanyService.selectById(staffs.get(i).getCompId());
+                if(!commonCompany.getCompName().contains("中天昊元")){
+                    commonCompanyList.add(commonCompany);
+                }
             }
         }
         return commonCompanyList;

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

@@ -71,7 +71,16 @@ public class OpenServiceInfoServiceImpl extends ServiceImpl<OpenServiceInfoMappe
             for (CommonStaff commonStaff:commonStaffList){
                 CommonCompany commonCompany=commonCompanyService.selectOne(new EntityWrapper<CommonCompany>()
                         .eq("comp_id",commonStaff.getCompId()));
-                temp.add(commonCompany);
+                if(commonCompany.getCompName().contains("中天昊元")){
+                    temp.add(commonCompany);
+                }
+            }
+            for (CommonStaff commonStaff:commonStaffList){
+                CommonCompany commonCompany=commonCompanyService.selectOne(new EntityWrapper<CommonCompany>()
+                        .eq("comp_id",commonStaff.getCompId()));
+                if(!commonCompany.getCompName().contains("中天昊元")){
+                    temp.add(commonCompany);
+                }
             }
         }
         return temp;

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

@@ -2365,8 +2365,8 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         PaymentView paymentView = new PaymentView();
         paymentView.setAmountIngPayableTotal(Double.valueOf(df.format(amountIngPayableTotal)));
         paymentView.setCarTotal(Double.valueOf(dataList.size()));
-        paymentView.setNetWeightTotal(Double.valueOf(df1.format(netWeightTotal)));
-        paymentView.setAverageUnitPrice(Double.valueOf(df.format(amountIngPayableTotal/netWeightTotal)));
+        paymentView.setNetWeightTotal(Double.valueOf(df1.format(netWeightTotal/1000)));
+        paymentView.setAverageUnitPrice(Double.valueOf(df.format(amountIngPayableTotal/netWeightTotal*1000)));
         paymentView.setWaterContentTotal(Double.valueOf(df.format(waterContentTotal/netWeightTotal)));
         paymentView.setImpurityTotal(Double.valueOf(df.format(impurityTotal/netWeightTotal)));
         paymentView.setMildewGrainTotal(Double.valueOf(df.format(mildewGrainTotal/netWeightTotal)));

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

@@ -1180,6 +1180,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         warehouseBaseInfoWrapper.eq("comp_id", compId).eq("delete_flag", "0");
         warehouseBaseInfoWrapper.andNew().eq("person_phone", personCharge).or()
                 .like("other_person_charge", personCharge);
+        warehouseBaseInfoWrapper.orderBy("warehouse_type,common_warehouse_no");
         List<WarehouseBaseInfo> warehouseBaseInfoList = this.selectList(warehouseBaseInfoWrapper);
         if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
             for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {