订单明细列表页开发

This commit is contained in:
朱昊天
2026-06-04 14:45:26 +08:00
parent 323da20f2a
commit 2ca6a271db
12 changed files with 667 additions and 0 deletions

View File

@@ -0,0 +1,57 @@
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.EditGroup;
import com.gear.common.enums.BusinessType;
import com.gear.common.utils.poi.ExcelUtil;
import com.gear.oa.domain.bo.GearContractDetailBo;
import com.gear.oa.domain.vo.GearContractDetailVo;
import com.gear.oa.service.IGearContractDetailService;
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 java.util.Arrays;
import java.util.List;
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/oa/contractDetail")
public class GearContractDetailController extends BaseController {
private final IGearContractDetailService iGearContractDetailService;
@GetMapping("/list")
public TableDataInfo<GearContractDetailVo> list(GearContractDetailBo bo, PageQuery pageQuery) {
return iGearContractDetailService.queryPageList(bo, pageQuery);
}
@Log(title = "订单明细列表", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(GearContractDetailBo bo, HttpServletResponse response) {
List<GearContractDetailVo> list = iGearContractDetailService.queryList(bo);
ExcelUtil.exportExcel(list, "订单明细列表", GearContractDetailVo.class, response);
}
@Log(title = "订单明细列表", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody GearContractDetailBo bo) {
return toAjax(iGearContractDetailService.updateByBo(bo));
}
@Log(title = "订单明细列表", businessType = BusinessType.DELETE)
@DeleteMapping("/{detailIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] detailIds) {
return toAjax(iGearContractDetailService.deleteWithValidByIds(Arrays.asList(detailIds), true));
}
}

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.gear.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("gear_contract_detail")
public class GearContractDetail extends BaseEntity {
private static final long serialVersionUID = 1L;
@TableId(value = "detail_id")
private Long detailId;
private Long contractId;
private Integer lineNo;
private String productName;
private String spec;
private String material;
private BigDecimal widthMm;
private BigDecimal thicknessMm;
private String surfaceTreatment;
private String packagingRequirement;
private String remark;
@TableLogic(value = "0", delval = "2")
private String delFlag;
}

View File

@@ -0,0 +1,46 @@
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 lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
@Data
@EqualsAndHashCode(callSuper = true)
public class GearContractDetailBo extends BaseEntity {
@NotNull(message = "明细ID不能为空", groups = {EditGroup.class})
private Long detailId;
@NotNull(message = "合同ID不能为空", groups = {AddGroup.class, EditGroup.class})
private Long contractId;
private Integer lineNo;
private String contractNo;
private String partyA;
private String partyB;
private String effectiveFlag;
private String productName;
private String spec;
private String material;
private BigDecimal widthMm;
private BigDecimal thicknessMm;
private String surfaceTreatment;
private String packagingRequirement;
}

View File

@@ -0,0 +1,65 @@
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.math.BigDecimal;
import java.util.Date;
@Data
@ExcelIgnoreUnannotated
public class GearContractDetailVo extends BaseEntity {
private static final long serialVersionUID = 1L;
@ExcelProperty(value = "明细ID")
private Long detailId;
@ExcelProperty(value = "合同ID")
private Long contractId;
@ExcelProperty(value = "合同号")
private String contractNo;
@ExcelProperty(value = "供方")
private String partyA;
@ExcelProperty(value = "需方")
private String partyB;
@ExcelProperty(value = "签订日期")
private Date signDate;
@ExcelProperty(value = "交货日期")
private Date deliveryDate;
@ExcelProperty(value = "序号")
private Integer lineNo;
@ExcelProperty(value = "产品名称")
private String productName;
@ExcelProperty(value = "规格")
private String spec;
@ExcelProperty(value = "材质")
private String material;
@ExcelProperty(value = "宽度(mm)")
private BigDecimal widthMm;
@ExcelProperty(value = "厚度(mm)")
private BigDecimal thicknessMm;
@ExcelProperty(value = "表面处理")
private String surfaceTreatment;
@ExcelProperty(value = "包装要求")
private String packagingRequirement;
@ExcelProperty(value = "备注")
private String remark;
}

View File

@@ -0,0 +1,13 @@
package com.gear.oa.mapper;
import com.gear.common.core.mapper.BaseMapperPlus;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import com.gear.oa.domain.GearContractDetail;
import com.gear.oa.domain.vo.GearContractDetailVo;
public interface GearContractDetailMapper extends BaseMapperPlus<GearContractDetailMapper, GearContractDetail, GearContractDetailVo> {
Page<GearContractDetailVo> selectVoPagePlus(Page<?> page, @Param("ew") Wrapper<GearContractDetail> wrapper);
}

View File

@@ -0,0 +1,21 @@
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.GearContractDetailBo;
import com.gear.oa.domain.vo.GearContractDetailVo;
import java.util.Collection;
import java.util.List;
public interface IGearContractDetailService {
TableDataInfo<GearContractDetailVo> queryPageList(GearContractDetailBo bo, PageQuery pageQuery);
List<GearContractDetailVo> queryList(GearContractDetailBo bo);
Boolean updateByBo(GearContractDetailBo bo);
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

View File

@@ -0,0 +1,75 @@
package com.gear.oa.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.GearContractDetail;
import com.gear.oa.domain.bo.GearContractDetailBo;
import com.gear.oa.domain.vo.GearContractDetailVo;
import com.gear.oa.mapper.GearContractDetailMapper;
import com.gear.oa.service.IGearContractDetailService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@RequiredArgsConstructor
@Service
public class GearContractDetailServiceImpl implements IGearContractDetailService {
private final GearContractDetailMapper baseMapper;
@Override
public TableDataInfo<GearContractDetailVo> queryPageList(GearContractDetailBo bo, PageQuery pageQuery) {
QueryWrapper<GearContractDetail> qw = buildQueryWrapperPlus(bo);
Page<GearContractDetailVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), qw);
return TableDataInfo.build(result);
}
@Override
public List<GearContractDetailVo> queryList(GearContractDetailBo bo) {
QueryWrapper<GearContractDetail> qw = buildQueryWrapperPlus(bo);
return baseMapper.selectVoList(qw);
}
private QueryWrapper<GearContractDetail> buildQueryWrapperPlus(GearContractDetailBo bo) {
Map<String, Object> params = bo.getParams();
QueryWrapper<GearContractDetail> qw = Wrappers.query();
qw.eq("d.del_flag", "0");
qw.eq(bo.getContractId() != null, "d.contract_id", bo.getContractId());
qw.eq(bo.getLineNo() != null, "d.line_no", bo.getLineNo());
qw.like(StringUtils.isNotBlank(bo.getProductName()), "d.product_name", bo.getProductName());
qw.like(StringUtils.isNotBlank(bo.getSpec()), "d.spec", bo.getSpec());
qw.like(StringUtils.isNotBlank(bo.getMaterial()), "d.material", bo.getMaterial());
qw.like(StringUtils.isNotBlank(bo.getSurfaceTreatment()), "d.surface_treatment", bo.getSurfaceTreatment());
qw.like(StringUtils.isNotBlank(bo.getPackagingRequirement()), "d.packaging_requirement", bo.getPackagingRequirement());
qw.like(StringUtils.isNotBlank(bo.getContractNo()), "c.contract_no", bo.getContractNo());
qw.like(StringUtils.isNotBlank(bo.getPartyA()), "c.party_a", bo.getPartyA());
qw.like(StringUtils.isNotBlank(bo.getPartyB()), "c.party_b", bo.getPartyB());
qw.eq(StringUtils.isNotBlank(bo.getEffectiveFlag()), "c.effective_flag", bo.getEffectiveFlag());
qw.orderByAsc("d.contract_id");
qw.orderByAsc("d.line_no");
return qw;
}
@Override
public Boolean updateByBo(GearContractDetailBo bo) {
GearContractDetail update = BeanUtil.toBean(bo, GearContractDetail.class);
return baseMapper.updateById(update) > 0;
}
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if (isValid) {
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}