DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

付款进度代码同步

Browse Source
This commit is contained in:
hdka
2025-05-25 18:15:07 +08:00
parent af5ae35562
commit d5660ee8aa
17 changed files with 690 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaPaymentProgressService.java Normal file
View File

@@ -0,0 +1,49 @@
package com.ruoyi.oa.service;
import com.ruoyi.oa.domain.OaPaymentProgress;
import com.ruoyi.oa.domain.vo.OaPaymentProgressVo;
import com.ruoyi.oa.domain.bo.OaPaymentProgressBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 项目付款进度Service接口
*
* @author hdka
* @date 2025-05-23
*/
public interface IOaPaymentProgressService {
/**
* 查询项目付款进度
*/
OaPaymentProgressVo queryById(Long paymentProgressId);
/**
* 查询项目付款进度列表
*/
TableDataInfo<OaPaymentProgressVo> queryPageList(OaPaymentProgressBo bo, PageQuery pageQuery);
/**
* 查询项目付款进度列表
*/
List<OaPaymentProgressVo> queryList(OaPaymentProgressBo bo);
/**
* 新增项目付款进度
*/
Boolean insertByBo(OaPaymentProgressBo bo);
/**
* 修改项目付款进度
*/
Boolean updateByBo(OaPaymentProgressBo bo);
/**
* 校验并批量删除项目付款进度信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

7
ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaFinanceService.java
View File

@@ -91,4 +91,11 @@ public interface ISysOaFinanceService {
Boolean deleteSysOaFinanceById(Long financeId);
List<SysOaFinanceVo> getBarData(SysOaFinanceBo bo);
public List<SysOaFinanceVo> getByProgressId(Long progressId);
public void deleteDetail(Long financeId);
TableDataInfo<SysOaFinanceVo> progressList(SysOaFinanceBo bo, PageQuery pageQuery);
}

117
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaPaymentProgressServiceImpl.java Normal file
View File

@@ -0,0 +1,117 @@
package com.ruoyi.oa.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.ruoyi.oa.domain.bo.OaPaymentProgressBo;
import com.ruoyi.oa.domain.vo.OaPaymentProgressVo;
import com.ruoyi.oa.domain.OaPaymentProgress;
import com.ruoyi.oa.mapper.OaPaymentProgressMapper;
import com.ruoyi.oa.service.IOaPaymentProgressService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 项目付款进度Service业务层处理
*
* @author hdka
* @date 2025-05-23
*/
@RequiredArgsConstructor
@Service
public class OaPaymentProgressServiceImpl implements IOaPaymentProgressService {
private final OaPaymentProgressMapper baseMapper;
/**
* 查询项目付款进度
*/
@Override
public OaPaymentProgressVo queryById(Long paymentProgressId){
return baseMapper.selectVoById(paymentProgressId);
}
/**
* 查询项目付款进度列表
*/
@Override
public TableDataInfo<OaPaymentProgressVo> queryPageList(OaPaymentProgressBo bo, PageQuery pageQuery) {
QueryWrapper<OaPaymentProgress> lqw = buildQueryWrapper(bo);
Page<OaPaymentProgressVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询项目付款进度列表
*/
@Override
public List<OaPaymentProgressVo> queryList(OaPaymentProgressBo bo) {
QueryWrapper<OaPaymentProgress> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private QueryWrapper<OaPaymentProgress> buildQueryWrapper(OaPaymentProgressBo bo) {
Map<String, Object> params = bo.getParams();
QueryWrapper<OaPaymentProgress> lqw = Wrappers.query();
lqw.like(bo.getProjectId() != null,"opp.project_id", bo.getProjectId());
lqw.ge(bo.getStartTime() != null, "opp.start_time", bo.getStartTime());
lqw.le(bo.getEndTime() != null,"opp.end_time", bo.getEndTime());
lqw.eq(bo.getIsVoid() != null, "opp.is_void", bo.getIsVoid());
lqw.eq(bo.getProjectName()!=null,"sop.project_name",bo.getProjectName());
lqw.eq(bo.getProjectNum()!=null,"sop.project_num",bo.getProjectNum());
lqw.eq(bo.getProjectCode()!=null,"sop.project_code",bo.getProjectCode());
lqw.eq("opp.del_flag",0);
return lqw;
}
/**
* 新增项目付款进度
*/
@Override
public Boolean insertByBo(OaPaymentProgressBo bo) {
OaPaymentProgress add = BeanUtil.toBean(bo, OaPaymentProgress.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setPaymentProgressId(add.getPaymentProgressId());
}
return flag;
}
/**
* 修改项目付款进度
*/
@Override
public Boolean updateByBo(OaPaymentProgressBo bo) {
OaPaymentProgress update = BeanUtil.toBean(bo, OaPaymentProgress.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(OaPaymentProgress entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除项目付款进度
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

60
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaFinanceServiceImpl.java
View File

@@ -23,6 +23,7 @@ import com.ruoyi.oa.domain.vo.SysOaFinanceVo;
import com.ruoyi.oa.domain.SysOaFinance;
import com.ruoyi.oa.mapper.SysOaFinanceMapper;
import com.ruoyi.oa.service.ISysOaFinanceService;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.*;
@@ -70,14 +71,25 @@ public class SysOaFinanceServiceImpl implements ISysOaFinanceService {
return TableDataInfo.build(sysOaFinanceVoList);
}
@Override
public TableDataInfo<SysOaFinanceVo> progressList(SysOaFinanceBo bo, PageQuery pageQuery) {
QueryWrapper<SysOaFinance> lqw = Wrappers.query();
lqw.eq(ObjectUtil.isNotNull(bo.getProjectId()), "sof.project_id", bo.getProjectId());
lqw.eq(ObjectUtil.isNotNull(bo.getPaymentProgressId()), "sof.payment_progress_id", bo.getPaymentProgressId());
lqw.eq(StringUtils.isNotBlank(bo.getFinanceType()), "sof.finance_type", bo.getFinanceType());
lqw.orderByDesc("sof.create_time");
Page<SysOaFinanceVo> sysOaFinanceVoList = baseMapper.selectFinanceList(pageQuery.build(),lqw );
return TableDataInfo.build(sysOaFinanceVoList);
}
private Wrapper<SysOaFinance> buildQueryWrapperByFinance(SysOaFinanceBo bo) {
Map<String, Object> params = bo.getParams();
QueryWrapper<SysOaFinance> lqw = Wrappers.query();
lqw.isNull("sof.payment_progress_id");
//前端设定了projectId的值为0和1，0：非项目进出账（添加时候默认为0），1：项目进出账（项目的id是数字串整数，添加时候该字段存储；gt大于0表示项目字段值
// lqw.ge("a.project_id ",bo.getProjectId());
lqw.eq(ObjectUtil.isNotNull(bo.getProjectId()), "a.project_id", bo.getProjectId());
lqw.eq(StringUtils.isNotBlank(bo.getFinanceType()), "a.finance_type", bo.getFinanceType());
lqw.orderByDesc("a.create_time");
lqw.eq(ObjectUtil.isNotNull(bo.getProjectId()), "sof.project_id", bo.getProjectId());
lqw.eq(StringUtils.isNotBlank(bo.getFinanceType()), "sof.finance_type", bo.getFinanceType());
lqw.orderByDesc("sof.create_time");
return lqw;
}
@@ -127,23 +139,16 @@ public class SysOaFinanceServiceImpl implements ISysOaFinanceService {
@Override
public BigDecimal selectFinanceByProjectId(SysOaFinanceBo bo) {
List<SysOaFinance> sysOaFinances = baseMapper.selectFinanceByProjectId(bo);
System.out.println("sysOaFinances===" + sysOaFinances);
System.out.println("sysOaFinances000===" + sysOaFinances.size());
if (sysOaFinances.size() > 0) {
ArrayList<BigDecimal> objects = new ArrayList<>();
sysOaFinances.forEach(v -> {
System.out.println("vvvv" + v.getDetailList());
BigDecimal reduce = v.getDetailList().stream().map(s -> s.getPrice() == null ? new BigDecimal(0) : s.getPrice()).reduce(BigDecimal.ZERO, BigDecimal::add);
objects.add(reduce);
});
//主表再次求和
BigDecimal reduce = objects.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
System.out.println("hehehehe999===" + reduce);
return reduce;
return objects.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
} else {
BigDecimal reduce = new BigDecimal(0);
System.out.println("hehehehe===" + reduce);
return reduce;
return new BigDecimal(0);
}
@@ -182,13 +187,13 @@ public class SysOaFinanceServiceImpl implements ISysOaFinanceService {
Map<String, Object> params = bo.getParams();
QueryWrapper<SysOaFinance> lqw = Wrappers.query();
//前端设定了projectId的值为0和1，0：非项目进出账（添加时候默认为0），1：项目进出账（项目的id是数字串整数，添加时候该字段存储；gt大于0表示项目字段值
lqw.eq("a.project_id", bo.getProjectId());
lqw.like(StringUtils.isNotBlank(bo.getFinanceTitle()), "a.finance_title", bo.getFinanceTitle());
lqw.like(StringUtils.isNotBlank(bo.getFinanceParties()), "a.finance_parties", bo.getFinanceParties());
lqw.eq(StringUtils.isNotBlank(bo.getFinanceType()), "a.finance_type", bo.getFinanceType());
lqw.eq(Objects.nonNull(bo.getReceiveAccountId()) && bo.getReceiveAccountId()!=-1L, "a.receive_account_id", bo.getReceiveAccountId());
lqw.eq("sof.project_id", bo.getProjectId());
lqw.like(StringUtils.isNotBlank(bo.getFinanceTitle()), "sof.finance_title", bo.getFinanceTitle());
lqw.like(StringUtils.isNotBlank(bo.getFinanceParties()), "sof.finance_parties", bo.getFinanceParties());
lqw.eq(StringUtils.isNotBlank(bo.getFinanceType()), "sof.finance_type", bo.getFinanceType());
lqw.eq(Objects.nonNull(bo.getReceiveAccountId()) && bo.getReceiveAccountId()!=-1L, "sof.receive_account_id", bo.getReceiveAccountId());
lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
"a.create_time", params.get("beginCreateTime"), params.get("endCreateTime"));
"sof.create_time", params.get("beginCreateTime"), params.get("endCreateTime"));
lqw.orderByDesc("create_time");
return lqw;
}
@@ -284,4 +289,21 @@ public class SysOaFinanceServiceImpl implements ISysOaFinanceService {
}
return baseMapper.deleteBatchIds(ids) > 0;
}*/
@Override
public List<SysOaFinanceVo> getByProgressId(Long progressId) {
return baseMapper.selectByPaymentProgressId(progressId);
}
@Override
@Transactional
public void deleteDetail(Long financeId) {
// 先删掉 sys_oa_detail 中的行
sysOaDetailMapper.delete(new QueryWrapper<SysOaDetail>()
.eq("finance_id", financeId));
// 再删 sys_oa_finance
baseMapper.deleteById(financeId);
}
}