Browse Source

调整

mssql
Yen 3 years ago
parent
commit
91a99d1c6b
  1. 2
      src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java
  2. 2
      src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java

2
src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java

@ -130,7 +130,7 @@ public class TbsActivityTemplateController {
tbsActivityTemplateService.updateById(template); tbsActivityTemplateService.updateById(template);
TbsActivityTemplate tmp = tbsActivityTemplateService.getById(param.getId()); TbsActivityTemplate tmp = tbsActivityTemplateService.getById(param.getId());
if(tmp!=null){ if(tmp!=null){
TbsActivityTemplateLog templateLog = activityTemplateLogService.toLog(template,param.getTemplateState()); TbsActivityTemplateLog templateLog = activityTemplateLogService.toLog(tmp,param.getTemplateState());
activityTemplateLogService.save(templateLog); activityTemplateLogService.save(templateLog);
} }
return R.ok(template); return R.ok(template);

2
src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java

@ -38,6 +38,7 @@ public class TbsBudgetLog implements Serializable {
/** 预算编码 */ /** 预算编码 */
@NotBlank(message = "预算编码不能为空") @NotBlank(message = "预算编码不能为空")
@Length(max = 30,message = "预算编码长度不能超过30字") @Length(max = 30,message = "预算编码长度不能超过30字")
@TableField(condition = SqlCondition.LIKE)
private String budgetCode; private String budgetCode;
/** 类型:0-预算新增;1-费用申请;2-预算调增;3-预算调减;4-费用释放;5-费用申请调增;6-费用申请调减 */ /** 类型:0-预算新增;1-费用申请;2-预算调增;3-预算调减;4-费用释放;5-费用申请调增;6-费用申请调减 */
@ -52,6 +53,7 @@ public class TbsBudgetLog implements Serializable {
/** 操作人名称 */ /** 操作人名称 */
@NotBlank(message = "操作人名称不能为空") @NotBlank(message = "操作人名称不能为空")
@Length(max = 32,message = "操作人名称长度不能超过32字") @Length(max = 32,message = "操作人名称长度不能超过32字")
@TableField(condition = SqlCondition.LIKE)
private String optUserName; private String optUserName;
/** 操作人编号 */ /** 操作人编号 */

Loading…
Cancel
Save