修改

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

@@ -407,13 +407,13 @@ public class SjDjjcServiceImpl implements ISjDjjcService
         sjLjjw.setJh(param.getJh());
         List<SjLjjw> sjLjjwList = sjLjjwMapper.selectSjLjjwList(sjLjjw);
         if(sjLjjwList.size()>0){
-            List<String> collect = sjLjjwList.stream().map(SjLjjw::getLjjh).collect(Collectors.toList());
             CommonParam param1=new CommonParam();
             String[] collectArray = sjLjjwList.stream()
                     .map(SjLjjw::getLjjh)
                     .toArray(String[]::new);
             param1.setJhs(collectArray);
             List<DjZjzhfx> zjzhfxList = djdcService.getZjzhfxList(param1);
+            zjzhfxList=zjzhfxList.stream().filter(it->it.getZb()!=null).sorted(Comparator.comparing(DjZjzhfx::getZb).reversed()).collect(Collectors.toList());
             if(zjzhfxList.size()>3){
                 zjzhfxList=zjzhfxList.subList(0,3);
             }

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

@@ -443,6 +443,7 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
                 }
                 sjZysx.setZysx(zyfx);
             }
+            sjZysxMapper.updateSjZysx(sjZysx);
         }else {
             sjZysx=new SjZysx();
             sjZysx.setJh(sjFdsgcs.getJh());

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

 package com.zjsgfa.project.zjsgfa.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -82,15 +83,25 @@ public class SjFdsgcsTsgjServiceImpl implements ISjFdsgcsTsgjService
             List<SjFl> sjFls = sjFlMapper.selectSjFlList(sjFl);
             if(sjFls.size()>0){
                 SjFl sjFl1 = sjFls.get(0);
-                List<String> collect1 = jcxxTsgjs.stream().map(JcxxTsgj::getSyzn).distinct().collect(Collectors.toList());
-                String syzn=String.join( ",",collect1);
+                List<String> collect1=new ArrayList<>();
+
+                for(JcxxTsgj jcxxTsgj1:jcxxTsgjs){
+                    String syzn=jcxxTsgj1.getGjmc()+"："+jcxxTsgj1.getSyzn();
+                    collect1.add(syzn);
+                }
+                String syzn=String.join( "；",collect1);
                 sjFl1.setJh(sjFdsgcsTsgj.getJh());
                 sjFl1.setSyzn(syzn);
                 sjFlMapper.updateSjFl(sjFl1);
 
             }else {
-                List<String> collect1 = jcxxTsgjs.stream().map(JcxxTsgj::getSyzn).distinct().collect(Collectors.toList());
-                String syzn=String.join( ",",collect1);
+                List<String> collect1=new ArrayList<>();
+
+                for(JcxxTsgj jcxxTsgj1:jcxxTsgjs){
+                    String syzn=jcxxTsgj1.getGjmc()+"："+jcxxTsgj1.getSyzn();
+                    collect1.add(syzn);
+                }
+                String syzn=String.join( "；",collect1);
                 SjFl sjFl1=new SjFl();
                 sjFl1.setJh(sjFdsgcsTsgj.getJh());
                 sjFl1.setSyzn(syzn);

src/main/java/com/zjsgfa/project/zt/controller/DjdcController.java

@@ -318,7 +318,7 @@ public class DjdcController {
                 kssjEx.exportExcel(response, kjsjList, "Sheet1");
                 break;
             case "exportZsjList":
-                //导出注释经
+                //导出
                 List<Zsjfx> zsjList = djdcService.getZsjList(param);
                 ExcelUtil<Zsjfx> zsjfxExcelUtil = new ExcelUtil<Zsjfx>(Zsjfx.class);
                 zsjfxExcelUtil.exportExcel(response, zsjList, "Sheet1");

src/main/java/com/zjsgfa/project/zt/domain/LjZtzhdf.java

@@ -42,7 +42,7 @@ public class LjZtzhdf extends BaseEntity
     private Double jsdf;
 
     /** 指标得分 */
-    @Excel(name = "指标得分")
+//    @Excel(name = "指标得分")
     private Double zbdf;
 
     /** 数量得分 */