|
@@ -168,6 +168,46 @@ public class ZhcxPersistentManageServiceImpl extends ServiceImpl<ZhcxPersistentM
|
|
|
} catch (Exception e) {
|
|
|
log.info("顽症导出word失败:"+e);
|
|
|
}
|
|
|
+ }else if (k.contains("油漆“零破坏”专项报告")){
|
|
|
+ FormDataVO formDataVo = new FormDataVO();
|
|
|
+ formDataVo.setMainDataList(mainDataList);
|
|
|
+
|
|
|
+ map.put("type",k);
|
|
|
+ List<ZhcxPersistentWordVO> zhcxPersistentManageDos = zhcxPersistentManageDao.groupByList(map);
|
|
|
+ List<ZhcxPersistentWordVO> listData = new ArrayList<>();
|
|
|
+ zhcxPersistentManageDos.forEach(ev->{
|
|
|
+ if("处罚".equals(ev.getType())){
|
|
|
+ ev.setPunishAmount(ev.getAmount());
|
|
|
+ ev.setPunishCount(ev.getCount());
|
|
|
+ listData.add(ev);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ List<Map<String, Object>> maps = convertList(listData, ZhcxPersistentWordVO.class);
|
|
|
+ slaveTableDataList.clear();
|
|
|
+ slaveTableDataList.add(maps);
|
|
|
+ formDataVo.setSlaveTableDataList(slaveTableDataList);
|
|
|
+ try {
|
|
|
+ SysFileItemDo fileTemp = sysFileItemService.getById("9aebb0bd84d8471b8ed954f5557cb775");
|
|
|
+ if(ObjectUtil.isNull(doc[0])) {
|
|
|
+ doc[0] = fillWordDataByMap(fileTemp.getFullpath(), formDataVo);
|
|
|
+ } else {
|
|
|
+ Document docTemp = fillWordDataByMap(fileTemp.getFullpath(), formDataVo);
|
|
|
+ doc[0].appendDocument(docTemp, ImportFormatMode.KEEP_DIFFERENT_STYLES);
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.info("顽症导出word失败:"+e);
|
|
|
+ }
|
|
|
+ Map<String, List<ZhcxPersistentManageDo>> typeList = v.stream()
|
|
|
+ .collect(Collectors.groupingBy(ZhcxPersistentManageDo::getType));
|
|
|
+ List<ZhcxPersistentManageDo> punishListData = new ArrayList<>();
|
|
|
+ typeList.forEach((k1, v1) -> {
|
|
|
+ if (k1.contains("处罚")) {
|
|
|
+ punishListData.addAll(v1);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ if (punishListData.size() > 0) {
|
|
|
+ initWeekWord(doc, punishListData,"692aacdfda804e989cc880bfe2d8b764");
|
|
|
+ }
|
|
|
}else if (k.contains("构件油漆后损伤专项督查")){
|
|
|
SysFileItemDo fileTemp = sysFileItemService.getById("427ec6c843914718ad12359c8cf70da7");
|
|
|
try {
|