修改

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

@@ -1004,7 +1004,7 @@ public class SjDjjcController extends BaseController
                 }
                 SjZjyCljl cljl =new SjZjyCljl();
                 cljl.setJh(jh);
-                int ks =0;
+                int ks =1;
                 String clmc=new DataFormatter().formatCellValue(row.getCell(ks));
                 if(StringUtils.isEmpty(clmc)){
                     continue;
@@ -2127,6 +2127,8 @@ public class SjDjjcController extends BaseController
 
             }
             if(!map.isEmpty()){
+                map.computeIfAbsent("工程补充", k -> new ArrayList<>());
+                map.computeIfAbsent("地质补充", k -> new ArrayList<>());
                 System.out.println("第一次map"+map);
                 Map<String,Object> map2 =new HashMap<>();
                 map2.put("dict_content",map);
@@ -2191,7 +2193,7 @@ public class SjDjjcController extends BaseController
         InputStream in = null;
         XWPFTemplate template = null;
         OutputStream os = null;
-        try {
+//        try {
             in = this.getClass().getResourceAsStream("/static/excel/sgfamb.docx");
             os = response.getOutputStream();
             String fileName = sjDjjc.getJh() + "井施工方案";
@@ -2269,21 +2271,21 @@ public class SjDjjcController extends BaseController
             template = compile.render(data);
             template.write(os);
             os.flush();
-        } catch (Exception e) {
-            throw e;
-        } finally {
-            if (in != null) {
-                in.close();
-            }
-            if (template != null) {
-                template.close();
-            }
-
-            if (os != null) {
-                os.close();
-            }
-
-        }
+//        } catch (Exception e) {
+//            throw e;
+//        } finally {
+//            if (in != null) {
+//                in.close();
+//            }
+//            if (template != null) {
+//                template.close();
+//            }
+//
+//            if (os != null) {
+//                os.close();
+//            }
+//
+//        }
     }
 
     public  Map<String, Object> buildDataModel(SjDjjc sjDjjc) {

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

@@ -772,6 +772,7 @@ public class SjDjjcServiceImpl implements ISjDjjcService
             BeanUtils.copyProperties(item,sjZtgjsj);
             sjZtgjsj.setJh(jh);
             sjZtgjsj.setLjjh(item.getJh());
+            sjZtgjsj.setZjymd(item.getZjymd()!=null?item.getZjymd().toString():"");
             String kc  =item.getKc();
             if(kc.equals("1")){
                 kc="一开";

src/main/java/com/zjsgfa/project/zt/service/impl/DjdcServiceImpl.java

@@ -382,8 +382,8 @@ public class DjdcServiceImpl implements DjdcService {
 
                 // 转换为天数（保留两位小数）
                 double daysDiff = secondsDiff / (24.0 * 60 * 60);
-
-                item.setZjzq(Double.parseDouble(df.format(daysDiff)));
+                daysDiff= Math.abs(daysDiff);
+                item.setZjzq(Double.parseDouble(df.format( daysDiff)));
                 //计算异常周期
                 Jswa jswa =new Jswa();
                 jswa.setKsrq(kssj);
@@ -394,7 +394,7 @@ public class DjdcServiceImpl implements DjdcService {
                 for(Jswa wa:jswaList){
                     zjycsl=zjycsl+(wa.getSg()+wa.getXl()+wa.getZrtg()+wa.getZztg()+wa.getFzqk());
                 }
-
+                zjycsl= Math.abs(zjycsl);
                 //异常周期
                 item.setZjycsl(Double.parseDouble(df.format(zjycsl/24)));
                 //生产周期
@@ -429,7 +429,7 @@ public class DjdcServiceImpl implements DjdcService {
 
                 // 转换为天数（保留两位小数）
                 double daysDiff = secondsDiff / (24.0 * 60 * 60);
-
+                daysDiff=Math.abs(daysDiff);
                 item.setZwzq(Double.parseDouble(df.format(daysDiff)));
 
                 item.setZwzq(Double.parseDouble(df.format(daysDiff)));
@@ -443,6 +443,7 @@ public class DjdcServiceImpl implements DjdcService {
                 for(Jswa wa:jswaList){
                     zjycsl=zjycsl+(wa.getSg()+wa.getXl()+wa.getZrtg()+wa.getZztg()+wa.getFzqk());
                 }
+                zjycsl=Math.abs(zjycsl);
                 item.setWjycsl(Double.parseDouble(df.format(zjycsl/24)));
                 //生产周期
                 item.setWjsczq(Double.parseDouble(df.format(item.getZwzq()-item.getWjycsl())));