Commit 2a9523b2 authored by hongguangwu's avatar hongguangwu

MVP1.7.16-法大大

parent b5d6e282
......@@ -19,11 +19,14 @@ package com.yifu.cloud.plus.v1.yifu.archives.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.TFascTemplate;
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.TFascTemplateService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TFascTemplateSearchVo;
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.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
......@@ -56,6 +59,8 @@ public class TFascTemplateController {
private final TFascTemplateDetailService tFascTemplateDetailService;
private final TFascEditLogService tFascEditLogService;
/**
* 简单分页查询
......@@ -116,14 +121,22 @@ public class TFascTemplateController {
if (Common.isEmpty(tFascTemplate.getContractType())) {
return R.failed("合同类型不能为空");
}
// 改没改合同,都加日志
TFascEditLog tFascEditLog = new TFascEditLog();
tFascEditLog.setMainId(tFascTemplate.getId());
tFascEditLog.setMainType(CommonConstants.ONE_STRING);
tFascEditLog.setEditContent("“合同类型”由“" + old.getContractType() + "”→“" + tFascTemplate.getContractType() + "”");
tFascEditLogService.save(tFascEditLog);
if (Common.isNotNull(old.getContractType()) && old.getContractType().equals(tFascTemplate.getContractType())) {
return R.failed("合同类型未变更");
tFascTemplateDetailService.initFascTemplateIsMust(old.getSignTemplateId());
return R.ok();
} else {
old.setContractType(tFascTemplate.getContractType());
tFascTemplateService.updateById(old);
// 初始化字段,并重新计算模板的是否已配置
tFascTemplateDetailService.initDetailHrField(old.getSignTemplateId());
return R.ok();
}
old.setContractType(tFascTemplate.getContractType());
tFascTemplateService.updateById(old);
// 初始化字段,并重新计算模板的是否已配置
tFascTemplateDetailService.initDetailHrField(tFascTemplate.getId());
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