Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVoExeclNew.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.base.api.basevehicleout;
 
 import com.yxt.common.core.utils.ExportEntityMap;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -61,4 +62,6 @@ public class BaseVehicleOutVoExeclNew {
     private String rebateMoneyTwo;
     @ExportEntityMap(CnName = "内部引荐人姓名", EnName = "innerName")
     private String innerName;
+    @ApiModelProperty("分公司sid")
+    private String createOrgSid;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml

@@ -221,7 +221,8 @@
         bvo.middleTwo,
         bvo.rebateMoneyTwo,
         bvoa.innerName,
-        bvo.manPurOrderTypeValue
+        bvo.manPurOrderTypeValue,
+        bvoa.createOrgSid
         FROM base_vehicle_out bvo
         LEFT JOIN base_vehicle_out_apply bvoa
         ON bvo.`mainSid` = bvoa.`sid`

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -1845,7 +1845,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
 
     public List<BaseVehicleOutVoExeclNew> listExcelNew(BaseVehicleOutQuery params) {
         QueryWrapper<BaseVehicleOutVoExeclNew> qw = new QueryWrapper<>();
-        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(params.getCreateOrgSid()).getData();
         if (params != null) {
             String orgSidPath = params.getOrgSidPath();
             SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
@@ -1897,6 +1896,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         int id = 1;
         for (BaseVehicleOutVoExeclNew baseVehicleOutVoExeclNew : baseVehicleOutVoExeclNews) {
             baseVehicleOutVoExeclNew.setRankNo(id);
+            String createOrgSid = baseVehicleOutVoExeclNew.getCreateOrgSid();
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
             baseVehicleOutVoExeclNew.setCreateOrgName(sysOrganizationVo.getName());
             id = id + 1;
         }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java

@@ -40,6 +40,8 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 
 /**
  * Project: anrui-base(销售出库单) <br/>
@@ -122,7 +124,8 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
         QueryWrapper<BaseVehicleOutApply> qw = createQueryWrapper(query);
         IPage<BaseVehicleOutApply> page = PagerUtil.queryToPage(pq);
         IPage<BaseVehicleOutApplyVoNew> pagging = baseMapper.selectPageVo(page, qw);
-        for (BaseVehicleOutApplyVoNew record : pagging.getRecords()) {
+        List<BaseVehicleOutApplyVoNew> records = pagging.getRecords();
+        for (BaseVehicleOutApplyVoNew record : records) {
             String createOrgSid = record.getCreateOrgSid();
             String createorgName = sysOrganizationFeign.fetchBySid(createOrgSid).getData().getName();
             record.setCreateOrgName(createorgName);
@@ -131,6 +134,7 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
                 record.setInsideCode("");
             }
         }
+        pagging.setTotal(records.size());
         PagerVo<BaseVehicleOutApplyVoNew> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }