Преглед на файлове

app,调整安全检查记录更新取值逻辑

yangguanjin преди 6 дни
родител
ревизия
aed92f2128

+ 3 - 0
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskordersecuritycheck/BoilerTaskOrderSecurityCheckServiceImpl.java

@@ -207,8 +207,11 @@ public class BoilerTaskOrderSecurityCheckServiceImpl implements BoilerTaskOrderS
                     updateObj.setValidityDate(localDateTime);
                 }
                 Object checkConclusion = map.get("checkConclusion");
+                Object checkResult = map.get("checkResult");
                 if(checkConclusion != null){
                     updateObj.setConclusion(checkConclusion.toString());
+                } else if (checkResult != null) {
+                    updateObj.setConclusion(checkResult.toString());
                 }
             }
         } catch (Exception e) {

+ 3 - 0
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskordersecuritycheck/PipeTaskOrderSecurityCheckServiceImpl.java

@@ -259,8 +259,11 @@ public class PipeTaskOrderSecurityCheckServiceImpl extends ServiceImpl<PipeTaskO
                     updateObj.setValidityDate(localDateTime);
                 }
                 Object checkConclusion = map.get("checkConclusion");
+                Object checkResult = map.get("checkResult");
                 if(checkConclusion != null){
                     updateObj.setConclusion(checkConclusion.toString());
+                } else if (checkResult != null) {
+                    updateObj.setConclusion(checkResult.toString());
                 }
             }
         } catch (Exception e) {