feat: 企标稽查-稽查报告

2023-09-13 15:38:37 +08:00
parent 15f9f8b820
commit c7b9994b68
6 changed files with 78 additions and 4 deletions
@@ -8,9 +8,11 @@ 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.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.EnterpriseStandardInspectReportService;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -41,6 +43,9 @@ public class EnterpriseStandardInspectController extends JeroController<Enterpri
 	@Resource
 	private EnterpriseStandardInspectDelayService esInspectDelayService;

+	@Resource
+	private EnterpriseStandardInspectReportService esInspectReportService;
+
 	/**
 	 * 分页列表查询
 	 *
@@ -52,7 +57,7 @@ public class EnterpriseStandardInspectController extends JeroController<Enterpri
 	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);
+		IPage<EnterpriseStandardInspectVo> pageList = esInspectService.queryPageList(esInspect, pageNo, pageSize);
 		return Result.OK(MessageUtils.getMessage(ResultCommon.OK), pageList);
 	}

@@ -68,4 +73,19 @@ public class EnterpriseStandardInspectController extends JeroController<Enterpri
 		EnterpriseStandardInspectDelay esInspectDelay = esInspectDelayService.getLastDelayInspect(inspectId);
 		return Result.OK(MessageUtils.getMessage(ResultCommon.OK), esInspectDelay);
 	}
+
+	/**
+	 * 稽查报告
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "企标稽查-稽查报告")
+	@ApiOperation(value="企标稽查-稽查报告", notes="企标稽查-稽查报告")
+	@GetMapping(value = "/inspectReport")
+	public Result<?> inspectReport(@RequestParam("id") String inspectId,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+		IPage<EnterpriseStandardInspectReport> pageList = esInspectReportService.getInspectReport(inspectId, pageNo, pageSize);
+		return Result.OK(MessageUtils.getMessage(ResultCommon.OK), pageList);
+	}
 }
@@ -1,6 +1,7 @@
 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 com.fasterxml.jackson.annotation.JsonFormat;
@@ -76,5 +77,15 @@ public class EnterpriseStandardInspectReport implements Serializable {

    /**附件*/
    @ApiModelProperty(value = "附件")
-    private String attachement;
+    private String attachment;
+
+    /**依据条款*/
+    @TableField(exist = false)
+    @ApiModelProperty(value = "依据条款")
+    private String baseClause;
+
+    /**标准内容或要求*/
+    @TableField(exist = false)
+    @ApiModelProperty(value = "标准内容或要求")
+    private String standardRequire;
 }
@@ -1,7 +1,9 @@
 package com.jero.modules.laws.enterprise.mapper;

+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;

 /**
 * @author ThinkBook
@@ -11,6 +13,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface EnterpriseStandardInspectReportMapper extends BaseMapper<EnterpriseStandardInspectReport> {

+    IPage<EnterpriseStandardInspectReport> page(IPage<EnterpriseStandardInspectReport> page, @Param("inspectId") String inspectId);
 }


@@ -15,13 +15,29 @@
            <result property="clauseBasedId" column="clause_based_id" jdbcType="VARCHAR"/>
            <result property="evaluateScore" column="evaluate_score" jdbcType="VARCHAR"/>
            <result property="executionStatus" column="execution_status" jdbcType="VARCHAR"/>
-            <result property="attachement" column="attachement" jdbcType="VARCHAR"/>
+            <result property="attachment" column="attachment" jdbcType="VARCHAR"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,create_by,create_time,
        update_by,update_time,org_code,
        inspect_id,clause_based_id,evaluate_score,
-        execution_status,attachement
+        execution_status,attachment
    </sql>
+
+    <select id="page" resultType="com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport">
+        SELECT
+            ir.id,
+            "暂无数据" AS baseClause,
+            "暂无数据" AS standardRequire,
+            ir.execution_status,
+            ir.evaluate_score,
+            o.file_name AS attachement
+        FROM
+            laws_enterprise_standard_inspect_report AS ir
+                LEFT JOIN oss_file AS o ON o.id = ir.attachment
+        WHERE
+            ir.inspect_id = #{inspectId}
+        ORDER BY ir.create_time DESC
+    </select>
 </mapper>
@@ -1,5 +1,6 @@
 package com.jero.modules.laws.enterprise.service;

+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport;
 import com.baomidou.mybatisplus.extension.service.IService;

@@ -10,4 +11,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface EnterpriseStandardInspectReportService extends IService<EnterpriseStandardInspectReport> {

+    /**
+     * 稽查报告列表
+     *
+     * @param inspectId
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    IPage<EnterpriseStandardInspectReport> getInspectReport(String inspectId, Integer pageNo, Integer pageSize);
 }
@@ -1,14 +1,19 @@
 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.modules.laws.enterprise.entity.EnterpriseStandardInspectReport;
+import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectReportService;
 import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardInspectReportMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+import javax.annotation.Resource;
+
 /**
 * @author ThinkBook
 * @description 针对表【laws_enterprise_standard_inspect_report】的数据库操作Service实现
@@ -20,6 +25,15 @@ import org.springframework.transaction.annotation.Transactional;
 public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl<EnterpriseStandardInspectReportMapper, EnterpriseStandardInspectReport>
    implements EnterpriseStandardInspectReportService {

+    @Resource
+    private EnterpriseStandardInspectReportMapper esInspectReportMapper;
+
+    @Override
+    public IPage<EnterpriseStandardInspectReport> getInspectReport(String inspectId, Integer pageNo, Integer pageSize) {
+        IPage<EnterpriseStandardInspectReport> page = new Page<>(pageNo, pageSize);
+        esInspectReportMapper.page(page, inspectId);
+        return page;
+    }
 }