Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r27516 -r27534 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 27516) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 27534) @@ -1412,7 +1412,7 @@ public Map getWaitingforRecyclingInvoicePlans( String handleDepartCoding, String applicationOrgUnitCoding, String applicationType, String applyTimeOrder,String operationRoom, - String tousseGroupId, String groupId, Boolean isQuerySum, Integer pageIndex, Integer pageSize) { + String tousseGroupId, String groupId, boolean isQuerySum, Integer pageIndex, Integer pageSize) { boolean enableUrgentFunction = CssdUtils.getSystemSetConfigByNameBool("enableUrgentFunction", false); String extraJoin = ""; String extraOrder = ""; Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java =================================================================== diff -u -r27521 -r27534 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java (.../InvoicePlanManager.java) (revision 27521) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java (.../InvoicePlanManager.java) (revision 27534) @@ -114,7 +114,7 @@ * return {invoicePlanAmount:申请单总数,departAmount:部门总数,invoicePlanList: 申请单列表} */ public Map getWaitingforRecyclingInvoicePlans(String handleDepartCoding,String applicationOrgUnitCoding, - String applicationType,String applyTimeOrder,String operationRoom,String tousseGroupId, String groupId, Boolean isQuerySum, Integer pageIndex, Integer pageSize); + String applicationType,String applyTimeOrder,String operationRoom,String tousseGroupId, String groupId, boolean isQuerySum, Integer pageIndex, Integer pageSize); public List findApplicationItemVOListByInvoicePlanId( String id); Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r27520 -r27534 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 27520) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 27534) @@ -6006,7 +6006,7 @@ return array.toString(); } @Override - public void updateDisinfectionTousseItems(Long tousseDefinitionId, JSONObject obj, Boolean calculateMaterialSplitAmount) { + public void updateDisinfectionTousseItems(Long tousseDefinitionId, JSONObject obj, boolean calculateMaterialSplitAmount) { TousseDefinition tousseDefinition = tousseDefinitionManager.get(tousseDefinitionId); if (tousseDefinition != null) { Set keySet = obj.keySet(); Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java =================================================================== diff -u -r27520 -r27534 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java (.../RecyclingRecordManager.java) (revision 27520) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java (.../RecyclingRecordManager.java) (revision 27534) @@ -206,7 +206,7 @@ * @param obj * @param calculateMaterialSplitAmount 是否重现计算材料拆分数量 */ - public void updateDisinfectionTousseItems(Long tousseDefinitionId,JSONObject obj, Boolean calculateMaterialSplitAmount); + public void updateDisinfectionTousseItems(Long tousseDefinitionId,JSONObject obj, boolean calculateMaterialSplitAmount); /** * 添加回收视频记录