Browse Source

优化款项和流程转办添加字段

master
dimengzhe 2 years ago
parent
commit
bc1bc25f7b
  1. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/AppFinSelectedReceivablesDetailedDto.java
  2. 63
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java
  3. 3
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java
  4. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java
  5. 6
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java
  6. 7
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java
  7. 34
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesPaymentDetailsQuery.java
  8. 3
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedVo.java
  9. 3
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/DetailsOfReceivablesAndUncollectedItemsVo.java
  10. 2390
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  11. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java
  12. 24
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
  13. 16
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java
  14. 111
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
  15. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
  16. 2
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfig.java
  17. 2
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigVo.java
  18. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.java
  19. 10
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.xml
  20. 1
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/AppFinSelectedReceivablesDetailedDto.java

@ -81,4 +81,6 @@ public class AppFinSelectedReceivablesDetailedDto implements Dto {
private String customerSid;
@ApiModelProperty("使用组织sid")
private String useOrgSid;
private int subscribedOf;
}

63
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java

@ -0,0 +1,63 @@
package com.yxt.anrui.fin.api.finselectedreceivablesdetailed;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description: 已认款项列表
* @author: dimengzhe
* @date: 2023/6/29
**/
@Data
public class FinSelectReceivablesDetailedVo implements Vo {
private static final long serialVersionUID = -1672232048017802807L;
@ApiModelProperty("合同编号")
private String contractId;
@ApiModelProperty("项目名称")
private String projectName;
@ApiModelProperty("联系电话")
private String mobile;
@ApiModelProperty("客户名称")
private String name;
@ApiModelProperty("应收金额")
private String receivable;
@ApiModelProperty("合同sid")
private String contractSid;
@ApiModelProperty("认款金额")
private String confirmMoney;
@ApiModelProperty("车架号")
private String vin;
@ApiModelProperty("认款时间")
private String confirmDate;
@ApiModelProperty("认款状态")
private String state;
@ApiModelProperty("sid")
private String sid;
private String busVinSid;
@ApiModelProperty("付款方式value")
private String payType;
@ApiModelProperty("付款方式key:1全款、2贷款")
private String payTypeKey;
@ApiModelProperty("客户sid")
private String customerSid;
@ApiModelProperty("分公司sid")
private String useOrgSid;
private int subscribedOf;
}

3
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java

@ -90,4 +90,7 @@ public class FinSelectedReceivablesDetailed extends BaseEntity {
private String payTypeKey;
@ApiModelProperty("全款贷款")
private String payType;
@ApiModelProperty("是否是已认款中的数据选择过来的,0不是(应收未收),1是(已认款)")
private int subscribedOf;
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java

@ -89,4 +89,6 @@ public class FinSelectedReceivablesDetailedDto implements Dto {
private String payTypeKey;
@ApiModelProperty("全款贷款")
private String payType;
private int subscribedOf;
}

6
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java

@ -25,7 +25,9 @@
*********************************************************/
package com.yxt.anrui.fin.api.finselectedreceivablesdetailed;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
@ -77,4 +79,8 @@ public interface FinSelectedReceivablesDetailedFeign {
@ApiOperation("根据应收未收sid查询最新一条")
@PostMapping("/fetchByReceivablesSidLimt")
public ResultBean<FinSelectedReceivablesDetailed> fetchByReceivablesSidLimt(@RequestParam("ysSid") String ysSid);
@ApiOperation("选择已认款项")
@PostMapping("/selectPageList")
ResultBean<PagerVo<FinSelectReceivablesDetailedVo>> selectPageList(@RequestBody PagerQuery<FinSelectedReceivablesPaymentDetailsQuery> pagerQuery);
}

7
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java

@ -25,7 +25,9 @@
*********************************************************/
package com.yxt.anrui.fin.api.finselectedreceivablesdetailed;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
@ -76,4 +78,9 @@ public class FinSelectedReceivablesDetailedFeignFallback implements FinSelectedR
return null;
}
@Override
public ResultBean<PagerVo<FinSelectReceivablesDetailedVo>> selectPageList(PagerQuery<FinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
return null;
}
}

34
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesPaymentDetailsQuery.java

@ -0,0 +1,34 @@
package com.yxt.anrui.fin.api.finselectedreceivablesdetailed;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description: 已认款查询
* @author: dimengzhe
* @date: 2023/6/29
**/
@Data
public class FinSelectedReceivablesPaymentDetailsQuery implements Query {
private static final long serialVersionUID = -8017557386308627908L;
@ApiModelProperty("合同编号")
private String contractNo;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("联系电话")
private String mobile;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("采购系统")
private String purchaseSystemSid;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("机构sid")
private String orgPath;
private String name;
}

3
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedVo.java

@ -50,4 +50,7 @@ public class AppFinUncollectedReceivablesDetailedVo implements Vo {
@ApiModelProperty("分公司sid")
private String useOrgSid;
@ApiModelProperty("是否是从已认款列表选择的:0不是(应收未收),1已认款")
private int subscribedOf;
}

3
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/DetailsOfReceivablesAndUncollectedItemsVo.java

@ -78,4 +78,7 @@ public class DetailsOfReceivablesAndUncollectedItemsVo implements Vo {
private String payTypeKey;
@ApiModelProperty("全款贷款")
private String payType;
@ApiModelProperty("是否是已认款的选择:0不是(应收未收),1是(已认款)")
private int subscribedOf;
}

2390
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

File diff suppressed because it is too large

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java

@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery;
import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedVo;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.SelectCustomerVo;
@ -148,4 +149,8 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
int updateAuditStateBySid(@Param("auditState") int i, @Param("collSid") String sid);
FinSelectedReceivablesDetailed fetchByReceivablesSidLimt(String ysSid);
List<String> selectUnSelectList(@Param("purchaseSystemSid") String purchaseSystemSid, @Param("userSid") String userSid, @Param("useOrgSid") String useOrgSid);
List<FinSelectReceivablesDetailedVo> selectPageList(@Param(Constants.WRAPPER) QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw, @Param("name") String name);
}

24
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@ -280,4 +280,28 @@
AND auditState = 3
ORDER BY createTime DESC LIMIT 1
</select>
<select id="selectUnSelectList" resultType="java.lang.String">
select sid from fin_uncollected_receivables_detailed where currentReceivableMoney>0
and useOrgSid = #{useOrgSid} and createBySid = #{userSid} AND purchaseSystemSid = #{purchaseSystemSid}
</select>
<select id="selectPageList"
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedVo">
select fd.*
from fin_selected_receivables_detailed fd
left join fin_uncollected_receivables_detailed furd on furd.sid = fd.receivablesSid
where fd.receivablesName != '订金'
<where>
${ew.sqlSegment}
<if test="name != null and name != ''">
and concat(IFNULL(fd.customerName
, '')
, ifnull(fd.contractNo
, '')) LIKE concat('%'
, #{name}
, '%')
</if>
</where>
</select>
</mapper>

16
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java

@ -25,10 +25,12 @@
*********************************************************/
package com.yxt.anrui.fin.biz.finselectedreceivablesdetailed;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*;
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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@ -95,4 +97,12 @@ public class FinSelectedReceivablesDetailedRest implements FinSelectedReceivable
return finSelectedReceivablesDetailedService.fetchByReceivablesSidLimt(ysSid);
}
@Override
public ResultBean<PagerVo<FinSelectReceivablesDetailedVo>> selectPageList(PagerQuery<FinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
PagerVo<FinSelectReceivablesDetailedVo> page = new PagerVo<>();
IPage<FinSelectReceivablesDetailedVo> iPage = finSelectedReceivablesDetailedService.selectPageList(pagerQuery);
PagerVo<FinSelectReceivablesDetailedVo> pagerVo = PagerUtil.pageToVo(iPage, page);
return new ResultBean<PagerVo<FinSelectReceivablesDetailedVo>>().success().setData(pagerVo);
}
}

111
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java

@ -28,20 +28,27 @@ package com.yxt.anrui.fin.biz.finselectedreceivablesdetailed;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery;
import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
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 org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* Project: anrui-fin(销售相关) <br/>
@ -58,6 +65,12 @@ import java.util.List;
*/
@Service
public class FinSelectedReceivablesDetailedService extends MybatisBaseService<FinSelectedReceivablesDetailedMapper, FinSelectedReceivablesDetailed> {
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
public PagerVo<FinSelectedReceivablesDetailed> listPage(PagerQuery<FinSelectedReceivablesDetailedQuery> pq) {
FinSelectedReceivablesDetailedQuery query = pq.getParams();
QueryWrapper<FinSelectedReceivablesDetailed> qw = createQueryWrapper(query);
@ -312,4 +325,100 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = baseMapper.fetchByReceivablesSidLimt(ysSid);
return rb.success().setData(finSelectedReceivablesDetailed);
}
public IPage<FinSelectReceivablesDetailedVo> selectPageList(PagerQuery<FinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
IPage<FinSelectReceivablesDetailedVo> page = PagerUtil.queryToPage(pagerQuery);
FinSelectedReceivablesPaymentDetailsQuery params = pagerQuery.getParams();
QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(pagerQuery.getParams().getPurchaseSystemSid())) {
qw.eq("purchaseSystemSid", pagerQuery.getParams().getPurchaseSystemSid());
} else {
qw.eq("purchaseSystemSid", "0");
}
String useOrgSid = "";
String orgPath = pagerQuery.getParams().getOrgPath();
String userSid = pagerQuery.getParams().getUserSid();
if (StringUtils.isNotBlank(orgPath)) {
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
} else {
useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
}
if (StringUtils.isNotBlank(useOrgSid)) {
qw.eq("useOrgSid", useOrgSid);
}
if (StringUtils.isNotBlank(userSid)) {
qw.eq("createBySid", userSid);
}
//查询没有认完的车辆sid
List<String> stringList = baseMapper.selectUnSelectList(pagerQuery.getParams().getPurchaseSystemSid(),userSid,useOrgSid);
stringList.removeAll(Collections.singleton(null));
if(!stringList.isEmpty()){
qw.notIn("receivablesSid",stringList);
}
List<FinSelectReceivablesDetailedVo> collList = baseMapper.selectPageList(qw,params.getName());
if (collList.isEmpty()) {
collList = baseMapper.selectPageList(qw, "");
for (FinSelectReceivablesDetailedVo record : collList) {
record.setSubscribedOf(1);
String busVinSid = record.getBusVinSid();
ResultBean<BusSalesOrderVehicle> resultBean = busSalesOrderVehicleFeign.details(busVinSid);
if (resultBean.getData() != null) {
String vinNo = resultBean.getData().getLinkNo();
String vinSid = resultBean.getData().getLinkSid();
String temporaryNo = resultBean.getData().getTemporaryNo();
record.setVin(vinNo);
if (StringUtils.isNotBlank(vinNo)) {
record.setVin(vinNo.substring(vinNo.length() - 8));
} else {
if ("2".equals(record.getPayTypeKey())) {
record.setVin(temporaryNo.substring(temporaryNo.length() - 2));
} else {
record.setVin(temporaryNo);
}
}
}
}
if (StringUtils.isNotBlank(pagerQuery.getParams().getName())) {
collList = collList.stream().filter(v -> v.getVin().contains(pagerQuery.getParams().getName())).collect(Collectors.toList());
}
} else {
for (FinSelectReceivablesDetailedVo record : collList) {
record.setSubscribedOf(1);
String busVinSid = record.getBusVinSid();
ResultBean<BusSalesOrderVehicle> resultBean = busSalesOrderVehicleFeign.details(busVinSid);
if (resultBean.getData() != null) {
String vinNo = resultBean.getData().getLinkNo();
String vinSid = resultBean.getData().getLinkSid();
String temporaryNo = resultBean.getData().getTemporaryNo();
record.setVin(vinNo);
if (StringUtils.isNotBlank(vinNo)) {
record.setVin(vinNo.substring(vinNo.length() - 8));
} else {
if ("2".equals(record.getPayTypeKey())) {
record.setVin(temporaryNo.substring(temporaryNo.length() - 2));
} else {
record.setVin(temporaryNo);
}
}
}
}
if (StringUtils.isNotBlank(pagerQuery.getParams().getName())) {
List<FinSelectReceivablesDetailedVo> 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());
//分页
IPage<FinSelectReceivablesDetailedVo> page1 = new Page<>();
page1.setRecords(collList);
page1.setTotal(collList.size());
page1.setPages((collList.size() / pagerQuery.getSize()) + 1);
page1.setCurrent(pagerQuery.getCurrent());
page1.setSize(pagerQuery.getSize());
return page1;
}
}

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@ -29,7 +29,6 @@ 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.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo;
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
import com.yxt.anrui.base.api.commoncontract.CommonContractVo;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
@ -200,6 +199,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
list.removeAll(Collections.singleton(null));
if (!list.isEmpty()) {
for (DetailsOfReceivablesAndUncollectedItemsVo v : list) {
v.setSubscribedOf(0);
String busVinSid = v.getBusVinSid();
ResultBean<BusSalesOrderVehicle> resultBean = busSalesOrderVehicleFeign.details(busVinSid);
if (resultBean.getData() != null) {

2
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfig.java

@ -23,4 +23,6 @@ public class SysFlowableConfig extends BaseEntity {
private Date startDate;
@ApiModelProperty("结束时间")
private Date endDate;
private String changeName;
}

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

@ -22,4 +22,6 @@ public class SysFlowableConfigVo implements Vo {
@ApiModelProperty("结束时间")
private String endDate;
private String changeName;
}

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

@ -22,4 +22,6 @@ public interface SysFlowableConfigMapper extends BaseMapper<SysFlowableConfig> {
SysFlowableConfig selectByUserSids(String userSid);
int deleteBySid(String userSid);
String selectBySid(String changeUserSid);
}

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

@ -2,7 +2,9 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.portal.biz.sysflowableconfig.SysFlowableConfigMapper">
<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 * from sys_flowable_config where userSid = #{userSid}
and(startDate is null or startDate &lt;#{nowDate})
and(endDate is null or endDate>#{nowDate})
</select>
<select id="initDetails" resultType="com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigVo">
@ -16,4 +18,10 @@
<delete id="deleteBySid">
delete from sys_flowable_config where userSid = #{userSid}
</delete>
<select id="selectBySid" resultType="java.lang.String">
select si.name from sys_user su
left join sys_staffinfo si on si.sid = su.staffSid
where su.sid = #{changeUserSid}
</select>
</mapper>

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

@ -41,6 +41,7 @@ public class SysFlowableConfigService extends MybatisBaseService<SysFlowableConf
}
sysFlowableConfig = new SysFlowableConfig();
BeanUtil.copyProperties(dto,sysFlowableConfig,"sid");
String name = baseMapper.selectBySid(dto.getChangeUserSid());
baseMapper.insert(sysFlowableConfig);
return rb.success();
}

Loading…
Cancel
Save