Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/service/IDCardInfoMaintainManagerImpl.java =================================================================== diff -u -r29847 -r29864 --- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/service/IDCardInfoMaintainManagerImpl.java (.../IDCardInfoMaintainManagerImpl.java) (revision 29847) +++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/service/IDCardInfoMaintainManagerImpl.java (.../IDCardInfoMaintainManagerImpl.java) (revision 29864) @@ -9,6 +9,7 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.disinfectsystem.entity.idcardinfomaintain.IDCardInfoMaintain; import com.forgon.disinfectsystem.entity.idcardinfomaintain.IDCardQuestionMaintain; import com.forgon.disinfectsystem.entity.idcardinfomaintain.IDCardRemarkMaintain; @@ -49,6 +50,7 @@ json.put("discoverUser", iDCardInfoMaintain.getDiscoverUser()); json.put("registTime", DateTools.getFormatDateStr(iDCardInfoMaintain.getRegistTime(), DateTools.COMMON_DATE_HMS)); json.put("status", iDCardInfoMaintain.getStatus()); + json.put("operator", iDCardInfoMaintain.getOperator()); if(iDCardInfoMaintain instanceof IDCardQuestionMaintain){ IDCardQuestionMaintain iDCardQuestion = (IDCardQuestionMaintain) iDCardInfoMaintain; json.put("serialNumber", iDCardQuestion.getSerialNumber()); @@ -76,8 +78,10 @@ if(CollectionUtils.isEmpty(IDCardInfoMaintainList)){ throw new SystemException("记录不存在!"); } + String opeartor = AcegiHelper.getLoginUserFullName(); for (IDCardInfoMaintain idCardInfoMaintain : IDCardInfoMaintainList) { idCardInfoMaintain.setStatus(status); + idCardInfoMaintain.setOperator(opeartor); } objectDao.batchSaveOrUpdate(IDCardInfoMaintainList); } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/idcardinfomaintain/IDCardInfoMaintain.java =================================================================== diff -u -r29847 -r29864 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/idcardinfomaintain/IDCardInfoMaintain.java (.../IDCardInfoMaintain.java) (revision 29847) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/idcardinfomaintain/IDCardInfoMaintain.java (.../IDCardInfoMaintain.java) (revision 29864) @@ -54,6 +54,11 @@ private String discoverUser; /** + * 处理人:当前登录用户 + */ + private String operator; + + /** * 状态:启用、停用 */ private String status = STATUS_ENABLE; @@ -109,6 +114,14 @@ this.discoverUser = discoverUser; } + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator; + } + public String getStatus() { return status; }