diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java index 5bb86d5cc..f6e916e77 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java @@ -56,15 +56,4 @@ public class ScanSwitchEntity extends BaseEpdcEntity { */ private String maintainInfo; - /** - * 扫码开关名称 - */ - //private String scanFlagName; - - /** - * 维护状态名称 - */ - //private String maintainFlagName; - - } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java index 45a5079c5..43f8b477a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java @@ -55,23 +55,6 @@ public class ScanSwitchServiceImpl extends BaseServiceImpl list = page.getRecords(); - for(int i = 0 ; i < list.size() ; i++){ - ScanSwitchEntity scanSwitchEntity = list.get(i); - int scanFlag = scanSwitchEntity.getScanFlag(); - int maintainFlag = scanSwitchEntity.getMaintainFlag(); - if(scanFlag == 0){ - scanSwitchEntity.setScanFlagName("不需要扫码"); - }else{ - scanSwitchEntity.setScanFlagName("需要扫码"); - } - if(maintainFlag == 0){ - scanSwitchEntity.setMaintainFlagName("关闭维护"); - }else{ - scanSwitchEntity.setMaintainFlagName("开启维护"); - } - }*/ - return getPageData(page, ScanSwitchDTO.class); }