Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 1 year ago
parent
commit
6a7d1f2e62
  1. 9
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java
  2. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
  3. 118
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java
  4. 16
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml
  5. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/ScheduledRepaymentService.java
  6. 11
      yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyDetailsVo.java
  7. 5
      yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyDto.java
  8. 25
      yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyQuery.java
  9. 24
      yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyVo.java
  10. 2
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java
  11. 2
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java
  12. 2
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java
  13. 2
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.java
  14. 7
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml
  15. 12
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyRest.java
  16. 137
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java

9
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java

@ -682,6 +682,7 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
NullPointerException nullPointerException = new NullPointerException();
}
String temp = getCellVal(row.getCell(i)).toString().trim();
String inPut = temp.trim();
for (int j = 0; j < resultCell.length; j++) {
if (i == resultCell[j]) {
switch (i) {
@ -690,16 +691,16 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
rowList.add(String.valueOf(r + 1));
break;
case 1:
importVo.setVehicleTypeCode(temp);
importVo.setVehicleTypeCode(inPut);
break;
case 2:
importVo.setConfigCode(temp);
importVo.setConfigCode(inPut);
break;
case 3:
importVo.setGuidedPrice(temp);
importVo.setGuidedPrice(inPut);
break;
case 4:
importVo.setManufactorSettlementPrice(temp);
importVo.setManufactorSettlementPrice(inPut);
break;
default:
break;

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java

@ -352,7 +352,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
dto2.setDimensionDept(voucherDetail.getDeptCode());
dto2.setDimensionCustom(voucherDetail.getCustomerCode());
dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
dto2.setCredit(String.valueOf(voucherDetail.getAmount()));
dto2.setDebit("-" + voucherDetail.getAmount().toString());
resultDetails.add(dto1);
resultDetails.add(dto2);
}
@ -552,7 +552,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
}
}
log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher));
return voucherService.saveVoucher(newVoucher);
return voucherService.saveVoucher(newVoucher);
}
/**

118
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java

@ -682,20 +682,16 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
}
private void pushLaterBuckleVoucher(String businessSid) {
List<LoanBuckleApplyRecord> records = loanBuckleApplyRecordService.selByMainSid(businessSid);
if (!records.isEmpty()) {
LoanBuckleApply loanBuckleApply = fetchBySid(businessSid);
if (null != loanBuckleApply) {
List<LoanPlanDetailsVoForLateVoucher> records = loanRepaymentPlanDetailsService.selListForLateVoucher(loanBuckleApply.getUseOrgSid());
List<String> planSids = new ArrayList<>();
List<String> finalPlanSids = new ArrayList<>();
records.stream().forEach(r -> {
planSids.add(r.getRepaymentHistorySid());
});
if (!planSids.isEmpty()) {
List<LoanPlanDetailsVoForLateVoucher> vouchers = loanRepaymentPlanDetailsService.selPushLaterVoucherOnBuckle(planSids);
if (!vouchers.isEmpty()) {
GeneralVoucher generalVoucher = new GeneralVoucher();
List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
for (LoanPlanDetailsVoForLateVoucher planDetails : vouchers) {
finalPlanSids.add(planDetails.getPlanSid());
if (!records.isEmpty()) {
GeneralVoucher generalVoucher = new GeneralVoucher();
List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
for (LoanPlanDetailsVoForLateVoucher planDetails : records) {
if (null != planDetails) {
planSids.add(planDetails.getPlanSid());
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
if (StringUtils.isNotBlank(planDetails.getUseOrgSid())) {
String useOrgSid = planDetails.getUseOrgSid();
@ -758,16 +754,102 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
voucherDetail.setAmount(new BigDecimal(planDetails.getOutstandingMoney()));
}
voucherDetails.add(voucherDetail);
}
generalVoucher.setVoucherDetails(voucherDetails);
finKingDeeFeign.saveLateVoucher(generalVoucher);
}
generalVoucher.setVoucherDetails(voucherDetails);
finKingDeeFeign.saveLateVoucher(generalVoucher);
}
if (!finalPlanSids.isEmpty()) {
int i = loanRepaymentPlanDetailsService.updateOweState(finalPlanSids);
if (!planSids.isEmpty()) {
int i = loanRepaymentPlanDetailsService.updateOweState(planSids);
}
}
// List<LoanBuckleApplyRecord> records = loanBuckleApplyRecordService.selByMainSid(businessSid);
// if (!records.isEmpty()) {
// List<String> planSids = new ArrayList<>();
// List<String> finalPlanSids = new ArrayList<>();
// records.stream().forEach(r -> {
// planSids.add(r.getRepaymentHistorySid());
// });
// if (!planSids.isEmpty()) {
// List<LoanPlanDetailsVoForLateVoucher> vouchers = loanRepaymentPlanDetailsService.selPushLaterVoucherOnBuckle(planSids);
// if (!vouchers.isEmpty()) {
// GeneralVoucher generalVoucher = new GeneralVoucher();
// List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
// for (LoanPlanDetailsVoForLateVoucher planDetails : vouchers) {
// finalPlanSids.add(planDetails.getPlanSid());
// GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
// if (StringUtils.isNotBlank(planDetails.getUseOrgSid())) {
// String useOrgSid = planDetails.getUseOrgSid();
// SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
// if (null != organizationVo) {
// generalVoucher.setUseOrgCode(organizationVo.getOrgCode());
// }
// }
// if (StringUtils.isNotBlank(planDetails.getScheduleSid())) {
// LoanRepaymentSchedule repaymentSchedule = loanRepaymentScheduleService.fetchBySid(planDetails.getScheduleSid());
// if (null != repaymentSchedule) {
// if (StringUtils.isNotBlank(repaymentSchedule.getCwDeptNo())) {
// voucherDetail.setDeptCode(repaymentSchedule.getCwDeptNo());
// }
// }
// }
// BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
// BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(planDetails.getSalesOrderSid()).getData();
// if (null != salesOrder) {
// if (null != busSalesOrderVehicle) {
// String customerNumber = "";
// //判断财务系统是否有客户
// Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
// String linkNo = "";
// BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
// if (!aBoolean) {
// // List<BdCustomer> bdCustomers = new ArrayList<>();
// BdCustomer bdCustomer = new BdCustomer();
// bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
// bdCustomer.setFShortName(salesOrder.getContractNo());
// BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
// bdCustomer.setTOrgIds(data.getOrgCode());
// if (org.apache.commons.lang3.StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
// String vinNo = busSalesOrderVehicle.getLinkNo();
// if (vinNo.length() > 8) {
// linkNo = vinNo.substring(vinNo.length() - 8);
// } else {
// linkNo = busSalesOrderVehicle.getLinkNo();
// }
// if (null != borrowerDetailsVo) {
// bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo);
// }
// } else {
// if (null != borrowerDetailsVo) {
// bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo());
// }
// }
// // bdCustomers.add(bdCustomer);
// ResultBean<String> resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer);
// if (resultBean.getSuccess()) {
// customerNumber = bdCustomer.getFNumber();
// }
// } else {
// customerNumber = busSalesOrderVehicle.getTemporaryNo();
// }
// voucherDetail.setCustomerCode(customerNumber);
// }
// }
// if (StringUtils.isNotBlank(planDetails.getOutstandingMoney())) {
// voucherDetail.setAmount(new BigDecimal(planDetails.getOutstandingMoney()));
// }
// voucherDetails.add(voucherDetail);
//
// }
// generalVoucher.setVoucherDetails(voucherDetails);
// finKingDeeFeign.saveLateVoucher(generalVoucher);
// }
// }
// if (!finalPlanSids.isEmpty()) {
// int i = loanRepaymentPlanDetailsService.updateOweState(finalPlanSids);
// }
// }
}
private void pushBuckleVoucher(String businessSid) {

16
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml

@ -253,7 +253,7 @@
</select>
<select id="repaymentStatistics"
resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.RepaymentStatisticsVo">
SELECT DISTINCT
SELECT
a.*,
(SELECT
(fjj.reveivableMoney - fjj.m)
@ -341,7 +341,7 @@
</select>
<select id="repaymentDetailsList"
resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.RepaymentDetailsListVo">
SELECT DISTINCT
SELECT
*
FROM
(
@ -414,7 +414,7 @@
</select>
<select id="repaymentStatisticsExport"
resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.RepaymentStatisticsExportVo">
SELECT DISTINCT
SELECT
a.*
FROM
(
@ -542,7 +542,7 @@
</select>
<select id="selPlanDetailsByBank"
resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.NoImportVo">
SELECT DISTINCT *
SELECT *
FROM (
SELECT p.sid,
po.bankSid,
@ -583,7 +583,7 @@
AND a.useOrgSid = #{useOrgSid}
</select>
<select id="selNotRuleForBuckSids" resultType="java.lang.String">
SELECT DISTINCT b.sid
SELECT b.sid
FROM (
SELECT his.*,
a.*
@ -618,7 +618,7 @@
LIMIT 1
</select>
<select id="selSidsForBuckle" resultType="java.lang.String">
SELECT DISTINCT b.sid
SELECT b.sid
FROM (
SELECT his.*,
a.*
@ -643,7 +643,7 @@
</select>
<select id="exportStatisticsExcel"
resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.export.RecordCountVo">
SELECT DISTINCT
SELECT
a.*,
(SELECT
(fjj.reveivableMoney - fjj.m)
@ -727,7 +727,7 @@
</select>
<select id="exportDetailsExcel"
resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.export.RepaymentDetailsExportVo">
SELECT DISTINCT
SELECT
@row_number := @row_number + 1 AS rankNo,
a.*
FROM

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/ScheduledRepaymentService.java

@ -57,7 +57,7 @@ public class ScheduledRepaymentService {
//@Scheduled(cron = "0 0 0 * * ?")
// @Scheduled(cron = "0 0/5 16 * * ?")
// @Scheduled(cron = "0/30 * * * * ?") //每30秒执行一次
// @Scheduled(cron = "0 0/5 * * * ?")
@Scheduled(cron = "0 0 9 * * ?")
public void scanRepayment() {
List<ScanRepaymentVo> schedules = loanRepaymentScheduleService.scanRepaymentVos();
schedules.removeAll(Collections.singleton(null));

11
yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyDetailsVo.java

@ -31,6 +31,7 @@ import com.yxt.common.core.vo.Vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -61,6 +62,12 @@ public class AsArrearsoutApplyDetailsVo implements Vo {
private String remarks;
@ApiModelProperty("制单人sid")
private String createBySid;
@ApiModelProperty("申请日期")
@JsonFormat(
pattern = "yyyy-MM-dd",
timezone = "GMT+8"
)
private Date createTime;
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据编号")
@ -88,7 +95,7 @@ public class AsArrearsoutApplyDetailsVo implements Vo {
@ApiModelProperty("工单欠款金额")
private BigDecimal pairArrearsMoney; // 工单欠款金额
@ApiModelProperty("附件路径")
private List<AsArrearsoutApplyFile> filePaths; // 附件路径(多个附件之间英文逗号隔开)
private List<AsArrearsoutApplyFile> filePaths = new ArrayList<>(); // 附件路径(多个附件之间英文逗号隔开)
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
@ -115,7 +122,7 @@ public class AsArrearsoutApplyDetailsVo implements Vo {
@ApiModelProperty("结算日期")
private Date balanceDate;
@ApiModelProperty("工单类型key")
private String billTypeKey;
private Integer billTypeKey;
@ApiModelProperty("工单类型value")
private String billTypeValue;
@ApiModelProperty("客户联系电话")

5
yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyDto.java

@ -31,6 +31,7 @@ import com.yxt.common.core.dto.Dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -88,7 +89,7 @@ public class AsArrearsoutApplyDto implements Dto {
@ApiModelProperty("工单欠款金额")
private BigDecimal pairArrearsMoney; // 工单欠款金额
@ApiModelProperty("附件路径")
private List<AsArrearsoutApplyFile> filePaths; // 附件路径(多个附件之间英文逗号隔开)
private List<AsArrearsoutApplyFile> filePaths = new ArrayList<>(); // 附件路径(多个附件之间英文逗号隔开)
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
@ -115,7 +116,7 @@ public class AsArrearsoutApplyDto implements Dto {
@ApiModelProperty("结算日期")
private Date balanceDate;
@ApiModelProperty("工单类型key")
private String billTypeKey;
private Integer billTypeKey;
@ApiModelProperty("工单类型value")
private String billTypeValue;
@ApiModelProperty("客户联系电话")

25
yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyQuery.java

@ -53,21 +53,30 @@ import lombok.Data;
@ApiModel(value = "欠款出厂申请 查询条件", description = "欠款出厂申请 查询条件")
public class AsArrearsoutApplyQuery implements Query {
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("申请人")
private String createByName;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("创建开始日期")
private String createStartTime;
@ApiModelProperty("创建结束日期")
private String createEndTime;
@ApiModelProperty("办结开始日期")
private String finishStartTime;
@ApiModelProperty("办结结束日期")
private String finishEndTime;
@ApiModelProperty("工单编号")
private String pairBillNo;
@ApiModelProperty("工单类型")
private String billType;
@ApiModelProperty("科目名称")
private String subject;
private String billTypeValue;
@ApiModelProperty("客户姓名")
private String customerName;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("车牌号")
private String vehMark;
private String userSid;
private String orgPath;
private String menuUrl;
private String menuSid;
}

24
yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyVo.java

@ -59,26 +59,36 @@ public class AsArrearsoutApplyVo implements Vo {
private String nodeState;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("创建组织名称")
private String useOrgName;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("申请人")
private String createByName;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("创建时间")
private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime;
@ApiModelProperty("工单编号")
private String pairBillNo;
@ApiModelProperty("工单类型")
private String billType;
@ApiModelProperty("科目名称")
private String subject;
private String billTypeValue;
@ApiModelProperty("客户姓名")
private String customerName;
@ApiModelProperty("客户联系电话")
private String customerPhone;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("车牌号")
private String vehMark;
@ApiModelProperty("工单应收金额")
private BigDecimal pairReceivableMoney;
@ApiModelProperty("工单已交金额")
private BigDecimal pairReceivedMoney;
@ApiModelProperty("工单欠款金额")
private BigDecimal pairArrearsMoney;
@ApiModelProperty("制单人姓名")
private String createByName;
@ApiModelProperty("发起日期")
private String createTime;
@ApiModelProperty("流程定义的id")
private String procDefId;
@ApiModelProperty("流程实例的sid")

2
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java

@ -91,6 +91,8 @@ public class AsBusrepairBill extends BaseEntity {
private String groupSid;
@ApiModelProperty("班组名称")
private String groupName;
@ApiModelProperty("应收金额")
private BigDecimal receivableAmount;

2
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java

@ -18,6 +18,8 @@ import java.util.List;
public class AsBusrepairBillDetailsVo implements Vo {
private String sid;
private String orgPath;
@ApiModelProperty("应收金额")
private String receivableAmount;
@ApiModelProperty("班组sid")
private String groupSid;
private String createDate;

2
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java

@ -18,6 +18,8 @@ import java.util.List;
public class AsBusrepairBillDto implements Dto {
private String sid;
private String orgPath;
@ApiModelProperty("应收金额")
private String receivableAmount;
@ApiModelProperty("班组sid")
private String groupSid;
@ApiModelProperty("班组名称")

2
yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.java

@ -67,4 +67,6 @@ public interface AsArrearsoutApplyMapper extends BaseMapper<AsArrearsoutApply> {
int updateFlowFiled(Map<String, Object> map);
String selectNum(String billNo);
int selectBySid(String join);
}

7
yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml

@ -36,4 +36,11 @@
order by billNo desc
limit 1
</select>
<select id="selectBySid" resultType="int">
SELECT COUNT(*)
FROM as_arrearsout_apply
WHERE nodeState != '待提交'
and find_in_set(sid, #{list})
</select>
</mapper>

12
yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyRest.java

@ -84,11 +84,17 @@ public class AsArrearsoutApplyRest {
}
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
return asArrearsoutApplyService.delAll(sids);
}
@ApiOperation("初始化")
@GetMapping("/init/{gdSid}")
public ResultBean<AsArrearsoutApplyDetailsVo> init(@PathVariable("gdSid") String gdSid){
ResultBean rb = ResultBean.fireFail();
asArrearsoutApplyService.delBySids(sids);
return rb.success();
AsArrearsoutApplyDetailsVo vo = asArrearsoutApplyService.init(gdSid);
return rb.success().setData(vo);
}
@ApiOperation("根据SID获取一条记录")

137
yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java

@ -30,7 +30,12 @@ import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.as.api.asarrearsoutapply.*;
import com.yxt.anrui.as.api.asarrearsoutapply.flowable.*;
import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill;
import com.yxt.anrui.as.api.asbusrepairbillvech.AsBusrepairBillVech;
import com.yxt.anrui.as.biz.asbusrepairbill.AsBusrepairBillService;
import com.yxt.anrui.as.biz.asbusrepairbillvech.AsBusrepairBillVechService;
import com.yxt.anrui.as.feign.base.billno.Rule;
import com.yxt.anrui.as.feign.flowable.flow.*;
import com.yxt.anrui.as.feign.flowable.flow2.FlowDelegateQuery;
@ -46,17 +51,13 @@ 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 com.yxt.common.base.config.component.FileUploadComponent;
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.as.api.asarrearsoutapply.AsArrearsoutApply;
import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyQuery;
import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyVo;
import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyDetailsVo;
import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -94,58 +95,33 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp
private FlowFeign flowFeign;
@Autowired
private MessageFeign messageFeign;
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private AsBusrepairBillService asBusrepairBillService;
@Autowired
private AsBusrepairBillVechService asBusrepairBillVechService;
public PagerVo<AsArrearsoutApplyVo> listPageVo(PagerQuery<AsArrearsoutApplyQuery> pq) {
AsArrearsoutApplyQuery query = pq.getParams();
QueryWrapper<AsArrearsoutApply> qw = new QueryWrapper<>();
//========================================数据授权开始
if (StringUtils.isNotBlank(query.getMenuUrl())) {
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setMenuSid(query.getMenuSid());
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<AsArrearsoutApplyVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<AsArrearsoutApplyVo> p = new PagerVo<>();
return p;
}
if (StringUtils.isNotBlank(query.getCreateOrgName())) {
qw.like("useOrgName", query.getCreateOrgName());
}
if (StringUtils.isNotBlank(query.getDeptName())) {
qw.like("deptName", query.getDeptName());
}
if (StringUtils.isNotBlank(query.getCreateByName())) {
qw.like("createByName", query.getCreateByName());
}
if (StringUtils.isNotBlank(query.getBillNo())) {
qw.like("billNo", query.getBillNo());
}
if (StringUtils.isNotBlank(query.getPairBillNo())){
qw.like("pairBillNo",query.getPairBillNo());
}
if (StringUtils.isNotBlank(query.getBillType())){
qw.like("billType",query.getBillType());
}
if (StringUtils.isNotBlank(query.getSubject())){
qw.like("subject",query.getSubject());
if (StringUtils.isNotBlank(query.getBillTypeValue())){
qw.like("billTypeValue",query.getBillTypeValue());
}
if (StringUtils.isNotBlank(query.getCustomerName())){
qw.like("customerName",query.getCustomerName());
@ -156,6 +132,16 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp
if (StringUtils.isNotBlank(query.getVehMark())){
qw.like("vehMark",query.getVehMark());
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
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 finishStartTime = query.getFinishStartTime();
String finishEndTime = query.getFinishEndTime();
qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(finishEndTime), "date_format (finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
);
IPage<AsArrearsoutApply> page = PagerUtil.queryToPage(pq);
IPage<AsArrearsoutApplyVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<AsArrearsoutApplyVo> p = PagerUtil.pageToVo(pagging, null);
@ -193,6 +179,13 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp
AsArrearsoutApply entity = new AsArrearsoutApply();
BeanUtil.copyProperties(dto, entity, "id", "sid");
entity.setNodeState("待提交");
List<AsArrearsoutApplyFile> filePaths = dto.getFilePaths();
String url = "";
for (AsArrearsoutApplyFile asArrearsoutApplyFile : filePaths) {
String filePath = asArrearsoutApplyFile.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
url = url + filePath + ",";
}
entity.setFilePath(url);
baseMapper.insert(entity);
return entity.getSid();
}
@ -204,6 +197,13 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp
}
AsArrearsoutApply entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
List<AsArrearsoutApplyFile> filePaths = dto.getFilePaths();
String url = "";
for (AsArrearsoutApplyFile asArrearsoutApplyFile : filePaths) {
String filePath = asArrearsoutApplyFile.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
url = url + filePath + ",";
}
entity.setFilePath(url);
baseMapper.updateById(entity);
}
@ -211,9 +211,37 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp
AsArrearsoutApply entity = fetchBySid(sid);
AsArrearsoutApplyDetailsVo vo = new AsArrearsoutApplyDetailsVo();
BeanUtil.copyProperties(entity, vo);
String filePath = entity.getFilePath();
String[] filePaths = filePath.split(",");
List<AsArrearsoutApplyFile> urlPahts = new ArrayList<>();
for (String path : filePaths) {
String url = fileUploadComponent.getUrlPrefix() + path;
AsArrearsoutApplyFile asArrearsoutApplyFile = new AsArrearsoutApplyFile();
asArrearsoutApplyFile.setUrl(url);
urlPahts.add(asArrearsoutApplyFile);
}
vo.setFilePaths(urlPahts);
return vo;
}
public AsArrearsoutApplyDetailsVo init(String gdSid) {
AsBusrepairBill asBusrepairBill = asBusrepairBillService.fetchBySid(gdSid);
AsArrearsoutApplyDetailsVo asArrearsoutApplyDetailsVo = new AsArrearsoutApplyDetailsVo();
asArrearsoutApplyDetailsVo.setPairBillSid(gdSid);
asArrearsoutApplyDetailsVo.setPairBillNo(asBusrepairBill.getBillNo());
asArrearsoutApplyDetailsVo.setCustomerSid(asBusrepairBill.getCustomerSid());
asArrearsoutApplyDetailsVo.setCustomerName(asBusrepairBill.getCustomerName());
asArrearsoutApplyDetailsVo.setCustomerPhone(asBusrepairBill.getMobile());
AsBusrepairBillVech asBusrepairBillVech = asBusrepairBillVechService.fetchByBillSid(gdSid);
asArrearsoutApplyDetailsVo.setVinNo(asBusrepairBillVech.getVinNo());
asArrearsoutApplyDetailsVo.setVehMark(asBusrepairBillVech.getVehMark());
asArrearsoutApplyDetailsVo.setUseOrgSid(asBusrepairBill.getUseOrgSid());
asArrearsoutApplyDetailsVo.setUseOrgName(asBusrepairBill.getUseOrgName());
asArrearsoutApplyDetailsVo.setBillTypeKey(asBusrepairBill.getBillTypeKey());
asArrearsoutApplyDetailsVo.setBillTypeValue(asBusrepairBill.getBillType());
return asArrearsoutApplyDetailsVo;
}
public ResultBean submit(SubmitAsArrearsoutApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
AsArrearsoutApply asArrearsoutApply = fetchBySid(dto.getSid());
@ -508,4 +536,15 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp
flowFeign.delegate(delegateQuery);
return rb.success();
}
public ResultBean delAll(String[] sids) {
ResultBean rb = ResultBean.fireFail();
//查询该sid中是否有流程不是待提交的
int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
if (count > 0) {
return rb.setMsg("删除的数据中包含已提交或已办结审批的数据,删除失败");
}
delBySids(sids);
return rb.success();
}
}
Loading…
Cancel
Save