From 60f4e5a1203c136b1e842b4d3a19cecb3918ac16 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 13 Sep 2023 16:21:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5-?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EnterpriseStandardInspectController.java | 20 ++++ .../EnterpriseStandardInspectRectifyPlan.java | 107 ++++++++++++++++++ ...priseStandardInspectRectifyPlanMapper.java | 21 ++++ ...rpriseStandardInspectRectifyPlanMapper.xml | 49 ++++++++ ...riseStandardInspectRectifyPlanService.java | 22 ++++ ...StandardInspectRectifyPlanServiceImpl.java | 63 +++++++++++ 6 files changed, 282 insertions(+) create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectRectifyPlan.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectRectifyPlanMapper.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectRectifyPlanMapper.xml create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectRectifyPlanService.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.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 fc74ada5..0dbb156d 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,10 +8,12 @@ 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.EnterpriseStandardInspectRectifyPlan; 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.EnterpriseStandardInspectRectifyPlanService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectReportService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectService; import io.swagger.annotations.Api; @@ -46,6 +48,9 @@ public class EnterpriseStandardInspectController extends JeroController pageList = esInspectReportService.getInspectReport(inspectId, pageNo, pageSize); return Result.OK(MessageUtils.getMessage(ResultCommon.OK), pageList); } + + /** + * 整改计划 + * + * @return + */ + @AutoLog(value = "企标稽查-整改计划") + @ApiOperation(value="企标稽查-整改计划", notes="企标稽查-整改计划") + @GetMapping(value = "/rectifyPlan") + public Result rectifyPlan(@RequestParam("id") String inspectId, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + IPage pageList = esInspectRectifyPlanService.getRectifyPlan(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/EnterpriseStandardInspectRectifyPlan.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectRectifyPlan.java new file mode 100644 index 00000000..bb08f26a --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectRectifyPlan.java @@ -0,0 +1,107 @@ +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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * + * @TableName laws_enterprise_standard_inspect_rectify_plan + */ +@TableName(value ="laws_enterprise_standard_inspect_rectify_plan") +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="laws_enterprise_standard_inspect_rectify_plan对象", description="企业标准稽查整改计划") +public class EnterpriseStandardInspectRectifyPlan implements Serializable { + /** + * 主键ID + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键ID") + private String id; + + /** + * 创建人 + */ + @ApiModelProperty(value = "创建人") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + private Date createTime; + + /** + * 更新人 + */ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + /** + * 所属部门 + */ + @ApiModelProperty(value = "所属部门") + private String orgCode; + + /** + * 稽查id + */ + @ApiModelProperty(value = "稽查id") + private String inspectId; + + /** + * 存在问题 + */ + @ApiModelProperty(value = "存在问题") + private String issue; + + /** + * 整改措施 + */ + @ApiModelProperty(value = "整改措施") + private String rectifyMeasure; + + /** + * 责任负责人 + */ + @ApiModelProperty(value = "责任负责人") + private String responseUser; + + /** + * 整改计划完成时间 + */ + @ApiModelProperty(value = "整改计划完成时间") + private Date planCompleteDate; + + /** + * 整改实际完成时间 + */ + @ApiModelProperty(value = "整改实际完成时间") + private Date actualCompleteDate; + + /** + * 整改状态 + */ + @ApiModelProperty(value = "整改状态") + private String rectifyStatus; + + @TableField(exist = false) + private static final long serialVersionUID = 1980978879087908791L; +} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectRectifyPlanMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectRectifyPlanMapper.java new file mode 100644 index 00000000..1f43515e --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardInspectRectifyPlanMapper.java @@ -0,0 +1,21 @@ +package com.jero.modules.laws.enterprise.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +/** +* @author ThinkBook +* @description 针对表【laws_enterprise_standard_inspect_rectify_plan】的数据库操作Mapper +* @createDate 2023-09-13 15:24:16 +* @Entity com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan +*/ +public interface EnterpriseStandardInspectRectifyPlanMapper 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/EnterpriseStandardInspectRectifyPlanMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectRectifyPlanMapper.xml new file mode 100644 index 00000000..19290151 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectRectifyPlanMapper.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + id,create_by,create_time, + update_by,update_time,org_code, + inspect_id,issue,rectify_measure, + response_user,plan_complete_date,actual_complete_date, + rectify_status + + + + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectRectifyPlanService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectRectifyPlanService.java new file mode 100644 index 00000000..7ff90cfb --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardInspectRectifyPlanService.java @@ -0,0 +1,22 @@ +package com.jero.modules.laws.enterprise.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author ThinkBook +* @description 针对表【laws_enterprise_standard_inspect_rectify_plan】的数据库操作Service +* @createDate 2023-09-13 15:24:16 +*/ +public interface EnterpriseStandardInspectRectifyPlanService extends IService { + + /** + * 整改计划列表 + * @param inspectId + * @param pageNo + * @param pageSize + * @return + */ + IPage getRectifyPlan(String inspectId, Integer pageNo, Integer pageSize); +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java new file mode 100644 index 00000000..c55fd2ec --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java @@ -0,0 +1,63 @@ +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.common.system.api.ISysBaseAPI; +import com.jero.common.system.vo.DictModel; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan; +import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectRectifyPlanService; +import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectRectifyPlanMapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +/** +* @author ThinkBook +* @description 针对表【laws_enterprise_standard_inspect_rectify_plan】的数据库操作Service实现 +* @createDate 2023-09-13 15:24:16 +*/ +@Service +@Transactional(rollbackFor = JeroBootException.class) +@Slf4j +public class EnterpriseStandardInspectRectifyPlanServiceImpl extends ServiceImpl + implements EnterpriseStandardInspectRectifyPlanService{ + + @Resource + ISysBaseAPI sysBaseAPI; + + @Resource + private EnterpriseStandardInspectRectifyPlanMapper esInspectRectifyPlanMapper; + + @Override + public IPage getRectifyPlan(String inspectId, Integer pageNo, Integer pageSize) { + IPage page = new Page<>(pageNo, pageSize); + esInspectRectifyPlanMapper.page(page, inspectId); + this.transInspectVo(page.getRecords()); + return page; + } + + // 转换列表中的状态值为中文 + private void transInspectVo(List list) { + if (list.isEmpty()) { + return; + } + List ynDictModelList = sysBaseAPI.getDictItems("inspect_rectify_status"); + list.forEach(e -> { + List collect = ynDictModelList.stream().filter(e1 -> e1.getValue().equals(e.getRectifyStatus())).collect(Collectors.toList()); + if (!collect.isEmpty()) { + e.setRectifyStatus(collect.get(0).getText()); + } + }); + } +} + + + +