Commit 0a28f646 authored by huyuchen's avatar huyuchen

花名册修改

parent 17d89cd9
...@@ -5118,7 +5118,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -5118,7 +5118,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)40,(short)20)). registerWriteHandler(new SimpleRowHeightStyleStrategy((short)40,(short)20)).
build(); build();
writeTable1 = EasyExcel.writerTable(1). writeTable1 = EasyExcel.writerTable(1).
head(headTwo(searchVo.getSocialHouseholdName(),searchVo.getCustomerNo())). head(headTwo(searchVo.getSocialHouseholdName(),searchVo.getUnitCreditCode())).
registerWriteHandler(customCellStyleStrategyOne). registerWriteHandler(customCellStyleStrategyOne).
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)25,(short)20)). registerWriteHandler(new SimpleRowHeightStyleStrategy((short)25,(short)20)).
build(); build();
...@@ -6057,7 +6057,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -6057,7 +6057,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
//第十二列 //第十二列
list.add( Lists.newArrayList("学历","学历")); list.add( Lists.newArrayList("学历","学历"));
//第十三列 //第十三列
list.add( Lists.newArrayList(" 备注"," 备注")); list.add( Lists.newArrayList("备注","备注"));
return list; return list;
} }
......
...@@ -1254,7 +1254,7 @@ ...@@ -1254,7 +1254,7 @@
'' as CHANGE_TYPE_FOUR, '' as CHANGE_TYPE_FOUR,
a.EMP_MOBILE, a.EMP_MOBILE,
a.EDUCATION_NAME, a.EDUCATION_NAME,
a.EMP_MOBILE as REMARK '' as REMARK
FROM t_dispatch_info a FROM t_dispatch_info a
left join t_social_info s on s.id=a.SOCIAL_ID left join t_social_info s on s.id=a.SOCIAL_ID
<where> <where>
...@@ -1292,7 +1292,7 @@ ...@@ -1292,7 +1292,7 @@
'' as CHANGE_TYPE_FOUR, '' as CHANGE_TYPE_FOUR,
a.EMP_MOBILE, a.EMP_MOBILE,
a.EDUCATION_NAME, a.EDUCATION_NAME,
a.EMP_MOBILE as REMARK '' as REMARK
FROM t_dispatch_info a FROM t_dispatch_info a
left join t_social_info s on s.id=a.SOCIAL_ID left join t_social_info s on s.id=a.SOCIAL_ID
<where> <where>
......
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