tj

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -147,6 +147,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         list.add(plan);
         List<Long> collect = list.stream().map(TMonitoringRetrievalPlan::getId).collect(Collectors.toList());
         boolean isEdit = false;
+        //true禁止编辑，false可以编辑
         boolean isComplete = true;
         if (plan.getParentId() != null) {
             isEdit = true;
@@ -154,15 +155,12 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         tMonitoringRetrievalPlanVO.setIsEdit(isEdit);
         List<String> status = new ArrayList<>();
         status.add("2");
-        //  status.add("3");
         List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks = iCoreMonitoringRetrievalTaskService.selectAllTaskByPlanId(collect, status);
-
-        if (CollectionUtils.isNotEmpty(coreMonitoringRetrievalTasks)&&plan.getPlanStatus()!=1) {
-            isComplete = false;
+        if (CollectionUtils.isNotEmpty(coreMonitoringRetrievalTasks)) {
+            isComplete = true;
         }
-        if (plan.getPlanStatus()==0){
-            isEdit=false;
-            isComplete=false;
+        if (plan.getPlanStatus() == 0) {
+            isComplete = false;
         }
         tMonitoringRetrievalPlanVO.setIsComplete(isComplete);
         return tMonitoringRetrievalPlanVO;
@@ -534,17 +532,17 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                 coreMonitoringRetrievalTaskBuilderService.deleteAllTaskByPlanIds(collect);
             }*/
 
-                for (TMonitoringRetrievalPlan tMonitoringRetrievalPlan : list1) {
-                    if (!isComplete){
-                        tMonitoringRetrievalPlan.setPlanStatus(2);
-                    }
-                    tMonitoringRetrievalPlan.setIsDistribute("0");
-                    baseMapper.updateById(tMonitoringRetrievalPlan);
-                    //如果是无周期和全是未完成，删除计划
-                    if (plan.getPlanCycle().equals("0")||isComplete) {
-                        baseMapper.deleteById(tMonitoringRetrievalPlan.getId());
-                    }
+            for (TMonitoringRetrievalPlan tMonitoringRetrievalPlan : list1) {
+                if (!isComplete) {
+                    tMonitoringRetrievalPlan.setPlanStatus(2);
+                }
+                tMonitoringRetrievalPlan.setIsDistribute("0");
+                baseMapper.updateById(tMonitoringRetrievalPlan);
+                //如果是无周期和全是未完成，删除计划
+                if (plan.getPlanCycle().equals("0") || isComplete) {
+                    baseMapper.deleteById(tMonitoringRetrievalPlan.getId());
                 }
+            }
 
             if (!plan.getPlanCycle().equals("0")) {
                 switch (plan.getPlanCycle()) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/mapper/CoreMonitoringRetrievalTaskMapper.java

@@ -108,7 +108,7 @@ public interface CoreMonitoringRetrievalTaskMapper extends BaseMapper<CoreMonito
      * @param planId
      */
     void deleteAllTaskByPlanId(@Param("planId") Long planId);
-    void deleteTaskByStartTime(@Param("planId") Long planId,@Param("startTime") String startTime);
+    void deleteTaskByStartTime(@Param("planId") Long planId,@Param("endTime") String endTime);
 
     void deleteAllTaskByPlanIds(@Param("planIds") Long[] planIds);
 

soc-modules/soc-modules-core/src/main/resources/mapper/retrieval/CoreMonitoringRetrievalTaskMapper.xml

@@ -586,7 +586,7 @@
         FROM
             core_monitoring_retrieval_task
         WHERE
-            plan_start_time > #{startTime}
+            plan_end_time > #{endTime}
           AND plan_id IN (
             SELECT
                 id

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgServiceImpl.java

@@ -146,6 +146,11 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
             BeanUtils.copyProperties(orgPhysicalDefenseConstructionExport1, orgPhysicalDefenseConstructionExport);
             orgPhysicalDefenseConstructionExport.setCity(sysOrg1.getShortName().indexOf("地区行社") == -1 ? sysOrg1.getShortName().substring(0, 2) : sysOrg1.getShortName().split("地区行社")[0]);
             Integer integer = baseMapper.selectNetworkNumberByPath(s.getPath());
+            Double avg = 0d;
+            if (integer != 0 || orgPhysicalDefenseConstructionExport1.getReachNumber() != 0) {
+                avg = (double) orgPhysicalDefenseConstructionExport1.getReachNumber() / integer * 100;
+            }
+            orgPhysicalDefenseConstructionExport.setReachRate(String.valueOf(Double.valueOf(String.format("%.2f", avg))) + "%");
             orgPhysicalDefenseConstructionExport.setNetworkNumber(integer);
             orgPhysicalDefenseConstructionExport.setOrgName(s.getShortName());
 

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgMapper.xml

@@ -717,6 +717,7 @@ and
             sys_org_physical_defense_construction a
                 LEFT JOIN sys_org b ON a.org_id = b.id
         WHERE
+            b.type=4 AND
             b.path LIKE concat(#{orgPath}, '%')
     </select>