feat(企标稽查流程): 基础模块添加

(cherry picked from commit 295aaaadfe)
2023-11-23 13:43:38 +08:00
parent d78bc5dd4e
commit c5b2ccf545
21 changed files with 990 additions and 49 deletions
@@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.List;


 /**
@@ -69,6 +70,33 @@ public class EnterpriseStandardInspectController extends JeroController<Enterpri
 		return Result.OK(pageList);
 	}

+	/**
+	 * 企标稽查-分页列表查询2
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "企标稽查-分页列表查询2")
+	@ApiOperation(value="企标稽查-分页列表查询2", notes="企标稽查-分页列表查询2")
+	@GetMapping(value = "/queryByPage")
+	public Result<IPage<EnterpriseStandardInspectVo>> queryByPage(EnterpriseStandardInspectVo enterpriseStandardInspectVo,
+								 @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1")  Integer pageNo,
+								 @ApiParam("每页条数")  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+		IPage<EnterpriseStandardInspectVo> pageList = esInspectService.queryByPage(enterpriseStandardInspectVo, pageNo, pageSize);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 * 企标稽查-列表查询2
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "企标稽查-列表查询2")
+	@ApiOperation(value="企标稽查-列表查询2", notes="企标稽查-列表查询2")
+	@GetMapping(value = "/queryByList")
+	public Result<List<EnterpriseStandardInspectVo>> queryByList(EnterpriseStandardInspectVo enterpriseStandardInspectVo) {
+		return Result.OK(esInspectService.queryByList(enterpriseStandardInspectVo));
+	}
+
 	/**
 	 * 延期稽查
 	 *
@@ -1,5 +1,6 @@
 package com.jero.modules.laws.enterprise.entity.vo;

+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModelProperty;
@@ -43,6 +44,7 @@ public class EnterpriseStandardInspectVo {
    /** 所属部门 */
    @Excel(name = "所属部门", width = 15, orderNum = "1")
    @ApiModelProperty(value = "所属部门")
+    @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
    private String belongDept;

    /** 计划稽查日期 */
@@ -55,11 +57,13 @@ public class EnterpriseStandardInspectVo {
    /** 稽查负责人 */
    @Excel(name = "稽查负责人", width = 15, orderNum = "1")
    @ApiModelProperty(value = "稽查负责人")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
    private String inspectUser;

    /** 标准化组对接人 */
    @Excel(name = "标准化组对接人", width = 15, orderNum = "1")
    @ApiModelProperty(value = "标准化组对接人")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
    private String standardizationDockingUser;

    /** 实际稽查完成日期 */
@@ -72,6 +76,7 @@ public class EnterpriseStandardInspectVo {
    /** 实际稽查人 */
    @Excel(name = "实际稽查人", width = 15, orderNum = "1")
    @ApiModelProperty(value = "实际稽查人")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
    private String actualInspectUser;

    /** 稽查状态 */
@@ -91,4 +96,9 @@ public class EnterpriseStandardInspectVo {
    @ApiModelProperty(value = "延期稽查标识")
    private boolean delayFlag;

+    //=================================
+    /**ids 查询用*/
+    @ApiModelProperty(value = "ids 查询用")
+    @TableField(exist = false)
+    private String ids;
 }
@@ -1,6 +1,9 @@
 package com.jero.modules.laws.enterprise.mapper;

+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO;
@@ -8,6 +11,8 @@ import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectDelay
 import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo;
 import org.apache.ibatis.annotations.Param;

+import java.util.List;
+
 /**
 * @author ThinkBook
 * @description 针对表【laws_enterprise_standard_inspect(企业标准)】的数据库操作Mapper
@@ -31,6 +36,21 @@ public interface EnterpriseStandardInspectMapper extends BaseMapper<EnterpriseSt
     * @return
     */
    IPage<EnterpriseStandardInspectDelayVo> pageWithDelay(IPage<EnterpriseStandardInspectDelayVo> page, @Param("param") ESQueryCommonDTO esQueryCommonDTO);
+
+    /**
+     * 企标稽查-分页列表查询2
+     * @param page
+     * @param queryWrapper
+     * @return
+     */
+    IPage<EnterpriseStandardInspectVo> queryByPage(Page<EnterpriseStandardInspectVo> page, @Param(Constants.WRAPPER) QueryWrapper<EnterpriseStandardInspectVo> queryWrapper);
+
+    /**
+     * 企标稽查-列表查询2
+     * @param queryWrapper
+     * @return
+     */
+    List<EnterpriseStandardInspectVo> queryByList(@Param(Constants.WRAPPER) QueryWrapper<EnterpriseStandardInspectVo> queryWrapper);
 }


@@ -167,4 +167,38 @@
            </if>
        ORDER BY i.create_time DESC
    </select>
+
+    <select id="queryByPage"
+            resultType="com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo">
+        <include refid="select_laws_enterprise_standard_inspect"/>
+    </select>
+
+    <select id="queryByList"
+            resultType="com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo">
+        <include refid="select_laws_enterprise_standard_inspect"/>
+    </select>
+
+    <sql id="select_laws_enterprise_standard_inspect">
+        select lesi.id,
+               lesi.create_by,
+               lesi.create_time,
+               lesi.update_by,
+               lesi.update_time,
+               inspect_no,
+               (IF(les.standard_number is not null, les.standard_name, inspect_name)) inspect_name,
+               standardization_work_group,
+               belong_dept,
+               plan_inspect_date,
+               inspect_user,
+               standardization_docking_user,
+               complete_date,
+               actual_inspect_user,
+               inspect_status,
+               group_concat(lesio.plan_inspect_object separator ',')                  plan_inspect_object
+        from laws_enterprise_standard_inspect lesi
+                 left join laws_enterprise_standard les on lesi.inspect_no = les.standard_number and les.del_flag = '0'
+                 left join laws_enterprise_standard_inspect_object lesio on lesi.id = lesio.inspect_id
+            ${ew.customSqlSegment}
+        group by lesi.id
+    </sql>
 </mapper>
@@ -8,6 +8,7 @@ import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo;

 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.List;

 /**
 * @author ThinkBook
@@ -53,4 +54,20 @@ public interface EnterpriseStandardInspectService extends IService<EnterpriseSta
     * @param fileName
     */
    void exportDataRectifyPlan(HttpServletResponse response, ESQueryCommonDTO esQueryCommonDTO, String sheetName, String fileName) throws IOException;
+
+    /**
+     * 企标稽查-分页列表查询2
+     * @param enterpriseStandardInspectVo
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    IPage<EnterpriseStandardInspectVo> queryByPage(EnterpriseStandardInspectVo enterpriseStandardInspectVo, Integer pageNo, Integer pageSize);
+
+    /**
+     * 企标稽查-列表查询2
+     * @param enterpriseStandardInspectVo
+     * @return
+     */
+    List<EnterpriseStandardInspectVo> queryByList(EnterpriseStandardInspectVo enterpriseStandardInspectVo);
 }
@@ -1,41 +1,34 @@
 package com.jero.modules.laws.enterprise.service.impl;

+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.EnterpriseStandardInspect;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan;
 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.EnterpriseStandardInspectDelayVo;
 import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo;
-import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardRecheckPlanVo;
-import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectRectifyPlanMapper;
-import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectRectifyPlanService;
-import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectService;
 import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectMapper;
+import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectRectifyPlanMapper;
+import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.jeecgframework.poi.excel.ExcelExportUtil;
 import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;

@@ -176,6 +169,30 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl<Enterprise
            log.error("写入响应流时发生错误", e);
        }
    }
+
+    @Override
+    public IPage<EnterpriseStandardInspectVo> queryByPage(EnterpriseStandardInspectVo enterpriseStandardInspectVo, Integer pageNo, Integer pageSize) {
+        QueryWrapper<EnterpriseStandardInspectVo> queryWrapper = getEnterpriseStandardInspectVoQueryWrapper(enterpriseStandardInspectVo);
+        return esInspectMapper.queryByPage(new Page<>(pageNo, pageSize), queryWrapper);
+    }
+
+    @Override
+    public List<EnterpriseStandardInspectVo> queryByList(EnterpriseStandardInspectVo enterpriseStandardInspectVo) {
+        QueryWrapper<EnterpriseStandardInspectVo> queryWrapper = getEnterpriseStandardInspectVoQueryWrapper(enterpriseStandardInspectVo);
+        return esInspectMapper.queryByList(queryWrapper);
+    }
+
+    @NotNull
+    private static QueryWrapper<EnterpriseStandardInspectVo> getEnterpriseStandardInspectVoQueryWrapper(EnterpriseStandardInspectVo enterpriseStandardInspectVo) {
+        QueryWrapper<EnterpriseStandardInspectVo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getId()), "lesi.id", enterpriseStandardInspectVo.getId());
+        if (StringUtils.isNotBlank(enterpriseStandardInspectVo.getIds())){
+            List<String> list = Arrays.asList(enterpriseStandardInspectVo.getIds().split(","));
+            queryWrapper.in("lesi.id", list);
+        }
+        queryWrapper.orderByDesc("lesi.createTime");
+        return queryWrapper;
+    }
 }