Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseOperate.java =================================================================== diff -u -r15785 -r15802 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseOperate.java (.../TousseOperate.java) (revision 15785) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseOperate.java (.../TousseOperate.java) (revision 15802) @@ -49,20 +49,31 @@ */ private Integer sendOutAmount; + public TousseOperate() { + } + + public TousseOperate(Integer sendOutAmount) { + this.sendOutAmount = sendOutAmount; + } + public Integer getSendOutAmount() { return sendOutAmount; } - public void setSendOutAmount(Integer sendOutAmount) { - this.sendOutAmount = sendOutAmount; + public void setSendOutAmount(Object obj) { + if(obj != null){ + this.sendOutAmount = Integer.parseInt(obj.toString()); + } } public Integer getUrgentAmount() { return urgentAmount; } - public void setUrgentAmount(Integer urgentAmount) { - this.urgentAmount = urgentAmount; + public void setUrgentAmount(Object obj) { + if(obj != null){ + this.urgentAmount = Integer.parseInt(obj.toString()); + } } public BigDecimal getROWNUM_() { Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java =================================================================== diff -u -r15785 -r15802 --- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java (.../SupplyRoomControlManagerImpl.java) (revision 15785) +++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java (.../SupplyRoomControlManagerImpl.java) (revision 15802) @@ -28,7 +28,6 @@ import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.disinfectsystem.basedatamanager.container.service.ContainerManager; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; -import com.forgon.disinfectsystem.entity.basedatamanager.container.Container; import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; @@ -115,8 +114,8 @@ String countSql = "select count(*),sum(po.amount),sum(po.recyclingAmount) "; - String sql = "select distinct ip.id as \"id\",po.tousseName as \"tousseName\",ip.urgentAmount,po.sendOutAmount," + - "po.amount as \"amount\",ip.depart as \"depart\"," + dressing2 + + String sql = "select distinct ip.id as \"id\",po.tousseName as \"tousseName\",ip.urgentAmount as \"urgentAmount\",po.sendOutAmount as \"sendOutAmount\"," + + "po.amount as \"amount\",ip.depart as \"depart\"," + dressing2 + "ip.departCoding as \"departCoding\",ip.applicationTime as \"applicationTime\"," + "ip.submitTime as \"submitTime\",ip.printTime as \"printTime\"," + "ip.serialNumber as \"serialNumber\",ip.settleAccountsDepart as \"settleAccountsDepart\"," +