From 91a99d1c6b6cc4a489c2bad0ecdc00ce3a327bf1 Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 30 Jan 2023 11:56:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/tbs/controller/TbsActivityTemplateController.java | 2 +- src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java index bf319c7b..7239c270 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java @@ -130,7 +130,7 @@ public class TbsActivityTemplateController { tbsActivityTemplateService.updateById(template); TbsActivityTemplate tmp = tbsActivityTemplateService.getById(param.getId()); if(tmp!=null){ - TbsActivityTemplateLog templateLog = activityTemplateLogService.toLog(template,param.getTemplateState()); + TbsActivityTemplateLog templateLog = activityTemplateLogService.toLog(tmp,param.getTemplateState()); activityTemplateLogService.save(templateLog); } return R.ok(template); diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java index 9b1c3708..e48474c9 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java @@ -38,6 +38,7 @@ public class TbsBudgetLog implements Serializable { /** 预算编码 */ @NotBlank(message = "预算编码不能为空") @Length(max = 30,message = "预算编码长度不能超过30字") + @TableField(condition = SqlCondition.LIKE) private String budgetCode; /** 类型：0-预算新增；1-费用申请；2-预算调增；3-预算调减；4-费用释放；5-费用申请调增；6-费用申请调减 */ @@ -52,6 +53,7 @@ public class TbsBudgetLog implements Serializable { /** 操作人名称 */ @NotBlank(message = "操作人名称不能为空") @Length(max = 32,message = "操作人名称长度不能超过32字") + @TableField(condition = SqlCondition.LIKE) private String optUserName; /** 操作人编号 */