diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java
index ea428fed..f5a3fb73 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java
@@ -98,4 +98,32 @@ public class SarInterpretationNationalStandard extends BaseEntity {
@TableField("risk_degree")
private String riskDegree;
+
+ @TableField(exist = false)
+ private String applyArctic;
+ @TableField(exist = false)
+ private String compliianceRequir;
+ @TableField(exist = false)
+ private String responseibleUnit;
+ @TableField(exist = false)
+ private String termsConditions;
+ @TableField(exist = false)
+ private String mainpointsImpementation;
+ @TableField(exist = false)
+ private String svpps;
+ @TableField(exist = false)
+ private String fileType;
+ @TableField(exist = false)
+ private String xccssrq;
+ @TableField(exist = false)
+ private String zccssrq;
+ @TableField(exist = false)
+ private String complianceStateSSI;
+ @TableField(exist = false)
+ private String compareWithPrevious;
+ @TableField(exist = false)
+ private String coreTechnicalRequirementSSI;
+ @TableField(exist = false)
+ private String readContent;
+
}
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml
index 0081604e..2a67c835 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml
@@ -21,44 +21,59 @@
SELECT c.* FROM (
SELECT
(@i:=@i+1) as rows,
- id,
- INTERPRETATION_TIME,
- STAND_NUMBER,
- specific_item,
- compared_with_previous,
- CREATION_USER,
- CREATION_TIME,
- VALID_FLAG,
- LAST_VERSION_NUMBER,
- risk_degree,
- compliance_state,
- INTERPRETATION_STATE,
- STAND_TYPE,
- MODIFY_TIME,
- STAND_SORT,
- STAND_ID,
- STAND_NAME,
- core_technical_requirement
+ sins.id,
+ sins.INTERPRETATION_TIME,
+ sins.STAND_NUMBER,
+ sins.specific_item,
+ sins.compared_with_previous,
+ sins.CREATION_USER,
+ sins.CREATION_TIME,
+ sins.VALID_FLAG,
+ sins.LAST_VERSION_NUMBER,
+ sins.risk_degree,
+ sins.compliance_state,
+ sins.INTERPRETATION_STATE,
+ sins.STAND_TYPE,
+ sins.MODIFY_TIME,
+ sins.STAND_SORT,
+ sins.STAND_ID,
+ sins.STAND_NAME,
+ sins.core_technical_requirement,
+ ssi.APPLY_ARCTIC as applyArctic,
+ ssi.COMPLIANCE_REQUIR as compliianceRequir,
+ ssi.RESPONSIBLE_UNIT as responseibleUnit,
+ ssi.TERMS_CONDITIONS as termsConditions,
+ ssi.MAINPOINTS_IMPEMENTATION as mainpointsImpementation,
+ ssi.SVPPS as svpps,
+ ssi.FILE_TYPE as fileType,
+ ssi.XCXSSRQ as xccssrq,
+ ssi.ZCCSSRQ as zccssrq,
+ ssi.compliance_state as complianceStateSSI,
+ ssi.compared_with_previous as compareWithPrevious,
+ ssi.core_technical_requirement as coreTechnicalRequirementSSI,
+ ssi.read_content as readContent
FROM
- sar_interpretation_national_standard ,(SELECT @i:=0)j
+ sar_interpretation_national_standard sins
+ LEFT JOIN sar_stand_items ssi ON ssi.STAND_ID=sins.STAND_ID
+ and ssi.ITEMS_NUM =sins.specific_item,(SELECT @i:=0)j
WHERE
1=1
- and INTERPRETATION_TIME = #{interpretationTime}
+ and sins.INTERPRETATION_TIME = #{interpretationTime}
- AND STAND_ID = #{standId}
+ AND sins.STAND_ID = #{standId}
- AND STAND_NUMBER like concat(concat('%',#{standNumber}),'%')
+ AND sins.STAND_NUMBER like concat(concat('%',#{standNumber}),'%')
- AND STAND_NAME like concat(concat('%',#{standName}),'%')
+ AND sins.STAND_NAME like concat(concat('%',#{standName}),'%')
- AND specific_item like concat(concat('%',#{specificItem}),'%')
+ AND sins.specific_item like concat(concat('%',#{specificItem}),'%')
- ORDER BY STAND_ID, specific_item
+ ORDER BY sins.STAND_ID, sins.specific_item
) c ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.specific_item,1,(SELECT LOCATE('.',CONCAT(c.specific_item,'.')))),SIGNED) ,rows
LIMIT ${(current-1)*size},${size}