Browse Source

问题优化

master
God 2 years ago
parent
commit
4a7f75a64e
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeign.java
  2. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeignFallback.java
  3. 76
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java
  4. 104
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java
  5. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodel.java
  6. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java
  7. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java
  8. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.java
  9. 60
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml
  10. 11
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java
  11. 82
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeign.java

@ -59,7 +59,7 @@ public interface BaseVehicleOutApplyFeign {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
@ResponseBody
public ResultBean<PagerVo<BaseVehicleOutApplyVo>> listPage(@RequestBody PagerQuery<BaseVehicleOutApplyQuery> pq);
public ResultBean<PagerVo<BaseVehicleOutApplyVoNew>> listPage(@RequestBody PagerQuery<BaseVehicleOutApplyQueryNew> pq);
@ApiOperation("新增或修改")
@PostMapping("/save")

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeignFallback.java

@ -48,10 +48,10 @@ import java.util.List;
@Component
public class BaseVehicleOutApplyFeignFallback implements BaseVehicleOutApplyFeign {
@Override
public ResultBean<PagerVo<BaseVehicleOutApplyVo>> listPage(PagerQuery<BaseVehicleOutApplyQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-base/basevehicleoutapply/listPage无法访问");
public ResultBean<PagerVo<BaseVehicleOutApplyVoNew>> listPage(PagerQuery<BaseVehicleOutApplyQueryNew> pq) {
return null;
}
@Override

76
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java

@ -0,0 +1,76 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.api.basevehicleoutapply;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-base(销售出库单) <br/>
* File: BaseVehicleOutApplyQuery.java <br/>
* Class: com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyQuery <br/>
* Description: 车辆出库单 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-01-12 08:54:50 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "车辆出库单 查询条件", description = "车辆出库单 查询条件")
public class BaseVehicleOutApplyQueryNew implements Query {
@ApiModelProperty("物料编码")
private String materialCode;
@ApiModelProperty("销售类型key")
private String typeKey;
@ApiModelProperty("销售日期开始时间")
private String saleDateStart;
@ApiModelProperty("销售日期结束时间")
private String saleDateEnd;
@ApiModelProperty("合同编号")
private String concatNo;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("销售部门")
private String orgDeptSid;
@ApiModelProperty("销售专员")
private String staffSid;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
@ApiModelProperty("内部编码")
private String insideCode;
@ApiModelProperty("分公司sid")
private String orgSid;
@ApiModelProperty(value = "组织全路径")
private String orgSidPath;
}

104
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java

@ -0,0 +1,104 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.api.basevehicleoutapply;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-base(销售出库单) <br/>
* File: BaseVehicleOutApplyVo.java <br/>
* Class: com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVo <br/>
* Description: 车辆出库单 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-01-12 08:54:50 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "车辆出库单 视图数据对象", description = "车辆出库单 视图数据对象")
public class BaseVehicleOutApplyVoNew implements Vo {
@ApiModelProperty("sid")
private String sid;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("分公司sid")
private String createOrgSid;
@ApiModelProperty("分公司名称")
private String createOrgName;
@ApiModelProperty("简述配置")
private String modelConfig;
@ApiModelProperty("内部编码")
private String insideCode;
@ApiModelProperty("销售类型")
private String type;
@ApiModelProperty("采购类型")
private String manPurOrderTypeValue;
@ApiModelProperty("销售日期")
private String saleDate;
@ApiModelProperty("成交价")
private String price;
@ApiModelProperty("销售部门")
private String orgName;
@ApiModelProperty("销售专员")
private String staffName;
@ApiModelProperty("合同编号")
private String concatNo;
@ApiModelProperty("是否为终端客户")
private String isTerminal;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("手机号码")
private String mobile;
@ApiModelProperty("物料名称")
private String materialName;
@ApiModelProperty("物料编码")
private String materialCode;
@ApiModelProperty("赠品价值")
private String giftsDescription;
@ApiModelProperty("销售折让")
private String salesAllowance;
@ApiModelProperty("中介人1")
private String middleOne;
@ApiModelProperty("返利金额1")
private String rebateMoneyOne;
@ApiModelProperty("中介人2")
private String middleTwo;
@ApiModelProperty("返利金额2")
private String rebateMoneyTwo;
@ApiModelProperty("内部引荐人姓名")
private String innerName;
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodel.java

@ -106,5 +106,9 @@ public class BaseVehinstallmodel extends BaseEntity {
private String useOrgSid; // 使用组织
@ApiModelProperty("创建组织")
private String createOrgSid; // 创建组织
@ApiModelProperty("冷机品牌")
private String coolerBrand;
@ApiModelProperty("冷机型号")
private String coolerModel;
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java

@ -104,6 +104,10 @@ public class BaseVehinstallmodelDetailsVo implements Vo {
private String useOrgSid; // 使用组织
@ApiModelProperty("创建组织")
private String createOrgSid; // 创建组织
@ApiModelProperty("冷机品牌")
private String coolerBrand;
@ApiModelProperty("冷机型号")
private String coolerModel;
@ApiModelProperty("销售订单中上装价格")
private String topPrice;

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java

@ -114,5 +114,9 @@ public class BaseVehinstallmodelDto implements Dto {
private String useOrgSid; // 使用组织
@ApiModelProperty("创建组织")
private String createOrgSid; // 创建组织
@ApiModelProperty("冷机品牌")
private String coolerBrand;
@ApiModelProperty("冷机型号")
private String coolerModel;
}

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

@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVoNew;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -56,7 +57,7 @@ public interface BaseVehicleOutApplyMapper extends BaseMapper<BaseVehicleOutAppl
//@Update("update base_vehicle_out_apply set name=#{msg} where id=#{id}")
//IPage<BaseVehicleOutApplyVo> voPage(IPage<BaseVehicleOutApply> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicleOutApply> qw);
IPage<BaseVehicleOutApplyVo> selectPageVo(IPage<BaseVehicleOutApply> page, @Param(Constants.WRAPPER) Wrapper<BaseVehicleOutApply> qw);
IPage<BaseVehicleOutApplyVoNew> selectPageVo(IPage<BaseVehicleOutApply> page, @Param(Constants.WRAPPER) Wrapper<BaseVehicleOutApply> qw);
List<BaseVehicleOutApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseVehicleOutApply> qw);

60
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml

@ -1,13 +1,55 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.base.biz.basevehicleoutapply.BaseVehicleOutApplyMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVo">
SELECT * FROM base_vehicle_out_apply <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVo">
SELECT * FROM base_vehicle_out_apply <where> ${ew.sqlSegment} </where>
</select>
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVoNew">
SELECT
bvoa.`sid`,
bvo.vinNo,
bvoa.`createOrgSid`,
bv.configName AS modelConfig,
bv.insideCode,
bvo.type,
bvo.manPurOrderTypeValue,
bvoa.`saleDate`,
bvo.`price`,
bvoa.`orgName`,
bvoa.`staffName`,
bvoa.`contractNo`,
CASE
bvoa.isTerminal
WHEN 1
THEN '是'
WHEN 0
THEN '否'
END AS isTerminal,
bvoa.customerName,
bvoa.mobile,
bvo.materialName,
bvo.materialCode,
bvo.giftsDescription,
bvo.salesAllowance,
bvo.middleOne,
bvo.middleTwo,
bvo.rebateMoneyOne,
bvo.rebateMoneyTwo,
bvoa.innerName
FROM
base_vehicle_out_apply bvoa
LEFT JOIN base_vehicle_out bvo
ON bvoa.`sid` = bvo.`mainSid`
LEFT JOIN base_vehicle bv
ON bv.sid = bvo.vinSid
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVo">
SELECT * FROM base_vehicle_out_apply
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

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

@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.anrui.base.biz.basevehicleoutapply;
import com.yxt.anrui.base.api.basevehicleoutapply.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -34,12 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApply;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyQuery;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVo;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyDetailsVo;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyDto;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyFeign;
/**
* Project: anrui-base(销售出库单) <br/>
@ -65,9 +60,9 @@ public class BaseVehicleOutApplyRest implements BaseVehicleOutApplyFeign {
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<BaseVehicleOutApplyVo>> listPage(@RequestBody PagerQuery<BaseVehicleOutApplyQuery> pq){
public ResultBean<PagerVo<BaseVehicleOutApplyVoNew>> listPage(@RequestBody PagerQuery<BaseVehicleOutApplyQueryNew> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<BaseVehicleOutApplyVo> pv = baseVehicleOutApplyService.listPageVo(pq);
PagerVo<BaseVehicleOutApplyVoNew> pv = baseVehicleOutApplyService.listPageVo(pq);
return rb.success().setData(pv);
}

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

@ -28,22 +28,18 @@ package com.yxt.anrui.base.biz.basevehicleoutapply;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo;
import com.yxt.anrui.base.api.basevehicleoutapply.*;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApply;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyQuery;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVo;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyDetailsVo;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyDto;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: anrui-base(销售出库单) <br/>
@ -60,19 +56,73 @@ import java.util.List;
*/
@Service
public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOutApplyMapper, BaseVehicleOutApply> {
private QueryWrapper<BaseVehicleOutApply> createQueryWrapper(BaseVehicleOutApplyQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
private QueryWrapper<BaseVehicleOutApply> createQueryWrapper(BaseVehicleOutApplyQueryNew params) {
QueryWrapper<BaseVehicleOutApply> 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.getMaterialCode())) {
qw.like("bvo.materialCode", params.getMaterialCode());
}
//销售类型
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());
}
}
return qw;
}
public PagerVo<BaseVehicleOutApplyVo> listPageVo(PagerQuery<BaseVehicleOutApplyQuery> pq) {
BaseVehicleOutApplyQuery query = pq.getParams();
public PagerVo<BaseVehicleOutApplyVoNew> listPageVo(PagerQuery<BaseVehicleOutApplyQueryNew> pq) {
BaseVehicleOutApplyQueryNew query = pq.getParams();
QueryWrapper<BaseVehicleOutApply> qw = createQueryWrapper(query);
IPage<BaseVehicleOutApply> page = PagerUtil.queryToPage(pq);
IPage<BaseVehicleOutApplyVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BaseVehicleOutApplyVo> p = PagerUtil.pageToVo(pagging, null);
IPage<BaseVehicleOutApplyVoNew> pagging = baseMapper.selectPageVo(page, qw);
for (BaseVehicleOutApplyVoNew record : pagging.getRecords()) {
String createOrgSid = record.getCreateOrgSid();
String createorgName = sysOrganizationFeign.fetchBySid(createOrgSid).getData().getName();
record.setMaterialCode(record.getMaterialCode().substring(record.getMaterialCode().length() - 8));
record.setCreateOrgName(createorgName);
}
PagerVo<BaseVehicleOutApplyVoNew> p = PagerUtil.pageToVo(pagging, null);
return p;
}

Loading…
Cancel
Save