顽症报告导出

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

@@ -66,6 +66,11 @@ public class ZhcxPersistentManageServiceImpl extends ServiceImpl<ZhcxPersistentM
         if(list.size() > 0){
             list.forEach(ev ->{
                 String sitepic = ev.getSitepic();
+                BigDecimal punishconfirmamount = ev.getPunishconfirmamount();
+                String type = ev.getType();
+                if(type.contains("处罚") && punishconfirmamount != null){
+                    ev.setAmount(punishconfirmamount);
+                }
                 if(StringUtils.isNotBlank(sitepic)){
                     String[] splits = sitepic.split("\\^_\\^");
                     Optional<String> firstId = Arrays.stream(splits)
@@ -151,6 +156,9 @@ public class ZhcxPersistentManageServiceImpl extends ServiceImpl<ZhcxPersistentM
                             Document docTemp = ExcelExportUtil.fillWordDataByMap(fileTemp.getFullpath(), formData);
                             doc[0].appendDocument(docTemp, ImportFormatMode.KEEP_DIFFERENT_STYLES);
                         }
+                        if (rewardList.size() > 0) {
+                            initWeekWord(doc, rewardList,"a808c450f6484ae18baa5afc4a8fc112");
+                        }
                     } catch (Exception e) {
                         log.info("顽症导出word失败:"+e);
                     }
@@ -163,6 +171,9 @@ public class ZhcxPersistentManageServiceImpl extends ServiceImpl<ZhcxPersistentM
                             Document docTemp = ExcelExportUtil.fillWordDataByMap(fileTemp.getFullpath(), formData);
                             doc[0].appendDocument(docTemp, ImportFormatMode.KEEP_DIFFERENT_STYLES);
                         }
+                        if (rewardList.size() > 0) {
+                            initWeekWord(doc, rewardList,"0291bfa0b2b04293a1e25d42b07b5e33");
+                        }
                     } catch (Exception e) {
                         log.info("顽症导出word失败:"+e);
                     }
@@ -175,6 +186,9 @@ public class ZhcxPersistentManageServiceImpl extends ServiceImpl<ZhcxPersistentM
                             Document docTemp = ExcelExportUtil.fillWordDataByMap(fileTemp.getFullpath(), formData);
                             doc[0].appendDocument(docTemp, ImportFormatMode.KEEP_DIFFERENT_STYLES);
                         }
+                        if (rewardList.size() > 0) {
+                            initWeekWord(doc, rewardList,"5b054a5cb2d84bd4b355eadd668fc6e6");
+                        }
                     } catch (Exception e) {
                         log.info("顽症导出word失败:"+e);
                     }
@@ -345,7 +359,11 @@ public class ZhcxPersistentManageServiceImpl extends ServiceImpl<ZhcxPersistentM
         int idx2 = 0;
         for (Map.Entry<String, List<ZhcxPersistentManageDo>> entry : gxyItemDataMap.entrySet()) {
             Q = Q - 1;
-            addexcel(doc,entry.getKey(), idx2,entry.getValue());
+            if (gxyItemDataMap.size() > 1) {
+                addexcel(doc,entry.getKey(), idx2,entry.getValue());
+            }else if (gxyItemDataMap.size() == 1) {
+                addexcel(doc,null, idx2,entry.getValue());
+            }
             System.out.println("Index = " + index + ", Key = " + entry.getKey() + ", Value = " + entry.getValue());
             idx2++;
         }
@@ -377,7 +395,9 @@ public class ZhcxPersistentManageServiceImpl extends ServiceImpl<ZhcxPersistentM
         Table table = (Table) doc.getChild(NodeType.TABLE, index, true);
         Row titleRow = table.getFirstRow();
         Range range1 = titleRow.getRange();
-        range1.replace("title",k);
+        if (StringUtils.isNotBlank(k)) {
+            range1.replace("title",k);
+        }
         int i = 0;
         for (ZhcxPersistentManageDo staf : staff) { // 替换变量
             i++;
@@ -500,6 +520,10 @@ public class ZhcxPersistentManageServiceImpl extends ServiceImpl<ZhcxPersistentM
                         if(!"已整改".equals(value)){
                             map.put(fieldName, "/");
                         }
+                    }else if(fieldName == "rectifystatus"){
+                        if(!"已整改".equals(value)){
+                            map.put(fieldName, "/");
+                        }
                     }
                 } catch (IllegalAccessException e) {
                     e.printStackTrace();

business-entity/src/main/java/com/rongwei/bsentity/domain/ZhcxPersistentManageDo.java

@@ -243,4 +243,14 @@ public class ZhcxPersistentManageDo extends BaseDo {
      */
     @TableField("BELONGORGNAME")
     private String belongorgname;
+    /**
+     * 所属检验室名称
+     */
+    @TableField("PUNISHCONFIRMAMOUNT")
+    private BigDecimal punishconfirmamount;
+    /**
+     * 所属检验室名称
+     */
+    @TableField("PUNISHCONFIRMDATE")
+    private Date punishconfirmdate;
 }