diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaPaymentProgressController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaPaymentProgressController.java new file mode 100644 index 0000000..423e54c --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaPaymentProgressController.java @@ -0,0 +1,98 @@ +package com.ruoyi.oa.controller; + + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.oa.domain.OaPaymentProgress; +import com.ruoyi.oa.domain.SysOaFinance; +import com.ruoyi.oa.domain.bo.OaPaymentProgressBo; +import com.ruoyi.oa.domain.bo.SysOaFinanceBo; +import com.ruoyi.oa.domain.vo.OaPaymentProgressVo; +import com.ruoyi.oa.domain.vo.SysOaFinanceVo; +import com.ruoyi.oa.service.IOaPaymentProgressService; +import com.ruoyi.oa.service.ISysOaFinanceService; +import liquibase.pro.packaged.A; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotEmpty; +import java.util.Arrays; +import java.util.List; + +/** + * 付款进度 + */ +@RestController +@RequestMapping("/oa/payment-progress") +public class OaPaymentProgressController extends BaseController { + + @Autowired + private IOaPaymentProgressService progressService; + @Autowired + private ISysOaFinanceService financeService; + + + /** 1. 创建付款进度 **/ + @PostMapping + public R createProgress(@RequestBody OaPaymentProgressBo p) { + + return R.ok(progressService.insertByBo(p)); + } + + /** 2. 修改付款进度（不可改主键/项目ID） **/ + @PutMapping + public R updateProgress(@RequestBody OaPaymentProgressBo p) { + + return R.ok(progressService.updateByBo(p)); + } + + /** + * 查询项目付款进度列表 + */ + @GetMapping("/list") + public TableDataInfo list(OaPaymentProgressBo bo, PageQuery pageQuery) { + return progressService.queryPageList(bo, pageQuery); + } + + /** 4. 查询某个进度下的所有明细（finance 记录） **/ + @GetMapping("/{progressId}/details") + public R> listDetails(@PathVariable("progressId") Long progressId) { + return R.ok(financeService.getByProgressId(progressId)); + } + + /** 5. 为某个进度添加明细 **/ + @PostMapping("/{progressId}/details") + public R addDetail(@PathVariable("progressId") Long progressId, + @RequestBody SysOaFinanceBo f) { + f.setPaymentProgressId(progressId); + + return R.ok(financeService.insertByBo(f)); + } + + /** 6. 修改明细（不可改主键/进度ID） **/ + @PutMapping("/details") + public R updateDetail(@RequestBody SysOaFinanceBo f) { + SysOaFinanceVo exist = financeService.queryById(f.getFinanceId()); + f.setPaymentProgressId(exist.getPaymentProgressId()); + return R.ok(financeService.updateByBo(f)); + } + + /** 7. 删除某条明细（并级联删 detail 记录） **/ + @DeleteMapping("/details/{financeId}") + public void deleteDetail(@PathVariable Long financeId) { + financeService.deleteDetail(financeId); + } + + /** + * 删除项目付款进度 + * + * @param paymentProgressIds 主键串 + */ + @DeleteMapping("/{paymentProgressIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] paymentProgressIds) { + return toAjax(progressService.deleteWithValidByIds(Arrays.asList(paymentProgressIds), true)); + } +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaFinanceController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaFinanceController.java index c7b2949..28206b9 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaFinanceController.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaFinanceController.java @@ -64,6 +64,14 @@ public class SysOaFinanceController extends BaseController { return sysOaFinanceList; } + /** + * 查询进出账管理列表 + */ + @GetMapping("/progress-list") + public TableDataInfo progressList(SysOaFinanceBo bo, PageQuery pageQuery) { + TableDataInfo sysOaFinanceVoTableDataInfo = iSysOaFinanceService.progressList(bo, pageQuery); + return sysOaFinanceVoTableDataInfo; + } @GetMapping("/barData") public R> pieData(SysOaFinanceBo bo) { diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaPaymentProgress.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaPaymentProgress.java new file mode 100644 index 0000000..41b16b3 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaPaymentProgress.java @@ -0,0 +1,70 @@ +package com.ruoyi.oa.domain; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.util.Date; +import java.math.BigDecimal; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 项目付款进度对象 oa_payment_progress + * + * @author hdka + * @date 2025-05-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("oa_payment_progress") +public class OaPaymentProgress extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 付款进度ID + */ + @TableId(value = "payment_progress_id") + private Long paymentProgressId; + /** + * 关联项目ID，引用 oa_project.project_id + */ + private Long projectId; + /** + * 付款开始时间 + */ + private Date startTime; + /** + * 付款结束时间 + */ + private Date endTime; + /** + * 付款金额 + */ + private BigDecimal amount; + /** + * 是否作废：0正常；1作废 + */ + private Integer isVoid; + /** + * 删除标志：0正常；1已删除 + */ + @TableLogic + private Integer delFlag; + /** + * 备注 + */ + private String remark; + + + /** + * 完成标志 + */ + private Long complete; + + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaFinance.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaFinance.java index e7e4189..c87f1c1 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaFinance.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaFinance.java @@ -107,4 +107,20 @@ public class SysOaFinance extends BaseEntity { @TableField(exist = false) private List detailList; + private Long paymentProgressId; + + /** + * 开始时间 + */ + private Date beginTime; + + /** + * 结束时间 + */ + private Date endTime; + + /** + * 完成状态 + */ + private Long status; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaPaymentProgressBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaPaymentProgressBo.java new file mode 100644 index 0000000..75bc60f --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaPaymentProgressBo.java @@ -0,0 +1,71 @@ +package com.ruoyi.oa.domain.bo; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +public class OaPaymentProgressBo extends BaseEntity { + + /** + * 付款进度ID + */ + private Long paymentProgressId; + + /** + * 关联项目ID，引用 oa_project.project_id + */ + private Long projectId; + + /** + * 付款开始时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date startTime; + + /** + * 付款结束时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date endTime; + + /** + * 付款金额 + */ + private BigDecimal amount; + + /** + * 是否作废：0正常；1作废 + */ + private Integer isVoid; + + /** + * 备注 + */ + private String remark; + + + + + /** + * 完成标志 + */ + private Long complete; + + private String projectName; + + private String projectCode; + + private String projectNum; + + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java index 120331d..9a0a6de 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java @@ -120,5 +120,24 @@ public class SysOaFinanceBo extends BaseEntity { */ private String outType; + /** + * 开始时间 + */ + private Date beginTime; + + /** + * 结束时间 + */ + private Date endTime; + + /** + * 付款进度id + */ + private Long paymentProgressId; + + /** + * 完成状态 + */ + private Long status; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaPaymentProgressVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaPaymentProgressVo.java new file mode 100644 index 0000000..ebe453d --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaPaymentProgressVo.java @@ -0,0 +1,81 @@ +package com.ruoyi.oa.domain.vo; + +import java.math.BigDecimal; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; +import java.util.Date; + + + +/** + * 项目付款进度视图对象 oa_payment_progress + * + * @author hdka + * @date 2025-05-23 + */ +@Data +@ExcelIgnoreUnannotated +public class OaPaymentProgressVo { + + private static final long serialVersionUID = 1L; + + /** + * 付款进度ID + */ + @ExcelProperty(value = "付款进度ID") + private Long paymentProgressId; + + /** + * 关联项目ID，引用 oa_project.project_id + */ + @ExcelProperty(value = "关联项目ID，引用 oa_project.project_id") + private Long projectId; + + /** + * 付款开始时间 + */ + @ExcelProperty(value = "付款开始时间") + private Date startTime; + + /** + * 付款结束时间 + */ + @ExcelProperty(value = "付款结束时间") + private Date endTime; + + /** + * 付款金额 + */ + @ExcelProperty(value = "付款金额") + private BigDecimal amount; + + /** + * 是否作废：0正常；1作废 + */ + @ExcelProperty(value = "是否作废：0正常；1作废") + private Integer isVoid; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + private String projectName; + private String projectCode; + private String projectNum; + + private Date earliestEndTime; + + + /** + * 完成标志 + */ + private Long complete; + + /** + * 完成资格 + */ + private Long qualified; +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaFinanceVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaFinanceVo.java index ddbcf3f..fc9f201 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaFinanceVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaFinanceVo.java @@ -140,6 +140,16 @@ public class SysOaFinanceVo extends SysOaFinance { */ private String outType; + /** + * 开始时间 + */ + private Date beginTime; + + /** + * 结束时间 + */ + private Date endTime; + /** * 类型金钱综合用于饼图数据 */ @@ -151,4 +161,9 @@ public class SysOaFinanceVo extends SysOaFinance { private String month; + /** + * 完成状态 + */ + private Long status; + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaFinanceMapper.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaFinanceMapper.java index 88a5fa4..71dee9c 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaFinanceMapper.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaFinanceMapper.java @@ -31,7 +31,7 @@ public interface SysOaFinanceMapper extends BaseMapperPlus selectPageFinanceList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); @@ -72,6 +72,9 @@ public interface SysOaFinanceMapper extends BaseMapperPlus getBarData(SysOaFinanceBo bo); + List selectByPaymentProgressId(Long progressId); + + /** * 项目资金管理，根据时间范围查询列表数据 diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaPaymentProgressService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaPaymentProgressService.java new file mode 100644 index 0000000..f0e464d --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaPaymentProgressService.java @@ -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 queryPageList(OaPaymentProgressBo bo, PageQuery pageQuery); + + /** + * 查询项目付款进度列表 + */ + List queryList(OaPaymentProgressBo bo); + + /** + * 新增项目付款进度 + */ + Boolean insertByBo(OaPaymentProgressBo bo); + + /** + * 修改项目付款进度 + */ + Boolean updateByBo(OaPaymentProgressBo bo); + + /** + * 校验并批量删除项目付款进度信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaFinanceService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaFinanceService.java index ce932b5..e8f28e1 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaFinanceService.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaFinanceService.java @@ -91,4 +91,11 @@ public interface ISysOaFinanceService { Boolean deleteSysOaFinanceById(Long financeId); List getBarData(SysOaFinanceBo bo); + + public List getByProgressId(Long progressId); + + public void deleteDetail(Long financeId); + + TableDataInfo progressList(SysOaFinanceBo bo, PageQuery pageQuery); + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaPaymentProgressServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaPaymentProgressServiceImpl.java new file mode 100644 index 0000000..f4af819 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaPaymentProgressServiceImpl.java @@ -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 queryPageList(OaPaymentProgressBo bo, PageQuery pageQuery) { + QueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询项目付款进度列表 + */ + @Override + public List queryList(OaPaymentProgressBo bo) { + QueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private QueryWrapper buildQueryWrapper(OaPaymentProgressBo bo) { + Map params = bo.getParams(); + QueryWrapper 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 ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaFinanceServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaFinanceServiceImpl.java index 53d27be..cc25ff2 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaFinanceServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaFinanceServiceImpl.java @@ -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 progressList(SysOaFinanceBo bo, PageQuery pageQuery) { + QueryWrapper 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 sysOaFinanceVoList = baseMapper.selectFinanceList(pageQuery.build(),lqw ); + return TableDataInfo.build(sysOaFinanceVoList); + } + private Wrapper buildQueryWrapperByFinance(SysOaFinanceBo bo) { Map params = bo.getParams(); QueryWrapper 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 sysOaFinances = baseMapper.selectFinanceByProjectId(bo); - System.out.println("sysOaFinances===" + sysOaFinances); - System.out.println("sysOaFinances000===" + sysOaFinances.size()); if (sysOaFinances.size() > 0) { ArrayList 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 params = bo.getParams(); QueryWrapper 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 getByProgressId(Long progressId) { + return baseMapper.selectByPaymentProgressId(progressId); + } + + @Override + @Transactional + public void deleteDetail(Long financeId) { + // 先删掉 sys_oa_detail 中的行 + sysOaDetailMapper.delete(new QueryWrapper() + .eq("finance_id", financeId)); + // 再删 sys_oa_finance + baseMapper.deleteById(financeId); + } + + } diff --git a/ruoyi-oa/src/main/resources/mapper/oa/OaPaymentProgressMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/OaPaymentProgressMapper.xml new file mode 100644 index 0000000..94880ec --- /dev/null +++ b/ruoyi-oa/src/main/resources/mapper/oa/OaPaymentProgressMapper.xml @@ -0,0 +1,39 @@ + + + + + + \ No newline at end of file diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaFinanceMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaFinanceMapper.xml index bf1f91f..8a0597a 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaFinanceMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaFinanceMapper.xml @@ -27,6 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -35,6 +37,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + @@ -51,31 +62,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select a.finance_id, - a.project_id, - a.finance_title, - a.finance_parties, - a.pay_type, - a.finance_type, - a.finance_time, - a.make_ratio, - a.make_price, - a.make_time, - a.make_explain, - a.accessory, - a.remark as finance_remark, - a.create_by, - a.create_time, - a.update_by, - a.update_time, + select sof.finance_id, + sof.project_id, + sof.finance_title, + sof.finance_parties, + sof.pay_type, + sof.finance_type, + sof.finance_time, + sof.make_ratio, + sof.make_price, + sof.make_time, + sof.make_explain, + sof.accessory, + sof.remark as finance_remark, + sof.create_by, + sof.create_time, + sof.update_by, + sof.update_time, b.detail_id, b.detail_title, - a.out_type, + sof.out_type, b.price, b.big_price, b.remark as detail_remark - from sys_oa_finance a - left join sys_oa_detail b on a.finance_id = b.finance_id + from sys_oa_finance sof + left join sys_oa_detail b on sof.finance_id = b.finance_id select a.finance_id, a.project_id, a.finance_title, a.finance_parties, a.pay_type, a.finance_type, a.finance_time, a.make_ratio, a.make_price, a.make_time, a.make_explain, a.accessory, a.remark as finance_remark, a.create_by, a.create_time, a.update_by, a.update_time, - b.detail_id, b.detail_title, b.price, b.big_price, b.remark as detail_remark,a.out_type + b.detail_id, b.detail_title, b.price, b.big_price, b.remark as detail_remark,a.out_type,a.payment_progress_id,a.status from sys_oa_finance a left join sys_oa_detail b on a.finance_id = b.finance_id where a.project_id = #{projectId} and a.finance_type = #{financeType} @@ -164,17 +179,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskMapper.xml index 9bb88c2..77ce82f 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskMapper.xml @@ -22,6 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -31,6 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -112,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sot.task_title, sot.task_type, sot.task_grade, - + sot.accessory, COALESCE( sot.finish_time, (SELECT a.end_time @@ -138,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" su1.nick_name AS createUserNickName, su2.nick_name AS workerNickName, - sot.accessory, + sot.rank_number, sot.remark, sot.task_rank, diff --git a/script/sql/payment.sql b/script/sql/payment.sql index 0c406c7..b28f58b 100644 --- a/script/sql/payment.sql +++ b/script/sql/payment.sql @@ -34,3 +34,8 @@ ALTER TABLE sys_oa_detail REFERENCES sys_oa_finance (finance_id) ON DELETE CASCADE ON UPDATE CASCADE; + + +ALTER TABLE sys_oa_finance + ADD COLUMN detail_start_time DATETIME NULL COMMENT '明细开始时间', + ADD COLUMN detail_end_time DATETIME NULL COMMENT '明细结束时间'; \ No newline at end of file