修改

pom.xml

@@ -278,6 +278,11 @@
             <artifactId>poi-tl</artifactId>
             <version>1.12.1</version>
         </dependency>
+        <dependency>
+            <groupId>io.github.draco1023</groupId>
+            <artifactId>poi-tl-ext</artifactId>
+            <version>0.4.23-poi5</version>
+        </dependency>
 
         <!-- 处理 Base64 解码 -->
         <dependency>

src/main/java/com/zjsgfa/project/zjsgfa/controller/SjDjjcController.java

@@ -31,6 +31,7 @@ import com.zjsgfa.project.zt.domain.CommonParam;
 import com.zjsgfa.project.zt.service.DjdcService;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.*;
+import org.ddr.poi.html.HtmlRenderPolicy;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -169,6 +170,37 @@ public class SjDjjcController extends BaseController
     @Autowired
     private SjFdsgcsZjyFdxnbMapper sjFdsgcsZjyFdxnbMapper;
 
+    @Autowired
+    private SjSggyGjsbxnyqMapper sjSggyGjsbxnyqMapper;
+
+    @Autowired
+    private SjSggyZjzhcsMapper sjSggyZjzhcsMapper;
+
+    @Autowired
+    private SjJkzpMapper sjJkzpMapper;
+
+    @Autowired
+    private SjHseMapper sjHseMapper;
+
+    @Autowired
+    private SjFlMapper sjFlMapper;
+
+    @Autowired
+    private SjFdsgcsTsgjMapper sjFdsgcsTsgjMapper;
+
+    @Autowired
+    private SjZtxxMapper sjZtxxMapper;
+
+    @Autowired
+    private SjLjtjztMapper sjLjtjztMapper;
+
+    @Autowired
+    private SjZtcsxxMapper sjZtcsxxMapper;
+
+    @Autowired
+    private SjZjcsxxMapper sjZjcsxxMapper;
+
+
 
 
 
@@ -1942,6 +1974,8 @@ public class SjDjjcController extends BaseController
             // 配置
             LoopRowTableRenderPolicy policy = new LoopRowTableRenderPolicy();
             LoopColumnTableRenderPolicy policyCol = new LoopColumnTableRenderPolicy();
+            HtmlRenderPolicy htmlRenderPolicy = new HtmlRenderPolicy();
+
             Configure config = Configure.builder().useSpringEL()
                     .bind("sjDzfcList", policy)//行循环策略
                     .bind("sjJsjgList", policy)//行循环策略
@@ -1966,6 +2000,37 @@ public class SjDjjcController extends BaseController
                     .bind("sjJhzqList", policy)//行循环策略
                     .bind("sjH2sList", policy)//行循环策略
                     .bind("sjLjsmList", policy)//行循环策略
+                    .bind("plqt", htmlRenderPolicy)//富文本策略
+                    .bind("tsyxfx", htmlRenderPolicy)//富文本策略
+                    .bind("sjyh", htmlRenderPolicy)//富文本策略
+                    .bind("sjSggyZjzhcsList", policy)//行循环策略
+                    .bind("sjSggyZjyFdxnbList", policyCol)//列循环策略
+                    .bind("sjSggyZjyFdsjList", policy)//行循环策略
+                    .bind("sjSggyZjyCljlList", policy)//行循环策略
+                    .bind("zjkzz", htmlRenderPolicy)//富文本策略
+                    .bind("jlgh", htmlRenderPolicy)//富文本策略
+                    .bind("syyq", htmlRenderPolicy)//富文本策略
+                    .bind("clcb", htmlRenderPolicy)//富文本策略
+                    .bind("hse", htmlRenderPolicy)//富文本策略
+                    .bind("yjlxfs", htmlRenderPolicy)//富文本策略
+                    .bind("yfgkcs", htmlRenderPolicy)//富文本策略
+                    .bind("wjsgcs", htmlRenderPolicy)//富文本策略
+                    .bind("syzn", htmlRenderPolicy)//富文本策略
+                    .bind("tsyxzs", htmlRenderPolicy)//富文本策略
+                    .bind("gjfx", htmlRenderPolicy)//富文本策略
+                    .bind("gjyh", htmlRenderPolicy)//富文本策略
+                    .bind("dcyl", htmlRenderPolicy)//富文本策略
+                    .bind("zyfx", htmlRenderPolicy)//富文本策略
+                    .bind("fxgkcs", htmlRenderPolicy)//富文本策略
+                    .bind("zjzh", htmlRenderPolicy)//富文本策略
+                    .bind("zjzhzysx", htmlRenderPolicy)//富文本策略
+                    .bind("zjycs", htmlRenderPolicy)//富文本策略
+                    .bind("zjgccs", htmlRenderPolicy)//富文本策略
+                    .bind("sjFdsgcsTsgjList", policy)//行策略
+                    .bind("sjFdsgcsDcyxList", policy)//行策略
+                    .bind("sjLjtjztList", policy)//行策略
+                    .bind("sjZtcsxxList", policy)//行策略
+                    .bind("sjFdsgcsZjyFdxnbList", policyCol)//列策略
                     .build();
             XWPFTemplate compile = XWPFTemplate.compile(in, config);
             // 加载模板并填充数据
@@ -2173,6 +2238,251 @@ public class SjDjjcController extends BaseController
         sjLjsm.setJh(jh);
         List<SjLjsm> sjLjsmList = sjLjsmMapper.selectSjLjsmList(sjLjsm);
         dataModel.put("sjLjsmList",sjLjsmList);
+        SjZysx sjZysx =new SjZysx();
+        sjZysx.setJh(jh);
+        List<SjZysx> sjZysxList = sjZysxMapper.selectSjZysxList(sjZysx);
+        SjZysx h2S = sjZysxList.stream().filter(it -> it.getLb().equals("H2S")).findFirst().orElse(null);
+        if(h2S!=null){
+            dataModel.put("h2S",h2S.getZysx());
+        }else {
+            dataModel.put("h2S","");
+        }
+
+        SjZysx plqt = sjZysxList.stream().filter(it -> it.getLb().equals("喷漏卡塌")).findFirst().orElse(null);
+        if(plqt!=null){
+            dataModel.put("plqt",plqt.getZysx());
+        }else {
+            dataModel.put("plqt","");
+        }
+
+        SjZysx tsyxfx = sjZysxList.stream().filter(it -> it.getLb().equals("特殊岩性风险")).findFirst().orElse(null);
+        if(tsyxfx!=null){
+            dataModel.put("tsyxfx",tsyxfx.getZysx());
+        }else {
+            dataModel.put("tsyxfx","");
+        }
+        SjZysx fpfx = sjZysxList.stream().filter(it -> it.getLb().equals("邻井扫描")).findFirst().orElse(null);
+        if(fpfx!=null){
+            dataModel.put("fpfx",fpfx.getZysx());
+        }else {
+            dataModel.put("fpfx","");
+        }
+        //施工概要
+        SjSggyGjsbxnyq sjSggyGjsbxnyq =new SjSggyGjsbxnyq();
+        sjSggyGjsbxnyq.setJh(jh);
+        List<SjSggyGjsbxnyq> sjSggyGjsbxnyqList = sjSggyGjsbxnyqMapper.selectSjSggyGjsbxnyqList(sjSggyGjsbxnyq);
+        if(sjSggyGjsbxnyqList.size()>0){
+            SjSggyGjsbxnyq gjsbxnyq = sjSggyGjsbxnyqList.get(0);
+            dataModel.put("sjyh",gjsbxnyq.getSjyh());
+            dataModel.put("zjxh", gjsbxnyq.getZjxh());
+            dataModel.put("wddy", gjsbxnyq.getWddy());
+            dataModel.put("dkwdscgl", gjsbxnyq.getDkwdscgl());
+            dataModel.put("zjnlZjlx", gjsbxnyq.getZjnlZjlx());
+            dataModel.put("zjnlZdcsll", gjsbxnyq.getZjnlZdcsll());
+            dataModel.put("zjnlZgcsby", gjsbxnyq.getZjnlZgcsby());
+            dataModel.put("xzxtDdzp", gjsbxnyq.getXzxtDdzp());
+            dataModel.put("xzxtDq", gjsbxnyq.getXzxtDq());
+            dataModel.put("xhxtB1lx", gjsbxnyq.getXhxtB1lx());
+            dataModel.put("xhxtB1xh", gjsbxnyq.getXhxtB1xh());
+            dataModel.put("xhxtB1zdgl", gjsbxnyq.getXhxtB1zdgl());
+            dataModel.put("xhxtB2lx", gjsbxnyq.getXhxtB2lx());
+            dataModel.put("xhxtB2xh", gjsbxnyq.getXhxtB2xh());
+            dataModel.put("xhxtB2zdgl", gjsbxnyq.getXhxtB2zdgl());
+            dataModel.put("xhxtB3lx", gjsbxnyq.getXhxtB3lx());
+            dataModel.put("xhxtB3xh", gjsbxnyq.getXhxtB3xh());
+            dataModel.put("xhxtB3zdgl", gjsbxnyq.getXhxtB3zdgl());
+            dataModel.put("gksbZdslx", gjsbxnyq.getGksbZdslx());
+            dataModel.put("gksbLxj1lx", gjsbxnyq.getGksbLxj1lx());
+            dataModel.put("gksbLxj1zdjgl", gjsbxnyq.getGksbLxj1zdjgl());
+            dataModel.put("gksbLxj2lx", gjsbxnyq.getGksbLxj2lx());
+            dataModel.put("gksbLxj2zdjgl", gjsbxnyq.getGksbLxj2zdjgl());
+            dataModel.put("gksbLxj3lx", gjsbxnyq.getGksbLxj3lx());
+            dataModel.put("gksbLxj3zdjgl", gjsbxnyq.getGksbLxj3zdjgl());
+            dataModel.put("xhgSl", gjsbxnyq.getXhgSl());
+            dataModel.put("xhgZrl", gjsbxnyq.getXhgZrl());
+            dataModel.put("cbgSl", gjsbxnyq.getCbgSl());
+            dataModel.put("cbgZrl", gjsbxnyq.getCbgZrl());
+        }else {
+            dataModel.put("sjyh","");
+            dataModel.put("zjxh", "");
+            dataModel.put("wddy", "");
+            dataModel.put("dkwdscgl", "");
+            dataModel.put("zjnlZjlx", "");
+            dataModel.put("zjnlZdcsll", "");
+            dataModel.put("zjnlZgcsby", "");
+            dataModel.put("xzxtDdzp", "");
+            dataModel.put("xzxtDq", "");
+            dataModel.put("xhxtB1lx", "");
+            dataModel.put("xhxtB1xh", "");
+            dataModel.put("xhxtB1zdgl", "");
+            dataModel.put("xhxtB2lx", "");
+            dataModel.put("xhxtB2xh", "");
+            dataModel.put("xhxtB2zdgl", "");
+            dataModel.put("xhxtB3lx", "");
+            dataModel.put("xhxtB3xh", "");
+            dataModel.put("xhxtB3zdgl", "");
+            dataModel.put("gksbZdslx", "");
+            dataModel.put("gksbLxj1lx", "");
+            dataModel.put("gksbLxj1zdjgl", "");
+            dataModel.put("gksbLxj2lx", "");
+            dataModel.put("gksbLxj2zdjgl", "");
+            dataModel.put("gksbLxj3lx", "");
+            dataModel.put("gksbLxj3zdjgl", "");
+            dataModel.put("xhgSl", "");
+            dataModel.put("xhgZrl", "");
+            dataModel.put("cbgSl", "");
+            dataModel.put("cbgZrl", "");
+        }
+
+        SjSggyZjzhcs sjSggyZjzhcs =new SjSggyZjzhcs();
+        sjSggyZjzhcs.setJh(jh);
+        List<SjSggyZjzhcs> sjSggyZjzhcsList = sjSggyZjzhcsMapper.selectSjSggyZjzhcsList(sjSggyZjzhcs);
+        dataModel.put("sjSggyZjzhcsList",sjSggyZjzhcsList);
+        SjSggyZjyFdxnb sjSggyZjyFdxnb =new SjSggyZjyFdxnb();
+        sjSggyZjyFdxnb.setJh(jh);
+        List<SjSggyZjyFdxnb> sjSggyZjyFdxnbList = sjSggyZjyFdxnbMapper.selectSjSggyZjyFdxnbList(sjSggyZjyFdxnb);
+        dataModel.put("sjSggyZjyFdxnbList",sjSggyZjyFdxnbList);
+
+        SjSggyZjyFdsj sjSggyZjyFdsj =new SjSggyZjyFdsj();
+        sjSggyZjyFdsj.setJh(jh);
+        List<SjSggyZjyFdsj> sjSggyZjyFdsjList = sjSggyZjyFdsjMapper.selectSjSggyZjyFdsjList(sjSggyZjyFdsj);
+        dataModel.put("sjSggyZjyFdsjList",sjSggyZjyFdsjList);
+
+        SjSggyZjyCljl sjSggyZjyCljl =new SjSggyZjyCljl();
+        sjSggyZjyCljl.setJh(jh);
+        List<SjSggyZjyCljl> sjSggyZjyCljlList = sjSggyZjyCljlMapper.selectSjSggyZjyCljlList(sjSggyZjyCljl);
+        dataModel.put("sjSggyZjyCljlList",sjSggyZjyCljlList);
+
+        SjJkzp sjJkzp =new SjJkzp();
+        sjJkzp.setJh(jh);
+        List<SjJkzp> sjJkzpList = sjJkzpMapper.selectSjJkzpList(sjJkzp);
+        if(sjJkzpList.size()>0){
+            SjJkzp sjJkzp1 = sjJkzpList.get(0);
+            dataModel.put("zjkzz", sjJkzp1.getZjkzz());
+            dataModel.put("jlgh", sjJkzp1.getJlgh());
+            dataModel.put("syyq", sjJkzp1.getSyyq());
+            dataModel.put("clcb", sjJkzp1.getClcb());
+        }else {
+            dataModel.put("zjkzz", sjJkzp.getZjkzz());
+            dataModel.put("jlgh", sjJkzp.getJlgh());
+            dataModel.put("syyq", sjJkzp.getSyyq());
+            dataModel.put("clcb", sjJkzp.getClcb());
+        }
+        SjHse sjHse =new SjHse();
+        sjHse.setJh(jh);
+        List<SjHse> sjHseList = sjHseMapper.selectSjHseList(sjHse);
+        if(sjHseList.size()>0){
+            SjHse sjHse1 = sjHseList.get(0);
+            dataModel.put("hse", sjHse1.getHse());
+        }else {
+            dataModel.put("hse", sjHse.getHse());
+        }
+        SjFl sjFl =new SjFl();
+        sjFl.setJh(jh);
+        List<SjFl> sjFlList = sjFlMapper.selectSjFlList(sjFl);
+        if(sjFlList.size()>0){
+            SjFl sjFl1 = sjFlList.get(0);
+            dataModel.put("yjlxfs", sjFl1.getYjlxfs());
+            dataModel.put("yfgkcs", sjFl1.getYfgkcs());
+            dataModel.put("wjsgcs", sjFl1.getWjsgcs());
+            dataModel.put("syzn", sjFl1.getSyzn());
+            dataModel.put("tsyxzs", sjFl1.getTsyxzs());
+        }else {
+            dataModel.put("yjlxfs", sjFl.getYjlxfs());
+            dataModel.put("yfgkcs", sjFl.getYfgkcs());
+            dataModel.put("wjsgcs", sjFl.getWjsgcs());
+            dataModel.put("syzn", sjFl.getSyzn());
+            dataModel.put("tsyxzs", sjFl.getTsyxzs());
+        }
+
+        List<Map<String, Object>> fdsgcsList =new ArrayList<>();
+
+        for(int i=0;i<sjJsjgList.size();i++){
+            SjJsjg sjJsjg1 = sjJsjgList.get(i);
+            String num="";
+            if(i==0){
+                num="（一） ";
+            }else if(i==1){
+                num="（二） ";
+            }else if(i==2){
+                num="（三） ";
+            }else if(i==3){
+                num="（四） ";
+            }else if(i==4){
+                num="（五） ";
+            }else if(i==5){
+                num="（六） ";
+            }else if(i==6){
+                num="（七） ";
+            }else if(i==7){
+                num="（八） ";
+            }
+            String kc = sjJsjg1.getKc();
+            Map<String, Object> map = new HashMap<>();
+            map.put("kc",num+ kc+"施工措施：");
+            SjFdsgcs sjFdsgcs =new SjFdsgcs();
+            sjFdsgcs.setJh(jh);
+            sjFdsgcs.setKc(kc);
+            List<SjFdsgcs> sjFdsgcsList= sjFdsgcsMapper.selectSjFdsgcsList(sjFdsgcs);
+            SjFdsgcs sjFdsgcs1 = sjFdsgcsList.get(0);
+            map.put("tzqk", sjFdsgcs1.getTzqk());
+            map.put("jdqk", sjFdsgcs1.getJdqk());
+            map.put("gjfx", sjFdsgcs1.getGjfx());
+            map.put("gjyh", sjFdsgcs1.getGjyh());
+            map.put("dcyl", sjFdsgcs1.getDcyl());
+            map.put("zyfx", sjFdsgcs1.getZyfx());
+            map.put("fxgkcs", sjFdsgcs1.getFxgkcs());
+            map.put("zjzh", sjFdsgcs1.getZjzh());
+            map.put("zjzhzysx", sjFdsgcs1.getZjzhzysx());
+            map.put("zjycs", sjFdsgcs1.getZjycs());
+            map.put("zjgccs", sjFdsgcs1.getZjgccs());
+            //特殊工具
+            SjFdsgcsTsgj sjFdsgcsTsgj =new SjFdsgcsTsgj();
+            sjFdsgcsTsgj.setJh(jh);
+            sjFdsgcsTsgj.setKc(kc);
+            List<SjFdsgcsTsgj> sjFdsgcsTsgjList = sjFdsgcsTsgjMapper.selectSjFdsgcsTsgjList(sjFdsgcsTsgj);
+            map.put("sjFdsgcsTsgjList", sjFdsgcsTsgjList);
+            SjZtxx sjZtxx=new SjZtxx();
+            sjZtxx.setJh(jh);
+            sjZtxx.setKc(kc);
+            List<SjZtxx> sjZtxxList = sjZtxxMapper.selectSjZtxxList(sjZtxx);
+            SjZtxx sjZtxx1 = sjZtxxList.get(0);
+            map.put("ztxh", sjZtxx1.getZtxh());
+            SjFdsgcsDcyx sjFdsgcsDcyx =new SjFdsgcsDcyx();
+            sjFdsgcsDcyx.setJh(jh);
+            sjFdsgcsDcyx.setKc(kc);
+            List<SjFdsgcsDcyx> sjFdsgcsDcyxList = sjFdsgcsDcyxMapper.selectSjFdsgcsDcyxList(sjFdsgcsDcyx);
+            map.put("sjFdsgcsDcyxList", sjFdsgcsDcyxList);
+            SjLjtjzt sjLjtjzt =new SjLjtjzt();
+            sjLjtjzt.setJh(jh);
+            sjLjtjzt.setKc(kc);
+            List<SjLjtjzt> sjLjtjztList = sjLjtjztMapper.selectSjLjtjztList(sjLjtjzt);
+            map.put("sjLjtjztList", sjLjtjztList);
+            SjZtcsxx sjZtcsxx =new SjZtcsxx();
+            sjZtcsxx.setJh(jh);
+            sjZtcsxx.setKc(kc);
+            List<SjZtcsxx> sjZtcsxxList = sjZtcsxxMapper.selectSjZtcsxxList(sjZtcsxx);
+            map.put("sjZtcsxxList", sjZtcsxxList);
+
+            SjZjcsxx sjZjcsxx =new SjZjcsxx();
+            sjZjcsxx.setJh(jh);
+            sjZjcsxx.setKc(kc);
+            List<SjZjcsxx> sjZjcsxxList = sjZjcsxxMapper.selectSjZjcsxxList(sjZjcsxx);
+            SjZjcsxx sjZjcsxx1 = sjZjcsxxList.get(0);
+            map.put("zjpl", sjZjcsxx1.getZjpl());
+            map.put("zjzy", sjZjcsxx1.getZjzy());
+            map.put("zjzs", sjZjcsxx1.getZjzs());
+
+            SjFdsgcsZjyFdxnb sjFdsgcsZjyFdxnb =new SjFdsgcsZjyFdxnb();
+            sjFdsgcsZjyFdxnb.setJh(jh);
+            sjFdsgcsZjyFdxnb.setKc(kc);
+            List<SjFdsgcsZjyFdxnb> sjFdsgcsZjyFdxnbList = sjFdsgcsZjyFdxnbMapper.selectSjFdsgcsZjyFdxnbList(sjFdsgcsZjyFdxnb);
+            map.put("sjFdsgcsZjyFdxnbList", sjFdsgcsZjyFdxnbList);
+            fdsgcsList.add(map);
+        }
+
+        dataModel.put("fdsgcsList", fdsgcsList);
+
 
 
 

src/main/java/com/zjsgfa/project/zjsgfa/controller/SjSggyZjyCljlController.java

@@ -41,7 +41,7 @@ public class SjSggyZjyCljlController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(SjSggyZjyCljl sjSggyZjyCljl)
     {
-        startPage();
+//        startPage();
         List<SjSggyZjyCljl> list = sjSggyZjyCljlService.selectSjSggyZjyCljlList(sjSggyZjyCljl);
         return getDataTable(list);
     }

src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjZysxServiceImpl.java

 package com.zjsgfa.project.zjsgfa.service.impl;
 
 import java.util.List;
+
+import cn.hutool.core.codec.Base64;
 import com.zjsgfa.common.utils.DateUtils;
+import com.zjsgfa.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zjsgfa.project.zjsgfa.mapper.SjZysxMapper;
@@ -53,6 +56,9 @@ public class SjZysxServiceImpl implements ISjZysxService
     @Override
     public int insertSjZysx(SjZysx sjZysx)
     {
+        if(StringUtils.isNotEmpty(sjZysx.getZysx())){
+            sjZysx.setZysx(new String(Base64.decode(sjZysx.getZysx())));
+        }
         return sjZysxMapper.insertSjZysx(sjZysx);
     }
 
@@ -65,6 +71,13 @@ public class SjZysxServiceImpl implements ISjZysxService
     @Override
     public int updateSjZysx(SjZysx sjZysx)
     {
+        String lb = sjZysx.getLb();
+        if("喷漏卡塌".equals(lb) || "特殊岩性风险".equals(lb)){
+            if(StringUtils.isNotEmpty(sjZysx.getZysx())){
+                sjZysx.setZysx(new String(Base64.decode(sjZysx.getZysx())));
+            }
+        }
+
         sjZysx.setUpdateTime(DateUtils.getNowDate());
         return sjZysxMapper.updateSjZysx(sjZysx);
     }