Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r19120 -r19122 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 19120) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 19122) @@ -2301,7 +2301,7 @@ String compareResult = new RecyclingApplicationComparator().doCompare(orignalApplication, invoicePlanManager.invoicePlan2RecyclingApplicationVo(application,false), tousseItemManager.tousseItem2TousseItemVo(application.getApplicationItems())); - if(StringTools.isNotEmpty(compareResult) || !DatabaseUtil.isPoIdValid(application.getId())){ + if(StringTools.isNotEmpty(compareResult) || orignalApplication == null){ applicationLogManager.saveApplicationLog(application, compareResult, ApplicationLogStatusEnum.SUBMIT); } //加急物品 Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/updateLog/ApplicationLogManagerImpl.java =================================================================== diff -u -r18606 -r19122 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/updateLog/ApplicationLogManagerImpl.java (.../ApplicationLogManagerImpl.java) (revision 18606) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/updateLog/ApplicationLogManagerImpl.java (.../ApplicationLogManagerImpl.java) (revision 19122) @@ -1,25 +1,26 @@ package com.forgon.disinfectsystem.recyclingapplication.updateLog; +import java.util.Date; +import java.util.List; + +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import net.sf.json.JsonConfig; + +import org.apache.commons.lang3.StringUtils; +import org.apache.log4j.Logger; + import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.directory.vo.LoginUserData; import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; -import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication; import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; import com.forgon.entity.PageEntity; import com.forgon.log.enums.ApplicationLogStatusEnum; import com.forgon.log.model.recyclingapplication.ApplicationLog; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.json.DateJsonValueProcessor; import com.forgon.tools.util.ObjectUtil; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import net.sf.json.JsonConfig; -import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; -import java.util.Date; -import java.util.List; - /** * @author zhonghaowen * @apiNote @@ -88,7 +89,10 @@ result.append(String.format("%s创建,申请科室为【%s】,结算科室为【%s】,处理科室为【%s】,物品如下:", recyclingApplication.getType(), recyclingApplication.getDepart(), recyclingApplication.getSettleAccountsDepart(), recyclingApplication.getHandleDepart())); List applicationItems = recyclingApplication.getApplicationItems(); for (TousseItem applicationItem : applicationItems) { - result.append(String.format("【%s】数量为:%s,", applicationItem.getTousseName(), applicationItem.getAmount())); + result.append(String.format("【%s】申请数量为:%s,", applicationItem.getTousseName(), applicationItem.getAmount())); + if(applicationItem.getRecyclingAmount() != null && applicationItem.getRecyclingAmount() > 0){ + result.append(String.format("回收数量为:%d,", applicationItem.getRecyclingAmount())); + } } return ObjectUtil.subStringLastBuilder(result); }