diff --git a/src/main/java/com/gaotao/modules/base/entity/UserLabelPrinterData.java b/src/main/java/com/gaotao/modules/base/entity/UserLabelPrinterData.java index 06150ba..85b39cd 100644 --- a/src/main/java/com/gaotao/modules/base/entity/UserLabelPrinterData.java +++ b/src/main/java/com/gaotao/modules/base/entity/UserLabelPrinterData.java @@ -2,6 +2,8 @@ package com.gaotao.modules.base.entity; import org.apache.ibatis.type.Alias; +import java.util.Date; + @Alias("UserLabelPrinterData") public class UserLabelPrinterData { private String site;// @@ -19,6 +21,10 @@ public class UserLabelPrinterData { private String ipAddress;// private String searchFlag;//是否查询 private String checkFlag;//是否检查 + private String createBy; + private Date createDate; + private String updateBy; + private Date updateDate; public UserLabelPrinterData() { @@ -143,4 +149,36 @@ public class UserLabelPrinterData { public void setCheckFlag(String checkFlag) { this.checkFlag = checkFlag; } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; + } + + public Date getUpdateDate() { + return updateDate; + } + + public void setUpdateDate(Date updateDate) { + this.updateDate = updateDate; + } } diff --git a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java index a1b2f81..47a6f4c 100644 --- a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java +++ b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java @@ -2345,6 +2345,8 @@ public class BaseServiceImpl implements BaseService { String objectId = String.valueOf(checkMap.get("objectId")); throw new XJException(msg, Integer.parseInt(resultCode), objectId); } + //设置新增审计字段 + inData.setCreateBy(inData.getUsername()); baseMapper.insertUserLabelPrinter(inData); } @@ -2368,7 +2370,8 @@ public class BaseServiceImpl implements BaseService { @Override public void updateUserLabelPrinter(UserLabelPrinterData inData) { - //修改目前不需要做校验 + //设置修改审计字段 + inData.setUpdateBy(inData.getUsername()); baseMapper.updateUserLabelPrinter(inData); } diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml index 5d3b1db..d1f6bd8 100644 --- a/src/main/resources/mapper/base/BaseMapper.xml +++ b/src/main/resources/mapper/base/BaseMapper.xml @@ -2001,7 +2001,11 @@ rfl.Reportfile labelName, rfl.ReportType labelClass, rfp.NewPrinterName printerName, - rfp.IPAddress ipAddress + rfp.IPAddress ipAddress, + rfp.create_by createBy, + rfp.create_date createDate, + rfp.update_by updateBy, + rfp.update_date updateDate FROM ReportFileList_UserPrinter rfp LEFT JOIN sys_user ssu ON ssu.username = rfp.UserID LEFT JOIN ReportFileList rfl ON rfl.ReportID = rfp.ReportID @@ -2037,14 +2041,15 @@ - INSERT INTO ReportFileList_UserPrinter(ReportID, UserID, PrinterName, IPAddress, NewPrinterName) - VALUES (#{labelNo}, #{userId}, '', #{ipAddress}, #{printerName}) + INSERT INTO ReportFileList_UserPrinter(ReportID, UserID, PrinterName, IPAddress, NewPrinterName, create_by, create_date, update_by, update_date) + VALUES (#{labelNo}, #{userId}, '', #{ipAddress}, #{printerName}, #{createBy}, GETDATE(), #{createBy}, GETDATE()) - UPDATE ReportFileList_UserPrinter SET IPAddress = #{ipAddress}, NewPrinterName = #{printerName} + UPDATE ReportFileList_UserPrinter SET IPAddress = #{ipAddress}, NewPrinterName = #{printerName}, + update_by = #{updateBy}, update_date = GETDATE() AND ReportID = #{labelNo} AND UserID = #{userId}