修改

src/main/java/com/zjsgfa/project/zjsgfa/domain/SjLjfzqk.java

@@ -43,4 +43,6 @@ public class SjLjfzqk extends BaseEntity
     /** 复杂情况 */
     /** 复杂情况 */
     @Excel(name = "复杂情况")
     @Excel(name = "复杂情况")
     private String fzqk;
     private String fzqk;
+
+    private String fsjgjyy;
 }
 }

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

@@ -118,7 +118,12 @@ public class SjLjfzqkServiceImpl implements ISjLjfzqkService
         param1.setJkzzb(sjDjjc.getJkzzb());
         param1.setJkzzb(sjDjjc.getJkzzb());
         List<SjLjfzqk> jsqaList=djdcService.getJsqaListByJh(param1);
         List<SjLjfzqk> jsqaList=djdcService.getJsqaListByJh(param1);
         if(jsqaList.size()>0){
         if(jsqaList.size()>0){
-            jsqaList.forEach(it->{it.setZbid(sjDjjc.getId());});
+            jsqaList.forEach(it->{
+                it.setZbid(sjDjjc.getId());
+                String fzqk = it.getFzqk() != null ? it.getFzqk() : "";
+                String fsjgjyy = it.getFsjgjyy() != null ? it.getFsjgjyy() : "";
+                it.setFzqk(fzqk + "：" + fsjgjyy);
+            });
             sjLjfzqkMapper.insertSjLjfzqkBatch(jsqaList);
             sjLjfzqkMapper.insertSjLjfzqkBatch(jsqaList);
         }
         }
 
 

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

@@ -123,7 +123,12 @@ public class SjLjzjyfzqkServiceImpl implements ISjLjzjyfzqkService
         param1.setJkzzb(sjDjjc.getJkzzb());
         param1.setJkzzb(sjDjjc.getJkzzb());
         List<SjLjfzqk> jsqaList=djdcService.getJsqaListByJh(param1);
         List<SjLjfzqk> jsqaList=djdcService.getJsqaListByJh(param1);
         if(jsqaList.size()>0){
         if(jsqaList.size()>0){
-            jsqaList.forEach(it->{it.setZbid(sjDjjc.getId());});
+            jsqaList.forEach(it->{
+                it.setZbid(sjDjjc.getId());
+                String fzqk = it.getFzqk() != null ? it.getFzqk() : "";
+                String fsjgjyy = it.getFsjgjyy() != null ? it.getFsjgjyy() : "";
+                it.setFzqk(fzqk + "：" + fsjgjyy);
+            });
             sjLjzjyfzqkMapper.insertSjLjzjyfzqkBatch(jsqaList);
             sjLjzjyfzqkMapper.insertSjLjzjyfzqkBatch(jsqaList);
         }
         }
 
 

src/main/resources/mybatis/zt/DjdcInfoMapper.xml

@@ -1282,7 +1282,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	</select>
     <select id="getJsqaListByJh" resultType="com.zjsgfa.project.zjsgfa.domain.SjLjfzqk">
     <select id="getJsqaListByJh" resultType="com.zjsgfa.project.zjsgfa.domain.SjLjfzqk">
 
 
-		select a.jh ljjh,FSRQ sj,FZQK fzqk,b.WJCZJS wzjs
+		select a.jh ljjh,FSRQ sj,FZQK fzqk,b.WJCZJS wzjs,fsjgjyy
 		       <if test="jkhzb!=null and jkzzb !=null">
 		       <if test="jkhzb!=null and jkzzb !=null">
 				   ,round(power(power(ABS(c.jkhzb - #{jkhzb}
 				   ,round(power(power(ABS(c.jkhzb - #{jkhzb}
 				   ), 2) + power(ABS(c.jkzzb -#{jkzzb}), 2), 0.5), 2) as jl
 				   ), 2) + power(ABS(c.jkzzb -#{jkzzb}), 2), 0.5), 2) as jl