Commit 61ced797 by jianan

电子报聘合同的人事姓名,文件名去空格

parent 3c4e2354
...@@ -6,6 +6,7 @@ import com.yd.dal.mapper.customer.*; ...@@ -6,6 +6,7 @@ import com.yd.dal.mapper.customer.*;
import com.yd.dal.mapper.practitioner.PractitionerHiringMapper; import com.yd.dal.mapper.practitioner.PractitionerHiringMapper;
import com.libs.pdf.*; import com.libs.pdf.*;
import com.yd.rmi.ali.oss.service.OssService; import com.yd.rmi.ali.oss.service.OssService;
import com.yd.rmi.cache.SystemConfigService;
import com.yd.util.CommonUtil; import com.yd.util.CommonUtil;
import com.yd.util.HttpUtil; import com.yd.util.HttpUtil;
import com.yd.util.PDFConfiguration; import com.yd.util.PDFConfiguration;
...@@ -34,6 +35,8 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring ...@@ -34,6 +35,8 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
private AclPractitionerHiringApproveRecordsMapper recordsMapper; private AclPractitionerHiringApproveRecordsMapper recordsMapper;
@Autowired @Autowired
private AclPractitionerHiringPersonalStatementsMapper statementsMapper; private AclPractitionerHiringPersonalStatementsMapper statementsMapper;
@Autowired
private SystemConfigService systemConfigService;
/** /**
...@@ -339,7 +342,10 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring ...@@ -339,7 +342,10 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
} }
} }
data.put("secondSubsystemManager", ""); data.put("secondSubsystemManager", "");
data.put("secondCenterHr", "EVEN");
// 获取人事专员姓名
String secondCenterHr = systemConfigService.getSingleConfigValue("Practitioner_Hiring_SecondCenterHr");
data.put("secondCenterHr", secondCenterHr);
} }
......
...@@ -735,7 +735,7 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService ...@@ -735,7 +735,7 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
} }
AclPractitioner practitioner = aclPractitionerMapper.selectByPrimaryKey(practitionerId); AclPractitioner practitioner = aclPractitionerMapper.selectByPrimaryKey(practitionerId);
String practitionerCode = practitioner == null ? null : practitioner.getPractitionerCode(); String practitionerCode = practitioner == null ? null : practitioner.getPractitionerCode().trim();
String practitionerRegNo = practitioner == null ? null : practitioner.getPractitionerRegNo(); String practitionerRegNo = practitioner == null ? null : practitioner.getPractitionerRegNo();
if (StringUtils.isBlank(practitionerRegNo)) { if (StringUtils.isBlank(practitionerRegNo)) {
......
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