feat: 企标稽查-整改计划

2023-09-13 16:21:05 +08:00
parent 8857595e1c
commit 60f4e5a120
6 changed files with 282 additions and 0 deletions
@@ -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<Enterpri
 	@Resource
 	private EnterpriseStandardInspectReportService esInspectReportService;

+	@Resource
+	private EnterpriseStandardInspectRectifyPlanService esInspectRectifyPlanService;
+
 	/**
 	 * 分页列表查询
 	 *
@@ -88,4 +93,19 @@ public class EnterpriseStandardInspectController extends JeroController<Enterpri
 		IPage<EnterpriseStandardInspectReport> 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<EnterpriseStandardInspectRectifyPlan> pageList = esInspectRectifyPlanService.getRectifyPlan(inspectId, pageNo, pageSize);
+		return Result.OK(MessageUtils.getMessage(ResultCommon.OK), pageList);
+	}
 }
@@ -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;
+}
@@ -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<EnterpriseStandardInspectRectifyPlan> {
+
+    IPage<EnterpriseStandardInspectRectifyPlan> page(IPage<EnterpriseStandardInspectRectifyPlan> page, @Param("inspectId") String inspectId);
+}
+
+
+
+
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectRectifyPlanMapper">
+
+    <resultMap id="BaseResultMap" type="com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan">
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="orgCode" column="org_code" jdbcType="VARCHAR"/>
+            <result property="inspectId" column="inspect_id" jdbcType="VARCHAR"/>
+            <result property="issue" column="issue" jdbcType="VARCHAR"/>
+            <result property="rectifyMeasure" column="rectify_measure" jdbcType="VARCHAR"/>
+            <result property="responseUser" column="response_user" jdbcType="VARCHAR"/>
+            <result property="planCompleteDate" column="plan_complete_date" jdbcType="TIMESTAMP"/>
+            <result property="actualCompleteDate" column="actual_complete_date" jdbcType="TIMESTAMP"/>
+            <result property="rectifyStatus" column="rectify_status" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        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
+    </sql>
+
+    <select id="page"
+            resultType="com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan">
+        SELECT
+            irp.id,
+            irp.issue,
+            irp.rectify_measure,
+            u.name_work_no AS responseUser,
+            irp.plan_complete_date,
+            irp.actual_complete_date,
+            irp.rectify_status
+        FROM
+            `laws_enterprise_standard_inspect_rectify_plan` AS irp
+                LEFT JOIN sys_user AS u ON u.id = irp.response_user
+        WHERE
+            irp.inspect_id = #{inspectId}
+        ORDER BY
+            irp.create_time DESC
+    </select>
+</mapper>
@@ -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<EnterpriseStandardInspectRectifyPlan> {
+
+    /**
+     * 整改计划列表
+     * @param inspectId
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    IPage<EnterpriseStandardInspectRectifyPlan> getRectifyPlan(String inspectId, Integer pageNo, Integer pageSize);
+}
@@ -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<EnterpriseStandardInspectRectifyPlanMapper, EnterpriseStandardInspectRectifyPlan>
+    implements EnterpriseStandardInspectRectifyPlanService{
+
+    @Resource
+    ISysBaseAPI sysBaseAPI;
+
+    @Resource
+    private EnterpriseStandardInspectRectifyPlanMapper esInspectRectifyPlanMapper;
+
+    @Override
+    public IPage<EnterpriseStandardInspectRectifyPlan> getRectifyPlan(String inspectId, Integer pageNo, Integer pageSize) {
+        IPage<EnterpriseStandardInspectRectifyPlan> page = new Page<>(pageNo, pageSize);
+        esInspectRectifyPlanMapper.page(page, inspectId);
+        this.transInspectVo(page.getRecords());
+        return page;
+    }
+
+    // 转换列表中的状态值为中文
+    private void transInspectVo(List<EnterpriseStandardInspectRectifyPlan> list) {
+        if (list.isEmpty()) {
+            return;
+        }
+        List<DictModel> ynDictModelList = sysBaseAPI.getDictItems("inspect_rectify_status");
+        list.forEach(e -> {
+            List<DictModel> collect = ynDictModelList.stream().filter(e1 -> e1.getValue().equals(e.getRectifyStatus())).collect(Collectors.toList());
+            if (!collect.isEmpty()) {
+                e.setRectifyStatus(collect.get(0).getText());
+            }
+        });
+    }
+}
+
+
+
+