20250305_sun

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtSqBf.java

@@ -402,4 +402,10 @@ public class GljtSqBf extends BaseEntity
     private String[] glsqsjRange;
 
     private String cxjf;
+
+    private String yb;
+
+    private String mz;
+
+    private String sndj;
 }

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtSqBg.java

@@ -353,4 +353,10 @@ public class GljtSqBg extends BaseEntity
 
     @TableField(exist = false)
     private String[] glsqsjRange;
+
+    private String yb;
+
+    private String mz;
+
+    private String sndj;
 }

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtSqLr.java

@@ -364,4 +364,10 @@ public class GljtSqLr extends BaseEntity
 
     @TableField(exist = false)
     private String lastJkzkTime;
+
+    private String yb;
+
+    private String mz;
+
+    private String sndj;
 }

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtSqLrHi.java

@@ -362,4 +362,10 @@ public class GljtSqLrHi extends BaseEntity
 
     @TableField(exist = false)
     private String programStatus;
+
+    private String yb;
+
+    private String mz;
+
+    private String sndj;
 }

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtSqSq.java

@@ -359,4 +359,10 @@ public class GljtSqSq extends BaseEntity
 
     @TableField(exist = false)
     private String[] glsqsjRange;
+
+    private String yb;
+
+    private String mz;
+
+    private String sndj;
 }

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtSqTf.java

@@ -381,4 +381,10 @@ public class GljtSqTf extends BaseEntity
     private String[] glsqsjRange;
 
     private String tfyf;
+
+    private String yb;
+
+    private String mz;
+
+    private String sndj;
 }

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtSqZj.java

@@ -396,4 +396,10 @@ public class GljtSqZj extends BaseEntity
 
     @TableField(exist = false)
     private String[] glsqsjRange;
+
+    private String yb;
+
+    private String mz;
+
+    private String sndj;
 }

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/impl/GljtQxpzServiceImpl.java

@@ -253,6 +253,7 @@ public class GljtQxpzServiceImpl implements IGljtQxpzService
                 in.put("total", totalStats);
                 in.put("pcms", pc.getMs());
                 in.put("pcmc", pc.getPcmc());
+                in.put("pcId", pc.getId());
                 inList.add(in);
             }
             res.put("pcList", inList);
@@ -291,6 +292,7 @@ public class GljtQxpzServiceImpl implements IGljtQxpzService
                     String shortCode = SubCodeUtil.code2Short(streetCode.getCode());
                     List<GljtJfxx> downList = allList.stream().filter(a -> likeRight(shortCode, a.getXzqh())).collect(Collectors.toList());
                     in.put("areaName", streetCode.getName());
+                    in.put("areaCode", streetCode.getCode());
                     for (SysDictData pc : dictDataList) {
                         List<GljtJfxx> pcList = downList.stream().filter(c -> StringUtils.equals(c.getBtbz(), pc.getDictValue())).collect(Collectors.toList());
                         Map<String, Object> in2 = new LinkedHashMap<>();