Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r20057 -r20058 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 20057) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 20058) @@ -1291,7 +1291,7 @@ Integer recyclingAmount = item.getRecyclingAmount(); if(recyclingAmount == null){ InvoicePlan invoicePlan = item.getInvoicePlan(); - if(!InvoicePlan.READED.equals(invoicePlan.getReaded())){ + if(!invoicePlan.readed()){ if(StringUtils.isNotBlank(ids)){ ids += ","; } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java =================================================================== diff -u -r19992 -r20058 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 19992) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 20058) @@ -375,7 +375,7 @@ String code = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig(); SupplyRoomConfig cssd = supplyRoomConfigManager.getFirstSupplyRoomConfig(); if (committedStatus && !StringTools.equals(code, cssd.getOrgUnitCoding()) - && InvoicePlan.READED.equals(application.getReaded())) { + && application.readed()) { outPrint(response, "该申请单已被阅读过,不能修改。如果需要修改,请联系管理员!"); return null; } @@ -908,7 +908,7 @@ String userOrgCode = AcegiHelper.getLoginUser().getCurrentOrgUnitCode(); if (userOrgCode.equals(config.getOrgUnitCoding()) && application != null && application.getCommittedStatus() - && !InvoicePlan.READED.equals(application.getReaded())) { + && !application.readed()) { application.setReaded(InvoicePlan.READED); recyclingApplicationManager.saveOrUpdate(application); } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java =================================================================== diff -u -r19818 -r20058 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 19818) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 20058) @@ -303,7 +303,7 @@ InvoicePlan invoicePlan = recyclingApplicationManager .getRecyclingApplicationByIdForRecycle(id); if (invoicePlan != null && invoicePlan.getCommittedStatus() - && !InvoicePlan.READED.equals(invoicePlan.getReaded())) { + && !invoicePlan.readed()) { invoicePlan.setReaded(InvoicePlan.READED); objectDao.saveOrUpdate(invoicePlan); } Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r20053 -r20058 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 20053) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 20058) @@ -5110,8 +5110,7 @@ tousseItemVo.setMaterialsMD5(tousseDefinition.getMaterialsMD5()); vo.getTousseItems().add(tousseItemVo); } - Integer readed = invoicePlan.getReaded(); - if(readed == null || readed.intValue() != InvoicePlan.READED){ + if(!invoicePlan.readed()){ invoicePlanIds.add(invoicePlan.getId()); } } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java =================================================================== diff -u -r19999 -r20058 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 19999) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 20058) @@ -694,6 +694,13 @@ public void setReaded(Integer readed) { this.readed = readed; } + /** + * 判断是否已读 + * @return + */ + public boolean readed(){ + return READED.equals(readed); + } public Date getLastInvoiceTime() { return lastInvoiceTime;