diff --git a/src/main/java/com/coscoshipping/ebtp/project/coscocategorymaintenance/column/CoscoCategoryMaintenanceField.java b/src/main/java/com/coscoshipping/ebtp/system/coscocategorymaintenance/column/CoscoCategoryMaintenanceField.java similarity index 92% rename from src/main/java/com/coscoshipping/ebtp/project/coscocategorymaintenance/column/CoscoCategoryMaintenanceField.java rename to src/main/java/com/coscoshipping/ebtp/system/coscocategorymaintenance/column/CoscoCategoryMaintenanceField.java index dfe951a..08f1ee6 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/coscocategorymaintenance/column/CoscoCategoryMaintenanceField.java +++ b/src/main/java/com/coscoshipping/ebtp/system/coscocategorymaintenance/column/CoscoCategoryMaintenanceField.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.coscocategorymaintenance.column; +package com.coscoshipping.ebtp.system.coscocategorymaintenance.column; /** diff --git a/src/main/java/com/coscoshipping/ebtp/project/coscocategorymaintenance/controller/CoscoCategoryMaintenanceController.java b/src/main/java/com/coscoshipping/ebtp/system/coscocategorymaintenance/controller/CoscoCategoryMaintenanceController.java similarity index 89% rename from src/main/java/com/coscoshipping/ebtp/project/coscocategorymaintenance/controller/CoscoCategoryMaintenanceController.java rename to src/main/java/com/coscoshipping/ebtp/system/coscocategorymaintenance/controller/CoscoCategoryMaintenanceController.java index 801f00b..57ae561 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/coscocategorymaintenance/controller/CoscoCategoryMaintenanceController.java +++ b/src/main/java/com/coscoshipping/ebtp/system/coscocategorymaintenance/controller/CoscoCategoryMaintenanceController.java @@ -1,10 +1,10 @@ -package com.coscoshipping.ebtp.project.coscocategorymaintenance.controller; +package com.coscoshipping.ebtp.system.coscocategorymaintenance.controller; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.coscoshipping.ebtp.project.coscocategorymaintenance.entity.CoscoCategoryMaintenance; -import com.coscoshipping.ebtp.project.coscocategorymaintenance.entity.CoscoCategoryMaintenanceVO; -import com.coscoshipping.ebtp.project.coscocategorymaintenance.service.ICoscoCategoryMaintenanceService; +import com.coscoshipping.ebtp.system.coscocategorymaintenance.entity.CoscoCategoryMaintenance; +import com.coscoshipping.ebtp.system.coscocategorymaintenance.entity.CoscoCategoryMaintenanceVO; +import com.coscoshipping.ebtp.system.coscocategorymaintenance.service.ICoscoCategoryMaintenanceService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/coscoshipping/ebtp/project/coscocategorymaintenance/dao/CoscoCategoryMaintenanceMapper.java b/src/main/java/com/coscoshipping/ebtp/system/coscocategorymaintenance/dao/CoscoCategoryMaintenanceMapper.java similarity index 78% rename from src/main/java/com/coscoshipping/ebtp/project/coscocategorymaintenance/dao/CoscoCategoryMaintenanceMapper.java rename to src/main/java/com/coscoshipping/ebtp/system/coscocategorymaintenance/dao/CoscoCategoryMaintenanceMapper.java index 98101b5..135d114 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/coscocategorymaintenance/dao/CoscoCategoryMaintenanceMapper.java +++ b/src/main/java/com/coscoshipping/ebtp/system/coscocategorymaintenance/dao/CoscoCategoryMaintenanceMapper.java @@ -1,9 +1,9 @@ -package com.coscoshipping.ebtp.project.coscocategorymaintenance.dao; +package com.coscoshipping.ebtp.system.coscocategorymaintenance.dao; import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; -import com.coscoshipping.ebtp.project.coscocategorymaintenance.entity.CoscoCategoryMaintenance; -import com.coscoshipping.ebtp.project.coscocategorymaintenance.entity.CoscoCategoryMaintenanceVO; +import com.coscoshipping.ebtp.system.coscocategorymaintenance.entity.CoscoCategoryMaintenance; +import com.coscoshipping.ebtp.system.coscocategorymaintenance.entity.CoscoCategoryMaintenanceVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/coscoshipping/ebtp/project/coscocategorymaintenance/dao/mapper/CoscoCategoryMaintenanceMapper.xml b/src/main/java/com/coscoshipping/ebtp/system/coscocategorymaintenance/dao/mapper/CoscoCategoryMaintenanceMapper.xml similarity index 90% rename from src/main/java/com/coscoshipping/ebtp/project/coscocategorymaintenance/dao/mapper/CoscoCategoryMaintenanceMapper.xml rename to src/main/java/com/coscoshipping/ebtp/system/coscocategorymaintenance/dao/mapper/CoscoCategoryMaintenanceMapper.xml index 949370f..803816c 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/coscocategorymaintenance/dao/mapper/CoscoCategoryMaintenanceMapper.xml +++ b/src/main/java/com/coscoshipping/ebtp/system/coscocategorymaintenance/dao/mapper/CoscoCategoryMaintenanceMapper.xml @@ -3,7 +3,7 @@ + type="com.coscoshipping.ebtp.system.coscocategorymaintenance.entity.CoscoCategoryMaintenance"> @@ -40,11 +40,11 @@ diff --git a/src/main/java/com/coscoshipping/ebtp/project/coscocategorymaintenance/entity/CoscoCategoryMaintenance.java b/src/main/java/com/coscoshipping/ebtp/system/coscocategorymaintenance/entity/CoscoCategoryMaintenance.java similarity index 96% rename from src/main/java/com/coscoshipping/ebtp/project/coscocategorymaintenance/entity/CoscoCategoryMaintenance.java rename to src/main/java/com/coscoshipping/ebtp/system/coscocategorymaintenance/entity/CoscoCategoryMaintenance.java index ddd4776..8dfcefb 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/coscocategorymaintenance/entity/CoscoCategoryMaintenance.java +++ b/src/main/java/com/coscoshipping/ebtp/system/coscocategorymaintenance/entity/CoscoCategoryMaintenance.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.coscocategorymaintenance.entity; +package com.coscoshipping.ebtp.system.coscocategorymaintenance.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; diff --git a/src/main/java/com/coscoshipping/ebtp/project/coscocategorymaintenance/entity/CoscoCategoryMaintenanceVO.java b/src/main/java/com/coscoshipping/ebtp/system/coscocategorymaintenance/entity/CoscoCategoryMaintenanceVO.java similarity index 91% rename from src/main/java/com/coscoshipping/ebtp/project/coscocategorymaintenance/entity/CoscoCategoryMaintenanceVO.java rename to src/main/java/com/coscoshipping/ebtp/system/coscocategorymaintenance/entity/CoscoCategoryMaintenanceVO.java index 76b8747..d34f281 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/coscocategorymaintenance/entity/CoscoCategoryMaintenanceVO.java +++ b/src/main/java/com/coscoshipping/ebtp/system/coscocategorymaintenance/entity/CoscoCategoryMaintenanceVO.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.coscocategorymaintenance.entity; +package com.coscoshipping.ebtp.system.coscocategorymaintenance.entity; import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/coscoshipping/ebtp/project/coscocategorymaintenance/service/ICoscoCategoryMaintenanceService.java b/src/main/java/com/coscoshipping/ebtp/system/coscocategorymaintenance/service/ICoscoCategoryMaintenanceService.java similarity index 68% rename from src/main/java/com/coscoshipping/ebtp/project/coscocategorymaintenance/service/ICoscoCategoryMaintenanceService.java rename to src/main/java/com/coscoshipping/ebtp/system/coscocategorymaintenance/service/ICoscoCategoryMaintenanceService.java index 67ee947..b85e217 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/coscocategorymaintenance/service/ICoscoCategoryMaintenanceService.java +++ b/src/main/java/com/coscoshipping/ebtp/system/coscocategorymaintenance/service/ICoscoCategoryMaintenanceService.java @@ -1,12 +1,10 @@ -package com.coscoshipping.ebtp.project.coscocategorymaintenance.service; +package com.coscoshipping.ebtp.system.coscocategorymaintenance.service; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; -import com.coscoshipping.ebtp.project.coscocategorymaintenance.entity.CoscoCategoryMaintenance; -import com.coscoshipping.ebtp.project.coscocategorymaintenance.entity.CoscoCategoryMaintenanceVO; +import com.coscoshipping.ebtp.system.coscocategorymaintenance.entity.CoscoCategoryMaintenance; +import com.coscoshipping.ebtp.system.coscocategorymaintenance.entity.CoscoCategoryMaintenanceVO; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.coscoshipping.ebtp.project.coscocategoryversion.entity.CoscoCategoryVersionVO; import java.util.List; diff --git a/src/main/java/com/coscoshipping/ebtp/project/coscocategorymaintenance/service/impl/CoscoCategoryMaintenanceServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/system/coscocategorymaintenance/service/impl/CoscoCategoryMaintenanceServiceImpl.java similarity index 84% rename from src/main/java/com/coscoshipping/ebtp/project/coscocategorymaintenance/service/impl/CoscoCategoryMaintenanceServiceImpl.java rename to src/main/java/com/coscoshipping/ebtp/system/coscocategorymaintenance/service/impl/CoscoCategoryMaintenanceServiceImpl.java index 39d5d6a..9ebc3d2 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/coscocategorymaintenance/service/impl/CoscoCategoryMaintenanceServiceImpl.java +++ b/src/main/java/com/coscoshipping/ebtp/system/coscocategorymaintenance/service/impl/CoscoCategoryMaintenanceServiceImpl.java @@ -1,25 +1,21 @@ -package com.coscoshipping.ebtp.project.coscocategorymaintenance.service.impl; +package com.coscoshipping.ebtp.system.coscocategorymaintenance.service.impl; import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; -import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum; -import com.coscoshipping.ebtp.project.coscocategorymaintenance.dao.CoscoCategoryMaintenanceMapper; -import com.coscoshipping.ebtp.project.coscocategorymaintenance.entity.CoscoCategoryMaintenance; -import com.coscoshipping.ebtp.project.coscocategorymaintenance.entity.CoscoCategoryMaintenanceVO; -import com.coscoshipping.ebtp.project.coscocategorymaintenance.service.ICoscoCategoryMaintenanceService; +import com.coscoshipping.ebtp.system.coscocategorymaintenance.dao.CoscoCategoryMaintenanceMapper; +import com.coscoshipping.ebtp.system.coscocategorymaintenance.entity.CoscoCategoryMaintenance; +import com.coscoshipping.ebtp.system.coscocategorymaintenance.entity.CoscoCategoryMaintenanceVO; +import com.coscoshipping.ebtp.system.coscocategorymaintenance.service.ICoscoCategoryMaintenanceService; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import net.bytebuddy.implementation.bytecode.Throw; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; -import java.util.Objects; /** * 对数据表 cosco_category_maintenance 操作的 serviceImpl diff --git a/src/main/java/com/coscoshipping/ebtp/project/coscocategoryversion/column/CoscoCategoryVersionField.java b/src/main/java/com/coscoshipping/ebtp/system/coscocategoryversion/column/CoscoCategoryVersionField.java similarity index 90% rename from src/main/java/com/coscoshipping/ebtp/project/coscocategoryversion/column/CoscoCategoryVersionField.java rename to src/main/java/com/coscoshipping/ebtp/system/coscocategoryversion/column/CoscoCategoryVersionField.java index 25bbe71..124f1f0 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/coscocategoryversion/column/CoscoCategoryVersionField.java +++ b/src/main/java/com/coscoshipping/ebtp/system/coscocategoryversion/column/CoscoCategoryVersionField.java @@ -1,4 +1,4 @@ -package com.coscoshipping.ebtp.project.coscocategoryversion.column; +package com.coscoshipping.ebtp.system.coscocategoryversion.column; /** diff --git a/src/main/java/com/coscoshipping/ebtp/project/coscocategoryversion/controller/CoscoCategoryVersionController.java b/src/main/java/com/coscoshipping/ebtp/system/coscocategoryversion/controller/CoscoCategoryVersionController.java similarity index 88% rename from src/main/java/com/coscoshipping/ebtp/project/coscocategoryversion/controller/CoscoCategoryVersionController.java rename to src/main/java/com/coscoshipping/ebtp/system/coscocategoryversion/controller/CoscoCategoryVersionController.java index 3add915..1431b9e 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/coscocategoryversion/controller/CoscoCategoryVersionController.java +++ b/src/main/java/com/coscoshipping/ebtp/system/coscocategoryversion/controller/CoscoCategoryVersionController.java @@ -1,11 +1,11 @@ -package com.coscoshipping.ebtp.project.coscocategoryversion.controller; +package com.coscoshipping.ebtp.system.coscocategoryversion.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.coscoshipping.ebtp.project.coscocategoryversion.entity.CoscoCategoryVersion; -import com.coscoshipping.ebtp.project.coscocategoryversion.entity.CoscoCategoryVersionVO; -import com.coscoshipping.ebtp.project.coscocategoryversion.service.ICoscoCategoryVersionService; +import com.coscoshipping.ebtp.system.coscocategoryversion.entity.CoscoCategoryVersion; +import com.coscoshipping.ebtp.system.coscocategoryversion.entity.CoscoCategoryVersionVO; +import com.coscoshipping.ebtp.system.coscocategoryversion.service.ICoscoCategoryVersionService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; diff --git a/src/main/java/com/coscoshipping/ebtp/project/coscocategoryversion/dao/CoscoCategoryVersionMapper.java b/src/main/java/com/coscoshipping/ebtp/system/coscocategoryversion/dao/CoscoCategoryVersionMapper.java similarity index 78% rename from src/main/java/com/coscoshipping/ebtp/project/coscocategoryversion/dao/CoscoCategoryVersionMapper.java rename to src/main/java/com/coscoshipping/ebtp/system/coscocategoryversion/dao/CoscoCategoryVersionMapper.java index 8cf628d..eed7711 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/coscocategoryversion/dao/CoscoCategoryVersionMapper.java +++ b/src/main/java/com/coscoshipping/ebtp/system/coscocategoryversion/dao/CoscoCategoryVersionMapper.java @@ -1,10 +1,10 @@ -package com.coscoshipping.ebtp.project.coscocategoryversion.dao; +package com.coscoshipping.ebtp.system.coscocategoryversion.dao; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; -import com.coscoshipping.ebtp.project.coscocategoryversion.entity.CoscoCategoryVersion; -import com.coscoshipping.ebtp.project.coscocategoryversion.entity.CoscoCategoryVersionVO; +import com.coscoshipping.ebtp.system.coscocategoryversion.entity.CoscoCategoryVersion; +import com.coscoshipping.ebtp.system.coscocategoryversion.entity.CoscoCategoryVersionVO; import org.apache.ibatis.annotations.Param; /** diff --git a/src/main/java/com/coscoshipping/ebtp/project/coscocategoryversion/dao/mapper/CoscoCategoryVersionMapper.xml b/src/main/java/com/coscoshipping/ebtp/system/coscocategoryversion/dao/mapper/CoscoCategoryVersionMapper.xml similarity index 86% rename from src/main/java/com/coscoshipping/ebtp/project/coscocategoryversion/dao/mapper/CoscoCategoryVersionMapper.xml rename to src/main/java/com/coscoshipping/ebtp/system/coscocategoryversion/dao/mapper/CoscoCategoryVersionMapper.xml index db7b40b..85e7187 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/coscocategoryversion/dao/mapper/CoscoCategoryVersionMapper.xml +++ b/src/main/java/com/coscoshipping/ebtp/system/coscocategoryversion/dao/mapper/CoscoCategoryVersionMapper.xml @@ -3,7 +3,7 @@ + type="com.coscoshipping.ebtp.system.coscocategoryversion.entity.CoscoCategoryVersion"> @@ -29,11 +29,11 @@ + SELECT * FROM cosco_reconnaissance_notice + + diff --git a/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancenotice/entity/CoscoReconnaissanceNotice.java b/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancenotice/entity/CoscoReconnaissanceNotice.java new file mode 100644 index 0000000..8dcc8b2 --- /dev/null +++ b/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancenotice/entity/CoscoReconnaissanceNotice.java @@ -0,0 +1,111 @@ +package com.coscoshipping.ebtp.system.coscoreconnaissancenotice.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * 实体类 CoscoReconnaissanceNotice + * @author sunyu + * @date 2025-5-28 + */ +@Data +@Accessors(chain = true) +@ApiModel +@TableName(value = "cosco_reconnaissance_notice", autoResultMap = true) +public class CoscoReconnaissanceNotice extends BaseEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "主键id") + private Long id; + + /** + * 踏勘标题 + */ + @ApiModelProperty(value = "踏勘标题") + private String title; + + /** + * 关联标段（0服务器采购 1交换机采购） + */ + @ApiModelProperty(value = "关联标段（0服务器采购 1交换机采购）") + private String relatedSection; + + /** + * 踏勘时间 + */ + @ApiModelProperty(value = "踏勘时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private LocalDateTime reconnaissanceTime; + + /** + * 踏勘地点 + */ + @ApiModelProperty(value = "踏勘地点") + private String location; + + /** + * 踏勤联系人 + */ + @ApiModelProperty(value = "踏勤联系人") + private String contacts; + + /** + * 联系电话 + */ + @ApiModelProperty(value = "联系电话") + private String phone; + + /** + * 踏助人员要求 + */ + @ApiModelProperty(value = "踏助人员要求") + private String personRequire; + + /** + * 踏勘附件 + */ + @ApiModelProperty(value = "踏勘附件") + private String attachment; + + /** + * 踏勘状态（0 已保存 1已发送） + */ + @ApiModelProperty(value = "踏勘状态（0 已保存 1已发送）") + private Integer status; + + /** + * 踏勘状态（0 已保存 1已发送） + */ + @ApiModelProperty(value = "回执时间）") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private LocalDateTime receiptDate; + + @TableField(exist = false) + private String tenantId; + + @TableField(exist = false) + private String tenantName; + + @TableField(exist = false) + private String deleteFlag; + + @TableField(exist = false) + private LocalDateTime lastUpdateTime; + +} diff --git a/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancenotice/entity/CoscoReconnaissanceNoticeVO.java b/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancenotice/entity/CoscoReconnaissanceNoticeVO.java new file mode 100644 index 0000000..d329dc8 --- /dev/null +++ b/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancenotice/entity/CoscoReconnaissanceNoticeVO.java @@ -0,0 +1,26 @@ +package com.coscoshipping.ebtp.system.coscoreconnaissancenotice.entity; + +import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * 实体类 CoscoReconnaissanceNotice + * @author sunyu + * @date 2025-5-28 + */ +@Data +@Accessors(chain = true) +@ApiModel +public class CoscoReconnaissanceNoticeVO extends CoscoReconnaissanceNotice implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "分页对象信息") + private BasePageRequest basePageRequest; + +} diff --git a/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancenotice/service/ICoscoReconnaissanceNoticeService.java b/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancenotice/service/ICoscoReconnaissanceNoticeService.java new file mode 100644 index 0000000..a4b02d0 --- /dev/null +++ b/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancenotice/service/ICoscoReconnaissanceNoticeService.java @@ -0,0 +1,24 @@ +package com.coscoshipping.ebtp.system.coscoreconnaissancenotice.service; + + +import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; +import com.coscoshipping.ebtp.system.coscoreconnaissancenotice.entity.CoscoReconnaissanceNotice; +import com.coscoshipping.ebtp.system.coscoreconnaissancenotice.entity.CoscoReconnaissanceNoticeVO; +import com.baomidou.mybatisplus.core.metadata.IPage; + +/** + * 对数据表 cosco_reconnaissance_notice 操作的 service + * @author sunyu + * @date 2025-5-28 + */ +public interface ICoscoReconnaissanceNoticeService extends IBaseService { + + /** + * 分页查询 + * + * @param coscoReconnaissanceNoticeVO 分页数据 + * @return 返回结果 + */ + IPage getPage(CoscoReconnaissanceNoticeVO coscoReconnaissanceNoticeVO); + +} diff --git a/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancenotice/service/impl/CoscoReconnaissanceNoticeServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancenotice/service/impl/CoscoReconnaissanceNoticeServiceImpl.java new file mode 100644 index 0000000..531affe --- /dev/null +++ b/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancenotice/service/impl/CoscoReconnaissanceNoticeServiceImpl.java @@ -0,0 +1,68 @@ +package com.coscoshipping.ebtp.system.coscoreconnaissancenotice.service.impl; + + +import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; +import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; +import com.coscoshipping.ebtp.system.coscoreconnaissancenotice.dao.CoscoReconnaissanceNoticeMapper; +import com.coscoshipping.ebtp.system.coscoreconnaissancenotice.entity.CoscoReconnaissanceNotice; +import com.coscoshipping.ebtp.system.coscoreconnaissancenotice.entity.CoscoReconnaissanceNoticeVO; +import com.coscoshipping.ebtp.system.coscoreconnaissancenotice.service.ICoscoReconnaissanceNoticeService; +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.time.format.DateTimeFormatter; + +/** +* 对数据表 cosco_reconnaissance_notice 操作的 serviceImpl +* @author sunyu +* @date 2025-5-28 +*/ +@Service +public class CoscoReconnaissanceNoticeServiceImpl extends BaseServiceImpl implements ICoscoReconnaissanceNoticeService { + + private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + + @Resource + private CoscoReconnaissanceNoticeMapper coscoReconnaissanceNoticeMapper; + + /** + * 生成查询数据 + * + * @param coscoReconnaissanceNoticeVO 查询条件 + * @return 返回结果 + */ + + private LambdaQueryWrapper getCoscoReconnaissanceNoticeQueryWrapper(CoscoReconnaissanceNoticeVO coscoReconnaissanceNoticeVO) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + + return queryWrapper; + } + + @Override + public IPage getPage(CoscoReconnaissanceNoticeVO coscoReconnaissanceNoticeVO) { + LambdaQueryWrapper queryWrapper = getCoscoReconnaissanceNoticeQueryWrapper(coscoReconnaissanceNoticeVO); + queryWrapper.orderByDesc(CoscoReconnaissanceNotice::getId); + + if (null == coscoReconnaissanceNoticeVO.getBasePageRequest()) { + coscoReconnaissanceNoticeVO.setBasePageRequest(new BasePageRequest()); + } + //查询 + IPage p = new Page<>( + coscoReconnaissanceNoticeVO.getBasePageRequest().getPageNo(), + coscoReconnaissanceNoticeVO.getBasePageRequest().getPageSize() + ); + IPage result = this.page(p, queryWrapper); + + return result.convert(c -> BeanUtil.toBean(c, CoscoReconnaissanceNoticeVO.class)); + +// IPage result = coscoReconnaissanceNoticeMapper.selectPageList(p, +// coscoReconnaissanceNoticeVO.getTitle(), +// coscoReconnaissanceNoticeVO.getStatus()); +// return result; + } +} diff --git a/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancereceipt/column/CoscoReconnaissanceReceiptField.java b/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancereceipt/column/CoscoReconnaissanceReceiptField.java new file mode 100644 index 0000000..cf85856 --- /dev/null +++ b/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancereceipt/column/CoscoReconnaissanceReceiptField.java @@ -0,0 +1,60 @@ +package com.coscoshipping.ebtp.system.coscoreconnaissancereceipt.column; + + +/** + * 字段常量 CoscoReconnaissanceReceipt + * @author sunyu + * @date 2025-5-28 + */ +public class CoscoReconnaissanceReceiptField { + + + /** + * 主键ID + */ + public static final String ID = "id"; + + /** + * 踏勘通知表id + */ + public static final String NOTICE_ID = "notice_id"; + + /** + * 供应商名称 + */ + public static final String SUPPLIER_NAME = "supplier_name"; + + /** + * 是否进行踏勘 + */ + public static final String FLAG = "flag"; + + /** + * 踏勘人数 + */ + public static final String NUMBER = "number"; + + /** + * 踏勘联系人 + */ + public static final String CONTACTOR = "contactor"; + + /** + * 联系方式 + */ + public static final String CONTACT_INFO = "contact_info"; + + + /** + * 创建时间/起草时间 + */ + public static final String CREATE_DATE = "create_date"; + + + /** + * 更新时间 + */ + public static final String UPDATE_DATE = "update_date"; + + +} diff --git a/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancereceipt/controller/CoscoReconnaissanceReceiptController.java b/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancereceipt/controller/CoscoReconnaissanceReceiptController.java new file mode 100644 index 0000000..835ff6e --- /dev/null +++ b/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancereceipt/controller/CoscoReconnaissanceReceiptController.java @@ -0,0 +1,130 @@ +package com.coscoshipping.ebtp.system.coscoreconnaissancereceipt.controller; + + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.coscoshipping.ebtp.system.coscoreconnaissancereceipt.entity.CoscoReconnaissanceReceipt; +import com.coscoshipping.ebtp.system.coscoreconnaissancereceipt.entity.CoscoReconnaissanceReceiptVO; +import com.coscoshipping.ebtp.system.coscoreconnaissancereceipt.service.ICoscoReconnaissanceReceiptService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.coscoshipping.ebtp.project.coscotenderclarificationreceipt.entity.CoscoTenderClarificationReceipt; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.List; + + +/** +* 踏勘回执表 Controller +* @author sunyu +* @date 2025-5-28 +*/ +@Validated +@RestController +@Api(tags = "踏勘回执表") +@RequestMapping("/v1/coscoreconnaissancereceipt") +public class CoscoReconnaissanceReceiptController{ + + @Resource + private ICoscoReconnaissanceReceiptService coscoReconnaissanceReceiptService; + + /** + * 插入新数据 + * + * @param coscoReconnaissanceReceipt 实体类 + * + * @return 返回结果 + */ + @ApiOperation("插入新数据") + @PostMapping("") + public BaseResponse insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid CoscoReconnaissanceReceipt coscoReconnaissanceReceipt){ + + return BaseResponse.success(coscoReconnaissanceReceiptService.saveData(coscoReconnaissanceReceipt)); + } + + /** + * 修改数据 + * + * @param coscoReconnaissanceReceipt 实体类 + * + * @return 返回结果 + */ + @ApiOperation("修改数据") + @PostMapping("/update") + public BaseResponse update(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoReconnaissanceReceipt coscoReconnaissanceReceipt){ + + return BaseResponse.success(coscoReconnaissanceReceiptService.updateById(coscoReconnaissanceReceipt)); + } + + /** + * 查询数据 + * + * @param id 实体类主键 + * + * @return 返回结果 + */ + @ApiOperation("查询数据") + @GetMapping("/{id}") + public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id){ + + return BaseResponse.success(coscoReconnaissanceReceiptService.getById(id)); + } + + /** + * 删除数据 + * + * @param id 实体ID + * + * @return 返回结果 + */ + @ApiOperation("删除数据") + @GetMapping("/delete/{id}") + public BaseResponse delete(@ApiParam(value = "主键id", required = true) @PathVariable String id){ + + return BaseResponse.success(coscoReconnaissanceReceiptService.removeById(id)); + } + + + /** + * 查询分页数据 + * + * @param coscoReconnaissanceReceiptVO 分页信息 + * @return 返回结果 + */ + @ApiOperation("查询分页数据") + @PostMapping("/getPage") + public BaseResponse> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoReconnaissanceReceiptVO coscoReconnaissanceReceiptVO) { + + return BaseResponse.success(coscoReconnaissanceReceiptService.getPage(coscoReconnaissanceReceiptVO)); + } + + /** + * 根据通知id查询回执列表 + * + * @param noticeId + * @return 返回结果 + */ + @ApiOperation("根据通知id查询回执列表") + @GetMapping("/getReceiptList/{noticeId}") + public BaseResponse> getReceiptList(@ApiParam(value = "通知id", required = true) @PathVariable String noticeId) { + + return BaseResponse.success(coscoReconnaissanceReceiptService.getReceiptList(noticeId)); + } + + /** + * 根据供应商名称和踏勘通知表主键id(noticeId)查询踏勘回执回显信息 + * + * @param noticeId + * @return 返回结果 + */ + @ApiOperation("根据供应商名称和踏勘通知表主键id(noticeId)查询踏勘回执回显信息") + @GetMapping("/getReceiptInfo/{noticeId}") + public BaseResponse getReceiptInfo(@ApiParam(value = "通知id", required = true) @PathVariable String noticeId) { + + return BaseResponse.success(coscoReconnaissanceReceiptService.getReceiptInfo(noticeId)); + } +} diff --git a/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancereceipt/dao/CoscoReconnaissanceReceiptMapper.java b/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancereceipt/dao/CoscoReconnaissanceReceiptMapper.java new file mode 100644 index 0000000..3575b64 --- /dev/null +++ b/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancereceipt/dao/CoscoReconnaissanceReceiptMapper.java @@ -0,0 +1,14 @@ +package com.coscoshipping.ebtp.system.coscoreconnaissancereceipt.dao; + + +import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; +import com.coscoshipping.ebtp.system.coscoreconnaissancereceipt.entity.CoscoReconnaissanceReceipt; + +/** +* 对数据表 cosco_reconnaissance_receipt 操作的 dao +* @author sunyu +* @date 2025-5-28 +*/ +public interface CoscoReconnaissanceReceiptMapper extends IBaseMapper { + +} diff --git a/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancereceipt/dao/mapper/CoscoReconnaissanceReceiptMapper.xml b/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancereceipt/dao/mapper/CoscoReconnaissanceReceiptMapper.xml new file mode 100644 index 0000000..7243140 --- /dev/null +++ b/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancereceipt/dao/mapper/CoscoReconnaissanceReceiptMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + delete from cosco_reconnaissance_receipt where id in(${ids}) + + diff --git a/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancereceipt/entity/CoscoReconnaissanceReceipt.java b/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancereceipt/entity/CoscoReconnaissanceReceipt.java new file mode 100644 index 0000000..1afa1ac --- /dev/null +++ b/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancereceipt/entity/CoscoReconnaissanceReceipt.java @@ -0,0 +1,88 @@ +package com.coscoshipping.ebtp.system.coscoreconnaissancereceipt.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; + +/** + * 实体类 CoscoReconnaissanceReceipt + * @author sunyu + * @date 2025-5-28 + */ +@Data +@Accessors(chain = true) +@ApiModel +@TableName(value = "cosco_reconnaissance_receipt", autoResultMap = true) +public class CoscoReconnaissanceReceipt extends BaseEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ApiModelProperty(value = "主键ID") + private Long id; + + /** + * 踏勘通知表id + */ + @ApiModelProperty(value = "踏勘通知表id") + private Long noticeId; + + /** + * 供应商名称 + */ + @ApiModelProperty(value = "供应商名称") + private String supplierName; + + /** + * 是否进行踏勘 + */ + @ApiModelProperty(value = "是否进行踏勘") + private Boolean flag; + + /** + * 踏勘人数 + */ + @ApiModelProperty(value = "踏勘人数") + private String number; + + /** + * 踏勘联系人 + */ + @ApiModelProperty(value = "踏勘联系人") + private String contactor; + + /** + * 联系方式 + */ + @ApiModelProperty(value = "联系方式") + private String contactInfo; + + + /** + * 创建时间/起草时间 + */ + @ApiModelProperty(value = "创建时间/起草时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private java.time.LocalDateTime createDate; + + + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private java.time.LocalDateTime updateDate; + + +} diff --git a/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancereceipt/entity/CoscoReconnaissanceReceiptVO.java b/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancereceipt/entity/CoscoReconnaissanceReceiptVO.java new file mode 100644 index 0000000..6c84a11 --- /dev/null +++ b/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancereceipt/entity/CoscoReconnaissanceReceiptVO.java @@ -0,0 +1,26 @@ +package com.coscoshipping.ebtp.system.coscoreconnaissancereceipt.entity; + +import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * 实体类 CoscoReconnaissanceReceipt + * @author sunyu + * @date 2025-5-28 + */ +@Data +@Accessors(chain = true) +@ApiModel +public class CoscoReconnaissanceReceiptVO extends CoscoReconnaissanceReceipt implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "分页对象信息") + private BasePageRequest basePageRequest; + +} diff --git a/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancereceipt/service/ICoscoReconnaissanceReceiptService.java b/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancereceipt/service/ICoscoReconnaissanceReceiptService.java new file mode 100644 index 0000000..77b0a62 --- /dev/null +++ b/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancereceipt/service/ICoscoReconnaissanceReceiptService.java @@ -0,0 +1,32 @@ +package com.coscoshipping.ebtp.system.coscoreconnaissancereceipt.service; + + +import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; +import com.coscoshipping.ebtp.system.coscoreconnaissancereceipt.entity.CoscoReconnaissanceReceipt; +import com.coscoshipping.ebtp.system.coscoreconnaissancereceipt.entity.CoscoReconnaissanceReceiptVO; +import com.baomidou.mybatisplus.core.metadata.IPage; + +import java.util.List; + +/** + * 对数据表 cosco_reconnaissance_receipt 操作的 service + * @author sunyu + * @date 2025-5-28 + */ +public interface ICoscoReconnaissanceReceiptService extends IBaseService { + + /** + * 分页查询 + * + * @param coscoReconnaissanceReceiptVO 分页数据 + * @return 返回结果 + */ + IPage getPage(CoscoReconnaissanceReceiptVO coscoReconnaissanceReceiptVO); + + List getReceiptList(String noticeId); + + Boolean saveData(CoscoReconnaissanceReceipt coscoReconnaissanceReceipt); + + CoscoReconnaissanceReceipt getReceiptInfo(String noticeId); + +} diff --git a/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancereceipt/service/impl/CoscoReconnaissanceReceiptServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancereceipt/service/impl/CoscoReconnaissanceReceiptServiceImpl.java new file mode 100644 index 0000000..0647c82 --- /dev/null +++ b/src/main/java/com/coscoshipping/ebtp/system/coscoreconnaissancereceipt/service/impl/CoscoReconnaissanceReceiptServiceImpl.java @@ -0,0 +1,95 @@ +package com.coscoshipping.ebtp.system.coscoreconnaissancereceipt.service.impl; + + +import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; +import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; +import com.coscoshipping.ebtp.system.coscoreconnaissancenotice.dao.CoscoReconnaissanceNoticeMapper; +import com.coscoshipping.ebtp.system.coscoreconnaissancenotice.entity.CoscoReconnaissanceNotice; +import com.coscoshipping.ebtp.system.coscoreconnaissancereceipt.dao.CoscoReconnaissanceReceiptMapper; +import com.coscoshipping.ebtp.system.coscoreconnaissancereceipt.entity.CoscoReconnaissanceReceipt; +import com.coscoshipping.ebtp.system.coscoreconnaissancereceipt.entity.CoscoReconnaissanceReceiptVO; +import com.coscoshipping.ebtp.system.coscoreconnaissancereceipt.service.ICoscoReconnaissanceReceiptService; +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.coscoshipping.ebtp.project.coscotenderclarificationreceipt.entity.CoscoTenderClarificationReceipt; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.util.List; + +/** +* 对数据表 cosco_reconnaissance_receipt 操作的 serviceImpl +* @author sunyu +* @date 2025-5-28 +*/ +@Service +public class CoscoReconnaissanceReceiptServiceImpl extends BaseServiceImpl implements ICoscoReconnaissanceReceiptService { + + @Resource + private CoscoReconnaissanceReceiptMapper coscoReconnaissanceReceiptMapper; + + @Resource + private CoscoReconnaissanceNoticeMapper coscoReconnaissanceNoticeMapper; + + + /** + * 生成查询数据 + * + * @param coscoReconnaissanceReceiptVO 查询条件 + * @return 返回结果 + */ + + private LambdaQueryWrapper getCoscoReconnaissanceReceiptQueryWrapper(CoscoReconnaissanceReceiptVO coscoReconnaissanceReceiptVO) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + + return queryWrapper; + } + + @Override + public IPage getPage(CoscoReconnaissanceReceiptVO coscoReconnaissanceReceiptVO) { + LambdaQueryWrapper queryWrapper = getCoscoReconnaissanceReceiptQueryWrapper(coscoReconnaissanceReceiptVO); + queryWrapper.orderByDesc(CoscoReconnaissanceReceipt::getId); + + if (null == coscoReconnaissanceReceiptVO.getBasePageRequest()) { + coscoReconnaissanceReceiptVO.setBasePageRequest(new BasePageRequest()); + } + + //查询 + IPage p = new Page<>(coscoReconnaissanceReceiptVO.getBasePageRequest().getPageNo(), + coscoReconnaissanceReceiptVO.getBasePageRequest().getPageSize()); + IPage result = this.page(p, queryWrapper); + + return result.convert(c -> BeanUtil.toBean(c, CoscoReconnaissanceReceiptVO.class)); + } + + @Override + public List getReceiptList(String noticeId) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + queryWrapper.eq(CoscoReconnaissanceReceipt::getNoticeId, noticeId); + List list = baseMapper.selectList(queryWrapper); + return list; + } + + @Override + public Boolean saveData(CoscoReconnaissanceReceipt coscoReconnaissanceReceipt) { + baseMapper.insert(coscoReconnaissanceReceipt); + //更新通知表的receipt_date回执时间 + CoscoReconnaissanceNotice notice = new CoscoReconnaissanceNotice(); + notice.setId(coscoReconnaissanceReceipt.getNoticeId()); + notice.setReceiptDate(LocalDateTime.now()); + coscoReconnaissanceNoticeMapper.updateById(notice); + return true; + } + + @Override + public CoscoReconnaissanceReceipt getReceiptInfo(String noticeId) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + queryWrapper.eq(CoscoReconnaissanceReceipt::getNoticeId, noticeId) + .eq(CoscoReconnaissanceReceipt::getSupplierName, "北京良塔装饰工程中心"); + return baseMapper.selectOne(queryWrapper); + } +}