upgrade

safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeDetailController.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.qinan.safetyeval.client.api.QualFilingChangeDetailApi;
 import org.qinan.safetyeval.client.co.QualFilingChangeDetailCO;
+import org.qinan.safetyeval.client.co.QualFilingChangeDetaiOrgCO;
 import org.qinan.safetyeval.client.dto.*;
 import org.qinan.safetyeval.infrastructure.dataobject.base.Req;
 import org.springframework.validation.annotation.Validated;
@@ -54,4 +55,10 @@ public class QualFilingChangeDetailController {
     public PageResponse<QualFilingChangeDetailCO> page(@Validated QualFilingChangeDetailPageQuery query) {
         return qualFilingChangeDetailApi.page(query);
     }
+
+    @ApiOperation("分页查询机构变更明细")
+    @GetMapping("/orgPage")
+    public PageResponse<QualFilingChangeDetaiOrgCO> orgPage(@Validated QualFilingChangeDetailOrgPageQuery query) {
+        return qualFilingChangeDetailApi.orgPage(query);
+    }
 }

safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeDetailExecutor.java

@@ -1,21 +1,23 @@
 package org.qinan.safetyeval.app.executor;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.qinan.safetyeval.client.api.QualFilingChangeDetailApi;
-import org.qinan.safetyeval.client.dto.PageResponse;
-import org.qinan.safetyeval.client.dto.SingleResponse;
 import org.qinan.safetyeval.client.co.QualFilingChangeDetailCO;
-import org.qinan.safetyeval.client.dto.QualFilingChangeDetailAddCmd;
+import org.qinan.safetyeval.client.co.QualFilingChangeDetaiOrgCO;
-import org.qinan.safetyeval.client.dto.QualFilingChangeDetailModifyCmd;
+import org.qinan.safetyeval.client.dto.*;
-import org.qinan.safetyeval.client.dto.QualFilingChangeDetailPageQuery;
 import org.qinan.safetyeval.domain.entity.QualFilingChangeDetailEntity;
-import org.qinan.safetyeval.domain.query.QualFilingChangeDetailQuery;
 import org.qinan.safetyeval.domain.query.PageResult;
+import org.qinan.safetyeval.domain.query.QualFilingChangeDetailQuery;
 import org.qinan.safetyeval.domain.service.QualFilingChangeDetailDomainService;
 import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter;
+import org.qinan.safetyeval.infrastructure.mapper.QualFilingChangeDetailMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * 备案变更明细执行器（App层）
  *
@@ -28,6 +30,9 @@ public class QualFilingChangeDetailExecutor implements QualFilingChangeDetailApi
     @Autowired(required = false)
     private QualFilingChangeDetailDomainService qualFilingChangeDetailDomainService;
 
+    @Resource
+    private QualFilingChangeDetailMapper qualFilingChangeDetailMapper;
+
     @Override
     public SingleResponse<QualFilingChangeDetailCO> add(QualFilingChangeDetailAddCmd cmd) {
         QualFilingChangeDetailEntity entity = new QualFilingChangeDetailEntity();
@@ -79,6 +84,13 @@ public class QualFilingChangeDetailExecutor implements QualFilingChangeDetailApi
                 pageResult.getTotal());
     }
 
+    @Override
+    public PageResponse<QualFilingChangeDetaiOrgCO> orgPage(QualFilingChangeDetailOrgPageQuery query) {
+        Page<QualFilingChangeDetaiOrgCO> page = new Page<>(query.getCurrent(), query.getSize());
+        IPage<QualFilingChangeDetaiOrgCO> result = qualFilingChangeDetailMapper.orgPage(page, query);
+        return PageResponse.of(result.getRecords(), result.getTotal());
+    }
+
     private QualFilingChangeDetailCO toCO(QualFilingChangeDetailEntity entity) {
         if (entity == null) {
             return null;

safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/QualFilingChangeDetailApi.java

@@ -1,10 +1,12 @@
 package org.qinan.safetyeval.client.api;
 
 import org.qinan.safetyeval.client.co.QualFilingChangeDetailCO;
+import org.qinan.safetyeval.client.co.QualFilingChangeDetaiOrgCO;
 import org.qinan.safetyeval.client.dto.PageResponse;
 import org.qinan.safetyeval.client.dto.SingleResponse;
 import org.qinan.safetyeval.client.dto.QualFilingChangeDetailAddCmd;
 import org.qinan.safetyeval.client.dto.QualFilingChangeDetailModifyCmd;
+import org.qinan.safetyeval.client.dto.QualFilingChangeDetailOrgPageQuery;
 import org.qinan.safetyeval.client.dto.QualFilingChangeDetailPageQuery;
 
 /**
@@ -23,4 +25,12 @@ public interface QualFilingChangeDetailApi {
     SingleResponse<Void> delete(Long id);
 
     PageResponse<QualFilingChangeDetailCO> page(QualFilingChangeDetailPageQuery query);
+
+    /**
+     * 分页查询机构变更明细
+     *
+     * @param query 查询条件
+     * @return 分页结果
+     */
+    PageResponse<QualFilingChangeDetaiOrgCO> orgPage(QualFilingChangeDetailOrgPageQuery query);
 }

safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeDetaiOrgCO.java

@@ -0,0 +1,48 @@
+package org.qinan.safetyeval.client.co;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.qinan.safetyeval.domain.constant.QualFilingFormStepEnum;
+
+import java.time.LocalDateTime;
+
+/**
+ * 机构变更明细分页查询返回对象
+ *
+ * @author safety-eval
+ */
+@Data
+public class QualFilingChangeDetaiOrgCO {
+
+    @ApiModelProperty(value = "表单步骤编码(1-5)")
+    private Long id;
+
+    @ApiModelProperty(value = "表单步骤编码(1-5)" + QualFilingFormStepEnum.REMARKS)
+    private Integer formStepCode;
+
+    @ApiModelProperty(value = "表单步骤名称")
+    private String formStepName;
+
+    @ApiModelProperty(value = "变更字段")
+    private String changeField;
+
+    @ApiModelProperty(value = "变更内容摘要")
+    private String changeContent;
+
+    @ApiModelProperty(value = "变更细项编码")
+    private String changeItemCode;
+
+    @ApiModelProperty(value = "变更细项名称")
+    private String changeItemName;
+
+    @ApiModelProperty(value = "变更前")
+    private String beforeValue;
+
+    @ApiModelProperty(value = "变更后")
+    private String afterValue;
+
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+}

safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeDetailOrgPageQuery.java

@@ -0,0 +1,19 @@
+package org.qinan.safetyeval.client.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 机构变更明细分页查询请求
+ *
+ * @author safety-eval
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class QualFilingChangeDetailOrgPageQuery extends BasePageQuery {
+
+    @ApiModelProperty(value = "机构ID")
+    private Long orgId;
+
+}

safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/QualFilingFormStepEnum.java

@@ -14,6 +14,9 @@ public enum QualFilingFormStepEnum {
     private final int code;
     private final String name;
 
+    public static final String REMARKS = "备案类型=1:基本信息备案,2:备案材料上传,3:法定代表人承诺书,4:备案人员管理,5:装备清单";
+
+
     QualFilingFormStepEnum(int code, String name) {
         this.code = code;
         this.name = name;

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/QualFilingChangeDetailMapper.java

@@ -1,10 +1,13 @@
 package org.qinan.safetyeval.infrastructure.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.qinan.safetyeval.client.co.QualFilingChangeDetaiOrgCO;
+import org.qinan.safetyeval.client.dto.QualFilingChangeDetailOrgPageQuery;
 import org.qinan.safetyeval.infrastructure.dataobject.QualFilingChangeDetailDO;
 
 import java.util.List;
@@ -22,4 +25,13 @@ public interface QualFilingChangeDetailMapper extends BaseMapper<QualFilingChang
             + "INNER JOIN qual_filing_change c ON d.change_id = c.id "
             + "WHERE c.filing_id = #{filingId} AND d.delete_enum = 'false' AND c.delete_enum = 'false'")
     int countByFilingId(@Param("filingId") Long filingId);
+
+    /**
+     * 分页查询机构变更明细
+     *
+     * @param page  分页参数
+     * @param query 查询条件
+     * @return 分页结果
+     */
+    IPage<QualFilingChangeDetaiOrgCO> orgPage(Page<QualFilingChangeDetaiOrgCO> page, @Param("query") QualFilingChangeDetailOrgPageQuery query);
 }

safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeDetailMapper.xml

@@ -1,7 +1,6 @@
 <?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="org.qinan.safetyeval.infrastructure.mapper.QualFilingChangeDetailMapper">
-
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="org.qinan.safetyeval.infrastructure.dataobject.QualFilingChangeDetailDO">
         <id column="id" property="id"/>
@@ -30,7 +29,27 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        `id`, `change_id`, `form_step_code`, `form_step_name`, `change_field`, `change_content`, `change_item_code`, `change_item_name`, `before_value`, `after_value`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `org_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`
+        `id`, `change_id`, `form_step_code`, `form_step_name`, `change_field`, `change_content`, `change_item_code`,
+        `change_item_name`, `before_value`, `after_value`, `delete_enum`, `remarks`, `create_name`, `update_name`,
+        `tenant_id`, `org_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`
     </sql>
 
+    <!-- 分页查询机构变更明细 -->
+    <select id="orgPage" resultType="org.qinan.safetyeval.client.co.QualFilingChangeDetaiOrgCO">
+        SELECT
+        qfcd.id,
+        qfcd.form_step_code,
+        qfcd.form_step_name,
+        qfcd.change_field,
+        qfcd.change_content,
+        qfcd.change_item_code,
+        qfcd.change_item_name,
+        qfcd.before_value,
+        qfcd.after_value,
+        qfcd.create_time
+        FROM qual_filing_change_detail qfcd
+        WHERE qfcd.org_id = #{query.orgId}
+        AND qfcd.delete_enum = 'false'
+        ORDER BY qfcd.id DESC
+    </select>
 </mapper>