Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/StRoomControlHelper.java =================================================================== diff -u -r17472 -r18201 --- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/StRoomControlHelper.java (.../StRoomControlHelper.java) (revision 17472) +++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/StRoomControlHelper.java (.../StRoomControlHelper.java) (revision 18201) @@ -7,7 +7,6 @@ import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord; import com.forgon.disinfectsystem.supplyroomcontrol.vo.SupplyRoomVo; import com.forgon.disinfectsystem.vo.TousseOperate; -import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; @@ -102,7 +101,7 @@ public Map setResult(List list, Map param) { Integer[] results = (Integer[]) param.get("countResult"); Integer[] sterilizationTotalAmount = (Integer[]) param.get("sterilizationTotalAmount"); - Map packingMap = new HashMap(); + Map packingMap = new HashMap<>(); packingMap.put("totalCount", results[0]); packingMap.put("sterilizationTotalAmount", sterilizationTotalAmount[0]); packingMap.put("data", list); @@ -114,7 +113,7 @@ public Map getCountSqlS(String whereSql) { String countSql = "select count(*),1,1 from (select alias.* from " + whereSql + ") alias1"; String totalCountSql = "select sum(alias2.amount),1,1 from (" + ("select count(*) amount from " + whereSql) + ") alias2"; - Map map = new HashedMap(); + Map map = new HashMap<>(); map.put("countResult", countSql); map.put("sterilizationTotalAmount", totalCountSql); return map; Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java =================================================================== diff -u -r17472 -r18201 --- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java (.../RaRoomControlHelper.java) (revision 17472) +++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java (.../RaRoomControlHelper.java) (revision 18201) @@ -6,8 +6,7 @@ import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; import com.forgon.disinfectsystem.supplyroomcontrol.vo.SupplyRoomVo; import com.forgon.disinfectsystem.vo.TousseOperate; -import org.apache.commons.collections.map.HashedMap; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import java.util.HashMap; @@ -26,13 +25,13 @@ private DateQueryAdapter dateQueryAdapter; private SupplyRoomControlManager supplyRoomControlManager; - + private SupplyRoomControlManager2 supplyRoomControlManagerImpl2; - + public void setSupplyRoomControlManagerImpl2(SupplyRoomControlManager2 supplyRoomControlManagerImpl2) { this.supplyRoomControlManagerImpl2 = supplyRoomControlManagerImpl2; } - + public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) { this.dateQueryAdapter = dateQueryAdapter; } @@ -43,21 +42,43 @@ @Override public String buildSelectSql(SupplyRoomVo supplyRoomVo) { - String dressing1 = ""; - String dressing2 = ""; String tousseType = supplyRoomVo.getTousseType(); + String dressing = ""; if (!TousseDefinition.PACKAGE_TYPE_DRESSING.equals(tousseType) && !"一次性物品".equals(tousseType)) { - dressing1 = ",rr.recyclingTime as \"recyclingTime\",po.basketName as \"basketName\""; - dressing2 = "po.recyclingAmount as \"recyclingAmount\","; + dressing = "rr.recyclingTime as \"recyclingTime\",po.basketName as \"basketName\",po.recyclingAmount as \"recyclingAmount\","; } - return "select distinct ip.id as \"id\",po.tousseName as \"tousseName\",po.urgentAmount as \"urgentAmount\",po.sendOutAmount as \"sendOutAmount\"," + - "po.amount as \"amount\",ip.depart as \"depart\"," + dressing2 + + return "select distinct ip.id as \"id\",po.tousseName as \"tousseName\",po.tousseType as \"tousseType\",case when ri.urgentAmount is not null then ri.urgentAmount else po.urgentAmount end AS \"urgentAmount\",po.sendOutAmount as \"sendOutAmount\"," + + "po.amount as \"amount\",ip.depart as \"depart\"," + dressing + "ip.departCoding as \"departCoding\",ip.applicationTime as \"applicationTime\"," + "ip.submitTime as \"submitTime\",ip.printTime as \"printTime\"," + "ip.serialNumber as \"serialNumber\",ip.settleAccountsDepart as \"settleAccountsDepart\"," + - "replace(ip.remark,'\"',' ') as \"remark\",ip.applicant as \"applicant\",po.diposable as \"diposable\"" + dressing1; + "replace(ip.remark,'\"',' ') as \"remark\",ip.applicant as \"applicant\",po.diposable as \"diposable\",po.tousseDefinitionId as \"tousseDefinitionId\""; } + /** + * 构建要union的sql + * + * @param supplyRoomVo {@link SupplyRoomVo} + * @return 构建好的union sql + */ + private String buildUnionSql(SupplyRoomVo supplyRoomVo) { + String tousseType = supplyRoomVo.getTousseType(); + String startDateStr = dateQueryAdapter.dateAdapter(supplyRoomVo.getStartDate()); + String endDateStr = dateQueryAdapter.dateAdapter(supplyRoomVo.getEndDate()); + String dressing = ""; + if (!TousseDefinition.PACKAGE_TYPE_DRESSING.equals(tousseType) && !"一次性物品".equals(tousseType)) { + dressing = "rr.recyclingTime as \"recyclingTime\",null as \"basketName\",ri.amount as \"recyclingAmount\","; + } + String unionSelect = "select distinct rr.recyclingApplication_id as \"id\",ri.tousseName as \"tousseName\",ri.tousseType as \"tousseType\"," + + "ri.urgentAmount as \"urgentAmount\",0 as \"sendOutAmount\",0 as \"amount\",rr.depart as \"depart\"," + dressing + + "rr.departCode as \"departCoding\",rr.recyclingTime as \"applicationTime\",rr.recyclingTime as \"submitTime\"," + + "null as \"printTime\",null as \"serialNumber\",null as \"settleAccountsDepart\",replace(ri.remark,'\"',' ') as \"remark\"," + + "rr.operator as \"applicant\",'否' as \"diposable\",ri.tousseDefinitionId as \"tousseDefinitionId\" "; + String unionWhere = String.format(" from RecyclingRecord rr join RecyclingItem ri on rr.id = ri.recyclingRecord_id " + + " where rr.recyclingApplication_id is null and rr.recyclingTime between %s and %s", startDateStr, endDateStr); + return unionSelect + unionWhere; + } + @Override public String buildWhereSql(SupplyRoomVo supplyRoomVo) { String tousseType = supplyRoomVo.getTousseType(); @@ -66,31 +87,30 @@ String taskGroup = supplyRoomVo.getTaskGroup(); String startDateStr = dateQueryAdapter.dateAdapter(supplyRoomVo.getStartDate()); String endDateStr = dateQueryAdapter.dateAdapter(supplyRoomVo.getEndDate()); - String whereSql = " from TousseItem po,invoicePlan ip left join RecyclingRecord rr" - + " on rr.recyclingApplication_id = ip.id where po.RecyclingApplication_id = ip.id " - + " and ip.type in (" + SupplyRoomControlManagerImpl.INVOICEPLAN_TYPE + ") and ip.applicationTime between " - + startDateStr + " and " + endDateStr - + " and ip.committedStatus = 1 and (ip.recyclingStatus != '" - + InvoicePlan.STATUS_END + "' or ip.recyclingStatus is null)"; - whereSql = supplyRoomControlManager.setDisinfectionGoodsQuerySql(tousseName, tousseType, whereSql); + String whereSql = String.format(" from TousseItem po,invoicePlan ip left join RecyclingRecord rr on rr.recyclingApplication_id = ip.id left join RecyclingItem ri on rr.id = ri.recyclingRecord_id " + + " where po.RecyclingApplication_id = ip.id and ip.type in (%s) and ip.applicationTime between %s and %s " + + " and ip.committedStatus = 1 and (ip.recyclingStatus != '%s' or ip.recyclingStatus is null)", SupplyRoomControlManagerImpl.INVOICEPLAN_TYPE, startDateStr, endDateStr, InvoicePlan.STATUS_END); + //因为自定义回收的不产生申请单，所以RecyclingRecord的recyclingApplication_id是为空,因此要union上RecyclingRecord表中rr.recyclingApplication_id为空的数据 + String unionWhere = this.buildUnionSql(supplyRoomVo); + whereSql += " union " + unionWhere + ") po where 1=1 "; if (StringUtils.isNotBlank(departCoding)) { - whereSql += " and ip.depart = '" + departCoding + "'"; + whereSql += " and po.depart = '" + departCoding + "'"; } if (StringUtils.isNotBlank(taskGroup) && !"全部".equals(taskGroup)) { - whereSql += String.format(" and po.id in (select ti.id from TousseItem ti join CssdHandleTousses cht on ti.tousseDefinitionId = cht.tousseDefinitionId " + - " where cht.taskGroup ='%s' and cht.orgUnitCode = '%s')", taskGroup, AcegiHelper.getLoginUser().getCurrentOrgUnitCode()); + whereSql += String.format(" and po.tousseDefinitionId in (select cht.tousseDefinitionId from CssdHandleTousses cht where cht.taskGroup = '%s' and cht.orgUnitCode = '%s')", taskGroup, AcegiHelper.getLoginUser().getCurrentOrgUnitCode()); } String typeSql = supplyRoomControlManagerImpl2.getGoodsTypeByComboTousseType(supplyRoomVo.getComboTousseType(), "tousseType", "po"); - if (StringUtils.isNotBlank(typeSql)){ + if (StringUtils.isNotBlank(typeSql)) { whereSql += String.format(" and %s", typeSql); } + whereSql = supplyRoomControlManager.setDisinfectionGoodsQuerySql(tousseName, tousseType, whereSql); return whereSql; } @Override public Map setResult(List list, Map param) { Integer[] results = (Integer[]) param.get("countResult"); - Map applicationMap = new HashMap(); + Map applicationMap = new HashMap<>(); applicationMap.put("totalCount", results[0]); applicationMap.put("totalAppAmount", results[1]); applicationMap.put("totalRecyAmount", results[2]); Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/PkRoomControlHelper.java =================================================================== diff -u -r17472 -r18201 --- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/PkRoomControlHelper.java (.../PkRoomControlHelper.java) (revision 17472) +++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/PkRoomControlHelper.java (.../PkRoomControlHelper.java) (revision 18201) @@ -83,7 +83,7 @@ @Override public Map setResult(List list, Map param) { Integer[] results = (Integer[]) param.get("countResult"); - Map packingMap = new HashMap(); + Map packingMap = new HashMap<>(); packingMap.put("totalCount", results[0]); packingMap.put("packingTotalAmount", results[1]); packingMap.put("data", list); Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java =================================================================== diff -u -r17472 -r18201 --- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java (.../WdRoomControlHelper.java) (revision 17472) +++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java (.../WdRoomControlHelper.java) (revision 18201) @@ -90,7 +90,7 @@ @Override public Map setResult(List list, Map param) { Integer[] results = (Integer[]) param.get("countResult"); - Map washMap = new HashMap(); + Map washMap = new HashMap<>(); washMap.put("totalCount", results[0]); washMap.put("totalWashAmount", results[1]); washMap.put("data", list); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseOperate.java =================================================================== diff -u -r15802 -r18201 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseOperate.java (.../TousseOperate.java) (revision 15802) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseOperate.java (.../TousseOperate.java) (revision 18201) @@ -49,6 +49,16 @@ */ private Integer sendOutAmount; + /** + * 器械包类型 + */ + private String tousseType; + + /** + * 器械包定义id + */ + private BigDecimal tousseDefinitionId; + public TousseOperate() { } @@ -337,4 +347,58 @@ public void setBasketName(String basketName) { this.basketName = basketName; } + + public String getTousseType() { + return tousseType; + } + + public void setTousseType(String tousseType) { + this.tousseType = tousseType; + } + + public BigDecimal getTousseDefinitionId() { + return tousseDefinitionId; + } + + public void setTousseDefinitionId(BigDecimal tousseDefinitionId) { + this.tousseDefinitionId = tousseDefinitionId; + } + + @Override + public String toString() { + return "TousseOperate{" + + "id='" + id + '\'' + + ", tousseName='" + tousseName + '\'' + + ", serialNumber='" + serialNumber + '\'' + + ", applicant='" + applicant + '\'' + + ", settleAccountsDepart='" + settleAccountsDepart + '\'' + + ", remark='" + remark + '\'' + + ", amount=" + amount + + ", depart='" + depart + '\'' + + ", departCoding='" + departCoding + '\'' + + ", applicationTime='" + applicationTime + '\'' + + ", submitTime='" + submitTime + '\'' + + ", printTime='" + printTime + '\'' + + ", recyclingTime='" + recyclingTime + '\'' + + ", sender='" + sender + '\'' + + ", senderTime='" + senderTime + '\'' + + ", diposable='" + diposable + '\'' + + ", basketName='" + basketName + '\'' + + ", applyAmount='" + applyAmount + '\'' + + ", recyclingAmount=" + recyclingAmount + + ", packedAmount='" + packedAmount + '\'' + + ", unPackAmount='" + unPackAmount + '\'' + + ", operator='" + operator + '\'' + + ", disinfectIdentification='" + disinfectIdentification + '\'' + + ", disinfectProgram='" + disinfectProgram + '\'' + + ", startDate='" + startDate + '\'' + + ", endDate='" + endDate + '\'' + + ", frequency=" + frequency + + ", ROWNUM_=" + ROWNUM_ + + ", urgentAmount=" + urgentAmount + + ", sendOutAmount=" + sendOutAmount + + ", tousseType='" + tousseType + '\'' + + ", tousseDefinitionId=" + tousseDefinitionId + + '}'; + } } Index: ssts-web/src/main/webapp/homepage/supplyRoomOperate.js =================================================================== diff -u -r17472 -r18201 --- ssts-web/src/main/webapp/homepage/supplyRoomOperate.js (.../supplyRoomOperate.js) (revision 17472) +++ ssts-web/src/main/webapp/homepage/supplyRoomOperate.js (.../supplyRoomOperate.js) (revision 18201) @@ -45,7 +45,7 @@ function renderCallRecyclingApplicationShowFun(v, p, record){ var applicationID = record.data['id']; - if(applicationID != null && applicationID != ""){ + if(applicationID != null && applicationID != "" && applicationID !== 'null'){ if(record.data['diposable'] == '否'){ return ""+record.data['tousseName']+""; }else{ @@ -110,50 +110,6 @@ loadStoreByParams(reviewStore, queryParam2); loadStoreByParams(sterilizationStore, queryParam2); loadStoreByParams(invoicePlanStore, queryParam1); - // applicationStore.baseParams['tousseName'] = goodName; - // applicationStore.baseParams['tousseType'] = tousseType; - // applicationStore.baseParams['department'] = department; - // applicationStore.baseParams['startDate'] = startDate; - // applicationStore.baseParams['endDate'] = endDate; - // applicationStore.baseParams['taskGroup'] = taskGroup; - // applicationStore.load({params:{start: 0, limit: 10}}); - - // washStore.baseParams['tousseName'] = goodName; - // washStore.baseParams['tousseType'] = tousseType; - // washStore.baseParams['startDate'] = startDate; - // washStore.baseParams['endDate'] = endDate; - // washStore.baseParams['taskGroup'] = taskGroup; - // washStore.load({params:{start: 0, limit: 10}}); - - // packingStore.baseParams['tousseName'] = goodName; - // packingStore.baseParams['tousseType'] = tousseType; - // packingStore.baseParams['startDate'] = startDate; - // packingStore.baseParams['endDate'] = endDate; - // packingStore.baseParams['taskGroup'] = taskGroup; - // packingStore.load({params:{start: 0, limit: 10}}); - - // reviewStore.baseParams['tousseName'] = goodName; - // reviewStore.baseParams['tousseType'] = tousseType; - // reviewStore.baseParams['startDate'] = startDate; - // reviewStore.baseParams['endDate'] = endDate; - // reviewStore.baseParams['taskGroup'] = taskGroup; - // reviewStore.load({params:{start: 0, limit: 10}}); - - // sterilizationStore.baseParams['tousseName'] = goodName; - // sterilizationStore.baseParams['tousseType'] = tousseType; - // sterilizationStore.baseParams['startDate'] = startDate; - // sterilizationStore.baseParams['endDate'] = endDate; - // sterilizationStore.baseParams['taskGroup'] = taskGroup; - // sterilizationStore.load({params:{start: 0, limit: 10}}); - - // invoicePlanStore.baseParams['tousseName'] = goodName; - // invoicePlanStore.baseParams['tousseType'] = tousseType; - // invoicePlanStore.baseParams['department'] = department; - // invoicePlanStore.baseParams['startDate'] = startDate; - // invoicePlanStore.baseParams['endDate'] = endDate; - // invoicePlanStore.baseParams['taskGroup'] = taskGroup; - // invoicePlanStore.load({params:{start: 0, limit: 10}}); - } /** Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RvRoomControlHelper.java =================================================================== diff -u -r17472 -r18201 --- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RvRoomControlHelper.java (.../RvRoomControlHelper.java) (revision 17472) +++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RvRoomControlHelper.java (.../RvRoomControlHelper.java) (revision 18201) @@ -6,7 +6,6 @@ import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; import com.forgon.disinfectsystem.supplyroomcontrol.vo.SupplyRoomVo; import com.forgon.disinfectsystem.vo.TousseOperate; -import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; @@ -84,7 +83,7 @@ public Map setResult(List list, Map param) { Integer[] results = (Integer[]) param.get("countResult"); Integer[] totalReviewAmount = (Integer[]) param.get("totalReviewAmount"); - Map packingMap = new HashMap(); + Map packingMap = new HashMap<>(); packingMap.put("totalCount", results[0]); packingMap.put("totalReviewAmount", totalReviewAmount[0]); packingMap.put("data", list); @@ -97,7 +96,7 @@ String totalCountSql = "select count(*),1,1 " + whereSql; whereSql += " group by po.tousseName,po.reviewer,po.reviewTime,po.sterilizationBasket"; String countSql = "select count(*),1,1 from (select po.tousseName " + whereSql + ")alias"; - Map map = new HashedMap(); + Map map = new HashMap<>(); map.put("countResult", countSql); map.put("totalReviewAmount", totalCountSql); return map; Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/IpRoomControlHelper.java =================================================================== diff -u -r17472 -r18201 --- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/IpRoomControlHelper.java (.../IpRoomControlHelper.java) (revision 17472) +++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/IpRoomControlHelper.java (.../IpRoomControlHelper.java) (revision 18201) @@ -15,8 +15,8 @@ /** * @author zhonghaowen + * @apiNote 消毒供应中心运作监控发货信息查询 * @since 2017-01-06 - * @apiNote 消毒供应中心运作监控发货信息查询 */ public class IpRoomControlHelper implements SupplyRoomControlHelper { @@ -27,13 +27,13 @@ private SupplyRoomConfigManager supplyRoomConfigManager; private SupplyRoomControlManager supplyRoomControlManager; - + private SupplyRoomControlManager2 supplyRoomControlManagerImpl2; - + public void setSupplyRoomControlManagerImpl2(SupplyRoomControlManager2 supplyRoomControlManagerImpl2) { this.supplyRoomControlManagerImpl2 = supplyRoomControlManagerImpl2; } - + public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) { this.dateQueryAdapter = dateQueryAdapter; } @@ -58,11 +58,10 @@ String orgUnitCoding = config.getOrgUnitCoding(); String departCoding = supplyRoomVo.getDepartment(); String taskGroup = supplyRoomVo.getTaskGroup(); - String whereSql = "from Invoice i,InvoicePlan ip,InvoiceItem po" - + " where i.id = po.invoice_id and ip.id = i.invoicePlan_ID" - + " and ip.type in (" + SupplyRoomControlManagerImpl.INVOICEPLAN_TYPE + ") and i.status in ('已发货','收货签收')" - + " and i.orgUnitCoding = '" + orgUnitCoding + "'" - + " and i.sendTime between " + dateQueryAdapter.dateAdapter(supplyRoomVo.getStartDate()) + " and " + dateQueryAdapter.dateAdapter(supplyRoomVo.getEndDate()); + String whereSql = String.format(" from Invoice i join InvoiceItem po on i.id = po.invoice_id " + + " left join InvoicePlan ip on i.invoicePlan_ID = ip.id " + + " where (ip.type in (%s) or ip.type is null) and i.status in ('已发货','收货签收') and i.orgUnitCoding = '%s' " + + " and i.sendTime between %s and %s", SupplyRoomControlManagerImpl.INVOICEPLAN_TYPE, orgUnitCoding, dateQueryAdapter.dateAdapter(supplyRoomVo.getStartDate()), dateQueryAdapter.dateAdapter(supplyRoomVo.getEndDate())); whereSql = supplyRoomControlManager.setDisinfectionGoodsQuerySql(supplyRoomVo.getTousseName(), supplyRoomVo.getTousseType(), whereSql); if (StringUtils.isNotBlank(departCoding)) { whereSql += " and i.depart = '" + departCoding + "'"; @@ -72,7 +71,7 @@ " join CssdHandleTousses cht on ti.tousseDefinitionId = cht.tousseDefinitionId where cht.taskGroup = '%s' and cht.orgUnitCode = '%s')", taskGroup, AcegiHelper.getLoginUser().getCurrentOrgUnitCode()); } String typeSql = supplyRoomControlManagerImpl2.getGoodsTypeByComboTousseType(supplyRoomVo.getComboTousseType(), "tousseType", "po"); - if (StringUtils.isNotBlank(typeSql)){ + if (StringUtils.isNotBlank(typeSql)) { whereSql += String.format(" and %s", typeSql); } return whereSql; @@ -81,7 +80,7 @@ @Override public Map setResult(List list, Map param) { Integer[] results = (Integer[]) param.get("countResult"); - Map washMap = new HashMap(); + Map washMap = new HashMap<>(); washMap.put("totalCount", results[0]); washMap.put("invoiceTotalAmount", results[1]); washMap.put("data", list); Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java =================================================================== diff -u -r17472 -r18201 --- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java (.../SupplyRoomControlManagerImpl2.java) (revision 17472) +++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java (.../SupplyRoomControlManagerImpl2.java) (revision 18201) @@ -8,11 +8,11 @@ import com.forgon.tools.SqlBuilder; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.PageUtil; -import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -78,11 +78,11 @@ try { String selectSql = raRoomControlHelper.buildSelectSql(supplyRoomVo); String whereSql = raRoomControlHelper.buildWhereSql(supplyRoomVo); - String countSql = "select count(*),sum(po.amount),sum(po.recyclingAmount) "; - selectSql += whereSql; - countSql += whereSql; - logger.debug("[sql]:" + selectSql); - return this.getResult(raRoomControlHelper, selectSql, countSql); + String sql = "select * from (" + selectSql + whereSql + " order by po.\"applicationTime\" "; + String countSql = "select count(*), sum(po.\"amount\"), sum(po.\"recyclingAmount\") from ("; + countSql += selectSql + whereSql; + logger.debug("[sql]:" + sql); + return this.getResult(raRoomControlHelper, sql, countSql); } catch (Exception e) { logger.error(e); @@ -95,7 +95,7 @@ try { String selectSql = wdRoomControlHelper.buildSelectSql(supplyRoomVo); String whereSql = wdRoomControlHelper.buildWhereSql(supplyRoomVo); - String countSql = "select count(*),sum(ci.amount),1"; + String countSql = "select count(*),sum(ci.amount),1 "; countSql += whereSql; selectSql += whereSql + " order by wr.endDate desc"; logger.debug("[sql]:" + selectSql); @@ -173,10 +173,10 @@ throw new RuntimeException(e); } } - + @Override public String getGoodsTypeByComboTousseType(String comboTousseType, String type, String alias) { - if (StringUtils.isBlank(comboTousseType) || ObjectUtils.equals("all", comboTousseType)){ + if (StringUtils.isBlank(comboTousseType) || ObjectUtils.equals("all", comboTousseType)) { return null; } switch (comboTousseType) { @@ -202,7 +202,7 @@ return null; } } - + /** * 查询TousseOperate结果集 * @@ -222,7 +222,7 @@ * @return 统计的结果 */ private Map countBySql(String countSql) { - Map map = new HashedMap(); + Map map = new HashMap<>(); map.put("countResult", supplyRoomControlManager.countBySql(countSql)); return map; } @@ -234,7 +234,7 @@ * @return */ private Map countBySql(Map countSqlS) { - Map map = new HashedMap(); + Map map = new HashMap<>(); for (String content : countSqlS.keySet()) { Integer[] countResult = supplyRoomControlManager.countBySql(countSqlS.get(content).toString()); map.put(content, countResult);