lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

10-13-承包合同结算周期

Browse Source
This commit is contained in:
青云
2025-10-14 16:26:40 +08:00
parent f9d1a7a489
commit aab0a5e0b8
8 changed files with 485 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdContractProgressSettlementDateController.java Normal file
View File

@ -0,0 +1,105 @@
package org.dromara.xzd.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.xzd.domain.vo.XzdContractProgressSettlementDateVo;
import org.dromara.xzd.domain.bo.XzdContractProgressSettlementDateBo;
import org.dromara.xzd.service.IXzdContractProgressSettlementDateService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 承包合同进度结算周期
*
* @author Lion Li
* @date 2025-10-14
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/xzd/contractProgressSettlementDate")
public class XzdContractProgressSettlementDateController extends BaseController {
private final IXzdContractProgressSettlementDateService xzdContractProgressSettlementDateService;
/**
* 查询承包合同进度结算周期列表
*/
@SaCheckPermission("xzd:contractProgressSettlementDate:list")
@GetMapping("/list")
public TableDataInfo<XzdContractProgressSettlementDateVo> list(XzdContractProgressSettlementDateBo bo, PageQuery pageQuery) {
return xzdContractProgressSettlementDateService.queryPageList(bo, pageQuery);
}
/**
* 导出承包合同进度结算周期列表
*/
@SaCheckPermission("xzd:contractProgressSettlementDate:export")
@Log(title = "承包合同进度结算周期", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(XzdContractProgressSettlementDateBo bo, HttpServletResponse response) {
List<XzdContractProgressSettlementDateVo> list = xzdContractProgressSettlementDateService.queryList(bo);
ExcelUtil.exportExcel(list, "承包合同进度结算周期", XzdContractProgressSettlementDateVo.class, response);
}
/**
* 获取承包合同进度结算周期详细信息
*
* @param id 主键
*/
@SaCheckPermission("xzd:contractProgressSettlementDate:query")
@GetMapping("/{id}")
public R<XzdContractProgressSettlementDateVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(xzdContractProgressSettlementDateService.queryById(id));
}
/**
* 新增承包合同进度结算周期
*/
@SaCheckPermission("xzd:contractProgressSettlementDate:add")
@Log(title = "承包合同进度结算周期", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody XzdContractProgressSettlementDateBo bo) {
return toAjax(xzdContractProgressSettlementDateService.insertByBo(bo));
}
/**
* 修改承包合同进度结算周期
*/
@SaCheckPermission("xzd:contractProgressSettlementDate:edit")
@Log(title = "承包合同进度结算周期", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody XzdContractProgressSettlementDateBo bo) {
return toAjax(xzdContractProgressSettlementDateService.updateByBo(bo));
}
/**
* 删除承包合同进度结算周期
*
* @param ids 主键串
*/
@SaCheckPermission("xzd:contractProgressSettlementDate:remove")
@Log(title = "承包合同进度结算周期", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(xzdContractProgressSettlementDateService.deleteWithValidByIds(List.of(ids), true));
}
}

52
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractProgressSettlementDate.java Normal file
View File

@ -0,0 +1,52 @@
package org.dromara.xzd.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import java.io.Serial;
/**
* 承包合同进度结算周期对象 xzd_contract_progress_settlement_date
*
* @author Lion Li
* @date 2025-10-14
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("xzd_contract_progress_settlement_date")
public class XzdContractProgressSettlementDate extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* id
*/
@TableId(value = "id")
private Long id;
/**
* 周期名称
*/
private String name;
/**
* 开始时间
*/
private Date beginTime;
/**
* 结束时间
*/
private Date endTime;
/**
* 周期类型
*/
private String type;
}

48
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractProgressSettlementDateBo.java Normal file
View File

@ -0,0 +1,48 @@
package org.dromara.xzd.domain.bo;
import org.dromara.xzd.domain.XzdContractProgressSettlementDate;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 承包合同进度结算周期业务对象 xzd_contract_progress_settlement_date
*
* @author Lion Li
* @date 2025-10-14
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = XzdContractProgressSettlementDate.class, reverseConvertGenerate = false)
public class XzdContractProgressSettlementDateBo extends BaseEntity {
/**
* id
*/
private Long id;
/**
* 周期名称
*/
private String name;
/**
* 开始时间
*/
private Date beginTime;
/**
* 结束时间
*/
private Date endTime;
/**
* 周期类型
*/
private String type;
}

60
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractProgressSettlementDateVo.java Normal file
View File

@ -0,0 +1,60 @@
package org.dromara.xzd.domain.vo;
import java.util.Date;
import org.dromara.xzd.domain.XzdContractProgressSettlementDate;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 承包合同进度结算周期视图对象 xzd_contract_progress_settlement_date
*
* @author Lion Li
* @date 2025-10-14
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = XzdContractProgressSettlementDate.class)
public class XzdContractProgressSettlementDateVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* id
*/
@ExcelProperty(value = "id")
private Long id;
/**
* 周期名称
*/
@ExcelProperty(value = "周期名称")
private String name;
/**
* 开始时间
*/
@ExcelProperty(value = "开始时间")
private Date beginTime;
/**
* 结束时间
*/
@ExcelProperty(value = "结束时间")
private Date endTime;
/**
* 周期类型
*/
@ExcelProperty(value = "周期类型")
private String type;
}

15
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdContractProgressSettlementDateMapper.java Normal file
View File

@ -0,0 +1,15 @@
package org.dromara.xzd.mapper;
import org.dromara.xzd.domain.XzdContractProgressSettlementDate;
import org.dromara.xzd.domain.vo.XzdContractProgressSettlementDateVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 承包合同进度结算周期Mapper接口
*
* @author Lion Li
* @date 2025-10-14
*/
public interface XzdContractProgressSettlementDateMapper extends BaseMapperPlus<XzdContractProgressSettlementDate, XzdContractProgressSettlementDateVo> {
}

70
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdContractProgressSettlementDateService.java Normal file
View File

@ -0,0 +1,70 @@
package org.dromara.xzd.service;
import org.dromara.xzd.domain.vo.XzdContractProgressSettlementDateVo;
import org.dromara.xzd.domain.bo.XzdContractProgressSettlementDateBo;
import org.dromara.xzd.domain.XzdContractProgressSettlementDate;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.Collection;
import java.util.List;
/**
* 承包合同进度结算周期Service接口
*
* @author Lion Li
* @date 2025-10-14
*/
public interface IXzdContractProgressSettlementDateService extends IService<XzdContractProgressSettlementDate>{
/**
* 查询承包合同进度结算周期
*
* @param id 主键
* @return 承包合同进度结算周期
*/
XzdContractProgressSettlementDateVo queryById(Long id);
/**
* 分页查询承包合同进度结算周期列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 承包合同进度结算周期分页列表
*/
TableDataInfo<XzdContractProgressSettlementDateVo> queryPageList(XzdContractProgressSettlementDateBo bo, PageQuery pageQuery);
/**
* 查询符合条件的承包合同进度结算周期列表
*
* @param bo 查询条件
* @return 承包合同进度结算周期列表
*/
List<XzdContractProgressSettlementDateVo> queryList(XzdContractProgressSettlementDateBo bo);
/**
* 新增承包合同进度结算周期
*
* @param bo 承包合同进度结算周期
* @return 是否新增成功
*/
Boolean insertByBo(XzdContractProgressSettlementDateBo bo);
/**
* 修改承包合同进度结算周期
*
* @param bo 承包合同进度结算周期
* @return 是否修改成功
*/
Boolean updateByBo(XzdContractProgressSettlementDateBo bo);
/**
* 校验并批量删除承包合同进度结算周期信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

134
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractProgressSettlementDateServiceImpl.java Normal file
View File

@ -0,0 +1,134 @@
package org.dromara.xzd.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.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 org.dromara.xzd.domain.bo.XzdContractProgressSettlementDateBo;
import org.dromara.xzd.domain.vo.XzdContractProgressSettlementDateVo;
import org.dromara.xzd.domain.XzdContractProgressSettlementDate;
import org.dromara.xzd.mapper.XzdContractProgressSettlementDateMapper;
import org.dromara.xzd.service.IXzdContractProgressSettlementDateService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 承包合同进度结算周期Service业务层处理
*
* @author Lion Li
* @date 2025-10-14
*/
@RequiredArgsConstructor
@Service
public class XzdContractProgressSettlementDateServiceImpl extends ServiceImpl<XzdContractProgressSettlementDateMapper, XzdContractProgressSettlementDate> implements IXzdContractProgressSettlementDateService {
private final XzdContractProgressSettlementDateMapper baseMapper;
/**
* 查询承包合同进度结算周期
*
* @param id 主键
* @return 承包合同进度结算周期
*/
@Override
public XzdContractProgressSettlementDateVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询承包合同进度结算周期列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 承包合同进度结算周期分页列表
*/
@Override
public TableDataInfo<XzdContractProgressSettlementDateVo> queryPageList(XzdContractProgressSettlementDateBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<XzdContractProgressSettlementDate> lqw = buildQueryWrapper(bo);
Page<XzdContractProgressSettlementDateVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的承包合同进度结算周期列表
*
* @param bo 查询条件
* @return 承包合同进度结算周期列表
*/
@Override
public List<XzdContractProgressSettlementDateVo> queryList(XzdContractProgressSettlementDateBo bo) {
LambdaQueryWrapper<XzdContractProgressSettlementDate> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<XzdContractProgressSettlementDate> buildQueryWrapper(XzdContractProgressSettlementDateBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<XzdContractProgressSettlementDate> lqw = Wrappers.lambdaQuery();
lqw.orderByDesc(XzdContractProgressSettlementDate::getId);
lqw.like(StringUtils.isNotBlank(bo.getName()), XzdContractProgressSettlementDate::getName, bo.getName());
lqw.eq(bo.getBeginTime() != null, XzdContractProgressSettlementDate::getBeginTime, bo.getBeginTime());
lqw.eq(bo.getEndTime() != null, XzdContractProgressSettlementDate::getEndTime, bo.getEndTime());
lqw.eq(StringUtils.isNotBlank(bo.getType()), XzdContractProgressSettlementDate::getType, bo.getType());
return lqw;
}
/**
* 新增承包合同进度结算周期
*
* @param bo 承包合同进度结算周期
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(XzdContractProgressSettlementDateBo bo) {
XzdContractProgressSettlementDate add = MapstructUtils.convert(bo, XzdContractProgressSettlementDate.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改承包合同进度结算周期
*
* @param bo 承包合同进度结算周期
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(XzdContractProgressSettlementDateBo bo) {
XzdContractProgressSettlementDate update = MapstructUtils.convert(bo, XzdContractProgressSettlementDate.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(XzdContractProgressSettlementDate entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除承包合同进度结算周期信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSolutionSelectionServiceImpl.java
View File

@ -1,5 +1,6 @@
package org.dromara.xzd.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;