Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 1 year ago
parent
commit
b9b6606e4c
  1. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
  2. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/salesreturn/SalesReturn.java
  3. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/salesreturn/SalesReturnOrdersService.java
  4. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/salesreturn/data_FEntity.json
  5. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/DownExcelOverdueBankVo.java
  6. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/ExcelBankVo.java
  7. 19
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankService.java
  8. 25
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairPageQuery.java
  9. 31
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairPageVo.java
  10. 16
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBill.java
  11. 13
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDetailsVo.java
  12. 13
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java
  13. 31
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillQuery.java
  14. 36
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillVo.java
  15. 6
      yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerCrmVehVo.java
  16. 3
      yxt-as/src/main/java/com/yxt/anrui/as/api/enums/AsBillTypeEnum.java
  17. 18
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java
  18. 9
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
  19. 2
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.java
  20. 5
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml
  21. 16
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillRest.java
  22. 193
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java

@ -687,6 +687,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
if (StringUtils.isNotBlank(vehicleSelectVo.getOrgCode())) {
salesReturn.setFSaleOrgId(vehicleSelectVo.getOrgCode());
salesReturn.setFStockOrgId(vehicleSelectVo.getOrgCode());
salesReturnDetailDto.setFOwnerId(vehicleSelectVo.getOrgCode());
busSalesReturnOrdersDto.setSaleOrgId(vehicleSelectVo.getOrgCode());
}
BaseSalesReturnVo returnVo = baseVehicleOutFeign.selectByVehReturn(vehSid, busSalesOrderReturnVehApply.getContractNo()).getData();
@ -715,6 +716,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
busSalesReturnOrdersDto.setBillNo(billNo);
}
busSalesReturnOrdersService.saveReturnOrders(busSalesReturnOrdersDto);
salesReturnDetailDto.setFOwnerTypeId("业务组织");
salesReturnDetails.add(salesReturnDetailDto);
}
}

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/salesreturn/SalesReturn.java

@ -50,5 +50,9 @@ public class SalesReturn {
public String FDeliveryDate;
@ApiModelProperty("是否赠品")
public String FIsFree;
@ApiModelProperty("货主")
public String FOwnerId;
@ApiModelProperty("货主类型")
public String FOwnerTypeId;
}
}

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/salesreturn/SalesReturnOrdersService.java

@ -90,6 +90,8 @@ public class SalesReturnOrdersService extends FinKingDeeService {
m.put("FRealQty", c.getFRealQty());
m.put("FDeliveryDate", c.getFDeliveryDate());
m.put("FIsFree", c.getFIsFree());
m.put("FOwnerId",c.getFOwnerId());
m.put("FOwnerTypeId",c.getFOwnerTypeId());
collectionDetailMap.add(m);
}
return rb.success().setData(collectionDetailMap);

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/salesreturn/data_FEntity.json

@ -45,9 +45,9 @@
"FReturnType": {
"FNumber": "THLX01_SYS"
},
"FOwnerTypeId": "",
"FOwnerTypeId": "@KD_FOwnerTypeId",
"FOwnerId": {
"FNumber": ""
"FNumber": "@KD_FOwnerId"
},
"FProduceDate": "",
"FExpiryDate": "",

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/DownExcelOverdueBankVo.java

@ -14,8 +14,8 @@ public class DownExcelOverdueBankVo {
@ExportEntityMap(CnName = "资方合同编号", EnName = "bankContractNo")
private String bankContractNo;
@ExportEntityMap(CnName = "期数", EnName = "period")
private String period;
/* @ExportEntityMap(CnName = "期数", EnName = "period")
private String period;*/
@ExportEntityMap(CnName = "资方逾期月还", EnName = "bankOverdueMoney")
private String bankOverdueMoney;
}

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/ExcelBankVo.java

@ -14,8 +14,8 @@ public class ExcelBankVo {
@ApiModelProperty("资方合同编号")
private String bankContractNo;
@ApiModelProperty("期数")
private String period;
/* @ApiModelProperty("期数")
private String period;*/
@ApiModelProperty("资方逾期月还")
private String bankOverdueMoney;
}

19
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankService.java

@ -691,7 +691,7 @@ public class LoanOverdueBankService extends MybatisBaseService<LoanOverdueBankMa
if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) {
return rb.fail().setMsg("上传文件不正确");
}
int[] resultCell = new int[]{0, 1, 2};
int[] resultCell = new int[]{0, 1};
List<ExcelBankVo> list = new ArrayList<>();
List<ExcelBankVo> list2 = new ArrayList<>();
boolean isExcel2003 = true;
@ -741,10 +741,10 @@ public class LoanOverdueBankService extends MybatisBaseService<LoanOverdueBankMa
case 0:
excelBankVo.setBankContractNo(temp);
break;
case 1:
/* case 1:
excelBankVo.setPeriod(temp);
break;
case 2:
break;*/
case 1:
excelBankVo.setBankOverdueMoney(temp);
break;
default:
@ -762,10 +762,10 @@ public class LoanOverdueBankService extends MybatisBaseService<LoanOverdueBankMa
case 0:
word = "资方合同编号";
break;
case 1:
/* case 1:
word = "期数";
break;
case 2:
break;*/
case 1:
word = "资方逾期月还";
break;
default:
@ -785,9 +785,9 @@ public class LoanOverdueBankService extends MybatisBaseService<LoanOverdueBankMa
if (StringUtils.isBlank(excelBankVo.getBankContractNo())) {
checkWord.add("资方合同编号不能为空");
}
if (StringUtils.isBlank(excelBankVo.getPeriod())) {
/*if (StringUtils.isBlank(excelBankVo.getPeriod())) {
checkWord.add("期数不能为空");
}
}*/
if (StringUtils.isBlank(excelBankVo.getBankOverdueMoney())) {
checkWord.add("资方逾期月还不能为空,若无则需填写0");
}
@ -816,6 +816,7 @@ public class LoanOverdueBankService extends MybatisBaseService<LoanOverdueBankMa
returnExcelBankVo.setInfos(new ArrayList<>());
return returnExcelBankVo;
}
returnExcelBankVo.setInfos(importVoList);
return returnExcelBankVo;
}

25
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairPageQuery.java

@ -0,0 +1,25 @@
package com.yxt.anrui.as.api.asbusrepairbill;
import com.yxt.common.core.query.Query;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2024/4/26
**/
@Data
public class AsBusrepairPageQuery implements Query {
//维修工单编号
private String billNo;
//工单创建开始时间
private String createTimeStart;
//工单创建结束时间
private String createTimeEnd;
//车牌号
private String vehMark;
}

31
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairPageVo.java

@ -0,0 +1,31 @@
package com.yxt.anrui.as.api.asbusrepairbill;
import lombok.Data;
/**
* @description: 旧件回收登记
* @author: dimengzhe
* @date: 2024/4/26
**/
@Data
public class AsBusrepairPageVo {
//维修工单编号
private String billNo;
//工单创建日期
private String billTime;
//客户sid
private String customerSid;
//客户名称
private String customerName;
//车牌号
private String vehMark;
//车架号
private String vinNo;
//旧件回收说明
private String shortss;
//旧件照片
private String photos;
}

16
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBill.java

@ -76,11 +76,27 @@ public class AsBusreserveBill extends BaseEntity {
private String mobile; // 联系电话
@ApiModelProperty("车牌号")
private String vehMark; // 车牌号
@ApiModelProperty("车架号")
private String vinNo; // 车牌号
@ApiModelProperty("车型")
private String vehModel; // 车型
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("使用组织")
private String useOrgName; // 使用组织
@ApiModelProperty("创建组织")
private String createOrgName; // 创建组织
@ApiModelProperty("组织全路径")
private String orgSidPath; // 组织全路径
@ApiModelProperty("跟踪记录")
private String trackLogs; // 跟踪记录
@ApiModelProperty("制单部门sid")
private String createDeptSid; // 制单部门sid
@ApiModelProperty("制单部门")
private String createDept; // 制单部门
@ApiModelProperty("客户单位")
private String customerOrg; // 客户单位
}

13
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDetailsVo.java

@ -57,7 +57,10 @@ public class AsBusreserveBillDetailsVo implements Vo {
private String sid; // sid
private String createBySid; // sid
private String orgPath;
private String remarks; // 备注
@ApiModelProperty("制单时间")
private String createTime; // 制单人姓名
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据编号")
@ -79,12 +82,22 @@ public class AsBusreserveBillDetailsVo implements Vo {
private String mobile; // 联系电话
@ApiModelProperty("车牌号")
private String vehMark; // 车牌号
@ApiModelProperty("车架号")
private String vinNo; // 车牌号
@ApiModelProperty("车型")
private String vehModel; // 车型
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("跟踪记录")
private String trackLogs; // 跟踪记录
@ApiModelProperty("制单部门sid")
private String createDeptSid; // 制单部门sid
@ApiModelProperty("制单部门")
private String createDept; // 制单部门
@ApiModelProperty("客户单位")
private String customerOrg; // 客户单位
private List<AsbillSitemVo> sitemVos = new ArrayList<>();
}

13
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java

@ -57,9 +57,12 @@ public class AsBusreserveBillDto implements Dto {
private String sid; // sid
private String createBySid; // sid
private String orgPath;
private String remarks; // 备注
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("制单时间")
private String createTime; // 制单人姓名
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
private String reserveStart; // 预约时间开始
@ -79,12 +82,22 @@ public class AsBusreserveBillDto implements Dto {
private String mobile; // 联系电话
@ApiModelProperty("车牌号")
private String vehMark; // 车牌号
@ApiModelProperty("车架号")
private String vinNo; // 车牌号
@ApiModelProperty("车型")
private String vehModel; // 车型
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("跟踪记录")
private String trackLogs; // 跟踪记录
@ApiModelProperty("制单部门sid")
private String createDeptSid; // 制单部门sid
@ApiModelProperty("制单部门")
private String createDept; // 制单部门
@ApiModelProperty("客户单位")
private String customerOrg; // 客户单位
private List<AsbillSitemVo> sitemVos = new ArrayList<>();

31
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillQuery.java

@ -51,19 +51,30 @@ import lombok.Data;
@ApiModel(value = "预约单 查询条件", description = "预约单 查询条件")
public class AsBusreserveBillQuery implements Query {
@ApiModelProperty("使用组织sid")
private String orgPath;
private String userSid;
@ApiModelProperty("菜单url")
private String menuUrl;
private String useOrgName; // 分公司
private String createDept; //制单部门
private String createByName;//制单人
private String billNo;//单据编号
@ApiModelProperty("制单时间开始")
private String startCreateDate; // 制单时间开始
private String endCreateDate; // 制单时间结束
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("车牌号")
private String vehMark; // 车牌号
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("联系电话")
private String mobile; // 联系电话
@ApiModelProperty("预约时间开始")
private String startDate; // 预约时间开始
private String endDate; // 预约时间开始
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("联系电话")
private String mobile; // 联系电话
@ApiModelProperty("车牌号")
private String vehMark; // 车牌号
@ApiModelProperty("车型")
private String vehModel; // 车型
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
private String state;
}

36
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillVo.java

@ -52,27 +52,33 @@ import lombok.Data;
public class AsBusreserveBillVo implements Vo {
private String sid; // sid
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
private String state; // 1未完成 0已完成 2作废
@ApiModelProperty("分公司")
private String useOrgName; // 分公司
@ApiModelProperty("制单部门")
private String createDept; // 制单部门
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
private String reserveStart; // 预约时间开始
@ApiModelProperty("制单日期")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date createTime; // 制单日期
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("车牌号")
private String vehMark; // 车牌号
@ApiModelProperty("联系电话")
private String mobile; // 联系电话
@ApiModelProperty("预约时间开始")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date reserveStart; // 预约时间开始
@ApiModelProperty("预约时间截止")
private String reserveEnd; // 预约时间截止
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date reserveEnd; // 预约时间截止
@ApiModelProperty("预约服务顾问")
private String waitorName; // 预约服务顾问
@ApiModelProperty("预约设备")
private String reserveEquip; // 预约设备
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("联系电话")
private String mobile; // 联系电话
@ApiModelProperty("车牌号")
private String vehMark; // 车牌号
@ApiModelProperty("车型")
private String vehModel; // 车型
private String remarks;
private String state; // 1未完成 0已完成
}

6
yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerCrmVehVo.java

@ -15,4 +15,10 @@ public class AsCustomerCrmVehVo implements Vo {
private String customerSid; // 客户sid
@ApiModelProperty("车牌号")
private String vehMark; // 车牌号
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("车型sid")
private String vehModelSid;
@ApiModelProperty("车型")
private String vehModel;
}

3
yxt-as/src/main/java/com/yxt/anrui/as/api/enums/AsBillTypeEnum.java

@ -7,7 +7,8 @@ package com.yxt.anrui.as.api.enums;
*/
public enum AsBillTypeEnum {
WXGD("WXD", "维修工单");
WXGD("WXD", "维修工单"),
YYD("YYD", "预约单");

18
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java

@ -76,4 +76,22 @@ public class AsBusrepairBillRest {
asBusrepairBillService.confirmOut(sid);
return rb.success();
}
/**
* 旧件回收登记分页列表
* @param pagerQuery
* @return
*/
@PostMapping("/pageBillList")
@ApiOperation("旧件回收登记分页列表")
ResultBean<PagerVo<AsBusrepairPageVo>> pageBillList(@RequestBody PagerQuery<AsBusrepairPageQuery> pagerQuery){
ResultBean<PagerVo<AsBusrepairPageVo>> rb = ResultBean.fireFail();
PagerVo<AsBusrepairPageVo> pv = asBusrepairBillService.pageBillList(pagerQuery);
return rb.success().setData(pv);
}
@GetMapping("/getOneByBillNo")
@ApiOperation("旧件回收登记初始化")
ResultBean<AsBusrepairPageVo> getOneByBillNo(@RequestParam("billNo")String billNo){
return asBusrepairBillService.getOneByBillNo(billNo);
}
}

9
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@ -469,4 +469,13 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
}
return rb.success();
}
public PagerVo<AsBusrepairPageVo> pageBillList(PagerQuery<AsBusrepairPageQuery> pagerQuery) {
return null;
}
public ResultBean<AsBusrepairPageVo> getOneByBillNo(String billNo) {
return null;
}
}

2
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.java

@ -62,4 +62,6 @@ public interface AsBusreserveBillMapper extends BaseMapper<AsBusreserveBill> {
@Select("select * from as_busreserve_bill")
List<AsBusreserveBillVo> selectListVo();
int selectNum(String bill);
}

5
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml

@ -10,4 +10,9 @@
<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asbusreservebill.AsBusreserveBillVo">
SELECT * FROM as_busreserve_bill <where> ${ew.sqlSegment} </where>
</select>
<select id="selectNum" resultType="java.lang.Integer">
select IFNULL(CAST(REPLACE(MAX(billNo), #{bill}, '') AS SIGNED), 0) as code
from as_busreserve_bill
where billNo LIKE concat(#{bill}, '%')
</select>
</mapper>

16
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillRest.java

@ -100,4 +100,20 @@ public class AsBusreserveBillRest {
AsBusreserveBillDetailsVo vo = asBusreserveBillService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@ApiOperation("作废")
@PostMapping("/invalid")
public ResultBean invalid(@RequestParam("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
asBusreserveBillService.invalid(sid);
return rb.success();
}
@ApiOperation("保存跟踪记录")
@PostMapping("/saveTrackingRecord")
public ResultBean saveTrackingRecord(@RequestBody AsBusreserveBillDto dto) {
ResultBean rb = ResultBean.fireFail();
asBusreserveBillService.saveTrackingRecord(dto);
return rb.success();
}
}

193
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java

@ -26,11 +26,20 @@
package com.yxt.anrui.as.biz.asbusreservebill;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.as.api.asbusreservebill.*;
import com.yxt.anrui.as.api.asbusreservebillsitem.AsBusreserveBillSitem;
import com.yxt.anrui.as.api.enums.AsBillTypeEnum;
import com.yxt.anrui.as.api.utils.AsRule;
import com.yxt.anrui.as.api.utils.domain.AsBillNo;
import com.yxt.anrui.as.biz.asbusreservebillsitem.AsBusreserveBillSitemService;
import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery;
import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -64,14 +73,19 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
@Autowired
private AsBusreserveBillSitemService asBusreserveBillSitemService;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
private QueryWrapper<AsBusreserveBill> createQueryWrapper(AsBusreserveBillQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<AsBusreserveBill> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getUseOrgSid())) {
qw.eq("useOrgSid",query.getUseOrgSid());
}
// if (StringUtils.isNotBlank(query.getUseOrgSid())) {
// qw.eq("useOrgSid",query.getUseOrgSid());
// }
if (StringUtils.isNotBlank(query.getState())) {
qw.eq("state",query.getState());
}
@ -84,21 +98,116 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
if (StringUtils.isNotBlank(query.getVehMark())) {
qw.like("vehMark",query.getVehMark());
}
if (StringUtils.isNotBlank(query.getVehModel())) {
qw.like("vehModel",query.getVehModel());
}
return qw;
}
public PagerVo<AsBusreserveBillVo> listPageVo(PagerQuery<AsBusreserveBillQuery> pq) {
AsBusreserveBillQuery query = pq.getParams();
QueryWrapper<AsBusreserveBill> qw = createQueryWrapper(query);
QueryWrapper<AsBusreserveBill> qw = new QueryWrapper<>();
//========================================数据授权开始
if (StringUtils.isNotBlank(query.getMenuUrl())) {
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("createBySid", query.getUserSid());
} else {
PagerVo<AsBusreserveBillVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<AsBusreserveBillVo> p = new PagerVo<>();
return p;
}
}
if (StringUtils.isNotBlank(query.getState())) {
qw.eq("state",query.getState());
}
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("useOrgName",query.getUseOrgName());
}
if (StringUtils.isNotBlank(query.getCreateDept())) {
qw.like("createDept",query.getCreateDept());
}
if (StringUtils.isNotBlank(query.getCreateByName())) {
qw.like("createByName",query.getCreateByName());
}
if (StringUtils.isNotBlank(query.getBillNo())) {
qw.like("billNo",query.getBillNo());
}
if (StringUtils.isNotBlank(query.getCustomerName())) {
qw.like("customerName",query.getCustomerName());
}
if (StringUtils.isNotBlank(query.getVehMark())) {
qw.like("vehMark",query.getVehMark());
}
if (StringUtils.isNotBlank(query.getVinNo())) {
qw.like("vinNo",query.getVinNo());
}
if (StringUtils.isNotBlank(query.getMobile())) {
qw.like("mobile",query.getMobile());
}
String createStartTime = query.getStartCreateDate();
String createEndTime = query.getEndCreateDate();
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
String startDate = query.getStartDate();
String endDate = query.getEndDate();
qw.apply(StringUtils.isNotEmpty(startDate), "date_format (reserveStart,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(endDate), "date_format (reserveStart,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')"
);
IPage<AsBusreserveBill> page = PagerUtil.queryToPage(pq);
IPage<AsBusreserveBillVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<AsBusreserveBillVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
/**
* 生成单据编号
*
* @param orgSid
* @return
*/
public String getApplyCode(String orgSid) {
//获取分公司sid
ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(orgSid);
String orgCode = resultBean1.getData().getOrgCode();
AsBillNo b = new AsBillNo();
b.setOrgCode(orgCode);
b.setBillType(AsBillTypeEnum.YYD.getBillType());
String bill = AsRule.getBill(b);
int i = baseMapper.selectNum(bill);
String billNo = AsRule.getBillNo(bill, i);
return billNo;
}
public void saveOrUpdateDto(AsBusreserveBillDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isNotBlank(dtoSid)) {
@ -118,6 +227,18 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
} else {
AsBusreserveBill entity = new AsBusreserveBill();
BeanUtil.copyProperties(dto, entity, "id", "sid");
String orgPath = dto.getOrgPath();
entity.setOrgSidPath(orgPath);
ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath);
if (orgSidByPath.getSuccess()) {
entity.setUseOrgSid(orgSidByPath.getData());
entity.setCreateOrgSid(orgSidByPath.getData());
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(orgSidByPath.getData()).getData();
entity.setCreateOrgName(organizationVo.getName());
entity.setUseOrgName(organizationVo.getName());
String applyCode = getApplyCode(orgSidByPath.getData());
entity.setBillNo(applyCode);
}
baseMapper.insert(entity);
List<AsbillSitemVo> sitemVos = dto.getSitemVos();
if (!sitemVos.isEmpty()) {
@ -151,23 +272,49 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
AsBusreserveBill entity = fetchBySid(sid);
AsBusreserveBillDetailsVo vo = new AsBusreserveBillDetailsVo();
BeanUtil.copyProperties(entity, vo);
if (null != entity.getReserveStart()) {
vo.setReserveStart(sdf.format(entity.getReserveStart()));
}
if (null != entity.getReserveEnd()) {
vo.setReserveEnd(sdf.format(entity.getReserveEnd()));
}
List<AsbillSitemVo> sitemVos = new ArrayList<>();
List<AsBusreserveBillSitem> asBusreserveBillSitems = asBusreserveBillSitemService.fetchByMainSid(sid);
if (!asBusreserveBillSitems.isEmpty()) {
for (AsBusreserveBillSitem asBusreserveBillSitem : asBusreserveBillSitems) {
AsbillSitemVo sitemVo = new AsbillSitemVo();
BeanUtil.copyProperties(asBusreserveBillSitem, sitemVo);
sitemVos.add(sitemVo);
if (null != entity) {
BeanUtil.copyProperties(entity, vo);
vo.setCreateTime(DateUtil.formatDate(entity.getCreateTime()));
if (StringUtils.isNotBlank(entity.getOrgSidPath())) {
vo.setOrgPath(entity.getOrgSidPath());
}
if (null != entity.getReserveStart()) {
vo.setReserveStart(sdf.format(entity.getReserveStart()));
}
if (null != entity.getReserveEnd()) {
vo.setReserveEnd(sdf.format(entity.getReserveEnd()));
}
List<AsbillSitemVo> sitemVos = new ArrayList<>();
List<AsBusreserveBillSitem> asBusreserveBillSitems = asBusreserveBillSitemService.fetchByMainSid(sid);
if (!asBusreserveBillSitems.isEmpty()) {
for (AsBusreserveBillSitem asBusreserveBillSitem : asBusreserveBillSitems) {
AsbillSitemVo sitemVo = new AsbillSitemVo();
BeanUtil.copyProperties(asBusreserveBillSitem, sitemVo);
sitemVos.add(sitemVo);
}
vo.setSitemVos(sitemVos);
}
vo.setSitemVos(sitemVos);
}
return vo;
}
public void invalid(String sid) {
AsBusreserveBill bill = fetchBySid(sid);
if (null != bill) {
bill.setState(2);
baseMapper.updateById(bill);
}
}
public void saveTrackingRecord(AsBusreserveBillDto dto) {
if (StringUtils.isNotBlank(dto.getSid())) {
AsBusreserveBill bill = fetchBySid(dto.getSid());
if (null != bill) {
if (StringUtils.isNotBlank(dto.getTrackLogs())) {
bill.setTrackLogs(dto.getTrackLogs());
}
baseMapper.updateById(bill);
}
}
}
}
Loading…
Cancel
Save