数据权限仅保留创建人，增加按时间查询

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/PersonTestingController.java

@@ -104,7 +104,7 @@ public class PersonTestingController {
         }
         // 街道和超管有权查看所有数据
         if (NumConstant.ZERO == user.getSuperAdmin() && user.getDeptId() != 1258587398679126017L) {
-            params.put("deptIdList", user.getDeptIdList());
+//            params.put("deptIdList", user.getDeptIdList());
             params.put("creatorId", user.getId());
         }
         List<PersonTestingPageDTO> list = personTestingDao.getTestingPage(params);

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/v2/PersonTestingV2Controller.java

@@ -115,7 +115,7 @@ public class PersonTestingV2Controller {
         }
         // 街道和超管有权查看所有数据
         if (NumConstant.ZERO == user.getSuperAdmin() && user.getDeptId() != 1258587398679126017L) {
-            params.put("deptIdList", user.getDeptIdList());
+//            params.put("deptIdList", user.getDeptIdList());
             params.put("creatorId", user.getId());
         }
         List<PersonTestingPageDTO> list = personTestingDao.getTestingPage(params);

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingExportServer.java

@@ -41,7 +41,7 @@ public class PersonTestingExportServer implements IExcelExportServer {
         }
         // 街道和超管有权查看所有数据
         if (NumConstant.ZERO == user.getSuperAdmin() && user.getDeptId() != 1258587398679126017L) {
-            params.put("deptIdList", user.getDeptIdList());
+//            params.put("deptIdList", user.getDeptIdList());
             params.put("creatorId", user.getId());
         }
 

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java

@@ -100,7 +100,7 @@ public class PersonTestingServiceImpl extends BaseServiceImpl<PersonTestingDao,
         }
         // 街道和超管有权查看所有数据
         if (NumConstant.ZERO == user.getSuperAdmin() && user.getDeptId() != 1258587398679126017L) {
-            params.put("deptIdList", user.getDeptIdList());
+//            params.put("deptIdList", user.getDeptIdList());
             params.put("creatorId", user.getId());
         }
 

epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml

@@ -88,6 +88,10 @@
             and (t2.grid_id = #{gridId}
             OR find_in_set(#{gridId},t2.ALL_DEPT_IDS))
         </if>
+        <if test="timeStart != null and timeStart != '' and timeEnd != null and timeEnd != ''">
+            AND date_format(t.TESTING_TIME,'%Y-%m-%d') >= date_format(#{timeStart},'%Y-%m-%d')
+            AND date_format(t.TESTING_TIME,'%Y-%m-%d') &lt;= date_format(#{timeEnd},'%Y-%m-%d')
+        </if>
         order by t.CREATED_TIME desc
         <if test="excelBigDataPageSize != null and excelBigDataPageIndex != null">
             limit #{excelBigDataPageIndex},#{excelBigDataPageSize}