Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java =================================================================== diff -u -r41613 -r41634 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java (.../PackingManager.java) (revision 41613) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java (.../PackingManager.java) (revision 41634) @@ -385,11 +385,9 @@ public Map queryPackingRecordVos(Set packingRecordIds); /** * 获取装配任务文件夹 - * @param taskGroup 任务组 - * @param tousseOrDepart 包名或科室 * @return */ - public int getPackingTaskTousseNameCount(String taskGroup, String tousseOrDepart, String settleAccountsDepartCoding); + public int getPackingTaskTousseNameCount(WaitPackingTaskTaskParam param); /** * 获取装配任务文件夹 * @param taskGroup 任务组 Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerForLoadWaitPackingTaskDepartAndPage.java =================================================================== diff -u -r40694 -r41634 --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerForLoadWaitPackingTaskDepartAndPage.java (.../PackingManagerForLoadWaitPackingTaskDepartAndPage.java) (revision 40694) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerForLoadWaitPackingTaskDepartAndPage.java (.../PackingManagerForLoadWaitPackingTaskDepartAndPage.java) (revision 41634) @@ -14,6 +14,7 @@ import com.forgon.disinfectsystem.entity.basedatamanager.container.Container; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.becleanitem.ClassifyBasket; +import com.forgon.disinfectsystem.packing.vo.WaitPackingTaskTaskParam; import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; @@ -53,11 +54,15 @@ NewPackingTaskCommon.newCssdHandleTousses(objectDao, td2, Constants.TASKGROUP_CHANGGUZU); ClassifyBasket classifyBasket清洗筐117 = NewPackingTaskCommon.newClassifyBasket(objectDao, container清洗筐117); NewPackingTaskCommon.newPackingTask(objectDao, td2, classifyBasket清洗筐117, null, taskType, container清洗筐117, Constants.ORG_UNIT_CODE_NEIKE); - int conut = packingManager.getPackingTaskTousseNameCount(Constants.TASKGROUP_CHANGGUZU, StringUtils.EMPTY, null); + WaitPackingTaskTaskParam param = new WaitPackingTaskTaskParam(); + param.setTaskGroup(Constants.TASKGROUP_CHANGGUZU); + int conut = packingManager.getPackingTaskTousseNameCount(param); assertEquals("有2个装配任务", 2, conut); - conut = packingManager.getPackingTaskTousseNameCount(Constants.TASKGROUP_CHANGGUZU, StringUtils.EMPTY, Constants.ORG_UNIT_NAME_OR); + param.setSettleAccountsDepartCoding(Constants.ORG_UNIT_NAME_OR); + conut = packingManager.getPackingTaskTousseNameCount(param); assertEquals("有1个"+ Constants.ORG_UNIT_NAME_OR +"的装配任务", 1, conut); - conut = packingManager.getPackingTaskTousseNameCount(Constants.TASKGROUP_CHANGGUZU, StringUtils.EMPTY, Constants.ORG_UNIT_CODE_NEIKE); + param.setSettleAccountsDepartCoding(Constants.ORG_UNIT_CODE_NEIKE); + conut = packingManager.getPackingTaskTousseNameCount(param); assertEquals("有1个"+ Constants.ORG_UNIT_CODE_NEIKE +"的装配任务", 1, conut); } } Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r41619 -r41634 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 41619) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 41634) @@ -1889,25 +1889,27 @@ boolean showRecyclingPeopleColumnInPackingTasksList = CssdUtils.getSystemSetConfigByNameBool("showRecyclingPeopleColumnInPackingTasksList", false); //普通器械包、消毒物品及敷料包的装配任务查询 List taskList = new ArrayList(); + String startTimeSql = createStartTimeSql(param); + String washTimeSql = createWashTimeSql(param); if(tdOfPackingTask == null || !TousseDefinition.PACKAGE_TYPE_FOREIGN.equals(tdOfPackingTask.getTousseType()) && !TousseDefinition.PACKAGE_TYPE_SPLIT.equals(tdOfPackingTask.getTousseType()) && !TousseDefinition.PACKAGE_TYPE_CUSTOM.equals(tdOfPackingTask.getTousseType())){ - taskList = findPackingTaskFromCssdHandleToussesConfig(param, showRecyclingPeopleColumnInPackingTasksList,supplyRoomConfig, foldersAndTaskTypes,recyclingAmountConfirmSql, enableUrgentFunction,enableExtendedInformationOfUrgentFunction, enableGroupPendingAssemblyTasksByBasket); + taskList = findPackingTaskFromCssdHandleToussesConfig(param, showRecyclingPeopleColumnInPackingTasksList,supplyRoomConfig, foldersAndTaskTypes,recyclingAmountConfirmSql, enableUrgentFunction,enableExtendedInformationOfUrgentFunction, enableGroupPendingAssemblyTasksByBasket, startTimeSql, washTimeSql); } if(supplyRoomConfig != null){ //外来器械包默认处理科室及任务组 JSONObject foreignTousseHandleDepartAndTaskGroupJsonobject = supplyRoomConfig.getOneForeignTousseHandleDepartAndTaskGroupByDepartCode(AcegiHelper.getCurrentOrgUnitCode()); if(tdOfPackingTask != null && TousseDefinition.PACKAGE_TYPE_FOREIGN.equals(tdOfPackingTask.getTousseType()) || foreignTousseHandleDepartAndTaskGroupJsonobject != null && StringUtils.equals(taskGroup, foreignTousseHandleDepartAndTaskGroupJsonobject.optString("taskGroup"))){ //外来器械包的装配任务查询 - List foreignTousseTaskList = findForeignToussePackingTask(param, showRecyclingPeopleColumnInPackingTasksList, enableUrgentFunction, foldersAndTaskTypes, recyclingAmountConfirmSql,enableExtendedInformationOfUrgentFunction, enableGroupPendingAssemblyTasksByBasket); + List foreignTousseTaskList = findForeignToussePackingTask(param, showRecyclingPeopleColumnInPackingTasksList, enableUrgentFunction, foldersAndTaskTypes, recyclingAmountConfirmSql,enableExtendedInformationOfUrgentFunction, enableGroupPendingAssemblyTasksByBasket, startTimeSql, washTimeSql); if(CollectionUtils.isNotEmpty(foreignTousseTaskList)){ taskList.addAll(foreignTousseTaskList); } } if(tdOfPackingTask != null && TousseDefinition.PACKAGE_TYPE_CUSTOM.equals(tdOfPackingTask.getTousseType()) || StringUtils.equals(taskGroup, supplyRoomConfig.getCustomTousseDefaultTaskGroup())){ //自定义器械包的装配任务查询 - List customerTousseTaskList = findCustomerToussePackingTask(param, showRecyclingPeopleColumnInPackingTasksList, foldersAndTaskTypes, recyclingAmountConfirmSql, enableUrgentFunction,enableExtendedInformationOfUrgentFunction, enableGroupPendingAssemblyTasksByBasket); + List customerTousseTaskList = findCustomerToussePackingTask(param, showRecyclingPeopleColumnInPackingTasksList, foldersAndTaskTypes, recyclingAmountConfirmSql, enableUrgentFunction,enableExtendedInformationOfUrgentFunction, enableGroupPendingAssemblyTasksByBasket, startTimeSql, washTimeSql); if(CollectionUtils.isNotEmpty(customerTousseTaskList)){ taskList.addAll(customerTousseTaskList); } @@ -2915,12 +2917,12 @@ return queryTousseTypes; } @Override - public int getPackingTaskTousseNameCount(String taskGroup, String tousseOrDepart, String settleAccountsDepartCoding){ + public int getPackingTaskTousseNameCount(WaitPackingTaskTaskParam param){ //GDSKQYY-7 boolean enableGroupPendingAssemblyTasksByBasket = CssdUtils.getSystemSetConfigByNameBool("enableGroupPendingAssemblyTasksByBasket", false); String distinctName = enableGroupPendingAssemblyTasksByBasket?"po.classifyBasket_id":"td.name"; String sql = "select count(distinct "+ distinctName +") "; - sql += getPackingTaskListTotalwhereSql(taskGroup, tousseOrDepart, false, settleAccountsDepartCoding); + sql += getPackingTaskListTotalwhereSql(param, false); return objectDao.countBySql(sql); } /** @@ -2929,17 +2931,17 @@ * @param tousseOrDepart * @return */ - private String getPackingTaskListTotalwhereSql(String taskGroup, String tousseOrDepart, boolean querySettleAccountsDepart, String settleAccountsDepartCoding){ - Set queryTousseTypes = getQueryTousseTypes(taskGroup, supplyRoomConfigManager.getSystemParamsObj()); + private String getPackingTaskListTotalwhereSql(WaitPackingTaskTaskParam param, boolean querySettleAccountsDepart){ + Set queryTousseTypes = getQueryTousseTypes(param.getTaskGroup(), supplyRoomConfigManager.getSystemParamsObj()); String tousseTypeAndTaskGroupSql = ""; if(queryTousseTypes.contains(TousseDefinition.PACKAGE_TYPE_FOREIGN) && queryTousseTypes.contains(TousseDefinition.PACKAGE_TYPE_CUSTOM)){ - tousseTypeAndTaskGroupSql = " and (td.tousseType in('"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"','"+ TousseDefinition.PACKAGE_TYPE_FOREIGN +"','"+ TousseDefinition.PACKAGE_TYPE_FOREIGN +"') or td.ancestorID in(select tousseDefinitionId from CssdHandleTousses where taskGroup='"+ taskGroup +"' ) and td.tousseType not in('"+TousseDefinition.PACKAGE_TYPE_FOREIGN+"','"+TousseDefinition.PACKAGE_TYPE_SPLIT+"','"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"') and td.tousseType not in('"+TousseDefinition.PACKAGE_TYPE_FOREIGN+"','"+TousseDefinition.PACKAGE_TYPE_SPLIT+"')) "; + tousseTypeAndTaskGroupSql = " and (td.tousseType in('"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"','"+ TousseDefinition.PACKAGE_TYPE_FOREIGN +"','"+ TousseDefinition.PACKAGE_TYPE_FOREIGN +"') or td.ancestorID in(select tousseDefinitionId from CssdHandleTousses where taskGroup='"+ param.getTaskGroup() +"' ) and td.tousseType not in('"+TousseDefinition.PACKAGE_TYPE_FOREIGN+"','"+TousseDefinition.PACKAGE_TYPE_SPLIT+"','"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"') and td.tousseType not in('"+TousseDefinition.PACKAGE_TYPE_FOREIGN+"','"+TousseDefinition.PACKAGE_TYPE_SPLIT+"')) "; }else if(queryTousseTypes.contains(TousseDefinition.PACKAGE_TYPE_FOREIGN)){ - tousseTypeAndTaskGroupSql = " and (td.tousseType in('"+ TousseDefinition.PACKAGE_TYPE_SPLIT +"','"+ TousseDefinition.PACKAGE_TYPE_FOREIGN +"') or td.ancestorID in(select tousseDefinitionId from CssdHandleTousses where taskGroup='"+ taskGroup +"' ) and td.tousseType not in('"+TousseDefinition.PACKAGE_TYPE_FOREIGN+"','"+TousseDefinition.PACKAGE_TYPE_SPLIT+"','"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"') and td.tousseType not in('"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"')) "; + tousseTypeAndTaskGroupSql = " and (td.tousseType in('"+ TousseDefinition.PACKAGE_TYPE_SPLIT +"','"+ TousseDefinition.PACKAGE_TYPE_FOREIGN +"') or td.ancestorID in(select tousseDefinitionId from CssdHandleTousses where taskGroup='"+ param.getTaskGroup() +"' ) and td.tousseType not in('"+TousseDefinition.PACKAGE_TYPE_FOREIGN+"','"+TousseDefinition.PACKAGE_TYPE_SPLIT+"','"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"') and td.tousseType not in('"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"')) "; }else if(queryTousseTypes.contains(TousseDefinition.PACKAGE_TYPE_CUSTOM)){ - tousseTypeAndTaskGroupSql = " and (td.tousseType in('"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"') or td.ancestorID in(select tousseDefinitionId from CssdHandleTousses where taskGroup='"+ taskGroup +"' ) and td.tousseType not in('"+TousseDefinition.PACKAGE_TYPE_FOREIGN+"','"+TousseDefinition.PACKAGE_TYPE_SPLIT+"','"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"') and td.tousseType not in('"+TousseDefinition.PACKAGE_TYPE_FOREIGN+"','"+TousseDefinition.PACKAGE_TYPE_SPLIT+"')) "; + tousseTypeAndTaskGroupSql = " and (td.tousseType in('"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"') or td.ancestorID in(select tousseDefinitionId from CssdHandleTousses where taskGroup='"+ param.getTaskGroup() +"' ) and td.tousseType not in('"+TousseDefinition.PACKAGE_TYPE_FOREIGN+"','"+TousseDefinition.PACKAGE_TYPE_SPLIT+"','"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"') and td.tousseType not in('"+TousseDefinition.PACKAGE_TYPE_FOREIGN+"','"+TousseDefinition.PACKAGE_TYPE_SPLIT+"')) "; }else{ - tousseTypeAndTaskGroupSql = " and (td.ancestorID in(select tousseDefinitionId from CssdHandleTousses where taskGroup='"+ taskGroup +"' ) and td.tousseType not in('"+TousseDefinition.PACKAGE_TYPE_FOREIGN+"','"+TousseDefinition.PACKAGE_TYPE_SPLIT+"','"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"')) "; + tousseTypeAndTaskGroupSql = " and (td.ancestorID in(select tousseDefinitionId from CssdHandleTousses where taskGroup='"+ param.getTaskGroup() +"' ) and td.tousseType not in('"+TousseDefinition.PACKAGE_TYPE_FOREIGN+"','"+TousseDefinition.PACKAGE_TYPE_SPLIT+"','"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"')) "; } String sql = " from PackingTask po " + " join TousseDefinition td on td.id=po.tousseDefinition_id " @@ -2952,8 +2954,11 @@ + " where po.orgUnitCoding = '" + AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig() + "' and (tdc.hidePackingTask is null or tdc.hidePackingTask<>'是') and (tdc.forDisplay=1 or tdc.tousseType='"+ TousseDefinition.PACKAGE_TYPE_SPLIT +"') " - + getQuerySettleAccountsDepartCoding(settleAccountsDepartCoding) + + getQuerySettleAccountsDepartCoding(param.getSettleAccountsDepartCoding()) + + createStartTimeSql(param) + + createWashTimeSql(param) + tousseTypeAndTaskGroupSql; + String tousseOrDepart = param.getTousseOrDepart(); if(StringUtils.isNotBlank(tousseOrDepart)){ // sqlServer如果字符串中有"[",进行转译 if(tousseOrDepart.contains("[") && dbConnection.isSqlServer()){ @@ -2983,8 +2988,9 @@ } @Override public JSONArray loadWaitPackingTaskDepart(String taskGroup) { + WaitPackingTaskTaskParam param = new WaitPackingTaskTaskParam(); String sql = "SELECT DISTINCT ou.name, po.settleAccountsDepartCoding,sc.sequence " + - getPackingTaskListTotalwhereSql(taskGroup, null, true, null); + getPackingTaskListTotalwhereSql(param, true); List departList = new ArrayList<>(); Set readed = new HashSet();//防止有同名 但序号不同的数据 try (ResultSet rs = objectDao.executeSql(sql)) { @@ -3252,10 +3258,12 @@ * @param basketBarcode * @param tousseNamesAndTaskTypes 包名称和装配任务类型 * @param recyclingAmountConfirmSql 确认沟通是否隐藏装配任务的过滤条件 + * @param startTimeSql 装配任务回收时间过滤 + * @param washTimeSql 装配任务清洗时间过滤 * @return 同时返回PackingTask和TousseDefintion两个实体类，避免多次查询 */ private List findPackingTaskFromCssdHandleToussesConfig(WaitPackingTaskTaskParam param, boolean showRecyclingPeopleColumnInPackingTasksList,SupplyRoomConfig config, List tousseNamesAndTaskTypes, String recyclingAmountConfirmSql, boolean enableUrgentFunction - , boolean enableExtendedInformationOfUrgentFunction, boolean enableGroupPendingAssemblyTasksByBasket) { + , boolean enableExtendedInformationOfUrgentFunction, boolean enableGroupPendingAssemblyTasksByBasket,String startTimeSql,String washTimeSql) { String orgCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig(); StringBuffer sbf = new StringBuffer(); String extraOrder = ""; @@ -3309,6 +3317,8 @@ //+ "po.tousseDefinition_id = td.id and " + "ct.tousseDefinitionId=td.ancestorID " + getQuerySettleAccountsDepartCoding(param.getSettleAccountsDepartCoding()) + + startTimeSql + + washTimeSql //+ "and po.orgUnitCoding = ct.orgUnitCode " + "and (td.tousseType not in('"+TousseDefinition.PACKAGE_TYPE_FOREIGN+"','"+TousseDefinition.PACKAGE_TYPE_SPLIT+"','"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"')) " //外来器械和自定义器械，有专门获取装配任务 + "and ct.taskGroup = '"+param.getTaskGroup()+"' and po.orgUnitCoding = '" + orgCode + "' and po.unPackAmount > 0 " + recyclingAmountConfirmSql); @@ -3331,6 +3341,8 @@ + leftJoinRecyclingRecordSql + "where po.orgUnitCoding = ct.orgUnitCode " + getQuerySettleAccountsDepartCoding(param.getSettleAccountsDepartCoding()) + + startTimeSql + + washTimeSql + " and (td.tousseType not in('"+TousseDefinition.PACKAGE_TYPE_FOREIGN+"','"+TousseDefinition.PACKAGE_TYPE_SPLIT+"','"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"')) " //外来器械和自定义器械，有专门获取装配任务 + " and ct.taskGroup = '"+param.getTaskGroup()+"' and po.orgUnitCoding = '" + orgCode + "' and po.unPackAmount > 0 " + recyclingAmountConfirmSql); } @@ -3441,8 +3453,45 @@ } return findPackingTaskBySql(sbf.toString(), enableUrgentFunction, enableExtendedInformationOfUrgentFunction, enableFlexiblePriceCalculationOfDisinfectionGoodsFunction); } - /** + * 装配任务回收时间过滤 + * @param param + * @return + */ + private String createStartTimeSql(WaitPackingTaskTaskParam param){ + if(param.getIsBeforeModeForRecyclingTime() != null + && StringUtils.isNotBlank(param.getFilterRecyclingTime())){ + if(param.getIsBeforeModeForRecyclingTime()){//之前 + return " and po.startTime <= " + dateQueryAdapter.dateAdapter(param.getFilterRecyclingTime() + ":00"); + }else{//之后 + return " and po.startTime >= " + dateQueryAdapter.dateAdapter(param.getFilterRecyclingTime() + ":00"); + } + } + return StringUtils.EMPTY; + } + /** + * 装配任务清洗时间过滤 + * @param param + * @return + */ + private String createWashTimeSql(WaitPackingTaskTaskParam param){ + if(param.getIsBeforeModeForWashTime() != null + && StringUtils.isNotBlank(param.getFilterWashTime())){ + if(param.getIsBeforeModeForWashTime()){//之前 + return " and exists (select 1 from "+ WashAndDisinfectRecord.class.getSimpleName() + +" wr where wr.id=po.washRecord_id and wr.startDate <= " + + dateQueryAdapter.dateAdapter(param.getFilterWashTime() + ":00") + +") "; + }else{//之后 + return " and exists (select 1 from "+ WashAndDisinfectRecord.class.getSimpleName() + +" wr where wr.id=po.washRecord_id and wr.startDate >= " + + dateQueryAdapter.dateAdapter(param.getFilterWashTime() + ":00") + +") "; + } + } + return StringUtils.EMPTY; + } + /** * 清洗时间结束后再装配JYSRMYY-22 * @param basketBarcode */ @@ -3480,9 +3529,11 @@ * @param taskGroup * @param basketBarcode * @param tousseNamesAndTaskTypes 包名称和装配任务类型 + * @param startTimeSql 装配任务回收时间过滤 + * @param washTimeSql 装配任务清洗时间过滤 * @return 同时返回PackingTask和TousseDefintion两个实体类，避免多次查询 */ - private List findForeignToussePackingTask(WaitPackingTaskTaskParam param, boolean showRecyclingPeopleColumnInPackingTasksList, boolean enableUrgentFunction, List tousseNamesAndTaskTypes, String recyclingAmountConfirmSql, boolean enableExtendedInformationOfUrgentFunction, boolean enableGroupPendingAssemblyTasksByBasket) { + private List findForeignToussePackingTask(WaitPackingTaskTaskParam param, boolean showRecyclingPeopleColumnInPackingTasksList, boolean enableUrgentFunction, List tousseNamesAndTaskTypes, String recyclingAmountConfirmSql, boolean enableExtendedInformationOfUrgentFunction, boolean enableGroupPendingAssemblyTasksByBasket,String startTimeSql,String washTimeSql) { String orgCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig(); String urgentlevelQuery = null; String urgentlevelJoin = null; @@ -3528,6 +3579,8 @@ + leftJoinRecyclingRecordSql + " where (td.tousseType='"+TousseDefinition.PACKAGE_TYPE_FOREIGN + "' or td.tousseType='" + TousseDefinition.PACKAGE_TYPE_SPLIT + "')" + " and po.orgUnitCoding = '" + orgCode + "' " + recyclingAmountConfirmSql + + startTimeSql + + washTimeSql + getQuerySettleAccountsDepartCoding(param.getSettleAccountsDepartCoding())); Container basket = null; if(StringUtils.isNotBlank(param.getBasketBarcode())){ @@ -3621,9 +3674,11 @@ * @param taskGroup * @param basketBarcode * @param tousseNamesAndTaskTypes 包名称和装配任务类型 + * @param startTimeSql 装配任务回收时间过滤 + * @param washTimeSql 装配任务清洗时间过滤 * @return 同时返回PackingTask和TousseDefintion两个实体类，避免多次查询 */ - private List findCustomerToussePackingTask(WaitPackingTaskTaskParam param, boolean showRecyclingPeopleColumnInPackingTasksList, List tousseNamesAndTaskTypes, String recyclingAmountConfirmSql, boolean enableUrgentFunction, boolean enableExtendedInformationOfUrgentFunction, boolean enableGroupPendingAssemblyTasksByBasket) { + private List findCustomerToussePackingTask(WaitPackingTaskTaskParam param, boolean showRecyclingPeopleColumnInPackingTasksList, List tousseNamesAndTaskTypes, String recyclingAmountConfirmSql, boolean enableUrgentFunction, boolean enableExtendedInformationOfUrgentFunction, boolean enableGroupPendingAssemblyTasksByBasket,String startTimeSql,String washTimeSql) { String orgCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig(); String selectRecyclingUserSql = null; String leftJoinRecyclingRecordSql = null; @@ -3666,6 +3721,8 @@ + leftJoinRecyclingRecordSql + "where td.tousseType='"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"' and po.orgUnitCoding = '" + orgCode + "' " + getQuerySettleAccountsDepartCoding(param.getSettleAccountsDepartCoding()) + + startTimeSql + + washTimeSql + recyclingAmountConfirmSql); if(StringUtils.isNotBlank(param.getBasketBarcode())){ //验证篮筐是否清洗 Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java =================================================================== diff -u -r41613 -r41634 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java (.../PackingAction.java) (revision 41613) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java (.../PackingAction.java) (revision 41634) @@ -747,12 +747,12 @@ public void loadWaitPackingTaskPageJson(){ JSONObject obj = new JSONObject(); try { - String taskGroup = StrutsParamUtils.getPraramValue("taskGroup", null); - String tousseOrDepart = StrutsParamUtils.getPraramValue("tousseOrDepart", null); - String settleAccountsDepartCoding = StrutsParamUtils.getPraramValue("settleAccountsDepartCoding", null); - SqlUtils.checkInputParam(settleAccountsDepartCoding); - SqlUtils.checkInputParam(tousseOrDepart); - int totalCount = packingManager.getPackingTaskTousseNameCount(taskGroup, tousseOrDepart, settleAccountsDepartCoding); + WaitPackingTaskTaskParam param = new WaitPackingTaskTaskParam(); + RequestUtils.setPropertiesFromRequest(StrutsParamUtils.getRequest(), param); + + SqlUtils.checkInputParam(param.getSettleAccountsDepartCoding()); + SqlUtils.checkInputParam(param.getTousseOrDepart()); + int totalCount = packingManager.getPackingTaskTousseNameCount(param); int pageSize = StrutsParamUtils.getPraramValue("pageSize", 20); int pageNo = 0; if(totalCount > 0){