问题修改

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

@@ -25,6 +25,8 @@ public class BaseVehicleOutVoExecl{
     private String insideCode; // 内部编码
     @ExportEntityMap(CnName = "销售类型", EnName = "type")
     private String type;
+    @ExportEntityMap(CnName = "采购类型", EnName = "manPurOrderTypeValue")
+    private String manPurOrderTypeValue;
     @ExportEntityMap(CnName = "销售日期", EnName = "saleDate")
     private String saleDate;
     @ExportEntityMap(CnName = "成交价", EnName = "price")
@@ -61,6 +63,4 @@ public class BaseVehicleOutVoExecl{
     private String rebateMoneyTwo;
     @ExportEntityMap(CnName = "内部引荐人姓名", EnName = "innerName")
     private String innerName;
-    @ExportEntityMap(CnName = "采购类型", EnName = "manPurOrderTypeValue")
-    private String manPurOrderTypeValue;
 }

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

@@ -1,13 +1,12 @@
 package com.yxt.anrui.base.biz.basevehicleout;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut;
+import com.yxt.anrui.base.api.basedistributor.BaseDistributorExportVo;
-import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo;
+import com.yxt.anrui.base.api.basevehicleout.*;
-import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo;
-import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVoExecl;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,5 +39,5 @@ public interface BaseVehicleOutMapper extends BaseMapper<BaseVehicleOut> {
 
     BaseVehicleOutDetailsVo selByOrgSidAndVehSid(@Param("useOrgSid") String useOrgSid,@Param("vehSid") String vehSid);
 
-    BaseVehicleOutVoExecl selByExcel(String sid);
+    List<BaseVehicleOutVoExecl> selByExcel(@Param(Constants.WRAPPER) Wrapper<BaseVehicleOutVoExecl> qw);
 }

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

@@ -126,43 +126,46 @@
     </select>
 
     <select id="selByExcel" resultType="com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVoExecl">
-        SELECT so.name       AS createOrgName,
+        SELECT
-               bvo.vinNo,
+        so.name AS createOrgName,
-               bv.configName AS modelConfig,
+        bvo.vinNo,
-               bv.insideCode,
+        bv.configName AS modelConfig,
-               bvo.type,
+        bv.insideCode,
-               bvo.saleDate,
+        bvo.type,
-               bvo.price,
+        bvo.saleDate,
-               bvo.orgName,
+        bvo.price,
-               bvo.staffName,
+        bvo.orgName,
-               bvo.concatNo,
+        bvo.staffName,
-               CASE
+        bvo.concatNo,
-                       bvo.isTerminal
+        CASE
-                       WHEN 1
+        bvo.isTerminal
-                               THEN '是'
+        WHEN 1
-                       WHEN 0
+        THEN '是'
-                               THEN '否'
+        WHEN 0
-                       END   AS isTerminal,
+        THEN '否'
-               bvo.customerName,
+        END AS isTerminal,
-               bvo.mobile,
+        bvo.customerName,
-               bvo.trailerOrInstallName,
+        bvo.mobile,
-               bvo.trailerOrInstallCode,
+        bvo.trailerOrInstallName,
-               bvo.trailerOrInstallDealPrice,
+        bvo.trailerOrInstallCode,
-               bvo.giftsDescription,
+        bvo.trailerOrInstallDealPrice,
-               bvo.salesAllowance,
+        bvo.giftsDescription,
-               bvo.middleOne,
+        bvo.salesAllowance,
-               bvo.rebateMoneyOne,
+        bvo.middleOne,
-               bvo.middleTwo,
+        bvo.rebateMoneyOne,
-               bvo.rebateMoneyTwo,
+        bvo.middleTwo,
-               bvoa.innerName,
+        bvo.rebateMoneyTwo,
-               bvo.manPurOrderTypeValue
+        bvoa.innerName,
+        bvo.manPurOrderTypeValue
         FROM base_vehicle_out bvo
-                     LEFT JOIN base_vehicle bv
+        LEFT JOIN base_vehicle bv
-                ON bv.sid = bvo.vinSid
+        ON bv.sid = bvo.vinSid
-                     LEFT JOIN anrui_portal.sys_organization so
+        LEFT JOIN anrui_portal.sys_organization so
-                ON bvo.createOrgSid = so.sid
+        ON bvo.createOrgSid = so.sid
-                     LEFT JOIN base_vehicle_out_apply bvoa
+        LEFT JOIN base_vehicle_out_apply bvoa
-                ON bvo.mainSid = bvoa.sid
+        ON bvo.mainSid = bvoa.sid
-        WHERE bvo.sid = #{sid}
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 </mapper>

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

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basedistributor.BaseDistributorExportVo;
 import com.yxt.anrui.base.api.basemiddleman.BaseMiddleman;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basetrailer.BaseTrailer;
@@ -1122,11 +1123,61 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         return rb.success();
     }
 
-    public List<BaseVehicleOutVoExecl> listExcel(BaseVehicleOutQuery baseVehicleOutQuery) {
+    public List<BaseVehicleOutVoExecl> listExcel(BaseVehicleOutQuery params) {
-        List<BaseVehicleOutVoExecl> baseVehicleOutVoExecls = new ArrayList<>();
+        QueryWrapper<BaseVehicleOutVoExecl> qw = new QueryWrapper<>();
-        /*BaseVehicleOutVoExecl baseVehicleOutVoExecl = baseMapper.selByExcel(baseVehicleOutQuery);
+        if (params != null) {
-        baseVehicleOutVoExecl.setRankNo(id);
+            String orgSidPath = params.getOrgSidPath();
-        baseVehicleOutVoExecls.add(baseVehicleOutVoExecl);*/
+            SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
+            String orgLevelKey = data.getOrgLevelKey();
+            if ("2".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, 73);
+                qw.like("so.orgSidPath", orgSidPath);
+            } else if ("3".equals(orgLevelKey)) {
+                qw.eq("bvo.createOrgSid", params.getCreateOrgSid());
+            }
+            //车架号
+            if (StringUtils.isNotBlank(params.getVinNo())) {
+                qw.like("bvo.vinNo", params.getVinNo());
+            }
+            //销售类型
+            if (StringUtils.isNotBlank(params.getTypeKey())) {
+                qw.eq("bvo.typeKey", params.getTypeKey());
+            }
+            //销售日期开始-销售日期结束
+            qw.apply(StringUtils.isNotBlank(params.getSaleDateStart()), "date_format (bvo.saleDate,'%Y-%m-%d') >= date_format('" + params.getSaleDateStart() + "','%Y-%m-%d')").
+                    apply(StringUtils.isNotBlank(params.getSaleDateEnd()), "date_format (bvo.saleDate,'%Y-%m-%d') <= date_format('" + params.getSaleDateEnd() + "','%Y-%m-%d')"
+                    );
+            //合同编号
+            if (StringUtils.isNotBlank(params.getConcatNo())) {
+                qw.like("bvo.concatNo", params.getConcatNo());
+            }
+            //客户名称
+            if (StringUtils.isNotBlank(params.getCustomerName())) {
+                qw.like("bvo.customerName", params.getCustomerName());
+            }
+            //销售部门
+            if (StringUtils.isNotBlank(params.getOrgDeptSid())) {
+                qw.eq("bvo.orgSid", params.getOrgDeptSid());
+            }
+            //销售人员
+            if (StringUtils.isNotBlank(params.getStaffSid())) {
+                qw.eq("bvo.staffSid", params.getStaffSid());
+            }
+            //内部编码
+            if (StringUtils.isNotBlank(params.getInsideCode())) {
+                qw.like("bv.insideCode", params.getInsideCode());
+            }
+            //分公司
+            if (StringUtils.isNotBlank(params.getOrgSid())) {
+                qw.eq("bvo.createOrgSid", params.getOrgSid());
+            }
+        }
+        List<BaseVehicleOutVoExecl> baseVehicleOutVoExecls = baseMapper.selByExcel(qw);
+        int id = 1;
+        for (BaseVehicleOutVoExecl baseVehicleOutVoExecl : baseVehicleOutVoExecls) {
+            baseVehicleOutVoExecl.setRankNo(id);
+            id = id + 1;
+        }
         return baseVehicleOutVoExecls;
     }
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthVoExcel.java

@@ -27,6 +27,7 @@ package com.yxt.anrui.scm.api.scmvehinventorymonth;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.utils.ExportEntityMap;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
@@ -54,22 +55,20 @@ public class ScmVehInventorymonthVoExcel{
     private String sid;
     @ExportEntityMap(CnName = "序号", EnName = "rankNo")
     private Integer rankNo;
-    @ExportEntityMap(CnName = "编号", EnName = "billNo")
+    @ExportEntityMap(CnName = "车架号", EnName = "vinNo")
-    private String billNo; // 编号（yyyyMMdd）
+    private String vinNo; // 车架号
-    @ExportEntityMap(CnName = "生成日期", EnName = "createTime")
+    @ExportEntityMap(CnName = "盘库日期", EnName = "InventoryDate")
-    private String createTime;
+    @JsonProperty("InventoryDate")
-    @ExportEntityMap(CnName = "生成人", EnName = "createByName")
+    private String InventoryDate; // 盘库日期
-    private String createByName;
+    @ExportEntityMap(CnName = "存放地点", EnName = "location")
-    @ExportEntityMap(CnName = "应盘(台)", EnName = "totalNumber")
+    private String location; // 存放地点
-    private String totalNumber;
+    @ApiModelProperty("盘库人员")
-    @ExportEntityMap(CnName = "实盘(台)", EnName = "actualNumber")
+    @ExportEntityMap(CnName = "盘库人员", EnName = "InventoryName")
-    private String actualNumber;
+    @JsonProperty("InventoryName")
-    @ExportEntityMap(CnName = "未盘(台)", EnName = "surplusNumber")
+    private String InventoryName; // 盘库人员
-    private String surplusNumber;
+    @ExportEntityMap(CnName = "盘库结果", EnName = "InventoryState")
-    @ExportEntityMap(CnName = "盘盈(台)", EnName = "profitNumber")
+    @JsonProperty("InventoryState")
-    private String profitNumber;
+    private String InventoryState; // 盘库结果
-    @ExportEntityMap(CnName = "盘亏(台)", EnName = "lossNumber")
+    @ExportEntityMap(CnName = "备注", EnName = "remarks")
-    private String lossNumber;
+    private String remarks; // 备注
-    @ExportEntityMap(CnName = "盘损(台)", EnName = "damageNumber")
-    private String damageNumber;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.java

@@ -77,5 +77,5 @@ public interface ScmVehInventorymonthMapper extends BaseMapper<ScmVehInventorymo
     @Select("select * from scm_veh_inventorymonth order by id desc")
     List<AppScmVehInventorymonthVo> selectListAll();
 
-    ScmVehInventorymonthVoExcel selByExcel(String sid);
+    List<ScmVehInventorymonthVoExcel> selByExcel(String sid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml

@@ -61,11 +61,15 @@
     </select>
 
     <select id="selByExcel" resultType="com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonthVoExcel">
-        SELECT sid,
+        SELECT svi.`vinNo`,
-               billNo,
+               svi.`InventoryDate`,
-               createTime,
+               svi.`location`,
-               createByName
+               svi.`InventoryName`,
-        FROM scm_veh_inventorymonth
+               svi.`InventoryState`,
-        WHERE sid = #{sid}
+               svi.`remarks`
+        FROM scm_vehicle_inventory svi
+                     LEFT JOIN scm_veh_inventorymonth svim
+                ON svi.`mainSid` = svim.`sid`
+        WHERE svi.mainSid = #{sid}
     </select>
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java

@@ -412,21 +412,12 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
     }
 
     public List<ScmVehInventorymonthVoExcel> listExcel(String[] sids) {
-        List<ScmVehInventorymonthVoExcel> scmVehInventorymonthVoExcels = new ArrayList<>();
         int id = 1;
-        for (String sid : sids) {
+        String sid = sids[0];
-            ScmVehInventorymonthVoExcel scmVehInventorymonthVoExcel = baseMapper.selByExcel(sid);
+        List<ScmVehInventorymonthVoExcel> scmVehInventorymonthVoExcels = baseMapper.selByExcel(sid);
-            String mainSid = scmVehInventorymonthVoExcel.getSid();
+        for (ScmVehInventorymonthVoExcel scmVehInventorymonthVoExcel : scmVehInventorymonthVoExcels) {
-            AppVehInventorymonthVo vo = scmVehicleInventoryService.getMonthByMainSid(mainSid);
-            scmVehInventorymonthVoExcel.setSurplusNumber(String.valueOf(vo.getSurplusNumber()));
-            scmVehInventorymonthVoExcel.setTotalNumber(String.valueOf(vo.getTotalNumber()));
-            scmVehInventorymonthVoExcel.setLossNumber(String.valueOf(vo.getLossNumber()));
-            scmVehInventorymonthVoExcel.setDamageNumber(String.valueOf(vo.getDamageNumber()));
-            scmVehInventorymonthVoExcel.setProfitNumber(String.valueOf(vo.getProfitNumber()));
-            scmVehInventorymonthVoExcel.setActualNumber(String.valueOf(vo.getProfitNumber() + vo.getNormalNumber() + vo.getDamageNumber() + vo.getLossNumber()));
             scmVehInventorymonthVoExcel.setRankNo(id);
             id = id + 1;
-            scmVehInventorymonthVoExcels.add(scmVehInventorymonthVoExcel);
         }
         return scmVehInventorymonthVoExcels;
     }