Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r21959 -r22308 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 21959) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 22308) @@ -65,7 +65,6 @@ import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManager; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatchStock; -import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoods; import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsInstance; import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance; import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; @@ -1199,7 +1198,7 @@ //获取该器械包所绑定的器械包 BindGoodVo bindGoodVo = new BindGoodVo(); bindGoodVo.setBindCount(tousseItem.getEditAmount()); - bindGoodVo.setGoodId(String.valueOf(tousseItem.getTousseDefinitionId())); + bindGoodVo.setGoodId(tousseItem.getTousseDefinitionId()); bindGoodVo.setGoodName(tousseItem.getTousseName()); bindGoodVo.setGoodType(tousseItem.getTousseType()); JSONArray bindGoodVoJsonArray = tousseDefinitionManager.getBindGoods(bindGoodVo, recyclingApplication.getSettleAccountsDepartCoding(), recyclingApplication.getHandleDepartCoding()); @@ -1263,7 +1262,7 @@ //获取该一次性物品所绑定的一次性物品 BindGoodVo bindGoodVo = new BindGoodVo(); bindGoodVo.setBindCount(tousseItem.getEditAmount()); - bindGoodVo.setGoodId(String.valueOf(tousseItem.getDisposableGoodsId())); + bindGoodVo.setGoodId(tousseItem.getDisposableGoodsId()); bindGoodVo.setGoodName(tousseItem.getTousseName()); bindGoodVo.setGoodType(tousseItem.getTousseType()); JSONArray bindGoodVoJsonArray = tousseDefinitionManager.getBindGoods(bindGoodVo, recyclingApplication.getSettleAccountsDepartCoding(), recyclingApplication.getHandleDepartCoding()); Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java =================================================================== diff -u -r22199 -r22308 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java (.../TousseDefinitionAction.java) (revision 22199) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java (.../TousseDefinitionAction.java) (revision 22308) @@ -68,7 +68,6 @@ import com.forgon.disinfectsystem.tousse.cssdhandletousses.service.CssdHandleTousseManager; import com.forgon.disinfectsystem.tousse.imagefilemanager.service.ImageFileManager; import com.forgon.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager; -import com.forgon.disinfectsystem.tousse.toussedefinition.service.GoodBindHelper; import com.forgon.disinfectsystem.tousse.toussedefinition.service.SearchTousseDefinitionParams; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionHelper; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager; @@ -89,7 +88,6 @@ import com.forgon.tools.json.JsonPropertyFilter; import com.forgon.tools.string.StringTools; import com.forgon.tools.util.PageUtil; -import com.google.gson.reflect.TypeToken; import com.opensymphony.xwork2.ModelDriven; import com.opensymphony.xwork2.Preparable; @@ -2153,7 +2151,7 @@ BindGoodVo bindGoodVo = new BindGoodVo(); String goodName = StrutsParamUtils.getPraramValue("goodName", ""); String goodType = StrutsParamUtils.getPraramValue("goodType", ""); - String goodId = StrutsParamUtils.getPraramValue("goodId", ""); + Long goodId = StrutsParamUtils.getPraramLongValue("goodId", null); int bindCount = StrutsParamUtils.getPraramValue("bindCount", 0); bindGoodVo.setGoodId(goodId); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodsBindingConfig/vo/BindGoodVo.java =================================================================== diff -u -r15948 -r22308 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodsBindingConfig/vo/BindGoodVo.java (.../BindGoodVo.java) (revision 15948) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodsBindingConfig/vo/BindGoodVo.java (.../BindGoodVo.java) (revision 22308) @@ -18,7 +18,7 @@ /** * 绑定物品的id */ - private String goodId; + private Long goodId; /** @@ -42,15 +42,15 @@ this.bindCount = bindCount; } - public String getGoodId() { - return goodId; - } + public Long getGoodId() { + return goodId; + } - public void setGoodId(String goodId) { - this.goodId = goodId; - } + public void setGoodId(Long goodId) { + this.goodId = goodId; + } - public String getGoodType() { + public String getGoodType() { return goodType; } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodsBindingConfig/impl/GoodsBindSrvImpl.java =================================================================== diff -u -r21514 -r22308 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodsBindingConfig/impl/GoodsBindSrvImpl.java (.../GoodsBindSrvImpl.java) (revision 21514) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodsBindingConfig/impl/GoodsBindSrvImpl.java (.../GoodsBindSrvImpl.java) (revision 22308) @@ -1,5 +1,18 @@ package com.forgon.disinfectsystem.goodsBindingConfig.impl; +import java.util.List; + +import javax.annotation.Resource; + +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; + +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.log4j.Logger; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + import com.beust.jcommander.ParameterException; import com.forgon.disinfectsystem.goodsBindingConfig.entity.GoodsBindingConfig; import com.forgon.disinfectsystem.goodsBindingConfig.enums.BidirectionalStatus; @@ -8,17 +21,7 @@ import com.forgon.disinfectsystem.goodsBindingConfig.vo.BindGoodVo; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.IntegerUtils; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; -import java.util.List; - /** * Created by zhonghaowen on 2016/8/11. * 一次性物品绑定服务层实现类 @@ -179,10 +182,10 @@ */ private List findAllBindingByCondition(BindGoodVo bindGoodVo, GoodType type) { try { - String id = bindGoodVo.getGoodId(); + Long id = bindGoodVo.getGoodId(); StringBuilder hql = new StringBuilder("from GoodsBindingConfig po where 1 = 1"); - hql.append(GoodType.MAIN.equals(type) ? String.format(" and po.mainGoodId = '%s' and po.mainGoodType = '一次性物品'", id) : - String.format(" and po.secondaryGoodId = '%s' and po.secondaryGoodType = '一次性物品' and bidirectionalStatus = %s", id, BidirectionalStatus.IS.getVal())); + hql.append(GoodType.MAIN.equals(type) ? String.format(" and po.mainGoodId = %d and po.mainGoodType = '一次性物品'", id) : + String.format(" and po.secondaryGoodId = %d and po.secondaryGoodType = '一次性物品' and bidirectionalStatus = %d", id, BidirectionalStatus.IS.getVal())); List result = objectDao.findByHql(hql.toString()); return result; } Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r21980 -r22308 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 21980) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 22308) @@ -2947,12 +2947,12 @@ private List findAllBindingByCondition(BindGoodVo bindGoodVo, GoodType type) { try { List result = new ArrayList(); - String id = bindGoodVo.getGoodId(); + Long id = bindGoodVo.getGoodId(); if (DatabaseUtil.isPoIdValid(id)) { StringBuilder hql = new StringBuilder("from GoodsBindingConfig po where 1 = 1"); hql.append(GoodType.MAIN.equals(type) ? - String.format(" and po.mainGoodId = '%s' ", id) : - String.format(" and po.secondaryGoodId = '%s' and bidirectionalStatus = %s", id, BidirectionalStatus.IS.getVal())); + String.format(" and po.mainGoodId = %d ", id) : + String.format(" and po.secondaryGoodId = %d and bidirectionalStatus = %d", id, BidirectionalStatus.IS.getVal())); result = objectDao.findByHql(hql.toString()); } return result;