Commit e7c6d91b authored by hongguangwu's avatar hongguangwu

Merge branch 'MVP1.7.8' into develop

parents 1268d7ee 0efa9b10
...@@ -211,4 +211,7 @@ public class DispatchEmpVo implements Serializable { ...@@ -211,4 +211,7 @@ public class DispatchEmpVo implements Serializable {
@ExcelProperty(value ="试用期") @ExcelProperty(value ="试用期")
private String tryPeriod; private String tryPeriod;
@ExcelProperty(value ="学校")
private String school;
} }
...@@ -198,6 +198,7 @@ ...@@ -198,6 +198,7 @@
<result property="post" column="POST"/> <result property="post" column="POST"/>
<result property="empNo" column="EMP_NO"/> <result property="empNo" column="EMP_NO"/>
<result property="tryPeriod" column="TRY_PERIOD"/> <result property="tryPeriod" column="TRY_PERIOD"/>
<result property="school" column="school"/>
</resultMap> </resultMap>
<sql id="baseParam"> <sql id="baseParam">
...@@ -970,9 +971,11 @@ ...@@ -970,9 +971,11 @@
c.UNIT_NAME, c.UNIT_NAME,
c.UNIT_NO,c.DEPT_ID,c.DEPT_NAME,c.DEPT_NO,c.POST,c.EMP_NO,c.PROJECT_STATUS,c.EMP_NATRUE,c.TRY_PERIOD c.UNIT_NO,c.DEPT_ID,c.DEPT_NAME,c.DEPT_NO,c.POST,c.EMP_NO,c.PROJECT_STATUS,c.EMP_NATRUE,c.TRY_PERIOD
,a.SCHOOL
from ( from (
select e.ID,e.EMP_CODE,e.EMP_NAME,e.EMP_IDCARD,e.EMP_NATIONAL,e.EMP_PHONE,e.ID_PROVINCE,e.ID_CITY, select e.ID,e.EMP_CODE,e.EMP_NAME,e.EMP_IDCARD,e.EMP_NATIONAL,e.EMP_PHONE,e.ID_PROVINCE,e.ID_CITY,
e.ID_TOWN,e.EMP_REGIS_TYPE,e.FILE_PROVINCE,e.FILE_CITY,e.FILE_TOWN,e.HIGN_EDUCATION,e.FILE_STATUS,e.CONTACT_ADDRESS e.ID_TOWN,e.EMP_REGIS_TYPE,e.FILE_PROVINCE,e.FILE_CITY,e.FILE_TOWN,e.HIGN_EDUCATION,e.FILE_STATUS,e.CONTACT_ADDRESS
,e.SCHOOL
from t_employee_info e from t_employee_info e
where 1=1 and e.DELETE_FLAG = '0' where 1=1 and e.DELETE_FLAG = '0'
<if test="checkVo != null"> <if test="checkVo != null">
......
...@@ -1402,6 +1402,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1402,6 +1402,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dispatch.setIdCardCity(Common.isNotNullToStr(empVo.getIdCity())); dispatch.setIdCardCity(Common.isNotNullToStr(empVo.getIdCity()));
dispatch.setIdCardTown(Common.isNotNullToStr(empVo.getIdTown())); dispatch.setIdCardTown(Common.isNotNullToStr(empVo.getIdTown()));
} }
if (Common.isEmpty(dispatch.getSchoolName())) {
dispatch.setSchoolName(empVo.getSchool());
}
} }
// 生成申请编码 // 生成申请编码
......
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