问题修改

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

@@ -1,5 +1,6 @@
 package com.yxt.anrui.base.api.basevehicleout;
 
+import com.yxt.anrui.base.api.basedistributor.BaseDistributorExportQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -55,6 +56,12 @@ public interface BaseVehicleOutFeign {
     @DeleteMapping("/delBySid")
     @ResponseBody
     public ResultBean delBySid(@RequestParam("sid") String sid);
+
+    @PostMapping("/exportExcel")
+    @ApiOperation(value = "车辆销售台账列表导出")
+    @ResponseBody
+    public void exportExcel(@RequestBody String[] sids);
+
 }
 
 

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

@@ -101,8 +101,6 @@ public class BaseVehicleOutVo implements Vo {
 
     @ApiModelProperty("上装/挂车名称")
     private String trailerOrInstallName;
-    @ApiModelProperty("上装/挂车")
-    private String trailerOrInstall;
     @ApiModelProperty("上装/挂车成交价")
     private String trailerOrInstallDealPrice;
     @ApiModelProperty("上装/挂车物料编码")

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

@@ -0,0 +1,66 @@
+package com.yxt.anrui.base.api.basevehicleout;
+
+import com.yxt.common.core.utils.ExportEntityMap;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/29 12:00
+ * @Description
+ */
+@Data
+public class BaseVehicleOutVoExecl{
+
+    @ExportEntityMap(CnName = "序号", EnName = "rankNo")
+    private Integer rankNo;
+    @ExportEntityMap(CnName = "分公司", EnName = "createOrgName")
+    private String createOrgName; // 分公司
+    @ExportEntityMap(CnName = "车架号", EnName = "vinNo")
+    private String vinNo;
+    @ExportEntityMap(CnName = "配置", EnName = "modelConfig")
+    private String modelConfig;
+    @ExportEntityMap(CnName = "内部编码", EnName = "insideCode")
+    private String insideCode; // 内部编码
+    @ExportEntityMap(CnName = "销售类型", EnName = "type")
+    private String type;
+    @ExportEntityMap(CnName = "销售日期", EnName = "saleDate")
+    private String saleDate;
+    @ExportEntityMap(CnName = "成交价", EnName = "price")
+    private String price;
+    @ExportEntityMap(CnName = "销售部门", EnName = "orgName")
+    private String orgName;
+    @ExportEntityMap(CnName = "销售专员", EnName = "staffName")
+    private String staffName;
+    @ExportEntityMap(CnName = "合同编号", EnName = "concatNo")
+    private String concatNo;
+    @ExportEntityMap(CnName = "是否为终端客户", EnName = "isTerminal")
+    private String isTerminal;
+    @ExportEntityMap(CnName = "客户名称", EnName = "customerName")
+    private String customerName;
+    @ExportEntityMap(CnName = "手机号码", EnName = "mobile")
+    private String mobile;
+    @ExportEntityMap(CnName = "上装/挂车名称", EnName = "trailerOrInstallName")
+    private String trailerOrInstallName;
+    @ExportEntityMap(CnName = "上装/挂车物料编码", EnName = "trailerOrInstallCode")
+    private String trailerOrInstallCode;
+    @ExportEntityMap(CnName = "上装/挂车成交价", EnName = "trailerOrInstallDealPrice")
+    private String trailerOrInstallDealPrice;
+    @ExportEntityMap(CnName = "赠品说明", EnName = "giftsDescription")
+    private String giftsDescription;
+    @ExportEntityMap(CnName = "销售折让", EnName = "salesAllowance")
+    private String salesAllowance;
+    @ExportEntityMap(CnName = "中介人1", EnName = "middleOne")
+    private String middleOne;
+    @ExportEntityMap(CnName = "返利金额1", EnName = "rebateMoneyOne")
+    private String rebateMoneyOne;
+    @ExportEntityMap(CnName = "中介人2", EnName = "middleTwo")
+    private String middleTwo;
+    @ExportEntityMap(CnName = "返利金额2", EnName = "rebateMoneyTwo")
+    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/basetrailer/BaseTrailerService.java

@@ -288,26 +288,17 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         StkInStock stkInStock = new StkInStock();
         //入库日期:FDate  (必填项)
         stkInStock.setFDate(DateUtil.formatDate(new Date()));
+        String vehSid = dto.getVehSid();
+        BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vehSid);
+        String purchaseSystemSid = baseVehicle.getPurchaseSystemSid();
+        SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.fetchBySid(purchaseSystemSid).getData();
         //采购部门:FPurchaseDeptId  (必填项)
-        String departmentSid = dto.getDepartmentSid();
-        SysOrganizationVo data = sysOrganizationFeign.fetchBySid(departmentSid).getData();
-        stkInStock.setFPurchaseDeptId(data.getOrgCode());
-        BasePurchaseSystemDetailsVo data1 = basePurchaseSystemService.fetchDetailsByDeptSid(departmentSid).getData();
-        ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid());
-        if (data1 != null) {
-            //采购组织:FPurchaseOrgId  (必填项)
-            stkInStock.setFPurchaseOrgId(data1.getOrgCode());
-            //分配目标组织:TOrgId  (必填项)
-            stkInStock.setTOrgId(data1.getOrgCode());
-        } else {
-            SysOrganizationVo vo = sysOrganizationVoResultBean.getData();
-            if (vo != null) {
-                //采购组织:FPurchaseOrgId  (必填项)
-                stkInStock.setFPurchaseOrgId(vo.getOrgCode());
-                //分配目标组织:TOrgId  (必填项)
-                stkInStock.setTOrgId(vo.getOrgCode());
-            }
-        }
+        stkInStock.setFPurchaseDeptId(sysOrganizationVoBM.getOrgCode());
+        BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(purchaseSystemSid).getData();
+        //采购组织:FPurchaseOrgId  (必填项)
+        stkInStock.setFPurchaseOrgId(basePurchaseSystemDetailsVo.getOrgCode());
+        //分配目标组织:TOrgId  (必填项)
+        stkInStock.setTOrgId(basePurchaseSystemDetailsVo.getOrgCode());
         //供应商:FSupplierId  (必填项)
         String trailerModelSid = baseTrailer.getTrailerModelSid();
         BaseTrailerModel baseTrailerModel = baseTrailerModelService.fetchBySid(trailerModelSid);
@@ -420,7 +411,7 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
     public ResultBean trailerOut(String sid) {
         ResultBean rb = ResultBean.fireFail();
         BaseTrailer baseTrailer = fetchBySid(sid);
-        if (baseTrailer.getStockStateKey().equals("0002")){
+        if (baseTrailer.getStockStateKey().equals("0002")) {
             return rb.setMsg("该挂车已出库");
         }
         String vehSid = baseTrailer.getVehSid();
@@ -496,7 +487,7 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         //保存车辆出库单子表
         baseVehicleOutService.save(baseVehicleOut);
         //推送金蝶挂车销售出库单
-        SalOutStock salOutStock = createSzOrGcSalOutStock(baseTrailer,baseVehicle,baseVehicleOut);
+        SalOutStock salOutStock = createSzOrGcSalOutStock(baseTrailer, baseVehicle, baseVehicleOut);
         finKingDeeFeign.draftSalOutStock(salOutStock);
         List<SalOutStock.FEntity> fEntity = salOutStock.getFEntity();
         for (SalOutStock.FEntity entity : fEntity) {

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo;
 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;
@@ -38,4 +39,6 @@ public interface BaseVehicleOutMapper extends BaseMapper<BaseVehicleOut> {
     List<BaseVehicleOut> fetchByMainSid(String xsckdSid);
 
     BaseVehicleOutDetailsVo selByOrgSidAndVehSid(@Param("useOrgSid") String useOrgSid,@Param("vehSid") String vehSid);
+
+    BaseVehicleOutVoExecl selByExcel(String sid);
 }

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

@@ -52,7 +52,11 @@
         bv.modelConfigSid,
         bvc.sid as vehModelConfigSid,
         bvc.guidedPrice,
-        bvoa.innerName
+        bvoa.innerName,
+        bvo.trailerOrInstallName,
+        bvo.trailerOrInstallCode,
+        bvo.trailerOrInstallDealPrice,
+        bvo.manPurOrderTypeValue
         from base_vehicle_out bvo
         left join base_vehicle bv on bv.sid = bvo.vinSid
         left join base_vehmodel_config bvc on bv.modelSid = bvc.modelSid and bv.modelConfigSid =
@@ -67,36 +71,36 @@
 
     <select id="details" resultType="com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo">
         select bo.vinSid,
-                bo.vinNo,
-                bo.type,
-                bo.typeKey,
-                bo.orgSid,
-                bo.orgName,
-                bo.staffName,
-                bo.staffSid,
-                bo.concatNo,
-                bo.price,
-                case bo.isTerminal when 1 then '是' when 0 then '否' end as isTerminal,
-                bo.customerName,
-                bo.customerSid,
-                bo.mobile,
-                bo.giftsDescription,
-                bo.salesAllowance,
-                bo.middleOne,
-                bo.middleTwo,
-                bo.rebateMoneyOne,
-                bo.rebateMoneyTwo,
-                bo.remarks,
-                bo.saleDate,
-                bo.createOrgSid,
-                ba.innerName,
-                ba.innerUserSid,
-                bo.trailerOrInstallName,
-                bo.trailerOrInstall,
-                bo.trailerOrInstallDealPrice,
-                bo.totalDealPrice
+               bo.vinNo,
+               bo.type,
+               bo.typeKey,
+               bo.orgSid,
+               bo.orgName,
+               bo.staffName,
+               bo.staffSid,
+               bo.concatNo,
+               bo.price,
+               case bo.isTerminal when 1 then '是' when 0 then '否' end as isTerminal,
+               bo.customerName,
+               bo.customerSid,
+               bo.mobile,
+               bo.giftsDescription,
+               bo.salesAllowance,
+               bo.middleOne,
+               bo.middleTwo,
+               bo.rebateMoneyOne,
+               bo.rebateMoneyTwo,
+               bo.remarks,
+               bo.saleDate,
+               bo.createOrgSid,
+               ba.innerName,
+               ba.innerUserSid,
+               bo.trailerOrInstallName,
+               bo.trailerOrInstall,
+               bo.trailerOrInstallDealPrice,
+               bo.totalDealPrice
         from base_vehicle_out bo
-        left join base_vehicle_out_apply ba on ba.sid = bo.mainSid
+                     left join base_vehicle_out_apply ba on ba.sid = bo.mainSid
         where bo.sid = #{sid}
     </select>
 
@@ -118,7 +122,47 @@
         SELECT *
         FROM base_vehicle_out
         WHERE createOrgSid = #{useOrgSid}
-          AND vinSid = #{vehSid}
-        limit 1
+          AND vinSid = #{vehSid} limit 1
+    </select>
+
+    <select id="selByExcel" resultType="com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVoExecl">
+        SELECT so.name       AS createOrgName,
+               bvo.vinNo,
+               bv.configName AS modelConfig,
+               bv.insideCode,
+               bvo.type,
+               bvo.saleDate,
+               bvo.price,
+               bvo.orgName,
+               bvo.staffName,
+               bvo.concatNo,
+               CASE
+                       bvo.isTerminal
+                       WHEN 1
+                               THEN '是'
+                       WHEN 0
+                               THEN '否'
+                       END   AS isTerminal,
+               bvo.customerName,
+               bvo.mobile,
+               bvo.trailerOrInstallName,
+               bvo.trailerOrInstallCode,
+               bvo.trailerOrInstallDealPrice,
+               bvo.giftsDescription,
+               bvo.salesAllowance,
+               bvo.middleOne,
+               bvo.rebateMoneyOne,
+               bvo.middleTwo,
+               bvo.rebateMoneyTwo,
+               bvoa.innerName,
+               bvo.manPurOrderTypeValue
+        FROM base_vehicle_out bvo
+                     LEFT JOIN base_vehicle bv
+                ON bv.sid = bvo.vinSid
+                     LEFT JOIN anrui_portal.sys_organization so
+                ON bvo.createOrgSid = so.sid
+                     LEFT JOIN base_vehicle_out_apply bvoa
+                ON bvo.mainSid = bvoa.sid
+        WHERE bvo.sid = #{sid}
     </select>
 </mapper>

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

@@ -1,6 +1,8 @@
 package com.yxt.anrui.base.biz.basevehicleout;
 
+import com.yxt.anrui.base.api.basedistributor.BaseDistributorExportVo;
 import com.yxt.anrui.base.api.basevehicleout.*;
+import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -9,6 +11,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.List;
 import java.util.Map;
 
@@ -24,6 +29,8 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
 
     @Autowired
     private BaseVehicleOutService baseVehicleOutService;
+    @Autowired
+    private HttpServletResponse response;
 
     @Override
     public ResultBean vehicleOut(BaseVehicleOutDto dto) {
@@ -63,4 +70,20 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
     public ResultBean delBySid(String sid) {
         return baseVehicleOutService.delBySid(sid);
     }
+
+    @Override
+    public void exportExcel(String[] sids) {
+        //得到所有要导出的数据
+        List<BaseVehicleOutVoExecl> baseVehicleOutVoExecls = baseVehicleOutService.listExcel(sids);
+        //定义导出的excel名字
+        String excelName = "车辆销售台账管理列表";
+        String fileNameURL = "";
+        try {
+            fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        //导出车辆销售台账列表
+        ExportExcelUtils.export(fileNameURL, baseVehicleOutVoExecls, BaseVehicleOutVoExecl.class, response);
+    }
 }

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

@@ -1121,4 +1121,16 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         baseVehicleService.updateVehicleStateAndSaleDate(baseVehicle.getSid());
         return rb.success();
     }
+
+    public List<BaseVehicleOutVoExecl> listExcel(String[] sids) {
+        List<BaseVehicleOutVoExecl> baseVehicleOutVoExecls = new ArrayList<>();
+        int id = 1;
+        for (String sid : sids) {
+            BaseVehicleOutVoExecl baseVehicleOutVoExecl = baseMapper.selByExcel(sid);
+            baseVehicleOutVoExecl.setRankNo(id);
+            id = id + 1;
+            baseVehicleOutVoExecls.add(baseVehicleOutVoExecl);
+        }
+        return baseVehicleOutVoExecls;
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.xml

@@ -14,8 +14,8 @@
     <select id="selectListAllVo" resultType="com.yxt.anrui.portal.api.sysfunction.SysFunctionVo">
         SELECT func.*, source.sourceName as sourceName
         FROM sys_function func
-                     left join sys_source_function sourceF on sourceF.functionSid = func.sid
-                     left join sys_source source on source.sid = sourceF.sourceSid
+        left join sys_source_function sourceF on sourceF.functionSid = func.sid
+        left join sys_source source on source.sid = sourceF.sourceSid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -30,8 +30,8 @@
     <select id="getChildrensForFunctionTree" resultType="com.yxt.anrui.portal.api.sysfunction.SysFunctionTreeVo">
         SELECT func.*, source.sourceName, sourceFunction.functionRootSid as functionRootSid
         FROM sys_function func
-                     left join sys_source_function sourceFunction on sourceFunction.functionSid = func.sid
-                     left join sys_source source on source.sid = sourceFunction.sourceSid
+        left join sys_source_function sourceFunction on sourceFunction.functionSid = func.sid
+        left join sys_source source on source.sid = sourceFunction.sourceSid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -61,10 +61,15 @@
           and ssf.sourceSid = #{sourceSid}
     </select>
     <select id="getButtonPermissions" resultType="com.yxt.anrui.portal.api.sysfunction.ButtonPermissionVo">
-        select sf.cId as buttonId from sys_function sf
-        where actionUrl=#{query.url} and phoneFunction=#{query.type} and sid not in(
-            SELECT srf.functionSid FROM sys_user_role sur
-            LEFT JOIN sys_role_function srf  ON sur.roleSid = srf.rolesid
-            WHERE sur.userSid=#{query.userSid})
+        SELECT sf.cId AS buttonId
+        FROM sys_function sf
+        WHERE actionUrl = #{query.url}
+          AND phoneFunction = #{query.type}
+          AND sid NOT IN
+              (SELECT IFNULL(srf.functionSid, "") functionSid
+               FROM sys_user_role sur
+                            LEFT JOIN sys_role_function srf
+                       ON sur.roleSid = srf.rolesid
+               WHERE sur.userSid = #{query.userSid})
     </select>
 </mapper>