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:22:38 +08:00
parent d6263c6430
commit f9d1a7a489
14 changed files with 389 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractChange.java
View File

@ -1,9 +1,12 @@
package org.dromara.xzd.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.io.Serial;
@ -41,6 +44,8 @@ public class XzdContractChange extends BaseEntity {
/**
* 单据日期
*/
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date documentDate;
/**

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractTermination.java
View File

@ -1,9 +1,12 @@
package org.dromara.xzd.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.io.Serial;
@ -51,6 +54,8 @@ public class XzdContractTermination extends BaseEntity {
/**
* 终止日期
*/
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date terminationDate;
/**

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

@ -0,0 +1,46 @@
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.io.Serial;
/**
* 方案选择帮助对象 xzd_solution_selection
*
* @author Lion Li
* @date 2025-10-14
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("xzd_solution_selection")
public class XzdSolutionSelection extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@TableId(value = "id")
private Long id;
/**
* 编码
*/
private String coding;
/**
* 名称
*/
private String name;
/**
* 是否有引用单据
*/
private Long isDanju;
}

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractChangeBo.java
View File

@ -1,5 +1,6 @@
package org.dromara.xzd.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.xzd.domain.XzdContractAdvanceInfo;
import org.dromara.xzd.domain.XzdContractChange;
import org.dromara.common.mybatis.core.domain.BaseEntity;
@ -14,6 +15,7 @@ import org.dromara.xzd.domain.XzdDeductionItems;
import org.dromara.xzd.domain.vo.XzdContractAdvanceInfoVo;
import org.dromara.xzd.domain.vo.XzdContractClauseVo;
import org.dromara.xzd.domain.vo.XzdDeductionItemsVo;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
@ -51,6 +53,8 @@ public class XzdContractChangeBo extends BaseEntity {
* 单据日期
*/
@NotNull(message = "单据日期不能为空", groups = { AddGroup.class, EditGroup.class })
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date documentDate;
//
// /**

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractTerminationBo.java
View File

@ -1,5 +1,6 @@
package org.dromara.xzd.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.xzd.domain.XzdContractTermination;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
@ -8,6 +9,8 @@ import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
@ -53,6 +56,8 @@ public class XzdContractTerminationBo extends BaseEntity {
* 终止日期
*/
@NotNull(message = "终止日期不能为空", groups = { AddGroup.class, EditGroup.class })
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date terminationDate;
/**

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

@ -0,0 +1,44 @@
package org.dromara.xzd.domain.bo;
import org.dromara.xzd.domain.XzdSolutionSelection;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
/**
* 方案选择帮助业务对象 xzd_solution_selection
*
* @author Lion Li
* @date 2025-10-14
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = XzdSolutionSelection.class, reverseConvertGenerate = false)
public class XzdSolutionSelectionBo extends BaseEntity {
/**
* 主键ID
*/
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
private Long id;
/**
* 编码
*/
private String coding;
/**
* 名称
*/
private String name;
/**
* 是否有引用单据
*/
private Long isDanju;
}

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractChangeVo.java
View File

@ -3,6 +3,7 @@ package org.dromara.xzd.domain.vo;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.xzd.domain.XzdContractAdvanceInfo;
import org.dromara.xzd.domain.XzdContractChange;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
@ -13,6 +14,7 @@ import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.xzd.domain.XzdContractClause;
import org.dromara.xzd.domain.XzdDeductionItems;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial;
import java.io.Serializable;
@ -55,6 +57,8 @@ public class XzdContractChangeVo implements Serializable {
* 单据日期
*/
@ExcelProperty(value = "单据日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date documentDate;
// /**

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java
View File

@ -346,7 +346,7 @@ public class XzdContractDetailsVo implements Serializable {
/**
* 合同主要条款约定
*/
private XzdContractDepositInfo htzytqyd;
private XzdContractDepositInfo htzytkyd;
}

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractTerminationVo.java
View File

@ -2,6 +2,7 @@ package org.dromara.xzd.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.xzd.domain.XzdContractTermination;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
@ -9,6 +10,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial;
import java.io.Serializable;
@ -62,6 +64,8 @@ public class XzdContractTerminationVo implements Serializable {
* 终止日期
*/
@ExcelProperty(value = "终止日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date terminationDate;
/**

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

@ -0,0 +1,52 @@
package org.dromara.xzd.domain.vo;
import org.dromara.xzd.domain.XzdSolutionSelection;
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_solution_selection
*
* @author Lion Li
* @date 2025-10-14
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = XzdSolutionSelection.class)
public class XzdSolutionSelectionVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@ExcelProperty(value = "主键ID")
private Long id;
/**
* 编码
*/
@ExcelProperty(value = "编码")
private String coding;
/**
* 名称
*/
@ExcelProperty(value = "名称")
private String name;
/**
* 是否有引用单据
*/
@ExcelProperty(value = "是否有引用单据")
private Long isDanju;
}

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

@ -0,0 +1,15 @@
package org.dromara.xzd.mapper;
import org.dromara.xzd.domain.XzdSolutionSelection;
import org.dromara.xzd.domain.vo.XzdSolutionSelectionVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 方案选择帮助Mapper接口
*
* @author Lion Li
* @date 2025-10-14
*/
public interface XzdSolutionSelectionMapper extends BaseMapperPlus<XzdSolutionSelection, XzdSolutionSelectionVo> {
}

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

@ -0,0 +1,70 @@
package org.dromara.xzd.service;
import org.dromara.xzd.domain.vo.XzdSolutionSelectionVo;
import org.dromara.xzd.domain.bo.XzdSolutionSelectionBo;
import org.dromara.xzd.domain.XzdSolutionSelection;
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 IXzdSolutionSelectionService extends IService<XzdSolutionSelection>{
/**
* 查询方案选择帮助
*
* @param id 主键
* @return 方案选择帮助
*/
XzdSolutionSelectionVo queryById(Long id);
/**
* 分页查询方案选择帮助列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 方案选择帮助分页列表
*/
TableDataInfo<XzdSolutionSelectionVo> queryPageList(XzdSolutionSelectionBo bo, PageQuery pageQuery);
/**
* 查询符合条件的方案选择帮助列表
*
* @param bo 查询条件
* @return 方案选择帮助列表
*/
List<XzdSolutionSelectionVo> queryList(XzdSolutionSelectionBo bo);
/**
* 新增方案选择帮助
*
* @param bo 方案选择帮助
* @return 是否新增成功
*/
Boolean insertByBo(XzdSolutionSelectionBo bo);
/**
* 修改方案选择帮助
*
* @param bo 方案选择帮助
* @return 是否修改成功
*/
Boolean updateByBo(XzdSolutionSelectionBo bo);
/**
* 校验并批量删除方案选择帮助信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

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

@ -277,7 +277,7 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
bo.getHtzytkyd().setContractDetailsId(update.getId());
xzdContractDepositInfoService.updateById(bo.getHtzytkyd());
}else {
xzdContractDepositInfoService.removeById(old.getHtzytqyd());
xzdContractDepositInfoService.removeById(old.getHtzytkyd());
}
//更新文件
@ -450,7 +450,7 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
LambdaQueryWrapper<XzdContractDepositInfo> lambdaQueryWrapper4 = new LambdaQueryWrapper<>();
lambdaQueryWrapper4.eq(XzdContractDepositInfo::getContractDetailsId, info.getId());
XzdContractDepositInfo list3 = xzdContractDepositInfoService.getOne(lambdaQueryWrapper4);
info.setHtzytqyd(list3);
info.setHtzytkyd(list3);
//项目责任人
SysUserVo sysUserVo = sysUserService.selectUserById(info.getProjectResponsiblePerson());

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

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