Browse Source

问题修改

master
God 2 years ago
parent
commit
f7c3b3065e
  1. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVoExecl.java
  2. 9
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java
  3. 77
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml
  4. 61
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
  5. 35
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthVoExcel.java
  6. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.java
  7. 16
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml
  8. 15
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java

4
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;
}

9
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.basevehicleout.BaseVehicleOutDetailsVo;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVoExecl;
import com.yxt.anrui.base.api.basedistributor.BaseDistributorExportVo;
import com.yxt.anrui.base.api.basevehicleout.*;
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);
}

77
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,
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
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}
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>
${ew.sqlSegment}
</where>
</select>
</mapper>

61
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) {
List<BaseVehicleOutVoExecl> baseVehicleOutVoExecls = new ArrayList<>();
/*BaseVehicleOutVoExecl baseVehicleOutVoExecl = baseMapper.selByExcel(baseVehicleOutQuery);
baseVehicleOutVoExecl.setRankNo(id);
baseVehicleOutVoExecls.add(baseVehicleOutVoExecl);*/
public List<BaseVehicleOutVoExecl> listExcel(BaseVehicleOutQuery params) {
QueryWrapper<BaseVehicleOutVoExecl> qw = new QueryWrapper<>();
if (params != null) {
String orgSidPath = params.getOrgSidPath();
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;
}
}

35
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")
private String billNo; // 编号(yyyyMMdd)
@ExportEntityMap(CnName = "生成日期", EnName = "createTime")
private String createTime;
@ExportEntityMap(CnName = "生成人", EnName = "createByName")
private String createByName;
@ExportEntityMap(CnName = "应盘(台)", EnName = "totalNumber")
private String totalNumber;
@ExportEntityMap(CnName = "实盘(台)", EnName = "actualNumber")
private String actualNumber;
@ExportEntityMap(CnName = "未盘(台)", EnName = "surplusNumber")
private String surplusNumber;
@ExportEntityMap(CnName = "盘盈(台)", EnName = "profitNumber")
private String profitNumber;
@ExportEntityMap(CnName = "盘亏(台)", EnName = "lossNumber")
private String lossNumber;
@ExportEntityMap(CnName = "盘损(台)", EnName = "damageNumber")
private String damageNumber;
@ExportEntityMap(CnName = "车架号", EnName = "vinNo")
private String vinNo; // 车架号
@ExportEntityMap(CnName = "盘库日期", EnName = "InventoryDate")
@JsonProperty("InventoryDate")
private String InventoryDate; // 盘库日期
@ExportEntityMap(CnName = "存放地点", EnName = "location")
private String location; // 存放地点
@ApiModelProperty("盘库人员")
@ExportEntityMap(CnName = "盘库人员", EnName = "InventoryName")
@JsonProperty("InventoryName")
private String InventoryName; // 盘库人员
@ExportEntityMap(CnName = "盘库结果", EnName = "InventoryState")
@JsonProperty("InventoryState")
private String InventoryState; // 盘库结果
@ExportEntityMap(CnName = "备注", EnName = "remarks")
private String remarks; // 备注
}

2
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);
}

16
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,
billNo,
createTime,
createByName
FROM scm_veh_inventorymonth
WHERE sid = #{sid}
SELECT svi.`vinNo`,
svi.`InventoryDate`,
svi.`location`,
svi.`InventoryName`,
svi.`InventoryState`,
svi.`remarks`
FROM scm_vehicle_inventory svi
LEFT JOIN scm_veh_inventorymonth svim
ON svi.`mainSid` = svim.`sid`
WHERE svi.mainSid = #{sid}
</select>
</mapper>

15
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) {
ScmVehInventorymonthVoExcel scmVehInventorymonthVoExcel = baseMapper.selByExcel(sid);
String mainSid = scmVehInventorymonthVoExcel.getSid();
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()));
String sid = sids[0];
List<ScmVehInventorymonthVoExcel> scmVehInventorymonthVoExcels = baseMapper.selByExcel(sid);
for (ScmVehInventorymonthVoExcel scmVehInventorymonthVoExcel : scmVehInventorymonthVoExcels) {
scmVehInventorymonthVoExcel.setRankNo(id);
id = id + 1;
scmVehInventorymonthVoExcels.add(scmVehInventorymonthVoExcel);
}
return scmVehInventorymonthVoExcels;
}

Loading…
Cancel
Save