feat: 稽查列表接口

2023-09-11 09:50:49 +08:00
parent abbd94842b
commit c517355dd8
7 changed files with 238 additions and 12 deletions
@@ -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<EnterpriseStandardInspect, EnterpriseStandardInspectService> {
+
+	@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<EnterpriseStandardInspectVo> pageList= esInspectService.queryPageList(esInspect, pageNo, pageSize);
+		return Result.OK(pageList);
+	}
+}
@@ -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;
 }
@@ -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;
+
+}
@@ -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<EnterpriseStandardInspect> {

+    /**
+     * 稽查列表
+     * @param page
+     * @param esInspect
+     * @return
+     */
+    IPage<EnterpriseStandardInspectVo> page(IPage<EnterpriseStandardInspectVo> page, ESQueryCommonDTO esInspect);
 }


@@ -14,21 +14,62 @@
            <result property="inspectNo" column="inspect_no" jdbcType="VARCHAR"/>
            <result property="inspectName" column="inspect_name" jdbcType="VARCHAR"/>
            <result property="standardizationWorkGroup" column="standardization_work_group" jdbcType="VARCHAR"/>
-            <result property="beloneDept" column="belone_dept" jdbcType="VARCHAR"/>
+            <result property="belongDept" column="belong_dept" jdbcType="VARCHAR"/>
            <result property="planInspectDate" column="plan_inspect_date" jdbcType="TIMESTAMP"/>
            <result property="inspectUser" column="inspect_user" jdbcType="VARCHAR"/>
            <result property="standardizationDockingUser" column="standardization_docking_user" jdbcType="VARCHAR"/>
            <result property="completeDate" column="complete_date" jdbcType="TIMESTAMP"/>
            <result property="actualInspectUser" column="actual_inspect_user" jdbcType="VARCHAR"/>
-            <result property="insectState" column="insect_state" jdbcType="VARCHAR"/>
+            <result property="inspectStatus" column="inspect_status" jdbcType="VARCHAR"/>
    </resultMap>

-    <sql id="Base_Column_List">
-        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
-    </sql>
+    <select id="page" resultType="com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo">
+        SELECT
+            i.id,
+            s.standard_no AS inspectNo,
+            s.standard_name AS inspectName,
+            i.standardization_work_group AS standardizationWorkGroup,
+            d.depart_name AS belongDept,
+            i.plan_inspect_date AS planInspectDate,
+            u1.username AS inspectUser,
+            u2.username AS standardizationDockingUser,
+            i.complete_date AS completeDate,
+            u3.username AS actualInspectUser,
+            i.inspect_status AS inspectStatus,
+            i.create_time AS createTime
+        FROM
+            `laws_enterprise_standard_inspect` AS i
+                LEFT JOIN laws_enterprise_standard AS s ON s.standard_no = i.inspect_no
+                LEFT JOIN sys_depart AS d on d.id = i.belone_dept
+                LEFT JOIN sys_user AS u1 ON u1.id = i.inspect_user
+                LEFT JOIN sys_user AS u2 ON u2.id = i.standardization_docking_user
+                LEFT JOIN sys_user AS u3 ON u3.id = i.actual_inspect_user
+        WHERE
+            <!--企标编号判断-->
+            <if test="param.standardNo != null and param.standardNo != ''">
+                AND s.standard_no LIKE CONCAT('%',#{param.standardNo},'%')
+            </if>
+            <!--企标名称判断-->
+            <if test="param.standardName != null and param.standardName != ''">
+                AND s.standard_name LIKE CONCAT('%',#{param.standardName},'%')
+            </if>
+            <!--状态判断-->
+            <if test="param.inspectStatus != null and param.inspectStatus != ''">
+                AND i.inspect_status = #{param.inspectStatus}
+            </if>
+            <!--所属部门判断-->
+            <if test="param.inspectDept != null and param.inspectDept != ''">
+                AND i.belone_dept = #{param.inspectDept}
+            </if>
+            <!--计划稽查日期判断-->
+            <if test="param.inspectStartDate != null and param.inspectEndDate != null">
+                AND i.plan_inspect_date BETWEEN #{param.inspectStartDate} AND #{param.inspectEndDate}
+            </if>
+            <!--创建日期判断-->
+            <if test="param.inspectCreateStartDate != null and param.inspectCreateEndDate != null">
+                AND i.create_time BETWEEN #{param.inspectCreateStartDate} AND #{param.inspectCreateEndDate}
+            </if>
+        ORDER BY
+            i.create_time DESC
+    </select>
 </mapper>
@@ -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<EnterpriseStandardInspect> {

+    /**
+     * 分页列表
+     * @param esInspect
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    IPage<EnterpriseStandardInspectVo> queryPageList(ESQueryCommonDTO esInspect, Integer pageNo, Integer pageSize);
 }
@@ -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<EnterpriseStandardInspectMapper, EnterpriseStandardInspect>
    implements EnterpriseStandardInspectService {

+    @Resource
+    private ISysBaseAPI sysBaseAPI;
+
+    @Resource
+    private  EnterpriseStandardInspectMapper esInspectMapper;
+
+    @Override
+    public IPage<EnterpriseStandardInspectVo> queryPageList(ESQueryCommonDTO esInspect, Integer pageNo, Integer pageSize) {
+        IPage<EnterpriseStandardInspectVo> page = new Page<>(pageNo, pageSize);
+        esInspectMapper.page(page, esInspect);
+        this.transInspectVo(page.getRecords());
+        return page;
+    }
+
+    // 转换列表中的状态值为中文
+    private void transInspectVo(List<EnterpriseStandardInspectVo> list) {
+        if (list.isEmpty()) {
+            return;
+        }
+        List<DictModel> ynDictModelList = sysBaseAPI.getDictItems("inspect_status");
+        list.forEach(e -> {
+            List<DictModel> collect = ynDictModelList.stream().filter(e1 -> e1.getValue().equals(e.getInspectStatus())).collect(Collectors.toList());
+            if (!collect.isEmpty()) {
+                e.setInspectStatus(collect.get(0).getText());
+            }
+        });
+    }
 }