Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dto/ModifyTousseDefinitionDto.java =================================================================== diff -u -r36809 -r37438 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dto/ModifyTousseDefinitionDto.java (.../ModifyTousseDefinitionDto.java) (revision 36809) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dto/ModifyTousseDefinitionDto.java (.../ModifyTousseDefinitionDto.java) (revision 37438) @@ -99,6 +99,10 @@ */ private Integer printAmount; + /** + * 资产归属(科室编码) + */ + private String assetsBelongCode; public List getTousseDefinitionIds() { return tousseDefinitionIds; } @@ -259,4 +263,12 @@ this.printAmount = printAmount; } + public String getAssetsBelongCode() { + return assetsBelongCode; + } + + public void setAssetsBelongCode(String assetsBelongCode) { + this.assetsBelongCode = assetsBelongCode; + } + } Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r37255 -r37438 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 37255) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 37438) @@ -5411,7 +5411,7 @@ Double integral = modifyTousseDefinitionDto.getIntegral();//积分系数 String registUseRecordAfterSigned = modifyTousseDefinitionDto.getRegistUseRecordAfterSigned();//签收后录入使用记录 Integer printAmount = modifyTousseDefinitionDto.getPrintAmount();//打印份数 - + String assetsBelongCode = modifyTousseDefinitionDto.getAssetsBelongCode();//资产归属 //改动记录集合 List dataModifyRecordList = new ArrayList(); Date modifyDateTime = new Date(); @@ -5442,7 +5442,8 @@ || StringUtils.isNotEmpty(isReview) || StringUtils.isNotEmpty(isConvertApplyGoods)) || integral != null || StringUtils.isNotBlank(registUseRecordAfterSigned) - || printAmount != null){ + || printAmount != null + || StringUtils.isNotBlank(assetsBelongCode)){ for (TousseDefinition tousseDefinition : needModifys) { //若修改属性不为空则修改 if(StringUtils.isNotEmpty(isDisable) && !StringUtils.equals(tousseDefinition.getIsDisable(), isDisable)){//是否停用 @@ -5453,6 +5454,10 @@ addDataModifyRecord(dataModifyRecordList, tousseDefinition, tousseDefinition.getPackageSize(), packageSize, modifyDateTime, modifyUserID, "包大小", "packageSize"); filedValueMap.put("packageSize", packageSize); } + if(StringUtils.isNotEmpty(assetsBelongCode) && !StringUtils.equals(tousseDefinition.getAssetsBelongCode(), assetsBelongCode)){//assetsBelongCode + addDataModifyRecord(dataModifyRecordList, tousseDefinition, tousseDefinition.getAssetsBelongCode(), assetsBelongCode, modifyDateTime, modifyUserID, "资产归属", "assetsBelongCode"); + filedValueMap.put("assetsBelongCode", assetsBelongCode); + } if(StringUtils.isNotEmpty(borrowPrice) && !StringUtils.equals(borrowPrice, tousseDefinition.getBorrowPrice()+"")){//借出价格 addDataModifyRecord(dataModifyRecordList, tousseDefinition, tousseDefinition.getBorrowPrice()+"", borrowPrice, modifyDateTime, modifyUserID, "借出价格", "borrowPrice"); filedValueMap.put("borrowPrice", Double.valueOf(borrowPrice));