Commit e4e1175f authored by fangxinjiang's avatar fangxinjiang

代码优化-fxj

parent c7a21362
...@@ -53,6 +53,7 @@ import lombok.RequiredArgsConstructor; ...@@ -53,6 +53,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
...@@ -287,21 +288,19 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon ...@@ -287,21 +288,19 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
TEmployeeContractPreNew pre = new TEmployeeContractPreNew(); TEmployeeContractPreNew pre = new TEmployeeContractPreNew();
BeanCopyUtils.copyProperties(preVo,pre); BeanCopyUtils.copyProperties(preVo,pre);
pre.setProcessStatus(CommonConstants.ONE_STRING); pre.setProcessStatus(CommonConstants.ONE_STRING);
if (null != alert){ pre.setCustomerUsername(alert.getCsName());
pre.setCustomerUsername(alert.getCsName()); pre.setCustomerUserLoginname(alert.getCsLoginName());
pre.setCustomerUserLoginname(alert.getCsLoginName()); pre.setDeptName(alert.getProject());
pre.setDeptName(alert.getProject()); pre.setDeptNo(alert.getProjectNo());
pre.setDeptNo(alert.getProjectNo()); pre.setEmployeeName(alert.getEmpName());
pre.setEmployeeName(alert.getEmpName()); pre.setEmpIdcard(alert.getEmpIdcard());
pre.setEmpIdcard(alert.getEmpIdcard()); pre.setDeptId(alert.getDeptId());
pre.setDeptId(alert.getDeptId()); pre.setEmpPhone(alert.getEmpPhone());
pre.setEmpPhone(alert.getEmpPhone()); pre.setEmployeeNature(alert.getEmpType());
pre.setEmployeeNature(alert.getEmpType()); pre.setPosition(alert.getPost());
pre.setPosition(alert.getPost()); pre.setIsUrg(CommonConstants.ZERO_STRING);
pre.setIsUrg(CommonConstants.ZERO_STRING); pre.setOverFlag(CommonConstants.ONE_STRING);
pre.setOverFlag(CommonConstants.ONE_STRING); pre.setSignFlag(CommonConstants.ONE_STRING);
pre.setSignFlag(CommonConstants.ONE_STRING);
}
String errorInfo = initDateInfo(pre,contract); String errorInfo = initDateInfo(pre,contract);
if (null != errorInfo){ if (null != errorInfo){
return R.failed(errorInfo); return R.failed(errorInfo);
...@@ -378,7 +377,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon ...@@ -378,7 +377,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
preVoTemp= new TEmployeeContractPreNewVo(); preVoTemp= new TEmployeeContractPreNewVo();
BeanCopyUtils.copyProperties(preVo,preVoTemp); BeanCopyUtils.copyProperties(preVo,preVoTemp);
alert = alertMap.get(contract.getId()); alert = alertMap.get(contract.getId());
temp = confirmMap.get(contract.getId()); temp = null==confirmMap?null:confirmMap.get(contract.getId());
checkVo = check(preMap, scheme, rule, alert, preVoTemp, contract); checkVo = check(preMap, scheme, rule, alert, preVoTemp, contract);
if (null != checkVo){ if (null != checkVo){
if (null != temp ) { if (null != temp ) {
......
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