cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fix

dev
luotaiqian 2026-07-09 14:54:56 +08:00
parent 96417941c0
commit 5b8eb8aa93
2 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangeUpdateCmd.java
View File

@ -23,19 +23,16 @@ public class QualFilingMaterialChangeUpdateCmd implements Serializable {
* 备案变更id * 备案变更id
*/ */
@ApiModelProperty(value = "备案变更id", required = true) @ApiModelProperty(value = "备案变更id", required = true)
@NotNull(message = "备案变更id不能为空")
private Long filingChangeId; private Long filingChangeId;
/** /**
* 材料类型1,申请材料目录（原件）,2,申请书（原件）,3,法人证明（复印件）,4,三年内无重大违法失信记录查询证明,5,法定代表人承诺书（原件）,6,固定资产法定证明材料,7,工作场所及档案室面积证明,8,安全评价师专业能力证明,9,相关负责人证明材料,10,机构内部管理制度 * 材料类型1,申请材料目录（原件）,2,申请书（原件）,3,法人证明（复印件）,4,三年内无重大违法失信记录查询证明,5,法定代表人承诺书（原件）,6,固定资产法定证明材料,7,工作场所及档案室面积证明,8,安全评价师专业能力证明,9,相关负责人证明材料,10,机构内部管理制度
*/ */
@ApiModelProperty(value = "材料类型1,申请材料目录（原件）,2,申请书（原件）,3,法人证明（复印件）,4,三年内无重大违法失信记录查询证明,5,法定代表人承诺书（原件）,6,固定资产法定证明材料,7,工作场所及档案室面积证明,8,安全评价师专业能力证明,9,相关负责人证明材料,10,机构内部管理制度", required = true) @ApiModelProperty(value = "材料类型1,申请材料目录（原件）,2,申请书（原件）,3,法人证明（复印件）,4,三年内无重大违法失信记录查询证明,5,法定代表人承诺书（原件）,6,固定资产法定证明材料,7,工作场所及档案室面积证明,8,安全评价师专业能力证明,9,相关负责人证明材料,10,机构内部管理制度", required = true)
@NotBlank(message = "材料类型1,申请材料目录（原件）,2,申请书（原件）,3,法人证明（复印件）,4,三年内无重大违法失信记录查询证明,5,法定代表人承诺书（原件）,6,固定资产法定证明材料,7,工作场所及档案室面积证明,8,安全评价师专业能力证明,9,相关负责人证明材料,10,机构内部管理制度不能为空")
private Integer materialType; private Integer materialType;
/** /**
* 材料内容 * 材料内容
*/ */
@ApiModelProperty(value = "材料内容", required = true) @ApiModelProperty(value = "材料内容", required = true)
@NotBlank(message = "材料内容不能为空")
private String materialContent; private String materialContent;
/** /**
* 材料格式 * 材料格式
@ -87,7 +84,6 @@ public class QualFilingMaterialChangeUpdateCmd implements Serializable {
*/ */
@ApiModelProperty(value = "环境") @ApiModelProperty(value = "环境")
private String env; private String env;
@NotNull(message = "version不能为空")
@ApiModelProperty(value = "version") @ApiModelProperty(value = "version")
private Integer version; private Integer version;
} }

46
safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml
View File

@ -90,29 +90,31 @@
<!-- 机构端分页查询：每个filing_id只取最新一条变更记录，直接返回CO --> <!-- 机构端分页查询：每个filing_id只取最新一条变更记录，直接返回CO -->
<select id="orgPage" resultMap="OrgCOResultMap"> <select id="orgPage" resultMap="OrgCOResultMap">
SELECT * FROM ( SELECT * FROM (
SELECT SELECT
ROW_NUMBER() OVER (PARTITION BY qfc.filing_id ORDER BY qfc.id DESC) AS rn, ROW_NUMBER() OVER (PARTITION BY qfc.filing_id ORDER BY qfc.id DESC) AS rn,
qfc.* qfc.*
FROM qual_filing_change qfc FROM qual_filing_change qfc
<where> <where>
qfc.delete_enum = 'false' qfc.delete_enum = 'false'
AND qfc.org_id = #{query.orgId} AND qfc.org_id = #{query.orgId}
<if test="query.filingNo != null and query.filingNo != ''"> </where>
AND qfc.id = #{query.filingNo}
</if>
<if test="query.filingUnitName != null and query.filingUnitName != ''">
AND qfc.filing_unit_name LIKE CONCAT('%', #{query.filingUnitName}, '%')
</if>
<if test="query.filingTerritoryCode != null and query.filingTerritoryCode != ''">
AND (qfc.filing_territory_code = #{query.filingTerritoryCode}
OR qfc.filing_territory_name = #{query.filingTerritoryCode})
</if>
<if test="query.filingStatusCode != null">
AND qfc.filing_status_code = #{query.filingStatusCode}
</if>
</where>
) temp ) temp
WHERE temp.rn = 1 <where>
temp.rn = 1
<if test="query.filingNo != null and query.filingNo != ''">
AND temp.id = #{query.filingNo}
</if>
<if test="query.filingUnitName != null and query.filingUnitName != ''">
AND temp.filing_unit_name LIKE CONCAT('%', #{query.filingUnitName}, '%')
</if>
<if test="query.filingTerritoryCode != null and query.filingTerritoryCode != ''">
AND (temp.filing_territory_code = #{query.filingTerritoryCode}
OR temp.filing_territory_name = #{query.filingTerritoryCode})
</if>
<if test="query.filingStatusCode != null">
AND temp.filing_status_code = #{query.filingStatusCode}
</if>
</where>
</select> </select>
<!-- 按filing_id批量统计变更次数 --> <!-- 按filing_id批量统计变更次数 -->