Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
God 2 years ago
parent
commit
c95351d4f7
  1. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java
  2. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.xml
  3. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarListVo.java
  4. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarVo.java
  5. 1
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  6. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
  7. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java
  8. 84
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  9. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml
  10. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java
  11. 29
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigDto.java
  12. 13
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigFeign.java
  13. 25
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigVo.java
  14. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java
  15. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java
  16. 7
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.java
  17. 12
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.xml
  18. 14
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigRest.java
  19. 23
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java
  20. 1
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java
  21. 7
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml
  22. 5
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java
  23. 7
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
  24. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java

@ -31,7 +31,8 @@ public enum BillTypeEnum {
XSDDTCSQ("XSDDTCSQ", "销售订单退车申请"),
QKTCSQ("QKTCSQ", "欠款提车申请"),
GCCKSQ("GCCKSQ", "挂车出库申请"),
JCZLQRD("JCZLQRD", "交车资料确认单");
JCZLQRD("JCZLQRD", "交车资料确认单"),
JCECQRD("JCECQRD", "交车资料二次确认单");
private String billType;
private String billTypeName;

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.xml

@ -75,7 +75,7 @@
where bd.vehSid = #{vinSid}
and bbd.useOrg = #{orgSid}
and bbd.nodeState = '已办结'
and bbd.salesPolicyKey = '0001'
and bbd.salesPolicyKey = '0001' and bbd.effectiveDate>NOW()
</select>
<select id="selectAppDiscountpackageListByOrgSid"

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarListVo.java

@ -31,4 +31,7 @@ public class AppNowCarListVo implements Vo {
@ApiModelProperty("采购系统名称")
private String purchaseSystemName;
@ApiModelProperty("是否有促销标签")
private boolean promotion;
}

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarVo.java

@ -29,4 +29,7 @@ public class AppNowCarVo implements Vo {
private String purchaseSystemSid;
@ApiModelProperty("采购系统名称")
private String purchaseSystemName;
@ApiModelProperty("是否有促销标签")
private boolean promotion;
}

1
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@ -1053,6 +1053,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
busDiscountpackageHandoverLists.add(busDiscountpackageHandoverListDto);
}
}
busDiscountpackageHandoverDto.setOrgSidPath(busDeliveredApply.getOrgSidPath());
busDiscountpackageHandoverDto.setBusDiscountpackageHandoverLists(busDiscountpackageHandoverLists);
busDiscountpackageHandoverService.saveOrUpdateDto(busDiscountpackageHandoverDto);
}

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java

@ -882,7 +882,7 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
sb.append("合格证").append("、");
sbKey.append("002").append("、");
}
if (prepareVehicle.getOnBoardDataState() > 0) {
if (prepareVehicle.getOnBoardDataState() == 0 || prepareVehicle.getOnBoardDataState() == 1) {
BusVehicleInformationHandoverDetailsListVo data = busVehicleInformationHandoverService.detailsByVinSid(handoverWait.getVinSid()).getData();
if (null != data) {
if (data.getInformations().size() > 0) {
@ -1596,7 +1596,7 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
sb.append("合格证").append("、");
sbKey.append("002").append("、");
}
if (prepareVehicle.getOnBoardDataState() > 0) {
if (prepareVehicle.getOnBoardDataState() == 0 || prepareVehicle.getOnBoardDataState() == 1) {
BusVehicleInformationHandoverDetailsListVo data = busVehicleInformationHandoverService.detailsByVinSid(handoverWait.getVinSid()).getData();
if (null != data) {
if (data.getInformations().size() > 0) {

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java

@ -46,9 +46,6 @@ public class BusHandoverWaitService extends MybatisBaseService<BusHandoverWaitMa
orgPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
qw.eq("bh.useOrgSid", orgPath);
}
if (StringUtils.isNotBlank(params.getUserSid())) {
qw.eq("bh.createBySid", params.getUserSid());
}
qw.eq("bh.isDelete", 0);
}
IPage<BusHandoverWaitVo> pagging = baseMapper.selectPageVo(page, qw, params.getName());

84
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandMitQuery;
import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitFeign;
import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageFeign;
import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanDetailsVo;
import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanFeign;
import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
@ -308,6 +309,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
private LoanSolutionsOtherpolicyFeign loanSolutionsOtherpolicyFeign;
@Autowired
private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
@Autowired
private BaseDiscountpackageFeign baseDiscountpackageFeign;
/**
* 构造查询条件
@ -392,6 +395,21 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//包含采购系统的车架号
List<String> vinList = vinLists.stream().map(v -> v.getVinNo()).collect(Collectors.toList());
List<String> orderVinList = busSalesOrderVehicleService.selectList(sid);
if(!vinList.isEmpty()){
for (int i = 0; i < vinLists.size(); i++) {
VinListsVo vinListsVo = vinLists.get(i);
BigDecimal initBigDecimalTwo = BigDecimal.ZERO;
//根据sid去查询销售政策的sid,根据销售政策查询销售政策的金额
ResultBean<List<String>> listResultBean = baseDiscountpackageFeign.getMoney(vinListsVo.getVinSid(), entity.getUseOrgSid());
if (listResultBean.getSuccess() && !listResultBean.getData().isEmpty()) {
List<String> stringList = listResultBean.getData();
initBigDecimalTwo = initBigDecimalTwo.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add));
}
if(initBigDecimalTwo.compareTo(BigDecimal.ZERO) != 0){
vinList.set(i,vinList.get(i)+"促销("+initBigDecimalTwo.toString()+"元)");
}
}
}
modelInfo.setVinList(vinList);
modelInfo.setOrderVinList(orderVinList);
} else {
@ -1271,6 +1289,31 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
//计算总指导价-总成交价-总优惠包的价值
bigDecimalOne = guildPriceAll.subtract(finalPriceAll).add(discountPrice);
List<String> vehicleList = new ArrayList<>();
BigDecimal initBigDecimalOne = BigDecimal.ZERO;
List<String> initBigDecimalOneList = new ArrayList<>();
//是否是现车//ToDo:促销政策
if ("1".equals(busSalesOrder.getType())) {
//根据销售订单sid查询现车的sid集合
vehicleList = busSalesOrderVehicleService.selectVehicleSid(sid);
//根据现车去查询销售政策的总促销政策之和
if (vehicleList.size() > 0) {
for (int i = 0; i < vehicleList.size(); i++) {
BigDecimal initBigDecimalTwo = BigDecimal.ZERO;
//根据sid去查询销售政策的sid,根据销售政策查询销售政策的金额
ResultBean<List<String>> listResultBean = baseDiscountpackageFeign.getMoney(vehicleList.get(i), busSalesOrder.getUseOrgSid());
if (listResultBean.getSuccess() && !listResultBean.getData().isEmpty()) {
List<String> stringList = listResultBean.getData();
initBigDecimalTwo = initBigDecimalTwo.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add));
}
initBigDecimalOneList.add(initBigDecimalTwo.toString());
}
}
}
if(!initBigDecimalOneList.isEmpty()){
String initOne = Collections.min(initBigDecimalOneList);
initBigDecimalOne = new BigDecimal(initOne);
}
//查询返利金额
BusSalesOrderSubmit busSalesOrderSubmit = busSalesOrderSubmitService.selectBySaleOrderSid(sid);
if (busSalesOrderSubmit != null) {
@ -1303,8 +1346,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//ToDo:修改公式计算是否超权限:岗位权限*台数>总指导价-总成交价+总优惠包+总返利
//销售支持部经理的岗位权限价格
BigDecimal bigDecimal2 = new BigDecimal(price).multiply(new BigDecimal(quantity));
//岗位权限价格*台数
bigDecimalTwo = bigDecimal2;
bigDecimalOne = bigDecimalOne.add(initBigDecimal);
//总指导价-总成交价+总优惠包+总返利
bigDecimalOne = bigDecimalOne.add(initBigDecimal).subtract(initBigDecimalOne.multiply(new BigDecimal(quantity)));
if (bigDecimalTwo.compareTo(bigDecimalOne) < 0) {
//bigDecimalTwo<bigDecimalOne:超权限
isHavePower = true;
@ -1335,7 +1380,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
bigDecimalTwo = new BigDecimal("0");
BigDecimal bigDecimal2 = new BigDecimal(price).multiply(new BigDecimal(quantity));
bigDecimalTwo = bigDecimal2;
bigDecimalOne = bigDecimalOne.add(initBigDecimal);
bigDecimalOne = bigDecimalOne.add(initBigDecimal).subtract(initBigDecimalOne.multiply(new BigDecimal(quantity)));
if (bigDecimalTwo.compareTo(bigDecimalOne) < 0) {
//bigDecimalTwo<bigDecimalOne
isPower = true;
@ -2220,6 +2265,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//现车信息
AppNowCarVo appNowCarVo = new AppNowCarVo();
BeanUtil.copyProperties(vehicleOrderVo, appNowCarVo);
//根据sid去查询销售政策的sid,根据销售政策查询销售政策的金额
ResultBean<List<String>> listResultBean = baseDiscountpackageFeign.getMoney(vehicleOrderVo.getCarSid(), busSalesOrder.getUseOrgSid());
if (listResultBean.getSuccess()) {
List<String> stringList = listResultBean.getData();
if(stringList.isEmpty()){
appNowCarVo.setPromotion(false);
}else{
appNowCarVo.setPromotion(true);
}
}
//将该车型下的所有现车的车架号组合放入集合中
vinNoList.add(vehicleOrderVo.getVin());
vinNoMap.put(vehicleOrderVo.getVin(), vehicleOrderVo.getTopSid());
@ -2540,6 +2595,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
for (AppBaseVehicleOrderVo vehicleOrderVo : voList) {
AppNowCarVo appNowCarVo = new AppNowCarVo();
BeanUtil.copyProperties(vehicleOrderVo, appNowCarVo);
//根据sid去查询销售政策的sid,根据销售政策查询销售政策的金额
ResultBean<List<String>> listResultBean = baseDiscountpackageFeign.getMoney(vehicleOrderVo.getCarSid(), busSalesOrder.getUseOrgSid());
if (listResultBean.getSuccess()) {
List<String> stringList = listResultBean.getData();
if(stringList.isEmpty()){
appNowCarVo.setPromotion(false);
}else{
appNowCarVo.setPromotion(true);
}
}
//根据车辆sid查询该车架号的采购系统
ResultBean<BasePurchSystemVo> vehicleSelectVoResultBean = baseVehicleFeign.getSystem(vehicleOrderVo.getCarSid());
if (vehicleSelectVoResultBean.getData() != null) {
@ -3317,6 +3382,21 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//包含采购系统的车架号
List<String> vinList = vinLists.stream().map(v -> v.getVinNo()).collect(Collectors.toList());
List<String> orderVinList = busSalesOrderVehicleService.selectList(sid);
if(!vinList.isEmpty()){
for (int i = 0; i < vinLists.size(); i++) {
VinListsVo vinListsVo = vinLists.get(i);
BigDecimal initBigDecimalTwo = BigDecimal.ZERO;
//根据sid去查询销售政策的sid,根据销售政策查询销售政策的金额
ResultBean<List<String>> listResultBean = baseDiscountpackageFeign.getMoney(vinListsVo.getVinSid(), busSalesOrder.getUseOrgSid());
if (listResultBean.getSuccess() && !listResultBean.getData().isEmpty()) {
List<String> stringList = listResultBean.getData();
initBigDecimalTwo = initBigDecimalTwo.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add));
}
if(initBigDecimalTwo.compareTo(BigDecimal.ZERO) != 0){
vinList.set(i,vinList.get(i)+",促销("+initBigDecimalTwo.toString()+"元)");
}
}
}
modelInfo.setVinList(vinList);
modelInfo.setOrderVinList(orderVinList);
} else {

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml

@ -50,7 +50,7 @@
ORDER BY bvh.createTime DESC
</select>
<select id="selectByNo" resultType="com.yxt.anrui.buscenter.api.busvehicledatahandover.AppVinListVo">
select vinNo as vin, sid as recordSid,billNo as billId
select vinNo as vin, sid as recordSid, billNo as billId
from bus_vehicle_data_handover
where contractNo = #{contractNo}
and completeStateKey = '001'

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java

@ -300,7 +300,7 @@ public class BusVehicleDataHandoverService extends MybatisBaseService<BusVehicle
String orgCode = resultBean1.getData().getOrgCode();
BillNo b = new BillNo();
b.setOrgCode(orgCode);
b.setBillType(BillTypeEnum.JCZLQRD.getBillType());
b.setBillType(BillTypeEnum.JCECQRD.getBillType());
String bill = Rule.getBill(b);
int i = baseMapper.selectNum(bill);
String billNo = Rule.getBillNo(bill, i);

29
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigDto.java

@ -0,0 +1,29 @@
package com.yxt.anrui.portal.api.sysflowableconfig;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.Date;
/**
* @description: 流程设置转办
* @author: dimengzhe
* @date: 2023/6/28
**/
@Data
public class SysFlowableConfigDto implements Dto {
private static final long serialVersionUID = 5037689220100489101L;
@ApiModelProperty("当前登录人")
@NotBlank(message = "当前登录人不能为空")
private String userSid;
@ApiModelProperty("转办人用户sid")
private String changeUserSid;
private String startDate;
private String endDate;
}

13
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigFeign.java

@ -6,6 +6,11 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import javax.validation.Valid;
/**
* @description: 转办设置
@ -23,4 +28,12 @@ public interface SysFlowableConfigFeign {
@ApiOperation("查询是否有转办人 ")
@GetMapping("/selectByUserSid")
ResultBean<SysFlowableConfigVvo> selectByUserSid(@SpringQueryMap SysFlowableConfigQuery query);
@ApiOperation("初始化转办人信息")
@GetMapping("/initDetails")
ResultBean<SysFlowableConfigVo> initDetails(@RequestParam("userSid")String userSid);
@ApiOperation("保存修改")
@PostMapping("/saveOrUpdate")
ResultBean saveOrUpdate(@Valid @RequestBody SysFlowableConfigDto dto);
}

25
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigVo.java

@ -0,0 +1,25 @@
package com.yxt.anrui.portal.api.sysflowableconfig;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description: 设置流程转办初始化
* @author: dimengzhe
* @date: 2023/6/28
**/
@Data
public class SysFlowableConfigVo implements Vo {
private static final long serialVersionUID = 4223685847449654287L;
@ApiModelProperty("当前登录人用户sid")
private String userSid;
@ApiModelProperty("设置的转办人用户sid")
private String changeUserSid;
@ApiModelProperty("开始时间")
private String startDate;
@ApiModelProperty("结束时间")
private String endDate;
}

5
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java

@ -153,5 +153,10 @@ public interface SysStaffinfoFeign {
@GetMapping("/selectStaffLists")
ResultBean<List<PcSysStaffVo>> selectStaffLists();
@ApiOperation("获取集团所有在职人员")
@ResponseBody
@GetMapping("/selectStaffListss")
ResultBean<List<PcSysStaffVo>> selectStaffListss();
}

5
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java

@ -108,4 +108,9 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign {
return null;
}
@Override
public ResultBean<List<PcSysStaffVo>> selectStaffListss() {
return null;
}
}

7
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.java

@ -2,6 +2,7 @@ package com.yxt.anrui.portal.biz.sysflowableconfig;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfig;
import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -15,4 +16,10 @@ import java.util.Date;
@Mapper
public interface SysFlowableConfigMapper extends BaseMapper<SysFlowableConfig> {
SysFlowableConfig selectByUserSid(@Param("userSid") String userSid, @Param("nowDate") Date nowDate);
SysFlowableConfigVo initDetails(String userSid);
SysFlowableConfig selectByUserSids(String userSid);
int deleteBySid(String userSid);
}

12
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.xml

@ -4,4 +4,16 @@
<select id="selectByUserSid" resultType="com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfig">
select * from sys_flowable_config where userSid = #{userSid} and #{nowDate} between startDate and endDate
</select>
<select id="initDetails" resultType="com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigVo">
select * from sys_flowable_config where userSid = #{userSid}
</select>
<select id="selectByUserSids" resultType="com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfig">
select * from sys_flowable_config where userSid = #{userSid}
</select>
<delete id="deleteBySid">
delete from sys_flowable_config where userSid = #{userSid}
</delete>
</mapper>

14
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigRest.java

@ -1,8 +1,6 @@
package com.yxt.anrui.portal.biz.sysflowableconfig;
import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigFeign;
import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigQuery;
import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigVvo;
import com.yxt.anrui.portal.api.sysflowableconfig.*;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
@ -26,4 +24,14 @@ public class SysFlowableConfigRest implements SysFlowableConfigFeign {
public ResultBean<SysFlowableConfigVvo> selectByUserSid(SysFlowableConfigQuery query) {
return sysFlowableConfigService.selectByUserSid(query);
}
@Override
public ResultBean<SysFlowableConfigVo> initDetails(String userSid) {
return sysFlowableConfigService.initDetails(userSid);
}
@Override
public ResultBean saveOrUpdate(SysFlowableConfigDto dto) {
return sysFlowableConfigService.saveOrUpdateDto(dto);
}
}

23
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java

@ -1,9 +1,7 @@
package com.yxt.anrui.portal.biz.sysflowableconfig;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfig;
import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigQuery;
import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigVvo;
import com.yxt.anrui.portal.api.sysflowableconfig.*;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.core.result.ResultBean;
import org.springframework.stereotype.Service;
@ -27,4 +25,23 @@ public class SysFlowableConfigService extends MybatisBaseService<SysFlowableConf
BeanUtil.copyProperties(sysFlowableConfig,sysFlowableConfigVvo);
return rb.success().setData(sysFlowableConfigVvo);
}
public ResultBean<SysFlowableConfigVo> initDetails(String userSid) {
ResultBean<SysFlowableConfigVo> rb = ResultBean.fireFail();
SysFlowableConfigVo sysFlowableConfigVo = baseMapper.initDetails(userSid);
return rb.success().setData(sysFlowableConfigVo);
}
public ResultBean saveOrUpdateDto(SysFlowableConfigDto dto) {
ResultBean rb = ResultBean.fireFail();
//查询是否包含该用户的数据
SysFlowableConfig sysFlowableConfig = baseMapper.selectByUserSids(dto.getUserSid());
if(sysFlowableConfig != null){
baseMapper.deleteBySid(dto.getUserSid());
}
sysFlowableConfig = new SysFlowableConfig();
BeanUtil.copyProperties(dto,sysFlowableConfig,"sid");
baseMapper.insert(sysFlowableConfig);
return rb.success();
}
}

1
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java

@ -124,4 +124,5 @@ public interface SysStaffinfoMapper extends BaseMapper<SysStaffinfo> {
List<AppSysStaffVo> getGressionUserList(@Param("userOrgSid")String userOrgSid);
List<PcSysStaffVo> selectStaffLists();
List<PcSysStaffVo> selectStaffListss();
}

7
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml

@ -387,4 +387,11 @@
from sys_user su
left join sys_staffinfo si on su.staffSid = si.sid where su.isAdmin is NULL
</select>
<select id="selectStaffListss" resultType="com.yxt.anrui.portal.api.sysstaffinfo.PcSysStaffVo">
select su.sid userSid,
si.name staffName
from sys_user su
left join sys_staffinfo si on su.staffSid = si.sid where su.isAdmin is NULL and si.personTypeKey != '01'
</select>
</mapper>

5
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java

@ -225,5 +225,10 @@ public class SysStaffinfoRest implements SysStaffinfoFeign {
return sysStaffinfoService.selectStaffLists();
}
@Override
public ResultBean<List<PcSysStaffVo>> selectStaffListss() {
return sysStaffinfoService.selectStaffListss();
}
}

7
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java

@ -801,4 +801,11 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
list.removeAll(Collections.singleton(null));
return rb.success().setData(list);
}
public ResultBean<List<PcSysStaffVo>> selectStaffListss() {
ResultBean<List<PcSysStaffVo>> rb = ResultBean.fireFail();
List<PcSysStaffVo> list = baseMapper.selectStaffListss();
list.removeAll(Collections.singleton(null));
return rb.success().setData(list);
}
}

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java

@ -37,4 +37,7 @@ public class NowCarVo implements Vo {
@ApiModelProperty("采购系统名称")
@JsonProperty("paySystem")
private String purchaseSystemName;
@ApiModelProperty("是否有促销标签")
private boolean promotion;
}

Loading…
Cancel
Save