Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/tousseDefinitionBelongOrgUnit/service/TousseDefinitionBelongDepartManagerImpl.java =================================================================== diff -u -r26185 -r34053 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/tousseDefinitionBelongOrgUnit/service/TousseDefinitionBelongDepartManagerImpl.java (.../TousseDefinitionBelongDepartManagerImpl.java) (revision 26185) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/tousseDefinitionBelongOrgUnit/service/TousseDefinitionBelongDepartManagerImpl.java (.../TousseDefinitionBelongDepartManagerImpl.java) (revision 34053) @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.Date; import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; @@ -12,19 +13,26 @@ import org.springframework.beans.factory.annotation.Autowired; import com.beust.jcommander.ParameterException; +import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.directory.model.OrgUnit; import com.forgon.directory.service.OrgUnitManager; +import com.forgon.disinfectsystem.datamodifyrecord.service.DataModifyRecordManager; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinitionBelongDepart; +import com.forgon.disinfectsystem.entity.datamodifyrecord.DataModifyRecord; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.BasePoManagerImpl; +import com.forgon.tools.string.StringTools; import com.forgon.tools.util.SqlUtils; public class TousseDefinitionBelongDepartManagerImpl extends BasePoManagerImpl implements TousseDefinitionBelongDepartManager{ @Autowired private OrgUnitManager orgUnitManager; + + @Autowired + private DataModifyRecordManager dataModifyRecordManager; @Override public JSONObject saveOrUpdateTousseDefinitionBelongOrgUnits(TousseDefinition tousseDefinition, List newUnitCodes) { @@ -56,6 +64,10 @@ //保存新的所属科室 objectDao.batchSaveOrUpdate(addLists); resultLog.put("belongOrgUnitsLog", String.format("所属科室编码,原值:%s,新值:%s",oldUnitCodes,newUnitCodes)); + String newValue = StringTools.join(newUnitCodes, ","); + String oldValue = StringTools.join(oldUnitCodes, ","); + dataModifyRecordManager.saveDataModifyRecord(tousseDefinition.getId(), "修改所属科室", newValue, oldValue, new Date(), + DataModifyRecord.MODEL_TOUSSEDEFINITION, DataModifyRecord.MODIFY_TYPE_MANUAL, AcegiHelper.getLoginUser().getUserId()); } return resultLog; }