Commit 08aa7e94 authored by huyuchen's avatar huyuchen

花名册修改

parent 3d0ab125
...@@ -5097,7 +5097,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -5097,7 +5097,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
response.setContentType(CommonConstants.MULTIPART_FORM_DATA); response.setContentType(CommonConstants.MULTIPART_FORM_DATA);
response.setHeader(CommonConstants.CONTENT_DISPOSITION, CommonConstants.ATTACHMENT_FILENAME + URLEncoder.encode(fileName, CommonConstants.UTF8)); response.setHeader(CommonConstants.CONTENT_DISPOSITION, CommonConstants.ATTACHMENT_FILENAME + URLEncoder.encode(fileName, CommonConstants.UTF8));
// 这里 需要指定写用哪个class去写,然后写到第一个sheet,然后文件流会自动关闭 // 这里 需要指定写用哪个class去写,然后写到第一个sheet,然后文件流会自动关闭
ExcelWriter excelWriter = EasyExcel.write(out, TDispatchSocialExportVo.class).includeColumnFieldNames(searchVo.getExportFields()).build(); ExcelWriter excelWriter = EasyExcel.write(out).build();
WriteSheet writeSheet; WriteSheet writeSheet;
WriteTable writeTable0; WriteTable writeTable0;
WriteTable writeTable1; WriteTable writeTable1;
...@@ -5117,7 +5117,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -5117,7 +5117,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
list.add(vo); list.add(vo);
} }
} }
writeSheet = EasyExcel.writerSheet("增员").needHead(Boolean.FALSE).build(); writeSheet = EasyExcel.writerSheet("增员").build();
writeTable0 = EasyExcel.writerTable(0).head(head(searchVo.getSocialHouseholdName(),searchVo.getCustomerNo())).build(); writeTable0 = EasyExcel.writerTable(0).head(head(searchVo.getSocialHouseholdName(),searchVo.getCustomerNo())).build();
writeTable1 = EasyExcel.writerTable(1).head(head1()).build(); writeTable1 = EasyExcel.writerTable(1).head(head1()).build();
// 第一次写入会创建头 // 第一次写入会创建头
...@@ -5144,7 +5144,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -5144,7 +5144,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
list.add(vo); list.add(vo);
} }
} }
writeSheet = EasyExcel.writerSheet("减员").needHead(Boolean.FALSE).build(); writeSheet = EasyExcel.writerSheet("减员").build();
writeTable0 = EasyExcel.writerTable(0).head(head(searchVo.getSocialHouseholdName(),searchVo.getCustomerNo())).build(); writeTable0 = EasyExcel.writerTable(0).head(head(searchVo.getSocialHouseholdName(),searchVo.getCustomerNo())).build();
writeTable1 = EasyExcel.writerTable(1).head(head1()).build(); writeTable1 = EasyExcel.writerTable(1).head(head1()).build();
// 第一次写入会创建头 // 第一次写入会创建头
...@@ -5180,7 +5180,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -5180,7 +5180,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
response.setContentType(CommonConstants.MULTIPART_FORM_DATA); response.setContentType(CommonConstants.MULTIPART_FORM_DATA);
response.setHeader(CommonConstants.CONTENT_DISPOSITION, CommonConstants.ATTACHMENT_FILENAME + URLEncoder.encode(fileName, CommonConstants.UTF8)); response.setHeader(CommonConstants.CONTENT_DISPOSITION, CommonConstants.ATTACHMENT_FILENAME + URLEncoder.encode(fileName, CommonConstants.UTF8));
// 这里 需要指定写用哪个class去写,然后写到第一个sheet,然后文件流会自动关闭 // 这里 需要指定写用哪个class去写,然后写到第一个sheet,然后文件流会自动关闭
ExcelWriter excelWriter = EasyExcel.write(out, TDispatchSocialPersionExportVo.class).includeColumnFieldNames(searchVo.getExportFields()).build(); ExcelWriter excelWriter = EasyExcel.write(out).build();
WriteSheet writeSheet; WriteSheet writeSheet;
WriteTable writeTable0; WriteTable writeTable0;
WriteTable writeTable1; WriteTable writeTable1;
...@@ -5200,7 +5200,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -5200,7 +5200,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
list.add(vo); list.add(vo);
} }
} }
writeSheet = EasyExcel.writerSheet("增员").needHead(Boolean.FALSE).build(); writeSheet = EasyExcel.writerSheet("增员").build();
writeTable0 = EasyExcel.writerTable(0).head(persionHead(searchVo.getSocialHouseholdName(),searchVo.getCustomerNo())).build(); writeTable0 = EasyExcel.writerTable(0).head(persionHead(searchVo.getSocialHouseholdName(),searchVo.getCustomerNo())).build();
writeTable1 = EasyExcel.writerTable(1).head(persionHead1()).build(); writeTable1 = EasyExcel.writerTable(1).head(persionHead1()).build();
// 第一次写入会创建头 // 第一次写入会创建头
...@@ -5227,7 +5227,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -5227,7 +5227,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
list.add(vo); list.add(vo);
} }
} }
writeSheet = EasyExcel.writerSheet("减员").needHead(Boolean.FALSE).build(); writeSheet = EasyExcel.writerSheet("减员").build();
writeTable0 = EasyExcel.writerTable(0).head(persionHead(searchVo.getSocialHouseholdName(),searchVo.getCustomerNo())).build(); writeTable0 = EasyExcel.writerTable(0).head(persionHead(searchVo.getSocialHouseholdName(),searchVo.getCustomerNo())).build();
writeTable1 = EasyExcel.writerTable(1).head(persionHead1()).build(); writeTable1 = EasyExcel.writerTable(1).head(persionHead1()).build();
// 第一次写入会创建头 // 第一次写入会创建头
......
...@@ -1687,9 +1687,6 @@ ...@@ -1687,9 +1687,6 @@
<if test="tDispatchInfo.type != null and tDispatchInfo.type.trim() != ''"> <if test="tDispatchInfo.type != null and tDispatchInfo.type.trim() != ''">
AND a.TYPE = #{tDispatchInfo.type} AND a.TYPE = #{tDispatchInfo.type}
</if> </if>
<if test="tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''">
AND a.SOCIAL_HOUSEHOLD_NAME = #{tDispatchInfo.socialHouseholdName}
</if>
<if test="tDispatchInfo.disMonth != null and tDispatchInfo.disMonth.trim() != ''"> <if test="tDispatchInfo.disMonth != null and tDispatchInfo.disMonth.trim() != ''">
AND replace(DATE_FORMAT(a.CREATE_TIME,"%Y-%m"),'-','') = #{tDispatchInfo.disMonth} AND replace(DATE_FORMAT(a.CREATE_TIME,"%Y-%m"),'-','') = #{tDispatchInfo.disMonth}
</if> </if>
...@@ -1714,9 +1711,6 @@ ...@@ -1714,9 +1711,6 @@
<if test="tDispatchInfo.type != null and tDispatchInfo.type.trim() != ''"> <if test="tDispatchInfo.type != null and tDispatchInfo.type.trim() != ''">
AND a.TYPE = #{tDispatchInfo.type} AND a.TYPE = #{tDispatchInfo.type}
</if> </if>
<if test="tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''">
AND a.SOCIAL_HOUSEHOLD_NAME = #{tDispatchInfo.socialHouseholdName}
</if>
<if test="tDispatchInfo.disMonth != null and tDispatchInfo.disMonth.trim() != ''"> <if test="tDispatchInfo.disMonth != null and tDispatchInfo.disMonth.trim() != ''">
AND replace(DATE_FORMAT(a.CREATE_TIME,"%Y-%m"),'-','') = #{tDispatchInfo.disMonth} AND replace(DATE_FORMAT(a.CREATE_TIME,"%Y-%m"),'-','') = #{tDispatchInfo.disMonth}
</if> </if>
......
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