FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_master' into FOTON

Browse Source
This commit is contained in:
396572590@qq.com
2022-06-28 11:49:22 +08:00
parent 3213e37979 d9b478ea63
commit 467d19e5b2
3 changed files with 77 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+9 -8
View File
@@ -1568,15 +1568,16 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
entry.setValue(""); entry.setValue("");
} }
if("TXLBBUSS".equals(name)){ if("TXLBBUSS".equals(name)){
String value = entry.getValue().toString(); if(value1 != null){
QueryWrapper wrapper = new QueryWrapper(); String value = entry.getValue().toString();
wrapper.eq("REPLACE(MENU_NAME,' ','')",value.trim()); QueryWrapper wrapper = new QueryWrapper();
wrapper.like("PARENT_IDS","aaaaaaaaaaaaaaaaaaaaaa"); wrapper.eq("REPLACE(MENU_NAME,' ','')",value.trim());
List<SarMenuStandard> list = iSarMenuStandardService.list(wrapper); wrapper.like("PARENT_IDS","aaaaaaaaaaaaaaaaaaaaaa");
if(!list.isEmpty()){ List<SarMenuStandard> list = iSarMenuStandardService.list(wrapper);
newMap.put(name+"MenuId",list.get(0).getId()); if(!list.isEmpty()){
newMap.put(name+"MenuId",list.get(0).getId());
}
} }
} }
if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) { if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) {
String value = entry.getValue().toString(); String value = entry.getValue().toString();
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java
+28
View File
@@ -98,4 +98,32 @@ public class SarInterpretationNationalStandard extends BaseEntity {
@TableField("risk_degree") @TableField("risk_degree")
private String riskDegree; 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;
} }
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml
+40 -25
View File
@@ -21,44 +21,59 @@
SELECT c.* FROM ( SELECT c.* FROM (
SELECT SELECT
(@i:=@i+1) as rows, (@i:=@i+1) as rows,
id, sins.id,
INTERPRETATION_TIME, sins.INTERPRETATION_TIME,
STAND_NUMBER, sins.STAND_NUMBER,
specific_item, sins.specific_item,
compared_with_previous, sins.compared_with_previous,
CREATION_USER, sins.CREATION_USER,
CREATION_TIME, sins.CREATION_TIME,
VALID_FLAG, sins.VALID_FLAG,
LAST_VERSION_NUMBER, sins.LAST_VERSION_NUMBER,
risk_degree, sins.risk_degree,
compliance_state, sins.compliance_state,
INTERPRETATION_STATE, sins.INTERPRETATION_STATE,
STAND_TYPE, sins.STAND_TYPE,
MODIFY_TIME, sins.MODIFY_TIME,
STAND_SORT, sins.STAND_SORT,
STAND_ID, sins.STAND_ID,
STAND_NAME, sins.STAND_NAME,
core_technical_requirement 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 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 WHERE
1=1 1=1
<if test="interpretationTime!=null "> <if test="interpretationTime!=null ">
and INTERPRETATION_TIME = #{interpretationTime} and sins.INTERPRETATION_TIME = #{interpretationTime}
</if> </if>
<if test="standId!=null and standId!=''"> <if test="standId!=null and standId!=''">
AND STAND_ID = #{standId} AND sins.STAND_ID = #{standId}
</if> </if>
<if test="standNumber!=null and standNumber!=''"> <if test="standNumber!=null and standNumber!=''">
AND STAND_NUMBER like concat(concat('%',#{standNumber}),'%') AND sins.STAND_NUMBER like concat(concat('%',#{standNumber}),'%')
</if> </if>
<if test="standName!=null and standName!=''"> <if test="standName!=null and standName!=''">
AND STAND_NAME like concat(concat('%',#{standName}),'%') AND sins.STAND_NAME like concat(concat('%',#{standName}),'%')
</if> </if>
<if test="specificItem!=null and specificItem!=''"> <if test="specificItem!=null and specificItem!=''">
AND specific_item like concat(concat('%',#{specificItem}),'%') AND sins.specific_item like concat(concat('%',#{specificItem}),'%')
</if> </if>
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 ) 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} LIMIT ${(current-1)*size},${size}