From c517355dd8d0e7fceb7d6eda36db01fae915a789 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Sun, 10 Sep 2023 18:51:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A8=BD=E6=9F=A5=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EnterpriseStandardInspectController.java | 54 ++++++++++++++ .../entity/EnterpriseStandardInspect.java | 4 +- .../vo/EnterpriseStandardInspectVo.java | 71 +++++++++++++++++++ .../EnterpriseStandardInspectMapper.java | 10 +++ .../xml/EnterpriseStandardInspectMapper.xml | 61 +++++++++++++--- .../EnterpriseStandardInspectService.java | 11 +++ .../EnterpriseStandardInspectServiceImpl.java | 39 ++++++++++ 7 files changed, 238 insertions(+), 12 deletions(-) create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.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 new file mode 100644 index 00000000..242359f0 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java @@ -0,0 +1,54 @@ +package com.jero.modules.laws.enterprise.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardDeclare; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect; +import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; +import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardDeclareVo; +import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardDeclareService; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + + +/** + * @Description: 企标稽查 + * @Author: jero-boot + * @Date: 2022-02-12 + * @Version: V1.0 + */ +@Api(tags="企标宣贯") +@RestController +@RequestMapping("/enterprise/inspect") +@Slf4j +public class EnterpriseStandardInspectController extends JeroController { + + @Resource + private EnterpriseStandardInspectService esInspectService;; + + /** + * 分页列表查询 + * + * @return + */ + @AutoLog(value = "企标稽查-分页列表查询") + @ApiOperation(value="企标稽查-分页列表查询", notes="企标稽查-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ESQueryCommonDTO esInspect, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + IPage pageList= esInspectService.queryPageList(esInspect, pageNo, pageSize); + return Result.OK(pageList); + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspect.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspect.java index 4fac47cd..60784da4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspect.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspect.java @@ -72,7 +72,7 @@ public class EnterpriseStandardInspect implements Serializable { /** 所属部门 */ @ApiModelProperty(value = "所属部门") - private String beloneDept; + private String belongDept; /** 计划稽查日期 */ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @@ -100,5 +100,5 @@ public class EnterpriseStandardInspect implements Serializable { /** 稽查状态 */ @ApiModelProperty(value = "稽查状态") - private String insectState; + private String inspectStatus; } 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 new file mode 100644 index 00000000..0c793cce --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java @@ -0,0 +1,71 @@ +package com.jero.modules.laws.enterprise.entity.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @author: Mzaxd + * @Date: 2023/9/10 18:14 + */ +@Data +public class EnterpriseStandardInspectVo { + + /** 主键ID */ + @ApiModelProperty(value = "主键ID") + private String id; + + /** 稽查依据标准号 */ + @ApiModelProperty(value = "稽查依据标准号") + private String inspectNo; + + /** 稽查依据标准名称 */ + @ApiModelProperty(value = "稽查依据标准名称") + private String inspectName; + + /** 主责标准化工作组 */ + @ApiModelProperty(value = "主责标准化工作组") + private String standardizationWorkGroup; + + /** 所属部门 */ + @ApiModelProperty(value = "所属部门") + private String belongDept; + + /** 计划稽查日期 */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "计划稽查日期") + private Date planInspectDate; + + /** 稽查负责人 */ + @ApiModelProperty(value = "稽查负责人") + private String inspectUser; + + /** 标准化组对接人 */ + @ApiModelProperty(value = "标准化组对接人") + private String standardizationDockingUser; + + /** 实际稽查完成日期 */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "实际稽查完成日期") + private Date completeDate; + + /** 实际稽查人 */ + @ApiModelProperty(value = "实际稽查人") + private String actualInspectUser; + + /** 稽查状态 */ + @ApiModelProperty(value = "稽查状态") + private String inspectStatus; + + /** 创建时间 */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") + private Date createTime; + +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectMapper.java index aba429d5..7e51d8a7 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectMapper.java @@ -1,7 +1,10 @@ package com.jero.modules.laws.enterprise.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; +import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo; /** * @author ThinkBook @@ -11,6 +14,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface EnterpriseStandardInspectMapper extends BaseMapper { + /** + * 稽查列表 + * @param page + * @param esInspect + * @return + */ + IPage page(IPage page, ESQueryCommonDTO esInspect); } 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 09f887b6..86ee7bed 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 @@ -14,21 +14,62 @@ - + - + - - id,create_by,create_time, - update_by,update_time,org_code, - inspect_no,inspect_name,standardization_work_group, - belone_dept,plan_inspect_date,inspect_user, - standardization_docking_user,complete_date,actual_inspect_user, - insect_state - + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectService.java index 89bb0214..1862faa2 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectService.java @@ -1,7 +1,10 @@ package com.jero.modules.laws.enterprise.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; +import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo; /** * @author ThinkBook @@ -10,4 +13,12 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface EnterpriseStandardInspectService extends IService { + /** + * 分页列表 + * @param esInspect + * @param pageNo + * @param pageSize + * @return + */ + IPage queryPageList(ESQueryCommonDTO esInspect, Integer pageNo, Integer pageSize); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java index 307606f8..d56c80c7 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java @@ -1,11 +1,23 @@ 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.system.api.ISysBaseAPI; +import com.jero.common.system.vo.DictModel; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect; +import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; +import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardDeclareVo; +import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo; +import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardRecheckPlanVo; import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectService; import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectMapper; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + /** * @author ThinkBook * @description 针对表【laws_enterprise_standard_inspect(企业标准)】的数据库操作Service实现 @@ -15,6 +27,33 @@ import org.springframework.stereotype.Service; public class EnterpriseStandardInspectServiceImpl extends ServiceImpl implements EnterpriseStandardInspectService { + @Resource + private ISysBaseAPI sysBaseAPI; + + @Resource + private EnterpriseStandardInspectMapper esInspectMapper; + + @Override + public IPage queryPageList(ESQueryCommonDTO esInspect, Integer pageNo, Integer pageSize) { + IPage page = new Page<>(pageNo, pageSize); + esInspectMapper.page(page, esInspect); + this.transInspectVo(page.getRecords()); + return page; + } + + // 转换列表中的状态值为中文 + private void transInspectVo(List list) { + if (list.isEmpty()) { + return; + } + List ynDictModelList = sysBaseAPI.getDictItems("inspect_status"); + list.forEach(e -> { + List collect = ynDictModelList.stream().filter(e1 -> e1.getValue().equals(e.getInspectStatus())).collect(Collectors.toList()); + if (!collect.isEmpty()) { + e.setInspectStatus(collect.get(0).getText()); + } + }); + } }