Commit ae9134e1 authored by huyuchen's avatar huyuchen

fdd 代码修改

parent 4f4298c5
...@@ -82,7 +82,7 @@ public class FddContractAttachInfo extends BaseEntity { ...@@ -82,7 +82,7 @@ public class FddContractAttachInfo extends BaseEntity {
* 合同到期时间 * 合同到期时间
*/ */
@Schema(description ="合同到期时间") @Schema(description ="合同到期时间")
@ExcelAttribute(name = "合同到期时间",needExport = true) @ExcelAttribute(name = "合同到期时间", isNotEmpty = true, errorInfo = "合同到期时间不能为空")
private Date contractEnd; private Date contractEnd;
/** /**
...@@ -125,8 +125,8 @@ public class FddContractAttachInfo extends BaseEntity { ...@@ -125,8 +125,8 @@ public class FddContractAttachInfo extends BaseEntity {
* 岗位 * 岗位
*/ */
@Schema(description ="岗位") @Schema(description ="岗位")
@Length(max = 200, message = "岗位不能超过200个字符") @Length(max = 20, message = "岗位不能超过20个字符")
@ExcelAttribute(name = "岗位", isNotEmpty = true, errorInfo = "岗位不能为空", maxLength = 200, needExport = true) @ExcelAttribute(name = "岗位", isNotEmpty = true, errorInfo = "岗位不能为空", maxLength = 20, needExport = true)
private String post; private String post;
/** /**
...@@ -151,13 +151,14 @@ public class FddContractAttachInfo extends BaseEntity { ...@@ -151,13 +151,14 @@ public class FddContractAttachInfo extends BaseEntity {
* 法大大模板id * 法大大模板id
*/ */
@Schema(description ="法大大模板id") @Schema(description ="法大大模板id")
private String fddTemplateId; @ExcelAttribute(name = "法大大模板id")
private String fddTemplateId;
/** /**
* 员工姓名 * 员工姓名
*/ */
@Schema(description ="员工姓名") @Schema(description ="员工姓名")
@ExcelAttribute(name = "员工姓名", isNotEmpty = true, errorInfo = "员工合同id姓名不能为空", maxLength = 32, needExport = true) @ExcelAttribute(name = "员工姓名", isNotEmpty = true, errorInfo = "员工姓名不能为空", maxLength = 32, needExport = true)
private String empName; private String empName;
/** /**
...@@ -171,7 +172,8 @@ public class FddContractAttachInfo extends BaseEntity { ...@@ -171,7 +172,8 @@ public class FddContractAttachInfo extends BaseEntity {
* 手机号码 * 手机号码
*/ */
@Schema(description ="手机号码") @Schema(description ="手机号码")
private String empPhone; @ExcelAttribute(name = "手机号码", isNotEmpty = true, errorInfo = "手机号码不能为空", maxLength = 32, needExport = true)
private String empPhone;
/** /**
* 结算主体编码 * 结算主体编码
...@@ -184,7 +186,7 @@ public class FddContractAttachInfo extends BaseEntity { ...@@ -184,7 +186,7 @@ public class FddContractAttachInfo extends BaseEntity {
* 员工类型 * 员工类型
*/ */
@Schema(description ="员工类型") @Schema(description ="员工类型")
@ExcelAttribute(name = "员工类型", isDataId = true, errorInfo = "员工类型不能为空", maxLength = 20) @ExcelAttribute(name = "员工类型", isNotEmpty = true, errorInfo = "员工类型不能为空", isDataId = true, dataType = "emp_natrue",maxLength = 20, needExport = true)
private String empNatrue; private String empNatrue;
/** /**
......
...@@ -33,9 +33,9 @@ import lombok.EqualsAndHashCode; ...@@ -33,9 +33,9 @@ import lombok.EqualsAndHashCode;
*/ */
@Data @Data
@TableName("fdd_template_field_info") @TableName("fdd_template_field_info")
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode()
@Schema(description = "法大大字段对应信息表") @Schema(description = "法大大字段对应信息表")
public class FddTemplateFieldInfo extends BaseEntity { public class FddTemplateFieldInfo {
/** /**
* ID * ID
......
...@@ -22,13 +22,10 @@ import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysDictItem; ...@@ -22,13 +22,10 @@ import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysDictItem;
import com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeConstants; import com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeConstants;
import com.yifu.cloud.plus.v1.yifu.archives.entity.FddContractAttachInfo; import com.yifu.cloud.plus.v1.yifu.archives.entity.FddContractAttachInfo;
import com.yifu.cloud.plus.v1.yifu.archives.service.FddContractAttachInfoService; import com.yifu.cloud.plus.v1.yifu.archives.service.FddContractAttachInfoService;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants; import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ExcelUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprUpmsProperties; import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprUpmsProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog; import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
...@@ -41,9 +38,7 @@ import org.springframework.http.HttpHeaders; ...@@ -41,9 +38,7 @@ import org.springframework.http.HttpHeaders;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.util.HashMap; import java.util.*;
import java.util.List;
import java.util.Map;
/** /**
...@@ -143,21 +138,35 @@ public class FddContractAttachInfoController { ...@@ -143,21 +138,35 @@ public class FddContractAttachInfoController {
ExcelUtil<FddContractAttachInfo> util1 = null; ExcelUtil<FddContractAttachInfo> util1 = null;
try { try {
// // 调用字典服务,渲染字典值 // 渲染字典值
// res = HttpDaprUtil.invokeMethodPost(daprUpmsProperties.getAppUrl(), daprUpmsProperties.getAppId() Map<String, String> dicMap = new HashMap<>();
// , "/dict/inner/getDictList", null, Map.class, SecurityConstants.FROM_IN); Map<String,String> dicObj = (Map<String, String>) RedisUtil.redis.opsForValue()
// .get(CacheConstants.DICT_DETAILS
// Map<String, String> dicMap = new HashMap<>(); + CommonConstants.COLON_STRING
// if (null != res.getData().get("data")) { + "emp_natrue");
// for (SysDictItem dict : res.getData().get("data")) { if (Common.isNotNull(dicObj)) {
// dicMap.put(dict.getType() + CommonConstants.DOWN_LINE_STRING + dict.getLabel(), dict.getValue()); for (Map.Entry<String, String> entry : dicObj.entrySet()) {
// } String key = entry.getKey();
// } String Label = entry.getValue();
dicMap.put("emp_natrue" + CommonConstants.DOWN_LINE_STRING + Label, key);
}
}
Map<String,String> dicObj1 = (Map<String, String>) RedisUtil.redis.opsForValue()
.get(CacheConstants.DICT_DETAILS
+ CommonConstants.COLON_STRING
+ "salary_type");
if (Common.isNotNull(dicObj1)) {
for (Map.Entry<String, String> entry : dicObj1.entrySet()) {
String key1 = entry.getKey();
String Label1 = entry.getValue();
dicMap.put("salary_type" + CommonConstants.DOWN_LINE_STRING + Label1, key1);
}
}
jsonString = URLDecoder.decode(jsonString, CommonConstants.UTF8).replace("=", ""); jsonString = URLDecoder.decode(jsonString, CommonConstants.UTF8).replace("=", "");
util1 = new ExcelUtil<>(FddContractAttachInfo.class); util1 = new ExcelUtil<>(FddContractAttachInfo.class);
//传参字典数据MAP具体见方法实现 //传参字典数据MAP具体见方法实现
util1.getJsonStringToList(jsonString, null); util1.getJsonStringToList(jsonString, dicMap);
if (null != util1.getErrorInfo() && !util1.getErrorInfo().isEmpty()) { if (null != util1.getErrorInfo() && !util1.getErrorInfo().isEmpty()) {
return R.failed(util1.getErrorInfo(),"数据异常"); return R.failed(util1.getErrorInfo(),"数据异常");
} else { } else {
...@@ -165,7 +174,7 @@ public class FddContractAttachInfoController { ...@@ -165,7 +174,7 @@ public class FddContractAttachInfoController {
List<ErrorMessage> errorInfo = fddContractAttachInfoService.batchAdd(util1.getEntityList()); List<ErrorMessage> errorInfo = fddContractAttachInfoService.batchAdd(util1.getEntityList());
Map<String,Object> variableMap = new HashMap<>(); Map<String,Object> variableMap = new HashMap<>();
Map<Integer,Object> map = new HashMap<>(); Map<Integer,Object> map = new HashMap<>();
boolean allExitContract = errorInfo.stream().allMatch(e-> e.getMessage().equals("存在“在用”的合同")); boolean allExitContract = errorInfo.stream().allMatch(e-> checkInfo(e));
if (allExitContract) { if (allExitContract) {
variableMap.put("allMatch","true"); variableMap.put("allMatch","true");
for (ErrorMessage errorMessage :errorInfo){ for (ErrorMessage errorMessage :errorInfo){
...@@ -202,14 +211,28 @@ public class FddContractAttachInfoController { ...@@ -202,14 +211,28 @@ public class FddContractAttachInfoController {
ExcelUtil<FddContractAttachInfo> util1 = null; ExcelUtil<FddContractAttachInfo> util1 = null;
try { try {
// 调用字典服务,渲染字典值 // 渲染字典值
res = HttpDaprUtil.invokeMethodPost(daprUpmsProperties.getAppUrl(), daprUpmsProperties.getAppId()
, "/dict/inner/getDictList", null, Map.class, SecurityConstants.FROM_IN);
Map<String, String> dicMap = new HashMap<>(); Map<String, String> dicMap = new HashMap<>();
if (null != res.getData()) { Map<String,String> dicObj = (Map<String, String>) RedisUtil.redis.opsForValue()
for (SysDictItem dict : res.getData()) { .get(CacheConstants.DICT_DETAILS
dicMap.put(dict.getType() + CommonConstants.DOWN_LINE_STRING + dict.getLabel(), dict.getValue()); + CommonConstants.COLON_STRING
+ "emp_natrue");
if (Common.isNotNull(dicObj)) {
for (Map.Entry<String, String> entry : dicObj.entrySet()) {
String key = entry.getKey();
String Label = entry.getValue();
dicMap.put("emp_natrue" + CommonConstants.DOWN_LINE_STRING + Label, key);
}
}
Map<String,String> dicObj1 = (Map<String, String>) RedisUtil.redis.opsForValue()
.get(CacheConstants.DICT_DETAILS
+ CommonConstants.COLON_STRING
+ "salary_type");
if (Common.isNotNull(dicObj1)) {
for (Map.Entry<String, String> entry : dicObj1.entrySet()) {
String key1 = entry.getKey();
String Label1 = entry.getValue();
dicMap.put("salary_type" + CommonConstants.DOWN_LINE_STRING + Label1, key1);
} }
} }
...@@ -250,4 +273,9 @@ public class FddContractAttachInfoController { ...@@ -250,4 +273,9 @@ public class FddContractAttachInfoController {
List<ErrorMessage> errorInfo = fddContractAttachInfoService.sendTask(entityList); List<ErrorMessage> errorInfo = fddContractAttachInfoService.sendTask(entityList);
return R.ok(errorInfo); return R.ok(errorInfo);
} }
public boolean checkInfo(ErrorMessage errorMessage) {
Set<String> set = errorMessage.getErrors();
return set.stream().allMatch(e-> e.equals("存在“在用”的合同"));
}
} }
...@@ -136,7 +136,8 @@ public class FddContractInfoController { ...@@ -136,7 +136,8 @@ public class FddContractInfoController {
@PostMapping("/send") @PostMapping("/send")
public R<String> send(FddContractInfo fddContractInfo) throws ApiException { public R<String> send(FddContractInfo fddContractInfo) throws ApiException {
FddContractAttachInfo fddContractAttachInfo = fddContractAttachInfoService.getById(fddContractInfo.getId()); FddContractAttachInfo fddContractAttachInfo = fddContractAttachInfoService.getById(fddContractInfo.getId());
return fddContractInfoService.saveEmpContract(fddContractAttachInfo); YifuUser user = SecurityUtils.getUser();
return fddContractInfoService.saveEmpContract(fddContractAttachInfo,user);
} }
/** /**
......
...@@ -12,6 +12,8 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; ...@@ -12,6 +12,8 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.exception.CheckedException; import com.yifu.cloud.plus.v1.yifu.common.core.exception.CheckedException;
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.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -83,7 +85,7 @@ public class FddController { ...@@ -83,7 +85,7 @@ public class FddController {
fddPersonAccountService.updateById(fddPersonAccount); fddPersonAccountService.updateById(fddPersonAccount);
} }
} }
return R.ok(null,"成功"); return R.ok(null,"success");
} }
/** /**
...@@ -127,7 +129,7 @@ public class FddController { ...@@ -127,7 +129,7 @@ public class FddController {
fddPersonAccount.setCompanyInfoId(companyInfo.getId()); fddPersonAccount.setCompanyInfoId(companyInfo.getId());
} }
fddPersonAccountService.updateById(fddPersonAccount); fddPersonAccountService.updateById(fddPersonAccount);
return R.ok(null,"成功"); return R.ok(null,"success");
} }
} }
} }
...@@ -157,6 +159,7 @@ public class FddController { ...@@ -157,6 +159,7 @@ public class FddController {
if (StringUtils.equals(CommonConstants.TWO_STRING, jsonObject.getString("status"))) { if (StringUtils.equals(CommonConstants.TWO_STRING, jsonObject.getString("status"))) {
//成功 //成功
FddPersonAccount entity = fddPersonAccountService.getById(clientId); FddPersonAccount entity = fddPersonAccountService.getById(clientId);
YifuUser user = SecurityUtils.getUser();
if (entity != null) { if (entity != null) {
entity.setRealStatus(CommonConstants.ONE_STRING); entity.setRealStatus(CommonConstants.ONE_STRING);
entity.setUnionid(unionId); entity.setUnionid(unionId);
...@@ -172,7 +175,7 @@ public class FddController { ...@@ -172,7 +175,7 @@ public class FddController {
return; return;
} }
FddContractAttachInfo fddContractAttachInfo = attachInfos.get(CommonConstants.ZERO_INT); FddContractAttachInfo fddContractAttachInfo = attachInfos.get(CommonConstants.ZERO_INT);
R<String> returnR = fddContractInfoService.saveEmpContract(fddContractAttachInfo); R<String> returnR = fddContractInfoService.saveEmpContract(fddContractAttachInfo,user);
if (returnR != null) { if (returnR != null) {
//记录返回信息 //记录返回信息
if(returnR.getCode()== CommonConstants.SUCCESS){ if(returnR.getCode()== CommonConstants.SUCCESS){
...@@ -186,7 +189,7 @@ public class FddController { ...@@ -186,7 +189,7 @@ public class FddController {
} }
}); });
} }
return R.ok(null,"成功"); return R.ok(null,"success");
} }
} }
} else if (StringUtils.equals(fddEvent, "reviseTask")) { } else if (StringUtils.equals(fddEvent, "reviseTask")) {
...@@ -218,7 +221,7 @@ public class FddController { ...@@ -218,7 +221,7 @@ public class FddController {
e.printStackTrace(); e.printStackTrace();
} }
}); });
return R.ok(null,"成功"); return R.ok(null,"success");
} }
} }
} else if (StringUtils.equals(fddEvent, "sign")) { } else if (StringUtils.equals(fddEvent, "sign")) {
...@@ -260,7 +263,7 @@ public class FddController { ...@@ -260,7 +263,7 @@ public class FddController {
employeeContractInfoService.updateById(ec); employeeContractInfoService.updateById(ec);
} }
} }
return R.ok(null,"成功"); return R.ok(null,"success");
}else if (StringUtils.equals(fddEvent, "notifyUrlVerify")) { }else if (StringUtils.equals(fddEvent, "notifyUrlVerify")) {
return R.ok(null,"success"); return R.ok(null,"success");
} }
......
...@@ -23,6 +23,7 @@ import com.fadada.api.exception.ApiException; ...@@ -23,6 +23,7 @@ import com.fadada.api.exception.ApiException;
import com.yifu.cloud.plus.v1.yifu.archives.entity.FddContractAttachInfo; import com.yifu.cloud.plus.v1.yifu.archives.entity.FddContractAttachInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.FddContractInfo; import com.yifu.cloud.plus.v1.yifu.archives.entity.FddContractInfo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
...@@ -44,7 +45,7 @@ public interface FddContractInfoService extends IService<FddContractInfo> { ...@@ -44,7 +45,7 @@ public interface FddContractInfoService extends IService<FddContractInfo> {
* @Date: 2022/6/30 * @Date: 2022/6/30
* @return R * @return R
*/ */
R<String> saveEmpContract(FddContractAttachInfo fddContractInfo) throws ApiException; R<String> saveEmpContract(FddContractAttachInfo fddContractInfo, YifuUser user) throws ApiException;
/** /**
* 作废重签 * 作废重签
......
...@@ -69,7 +69,9 @@ import org.springframework.stereotype.Service; ...@@ -69,7 +69,9 @@ import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.BufferedOutputStream; import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.ZoneId; import java.time.ZoneId;
...@@ -107,27 +109,18 @@ public class FddContractInfoServiceImpl extends ServiceImpl<FddContractInfoMappe ...@@ -107,27 +109,18 @@ public class FddContractInfoServiceImpl extends ServiceImpl<FddContractInfoMappe
private FddSealPersonAuthService fddSealPersonAuthService; private FddSealPersonAuthService fddSealPersonAuthService;
@Autowired @Autowired
private FddContractAttachInfoMapper fddContractAttachInfoMapper; private FddContractAttachInfoMapper fddContractAttachInfoMapper;
// @Autowired @Autowired
// private TEmployeeContractInfoService employeeContractInfoService; private TEmployeeContractInfoService employeeContractInfoService;
// @Autowired
// private TEmployeeInfoService employeeInfoService;
@Autowired @Autowired
private FddTemplateFieldInfoService fieldInfoService; private FddTemplateFieldInfoService fieldInfoService;
// 阿里云文件上传服务 // 阿里云文件上传服务
@Autowired @Autowired
private OSSUtil ossUtil; private OSSUtil ossUtil;
// // 附件表
// @Autowired
// private TEmpAttaService empAttaService;
// // 附件-合同,关联表
// @Autowired
// private MEmpContractAttaService mempContractAttaService;
@Autowired @Autowired
private TSettleDomainService tSettleDomainService; private TSettleDomainService tSettleDomainService;
@Override @Override
public R<String> saveEmpContract(FddContractAttachInfo fddContractAttachInfo) throws ApiException { public R<String> saveEmpContract(FddContractAttachInfo fddContractAttachInfo,YifuUser user) throws ApiException {
YifuUser user = SecurityUtils.getUser();
if (!user.getId().equals(fddContractAttachInfo.getCreateBy())) { if (!user.getId().equals(fddContractAttachInfo.getCreateBy())) {
return R.failed("当前用户不是电子合同导入用户,不能操作"); return R.failed("当前用户不是电子合同导入用户,不能操作");
} }
...@@ -560,50 +553,50 @@ public class FddContractInfoServiceImpl extends ServiceImpl<FddContractInfoMappe ...@@ -560,50 +553,50 @@ public class FddContractInfoServiceImpl extends ServiceImpl<FddContractInfoMappe
**/ **/
@Override @Override
public R<String> moveFileToEmpConcat(FddContractInfo fddContractInfo, HttpServletResponse response) throws ApiException, IOException { public R<String> moveFileToEmpConcat(FddContractInfo fddContractInfo, HttpServletResponse response) throws ApiException, IOException {
// FddContractInfo entity = this.getById(fddContractInfo.getId()); FddContractInfo entity = this.getById(fddContractInfo.getId());
// if (entity == null || entity.getSignTaskId() == null) { if (entity == null || entity.getSignTaskId() == null) {
// throw new CheckedException("未获取到对应签署任务"); throw new CheckedException("未获取到对应签署任务");
// } }
// TEmployeeContractInfo employeeContractInfo = employeeContractInfoService.getById(entity.getContractId()); TEmployeeContractInfo employeeContractInfo = employeeContractInfoService.getById(entity.getContractId());
// if (employeeContractInfo != null) { if (employeeContractInfo != null) {
// //发送请求 //发送请求
// GetBySignFileIdReq req = new GetBySignFileIdReq(); GetBySignFileIdReq req = new GetBySignFileIdReq();
// req.setToken(fddUtil.getToken()); req.setToken(fddUtil.getToken());
// req.setTaskId(entity.getSignTaskId()); req.setTaskId(entity.getSignTaskId());
// DocumentClient client = new DocumentClient(fddUtil.getFadadaApiClient()); DocumentClient client = new DocumentClient(fddUtil.getFadadaApiClient());
// BaseRsp<DownLoadFileRsp> rsp = client.getBySignFileId(req); BaseRsp<DownLoadFileRsp> rsp = client.getBySignFileId(req);
// //校验参数 //校验参数
// if (StringUtils.equals(rsp.getCode(), FddUtil.SUCCESS)) { if (StringUtils.equals(rsp.getCode(), FddUtil.SUCCESS)) {
// DownLoadFileRsp rspData = rsp.getData(); DownLoadFileRsp rspData = rsp.getData();
// if (rspData != null) { if (rspData != null) {
// InputStream bis = null; InputStream bis = null;
// try { try {
// bis = new ByteArrayInputStream(rspData.getFileBytes()); bis = new ByteArrayInputStream(rspData.getFileBytes());
// String name = System.currentTimeMillis() + "法大大电子签附件"; String name = System.currentTimeMillis() + "法大大电子签附件";
// String key = name + ".zip"; String key = name + ".zip";
// ossUtil.uploadFileByStream(bis, key, null); ossUtil.uploadFileByStream(bis, key, null);
// // 1:保存为 // 1:保存为
//// TEmpAtta empAtta = BasicServiceUtil.initTEmpAttaForInsert(name, key, (long) rspData.getFileBytes().length); // TEmpAtta empAtta = BasicServiceUtil.initTEmpAttaForInsert(name, key, (long) rspData.getFileBytes().length);
//// empAttaService.save(empAtta); // empAttaService.save(empAtta);
//// MEmpContractAtta contractAtta = new MEmpContractAtta(); // MEmpContractAtta contractAtta = new MEmpContractAtta();
//// contractAtta.setAttaId(empAtta.getId()); // contractAtta.setAttaId(empAtta.getId());
//// contractAtta.setContractId(employeeContractInfo.getId()); // contractAtta.setContractId(employeeContractInfo.getId());
//// mempContractAttaService.save(contractAtta); // mempContractAttaService.save(contractAtta);
// FddContractAttachInfo fddContractAttachInfo = fddContractAttachInfoService.getOne(Wrappers.<FddContractAttachInfo>query().lambda() FddContractAttachInfo fddContractAttachInfo = fddContractAttachInfoMapper.selectOne(Wrappers.<FddContractAttachInfo>query().lambda()
// .eq(FddContractAttachInfo::getContractId,entity.getContractId()).last(CommonConstants.LAST_ONE_SQL)); .eq(FddContractAttachInfo::getContractId,entity.getContractId()).last(CommonConstants.LAST_ONE_SQL));
// if (fddContractAttachInfo != null) { if (fddContractAttachInfo != null) {
// fddContractAttachInfo.setIsMove(CommonConstants.ONE_INT); fddContractAttachInfo.setIsMove(CommonConstants.ONE_INT);
// fddContractAttachInfoService.updateById(fddContractAttachInfo); fddContractAttachInfoMapper.updateById(fddContractAttachInfo);
// } }
// return R.ok(); return R.ok();
// } finally { } finally {
// if (bis != null) { if (bis != null) {
// bis.close(); bis.close();
// } }
// } }
// } }
// } }
// } }
return R.failed("转移失败"); return R.failed("转移失败");
} }
...@@ -878,6 +871,7 @@ public class FddContractInfoServiceImpl extends ServiceImpl<FddContractInfoMappe ...@@ -878,6 +871,7 @@ public class FddContractInfoServiceImpl extends ServiceImpl<FddContractInfoMappe
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.String> * @return: com.yifu.cloud.v1.common.core.util.R<java.lang.String>
**/ **/
private R<String> cancleReviSeTask(FddContractInfo entity) throws ApiException { private R<String> cancleReviSeTask(FddContractInfo entity) throws ApiException {
YifuUser user = SecurityUtils.getUser();
//定稿任务状态:0 待发起 、1定稿中、2已定稿、3已撤销、4已过期 //定稿任务状态:0 待发起 、1定稿中、2已定稿、3已撤销、4已过期
R<Integer> reviseTaskDetailR = reviseTaskDetail(entity); R<Integer> reviseTaskDetailR = reviseTaskDetail(entity);
if (reviseTaskDetailR.getCode() != CommonConstants.SUCCESS) { if (reviseTaskDetailR.getCode() != CommonConstants.SUCCESS) {
...@@ -897,9 +891,7 @@ public class FddContractInfoServiceImpl extends ServiceImpl<FddContractInfoMappe ...@@ -897,9 +891,7 @@ public class FddContractInfoServiceImpl extends ServiceImpl<FddContractInfoMappe
//.先复制一份合同、然后删除之前合同 //.先复制一份合同、然后删除之前合同
entity.setDeleteFlag(CommonConstants.ONE_STRING); entity.setDeleteFlag(CommonConstants.ONE_STRING);
this.updateById(entity); this.updateById(entity);
// TEmployeeContractInfo employeeContractInfo = employeeContractInfoService.getById(entity.getContractId()); R<String> saveEmpContractR = saveEmpContract(attachInfo,user);
// TEmployeeInfo employeeInfo = employeeInfoService.getById(employeeContractInfo.getEmpId());
R<String> saveEmpContractR = saveEmpContract(attachInfo);
if (saveEmpContractR.getCode() != CommonConstants.SUCCESS) { if (saveEmpContractR.getCode() != CommonConstants.SUCCESS) {
throw new CheckedException(saveEmpContractR.getMsg()); throw new CheckedException(saveEmpContractR.getMsg());
} }
......
...@@ -3,6 +3,8 @@ package com.yifu.cloud.plus.v1.yifu.common.core.util; ...@@ -3,6 +3,8 @@ package com.yifu.cloud.plus.v1.yifu.common.core.util;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
/** /**
* @author fang * @author fang
...@@ -16,6 +18,8 @@ public class ErrorMessage implements Serializable { ...@@ -16,6 +18,8 @@ public class ErrorMessage implements Serializable {
//默认红色 success green //默认红色 success green
private String color = "red"; private String color = "red";
private Set<String> errors = new HashSet();
/** /**
* @param 用于展示勾选的名称 * @param 用于展示勾选的名称
* @Author: wangan * @Author: wangan
...@@ -42,4 +46,9 @@ public class ErrorMessage implements Serializable { ...@@ -42,4 +46,9 @@ public class ErrorMessage implements Serializable {
this.message = message; this.message = message;
this.name= name; this.name= name;
} }
public ErrorMessage(Integer lineNum, Set<String> errors) {
this.lineNum = lineNum;
this.errors = errors;
}
} }
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