Skip to content

Commit 44a56ae

Browse files
committed
feat: enhance compliance control configuration with section mapping and DTO updates
1 parent bde728f commit 44a56ae

4 files changed

Lines changed: 21 additions & 1 deletion

File tree

backend/src/main/java/com/park/utmstack/domain/compliance/UtmComplianceControlConfig.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public class UtmComplianceControlConfig implements Serializable {
3232

3333
@ManyToOne
3434
@JoinColumn(name = "standard_section_id",
35+
referencedColumnName = "id",
3536
insertable = false,
3637
updatable = false
3738
)

backend/src/main/java/com/park/utmstack/repository/compliance/UtmComplianceControlConfigRepository.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111

1212
@Repository
1313
public interface UtmComplianceControlConfigRepository extends JpaRepository<UtmComplianceControlConfig, Long>, JpaSpecificationExecutor<UtmComplianceControlConfig> {
14-
@Query(" SELECT c FROM UtmComplianceControlConfig c LEFT JOIN FETCH c.queriesConfigs WHERE c.id = :id")
14+
@Query("""
15+
SELECT c FROM UtmComplianceControlConfig c
16+
LEFT JOIN FETCH c.section s
17+
LEFT JOIN FETCH s.standard st
18+
LEFT JOIN FETCH c.queriesConfigs q
19+
WHERE c.id = :id
20+
""")
1521
Optional<UtmComplianceControlConfig> findByIdWithQueries(@Param("id") Long id);
1622
}

backend/src/main/java/com/park/utmstack/service/dto/compliance/UtmComplianceControlConfigDto.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ public class UtmComplianceControlConfigDto {
1515
@NotNull
1616
private Long standardSectionId;
1717

18+
private UtmComplianceStandardSectionDto section;
19+
1820
@NotNull
1921
@Size(min = 10, max = 200)
2022
private String controlName;
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.park.utmstack.service.dto.compliance;
2+
3+
import lombok.Data;
4+
5+
@Data
6+
public class UtmComplianceStandardSectionDto {
7+
private Long id;
8+
private String standardSectionName;
9+
private String standardSectionDescription;
10+
private Long standardId;
11+
}

0 commit comments

Comments
 (0)