Commit 1e4dcc21 authored by hongguangwu's avatar hongguangwu

MVP1.7.16-法大大

parent ea019961
...@@ -19,9 +19,12 @@ package com.yifu.cloud.plus.v1.yifu.archives.controller; ...@@ -19,9 +19,12 @@ package com.yifu.cloud.plus.v1.yifu.archives.controller;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TFascEditLog;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TFascTemplateDetail; import com.yifu.cloud.plus.v1.yifu.archives.entity.TFascTemplateDetail;
import com.yifu.cloud.plus.v1.yifu.archives.service.TFascEditLogService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TFascTemplateDetailService; import com.yifu.cloud.plus.v1.yifu.archives.service.TFascTemplateDetailService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TFascTemplateDetailSearchVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TFascTemplateDetailSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common; import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage; import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
...@@ -52,6 +55,7 @@ public class TFascTemplateDetailController { ...@@ -52,6 +55,7 @@ public class TFascTemplateDetailController {
private final TFascTemplateDetailService tFascTemplateDetailService; private final TFascTemplateDetailService tFascTemplateDetailService;
private final TFascEditLogService tFascEditLogService;
/** /**
* 简单分页查询 * 简单分页查询
...@@ -118,6 +122,9 @@ public class TFascTemplateDetailController { ...@@ -118,6 +122,9 @@ public class TFascTemplateDetailController {
if (Common.isEmpty(tFascTemplateDetail.getId())) { if (Common.isEmpty(tFascTemplateDetail.getId())) {
return R.failed("ID不能为空"); return R.failed("ID不能为空");
} }
if (Common.isEmpty(tFascTemplateDetail.getHrFieldId()) || Common.isEmpty(tFascTemplateDetail.getHrField())) {
return R.failed("皖信字段不能为空");
}
TFascTemplateDetail old = tFascTemplateDetailService.getById(tFascTemplateDetail.getId()); TFascTemplateDetail old = tFascTemplateDetailService.getById(tFascTemplateDetail.getId());
if (old == null) { if (old == null) {
return R.failed("根据ID未找到原信息"); return R.failed("根据ID未找到原信息");
...@@ -125,6 +132,22 @@ public class TFascTemplateDetailController { ...@@ -125,6 +132,22 @@ public class TFascTemplateDetailController {
// 更新映射表 // 更新映射表
tFascTemplateDetailService.updateById(tFascTemplateDetail); tFascTemplateDetailService.updateById(tFascTemplateDetail);
// 改没改合同,都加日志
TFascEditLog tFascEditLog = new TFascEditLog();
tFascEditLog.setMainId(tFascTemplateDetail.getId());
tFascEditLog.setMainType(CommonConstants.TWO_STRING);
String editContent = "“皖信字段”由“";
if (Common.isEmpty(old.getHrField())) {
editContent += "空”";
} else {
editContent += old.getHrField() + "”";
}
editContent += "→“" + tFascTemplateDetail.getHrField() + "”";
if (Common.isEmpty(old.getIsEdit()) || CommonConstants.ZERO_STRING.equals(old.getIsEdit())) {
editContent += ";“是否已配置”由“未配置”→“已配置”";
}
tFascEditLog.setEditContent(editContent);
tFascEditLogService.save(tFascEditLog);
// 重新刷新主模板表的必填是否已填 // 重新刷新主模板表的必填是否已填
tFascTemplateDetailService.initFascTemplateIsMust(old.getSignTemplateId()); tFascTemplateDetailService.initFascTemplateIsMust(old.getSignTemplateId());
return R.ok(); return R.ok();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment