问题单修复&&报告模版配置接口联调

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineIntegrityDataMapper.xml

@@ -74,7 +74,7 @@
         line.`Level`as 'Level',
         line.Update_Time AS 'updateTime',
         line.Sort as 'sort',
-        pd.Call_Flag as 'ComFlag',
+        pd.Com_Flag as 'ComFlag',
         sdd.`Name` AS 'LineScale',
         device.`Name` AS 'deviceName',
         pd.IP AS 'ip',

pqs-system/system-boot/src/main/java/com/njcn/system/mapper/TemplateRelMapper.java

@@ -22,4 +22,6 @@ public interface TemplateRelMapper extends BaseMapper<TemplateRel> {
     List<TemplateRel> selectRelevance(@Param("ids") List<String> ids);
 
     boolean batchInsert(@Param("list") List<TemplateRel> list);
+
+    boolean deleteByRtId(@Param("rtId") String id);
 }

pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/TemplateRelMapper.xml

@@ -13,6 +13,10 @@
         </foreach>
     </insert>
 
+    <delete id="deleteByRtId">
+        DELETE FROM report_relevancy WHERE Rt_Id=#{rtId}
+    </delete>
+
     <select id="selectRelevance" resultType="TemplateRel">
         select report_relevancy.*
         from report_relevancy report_relevancy

pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventDictServiceImpl.java

@@ -114,8 +114,8 @@ public class EventDictServiceImpl extends ServiceImpl<EventDictMapper, ReportDic
             //排序
             if (ObjectUtil.isAllNotEmpty(dictQueryParam.getSortBy(), dictQueryParam.getOrderBy())) {
                 queryWrapper.orderBy(true, dictQueryParam.getOrderBy().equals(DbConstant.ASC), StrUtil.toUnderlineCase(dictQueryParam.getSortBy()));
-            }else{
-                //queryWrapper.eq("report_dict.pid",dictQueryParam.getPid());
+            } else {
+                queryWrapper.eq("report_dict.pid",dictQueryParam.getPid());
                 //没有排序参数，默认根据sort字段排序，没有排序字段的，根据updateTime更新时间排序
                 queryWrapper.orderBy(true, true, "report_dict.update_time");
             }

pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java

@@ -127,7 +127,7 @@ public class EventTemplateServiceImpl extends ServiceImpl<EventTemplateMapper, E
         BeanUtils.copyProperties(eventTemplateUpdateParam,eventTemplate);
         boolean flag = this.updateById(eventTemplate);
         // 先删除字典表
-        templateRelMapper.deleteById(id);
+        templateRelMapper.deleteByRtId(id);
         List<TemplateRel> list = new ArrayList<>();
         eventTemplateUpdateParam.getIds().forEach(rdId -> {
             TemplateRel relevancy = new TemplateRel();