Commit d2f0aa66 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.9' into MVP1.7.9

parents ee6af74a 9497ec78
...@@ -507,10 +507,13 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -507,10 +507,13 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
preVo.setEmployeeName(employeeRegistrationPre.getEmployeeName()); preVo.setEmployeeName(employeeRegistrationPre.getEmployeeName());
preVo.setEmpIdcard(employeeRegistrationPre.getEmpIdcard()); preVo.setEmpIdcard(employeeRegistrationPre.getEmpIdcard());
preVo.setBuyStandard(insurancePreVo.getBuyStandard()); preVo.setBuyStandard(insurancePreVo.getBuyStandard());
preVo.setBuyType(insurancePreVo.getBuyType());
preVo.setDeptNo(insurancePreVo.getDeptNo());
preVo.setInsuranceTypeName(insurancePreVo.getInsuranceTypeName()); preVo.setInsuranceTypeName(insurancePreVo.getInsuranceTypeName());
preVo.setInsuranceCompanyName(insurancePreVo.getInsuranceCompanyName()); preVo.setInsuranceCompanyName(insurancePreVo.getInsuranceCompanyName());
preVo.setPolicyStart(insurancePreVo.getPolicyStart()); preVo.setPolicyStart(insurancePreVo.getPolicyStart());
preVo.setPolicyEnd(insurancePreVo.getPolicyEnd()); preVo.setPolicyEnd(insurancePreVo.getPolicyEnd());
preVo.setProcessStatus(insurancePreVo.getProcessStatus());
checkVo = checkInsuranceExit(preVo); checkVo = checkInsuranceExit(preVo);
if (null != checkVo) { if (null != checkVo) {
errorList.add(checkVo); errorList.add(checkVo);
......
...@@ -80,5 +80,6 @@ ...@@ -80,5 +80,6 @@
1=1 1=1
<include refid="tEmployeePreLog_where"/> <include refid="tEmployeePreLog_where"/>
</where> </where>
order by a.CREATE_TIME desc
</select> </select>
</mapper> </mapper>
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