diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 5608e1b..fce7ba9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -172,8 +172,6 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
         Summary summaryDetail = summaryService.getById(summary.getId());
-
-
         if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) {
             summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true));
         }
@@ -196,6 +194,18 @@
         if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) {
             summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true));
         }
+        if (ObjectUtil.isNotEmpty(summary.getBrief())) {
+            summaryDetail.setBrief(summary.getBrief());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getDescription())) {
+            summaryDetail.setDescription(summary.getDescription());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getSpecialName())) {
+            summaryDetail.setSpecialName(summary.getSpecialName());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getKeyNote())) {
+            summaryDetail.setKeyNote(summary.getKeyNote());
+        }
 
         return  ResponseData.success(summaryService.update(summaryDetail));
     }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 5608e1b..fce7ba9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -172,8 +172,6 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
         Summary summaryDetail = summaryService.getById(summary.getId());
-
-
         if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) {
             summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true));
         }
@@ -196,6 +194,18 @@
         if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) {
             summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true));
         }
+        if (ObjectUtil.isNotEmpty(summary.getBrief())) {
+            summaryDetail.setBrief(summary.getBrief());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getDescription())) {
+            summaryDetail.setDescription(summary.getDescription());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getSpecialName())) {
+            summaryDetail.setSpecialName(summary.getSpecialName());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getKeyNote())) {
+            summaryDetail.setKeyNote(summary.getKeyNote());
+        }
 
         return  ResponseData.success(summaryService.update(summaryDetail));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index d69b570..e727d42 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -26,6 +26,9 @@
     List<AreaReportResponse> statisticsByArea(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
+    List<AreaReportResponse> statisticsByXfArea(@Param("begTime") String begTime,
+                                              @Param("endTime") String endTime);
+
     Integer getJudgeCountByTime(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 5608e1b..fce7ba9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -172,8 +172,6 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
         Summary summaryDetail = summaryService.getById(summary.getId());
-
-
         if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) {
             summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true));
         }
@@ -196,6 +194,18 @@
         if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) {
             summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true));
         }
+        if (ObjectUtil.isNotEmpty(summary.getBrief())) {
+            summaryDetail.setBrief(summary.getBrief());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getDescription())) {
+            summaryDetail.setDescription(summary.getDescription());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getSpecialName())) {
+            summaryDetail.setSpecialName(summary.getSpecialName());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getKeyNote())) {
+            summaryDetail.setKeyNote(summary.getKeyNote());
+        }
 
         return  ResponseData.success(summaryService.update(summaryDetail));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index d69b570..e727d42 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -26,6 +26,9 @@
     List<AreaReportResponse> statisticsByArea(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
+    List<AreaReportResponse> statisticsByXfArea(@Param("begTime") String begTime,
+                                              @Param("endTime") String endTime);
+
     Integer getJudgeCountByTime(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 7d8c481..90ec0ad 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import org.apache.ibatis.annotations.Param;
@@ -17,6 +19,14 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
-    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+    List<TagResponse> getMapList(@Param("begTime") String begTime,
+                                 @Param("endTime") String endTime);
+
+    List<CommonResponse> getCountByStatus(@Param("begTime") String begTime,
+                                          @Param("endTime") String endTime);
+
+    List<CmdBodyCommonResponse> getCountByStatusAndTime(@Param("begTime") String begTime,
+                                                        @Param("endTime") String endTime,
+                                                        @Param("type") String type);
 
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 5608e1b..fce7ba9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -172,8 +172,6 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
         Summary summaryDetail = summaryService.getById(summary.getId());
-
-
         if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) {
             summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true));
         }
@@ -196,6 +194,18 @@
         if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) {
             summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true));
         }
+        if (ObjectUtil.isNotEmpty(summary.getBrief())) {
+            summaryDetail.setBrief(summary.getBrief());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getDescription())) {
+            summaryDetail.setDescription(summary.getDescription());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getSpecialName())) {
+            summaryDetail.setSpecialName(summary.getSpecialName());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getKeyNote())) {
+            summaryDetail.setKeyNote(summary.getKeyNote());
+        }
 
         return  ResponseData.success(summaryService.update(summaryDetail));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index d69b570..e727d42 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -26,6 +26,9 @@
     List<AreaReportResponse> statisticsByArea(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
+    List<AreaReportResponse> statisticsByXfArea(@Param("begTime") String begTime,
+                                              @Param("endTime") String endTime);
+
     Integer getJudgeCountByTime(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 7d8c481..90ec0ad 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import org.apache.ibatis.annotations.Param;
@@ -17,6 +19,14 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
-    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+    List<TagResponse> getMapList(@Param("begTime") String begTime,
+                                 @Param("endTime") String endTime);
+
+    List<CommonResponse> getCountByStatus(@Param("begTime") String begTime,
+                                          @Param("endTime") String endTime);
+
+    List<CmdBodyCommonResponse> getCountByStatusAndTime(@Param("begTime") String begTime,
+                                                        @Param("endTime") String endTime,
+                                                        @Param("type") String type);
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index e7fa8df..aa7979e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -77,8 +77,9 @@
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,t0.submit_organcode AS submitCode,ci.instruct_organ AS
-        instructOrgan,ci.instruct_post AS instructCode
+        SELECT t0.submit_organ AS submitOrgan,
+        t0.submit_organcode AS submitCode,
+        ci.controls_link AS links
         FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
         WHERE cb.`body_nature`=0
         <if test="begTime!='' and begTime!=null">
@@ -88,7 +89,26 @@
             AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
         </if>
 
-        ) t0 LEFT JOIN cmd_body_instruct ci ON
+        ) t0 LEFT JOIN cmd_controls_info ci ON
+        t0.body_id = ci.body_id
+
+    </select>
+
+    <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
+
+        SELECT t0.instruct_organ AS instructOrgan,
+        t0.instruct_post AS instructCode,
+        ci.controls_link AS links
+        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
+        WHERE 1=1
+        <if test="begTime!='' and begTime!=null">
+            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
+        ) t0 LEFT JOIN cmd_controls_info ci ON
         t0.body_id = ci.body_id
 
     </select>
@@ -113,7 +133,14 @@
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
-        </if>) t
+        </if>
+     <!--   <if test="begTime!='' and begTime!=null">
+            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>-->
+        ) t
         GROUP BY
         t.organ
     </select>
@@ -124,7 +151,7 @@
         SELECT t.organ AS name, sum(t.links ) AS value FROM (
         SELECT cbi.`instruct_organ` as organ ,cc.`controls_link` as links FROM cmd_body_info cb
         LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id =  cb.body_id
+        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id = cb.body_id
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 5608e1b..fce7ba9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -172,8 +172,6 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
         Summary summaryDetail = summaryService.getById(summary.getId());
-
-
         if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) {
             summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true));
         }
@@ -196,6 +194,18 @@
         if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) {
             summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true));
         }
+        if (ObjectUtil.isNotEmpty(summary.getBrief())) {
+            summaryDetail.setBrief(summary.getBrief());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getDescription())) {
+            summaryDetail.setDescription(summary.getDescription());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getSpecialName())) {
+            summaryDetail.setSpecialName(summary.getSpecialName());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getKeyNote())) {
+            summaryDetail.setKeyNote(summary.getKeyNote());
+        }
 
         return  ResponseData.success(summaryService.update(summaryDetail));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index d69b570..e727d42 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -26,6 +26,9 @@
     List<AreaReportResponse> statisticsByArea(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
+    List<AreaReportResponse> statisticsByXfArea(@Param("begTime") String begTime,
+                                              @Param("endTime") String endTime);
+
     Integer getJudgeCountByTime(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 7d8c481..90ec0ad 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import org.apache.ibatis.annotations.Param;
@@ -17,6 +19,14 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
-    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+    List<TagResponse> getMapList(@Param("begTime") String begTime,
+                                 @Param("endTime") String endTime);
+
+    List<CommonResponse> getCountByStatus(@Param("begTime") String begTime,
+                                          @Param("endTime") String endTime);
+
+    List<CmdBodyCommonResponse> getCountByStatusAndTime(@Param("begTime") String begTime,
+                                                        @Param("endTime") String endTime,
+                                                        @Param("type") String type);
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index e7fa8df..aa7979e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -77,8 +77,9 @@
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,t0.submit_organcode AS submitCode,ci.instruct_organ AS
-        instructOrgan,ci.instruct_post AS instructCode
+        SELECT t0.submit_organ AS submitOrgan,
+        t0.submit_organcode AS submitCode,
+        ci.controls_link AS links
         FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
         WHERE cb.`body_nature`=0
         <if test="begTime!='' and begTime!=null">
@@ -88,7 +89,26 @@
             AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
         </if>
 
-        ) t0 LEFT JOIN cmd_body_instruct ci ON
+        ) t0 LEFT JOIN cmd_controls_info ci ON
+        t0.body_id = ci.body_id
+
+    </select>
+
+    <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
+
+        SELECT t0.instruct_organ AS instructOrgan,
+        t0.instruct_post AS instructCode,
+        ci.controls_link AS links
+        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
+        WHERE 1=1
+        <if test="begTime!='' and begTime!=null">
+            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
+        ) t0 LEFT JOIN cmd_controls_info ci ON
         t0.body_id = ci.body_id
 
     </select>
@@ -113,7 +133,14 @@
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
-        </if>) t
+        </if>
+     <!--   <if test="begTime!='' and begTime!=null">
+            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>-->
+        ) t
         GROUP BY
         t.organ
     </select>
@@ -124,7 +151,7 @@
         SELECT t.organ AS name, sum(t.links ) AS value FROM (
         SELECT cbi.`instruct_organ` as organ ,cc.`controls_link` as links FROM cmd_body_info cb
         LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id =  cb.body_id
+        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id = cb.body_id
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index 4c4ebce..87fb876 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -22,11 +22,10 @@
     </sql>
 
 
-
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT  cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
+        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
         FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id=  cci.tag_id
+        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
         WHERE 1 = 1
         <if test="begTime!='' and begTime!=null">
             AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
@@ -38,4 +37,42 @@
 
     </select>
 
+
+    <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
+
+        SELECT t.bodyState AS name, sum(t.links) AS value
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE cb.roam_operation in ('1', '2', '5', '6', '7', '8.3')
+
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+        GROUP BY
+        t.bodyState
+    </select>
+
+
+    <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+
+        SELECT t.links as links,t.roamTime as resultTime
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE 1=1
+        <if test="type != null  and  type != ''">
+            and cb.roam_operation = #{type}
+        </if>
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+    </select>
+
 </mapper>

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 5608e1b..fce7ba9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -172,8 +172,6 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
         Summary summaryDetail = summaryService.getById(summary.getId());
-
-
         if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) {
             summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true));
         }
@@ -196,6 +194,18 @@
         if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) {
             summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true));
         }
+        if (ObjectUtil.isNotEmpty(summary.getBrief())) {
+            summaryDetail.setBrief(summary.getBrief());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getDescription())) {
+            summaryDetail.setDescription(summary.getDescription());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getSpecialName())) {
+            summaryDetail.setSpecialName(summary.getSpecialName());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getKeyNote())) {
+            summaryDetail.setKeyNote(summary.getKeyNote());
+        }
 
         return  ResponseData.success(summaryService.update(summaryDetail));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index d69b570..e727d42 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -26,6 +26,9 @@
     List<AreaReportResponse> statisticsByArea(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
+    List<AreaReportResponse> statisticsByXfArea(@Param("begTime") String begTime,
+                                              @Param("endTime") String endTime);
+
     Integer getJudgeCountByTime(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 7d8c481..90ec0ad 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import org.apache.ibatis.annotations.Param;
@@ -17,6 +19,14 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
-    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+    List<TagResponse> getMapList(@Param("begTime") String begTime,
+                                 @Param("endTime") String endTime);
+
+    List<CommonResponse> getCountByStatus(@Param("begTime") String begTime,
+                                          @Param("endTime") String endTime);
+
+    List<CmdBodyCommonResponse> getCountByStatusAndTime(@Param("begTime") String begTime,
+                                                        @Param("endTime") String endTime,
+                                                        @Param("type") String type);
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index e7fa8df..aa7979e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -77,8 +77,9 @@
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,t0.submit_organcode AS submitCode,ci.instruct_organ AS
-        instructOrgan,ci.instruct_post AS instructCode
+        SELECT t0.submit_organ AS submitOrgan,
+        t0.submit_organcode AS submitCode,
+        ci.controls_link AS links
         FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
         WHERE cb.`body_nature`=0
         <if test="begTime!='' and begTime!=null">
@@ -88,7 +89,26 @@
             AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
         </if>
 
-        ) t0 LEFT JOIN cmd_body_instruct ci ON
+        ) t0 LEFT JOIN cmd_controls_info ci ON
+        t0.body_id = ci.body_id
+
+    </select>
+
+    <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
+
+        SELECT t0.instruct_organ AS instructOrgan,
+        t0.instruct_post AS instructCode,
+        ci.controls_link AS links
+        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
+        WHERE 1=1
+        <if test="begTime!='' and begTime!=null">
+            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
+        ) t0 LEFT JOIN cmd_controls_info ci ON
         t0.body_id = ci.body_id
 
     </select>
@@ -113,7 +133,14 @@
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
-        </if>) t
+        </if>
+     <!--   <if test="begTime!='' and begTime!=null">
+            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>-->
+        ) t
         GROUP BY
         t.organ
     </select>
@@ -124,7 +151,7 @@
         SELECT t.organ AS name, sum(t.links ) AS value FROM (
         SELECT cbi.`instruct_organ` as organ ,cc.`controls_link` as links FROM cmd_body_info cb
         LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id =  cb.body_id
+        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id = cb.body_id
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index 4c4ebce..87fb876 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -22,11 +22,10 @@
     </sql>
 
 
-
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT  cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
+        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
         FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id=  cci.tag_id
+        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
         WHERE 1 = 1
         <if test="begTime!='' and begTime!=null">
             AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
@@ -38,4 +37,42 @@
 
     </select>
 
+
+    <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
+
+        SELECT t.bodyState AS name, sum(t.links) AS value
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE cb.roam_operation in ('1', '2', '5', '6', '7', '8.3')
+
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+        GROUP BY
+        t.bodyState
+    </select>
+
+
+    <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+
+        SELECT t.links as links,t.roamTime as resultTime
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE 1=1
+        <if test="type != null  and  type != ''">
+            and cb.roam_operation = #{type}
+        </if>
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
index 87d02db..7c45998 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
@@ -17,10 +17,10 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value
+        SELECT t1.`tag_name` AS name, t0.tagCount AS value
         FROM cmd_body_tag t1
         LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount
+        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
         FROM cmd_controls_info a WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND a.publish_time <![CDATA[  >=  ]]> #{begTime}

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 5608e1b..fce7ba9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -172,8 +172,6 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
         Summary summaryDetail = summaryService.getById(summary.getId());
-
-
         if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) {
             summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true));
         }
@@ -196,6 +194,18 @@
         if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) {
             summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true));
         }
+        if (ObjectUtil.isNotEmpty(summary.getBrief())) {
+            summaryDetail.setBrief(summary.getBrief());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getDescription())) {
+            summaryDetail.setDescription(summary.getDescription());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getSpecialName())) {
+            summaryDetail.setSpecialName(summary.getSpecialName());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getKeyNote())) {
+            summaryDetail.setKeyNote(summary.getKeyNote());
+        }
 
         return  ResponseData.success(summaryService.update(summaryDetail));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index d69b570..e727d42 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -26,6 +26,9 @@
     List<AreaReportResponse> statisticsByArea(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
+    List<AreaReportResponse> statisticsByXfArea(@Param("begTime") String begTime,
+                                              @Param("endTime") String endTime);
+
     Integer getJudgeCountByTime(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 7d8c481..90ec0ad 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import org.apache.ibatis.annotations.Param;
@@ -17,6 +19,14 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
-    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+    List<TagResponse> getMapList(@Param("begTime") String begTime,
+                                 @Param("endTime") String endTime);
+
+    List<CommonResponse> getCountByStatus(@Param("begTime") String begTime,
+                                          @Param("endTime") String endTime);
+
+    List<CmdBodyCommonResponse> getCountByStatusAndTime(@Param("begTime") String begTime,
+                                                        @Param("endTime") String endTime,
+                                                        @Param("type") String type);
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index e7fa8df..aa7979e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -77,8 +77,9 @@
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,t0.submit_organcode AS submitCode,ci.instruct_organ AS
-        instructOrgan,ci.instruct_post AS instructCode
+        SELECT t0.submit_organ AS submitOrgan,
+        t0.submit_organcode AS submitCode,
+        ci.controls_link AS links
         FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
         WHERE cb.`body_nature`=0
         <if test="begTime!='' and begTime!=null">
@@ -88,7 +89,26 @@
             AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
         </if>
 
-        ) t0 LEFT JOIN cmd_body_instruct ci ON
+        ) t0 LEFT JOIN cmd_controls_info ci ON
+        t0.body_id = ci.body_id
+
+    </select>
+
+    <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
+
+        SELECT t0.instruct_organ AS instructOrgan,
+        t0.instruct_post AS instructCode,
+        ci.controls_link AS links
+        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
+        WHERE 1=1
+        <if test="begTime!='' and begTime!=null">
+            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
+        ) t0 LEFT JOIN cmd_controls_info ci ON
         t0.body_id = ci.body_id
 
     </select>
@@ -113,7 +133,14 @@
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
-        </if>) t
+        </if>
+     <!--   <if test="begTime!='' and begTime!=null">
+            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>-->
+        ) t
         GROUP BY
         t.organ
     </select>
@@ -124,7 +151,7 @@
         SELECT t.organ AS name, sum(t.links ) AS value FROM (
         SELECT cbi.`instruct_organ` as organ ,cc.`controls_link` as links FROM cmd_body_info cb
         LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id =  cb.body_id
+        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id = cb.body_id
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index 4c4ebce..87fb876 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -22,11 +22,10 @@
     </sql>
 
 
-
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT  cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
+        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
         FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id=  cci.tag_id
+        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
         WHERE 1 = 1
         <if test="begTime!='' and begTime!=null">
             AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
@@ -38,4 +37,42 @@
 
     </select>
 
+
+    <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
+
+        SELECT t.bodyState AS name, sum(t.links) AS value
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE cb.roam_operation in ('1', '2', '5', '6', '7', '8.3')
+
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+        GROUP BY
+        t.bodyState
+    </select>
+
+
+    <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+
+        SELECT t.links as links,t.roamTime as resultTime
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE 1=1
+        <if test="type != null  and  type != ''">
+            and cb.roam_operation = #{type}
+        </if>
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
index 87d02db..7c45998 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
@@ -17,10 +17,10 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value
+        SELECT t1.`tag_name` AS name, t0.tagCount AS value
         FROM cmd_body_tag t1
         LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount
+        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
         FROM cmd_controls_info a WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 6cca13a..0b92ef4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -40,9 +40,9 @@
 
 
     <select id="getWebList" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
-        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb
+        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb,IFNULL(cc.controls_link,0) as links
         FROM cmd_controls_info cc
-        WHERE cc.`body_id` IN (SELECT cb.`body_id` FROM cmd_body_info cb WHERE cb.`body_nature` = 0)
+        WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND cc.create_time <![CDATA[  >=  ]]> #{begTime}
         </if>

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 5608e1b..fce7ba9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -172,8 +172,6 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
         Summary summaryDetail = summaryService.getById(summary.getId());
-
-
         if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) {
             summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true));
         }
@@ -196,6 +194,18 @@
         if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) {
             summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true));
         }
+        if (ObjectUtil.isNotEmpty(summary.getBrief())) {
+            summaryDetail.setBrief(summary.getBrief());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getDescription())) {
+            summaryDetail.setDescription(summary.getDescription());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getSpecialName())) {
+            summaryDetail.setSpecialName(summary.getSpecialName());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getKeyNote())) {
+            summaryDetail.setKeyNote(summary.getKeyNote());
+        }
 
         return  ResponseData.success(summaryService.update(summaryDetail));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index d69b570..e727d42 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -26,6 +26,9 @@
     List<AreaReportResponse> statisticsByArea(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
+    List<AreaReportResponse> statisticsByXfArea(@Param("begTime") String begTime,
+                                              @Param("endTime") String endTime);
+
     Integer getJudgeCountByTime(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 7d8c481..90ec0ad 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import org.apache.ibatis.annotations.Param;
@@ -17,6 +19,14 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
-    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+    List<TagResponse> getMapList(@Param("begTime") String begTime,
+                                 @Param("endTime") String endTime);
+
+    List<CommonResponse> getCountByStatus(@Param("begTime") String begTime,
+                                          @Param("endTime") String endTime);
+
+    List<CmdBodyCommonResponse> getCountByStatusAndTime(@Param("begTime") String begTime,
+                                                        @Param("endTime") String endTime,
+                                                        @Param("type") String type);
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index e7fa8df..aa7979e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -77,8 +77,9 @@
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,t0.submit_organcode AS submitCode,ci.instruct_organ AS
-        instructOrgan,ci.instruct_post AS instructCode
+        SELECT t0.submit_organ AS submitOrgan,
+        t0.submit_organcode AS submitCode,
+        ci.controls_link AS links
         FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
         WHERE cb.`body_nature`=0
         <if test="begTime!='' and begTime!=null">
@@ -88,7 +89,26 @@
             AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
         </if>
 
-        ) t0 LEFT JOIN cmd_body_instruct ci ON
+        ) t0 LEFT JOIN cmd_controls_info ci ON
+        t0.body_id = ci.body_id
+
+    </select>
+
+    <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
+
+        SELECT t0.instruct_organ AS instructOrgan,
+        t0.instruct_post AS instructCode,
+        ci.controls_link AS links
+        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
+        WHERE 1=1
+        <if test="begTime!='' and begTime!=null">
+            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
+        ) t0 LEFT JOIN cmd_controls_info ci ON
         t0.body_id = ci.body_id
 
     </select>
@@ -113,7 +133,14 @@
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
-        </if>) t
+        </if>
+     <!--   <if test="begTime!='' and begTime!=null">
+            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>-->
+        ) t
         GROUP BY
         t.organ
     </select>
@@ -124,7 +151,7 @@
         SELECT t.organ AS name, sum(t.links ) AS value FROM (
         SELECT cbi.`instruct_organ` as organ ,cc.`controls_link` as links FROM cmd_body_info cb
         LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id =  cb.body_id
+        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id = cb.body_id
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index 4c4ebce..87fb876 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -22,11 +22,10 @@
     </sql>
 
 
-
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT  cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
+        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
         FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id=  cci.tag_id
+        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
         WHERE 1 = 1
         <if test="begTime!='' and begTime!=null">
             AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
@@ -38,4 +37,42 @@
 
     </select>
 
+
+    <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
+
+        SELECT t.bodyState AS name, sum(t.links) AS value
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE cb.roam_operation in ('1', '2', '5', '6', '7', '8.3')
+
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+        GROUP BY
+        t.bodyState
+    </select>
+
+
+    <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+
+        SELECT t.links as links,t.roamTime as resultTime
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE 1=1
+        <if test="type != null  and  type != ''">
+            and cb.roam_operation = #{type}
+        </if>
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
index 87d02db..7c45998 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
@@ -17,10 +17,10 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value
+        SELECT t1.`tag_name` AS name, t0.tagCount AS value
         FROM cmd_body_tag t1
         LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount
+        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
         FROM cmd_controls_info a WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 6cca13a..0b92ef4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -40,9 +40,9 @@
 
 
     <select id="getWebList" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
-        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb
+        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb,IFNULL(cc.controls_link,0) as links
         FROM cmd_controls_info cc
-        WHERE cc.`body_id` IN (SELECT cb.`body_id` FROM cmd_body_info cb WHERE cb.`body_nature` = 0)
+        WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND cc.create_time <![CDATA[  >=  ]]> #{begTime}
         </if>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
index 3ab6334..8c8b9a4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
@@ -13,4 +13,6 @@
 
     private String instructOrgan;
 
+    private String links;
+
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 5608e1b..fce7ba9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -172,8 +172,6 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
         Summary summaryDetail = summaryService.getById(summary.getId());
-
-
         if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) {
             summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true));
         }
@@ -196,6 +194,18 @@
         if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) {
             summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true));
         }
+        if (ObjectUtil.isNotEmpty(summary.getBrief())) {
+            summaryDetail.setBrief(summary.getBrief());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getDescription())) {
+            summaryDetail.setDescription(summary.getDescription());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getSpecialName())) {
+            summaryDetail.setSpecialName(summary.getSpecialName());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getKeyNote())) {
+            summaryDetail.setKeyNote(summary.getKeyNote());
+        }
 
         return  ResponseData.success(summaryService.update(summaryDetail));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index d69b570..e727d42 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -26,6 +26,9 @@
     List<AreaReportResponse> statisticsByArea(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
+    List<AreaReportResponse> statisticsByXfArea(@Param("begTime") String begTime,
+                                              @Param("endTime") String endTime);
+
     Integer getJudgeCountByTime(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 7d8c481..90ec0ad 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import org.apache.ibatis.annotations.Param;
@@ -17,6 +19,14 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
-    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+    List<TagResponse> getMapList(@Param("begTime") String begTime,
+                                 @Param("endTime") String endTime);
+
+    List<CommonResponse> getCountByStatus(@Param("begTime") String begTime,
+                                          @Param("endTime") String endTime);
+
+    List<CmdBodyCommonResponse> getCountByStatusAndTime(@Param("begTime") String begTime,
+                                                        @Param("endTime") String endTime,
+                                                        @Param("type") String type);
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index e7fa8df..aa7979e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -77,8 +77,9 @@
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,t0.submit_organcode AS submitCode,ci.instruct_organ AS
-        instructOrgan,ci.instruct_post AS instructCode
+        SELECT t0.submit_organ AS submitOrgan,
+        t0.submit_organcode AS submitCode,
+        ci.controls_link AS links
         FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
         WHERE cb.`body_nature`=0
         <if test="begTime!='' and begTime!=null">
@@ -88,7 +89,26 @@
             AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
         </if>
 
-        ) t0 LEFT JOIN cmd_body_instruct ci ON
+        ) t0 LEFT JOIN cmd_controls_info ci ON
+        t0.body_id = ci.body_id
+
+    </select>
+
+    <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
+
+        SELECT t0.instruct_organ AS instructOrgan,
+        t0.instruct_post AS instructCode,
+        ci.controls_link AS links
+        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
+        WHERE 1=1
+        <if test="begTime!='' and begTime!=null">
+            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
+        ) t0 LEFT JOIN cmd_controls_info ci ON
         t0.body_id = ci.body_id
 
     </select>
@@ -113,7 +133,14 @@
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
-        </if>) t
+        </if>
+     <!--   <if test="begTime!='' and begTime!=null">
+            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>-->
+        ) t
         GROUP BY
         t.organ
     </select>
@@ -124,7 +151,7 @@
         SELECT t.organ AS name, sum(t.links ) AS value FROM (
         SELECT cbi.`instruct_organ` as organ ,cc.`controls_link` as links FROM cmd_body_info cb
         LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id =  cb.body_id
+        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id = cb.body_id
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index 4c4ebce..87fb876 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -22,11 +22,10 @@
     </sql>
 
 
-
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT  cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
+        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
         FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id=  cci.tag_id
+        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
         WHERE 1 = 1
         <if test="begTime!='' and begTime!=null">
             AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
@@ -38,4 +37,42 @@
 
     </select>
 
+
+    <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
+
+        SELECT t.bodyState AS name, sum(t.links) AS value
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE cb.roam_operation in ('1', '2', '5', '6', '7', '8.3')
+
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+        GROUP BY
+        t.bodyState
+    </select>
+
+
+    <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+
+        SELECT t.links as links,t.roamTime as resultTime
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE 1=1
+        <if test="type != null  and  type != ''">
+            and cb.roam_operation = #{type}
+        </if>
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
index 87d02db..7c45998 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
@@ -17,10 +17,10 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value
+        SELECT t1.`tag_name` AS name, t0.tagCount AS value
         FROM cmd_body_tag t1
         LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount
+        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
         FROM cmd_controls_info a WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 6cca13a..0b92ef4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -40,9 +40,9 @@
 
 
     <select id="getWebList" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
-        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb
+        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb,IFNULL(cc.controls_link,0) as links
         FROM cmd_controls_info cc
-        WHERE cc.`body_id` IN (SELECT cb.`body_id` FROM cmd_body_info cb WHERE cb.`body_nature` = 0)
+        WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND cc.create_time <![CDATA[  >=  ]]> #{begTime}
         </if>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
index 3ab6334..8c8b9a4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
@@ -13,4 +13,6 @@
 
     private String instructOrgan;
 
+    private String links;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
index 8142f95..f15a9d3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
@@ -18,5 +18,7 @@
     //用于初始化和点击事件刷新地图数据区分 1：点击事件，0：初始化
     private boolean flag;
 
+    private int page;
+
 
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 5608e1b..fce7ba9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -172,8 +172,6 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
         Summary summaryDetail = summaryService.getById(summary.getId());
-
-
         if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) {
             summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true));
         }
@@ -196,6 +194,18 @@
         if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) {
             summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true));
         }
+        if (ObjectUtil.isNotEmpty(summary.getBrief())) {
+            summaryDetail.setBrief(summary.getBrief());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getDescription())) {
+            summaryDetail.setDescription(summary.getDescription());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getSpecialName())) {
+            summaryDetail.setSpecialName(summary.getSpecialName());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getKeyNote())) {
+            summaryDetail.setKeyNote(summary.getKeyNote());
+        }
 
         return  ResponseData.success(summaryService.update(summaryDetail));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index d69b570..e727d42 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -26,6 +26,9 @@
     List<AreaReportResponse> statisticsByArea(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
+    List<AreaReportResponse> statisticsByXfArea(@Param("begTime") String begTime,
+                                              @Param("endTime") String endTime);
+
     Integer getJudgeCountByTime(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 7d8c481..90ec0ad 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import org.apache.ibatis.annotations.Param;
@@ -17,6 +19,14 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
-    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+    List<TagResponse> getMapList(@Param("begTime") String begTime,
+                                 @Param("endTime") String endTime);
+
+    List<CommonResponse> getCountByStatus(@Param("begTime") String begTime,
+                                          @Param("endTime") String endTime);
+
+    List<CmdBodyCommonResponse> getCountByStatusAndTime(@Param("begTime") String begTime,
+                                                        @Param("endTime") String endTime,
+                                                        @Param("type") String type);
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index e7fa8df..aa7979e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -77,8 +77,9 @@
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,t0.submit_organcode AS submitCode,ci.instruct_organ AS
-        instructOrgan,ci.instruct_post AS instructCode
+        SELECT t0.submit_organ AS submitOrgan,
+        t0.submit_organcode AS submitCode,
+        ci.controls_link AS links
         FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
         WHERE cb.`body_nature`=0
         <if test="begTime!='' and begTime!=null">
@@ -88,7 +89,26 @@
             AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
         </if>
 
-        ) t0 LEFT JOIN cmd_body_instruct ci ON
+        ) t0 LEFT JOIN cmd_controls_info ci ON
+        t0.body_id = ci.body_id
+
+    </select>
+
+    <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
+
+        SELECT t0.instruct_organ AS instructOrgan,
+        t0.instruct_post AS instructCode,
+        ci.controls_link AS links
+        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
+        WHERE 1=1
+        <if test="begTime!='' and begTime!=null">
+            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
+        ) t0 LEFT JOIN cmd_controls_info ci ON
         t0.body_id = ci.body_id
 
     </select>
@@ -113,7 +133,14 @@
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
-        </if>) t
+        </if>
+     <!--   <if test="begTime!='' and begTime!=null">
+            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>-->
+        ) t
         GROUP BY
         t.organ
     </select>
@@ -124,7 +151,7 @@
         SELECT t.organ AS name, sum(t.links ) AS value FROM (
         SELECT cbi.`instruct_organ` as organ ,cc.`controls_link` as links FROM cmd_body_info cb
         LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id =  cb.body_id
+        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id = cb.body_id
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index 4c4ebce..87fb876 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -22,11 +22,10 @@
     </sql>
 
 
-
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT  cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
+        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
         FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id=  cci.tag_id
+        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
         WHERE 1 = 1
         <if test="begTime!='' and begTime!=null">
             AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
@@ -38,4 +37,42 @@
 
     </select>
 
+
+    <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
+
+        SELECT t.bodyState AS name, sum(t.links) AS value
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE cb.roam_operation in ('1', '2', '5', '6', '7', '8.3')
+
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+        GROUP BY
+        t.bodyState
+    </select>
+
+
+    <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+
+        SELECT t.links as links,t.roamTime as resultTime
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE 1=1
+        <if test="type != null  and  type != ''">
+            and cb.roam_operation = #{type}
+        </if>
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
index 87d02db..7c45998 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
@@ -17,10 +17,10 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value
+        SELECT t1.`tag_name` AS name, t0.tagCount AS value
         FROM cmd_body_tag t1
         LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount
+        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
         FROM cmd_controls_info a WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 6cca13a..0b92ef4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -40,9 +40,9 @@
 
 
     <select id="getWebList" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
-        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb
+        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb,IFNULL(cc.controls_link,0) as links
         FROM cmd_controls_info cc
-        WHERE cc.`body_id` IN (SELECT cb.`body_id` FROM cmd_body_info cb WHERE cb.`body_nature` = 0)
+        WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND cc.create_time <![CDATA[  >=  ]]> #{begTime}
         </if>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
index 3ab6334..8c8b9a4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
@@ -13,4 +13,6 @@
 
     private String instructOrgan;
 
+    private String links;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
index 8142f95..f15a9d3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
@@ -18,5 +18,7 @@
     //用于初始化和点击事件刷新地图数据区分 1：点击事件，0：初始化
     private boolean flag;
 
+    private int page;
+
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
index c620ea2..0cc0d72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -14,4 +14,7 @@
     //时间
     private String resultTime;
 
+    //关联条数
+    private String links;
+
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 5608e1b..fce7ba9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -172,8 +172,6 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
         Summary summaryDetail = summaryService.getById(summary.getId());
-
-
         if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) {
             summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true));
         }
@@ -196,6 +194,18 @@
         if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) {
             summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true));
         }
+        if (ObjectUtil.isNotEmpty(summary.getBrief())) {
+            summaryDetail.setBrief(summary.getBrief());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getDescription())) {
+            summaryDetail.setDescription(summary.getDescription());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getSpecialName())) {
+            summaryDetail.setSpecialName(summary.getSpecialName());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getKeyNote())) {
+            summaryDetail.setKeyNote(summary.getKeyNote());
+        }
 
         return  ResponseData.success(summaryService.update(summaryDetail));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index d69b570..e727d42 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -26,6 +26,9 @@
     List<AreaReportResponse> statisticsByArea(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
+    List<AreaReportResponse> statisticsByXfArea(@Param("begTime") String begTime,
+                                              @Param("endTime") String endTime);
+
     Integer getJudgeCountByTime(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 7d8c481..90ec0ad 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import org.apache.ibatis.annotations.Param;
@@ -17,6 +19,14 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
-    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+    List<TagResponse> getMapList(@Param("begTime") String begTime,
+                                 @Param("endTime") String endTime);
+
+    List<CommonResponse> getCountByStatus(@Param("begTime") String begTime,
+                                          @Param("endTime") String endTime);
+
+    List<CmdBodyCommonResponse> getCountByStatusAndTime(@Param("begTime") String begTime,
+                                                        @Param("endTime") String endTime,
+                                                        @Param("type") String type);
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index e7fa8df..aa7979e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -77,8 +77,9 @@
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,t0.submit_organcode AS submitCode,ci.instruct_organ AS
-        instructOrgan,ci.instruct_post AS instructCode
+        SELECT t0.submit_organ AS submitOrgan,
+        t0.submit_organcode AS submitCode,
+        ci.controls_link AS links
         FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
         WHERE cb.`body_nature`=0
         <if test="begTime!='' and begTime!=null">
@@ -88,7 +89,26 @@
             AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
         </if>
 
-        ) t0 LEFT JOIN cmd_body_instruct ci ON
+        ) t0 LEFT JOIN cmd_controls_info ci ON
+        t0.body_id = ci.body_id
+
+    </select>
+
+    <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
+
+        SELECT t0.instruct_organ AS instructOrgan,
+        t0.instruct_post AS instructCode,
+        ci.controls_link AS links
+        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
+        WHERE 1=1
+        <if test="begTime!='' and begTime!=null">
+            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
+        ) t0 LEFT JOIN cmd_controls_info ci ON
         t0.body_id = ci.body_id
 
     </select>
@@ -113,7 +133,14 @@
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
-        </if>) t
+        </if>
+     <!--   <if test="begTime!='' and begTime!=null">
+            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>-->
+        ) t
         GROUP BY
         t.organ
     </select>
@@ -124,7 +151,7 @@
         SELECT t.organ AS name, sum(t.links ) AS value FROM (
         SELECT cbi.`instruct_organ` as organ ,cc.`controls_link` as links FROM cmd_body_info cb
         LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id =  cb.body_id
+        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id = cb.body_id
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index 4c4ebce..87fb876 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -22,11 +22,10 @@
     </sql>
 
 
-
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT  cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
+        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
         FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id=  cci.tag_id
+        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
         WHERE 1 = 1
         <if test="begTime!='' and begTime!=null">
             AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
@@ -38,4 +37,42 @@
 
     </select>
 
+
+    <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
+
+        SELECT t.bodyState AS name, sum(t.links) AS value
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE cb.roam_operation in ('1', '2', '5', '6', '7', '8.3')
+
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+        GROUP BY
+        t.bodyState
+    </select>
+
+
+    <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+
+        SELECT t.links as links,t.roamTime as resultTime
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE 1=1
+        <if test="type != null  and  type != ''">
+            and cb.roam_operation = #{type}
+        </if>
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
index 87d02db..7c45998 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
@@ -17,10 +17,10 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value
+        SELECT t1.`tag_name` AS name, t0.tagCount AS value
         FROM cmd_body_tag t1
         LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount
+        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
         FROM cmd_controls_info a WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 6cca13a..0b92ef4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -40,9 +40,9 @@
 
 
     <select id="getWebList" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
-        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb
+        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb,IFNULL(cc.controls_link,0) as links
         FROM cmd_controls_info cc
-        WHERE cc.`body_id` IN (SELECT cb.`body_id` FROM cmd_body_info cb WHERE cb.`body_nature` = 0)
+        WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND cc.create_time <![CDATA[  >=  ]]> #{begTime}
         </if>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
index 3ab6334..8c8b9a4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
@@ -13,4 +13,6 @@
 
     private String instructOrgan;
 
+    private String links;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
index 8142f95..f15a9d3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
@@ -18,5 +18,7 @@
     //用于初始化和点击事件刷新地图数据区分 1：点击事件，0：初始化
     private boolean flag;
 
+    private int page;
+
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
index c620ea2..0cc0d72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -14,4 +14,7 @@
     //时间
     private String resultTime;
 
+    //关联条数
+    private String links;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
index d2c480c..71a828f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -13,4 +13,6 @@
 
     private Long secondId;
 
+    private int page;
+
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 5608e1b..fce7ba9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -172,8 +172,6 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
         Summary summaryDetail = summaryService.getById(summary.getId());
-
-
         if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) {
             summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true));
         }
@@ -196,6 +194,18 @@
         if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) {
             summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true));
         }
+        if (ObjectUtil.isNotEmpty(summary.getBrief())) {
+            summaryDetail.setBrief(summary.getBrief());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getDescription())) {
+            summaryDetail.setDescription(summary.getDescription());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getSpecialName())) {
+            summaryDetail.setSpecialName(summary.getSpecialName());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getKeyNote())) {
+            summaryDetail.setKeyNote(summary.getKeyNote());
+        }
 
         return  ResponseData.success(summaryService.update(summaryDetail));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index d69b570..e727d42 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -26,6 +26,9 @@
     List<AreaReportResponse> statisticsByArea(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
+    List<AreaReportResponse> statisticsByXfArea(@Param("begTime") String begTime,
+                                              @Param("endTime") String endTime);
+
     Integer getJudgeCountByTime(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 7d8c481..90ec0ad 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import org.apache.ibatis.annotations.Param;
@@ -17,6 +19,14 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
-    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+    List<TagResponse> getMapList(@Param("begTime") String begTime,
+                                 @Param("endTime") String endTime);
+
+    List<CommonResponse> getCountByStatus(@Param("begTime") String begTime,
+                                          @Param("endTime") String endTime);
+
+    List<CmdBodyCommonResponse> getCountByStatusAndTime(@Param("begTime") String begTime,
+                                                        @Param("endTime") String endTime,
+                                                        @Param("type") String type);
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index e7fa8df..aa7979e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -77,8 +77,9 @@
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,t0.submit_organcode AS submitCode,ci.instruct_organ AS
-        instructOrgan,ci.instruct_post AS instructCode
+        SELECT t0.submit_organ AS submitOrgan,
+        t0.submit_organcode AS submitCode,
+        ci.controls_link AS links
         FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
         WHERE cb.`body_nature`=0
         <if test="begTime!='' and begTime!=null">
@@ -88,7 +89,26 @@
             AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
         </if>
 
-        ) t0 LEFT JOIN cmd_body_instruct ci ON
+        ) t0 LEFT JOIN cmd_controls_info ci ON
+        t0.body_id = ci.body_id
+
+    </select>
+
+    <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
+
+        SELECT t0.instruct_organ AS instructOrgan,
+        t0.instruct_post AS instructCode,
+        ci.controls_link AS links
+        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
+        WHERE 1=1
+        <if test="begTime!='' and begTime!=null">
+            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
+        ) t0 LEFT JOIN cmd_controls_info ci ON
         t0.body_id = ci.body_id
 
     </select>
@@ -113,7 +133,14 @@
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
-        </if>) t
+        </if>
+     <!--   <if test="begTime!='' and begTime!=null">
+            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>-->
+        ) t
         GROUP BY
         t.organ
     </select>
@@ -124,7 +151,7 @@
         SELECT t.organ AS name, sum(t.links ) AS value FROM (
         SELECT cbi.`instruct_organ` as organ ,cc.`controls_link` as links FROM cmd_body_info cb
         LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id =  cb.body_id
+        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id = cb.body_id
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index 4c4ebce..87fb876 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -22,11 +22,10 @@
     </sql>
 
 
-
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT  cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
+        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
         FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id=  cci.tag_id
+        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
         WHERE 1 = 1
         <if test="begTime!='' and begTime!=null">
             AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
@@ -38,4 +37,42 @@
 
     </select>
 
+
+    <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
+
+        SELECT t.bodyState AS name, sum(t.links) AS value
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE cb.roam_operation in ('1', '2', '5', '6', '7', '8.3')
+
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+        GROUP BY
+        t.bodyState
+    </select>
+
+
+    <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+
+        SELECT t.links as links,t.roamTime as resultTime
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE 1=1
+        <if test="type != null  and  type != ''">
+            and cb.roam_operation = #{type}
+        </if>
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
index 87d02db..7c45998 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
@@ -17,10 +17,10 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value
+        SELECT t1.`tag_name` AS name, t0.tagCount AS value
         FROM cmd_body_tag t1
         LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount
+        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
         FROM cmd_controls_info a WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 6cca13a..0b92ef4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -40,9 +40,9 @@
 
 
     <select id="getWebList" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
-        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb
+        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb,IFNULL(cc.controls_link,0) as links
         FROM cmd_controls_info cc
-        WHERE cc.`body_id` IN (SELECT cb.`body_id` FROM cmd_body_info cb WHERE cb.`body_nature` = 0)
+        WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND cc.create_time <![CDATA[  >=  ]]> #{begTime}
         </if>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
index 3ab6334..8c8b9a4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
@@ -13,4 +13,6 @@
 
     private String instructOrgan;
 
+    private String links;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
index 8142f95..f15a9d3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
@@ -18,5 +18,7 @@
     //用于初始化和点击事件刷新地图数据区分 1：点击事件，0：初始化
     private boolean flag;
 
+    private int page;
+
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
index c620ea2..0cc0d72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -14,4 +14,7 @@
     //时间
     private String resultTime;
 
+    //关联条数
+    private String links;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
index d2c480c..71a828f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -13,4 +13,6 @@
 
     private Long secondId;
 
+    private int page;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java
index 66a8432..b300397 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java
@@ -24,9 +24,12 @@
     List<CmdBodyInfo> getCmdBodyInfoByTag(String begTime, String endTime);
     //根据上报、下发时间统计信息数
     List<CmdBodyCommonResponse> getCountByTime(String begTime, String endTime);
-    //根据区域统计上报、下发数据
+    //根据区域统计上报
     List<AreaReportResponse> statisticsByArea(String begTime, String endTime);
 
+    //根据区域统计上下发数据
+    List<AreaReportResponse> statisticsByXfArea(String begTime, String endTime);
+
     List<CmdBodyInfo> getCmdBodyInfosByStatus();
     //查询实时上报至返回条数
     List<CommonResponse> getCountByStatus();

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 5608e1b..fce7ba9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -172,8 +172,6 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
         Summary summaryDetail = summaryService.getById(summary.getId());
-
-
         if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) {
             summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true));
         }
@@ -196,6 +194,18 @@
         if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) {
             summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true));
         }
+        if (ObjectUtil.isNotEmpty(summary.getBrief())) {
+            summaryDetail.setBrief(summary.getBrief());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getDescription())) {
+            summaryDetail.setDescription(summary.getDescription());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getSpecialName())) {
+            summaryDetail.setSpecialName(summary.getSpecialName());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getKeyNote())) {
+            summaryDetail.setKeyNote(summary.getKeyNote());
+        }
 
         return  ResponseData.success(summaryService.update(summaryDetail));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index d69b570..e727d42 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -26,6 +26,9 @@
     List<AreaReportResponse> statisticsByArea(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
+    List<AreaReportResponse> statisticsByXfArea(@Param("begTime") String begTime,
+                                              @Param("endTime") String endTime);
+
     Integer getJudgeCountByTime(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 7d8c481..90ec0ad 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import org.apache.ibatis.annotations.Param;
@@ -17,6 +19,14 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
-    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+    List<TagResponse> getMapList(@Param("begTime") String begTime,
+                                 @Param("endTime") String endTime);
+
+    List<CommonResponse> getCountByStatus(@Param("begTime") String begTime,
+                                          @Param("endTime") String endTime);
+
+    List<CmdBodyCommonResponse> getCountByStatusAndTime(@Param("begTime") String begTime,
+                                                        @Param("endTime") String endTime,
+                                                        @Param("type") String type);
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index e7fa8df..aa7979e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -77,8 +77,9 @@
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,t0.submit_organcode AS submitCode,ci.instruct_organ AS
-        instructOrgan,ci.instruct_post AS instructCode
+        SELECT t0.submit_organ AS submitOrgan,
+        t0.submit_organcode AS submitCode,
+        ci.controls_link AS links
         FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
         WHERE cb.`body_nature`=0
         <if test="begTime!='' and begTime!=null">
@@ -88,7 +89,26 @@
             AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
         </if>
 
-        ) t0 LEFT JOIN cmd_body_instruct ci ON
+        ) t0 LEFT JOIN cmd_controls_info ci ON
+        t0.body_id = ci.body_id
+
+    </select>
+
+    <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
+
+        SELECT t0.instruct_organ AS instructOrgan,
+        t0.instruct_post AS instructCode,
+        ci.controls_link AS links
+        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
+        WHERE 1=1
+        <if test="begTime!='' and begTime!=null">
+            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
+        ) t0 LEFT JOIN cmd_controls_info ci ON
         t0.body_id = ci.body_id
 
     </select>
@@ -113,7 +133,14 @@
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
-        </if>) t
+        </if>
+     <!--   <if test="begTime!='' and begTime!=null">
+            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>-->
+        ) t
         GROUP BY
         t.organ
     </select>
@@ -124,7 +151,7 @@
         SELECT t.organ AS name, sum(t.links ) AS value FROM (
         SELECT cbi.`instruct_organ` as organ ,cc.`controls_link` as links FROM cmd_body_info cb
         LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id =  cb.body_id
+        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id = cb.body_id
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index 4c4ebce..87fb876 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -22,11 +22,10 @@
     </sql>
 
 
-
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT  cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
+        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
         FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id=  cci.tag_id
+        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
         WHERE 1 = 1
         <if test="begTime!='' and begTime!=null">
             AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
@@ -38,4 +37,42 @@
 
     </select>
 
+
+    <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
+
+        SELECT t.bodyState AS name, sum(t.links) AS value
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE cb.roam_operation in ('1', '2', '5', '6', '7', '8.3')
+
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+        GROUP BY
+        t.bodyState
+    </select>
+
+
+    <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+
+        SELECT t.links as links,t.roamTime as resultTime
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE 1=1
+        <if test="type != null  and  type != ''">
+            and cb.roam_operation = #{type}
+        </if>
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
index 87d02db..7c45998 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
@@ -17,10 +17,10 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value
+        SELECT t1.`tag_name` AS name, t0.tagCount AS value
         FROM cmd_body_tag t1
         LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount
+        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
         FROM cmd_controls_info a WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 6cca13a..0b92ef4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -40,9 +40,9 @@
 
 
     <select id="getWebList" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
-        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb
+        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb,IFNULL(cc.controls_link,0) as links
         FROM cmd_controls_info cc
-        WHERE cc.`body_id` IN (SELECT cb.`body_id` FROM cmd_body_info cb WHERE cb.`body_nature` = 0)
+        WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND cc.create_time <![CDATA[  >=  ]]> #{begTime}
         </if>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
index 3ab6334..8c8b9a4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
@@ -13,4 +13,6 @@
 
     private String instructOrgan;
 
+    private String links;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
index 8142f95..f15a9d3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
@@ -18,5 +18,7 @@
     //用于初始化和点击事件刷新地图数据区分 1：点击事件，0：初始化
     private boolean flag;
 
+    private int page;
+
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
index c620ea2..0cc0d72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -14,4 +14,7 @@
     //时间
     private String resultTime;
 
+    //关联条数
+    private String links;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
index d2c480c..71a828f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -13,4 +13,6 @@
 
     private Long secondId;
 
+    private int page;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java
index 66a8432..b300397 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java
@@ -24,9 +24,12 @@
     List<CmdBodyInfo> getCmdBodyInfoByTag(String begTime, String endTime);
     //根据上报、下发时间统计信息数
     List<CmdBodyCommonResponse> getCountByTime(String begTime, String endTime);
-    //根据区域统计上报、下发数据
+    //根据区域统计上报
     List<AreaReportResponse> statisticsByArea(String begTime, String endTime);
 
+    //根据区域统计上下发数据
+    List<AreaReportResponse> statisticsByXfArea(String begTime, String endTime);
+
     List<CmdBodyInfo> getCmdBodyInfosByStatus();
     //查询实时上报至返回条数
     List<CommonResponse> getCountByStatus();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
index f674e6b..99eaa0a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -25,4 +27,10 @@
 
     List<TagResponse> getTagResponses(String begTime, String endTime);
 
+    //获取上报至反馈数据  根据时间段
+    List<CommonResponse> getCountByStatus(String begTime, String endTime);
+
+    //获取上报、下发时间趋势
+    List<CmdBodyCommonResponse> getCountByStatusAndTime(String begTime, String endTime, String type);
+
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 5608e1b..fce7ba9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -172,8 +172,6 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
         Summary summaryDetail = summaryService.getById(summary.getId());
-
-
         if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) {
             summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true));
         }
@@ -196,6 +194,18 @@
         if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) {
             summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true));
         }
+        if (ObjectUtil.isNotEmpty(summary.getBrief())) {
+            summaryDetail.setBrief(summary.getBrief());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getDescription())) {
+            summaryDetail.setDescription(summary.getDescription());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getSpecialName())) {
+            summaryDetail.setSpecialName(summary.getSpecialName());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getKeyNote())) {
+            summaryDetail.setKeyNote(summary.getKeyNote());
+        }
 
         return  ResponseData.success(summaryService.update(summaryDetail));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index d69b570..e727d42 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -26,6 +26,9 @@
     List<AreaReportResponse> statisticsByArea(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
+    List<AreaReportResponse> statisticsByXfArea(@Param("begTime") String begTime,
+                                              @Param("endTime") String endTime);
+
     Integer getJudgeCountByTime(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 7d8c481..90ec0ad 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import org.apache.ibatis.annotations.Param;
@@ -17,6 +19,14 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
-    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+    List<TagResponse> getMapList(@Param("begTime") String begTime,
+                                 @Param("endTime") String endTime);
+
+    List<CommonResponse> getCountByStatus(@Param("begTime") String begTime,
+                                          @Param("endTime") String endTime);
+
+    List<CmdBodyCommonResponse> getCountByStatusAndTime(@Param("begTime") String begTime,
+                                                        @Param("endTime") String endTime,
+                                                        @Param("type") String type);
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index e7fa8df..aa7979e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -77,8 +77,9 @@
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,t0.submit_organcode AS submitCode,ci.instruct_organ AS
-        instructOrgan,ci.instruct_post AS instructCode
+        SELECT t0.submit_organ AS submitOrgan,
+        t0.submit_organcode AS submitCode,
+        ci.controls_link AS links
         FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
         WHERE cb.`body_nature`=0
         <if test="begTime!='' and begTime!=null">
@@ -88,7 +89,26 @@
             AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
         </if>
 
-        ) t0 LEFT JOIN cmd_body_instruct ci ON
+        ) t0 LEFT JOIN cmd_controls_info ci ON
+        t0.body_id = ci.body_id
+
+    </select>
+
+    <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
+
+        SELECT t0.instruct_organ AS instructOrgan,
+        t0.instruct_post AS instructCode,
+        ci.controls_link AS links
+        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
+        WHERE 1=1
+        <if test="begTime!='' and begTime!=null">
+            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
+        ) t0 LEFT JOIN cmd_controls_info ci ON
         t0.body_id = ci.body_id
 
     </select>
@@ -113,7 +133,14 @@
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
-        </if>) t
+        </if>
+     <!--   <if test="begTime!='' and begTime!=null">
+            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>-->
+        ) t
         GROUP BY
         t.organ
     </select>
@@ -124,7 +151,7 @@
         SELECT t.organ AS name, sum(t.links ) AS value FROM (
         SELECT cbi.`instruct_organ` as organ ,cc.`controls_link` as links FROM cmd_body_info cb
         LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id =  cb.body_id
+        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id = cb.body_id
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index 4c4ebce..87fb876 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -22,11 +22,10 @@
     </sql>
 
 
-
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT  cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
+        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
         FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id=  cci.tag_id
+        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
         WHERE 1 = 1
         <if test="begTime!='' and begTime!=null">
             AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
@@ -38,4 +37,42 @@
 
     </select>
 
+
+    <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
+
+        SELECT t.bodyState AS name, sum(t.links) AS value
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE cb.roam_operation in ('1', '2', '5', '6', '7', '8.3')
+
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+        GROUP BY
+        t.bodyState
+    </select>
+
+
+    <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+
+        SELECT t.links as links,t.roamTime as resultTime
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE 1=1
+        <if test="type != null  and  type != ''">
+            and cb.roam_operation = #{type}
+        </if>
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
index 87d02db..7c45998 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
@@ -17,10 +17,10 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value
+        SELECT t1.`tag_name` AS name, t0.tagCount AS value
         FROM cmd_body_tag t1
         LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount
+        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
         FROM cmd_controls_info a WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 6cca13a..0b92ef4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -40,9 +40,9 @@
 
 
     <select id="getWebList" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
-        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb
+        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb,IFNULL(cc.controls_link,0) as links
         FROM cmd_controls_info cc
-        WHERE cc.`body_id` IN (SELECT cb.`body_id` FROM cmd_body_info cb WHERE cb.`body_nature` = 0)
+        WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND cc.create_time <![CDATA[  >=  ]]> #{begTime}
         </if>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
index 3ab6334..8c8b9a4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
@@ -13,4 +13,6 @@
 
     private String instructOrgan;
 
+    private String links;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
index 8142f95..f15a9d3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
@@ -18,5 +18,7 @@
     //用于初始化和点击事件刷新地图数据区分 1：点击事件，0：初始化
     private boolean flag;
 
+    private int page;
+
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
index c620ea2..0cc0d72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -14,4 +14,7 @@
     //时间
     private String resultTime;
 
+    //关联条数
+    private String links;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
index d2c480c..71a828f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -13,4 +13,6 @@
 
     private Long secondId;
 
+    private int page;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java
index 66a8432..b300397 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java
@@ -24,9 +24,12 @@
     List<CmdBodyInfo> getCmdBodyInfoByTag(String begTime, String endTime);
     //根据上报、下发时间统计信息数
     List<CmdBodyCommonResponse> getCountByTime(String begTime, String endTime);
-    //根据区域统计上报、下发数据
+    //根据区域统计上报
     List<AreaReportResponse> statisticsByArea(String begTime, String endTime);
 
+    //根据区域统计上下发数据
+    List<AreaReportResponse> statisticsByXfArea(String begTime, String endTime);
+
     List<CmdBodyInfo> getCmdBodyInfosByStatus();
     //查询实时上报至返回条数
     List<CommonResponse> getCountByStatus();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
index f674e6b..99eaa0a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -25,4 +27,10 @@
 
     List<TagResponse> getTagResponses(String begTime, String endTime);
 
+    //获取上报至反馈数据  根据时间段
+    List<CommonResponse> getCountByStatus(String begTime, String endTime);
+
+    //获取上报、下发时间趋势
+    List<CmdBodyCommonResponse> getCountByStatusAndTime(String begTime, String endTime, String type);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java
index 2b1cb1f..2386135 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java
@@ -50,6 +50,11 @@
     }
 
     @Override
+    public List<AreaReportResponse> statisticsByXfArea(String begTime, String endTime) {
+        return this.baseMapper.statisticsByXfArea(begTime, endTime);
+    }
+
+    @Override
     public List<CmdBodyInfo> getCmdBodyInfosByStatus() {
         QueryWrapper<CmdBodyInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("body_nature", "0");

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 5608e1b..fce7ba9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -172,8 +172,6 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
         Summary summaryDetail = summaryService.getById(summary.getId());
-
-
         if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) {
             summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true));
         }
@@ -196,6 +194,18 @@
         if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) {
             summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true));
         }
+        if (ObjectUtil.isNotEmpty(summary.getBrief())) {
+            summaryDetail.setBrief(summary.getBrief());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getDescription())) {
+            summaryDetail.setDescription(summary.getDescription());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getSpecialName())) {
+            summaryDetail.setSpecialName(summary.getSpecialName());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getKeyNote())) {
+            summaryDetail.setKeyNote(summary.getKeyNote());
+        }
 
         return  ResponseData.success(summaryService.update(summaryDetail));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index d69b570..e727d42 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -26,6 +26,9 @@
     List<AreaReportResponse> statisticsByArea(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
+    List<AreaReportResponse> statisticsByXfArea(@Param("begTime") String begTime,
+                                              @Param("endTime") String endTime);
+
     Integer getJudgeCountByTime(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 7d8c481..90ec0ad 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import org.apache.ibatis.annotations.Param;
@@ -17,6 +19,14 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
-    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+    List<TagResponse> getMapList(@Param("begTime") String begTime,
+                                 @Param("endTime") String endTime);
+
+    List<CommonResponse> getCountByStatus(@Param("begTime") String begTime,
+                                          @Param("endTime") String endTime);
+
+    List<CmdBodyCommonResponse> getCountByStatusAndTime(@Param("begTime") String begTime,
+                                                        @Param("endTime") String endTime,
+                                                        @Param("type") String type);
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index e7fa8df..aa7979e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -77,8 +77,9 @@
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,t0.submit_organcode AS submitCode,ci.instruct_organ AS
-        instructOrgan,ci.instruct_post AS instructCode
+        SELECT t0.submit_organ AS submitOrgan,
+        t0.submit_organcode AS submitCode,
+        ci.controls_link AS links
         FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
         WHERE cb.`body_nature`=0
         <if test="begTime!='' and begTime!=null">
@@ -88,7 +89,26 @@
             AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
         </if>
 
-        ) t0 LEFT JOIN cmd_body_instruct ci ON
+        ) t0 LEFT JOIN cmd_controls_info ci ON
+        t0.body_id = ci.body_id
+
+    </select>
+
+    <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
+
+        SELECT t0.instruct_organ AS instructOrgan,
+        t0.instruct_post AS instructCode,
+        ci.controls_link AS links
+        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
+        WHERE 1=1
+        <if test="begTime!='' and begTime!=null">
+            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
+        ) t0 LEFT JOIN cmd_controls_info ci ON
         t0.body_id = ci.body_id
 
     </select>
@@ -113,7 +133,14 @@
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
-        </if>) t
+        </if>
+     <!--   <if test="begTime!='' and begTime!=null">
+            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>-->
+        ) t
         GROUP BY
         t.organ
     </select>
@@ -124,7 +151,7 @@
         SELECT t.organ AS name, sum(t.links ) AS value FROM (
         SELECT cbi.`instruct_organ` as organ ,cc.`controls_link` as links FROM cmd_body_info cb
         LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id =  cb.body_id
+        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id = cb.body_id
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index 4c4ebce..87fb876 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -22,11 +22,10 @@
     </sql>
 
 
-
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT  cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
+        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
         FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id=  cci.tag_id
+        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
         WHERE 1 = 1
         <if test="begTime!='' and begTime!=null">
             AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
@@ -38,4 +37,42 @@
 
     </select>
 
+
+    <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
+
+        SELECT t.bodyState AS name, sum(t.links) AS value
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE cb.roam_operation in ('1', '2', '5', '6', '7', '8.3')
+
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+        GROUP BY
+        t.bodyState
+    </select>
+
+
+    <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+
+        SELECT t.links as links,t.roamTime as resultTime
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE 1=1
+        <if test="type != null  and  type != ''">
+            and cb.roam_operation = #{type}
+        </if>
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
index 87d02db..7c45998 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
@@ -17,10 +17,10 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value
+        SELECT t1.`tag_name` AS name, t0.tagCount AS value
         FROM cmd_body_tag t1
         LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount
+        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
         FROM cmd_controls_info a WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 6cca13a..0b92ef4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -40,9 +40,9 @@
 
 
     <select id="getWebList" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
-        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb
+        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb,IFNULL(cc.controls_link,0) as links
         FROM cmd_controls_info cc
-        WHERE cc.`body_id` IN (SELECT cb.`body_id` FROM cmd_body_info cb WHERE cb.`body_nature` = 0)
+        WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND cc.create_time <![CDATA[  >=  ]]> #{begTime}
         </if>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
index 3ab6334..8c8b9a4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
@@ -13,4 +13,6 @@
 
     private String instructOrgan;
 
+    private String links;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
index 8142f95..f15a9d3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
@@ -18,5 +18,7 @@
     //用于初始化和点击事件刷新地图数据区分 1：点击事件，0：初始化
     private boolean flag;
 
+    private int page;
+
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
index c620ea2..0cc0d72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -14,4 +14,7 @@
     //时间
     private String resultTime;
 
+    //关联条数
+    private String links;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
index d2c480c..71a828f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -13,4 +13,6 @@
 
     private Long secondId;
 
+    private int page;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java
index 66a8432..b300397 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java
@@ -24,9 +24,12 @@
     List<CmdBodyInfo> getCmdBodyInfoByTag(String begTime, String endTime);
     //根据上报、下发时间统计信息数
     List<CmdBodyCommonResponse> getCountByTime(String begTime, String endTime);
-    //根据区域统计上报、下发数据
+    //根据区域统计上报
     List<AreaReportResponse> statisticsByArea(String begTime, String endTime);
 
+    //根据区域统计上下发数据
+    List<AreaReportResponse> statisticsByXfArea(String begTime, String endTime);
+
     List<CmdBodyInfo> getCmdBodyInfosByStatus();
     //查询实时上报至返回条数
     List<CommonResponse> getCountByStatus();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
index f674e6b..99eaa0a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -25,4 +27,10 @@
 
     List<TagResponse> getTagResponses(String begTime, String endTime);
 
+    //获取上报至反馈数据  根据时间段
+    List<CommonResponse> getCountByStatus(String begTime, String endTime);
+
+    //获取上报、下发时间趋势
+    List<CmdBodyCommonResponse> getCountByStatusAndTime(String begTime, String endTime, String type);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java
index 2b1cb1f..2386135 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java
@@ -50,6 +50,11 @@
     }
 
     @Override
+    public List<AreaReportResponse> statisticsByXfArea(String begTime, String endTime) {
+        return this.baseMapper.statisticsByXfArea(begTime, endTime);
+    }
+
+    @Override
     public List<CmdBodyInfo> getCmdBodyInfosByStatus() {
         QueryWrapper<CmdBodyInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("body_nature", "0");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
index 46ec4e1..aa7cd2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
@@ -3,6 +3,8 @@
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.service.AbstractDictService;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.enums.DictEnum;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
@@ -71,4 +73,14 @@
     public List<TagResponse> getTagResponses(String begTime, String endTime) {
         return this.baseMapper.getMapList(begTime,endTime);
     }
+
+    @Override
+    public List<CommonResponse> getCountByStatus(String begTime, String endTime) {
+        return this.baseMapper.getCountByStatus(begTime,endTime);
+    }
+
+    @Override
+    public List<CmdBodyCommonResponse> getCountByStatusAndTime(String begTime, String endTime, String type) {
+        return this.baseMapper.getCountByStatusAndTime(begTime,endTime,type);
+    }
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 5608e1b..fce7ba9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -172,8 +172,6 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
         Summary summaryDetail = summaryService.getById(summary.getId());
-
-
         if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) {
             summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true));
         }
@@ -196,6 +194,18 @@
         if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) {
             summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true));
         }
+        if (ObjectUtil.isNotEmpty(summary.getBrief())) {
+            summaryDetail.setBrief(summary.getBrief());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getDescription())) {
+            summaryDetail.setDescription(summary.getDescription());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getSpecialName())) {
+            summaryDetail.setSpecialName(summary.getSpecialName());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getKeyNote())) {
+            summaryDetail.setKeyNote(summary.getKeyNote());
+        }
 
         return  ResponseData.success(summaryService.update(summaryDetail));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index d69b570..e727d42 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -26,6 +26,9 @@
     List<AreaReportResponse> statisticsByArea(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
+    List<AreaReportResponse> statisticsByXfArea(@Param("begTime") String begTime,
+                                              @Param("endTime") String endTime);
+
     Integer getJudgeCountByTime(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 7d8c481..90ec0ad 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import org.apache.ibatis.annotations.Param;
@@ -17,6 +19,14 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
-    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+    List<TagResponse> getMapList(@Param("begTime") String begTime,
+                                 @Param("endTime") String endTime);
+
+    List<CommonResponse> getCountByStatus(@Param("begTime") String begTime,
+                                          @Param("endTime") String endTime);
+
+    List<CmdBodyCommonResponse> getCountByStatusAndTime(@Param("begTime") String begTime,
+                                                        @Param("endTime") String endTime,
+                                                        @Param("type") String type);
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index e7fa8df..aa7979e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -77,8 +77,9 @@
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,t0.submit_organcode AS submitCode,ci.instruct_organ AS
-        instructOrgan,ci.instruct_post AS instructCode
+        SELECT t0.submit_organ AS submitOrgan,
+        t0.submit_organcode AS submitCode,
+        ci.controls_link AS links
         FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
         WHERE cb.`body_nature`=0
         <if test="begTime!='' and begTime!=null">
@@ -88,7 +89,26 @@
             AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
         </if>
 
-        ) t0 LEFT JOIN cmd_body_instruct ci ON
+        ) t0 LEFT JOIN cmd_controls_info ci ON
+        t0.body_id = ci.body_id
+
+    </select>
+
+    <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
+
+        SELECT t0.instruct_organ AS instructOrgan,
+        t0.instruct_post AS instructCode,
+        ci.controls_link AS links
+        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
+        WHERE 1=1
+        <if test="begTime!='' and begTime!=null">
+            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
+        ) t0 LEFT JOIN cmd_controls_info ci ON
         t0.body_id = ci.body_id
 
     </select>
@@ -113,7 +133,14 @@
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
-        </if>) t
+        </if>
+     <!--   <if test="begTime!='' and begTime!=null">
+            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>-->
+        ) t
         GROUP BY
         t.organ
     </select>
@@ -124,7 +151,7 @@
         SELECT t.organ AS name, sum(t.links ) AS value FROM (
         SELECT cbi.`instruct_organ` as organ ,cc.`controls_link` as links FROM cmd_body_info cb
         LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id =  cb.body_id
+        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id = cb.body_id
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index 4c4ebce..87fb876 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -22,11 +22,10 @@
     </sql>
 
 
-
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT  cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
+        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
         FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id=  cci.tag_id
+        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
         WHERE 1 = 1
         <if test="begTime!='' and begTime!=null">
             AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
@@ -38,4 +37,42 @@
 
     </select>
 
+
+    <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
+
+        SELECT t.bodyState AS name, sum(t.links) AS value
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE cb.roam_operation in ('1', '2', '5', '6', '7', '8.3')
+
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+        GROUP BY
+        t.bodyState
+    </select>
+
+
+    <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+
+        SELECT t.links as links,t.roamTime as resultTime
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE 1=1
+        <if test="type != null  and  type != ''">
+            and cb.roam_operation = #{type}
+        </if>
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
index 87d02db..7c45998 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
@@ -17,10 +17,10 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value
+        SELECT t1.`tag_name` AS name, t0.tagCount AS value
         FROM cmd_body_tag t1
         LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount
+        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
         FROM cmd_controls_info a WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 6cca13a..0b92ef4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -40,9 +40,9 @@
 
 
     <select id="getWebList" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
-        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb
+        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb,IFNULL(cc.controls_link,0) as links
         FROM cmd_controls_info cc
-        WHERE cc.`body_id` IN (SELECT cb.`body_id` FROM cmd_body_info cb WHERE cb.`body_nature` = 0)
+        WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND cc.create_time <![CDATA[  >=  ]]> #{begTime}
         </if>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
index 3ab6334..8c8b9a4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
@@ -13,4 +13,6 @@
 
     private String instructOrgan;
 
+    private String links;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
index 8142f95..f15a9d3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
@@ -18,5 +18,7 @@
     //用于初始化和点击事件刷新地图数据区分 1：点击事件，0：初始化
     private boolean flag;
 
+    private int page;
+
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
index c620ea2..0cc0d72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -14,4 +14,7 @@
     //时间
     private String resultTime;
 
+    //关联条数
+    private String links;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
index d2c480c..71a828f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -13,4 +13,6 @@
 
     private Long secondId;
 
+    private int page;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java
index 66a8432..b300397 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java
@@ -24,9 +24,12 @@
     List<CmdBodyInfo> getCmdBodyInfoByTag(String begTime, String endTime);
     //根据上报、下发时间统计信息数
     List<CmdBodyCommonResponse> getCountByTime(String begTime, String endTime);
-    //根据区域统计上报、下发数据
+    //根据区域统计上报
     List<AreaReportResponse> statisticsByArea(String begTime, String endTime);
 
+    //根据区域统计上下发数据
+    List<AreaReportResponse> statisticsByXfArea(String begTime, String endTime);
+
     List<CmdBodyInfo> getCmdBodyInfosByStatus();
     //查询实时上报至返回条数
     List<CommonResponse> getCountByStatus();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
index f674e6b..99eaa0a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -25,4 +27,10 @@
 
     List<TagResponse> getTagResponses(String begTime, String endTime);
 
+    //获取上报至反馈数据  根据时间段
+    List<CommonResponse> getCountByStatus(String begTime, String endTime);
+
+    //获取上报、下发时间趋势
+    List<CmdBodyCommonResponse> getCountByStatusAndTime(String begTime, String endTime, String type);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java
index 2b1cb1f..2386135 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java
@@ -50,6 +50,11 @@
     }
 
     @Override
+    public List<AreaReportResponse> statisticsByXfArea(String begTime, String endTime) {
+        return this.baseMapper.statisticsByXfArea(begTime, endTime);
+    }
+
+    @Override
     public List<CmdBodyInfo> getCmdBodyInfosByStatus() {
         QueryWrapper<CmdBodyInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("body_nature", "0");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
index 46ec4e1..aa7cd2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
@@ -3,6 +3,8 @@
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.service.AbstractDictService;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.enums.DictEnum;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
@@ -71,4 +73,14 @@
     public List<TagResponse> getTagResponses(String begTime, String endTime) {
         return this.baseMapper.getMapList(begTime,endTime);
     }
+
+    @Override
+    public List<CommonResponse> getCountByStatus(String begTime, String endTime) {
+        return this.baseMapper.getCountByStatus(begTime,endTime);
+    }
+
+    @Override
+    public List<CmdBodyCommonResponse> getCountByStatusAndTime(String begTime, String endTime, String type) {
+        return this.baseMapper.getCountByStatusAndTime(begTime,endTime,type);
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java
index 9581bea..4cc1fa8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
 import com.casic.missiles.modular.system.dto.CommonRequest;
@@ -25,7 +26,13 @@
 
     @Override
     public List<CommonRequest> statisticsByTag(BusinessReportInfoRequest request) {
-        return this.baseMapper.statisticsByTag(request.getBeginTime(),request.getEndTime());
+        List<CommonRequest> commonRequestList = this.baseMapper.statisticsByTag(request.getBeginTime(),request.getEndTime());
+        commonRequestList.forEach(commonRequest -> {
+            commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue())&&commonRequest.getValue().contains(".")?
+                    commonRequest.getValue().substring(0,commonRequest.getValue().indexOf(".")):
+                    commonRequest.getValue());
+        });
+        return commonRequestList;
     }
 
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 5608e1b..fce7ba9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -172,8 +172,6 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
         Summary summaryDetail = summaryService.getById(summary.getId());
-
-
         if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) {
             summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true));
         }
@@ -196,6 +194,18 @@
         if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) {
             summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true));
         }
+        if (ObjectUtil.isNotEmpty(summary.getBrief())) {
+            summaryDetail.setBrief(summary.getBrief());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getDescription())) {
+            summaryDetail.setDescription(summary.getDescription());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getSpecialName())) {
+            summaryDetail.setSpecialName(summary.getSpecialName());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getKeyNote())) {
+            summaryDetail.setKeyNote(summary.getKeyNote());
+        }
 
         return  ResponseData.success(summaryService.update(summaryDetail));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index d69b570..e727d42 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -26,6 +26,9 @@
     List<AreaReportResponse> statisticsByArea(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
+    List<AreaReportResponse> statisticsByXfArea(@Param("begTime") String begTime,
+                                              @Param("endTime") String endTime);
+
     Integer getJudgeCountByTime(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 7d8c481..90ec0ad 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import org.apache.ibatis.annotations.Param;
@@ -17,6 +19,14 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
-    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+    List<TagResponse> getMapList(@Param("begTime") String begTime,
+                                 @Param("endTime") String endTime);
+
+    List<CommonResponse> getCountByStatus(@Param("begTime") String begTime,
+                                          @Param("endTime") String endTime);
+
+    List<CmdBodyCommonResponse> getCountByStatusAndTime(@Param("begTime") String begTime,
+                                                        @Param("endTime") String endTime,
+                                                        @Param("type") String type);
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index e7fa8df..aa7979e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -77,8 +77,9 @@
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,t0.submit_organcode AS submitCode,ci.instruct_organ AS
-        instructOrgan,ci.instruct_post AS instructCode
+        SELECT t0.submit_organ AS submitOrgan,
+        t0.submit_organcode AS submitCode,
+        ci.controls_link AS links
         FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
         WHERE cb.`body_nature`=0
         <if test="begTime!='' and begTime!=null">
@@ -88,7 +89,26 @@
             AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
         </if>
 
-        ) t0 LEFT JOIN cmd_body_instruct ci ON
+        ) t0 LEFT JOIN cmd_controls_info ci ON
+        t0.body_id = ci.body_id
+
+    </select>
+
+    <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
+
+        SELECT t0.instruct_organ AS instructOrgan,
+        t0.instruct_post AS instructCode,
+        ci.controls_link AS links
+        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
+        WHERE 1=1
+        <if test="begTime!='' and begTime!=null">
+            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
+        ) t0 LEFT JOIN cmd_controls_info ci ON
         t0.body_id = ci.body_id
 
     </select>
@@ -113,7 +133,14 @@
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
-        </if>) t
+        </if>
+     <!--   <if test="begTime!='' and begTime!=null">
+            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>-->
+        ) t
         GROUP BY
         t.organ
     </select>
@@ -124,7 +151,7 @@
         SELECT t.organ AS name, sum(t.links ) AS value FROM (
         SELECT cbi.`instruct_organ` as organ ,cc.`controls_link` as links FROM cmd_body_info cb
         LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id =  cb.body_id
+        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id = cb.body_id
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index 4c4ebce..87fb876 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -22,11 +22,10 @@
     </sql>
 
 
-
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT  cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
+        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
         FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id=  cci.tag_id
+        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
         WHERE 1 = 1
         <if test="begTime!='' and begTime!=null">
             AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
@@ -38,4 +37,42 @@
 
     </select>
 
+
+    <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
+
+        SELECT t.bodyState AS name, sum(t.links) AS value
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE cb.roam_operation in ('1', '2', '5', '6', '7', '8.3')
+
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+        GROUP BY
+        t.bodyState
+    </select>
+
+
+    <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+
+        SELECT t.links as links,t.roamTime as resultTime
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE 1=1
+        <if test="type != null  and  type != ''">
+            and cb.roam_operation = #{type}
+        </if>
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
index 87d02db..7c45998 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
@@ -17,10 +17,10 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value
+        SELECT t1.`tag_name` AS name, t0.tagCount AS value
         FROM cmd_body_tag t1
         LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount
+        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
         FROM cmd_controls_info a WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 6cca13a..0b92ef4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -40,9 +40,9 @@
 
 
     <select id="getWebList" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
-        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb
+        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb,IFNULL(cc.controls_link,0) as links
         FROM cmd_controls_info cc
-        WHERE cc.`body_id` IN (SELECT cb.`body_id` FROM cmd_body_info cb WHERE cb.`body_nature` = 0)
+        WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND cc.create_time <![CDATA[  >=  ]]> #{begTime}
         </if>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
index 3ab6334..8c8b9a4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
@@ -13,4 +13,6 @@
 
     private String instructOrgan;
 
+    private String links;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
index 8142f95..f15a9d3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
@@ -18,5 +18,7 @@
     //用于初始化和点击事件刷新地图数据区分 1：点击事件，0：初始化
     private boolean flag;
 
+    private int page;
+
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
index c620ea2..0cc0d72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -14,4 +14,7 @@
     //时间
     private String resultTime;
 
+    //关联条数
+    private String links;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
index d2c480c..71a828f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -13,4 +13,6 @@
 
     private Long secondId;
 
+    private int page;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java
index 66a8432..b300397 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java
@@ -24,9 +24,12 @@
     List<CmdBodyInfo> getCmdBodyInfoByTag(String begTime, String endTime);
     //根据上报、下发时间统计信息数
     List<CmdBodyCommonResponse> getCountByTime(String begTime, String endTime);
-    //根据区域统计上报、下发数据
+    //根据区域统计上报
     List<AreaReportResponse> statisticsByArea(String begTime, String endTime);
 
+    //根据区域统计上下发数据
+    List<AreaReportResponse> statisticsByXfArea(String begTime, String endTime);
+
     List<CmdBodyInfo> getCmdBodyInfosByStatus();
     //查询实时上报至返回条数
     List<CommonResponse> getCountByStatus();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
index f674e6b..99eaa0a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -25,4 +27,10 @@
 
     List<TagResponse> getTagResponses(String begTime, String endTime);
 
+    //获取上报至反馈数据  根据时间段
+    List<CommonResponse> getCountByStatus(String begTime, String endTime);
+
+    //获取上报、下发时间趋势
+    List<CmdBodyCommonResponse> getCountByStatusAndTime(String begTime, String endTime, String type);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java
index 2b1cb1f..2386135 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java
@@ -50,6 +50,11 @@
     }
 
     @Override
+    public List<AreaReportResponse> statisticsByXfArea(String begTime, String endTime) {
+        return this.baseMapper.statisticsByXfArea(begTime, endTime);
+    }
+
+    @Override
     public List<CmdBodyInfo> getCmdBodyInfosByStatus() {
         QueryWrapper<CmdBodyInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("body_nature", "0");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
index 46ec4e1..aa7cd2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
@@ -3,6 +3,8 @@
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.service.AbstractDictService;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.enums.DictEnum;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
@@ -71,4 +73,14 @@
     public List<TagResponse> getTagResponses(String begTime, String endTime) {
         return this.baseMapper.getMapList(begTime,endTime);
     }
+
+    @Override
+    public List<CommonResponse> getCountByStatus(String begTime, String endTime) {
+        return this.baseMapper.getCountByStatus(begTime,endTime);
+    }
+
+    @Override
+    public List<CmdBodyCommonResponse> getCountByStatusAndTime(String begTime, String endTime, String type) {
+        return this.baseMapper.getCountByStatusAndTime(begTime,endTime,type);
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java
index 9581bea..4cc1fa8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
 import com.casic.missiles.modular.system.dto.CommonRequest;
@@ -25,7 +26,13 @@
 
     @Override
     public List<CommonRequest> statisticsByTag(BusinessReportInfoRequest request) {
-        return this.baseMapper.statisticsByTag(request.getBeginTime(),request.getEndTime());
+        List<CommonRequest> commonRequestList = this.baseMapper.statisticsByTag(request.getBeginTime(),request.getEndTime());
+        commonRequestList.forEach(commonRequest -> {
+            commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue())&&commonRequest.getValue().contains(".")?
+                    commonRequest.getValue().substring(0,commonRequest.getValue().indexOf(".")):
+                    commonRequest.getValue());
+        });
+        return commonRequestList;
     }
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java
index 74b674a..fcbb89d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java
@@ -20,6 +20,7 @@
 import com.casic.missiles.modular.system.service.ICmdBodyInfoService;
 import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.casic.missiles.modular.system.service.IJudgmentService;
+import com.casic.missiles.modular.system.util.ToolUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -332,7 +333,8 @@
 
     @Override
     public Map<String, Object> statisticsByDateTime(JudgmentRequest judgmentRequest) {
-        return iBusinessAccessService.getAccessStatus("2-sj") ?
+        return iBusinessAccessService.getAccessStatus("2-sj")&&
+                (ToolUtils.pageArr[1]==judgmentRequest.getPage()) ?
                 getDataByOther(judgmentRequest) :
                 getDataByLocal(judgmentRequest);
 
@@ -396,7 +398,7 @@
 
         Judgment judgment = this.baseMapper.selectById(judgmentRequest.getSecondId());
 
-        judgment.setJudgmentTotal(iBusinessAccessService.getAccessStatus("2-bt") ?
+        judgment.setJudgmentTotal(iBusinessAccessService.getAccessStatus("2-bt") && (ToolUtils.pageArr[1]==judgmentRequest.getPage())?
                 iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()) : judgment.getJudgmentTotal());
         if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle());
@@ -585,7 +587,7 @@
     //从本地接口获取
     public List<Map<String, Object>> getByLocal(JudgmentRequest judgmentRequest) {
         List<Map<String, Object>> resultList = new ArrayList<>();
-        Judgment judgment = this.getById(judgmentRequest.getSecondId());
+        Judgment judgment = this.baseMapper.selectById(judgmentRequest.getSecondId());
         if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getTagResult())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getTagResult());
             List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 5608e1b..fce7ba9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -172,8 +172,6 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
         Summary summaryDetail = summaryService.getById(summary.getId());
-
-
         if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) {
             summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true));
         }
@@ -196,6 +194,18 @@
         if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) {
             summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true));
         }
+        if (ObjectUtil.isNotEmpty(summary.getBrief())) {
+            summaryDetail.setBrief(summary.getBrief());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getDescription())) {
+            summaryDetail.setDescription(summary.getDescription());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getSpecialName())) {
+            summaryDetail.setSpecialName(summary.getSpecialName());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getKeyNote())) {
+            summaryDetail.setKeyNote(summary.getKeyNote());
+        }
 
         return  ResponseData.success(summaryService.update(summaryDetail));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index d69b570..e727d42 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -26,6 +26,9 @@
     List<AreaReportResponse> statisticsByArea(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
+    List<AreaReportResponse> statisticsByXfArea(@Param("begTime") String begTime,
+                                              @Param("endTime") String endTime);
+
     Integer getJudgeCountByTime(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 7d8c481..90ec0ad 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import org.apache.ibatis.annotations.Param;
@@ -17,6 +19,14 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
-    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+    List<TagResponse> getMapList(@Param("begTime") String begTime,
+                                 @Param("endTime") String endTime);
+
+    List<CommonResponse> getCountByStatus(@Param("begTime") String begTime,
+                                          @Param("endTime") String endTime);
+
+    List<CmdBodyCommonResponse> getCountByStatusAndTime(@Param("begTime") String begTime,
+                                                        @Param("endTime") String endTime,
+                                                        @Param("type") String type);
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index e7fa8df..aa7979e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -77,8 +77,9 @@
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,t0.submit_organcode AS submitCode,ci.instruct_organ AS
-        instructOrgan,ci.instruct_post AS instructCode
+        SELECT t0.submit_organ AS submitOrgan,
+        t0.submit_organcode AS submitCode,
+        ci.controls_link AS links
         FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
         WHERE cb.`body_nature`=0
         <if test="begTime!='' and begTime!=null">
@@ -88,7 +89,26 @@
             AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
         </if>
 
-        ) t0 LEFT JOIN cmd_body_instruct ci ON
+        ) t0 LEFT JOIN cmd_controls_info ci ON
+        t0.body_id = ci.body_id
+
+    </select>
+
+    <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
+
+        SELECT t0.instruct_organ AS instructOrgan,
+        t0.instruct_post AS instructCode,
+        ci.controls_link AS links
+        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
+        WHERE 1=1
+        <if test="begTime!='' and begTime!=null">
+            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
+        ) t0 LEFT JOIN cmd_controls_info ci ON
         t0.body_id = ci.body_id
 
     </select>
@@ -113,7 +133,14 @@
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
-        </if>) t
+        </if>
+     <!--   <if test="begTime!='' and begTime!=null">
+            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>-->
+        ) t
         GROUP BY
         t.organ
     </select>
@@ -124,7 +151,7 @@
         SELECT t.organ AS name, sum(t.links ) AS value FROM (
         SELECT cbi.`instruct_organ` as organ ,cc.`controls_link` as links FROM cmd_body_info cb
         LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id =  cb.body_id
+        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id = cb.body_id
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index 4c4ebce..87fb876 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -22,11 +22,10 @@
     </sql>
 
 
-
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT  cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
+        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
         FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id=  cci.tag_id
+        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
         WHERE 1 = 1
         <if test="begTime!='' and begTime!=null">
             AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
@@ -38,4 +37,42 @@
 
     </select>
 
+
+    <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
+
+        SELECT t.bodyState AS name, sum(t.links) AS value
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE cb.roam_operation in ('1', '2', '5', '6', '7', '8.3')
+
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+        GROUP BY
+        t.bodyState
+    </select>
+
+
+    <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+
+        SELECT t.links as links,t.roamTime as resultTime
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE 1=1
+        <if test="type != null  and  type != ''">
+            and cb.roam_operation = #{type}
+        </if>
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
index 87d02db..7c45998 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
@@ -17,10 +17,10 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value
+        SELECT t1.`tag_name` AS name, t0.tagCount AS value
         FROM cmd_body_tag t1
         LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount
+        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
         FROM cmd_controls_info a WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 6cca13a..0b92ef4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -40,9 +40,9 @@
 
 
     <select id="getWebList" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
-        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb
+        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb,IFNULL(cc.controls_link,0) as links
         FROM cmd_controls_info cc
-        WHERE cc.`body_id` IN (SELECT cb.`body_id` FROM cmd_body_info cb WHERE cb.`body_nature` = 0)
+        WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND cc.create_time <![CDATA[  >=  ]]> #{begTime}
         </if>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
index 3ab6334..8c8b9a4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
@@ -13,4 +13,6 @@
 
     private String instructOrgan;
 
+    private String links;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
index 8142f95..f15a9d3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
@@ -18,5 +18,7 @@
     //用于初始化和点击事件刷新地图数据区分 1：点击事件，0：初始化
     private boolean flag;
 
+    private int page;
+
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
index c620ea2..0cc0d72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -14,4 +14,7 @@
     //时间
     private String resultTime;
 
+    //关联条数
+    private String links;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
index d2c480c..71a828f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -13,4 +13,6 @@
 
     private Long secondId;
 
+    private int page;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java
index 66a8432..b300397 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java
@@ -24,9 +24,12 @@
     List<CmdBodyInfo> getCmdBodyInfoByTag(String begTime, String endTime);
     //根据上报、下发时间统计信息数
     List<CmdBodyCommonResponse> getCountByTime(String begTime, String endTime);
-    //根据区域统计上报、下发数据
+    //根据区域统计上报
     List<AreaReportResponse> statisticsByArea(String begTime, String endTime);
 
+    //根据区域统计上下发数据
+    List<AreaReportResponse> statisticsByXfArea(String begTime, String endTime);
+
     List<CmdBodyInfo> getCmdBodyInfosByStatus();
     //查询实时上报至返回条数
     List<CommonResponse> getCountByStatus();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
index f674e6b..99eaa0a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -25,4 +27,10 @@
 
     List<TagResponse> getTagResponses(String begTime, String endTime);
 
+    //获取上报至反馈数据  根据时间段
+    List<CommonResponse> getCountByStatus(String begTime, String endTime);
+
+    //获取上报、下发时间趋势
+    List<CmdBodyCommonResponse> getCountByStatusAndTime(String begTime, String endTime, String type);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java
index 2b1cb1f..2386135 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java
@@ -50,6 +50,11 @@
     }
 
     @Override
+    public List<AreaReportResponse> statisticsByXfArea(String begTime, String endTime) {
+        return this.baseMapper.statisticsByXfArea(begTime, endTime);
+    }
+
+    @Override
     public List<CmdBodyInfo> getCmdBodyInfosByStatus() {
         QueryWrapper<CmdBodyInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("body_nature", "0");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
index 46ec4e1..aa7cd2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
@@ -3,6 +3,8 @@
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.service.AbstractDictService;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.enums.DictEnum;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
@@ -71,4 +73,14 @@
     public List<TagResponse> getTagResponses(String begTime, String endTime) {
         return this.baseMapper.getMapList(begTime,endTime);
     }
+
+    @Override
+    public List<CommonResponse> getCountByStatus(String begTime, String endTime) {
+        return this.baseMapper.getCountByStatus(begTime,endTime);
+    }
+
+    @Override
+    public List<CmdBodyCommonResponse> getCountByStatusAndTime(String begTime, String endTime, String type) {
+        return this.baseMapper.getCountByStatusAndTime(begTime,endTime,type);
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java
index 9581bea..4cc1fa8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
 import com.casic.missiles.modular.system.dto.CommonRequest;
@@ -25,7 +26,13 @@
 
     @Override
     public List<CommonRequest> statisticsByTag(BusinessReportInfoRequest request) {
-        return this.baseMapper.statisticsByTag(request.getBeginTime(),request.getEndTime());
+        List<CommonRequest> commonRequestList = this.baseMapper.statisticsByTag(request.getBeginTime(),request.getEndTime());
+        commonRequestList.forEach(commonRequest -> {
+            commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue())&&commonRequest.getValue().contains(".")?
+                    commonRequest.getValue().substring(0,commonRequest.getValue().indexOf(".")):
+                    commonRequest.getValue());
+        });
+        return commonRequestList;
     }
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java
index 74b674a..fcbb89d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java
@@ -20,6 +20,7 @@
 import com.casic.missiles.modular.system.service.ICmdBodyInfoService;
 import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.casic.missiles.modular.system.service.IJudgmentService;
+import com.casic.missiles.modular.system.util.ToolUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -332,7 +333,8 @@
 
     @Override
     public Map<String, Object> statisticsByDateTime(JudgmentRequest judgmentRequest) {
-        return iBusinessAccessService.getAccessStatus("2-sj") ?
+        return iBusinessAccessService.getAccessStatus("2-sj")&&
+                (ToolUtils.pageArr[1]==judgmentRequest.getPage()) ?
                 getDataByOther(judgmentRequest) :
                 getDataByLocal(judgmentRequest);
 
@@ -396,7 +398,7 @@
 
         Judgment judgment = this.baseMapper.selectById(judgmentRequest.getSecondId());
 
-        judgment.setJudgmentTotal(iBusinessAccessService.getAccessStatus("2-bt") ?
+        judgment.setJudgmentTotal(iBusinessAccessService.getAccessStatus("2-bt") && (ToolUtils.pageArr[1]==judgmentRequest.getPage())?
                 iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()) : judgment.getJudgmentTotal());
         if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle());
@@ -585,7 +587,7 @@
     //从本地接口获取
     public List<Map<String, Object>> getByLocal(JudgmentRequest judgmentRequest) {
         List<Map<String, Object>> resultList = new ArrayList<>();
-        Judgment judgment = this.getById(judgmentRequest.getSecondId());
+        Judgment judgment = this.baseMapper.selectById(judgmentRequest.getSecondId());
         if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getTagResult())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getTagResult());
             List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java
index d7efb55..40a0497 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java
@@ -18,6 +18,7 @@
 import com.casic.missiles.modular.system.enums.DictEnum;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.*;
+import com.casic.missiles.modular.system.util.ToolUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -65,6 +66,8 @@
 
     @Autowired
     private IBusinessAccessService iBusinessAccessService;
+    @Autowired
+    private ICmdBodyRoamService iCmdBodyRoamService;
 
 
     @Override
@@ -147,7 +150,8 @@
     public RealtimeWork getListByOtherResult(BusinessReportInfoRequest businessReportInfoRequest) {
 
 
-        List<CommonResponse> commonResponseList = iCmdBodyInfoService.getCountByStatus();
+        List<CommonResponse> commonResponseList = iCmdBodyRoamService.getCountByStatus(businessReportInfoRequest.getBeginTime(),
+                businessReportInfoRequest.getEndTime());
 //        List<CmdBodyInfo> cmdBodyInfoList = iCmdBodyInfoService.getCmdBodyInfosByStatus();
         int reportedCount = 0, firstJudgmentCount = 0, secondLeaderCount = 0, firstLeaderCount = 0, sendCount = 0, feedbackCount = 0;
 
@@ -176,7 +180,8 @@
 
     @Override
     public RealtimeWork getResult(BusinessReportInfoRequest businessReportInfoRequest) {
-        return iBusinessAccessService.getAccessStatus("3-lc") ? getListByOtherResult(businessReportInfoRequest) : getListByLocalResult(businessReportInfoRequest.getThirdId());
+        return iBusinessAccessService.getAccessStatus("3-lc") && (ToolUtils.pageArr[2] == businessReportInfoRequest.getPage())
+                ? getListByOtherResult(businessReportInfoRequest) : getListByLocalResult(businessReportInfoRequest.getThirdId());
     }
 
     public List<HashMap<String, Object>> statisticsByHourTime() {
@@ -346,7 +351,9 @@
             resultMap.put("value", 0);
             list.forEach(cmdBodyCommonResponse -> {
                 if (ObjectUtil.isNotEmpty(cmdBodyCommonResponse.getControlsWeb()) && cmdBodyCommonResponse.getControlsWeb().indexOf(dict.getCode()) == 0) {
-                    resultMap.put("value", Long.valueOf(resultMap.get("value") + "") + 1);
+                    resultMap.put("value", Long.valueOf(resultMap.get("value") + "") + (ObjectUtil.isNotEmpty(cmdBodyCommonResponse.getLinks()) &&
+                            StringUtils.isNumeric(cmdBodyCommonResponse.getLinks()) ?
+                            Long.valueOf(cmdBodyCommonResponse.getLinks()) : 0));
                 }
             });
             resultMapList.add(resultMap);
@@ -356,16 +363,22 @@
 
     @Override
     public List<HashMap<String, Object>> statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) {
-        return iBusinessAccessService.getAccessStatus("3-pt") ? statisticsByOtherPlate(businessReportInfoRequest) : statisticsByLocalPlate(businessReportInfoRequest.getThirdId());
+        return iBusinessAccessService.getAccessStatus("3-pt") &&
+                (ToolUtils.pageArr[2] == businessReportInfoRequest.getPage())
+                ? statisticsByOtherPlate(businessReportInfoRequest) : statisticsByLocalPlate(businessReportInfoRequest.getThirdId());
     }
 
     //从第三方获取上报记录
     public Map<String, Object> statisticsByOtherReport(BusinessReportInfoRequest businessReportInfoRequest) {
         Map<String, Object> resultMap = new HashMap<>();
         //获取上报信息
-        List<CmdBodyCommonResponse> sbList = iCmdBodyInfoService.getCountByTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime());
+//        List<CmdBodyCommonResponse> sbList = iCmdBodyInfoService.getCountByTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime());
+
+        List<CmdBodyCommonResponse> sbList = iCmdBodyRoamService.getCountByStatusAndTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime(), DictMapDTO.sbArr[0]);
         //获取下发信息
-        List<CmdBodyCommonResponse> xfList = iCmdBodyInstructService.getCountByTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime());
+//        List<CmdBodyCommonResponse> xfList = iCmdBodyInstructService.getCountByTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime());
+
+        List<CmdBodyCommonResponse> xfList = iCmdBodyRoamService.getCountByStatusAndTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime(), DictMapDTO.xfArr[0]);
 
         List<Map<String, Object>> dpMapList = new ArrayList<>();
         List<Map<String, Object>> sbMapList = new ArrayList<>();
@@ -378,7 +391,7 @@
             sbMap.put("value", 0);
             sbList.forEach(sb -> {
                 if (ObjectUtil.isNotEmpty(sb.getResultTime()) && DateUtil.compare(DateUtil.parseDateTime(sb.getResultTime()), dateTime, "yyyy-MM-dd HH") == 0) {
-                    sbMap.put("value", Long.valueOf(sbMap.get("value") + "") + 1);
+                    sbMap.put("value", Long.valueOf(sbMap.get("value") + "") + (ObjectUtil.isNotEmpty(sb.getLinks()) && StringUtils.isNumeric(sb.getLinks()) ? Long.valueOf(sb.getLinks()) : 0));
                 }
             });
             dpMap.put("value", sbMap.get("value"));
@@ -393,7 +406,7 @@
             xfMap.put("value", 0);
             xfList.forEach(xf -> {
                 if (ObjectUtil.isNotEmpty(xf.getResultTime()) && DateUtil.compare(DateUtil.parseDateTime(xf.getResultTime()), dateTime, "yyyy-MM-dd HH") == 0) {
-                    xfMap.put("value", Long.valueOf(xfMap.get("value") + "") + 1);
+                    xfMap.put("value", Long.valueOf(xfMap.get("value") + "") + (ObjectUtil.isNotEmpty(xf.getLinks()) && StringUtils.isNumeric(xf.getLinks()) ? Long.valueOf(xf.getLinks()) : 0));
                 }
             });
             xfMapList.add(xfMap);
@@ -459,13 +472,22 @@
 
     @Override
     public Map<String, Object> statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest) {
-        return iBusinessAccessService.getAccessStatus("3-sj") ? statisticsByOtherReport(businessReportInfoRequest) : statisticsByLocalReport(businessReportInfoRequest.getThirdId());
+        return iBusinessAccessService.getAccessStatus("3-sj") &&
+                (ToolUtils.pageArr[2] == businessReportInfoRequest.getPage()) ?
+                statisticsByOtherReport(businessReportInfoRequest) :
+                statisticsByLocalReport(businessReportInfoRequest.getThirdId());
     }
 
 
     //从第三方获取标签统计结果
     public List<CommonRequest> statisticsByOtherTag(BusinessReportInfoRequest request) {
-        return iCmdBodyTagService.statisticsByTag(request);
+        List<CommonRequest> commonRequestList = iCmdBodyTagService.statisticsByTag(request);
+        commonRequestList.forEach(commonRequest -> {
+            commonRequest.setName(ObjectUtil.isNotEmpty(commonRequest.getName()) && commonRequest.getName().length() > 6 ? commonRequest.getName().substring(0, 6) : commonRequest.getName());
+            commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue())&&commonRequest.getValue().contains(".") ? commonRequest.getValue().substring(0,commonRequest.getValue().indexOf(".")) : commonRequest.getValue());
+
+        });
+        return commonRequestList;
     }
 
     //从本地获取标签统计结果
@@ -483,7 +505,9 @@
     @Override
     public List<CommonRequest> statisticsByTag(BusinessReportInfoRequest request) {
 
-        return iBusinessAccessService.getAccessStatus("3-bq") ? statisticsByOtherTag(request) : statisticsByLocalTag(request);
+        return iBusinessAccessService.getAccessStatus("3-bq") &&
+                (ToolUtils.pageArr[2] == request.getPage()) ?
+                statisticsByOtherTag(request) : statisticsByLocalTag(request);
     }
 
 
@@ -529,17 +553,21 @@
                 areaList1.add(area);
             }
         });
-        List<AreaReportResponse> responseList = iCmdBodyInfoService.statisticsByArea(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime());
+        List<AreaReportResponse> responseSbList = iCmdBodyInfoService.statisticsByArea(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime());
+        List<AreaReportResponse> responseXfList = iCmdBodyInfoService.statisticsByXfArea(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime());
         areaList1.forEach(area -> {
             CommonResponse commonResponse = new CommonResponse(area.getAreaName(), "0", "0");
-            responseList.forEach(res -> {
+            responseSbList.forEach(res -> {
                 String submitCode = processUtil(res.getSubmitCode());
-                String instructCode = processUtil(res.getInstructCode());
                 if (area.getId().equals(submitCode) || isChild(area.getId(), areaList, submitCode)) {
-                    commonResponse.setValue((Long.valueOf(commonResponse.getValue()) + 1) + "");
+                    commonResponse.setValue((Long.valueOf(commonResponse.getValue()) + (ObjectUtil.isNotEmpty(res.getLinks()) && StringUtils.isNumeric(res.getLinks()) ? Long.valueOf(res.getLinks()) : 0)) + "");
                 }
+
+            });
+            responseXfList.forEach(res1 -> {
+                String instructCode = processUtil(res1.getInstructCode());
                 if (area.getId().equals(instructCode) || isChild(area.getId(), areaList, instructCode)) {
-                    commonResponse.setValue1((Long.valueOf(commonResponse.getValue1()) + 1) + "");
+                    commonResponse.setValue1((Long.valueOf(commonResponse.getValue1()) + (ObjectUtil.isNotEmpty(res1.getLinks()) && StringUtils.isNumeric(res1.getLinks()) ? Long.valueOf(res1.getLinks()) : 0)) + "");
                 }
             });
             resultList.add(commonResponse);
@@ -565,7 +593,10 @@
 
         return businessReportInfoRequest.isFlag() ? clickData(businessReportInfoRequest) :
 
-                (iBusinessAccessService.getAccessStatus("3-qy") ? statisticsByOtherArea(businessReportInfoRequest) : statisticsByLocalArea(businessReportInfoRequest.getThirdId()));
+                (iBusinessAccessService.getAccessStatus("3-qy") &&
+                        (ToolUtils.pageArr[2] == businessReportInfoRequest.getPage()) ?
+                        statisticsByOtherArea(businessReportInfoRequest) :
+                        statisticsByLocalArea(businessReportInfoRequest.getThirdId()));
     }
 
     @Override

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 5608e1b..fce7ba9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -172,8 +172,6 @@
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
         Summary summaryDetail = summaryService.getById(summary.getId());
-
-
         if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) {
             summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true));
         }
@@ -196,6 +194,18 @@
         if (ObjectUtil.isNotEmpty(summary.getProcessDetailList())) {
             summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true));
         }
+        if (ObjectUtil.isNotEmpty(summary.getBrief())) {
+            summaryDetail.setBrief(summary.getBrief());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getDescription())) {
+            summaryDetail.setDescription(summary.getDescription());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getSpecialName())) {
+            summaryDetail.setSpecialName(summary.getSpecialName());
+        }
+        if (ObjectUtil.isNotEmpty(summary.getKeyNote())) {
+            summaryDetail.setKeyNote(summary.getKeyNote());
+        }
 
         return  ResponseData.success(summaryService.update(summaryDetail));
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index d69b570..e727d42 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -26,6 +26,9 @@
     List<AreaReportResponse> statisticsByArea(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
+    List<AreaReportResponse> statisticsByXfArea(@Param("begTime") String begTime,
+                                              @Param("endTime") String endTime);
+
     Integer getJudgeCountByTime(@Param("begTime") String begTime,
                                               @Param("endTime") String endTime);
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 7d8c481..90ec0ad 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import org.apache.ibatis.annotations.Param;
@@ -17,6 +19,14 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
-    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+    List<TagResponse> getMapList(@Param("begTime") String begTime,
+                                 @Param("endTime") String endTime);
+
+    List<CommonResponse> getCountByStatus(@Param("begTime") String begTime,
+                                          @Param("endTime") String endTime);
+
+    List<CmdBodyCommonResponse> getCountByStatusAndTime(@Param("begTime") String begTime,
+                                                        @Param("endTime") String endTime,
+                                                        @Param("type") String type);
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index e7fa8df..aa7979e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -77,8 +77,9 @@
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,t0.submit_organcode AS submitCode,ci.instruct_organ AS
-        instructOrgan,ci.instruct_post AS instructCode
+        SELECT t0.submit_organ AS submitOrgan,
+        t0.submit_organcode AS submitCode,
+        ci.controls_link AS links
         FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
         WHERE cb.`body_nature`=0
         <if test="begTime!='' and begTime!=null">
@@ -88,7 +89,26 @@
             AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
         </if>
 
-        ) t0 LEFT JOIN cmd_body_instruct ci ON
+        ) t0 LEFT JOIN cmd_controls_info ci ON
+        t0.body_id = ci.body_id
+
+    </select>
+
+    <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
+
+        SELECT t0.instruct_organ AS instructOrgan,
+        t0.instruct_post AS instructCode,
+        ci.controls_link AS links
+        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
+        WHERE 1=1
+        <if test="begTime!='' and begTime!=null">
+            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
+        ) t0 LEFT JOIN cmd_controls_info ci ON
         t0.body_id = ci.body_id
 
     </select>
@@ -113,7 +133,14 @@
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
-        </if>) t
+        </if>
+     <!--   <if test="begTime!='' and begTime!=null">
+            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
+        </if>-->
+        ) t
         GROUP BY
         t.organ
     </select>
@@ -124,7 +151,7 @@
         SELECT t.organ AS name, sum(t.links ) AS value FROM (
         SELECT cbi.`instruct_organ` as organ ,cc.`controls_link` as links FROM cmd_body_info cb
         LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id =  cb.body_id
+        LEFT JOIN cmd_body_instruct cbi ON cbi.body_id = cb.body_id
         WHERE cb.`body_nature`=0
         <if test="type != null  and  type != ''">
             and cb.body_state = #{type}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index 4c4ebce..87fb876 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -22,11 +22,10 @@
     </sql>
 
 
-
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT  cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
+        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
         FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id=  cci.tag_id
+        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
         WHERE 1 = 1
         <if test="begTime!='' and begTime!=null">
             AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
@@ -38,4 +37,42 @@
 
     </select>
 
+
+    <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
+
+        SELECT t.bodyState AS name, sum(t.links) AS value
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE cb.roam_operation in ('1', '2', '5', '6', '7', '8.3')
+
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+        GROUP BY
+        t.bodyState
+    </select>
+
+
+    <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+
+        SELECT t.links as links,t.roamTime as resultTime
+        FROM (
+        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
+        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
+        WHERE 1=1
+        <if test="type != null  and  type != ''">
+            and cb.roam_operation = #{type}
+        </if>
+        <if test="begTime!='' and begTime!=null">
+            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) t
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
index 87d02db..7c45998 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
@@ -17,10 +17,10 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value
+        SELECT t1.`tag_name` AS name, t0.tagCount AS value
         FROM cmd_body_tag t1
         LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount
+        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
         FROM cmd_controls_info a WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 6cca13a..0b92ef4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -40,9 +40,9 @@
 
 
     <select id="getWebList" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
-        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb
+        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb,IFNULL(cc.controls_link,0) as links
         FROM cmd_controls_info cc
-        WHERE cc.`body_id` IN (SELECT cb.`body_id` FROM cmd_body_info cb WHERE cb.`body_nature` = 0)
+        WHERE 1=1
         <if test="begTime!='' and begTime!=null">
             AND cc.create_time <![CDATA[  >=  ]]> #{begTime}
         </if>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
index 3ab6334..8c8b9a4 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java
@@ -13,4 +13,6 @@
 
     private String instructOrgan;
 
+    private String links;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
index 8142f95..f15a9d3 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
@@ -18,5 +18,7 @@
     //用于初始化和点击事件刷新地图数据区分 1：点击事件，0：初始化
     private boolean flag;
 
+    private int page;
+
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
index c620ea2..0cc0d72 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -14,4 +14,7 @@
     //时间
     private String resultTime;
 
+    //关联条数
+    private String links;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
index d2c480c..71a828f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -13,4 +13,6 @@
 
     private Long secondId;
 
+    private int page;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java
index 66a8432..b300397 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java
@@ -24,9 +24,12 @@
     List<CmdBodyInfo> getCmdBodyInfoByTag(String begTime, String endTime);
     //根据上报、下发时间统计信息数
     List<CmdBodyCommonResponse> getCountByTime(String begTime, String endTime);
-    //根据区域统计上报、下发数据
+    //根据区域统计上报
     List<AreaReportResponse> statisticsByArea(String begTime, String endTime);
 
+    //根据区域统计上下发数据
+    List<AreaReportResponse> statisticsByXfArea(String begTime, String endTime);
+
     List<CmdBodyInfo> getCmdBodyInfosByStatus();
     //查询实时上报至返回条数
     List<CommonResponse> getCountByStatus();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
index f674e6b..99eaa0a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -25,4 +27,10 @@
 
     List<TagResponse> getTagResponses(String begTime, String endTime);
 
+    //获取上报至反馈数据  根据时间段
+    List<CommonResponse> getCountByStatus(String begTime, String endTime);
+
+    //获取上报、下发时间趋势
+    List<CmdBodyCommonResponse> getCountByStatusAndTime(String begTime, String endTime, String type);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java
index 2b1cb1f..2386135 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java
@@ -50,6 +50,11 @@
     }
 
     @Override
+    public List<AreaReportResponse> statisticsByXfArea(String begTime, String endTime) {
+        return this.baseMapper.statisticsByXfArea(begTime, endTime);
+    }
+
+    @Override
     public List<CmdBodyInfo> getCmdBodyInfosByStatus() {
         QueryWrapper<CmdBodyInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("body_nature", "0");
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
index 46ec4e1..aa7cd2f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
@@ -3,6 +3,8 @@
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.core.application.service.AbstractDictService;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.dto.CommonResponse;
 import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.enums.DictEnum;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
@@ -71,4 +73,14 @@
     public List<TagResponse> getTagResponses(String begTime, String endTime) {
         return this.baseMapper.getMapList(begTime,endTime);
     }
+
+    @Override
+    public List<CommonResponse> getCountByStatus(String begTime, String endTime) {
+        return this.baseMapper.getCountByStatus(begTime,endTime);
+    }
+
+    @Override
+    public List<CmdBodyCommonResponse> getCountByStatusAndTime(String begTime, String endTime, String type) {
+        return this.baseMapper.getCountByStatusAndTime(begTime,endTime,type);
+    }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java
index 9581bea..4cc1fa8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
 import com.casic.missiles.modular.system.dto.CommonRequest;
@@ -25,7 +26,13 @@
 
     @Override
     public List<CommonRequest> statisticsByTag(BusinessReportInfoRequest request) {
-        return this.baseMapper.statisticsByTag(request.getBeginTime(),request.getEndTime());
+        List<CommonRequest> commonRequestList = this.baseMapper.statisticsByTag(request.getBeginTime(),request.getEndTime());
+        commonRequestList.forEach(commonRequest -> {
+            commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue())&&commonRequest.getValue().contains(".")?
+                    commonRequest.getValue().substring(0,commonRequest.getValue().indexOf(".")):
+                    commonRequest.getValue());
+        });
+        return commonRequestList;
     }
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java
index 74b674a..fcbb89d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java
@@ -20,6 +20,7 @@
 import com.casic.missiles.modular.system.service.ICmdBodyInfoService;
 import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.casic.missiles.modular.system.service.IJudgmentService;
+import com.casic.missiles.modular.system.util.ToolUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -332,7 +333,8 @@
 
     @Override
     public Map<String, Object> statisticsByDateTime(JudgmentRequest judgmentRequest) {
-        return iBusinessAccessService.getAccessStatus("2-sj") ?
+        return iBusinessAccessService.getAccessStatus("2-sj")&&
+                (ToolUtils.pageArr[1]==judgmentRequest.getPage()) ?
                 getDataByOther(judgmentRequest) :
                 getDataByLocal(judgmentRequest);
 
@@ -396,7 +398,7 @@
 
         Judgment judgment = this.baseMapper.selectById(judgmentRequest.getSecondId());
 
-        judgment.setJudgmentTotal(iBusinessAccessService.getAccessStatus("2-bt") ?
+        judgment.setJudgmentTotal(iBusinessAccessService.getAccessStatus("2-bt") && (ToolUtils.pageArr[1]==judgmentRequest.getPage())?
                 iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()) : judgment.getJudgmentTotal());
         if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle());
@@ -585,7 +587,7 @@
     //从本地接口获取
     public List<Map<String, Object>> getByLocal(JudgmentRequest judgmentRequest) {
         List<Map<String, Object>> resultList = new ArrayList<>();
-        Judgment judgment = this.getById(judgmentRequest.getSecondId());
+        Judgment judgment = this.baseMapper.selectById(judgmentRequest.getSecondId());
         if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getTagResult())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getTagResult());
             List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java
index d7efb55..40a0497 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java
@@ -18,6 +18,7 @@
 import com.casic.missiles.modular.system.enums.DictEnum;
 import com.casic.missiles.modular.system.model.*;
 import com.casic.missiles.modular.system.service.*;
+import com.casic.missiles.modular.system.util.ToolUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -65,6 +66,8 @@
 
     @Autowired
     private IBusinessAccessService iBusinessAccessService;
+    @Autowired
+    private ICmdBodyRoamService iCmdBodyRoamService;
 
 
     @Override
@@ -147,7 +150,8 @@
     public RealtimeWork getListByOtherResult(BusinessReportInfoRequest businessReportInfoRequest) {
 
 
-        List<CommonResponse> commonResponseList = iCmdBodyInfoService.getCountByStatus();
+        List<CommonResponse> commonResponseList = iCmdBodyRoamService.getCountByStatus(businessReportInfoRequest.getBeginTime(),
+                businessReportInfoRequest.getEndTime());
 //        List<CmdBodyInfo> cmdBodyInfoList = iCmdBodyInfoService.getCmdBodyInfosByStatus();
         int reportedCount = 0, firstJudgmentCount = 0, secondLeaderCount = 0, firstLeaderCount = 0, sendCount = 0, feedbackCount = 0;
 
@@ -176,7 +180,8 @@
 
     @Override
     public RealtimeWork getResult(BusinessReportInfoRequest businessReportInfoRequest) {
-        return iBusinessAccessService.getAccessStatus("3-lc") ? getListByOtherResult(businessReportInfoRequest) : getListByLocalResult(businessReportInfoRequest.getThirdId());
+        return iBusinessAccessService.getAccessStatus("3-lc") && (ToolUtils.pageArr[2] == businessReportInfoRequest.getPage())
+                ? getListByOtherResult(businessReportInfoRequest) : getListByLocalResult(businessReportInfoRequest.getThirdId());
     }
 
     public List<HashMap<String, Object>> statisticsByHourTime() {
@@ -346,7 +351,9 @@
             resultMap.put("value", 0);
             list.forEach(cmdBodyCommonResponse -> {
                 if (ObjectUtil.isNotEmpty(cmdBodyCommonResponse.getControlsWeb()) && cmdBodyCommonResponse.getControlsWeb().indexOf(dict.getCode()) == 0) {
-                    resultMap.put("value", Long.valueOf(resultMap.get("value") + "") + 1);
+                    resultMap.put("value", Long.valueOf(resultMap.get("value") + "") + (ObjectUtil.isNotEmpty(cmdBodyCommonResponse.getLinks()) &&
+                            StringUtils.isNumeric(cmdBodyCommonResponse.getLinks()) ?
+                            Long.valueOf(cmdBodyCommonResponse.getLinks()) : 0));
                 }
             });
             resultMapList.add(resultMap);
@@ -356,16 +363,22 @@
 
     @Override
     public List<HashMap<String, Object>> statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) {
-        return iBusinessAccessService.getAccessStatus("3-pt") ? statisticsByOtherPlate(businessReportInfoRequest) : statisticsByLocalPlate(businessReportInfoRequest.getThirdId());
+        return iBusinessAccessService.getAccessStatus("3-pt") &&
+                (ToolUtils.pageArr[2] == businessReportInfoRequest.getPage())
+                ? statisticsByOtherPlate(businessReportInfoRequest) : statisticsByLocalPlate(businessReportInfoRequest.getThirdId());
     }
 
     //从第三方获取上报记录
     public Map<String, Object> statisticsByOtherReport(BusinessReportInfoRequest businessReportInfoRequest) {
         Map<String, Object> resultMap = new HashMap<>();
         //获取上报信息
-        List<CmdBodyCommonResponse> sbList = iCmdBodyInfoService.getCountByTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime());
+//        List<CmdBodyCommonResponse> sbList = iCmdBodyInfoService.getCountByTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime());
+
+        List<CmdBodyCommonResponse> sbList = iCmdBodyRoamService.getCountByStatusAndTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime(), DictMapDTO.sbArr[0]);
         //获取下发信息
-        List<CmdBodyCommonResponse> xfList = iCmdBodyInstructService.getCountByTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime());
+//        List<CmdBodyCommonResponse> xfList = iCmdBodyInstructService.getCountByTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime());
+
+        List<CmdBodyCommonResponse> xfList = iCmdBodyRoamService.getCountByStatusAndTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime(), DictMapDTO.xfArr[0]);
 
         List<Map<String, Object>> dpMapList = new ArrayList<>();
         List<Map<String, Object>> sbMapList = new ArrayList<>();
@@ -378,7 +391,7 @@
             sbMap.put("value", 0);
             sbList.forEach(sb -> {
                 if (ObjectUtil.isNotEmpty(sb.getResultTime()) && DateUtil.compare(DateUtil.parseDateTime(sb.getResultTime()), dateTime, "yyyy-MM-dd HH") == 0) {
-                    sbMap.put("value", Long.valueOf(sbMap.get("value") + "") + 1);
+                    sbMap.put("value", Long.valueOf(sbMap.get("value") + "") + (ObjectUtil.isNotEmpty(sb.getLinks()) && StringUtils.isNumeric(sb.getLinks()) ? Long.valueOf(sb.getLinks()) : 0));
                 }
             });
             dpMap.put("value", sbMap.get("value"));
@@ -393,7 +406,7 @@
             xfMap.put("value", 0);
             xfList.forEach(xf -> {
                 if (ObjectUtil.isNotEmpty(xf.getResultTime()) && DateUtil.compare(DateUtil.parseDateTime(xf.getResultTime()), dateTime, "yyyy-MM-dd HH") == 0) {
-                    xfMap.put("value", Long.valueOf(xfMap.get("value") + "") + 1);
+                    xfMap.put("value", Long.valueOf(xfMap.get("value") + "") + (ObjectUtil.isNotEmpty(xf.getLinks()) && StringUtils.isNumeric(xf.getLinks()) ? Long.valueOf(xf.getLinks()) : 0));
                 }
             });
             xfMapList.add(xfMap);
@@ -459,13 +472,22 @@
 
     @Override
     public Map<String, Object> statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest) {
-        return iBusinessAccessService.getAccessStatus("3-sj") ? statisticsByOtherReport(businessReportInfoRequest) : statisticsByLocalReport(businessReportInfoRequest.getThirdId());
+        return iBusinessAccessService.getAccessStatus("3-sj") &&
+                (ToolUtils.pageArr[2] == businessReportInfoRequest.getPage()) ?
+                statisticsByOtherReport(businessReportInfoRequest) :
+                statisticsByLocalReport(businessReportInfoRequest.getThirdId());
     }
 
 
     //从第三方获取标签统计结果
     public List<CommonRequest> statisticsByOtherTag(BusinessReportInfoRequest request) {
-        return iCmdBodyTagService.statisticsByTag(request);
+        List<CommonRequest> commonRequestList = iCmdBodyTagService.statisticsByTag(request);
+        commonRequestList.forEach(commonRequest -> {
+            commonRequest.setName(ObjectUtil.isNotEmpty(commonRequest.getName()) && commonRequest.getName().length() > 6 ? commonRequest.getName().substring(0, 6) : commonRequest.getName());
+            commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue())&&commonRequest.getValue().contains(".") ? commonRequest.getValue().substring(0,commonRequest.getValue().indexOf(".")) : commonRequest.getValue());
+
+        });
+        return commonRequestList;
     }
 
     //从本地获取标签统计结果
@@ -483,7 +505,9 @@
     @Override
     public List<CommonRequest> statisticsByTag(BusinessReportInfoRequest request) {
 
-        return iBusinessAccessService.getAccessStatus("3-bq") ? statisticsByOtherTag(request) : statisticsByLocalTag(request);
+        return iBusinessAccessService.getAccessStatus("3-bq") &&
+                (ToolUtils.pageArr[2] == request.getPage()) ?
+                statisticsByOtherTag(request) : statisticsByLocalTag(request);
     }
 
 
@@ -529,17 +553,21 @@
                 areaList1.add(area);
             }
         });
-        List<AreaReportResponse> responseList = iCmdBodyInfoService.statisticsByArea(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime());
+        List<AreaReportResponse> responseSbList = iCmdBodyInfoService.statisticsByArea(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime());
+        List<AreaReportResponse> responseXfList = iCmdBodyInfoService.statisticsByXfArea(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime());
         areaList1.forEach(area -> {
             CommonResponse commonResponse = new CommonResponse(area.getAreaName(), "0", "0");
-            responseList.forEach(res -> {
+            responseSbList.forEach(res -> {
                 String submitCode = processUtil(res.getSubmitCode());
-                String instructCode = processUtil(res.getInstructCode());
                 if (area.getId().equals(submitCode) || isChild(area.getId(), areaList, submitCode)) {
-                    commonResponse.setValue((Long.valueOf(commonResponse.getValue()) + 1) + "");
+                    commonResponse.setValue((Long.valueOf(commonResponse.getValue()) + (ObjectUtil.isNotEmpty(res.getLinks()) && StringUtils.isNumeric(res.getLinks()) ? Long.valueOf(res.getLinks()) : 0)) + "");
                 }
+
+            });
+            responseXfList.forEach(res1 -> {
+                String instructCode = processUtil(res1.getInstructCode());
                 if (area.getId().equals(instructCode) || isChild(area.getId(), areaList, instructCode)) {
-                    commonResponse.setValue1((Long.valueOf(commonResponse.getValue1()) + 1) + "");
+                    commonResponse.setValue1((Long.valueOf(commonResponse.getValue1()) + (ObjectUtil.isNotEmpty(res1.getLinks()) && StringUtils.isNumeric(res1.getLinks()) ? Long.valueOf(res1.getLinks()) : 0)) + "");
                 }
             });
             resultList.add(commonResponse);
@@ -565,7 +593,10 @@
 
         return businessReportInfoRequest.isFlag() ? clickData(businessReportInfoRequest) :
 
-                (iBusinessAccessService.getAccessStatus("3-qy") ? statisticsByOtherArea(businessReportInfoRequest) : statisticsByLocalArea(businessReportInfoRequest.getThirdId()));
+                (iBusinessAccessService.getAccessStatus("3-qy") &&
+                        (ToolUtils.pageArr[2] == businessReportInfoRequest.getPage()) ?
+                        statisticsByOtherArea(businessReportInfoRequest) :
+                        statisticsByLocalArea(businessReportInfoRequest.getThirdId()));
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/util/ToolUtils.java b/casic-server/src/main/java/com/casic/missiles/modular/system/util/ToolUtils.java
new file mode 100644
index 0000000..02f3809
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/util/ToolUtils.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.modular.system.util;
+
+import cn.hutool.core.util.ObjectUtil;
+
+public class ToolUtils {
+
+    private final static String YEAR = "2099";
+
+    public static   int[] pageArr={1,2,3};
+
+    public static boolean containYear(String date) {
+
+        if (ObjectUtil.isNotEmpty(date)) {
+            return date.indexOf(YEAR) != -1 ? true : false;
+        }
+
+        return false;
+
+    }
+
+}