From c7b9994b68fed073e54dc164424d1801dfa258ab Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 13 Sep 2023 14:49:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5-?= =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E6=8A=A5=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EnterpriseStandardInspectController.java | 22 ++++++++++++++++++- .../EnterpriseStandardInspectReport.java | 13 ++++++++++- ...EnterpriseStandardInspectReportMapper.java | 3 +++ .../EnterpriseStandardInspectReportMapper.xml | 20 +++++++++++++++-- ...nterpriseStandardInspectReportService.java | 10 +++++++++ ...priseStandardInspectReportServiceImpl.java | 14 ++++++++++++ 6 files changed, 78 insertions(+), 4 deletions(-) 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 7f7a7684..fc74ada5 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 @@ -8,9 +8,11 @@ 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.EnterpriseStandardInspectReport; 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.EnterpriseStandardInspectReportService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -41,6 +43,9 @@ public class EnterpriseStandardInspectController extends JeroController queryPageList(ESQueryCommonDTO esInspect, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { - IPage pageList= esInspectService.queryPageList(esInspect, pageNo, pageSize); + IPage pageList = esInspectService.queryPageList(esInspect, pageNo, pageSize); return Result.OK(MessageUtils.getMessage(ResultCommon.OK), pageList); } @@ -68,4 +73,19 @@ public class EnterpriseStandardInspectController extends JeroController inspectReport(@RequestParam("id") String inspectId, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + IPage pageList = esInspectReportService.getInspectReport(inspectId, pageNo, pageSize); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK), pageList); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectReport.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectReport.java index 990e4a88..496fd3af 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectReport.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectReport.java @@ -1,6 +1,7 @@ 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 com.fasterxml.jackson.annotation.JsonFormat; @@ -76,5 +77,15 @@ public class EnterpriseStandardInspectReport implements Serializable { /**附件*/ @ApiModelProperty(value = "附件") - private String attachement; + private String attachment; + + /**依据条款*/ + @TableField(exist = false) + @ApiModelProperty(value = "依据条款") + private String baseClause; + + /**标准内容或要求*/ + @TableField(exist = false) + @ApiModelProperty(value = "标准内容或要求") + private String standardRequire; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectReportMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectReportMapper.java index c5c05c36..265be8ea 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectReportMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectReportMapper.java @@ -1,7 +1,9 @@ package com.jero.modules.laws.enterprise.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** * @author ThinkBook @@ -11,6 +13,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface EnterpriseStandardInspectReportMapper extends BaseMapper { + IPage page(IPage page, @Param("inspectId") String inspectId); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectReportMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectReportMapper.xml index f8f06e48..b62451f5 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectReportMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectReportMapper.xml @@ -15,13 +15,29 @@ - + id,create_by,create_time, update_by,update_time,org_code, inspect_id,clause_based_id,evaluate_score, - execution_status,attachement + execution_status,attachment + + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectReportService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectReportService.java index 88e0a454..1c55e2fe 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectReportService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectReportService.java @@ -1,5 +1,6 @@ package com.jero.modules.laws.enterprise.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport; import com.baomidou.mybatisplus.extension.service.IService; @@ -10,4 +11,13 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface EnterpriseStandardInspectReportService extends IService { + /** + * 稽查报告列表 + * + * @param inspectId + * @param pageNo + * @param pageSize + * @return + */ + IPage getInspectReport(String inspectId, Integer pageNo, Integer pageSize); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectReportServiceImpl.java index e2030197..cd1a6f20 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectReportServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectReportServiceImpl.java @@ -1,14 +1,19 @@ package com.jero.modules.laws.enterprise.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport; +import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo; import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectReportService; import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectReportMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; + /** * @author ThinkBook * @description 针对表【laws_enterprise_standard_inspect_report】的数据库操作Service实现 @@ -20,6 +25,15 @@ import org.springframework.transaction.annotation.Transactional; public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl implements EnterpriseStandardInspectReportService { + @Resource + private EnterpriseStandardInspectReportMapper esInspectReportMapper; + + @Override + public IPage getInspectReport(String inspectId, Integer pageNo, Integer pageSize) { + IPage page = new Page<>(pageNo, pageSize); + esInspectReportMapper.page(page, inspectId); + return page; + } }