DeXun/GEAR-OA
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合同编辑详情开发

Browse Source
This commit is contained in:
朱昊天
2026-06-02 21:27:44 +08:00
parent 9f4e1c39ad
commit 323da20f2a
19 changed files with 1301 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
gear-oa/src/main/java/com/gear/oa/controller/GearContractController.java Normal file
View File

@@ -0,0 +1,71 @@
package com.gear.oa.controller;
import com.gear.common.annotation.Log;
import com.gear.common.annotation.RepeatSubmit;
import com.gear.common.core.controller.BaseController;
import com.gear.common.core.domain.PageQuery;
import com.gear.common.core.domain.R;
import com.gear.common.core.page.TableDataInfo;
import com.gear.common.core.validate.AddGroup;
import com.gear.common.core.validate.EditGroup;
import com.gear.common.enums.BusinessType;
import com.gear.common.utils.poi.ExcelUtil;
import com.gear.oa.domain.bo.GearContractBo;
import com.gear.oa.domain.vo.GearContractVo;
import com.gear.oa.service.IGearContractService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
import java.util.List;
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/oa/contract")
public class GearContractController extends BaseController {
private final IGearContractService iGearContractService;
@GetMapping("/list")
public TableDataInfo<GearContractVo> list(GearContractBo bo, PageQuery pageQuery) {
return iGearContractService.queryPageList(bo, pageQuery);
}
@Log(title = "合同编辑详情", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(GearContractBo bo, HttpServletResponse response) {
List<GearContractVo> list = iGearContractService.queryList(bo);
ExcelUtil.exportExcel(list, "合同编辑详情", GearContractVo.class, response);
}
@GetMapping("/{contractId}")
public R<GearContractVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long contractId) {
return R.ok(iGearContractService.queryById(contractId));
}
@Log(title = "合同编辑详情", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody GearContractBo bo) {
return toAjax(iGearContractService.insertByBo(bo));
}
@Log(title = "合同编辑详情", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody GearContractBo bo) {
return toAjax(iGearContractService.updateByBo(bo));
}
@Log(title = "合同编辑详情", businessType = BusinessType.DELETE)
@DeleteMapping("/{contractIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] contractIds) {
return toAjax(iGearContractService.deleteWithValidByIds(Arrays.asList(contractIds), true));
}
}

45
gear-oa/src/main/java/com/gear/oa/domain/GearContract.java Normal file
View File

@@ -0,0 +1,45 @@
package com.gear.oa.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.gear.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("gear_contract")
public class GearContract extends BaseEntity {
private static final long serialVersionUID = 1L;
@TableId(value = "contract_id")
private Long contractId;
private String contractNo;
private String partyA;
private String partyB;
private String effectiveFlag;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date signDate;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date deliveryDate;
private String signPlace;
private String partyAAddress;
private String partyBAddress;
@TableLogic(value = "0", delval = "2")
private String delFlag;
}

54
gear-oa/src/main/java/com/gear/oa/domain/bo/GearContractBo.java Normal file
View File

@@ -0,0 +1,54 @@
package com.gear.oa.domain.bo;
import com.gear.common.core.domain.BaseEntity;
import com.gear.common.core.validate.AddGroup;
import com.gear.common.core.validate.EditGroup;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = true)
public class GearContractBo extends BaseEntity {
@NotNull(message = "合同ID不能为空", groups = {EditGroup.class})
private Long contractId;
@NotBlank(message = "合同号不能为空", groups = {AddGroup.class, EditGroup.class})
private String contractNo;
private String partyA;
private String partyB;
private String effectiveFlag;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date signDate;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date deliveryDate;
private String signPlace;
private String partyAAddress;
private String partyBAddress;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date signDateStart;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date signDateEnd;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date deliveryDateStart;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date deliveryDateEnd;
}

49
gear-oa/src/main/java/com/gear/oa/domain/vo/GearContractVo.java Normal file
View File

@@ -0,0 +1,49 @@
package com.gear.oa.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.gear.common.core.domain.BaseEntity;
import lombok.Data;
import java.util.Date;
@Data
@ExcelIgnoreUnannotated
public class GearContractVo extends BaseEntity {
private static final long serialVersionUID = 1L;
@ExcelProperty(value = "合同ID")
private Long contractId;
@ExcelProperty(value = "合同号")
private String contractNo;
@ExcelProperty(value = "甲方/供方")
private String partyA;
@ExcelProperty(value = "乙方/需方")
private String partyB;
@ExcelProperty(value = "是否生效")
private String effectiveFlag;
@ExcelProperty(value = "签订日期")
private Date signDate;
@ExcelProperty(value = "交货日期")
private Date deliveryDate;
@ExcelProperty(value = "签订地点")
private String signPlace;
@ExcelProperty(value = "甲方地址")
private String partyAAddress;
@ExcelProperty(value = "乙方地址")
private String partyBAddress;
@ExcelProperty(value = "备注")
private String remark;
}

9
gear-oa/src/main/java/com/gear/oa/mapper/GearContractMapper.java Normal file
View File

@@ -0,0 +1,9 @@
package com.gear.oa.mapper;
import com.gear.common.core.mapper.BaseMapperPlus;
import com.gear.oa.domain.GearContract;
import com.gear.oa.domain.vo.GearContractVo;
public interface GearContractMapper extends BaseMapperPlus<GearContractMapper, GearContract, GearContractVo> {
}

25
gear-oa/src/main/java/com/gear/oa/service/IGearContractService.java Normal file
View File

@@ -0,0 +1,25 @@
package com.gear.oa.service;
import com.gear.common.core.domain.PageQuery;
import com.gear.common.core.page.TableDataInfo;
import com.gear.oa.domain.bo.GearContractBo;
import com.gear.oa.domain.vo.GearContractVo;
import java.util.Collection;
import java.util.List;
public interface IGearContractService {
GearContractVo queryById(Long contractId);
TableDataInfo<GearContractVo> queryPageList(GearContractBo bo, PageQuery pageQuery);
List<GearContractVo> queryList(GearContractBo bo);
Boolean insertByBo(GearContractBo bo);
Boolean updateByBo(GearContractBo bo);
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

108
gear-oa/src/main/java/com/gear/oa/service/impl/GearContractServiceImpl.java Normal file
View File

@@ -0,0 +1,108 @@
package com.gear.oa.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gear.common.core.domain.PageQuery;
import com.gear.common.core.page.TableDataInfo;
import com.gear.common.utils.StringUtils;
import com.gear.oa.domain.GearContract;
import com.gear.oa.domain.bo.GearContractBo;
import com.gear.oa.domain.vo.GearContractVo;
import com.gear.oa.mapper.GearContractMapper;
import com.gear.oa.service.IGearContractService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@RequiredArgsConstructor
@Service
public class GearContractServiceImpl implements IGearContractService {
private final GearContractMapper baseMapper;
@Override
public GearContractVo queryById(Long contractId) {
return baseMapper.selectVoById(contractId);
}
@Override
public TableDataInfo<GearContractVo> queryPageList(GearContractBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<GearContract> lqw = buildQueryWrapper(bo);
Page<GearContractVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
@Override
public List<GearContractVo> queryList(GearContractBo bo) {
LambdaQueryWrapper<GearContract> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<GearContract> buildQueryWrapper(GearContractBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<GearContract> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getContractId() != null, GearContract::getContractId, bo.getContractId());
lqw.like(StringUtils.isNotBlank(bo.getContractNo()), GearContract::getContractNo, bo.getContractNo());
lqw.like(StringUtils.isNotBlank(bo.getPartyA()), GearContract::getPartyA, bo.getPartyA());
lqw.like(StringUtils.isNotBlank(bo.getPartyB()), GearContract::getPartyB, bo.getPartyB());
lqw.eq(StringUtils.isNotBlank(bo.getEffectiveFlag()), GearContract::getEffectiveFlag, bo.getEffectiveFlag());
lqw.like(StringUtils.isNotBlank(bo.getSignPlace()), GearContract::getSignPlace, bo.getSignPlace());
lqw.ge(bo.getSignDateStart() != null, GearContract::getSignDate, bo.getSignDateStart());
lqw.le(bo.getSignDateEnd() != null, GearContract::getSignDate, bo.getSignDateEnd());
lqw.ge(bo.getDeliveryDateStart() != null, GearContract::getDeliveryDate, bo.getDeliveryDateStart());
lqw.le(bo.getDeliveryDateEnd() != null, GearContract::getDeliveryDate, bo.getDeliveryDateEnd());
lqw.orderByDesc(GearContract::getSignDate);
lqw.orderByDesc(GearContract::getCreateTime);
return lqw;
}
@Override
public Boolean insertByBo(GearContractBo bo) {
GearContract add = BeanUtil.toBean(bo, GearContract.class);
validEntityBeforeSave(add);
boolean ok = baseMapper.insert(add) > 0;
if (ok) {
bo.setContractId(add.getContractId());
}
return ok;
}
@Override
public Boolean updateByBo(GearContractBo bo) {
GearContract update = BeanUtil.toBean(bo, GearContract.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
private void validEntityBeforeSave(GearContract entity) {
boolean isInsert = entity.getContractId() == null;
if (entity.getContractId() == null) {
entity.setContractId(IdUtil.getSnowflakeNextId());
}
if (StringUtils.isBlank(entity.getContractNo())) {
entity.setContractNo("CON_" + IdUtil.getSnowflakeNextIdStr());
}
if (StringUtils.isBlank(entity.getEffectiveFlag())) {
entity.setEffectiveFlag("0");
}
if (isInsert) {
if (StringUtils.isBlank(entity.getDelFlag())) {
entity.setDelFlag("0");
}
}
}
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if (isValid) {
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}