顽症导出

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxPersistentManageServiceImpl.java

@@ -208,6 +208,46 @@ public class ZhcxPersistentManageServiceImpl extends ServiceImpl<ZhcxPersistentM
                     if (punishListData.size() > 0) {
                         initWeekWord(doc, punishListData,"692aacdfda804e989cc880bfe2d8b764");
                     }
+                }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("70fc8489a6604473a5b745e3b9e8fffb");
+                        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,"bc5442ad2f924f7fa17f1949ec8ebc8c");
+                    }
                 }else if (k.contains("构件油漆后损伤专项督查")){
                     SysFileItemDo fileTemp = sysFileItemService.getById("427ec6c843914718ad12359c8cf70da7");
                     try {
@@ -478,7 +518,7 @@ public class ZhcxPersistentManageServiceImpl extends ServiceImpl<ZhcxPersistentM
         int idx2 = 0;
         for (Map.Entry<String, List<ZhcxPersistentManageDo>> entry : gxyItemDataMap.entrySet()) {
             Q = Q - 1;
-            if (fill.contains("每周质量顽症督查") || fill.contains("油漆“零破坏”专项")) {
+            if (fill.contains("每周质量顽症督查") || fill.contains("油漆“零破坏”专项") || fill.contains("面漆后动火")) {
                 addexcel(doc,entry.getKey(), idx2,entry.getValue());
             }else{
                 addexcel(doc,null, idx2,entry.getValue());