diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java index 8b78aa1a4b..e665961935 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.fin.api.finselectedreceivablesdetailed; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,51 +14,36 @@ import lombok.Data; public class FinSelectReceivablesDetailedVo implements Vo { private static final long serialVersionUID = -1672232048017802807L; + @ApiModelProperty("应收未收款项sid") + private String sid; // 应收未收款项sid + @ApiModelProperty("合同sid") + private String contractSid; // 合同sid @ApiModelProperty("合同编号") - private String contractId; - - @ApiModelProperty("项目名称") - private String projectName; - - @ApiModelProperty("联系电话") - private String mobile; - + private String contractNo; // 合同编号 + @ApiModelProperty("客户sid") + private String customerSid; // 客户sid @ApiModelProperty("客户名称") - private String name; - - @ApiModelProperty("应收金额") - private String receivable; - - @ApiModelProperty("合同sid") - private String contractSid; - - @ApiModelProperty("认款金额") - private String confirmMoney; - + private String customerName; // 客户名称 @ApiModelProperty("车架号") - private String vin; - - @ApiModelProperty("认款时间") - private String confirmDate; - - @ApiModelProperty("认款状态") - private String state; - - @ApiModelProperty("sid") - private String sid; + @JsonProperty("VIN") + private String VIN; // 车架号 + @ApiModelProperty("联系电话") + private String customerPhone; // 联系电话 + @ApiModelProperty("应收项目名称") + private String receivablesName; // 应收项目名称 + @ApiModelProperty("当前应收金额") + private String currentReceivableMoney; // 当前应收金额 + @ApiModelProperty("应收金额") + private String reveivableMoney; + @ApiModelProperty("业务车辆sid") private String busVinSid; - @ApiModelProperty("付款方式value") - private String payType; - @ApiModelProperty("付款方式key:1全款、2贷款") + @ApiModelProperty("全款贷款key:1是全款,2贷款") private String payTypeKey; - @ApiModelProperty("客户sid") - private String customerSid; - @ApiModelProperty("分公司sid") - private String useOrgSid; + @ApiModelProperty("全款贷款") + private String payType; + @ApiModelProperty("是否是已认款的选择:0不是(应收未收),1是(已认款)") private int subscribedOf; - - } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java index b5ea933d2e..b5fa8baf35 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java @@ -356,7 +356,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService collList = baseMapper.selectPageList(qw,params.getName()); - if (collList.isEmpty()) { + /*if (collList.isEmpty()) { collList = baseMapper.selectPageList(qw, ""); for (FinSelectReceivablesDetailedVo record : collList) { record.setSubscribedOf(1); @@ -406,12 +406,12 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService cll = collList.stream().filter(v -> v.getVin().contains(pagerQuery.getParams().getName())).collect(Collectors.toList()); collList = Stream.of(collList, cll).flatMap(Collection::stream).collect(Collectors.toList()); } - } + }*/ //将collList根据sid去重 collList = collList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(FinSelectReceivablesDetailedVo::getSid))), ArrayList::new)); //根据合同编号倒序排序 - collList = collList.stream().sorted(Comparator.comparing(FinSelectReceivablesDetailedVo::getContractId).reversed()).collect(Collectors.toList()); +// collList = collList.stream().sorted(Comparator.comparing(FinSelectReceivablesDetailedVo::getContractId).reversed()).collect(Collectors.toList()); //分页 IPage page1 = new Page<>(); page1.setRecords(collList); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java index fcfc32036e..66c7fca53f 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java @@ -3,12 +3,9 @@ package com.yxt.anrui.portal.biz.sysflowableconfig; import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.portal.api.sysflowableconfig.*; import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; import org.springframework.stereotype.Service; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.Date; /** @@ -33,14 +30,7 @@ public class SysFlowableConfigService extends MybatisBaseService rb = ResultBean.fireFail(); SysFlowableConfigVo sysFlowableConfigVo = baseMapper.initDetails(userSid); if(sysFlowableConfigVo != null){ - if(StringUtils.isNotBlank(sysFlowableConfigVo.getStartDate())){ - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); - try { - sysFlowableConfigVo.setStartDateLong(sdf.parse(sysFlowableConfigVo.getStartDate()).getTime()); - } catch (ParseException e) { - e.printStackTrace(); - } - } + sysFlowableConfigVo.setStartDateLong(System.currentTimeMillis()); } return rb.success().setData(sysFlowableConfigVo); }