From d875f7d235be5b9218bd3a07cecd559ed6600c0b Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 13 Sep 2023 14:05:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5-?= =?UTF-8?q?=E5=BB=B6=E6=9C=9F=E7=A8=BD=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EnterpriseStandardInspectController.java | 18 +++++ .../EnterpriseStandardInspectDelay.java | 66 +++++++++++++++++++ .../vo/EnterpriseStandardInspectVo.java | 4 ++ .../EnterpriseStandardInspectDelayMapper.java | 18 +++++ .../EnterpriseStandardInspectDelayMapper.xml | 24 +++++++ .../xml/EnterpriseStandardInspectMapper.xml | 11 +++- ...EnterpriseStandardInspectDelayService.java | 19 ++++++ ...rpriseStandardInspectDelayServiceImpl.java | 38 +++++++++++ 8 files changed, 195 insertions(+), 3 deletions(-) create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectDelay.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectDelayMapper.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectDelayMapper.xml create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectDelayService.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectDelayServiceImpl.java diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java index 6adf5978..7f7a7684 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java @@ -7,8 +7,10 @@ import com.jero.common.system.base.controller.JeroController; import com.jero.common.util.MessageUtils; import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectDelay; import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectDelayService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -36,6 +38,9 @@ public class EnterpriseStandardInspectController extends JeroController pageList= esInspectService.queryPageList(esInspect, pageNo, pageSize); return Result.OK(MessageUtils.getMessage(ResultCommon.OK), pageList); } + + /** + * 延期稽查 + * + * @return + */ + @AutoLog(value = "企标稽查-延期稽查") + @ApiOperation(value="企标稽查-延期稽查", notes="企标稽查-延期稽查") + @GetMapping(value = "/delayInspect") + public Result delayInspect(@RequestParam("id") String inspectId) { + EnterpriseStandardInspectDelay esInspectDelay = esInspectDelayService.getLastDelayInspect(inspectId); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK), esInspectDelay); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectDelay.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectDelay.java new file mode 100644 index 00000000..9e1d1e23 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectDelay.java @@ -0,0 +1,66 @@ +package com.jero.modules.laws.enterprise.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * + * @TableName laws_enterprise_standard_inspect_delay + */ +@TableName(value ="laws_enterprise_standard_inspect_delay") +@Data +public class EnterpriseStandardInspectDelay implements Serializable { + /** + * 主键ID + */ + @TableId + private String id; + + /** + * 创建人 + */ + private String createBy; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新人 + */ + private String updateBy; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 所属部门 + */ + private String orgCode; + + /** + * 稽查id + */ + private String inspectId; + + /** + * 申请延期日期 + */ + private Date requestDelayDate; + + /** + * 延期说明 + */ + private String delayDescprtion; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java index 75ba6575..97c84c03 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java @@ -72,4 +72,8 @@ public class EnterpriseStandardInspectVo { @ApiModelProperty(value = "创建时间") private Date createTime; + /** 延期稽查标识 */ + @ApiModelProperty(value = "延期稽查标识") + private boolean delayFlag; + } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectDelayMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectDelayMapper.java new file mode 100644 index 00000000..58556cf5 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectDelayMapper.java @@ -0,0 +1,18 @@ +package com.jero.modules.laws.enterprise.mapper; + +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectDelay; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author ThinkBook +* @description 针对表【laws_enterprise_standard_inspect_delay】的数据库操作Mapper +* @createDate 2023-09-13 13:46:35 +* @Entity com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectDelay +*/ +public interface EnterpriseStandardInspectDelayMapper extends BaseMapper { + +} + + + + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectDelayMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectDelayMapper.xml new file mode 100644 index 00000000..ce8c4345 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectDelayMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + id,create_by,create_time, + update_by,update_time,org_code, + inspect_id,request_delay_date,delay_descprtion + + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml index 45152fc5..68125742 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml @@ -25,6 +25,7 @@ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectDelayService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectDelayService.java new file mode 100644 index 00000000..3a5abc5b --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectDelayService.java @@ -0,0 +1,19 @@ +package com.jero.modules.laws.enterprise.service; + +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectDelay; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author ThinkBook +* @description 针对表【laws_enterprise_standard_inspect_delay】的数据库操作Service +* @createDate 2023-09-13 13:46:35 +*/ +public interface EnterpriseStandardInspectDelayService extends IService { + + /** + * 稽查列表获取最新的延期极差信息 + * @param inspectId + * @return + */ + EnterpriseStandardInspectDelay getLastDelayInspect(String inspectId); +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectDelayServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectDelayServiceImpl.java new file mode 100644 index 00000000..eb4e68de --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectDelayServiceImpl.java @@ -0,0 +1,38 @@ +package com.jero.modules.laws.enterprise.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.exception.JeroBootException; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectDelay; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectDelayService; +import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectDelayMapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** +* @author ThinkBook +* @description 针对表【laws_enterprise_standard_inspect_delay】的数据库操作Service实现 +* @createDate 2023-09-13 13:46:35 +*/ +@Service +@Transactional(rollbackFor = JeroBootException.class) +@Slf4j +public class EnterpriseStandardInspectDelayServiceImpl extends ServiceImpl + implements EnterpriseStandardInspectDelayService{ + + @Override + public EnterpriseStandardInspectDelay getLastDelayInspect(String inspectId) { + // 多次延期只返回最新的信息 + LambdaQueryWrapper esInspectDelayWrapper = new LambdaQueryWrapper<>(); + esInspectDelayWrapper.orderByDesc(EnterpriseStandardInspectDelay::getCreateTime); + List list = list(esInspectDelayWrapper); + return list.get(0); + } +} + + + +