fix--维权抚慰大屏抚慰金额总数不对

src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java

@@ -21,6 +21,7 @@ import com.biutag.supervision.pojo.vo.ComfortMapIconVo;
 import com.biutag.supervision.pojo.vo.EchartsVo;
 import com.biutag.supervision.service.DataRightsComfortService;
 import com.biutag.supervision.service.RpcApplyService;
+import com.biutag.supervision.service.SupDepartService;
 import com.biutag.supervision.service.SupDictDataService;
 import com.biutag.supervision.service.datav.DatavService;
 import com.biutag.supervision.util.CompletableUtils.CompletableFutureUtil;
@@ -57,6 +58,7 @@ public class DataVRightsComfortController {
     private final SupDictDataService supDictDataService;
     private final SupDepartMapper supDepartMapper;
     private final   DatavService  datavService;
+    private final SupDepartService supDepartService;
 
 
     /**
@@ -237,11 +239,11 @@ public class DataVRightsComfortController {
         }
         for (ComfortMapIconVo re : res) {
             String departId = re.getDepartId();
-
+            List<String> allNodeIds = supDepartService.getAllNodeIds(departId);
             List<RpcApply> list = rpcApplyService.list(new LambdaQueryWrapper<RpcApply>()
                     .between(RpcApply::getCrtTime, beginTime, finalEndTime)
-                    .eq(RpcApply::getDepartId,departId)
-                    .eq(RpcApply::getVerified,"0")
+                    .in(RpcApply::getDepartId,allNodeIds)
+//                    .eq(RpcApply::getVerified,"0")
                     .eq(RpcApply::getType, RpcApplyTypeEnum.RIGHTS_PROTECTION.getValue()));
 
             Set<String> caseNumbers = list.stream()

src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java

@@ -19,7 +19,7 @@ import java.util.List;
 public interface RpcApplyMapper extends BaseMapper<RpcApply> {
 
     @Select("SELECT COALESCE(SUM(a.provide_relief), 0.0) FROM rpc_apply_person a LEFT JOIN rpc_apply b ON a.rpc_id = b.rpc_id " +
-            "WHERE b.apply_date BETWEEN #{beginTime} AND #{endTime} AND b.type = 2")
+            "WHERE b.apply_date BETWEEN #{beginTime} AND #{endTime} AND b.type = 2 AND b.rpc_status='completed' ")
     Double countComfortMoney(Date beginTime, Date endTime);
 
     @Select("SELECT c.job name, COUNT(c.job) value FROM sup_police c JOIN " +