Merge branch 'dev-2.20.0' of http://101.36.160.140:21044/province-qinghai/province-all into dev-2.20.0

unis-plugin/unis-plugin-biz/src/main/java/com/unis/emergencySupportCenter/modular/planExecute/mapper/mapping/PlanExecuteMapper.xml

@@ -3,17 +3,34 @@
 <mapper namespace="com.unis.emergencySupportCenter.modular.planExecute.mapper.PlanExecuteMapper">
     <select id="pageList" parameterType="com.baomidou.mybatisplus.core.conditions.Wrapper" resultType="com.unis.emergencySupportCenter.modular.planExecute.entity.PlanExecute">
         SELECT
-            pe.id,
-            pf.plan_name planName,
-	        pf.emergency_level emergencyLevel,
-	        pf.disaster_level disasterLevel,
-            CASE WHEN COUNT(ee.es_plan_execute_id)=0 THEN NULL END enterpriseCount,
-            SUM(ee.quantity) grainCount,
-            pe.create_time
+            t1.id,
+            t1.planName,
+            t1.emergencyLevel,
+            t1.disasterLevel,
+            t1.enterpriseCount,
+            t1.grainCount,
+            t1.create_time
         FROM
-            biz_es_ep_plan_execute pe
-        LEFT JOIN biz_es_ep_online_plan_formulation pf ON pe.es_online_plan_formulation_id = pf.id
-        LEFT JOIN biz_es_ep_plan_execute_enterprise ee ON pe.id = ee.es_plan_execute_id
+            (
+                SELECT
+                    pe.id,
+                    pf.plan_name planName,
+                    pf.emergency_level emergencyLevel,
+                    pf.disaster_level disasterLevel,
+                    CASE
+                WHEN COUNT(ee.es_plan_execute_id) = 0 THEN
+                    NULL
+                END enterpriseCount,
+                SUM(ee.quantity) grainCount,
+                pe.create_time,
+                ee.sys_org_id,
+                pe.create_user,
+                pe.es_online_plan_formulation_id
+            FROM
+                biz_es_ep_plan_execute pe
+            LEFT JOIN biz_es_ep_online_plan_formulation pf ON pe.es_online_plan_formulation_id = pf.id
+            LEFT JOIN biz_es_ep_plan_execute_enterprise ee ON pe.id = ee.es_plan_execute_id
+            ) t1
         ${ew.customSqlSegment}
     </select>
 </mapper>

unis-plugin/unis-plugin-biz/src/main/java/com/unis/emergencySupportCenter/modular/planExecute/service/impl/PlanExecuteServiceImpl.java

@@ -58,22 +58,22 @@ public class PlanExecuteServiceImpl extends ServiceImpl<PlanExecuteMapper, PlanE
     @Override
     public Page<PlanExecute> page(PlanExecutePageParam planExecutePageParam) {
         QueryWrapper<PlanExecute> queryWrapper = new QueryWrapper<>();
-        // 自定义查询条件
-        if (StringUtils.isNotEmpty(planExecutePageParam.getPlanName())) {
-            queryWrapper.like("pf.plan_name", planExecutePageParam.getPlanName());
-        }
-        if (ObjectUtil.isNotEmpty(planExecutePageParam.getEmergencyLevel())) {
-            queryWrapper.eq("pf.emergency_level", planExecutePageParam.getEmergencyLevel());
-        }
         // 权限范围
         List<String> loginUserDataScope = StpLoginUserUtil.getLoginUserDataScope();
         // 创建人权限
         String loginUserId = StpLoginUserUtil.getLoginUser().getId();
         if (CollectionUtils.isNotEmpty(loginUserDataScope)) {
-            queryWrapper.in("ee.sys_org_id", loginUserDataScope)
-                    .or().eq("pe.create_user", loginUserId);
+            queryWrapper.in("t1.sys_org_id", loginUserDataScope)
+                    .or().eq("t1.create_user", loginUserId);
         } else {
-            queryWrapper.eq("pe.create_user", StpUtil.getLoginIdAsString());
+            queryWrapper.eq("t1.create_user", StpUtil.getLoginIdAsString());
+        }
+        // 自定义查询条件
+        if (StringUtils.isNotEmpty(planExecutePageParam.getPlanName())) {
+            queryWrapper.like("t1.planName", planExecutePageParam.getPlanName());
+        }
+        if (ObjectUtil.isNotEmpty(planExecutePageParam.getEmergencyLevel())) {
+            queryWrapper.eq("t1.emergencyLevel", planExecutePageParam.getEmergencyLevel());
         }
         // 排序
         if (ObjectUtil.isAllNotEmpty(planExecutePageParam.getSortField(), planExecutePageParam.getSortOrder())) {
@@ -83,7 +83,7 @@ public class PlanExecuteServiceImpl extends ServiceImpl<PlanExecuteMapper, PlanE
         } else {
             queryWrapper.lambda().orderByDesc(PlanExecute::getId);
         }
-        queryWrapper.groupBy("pe.es_online_plan_formulation_id");
+        queryWrapper.groupBy("t1.es_online_plan_formulation_id");
         return planExecuteMapper.pageList(CommonPageRequest.defaultPage(), queryWrapper);
     }