diff --git a/src/main/java/com/cm/systemcity/controller/apis/leave/LeaveController.java b/src/main/java/com/cm/systemcity/controller/apis/leave/LeaveController.java
index 862940a..9ac428a 100644
--- a/src/main/java/com/cm/systemcity/controller/apis/leave/LeaveController.java
+++ b/src/main/java/com/cm/systemcity/controller/apis/leave/LeaveController.java
@@ -46,6 +46,13 @@ public class LeaveController extends AbstractController {
         return leaveService.listPageLeaveDetail(page);
     }
 
+    @GetMapping("list-page-leave-detail1")
+    public SuccessResultList<List<LeaveDTO>> listPageLeaveDetail1(ListPage page) throws SearchException {
+        Map<String, Object> params = requestParams();
+        page.setParams(params);
+        return leaveService.listPageLeaveDetail1(page);
+    }
+
     @GetMapping("list-page-leave-detail2")
     public SuccessResultList<List<LeaveDTO>> listPageLeaveDetail2(ListPage page) throws SearchException {
         Map<String, Object> params = requestParams();
diff --git a/src/main/java/com/cm/systemcity/dao/reportcase/IReportCaseDao.java b/src/main/java/com/cm/systemcity/dao/reportcase/IReportCaseDao.java
index ccf85b3..af33053 100755
--- a/src/main/java/com/cm/systemcity/dao/reportcase/IReportCaseDao.java
+++ b/src/main/java/com/cm/systemcity/dao/reportcase/IReportCaseDao.java
@@ -379,4 +379,7 @@ public interface IReportCaseDao {
     List<ReportCaseHandleDTO> listReportCaseHandleDTO(Map<String, Object> params);
 
     List<HandleDepartmentDTO> listDept(Map<String, Object> params);
+
+    Integer countReportCaseAssign(Map<String, Object> reportCaseAssignMap);
+
 }
diff --git a/src/main/java/com/cm/systemcity/service/leave/ILeaveService.java b/src/main/java/com/cm/systemcity/service/leave/ILeaveService.java
index 4c94919..e7a6aab 100644
--- a/src/main/java/com/cm/systemcity/service/leave/ILeaveService.java
+++ b/src/main/java/com/cm/systemcity/service/leave/ILeaveService.java
@@ -188,6 +188,9 @@ public interface ILeaveService {
      */
     SuccessResultList<List<LeaveDTO>> listPageLeaveDetail(ListPage page) throws SearchException;
 
+    SuccessResultList<List<LeaveDTO>> listPageLeaveDetail1(ListPage page);
+
+
     /**
      * 2级分页请假详情列表
      *
@@ -224,5 +227,4 @@ public interface ILeaveService {
     Integer countUserLeave(Map<String, Object> params) throws SearchException;
 
 
-
 }
diff --git a/src/main/java/com/cm/systemcity/service/leave/impl/LeaveServiceImpl.java b/src/main/java/com/cm/systemcity/service/leave/impl/LeaveServiceImpl.java
index 1a8422a..db96149 100644
--- a/src/main/java/com/cm/systemcity/service/leave/impl/LeaveServiceImpl.java
+++ b/src/main/java/com/cm/systemcity/service/leave/impl/LeaveServiceImpl.java
@@ -307,6 +307,14 @@ public class LeaveServiceImpl extends BaseService implements ILeaveService {
         return new SuccessResultList<>(list, pageInfo.getPageNum(), pageInfo.getTotal());
     }
 
+    @Override
+    public SuccessResultList<List<LeaveDTO>> listPageLeaveDetail1(ListPage page) {
+        PageHelper.startPage(page.getPage(), page.getRows());
+        List<LeaveDTO> list = leaveDao.listLeave(page.getParams());
+        PageInfo<LeaveDTO> pageInfo = new PageInfo<>(list);
+        return new SuccessResultList<>(list, pageInfo.getPageNum(), pageInfo.getTotal());
+    }
+
     @Override
     public SuccessResultList<List<LeaveDTO>> listPageLeaveDetail2(ListPage page) {
         // 1级审批通过的请假列表
diff --git a/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseAutoAppServiceImpl.java b/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseAutoAppServiceImpl.java
index 6ffb2c3..ea66073 100644
--- a/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseAutoAppServiceImpl.java
+++ b/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseAutoAppServiceImpl.java
@@ -66,14 +66,14 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
              * caseSource 2巡检采集 3专管员上报
              */
             // 判断是否为自处理案件
-            params.put("caseFlowType","2");
-            params.put("caseSource","2");
+            params.put("caseFlowType", "2");
+            params.put("caseSource", "2");
             // 查询用户权限
             List<Map<String, Object>> roleList = reportCaseDao.listRoleByUserId(appTokenUser.getId());
-            for (Map<String, Object> item : roleList){
-                if("bc405346-8714-4ded-89ac-9cc4d755f66a".equals(item.get("roleId").toString())){
-                    params.put("caseFlowType","1");
-                    params.put("caseSource","3");
+            for (Map<String, Object> item : roleList) {
+                if ("bc405346-8714-4ded-89ac-9cc4d755f66a".equals(item.get("roleId").toString())) {
+                    params.put("caseFlowType", "1");
+                    params.put("caseSource", "3");
                     break;
                 }
             }
@@ -92,7 +92,7 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
             selfAutoAssign(query, token, appTokenUser);
             return new SuccessResult();
         }
-        if (1 != isSelf){
+        if (1 != isSelf) {
             /**
              *   查询该案件类型所绑定的处理部门及街镇
              *   可查询到绑定关系即为职能部门案件，查询不到即为街镇案件
@@ -114,7 +114,7 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
             List<BindingDepartmentDTO> bindingList = bindingDepartment.listBindingDepartmentByCaseType(query);
 
             // 未查询到所绑定部门 转为街镇案件
-            if(bindingList == null || bindingList.size() == 0){
+            if (bindingList == null || bindingList.size() == 0) {
                 params.put("caseFlowType", "2");
                 // 受理
                 saveReportCaseInfo(params);
@@ -153,7 +153,7 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
             }
 
             // 查询到绑定部门信息 转为职能部门案件
-            if(bindingList != null && bindingList.size() > 0){
+            if (bindingList != null && bindingList.size() > 0) {
                 params.put("caseFlowType", "1");
                 // 受理
                 saveReportCaseInfo(params);
@@ -183,13 +183,13 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
                 addReportCaseLog(token, caseLogParams);
                 // 查询部门下所有专管员
                 List<Map<String, Object>> deptUsers = new ArrayList<>();
-                for(BindingDepartmentDTO deptItem : bindingList){
+                for (BindingDepartmentDTO deptItem : bindingList) {
                     List<Map<String, Object>> userList = bindingDepartment.listDepartmentUser(deptItem.getDepartmentId());
-                    if(userList != null && userList.size() > 0){
+                    if (userList != null && userList.size() > 0) {
                         deptUsers.addAll(userList);
                     }
                 }
-                if(deptUsers == null || deptUsers.size() == 0){
+                if (deptUsers == null || deptUsers.size() == 0) {
                     // 补充那件为查询绑定部门日志
                     caseLogParams.clear();
                     caseLogParams.put("caseId", caseId);
@@ -203,7 +203,7 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
                 query.clear();
                 List<String> handleUserIds = new ArrayList<>();
                 List<String> handleUserNames = new ArrayList<>();
-                for(Map<String, Object> item : deptUsers ){
+                for (Map<String, Object> item : deptUsers) {
                     query.put("userId", item.get("userId").toString());
                     List<GridAndPointsDTO> gridList = userPointsService.listUserGrid(query);
                     if (gridList.isEmpty()) {
@@ -220,7 +220,7 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
                         }
                     }
                 }
-                if(handleUserIds.size() == 0){
+                if (handleUserIds.size() == 0) {
                     caseLogParams.clear();
                     caseLogParams.put("caseId", caseId);
                     caseLogParams.put("userOpinion", "案件发生地未匹配到对应专管员负责网格，需网格办手动处理");
@@ -278,7 +278,7 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
      * @throws UpdateException
      * @throws SaveException
      */
-    private void autoAccept(Map<String, Object> params, String token,UserDTO userDTO) throws UpdateException, SaveException {
+    private void autoAccept(Map<String, Object> params, String token, UserDTO userDTO) throws UpdateException, SaveException {
         // 修改案件状态为受理
         Map<String, Object> reportCaseParams = new HashMap<>(0);
         reportCaseParams.put("reportCaseId", params.get("caseId").toString());
@@ -298,13 +298,13 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
         params.put("acceptOpinion", "自动受理");
         params.put("acceptStatus", 1);
         setSaveInfo(token, params);
-        params.put("creator",userDTO.getUserId());
-        params.put("modifier",userDTO.getUserId());
+        params.put("creator", userDTO.getUserId());
+        params.put("modifier", userDTO.getUserId());
         reportCaseDao.saveReportCaseAccept(params);
 
         //保存受理日志
         caseLogParams.put("handleStatus", 1);
-        autoReportCaseLog(token, caseLogParams,userDTO);
+        autoReportCaseLog(token, caseLogParams, userDTO);
     }
 
     /**
@@ -321,7 +321,7 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
         reportCaseParams.put("reportCaseId", params.get("caseId").toString());
         reportCaseParams.put("caseStatus", 2);
         setUpdateInfo(token, params);
-        params.put("modifier",userDTO.getUserId());
+        params.put("modifier", userDTO.getUserId());
         reportCaseDao.updateReportCase(reportCaseParams);
 
         //修改案件受理状态-模拟受理过程
@@ -329,7 +329,7 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
         reportCaseParams.put("caseId", params.get("caseId").toString());
         reportCaseParams.put("isRegister", 1);
         setUpdateInfo(token, params);
-        params.put("modifier",userDTO.getUserId());
+        params.put("modifier", userDTO.getUserId());
         reportCaseDao.updateReportCaseAccept(reportCaseParams);
 
         //添加立案信息
@@ -337,8 +337,8 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
         params.put("registerOpinion", "自动立案");
         params.put("registerUserName", userDTO.getUserName());
         setSaveInfo(token, params);
-        params.put("creator",userDTO.getUserId());
-        params.put("modifier",userDTO.getUserId());
+        params.put("creator", userDTO.getUserId());
+        params.put("modifier", userDTO.getUserId());
         reportCaseDao.saveReportCaseRegister(params);
 
         // 添加立案日志
@@ -347,7 +347,7 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
         caseLogParams.put("userOpinion", params.get("registerOpinion"));
         caseLogParams.put("handleStatus", 1);
         caseLogParams.put("optionType", "案件立案");
-        autoReportCaseLog(token, caseLogParams,userDTO);
+        autoReportCaseLog(token, caseLogParams, userDTO);
     }
 
     /**
@@ -364,14 +364,14 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
         reportCaseParams.put("reportCaseId", params.get("caseId").toString());
         reportCaseParams.put("caseStatus", 3);
         setUpdateInfo(token, reportCaseParams);
-        params.put("modifier",userDTO.getUserId());
+        params.put("modifier", userDTO.getUserId());
         reportCaseDao.updateReportCase(reportCaseParams);
         // 修改立案信息-模拟立案过程
         reportCaseParams.clear();
         reportCaseParams.put("caseId", params.get("caseId").toString());
         reportCaseParams.put("isAssign", 1);
         setUpdateInfo(token, reportCaseParams);
-        params.put("modifier",userDTO.getUserId());
+        params.put("modifier", userDTO.getUserId());
         reportCaseDao.updateReportCaseRegister(reportCaseParams);
 
         // 新增下派信息
@@ -383,8 +383,8 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
         params.put("handleUserName", userDTO.getUserName());
         params.put("assignOpinion", "自动下派");
         setSaveInfo(token, params);
-        params.put("creator",userDTO.getUserId());
-        params.put("modifier",userDTO.getUserId());
+        params.put("creator", userDTO.getUserId());
+        params.put("modifier", userDTO.getUserId());
         reportCaseDao.saveReportCaseAssign(params);
 
         // 下派日志
@@ -397,7 +397,7 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
         caseLogParams.put("handleUserPhone", params.get("handleUserPhone"));
         caseLogParams.put("handleTime", params.get("handleTime"));
         caseLogParams.put("handleStatus", 1);
-        autoReportCaseLog(token, caseLogParams,userDTO);
+        autoReportCaseLog(token, caseLogParams, userDTO);
     }
 
     /**
@@ -522,7 +522,7 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
         addReportCaseLog(token, caseLogParams);
     }
 
-    private void saveAssignWithUserIds(Map<String, Object> params, String token, List<String> userIdList ,List<String> userNameList){
+    private void saveAssignWithUserIds(Map<String, Object> params, String token, List<String> userIdList, List<String> userNameList) {
         // 修改案件状态为待处理
         Map<String, Object> reportCaseParams = new HashMap<>();
         reportCaseParams.put("reportCaseId", params.get("caseId").toString());
@@ -544,7 +544,7 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
         params.put("assignUserName", appTokenUser.getName());
         params.put("handleUserType", 0);
         params.put("handleTime", 1);
-        params.put("handleUserId", StringUtils.join(userIdList,","));
+        params.put("handleUserId", StringUtils.join(userIdList, ","));
         params.put("handleUserName", StringUtils.join(userNameList, ","));
         params.put("assignOpinion", "案件转派");
         setSaveInfo(token, params);
@@ -554,7 +554,7 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
         caseLogParams.put("caseId", params.get("caseId"));
         caseLogParams.put("optionType", "案件转派");
         caseLogParams.put("userOpinion", params.get("assignOpinion"));
-        caseLogParams.put("handleUserId", StringUtils.join(userIdList,","));
+        caseLogParams.put("handleUserId", StringUtils.join(userIdList, ","));
         caseLogParams.put("handleUserName", StringUtils.join(userNameList, ","));
         caseLogParams.put("handleUserPhone", "");
         caseLogParams.put("handleTime", params.get("handleTime"));
@@ -567,7 +567,7 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
     @Override
     public SuccessResult returnReportToAccept(String token, Map<String, Object> params) {
         String caseId = params.get("caseId").toString();
-        params.put("caseId",caseId);
+        params.put("caseId", caseId);
         //删除下派信息
         reportCaseDao.removeReportCaseAssign(params);
         //删除立案信息
@@ -575,23 +575,24 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
         //删除受理信息
         reportCaseDao.removeReportCaseAccept(params);
         //修改上报状态为待受理
-        params.put("reportCaseId",caseId);
-        params.put("caseStatus","0");
-        params.put("isAccept","0");
-        setUpdateInfo(token,params);
+        params.put("reportCaseId", caseId);
+        params.put("caseStatus", "0");
+        params.put("isAccept", "0");
+        setUpdateInfo(token, params);
         reportCaseDao.updateReportCase(params);
         //写日志
         Map<String, Object> logParam = new HashMap<>();
-        logParam.put("caseId",caseId);
+        logParam.put("caseId", caseId);
         logParam.put("optionType", "案件下派");
         logParam.put("userOpinion", "回退重新受理");
         logParam.put("handleStatus", 0);
-        addReportCaseLog(token,logParam);
+        addReportCaseLog(token, logParam);
         return new SuccessResult();
     }
 
     /**
      * 添加案件上报日志
+     *
      * @param token
      * @param caseLogParams
      * @throws SaveException
@@ -618,6 +619,7 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
 
     /**
      * 自动流转日志
+     *
      * @param token
      * @param caseLogParams
      * @throws SaveException
@@ -676,19 +678,19 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
         String userId = appTokenUser.getId();
         boolean isNPerson = false;
         List<Map<String, Object>> roleList = reportCaseDao.listRoleByUserId(userId);
-        for (Map<String, Object> item : roleList){
-            if("bc405346-8714-4ded-89ac-9cc4d755f66a".equals(item.get("roleId").toString())){
+        for (Map<String, Object> item : roleList) {
+            if ("bc405346-8714-4ded-89ac-9cc4d755f66a".equals(item.get("roleId").toString())) {
                 isNPerson = true;
                 break;
             }
         }
         // 专管员返回自己部门所有人员
         List<UserDTO> userDTOList = new ArrayList<>();
-        if(isNPerson){
+        if (isNPerson) {
             List<Map<String, Object>> deptList = reportCaseDao.listDeptByUserId(userId);
-            for(Map<String, Object> item : deptList){
+            for (Map<String, Object> item : deptList) {
                 List<Map<String, Object>> userList = reportCaseDao.listUserByDeptId(item.get("departmentId").toString());
-                for (Map<String, Object> u : userList){
+                for (Map<String, Object> u : userList) {
                     UserDTO userDTO = new UserDTO();
                     userDTO.setUserId(u.get("userId").toString());
                     userDTO.setUserName(u.get("userName").toString());
@@ -697,17 +699,17 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
             }
         }
         // 网格员返回自己上级和所有下级
-        if(!isNPerson){
+        if (!isNPerson) {
             params.put("reportCaseId", caseId);
             ReportCaseDTO reportCase = reportCaseDao.getReportCase(params);
             String areaId = reportCase.getAreaId();
             String communityId = reportCase.getCommunityId();
-            params.put("areaId",areaId);
-            params.put("communityId",communityId);
+            params.put("areaId", areaId);
+            params.put("communityId", communityId);
             // 查询三级网格长
-            params.put("communityBossLevel","2");
+            params.put("communityBossLevel", "2");
             List<Map<String, Object>> userList3 = reportCaseDao.listUserFromCommunityBoss(params);
-            for (Map<String, Object> u : userList3){
+            for (Map<String, Object> u : userList3) {
                 UserDTO userDTO = new UserDTO();
                 userDTO.setPrefixUserName("(3级网格长) ");
                 userDTO.setUserId(u.get("userId").toString());
@@ -715,9 +717,9 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
                 userDTOList.add(userDTO);
             }
             // 查询四级网格长
-            params.put("communityBossLevel","3");
+            params.put("communityBossLevel", "3");
             List<Map<String, Object>> userList4 = reportCaseDao.listUserFromCommunityBoss(params);
-            for (Map<String, Object> u : userList4){
+            for (Map<String, Object> u : userList4) {
                 UserDTO userDTO = new UserDTO();
                 userDTO.setPrefixUserName("(4级网格长) ");
                 userDTO.setUserId(u.get("userId").toString());
@@ -725,9 +727,9 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
                 userDTOList.add(userDTO);
             }
             // 查询五级网格员
-            params.put("communityBossLevel","4");
+            params.put("communityBossLevel", "4");
             List<Map<String, Object>> userList5 = reportCaseDao.listUserFromCommunityBoss(params);
-            for (Map<String, Object> u : userList5){
+            for (Map<String, Object> u : userList5) {
                 UserDTO userDTO = new UserDTO();
                 userDTO.setPrefixUserName("(5级网格员) ");
                 userDTO.setUserId(u.get("userId").toString());
diff --git a/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseServiceImpl.java b/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseServiceImpl.java
index 112abd3..4686f9d 100755
--- a/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseServiceImpl.java
+++ b/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseServiceImpl.java
@@ -593,9 +593,17 @@ public class ReportCaseServiceImpl extends BaseService implements IReportCaseSer
          * 案件下派页面已将userId调整
          * handleUserId 业务调整为多人 ','号分割
          */
-        setSaveInfo(params);
-        reportCaseDao.saveReportCaseAssign(params);
-
+        Map<String, Object> reportCaseAssignMap = new HashMap<>();
+        reportCaseAssignMap.put("caseId", params.get("caseId").toString());
+        Integer count = reportCaseDao.countReportCaseAssign(reportCaseAssignMap);
+        count = count == null ? 0 : count;
+        if (count == 0) {
+            setSaveInfo(params);
+            reportCaseDao.saveReportCaseAssign(params);
+        } else {
+            setUpdateInfo(params);
+            reportCaseDao.updateReportCaseAssign(params);
+        }
         // 添加案件转派日志
         Map<String, Object> caseLogParams = new HashMap<>();
         caseLogParams.put("caseId", params.get("caseId"));
@@ -1206,7 +1214,7 @@ public class ReportCaseServiceImpl extends BaseService implements IReportCaseSer
                 fileRatio = caseTotalCount > 0 ? fileCount.doubleValue() / caseTotalCount.doubleValue() : 0;
                 caseStatisticDTO.setFileRatio(fileRatio >= 1 ? String.format("%.0f", 1.0 * 100) : String.format("%.2f", fileRatio * 100));
             });
-            if(caseStatisticDTOS == null) {
+            if (caseStatisticDTOS == null) {
                 caseStatisticDTOS = departmentCaseStatisticDTOS;
             } else {
                 caseStatisticDTOS.addAll(departmentCaseStatisticDTOS);
diff --git a/src/main/java/com/cm/systemcity/task/SystemTask.java b/src/main/java/com/cm/systemcity/task/SystemTask.java
index 4015d9b..1310372 100644
--- a/src/main/java/com/cm/systemcity/task/SystemTask.java
+++ b/src/main/java/com/cm/systemcity/task/SystemTask.java
@@ -40,12 +40,6 @@ public class SystemTask {
     @Autowired
     private IAssessmentService assessmentService;
 
-    @Scheduled(cron = "0 0 5 * * ?")
-    public void ddyDayWorkTask() {
-        // 统计过去24小时内没有转派的案件
-
-    }
-
     /**
      * 每天0点定时任务
      */
diff --git a/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml b/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml
index 34d5204..86a78c9 100755
--- a/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml
+++ b/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml
@@ -709,6 +709,9 @@
         UPDATE
             city_report_case_assign
         SET
+        <if test="handleUserType != null">
+            handle_user_type = #{handleUserType},
+        </if>
         <if test="handleUserId != null and handleUserId != ''">
             handle_user_id = #{handleUserId},
         </if>
@@ -730,6 +733,17 @@
             case_id = #{caseId}
     </update>
 
+    <select id="countReportCaseAssign" parameterType="map" resultType="java.lang.Integer">
+        SELECT
+            COUNT(*)
+        FROM
+            city_report_case_assign
+        WHERE
+            is_delete = 0
+          AND
+            case_id = #{caseId}
+    </select>
+
 
     <!-- 案件待受理列表 -->
     <select id="listPageReportCaseRegister" parameterType="map" resultMap="reportCaseRegisterDTO">
@@ -2180,4 +2194,6 @@
             department_parent_id = #{departmentParentId}
         </if>
     </select>
+
+
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/static/route/assessment/list_day_zf.html b/src/main/resources/static/route/assessment/list_day_zf.html
new file mode 100644
index 0000000..53e91ea
--- /dev/null
+++ b/src/main/resources/static/route/assessment/list_day_zf.html
@@ -0,0 +1,263 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <base href="/servicecity/">
+    <meta charset="UTF-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=11,chrome=1"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+
+    <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
+    <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+<div class="layui-fluid layui-anim layui-anim-fadein">
+    <div class="layui-row">
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-body">
+                    <div class="test-table-reload-btn layui-form" style="margin-bottom: 5px;">
+                        <div class="layui-inline">
+                            <input type="text" id="keywords" class="layui-input search-item" placeholder="姓名" style="height: 38px;width: 150px;" autocomplete="off">
+                        </div>
+                        <div class="layui-inline">
+                            <input type="text" id="showDay" class="layui-input search-item"
+                                   readonly="readonly" placeholder="开始时间" style="height: 38px;width:150px;cursor: pointer" autocomplete="off">
+                        </div>
+                        <button type="button" id="search" class="layui-btn layui-btn-sm">
+                            <i class="fa fa-lg fa-search"></i> 搜索
+                        </button>
+                        <button type="button" id="exportTable" class="layui-btn layui-btn-sm">
+                            <i class="fa fa-lg fa-share"></i> 导出Excel
+                        </button>
+                        <button type="button" id="updateDataBtn" class="layui-btn layui-btn-sm">
+                            <i class="fa fa-lg fa-refresh"></i> 数据有出入？更新数据
+                        </button>
+                    </div>
+
+                    <table class="layui-hide" id="dataTable" lay-filter="dataTable"></table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="assets/layuiadmin/layui/layui.js"></script>
+
+<script type="text/javascript">
+    layui.config({
+        base: 'assets/layuiadmin/'
+    }).extend({
+        index: 'lib/index'
+    }).use(['index', 'table', 'laytpl', 'form','laydate'], function() {
+        var $ = layui.$;
+        var $win = $(window);
+        var laytpl = layui.laytpl;
+        var table = layui.table;
+        var admin = layui.admin;
+        var form = layui.form;
+        var laydate = layui.laydate;
+        var tableUrl = 'api/assessment/listpageusersignindaystatus';
+        var dataLoading = false;
+
+        function initData(){
+            $('#areaSelectTemplateBox').show();
+            $('#deptSelectTemplateBox').hide();
+            setTimeout(function(){
+                initTable();
+            },500);
+        }
+        initData();
+
+        $(document).on('click', '#search', function() {
+            if(dataLoading){
+                layer.msg('数据加载中,请稍等...');
+                return;
+            }
+            reloadTable();
+        });
+
+        $(document).on('click', '#exportTable', function() {
+            top.dialog.confirm('确定导出数据？', function(index) {
+                top.dialog.close(index);
+                window.open(getParamsUrl(top.restAjax.path('api/assessment/listusersignindaystatustoexcel', [])), '_blank');
+            });
+        });
+
+        // 初始化表格
+        function initTable() {
+            dataLoading = true;
+            var whereParam  = {
+                keywords : $('#keywords').val(),
+                showDay : $('#showDay').val(),
+                userType : 1,
+                departmentId : '1d74dfc8-f3a3-4517-87fe-7acf7891bab4'
+            };
+            table.render({
+                elem: '#dataTable',
+                id: 'dataTable',
+                url: top.restAjax.path(tableUrl, []),
+                where : whereParam,
+                width: admin.screen() > 1 ? '100%' : '',
+                height: $win.height() - 95,
+                limit: 20,
+                limits: [20, 40, 60, 80, 100, 200],
+                request: {
+                    pageName: 'page',
+                    limitName: 'rows'
+                },
+                cols: [[
+                    {field:'rowNum', width:60, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
+                    {field: 'userName', width: 200, title: '人员名称', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                    {width: 250, title: '部门/社区', align:'left',
+                        templet: function(row) {
+                            if(row['departmentNames'] != ''){
+                                return row['departmentNames'];
+                            }
+                            if(row['communityNames'] != ''){
+                                return row['areaName'] + '(' + row['communityNames'] + ')'
+                            }
+                            return '';
+                        }
+                    },
+                    {width: 120, title: '签到情况(次)', align:'center',
+                        templet: function(row) {
+                            return row.signinCount + row.signoutCount;
+                        }
+                    },
+                    {field: 'leaveTimeSum', width: 100, title: '请假天数', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData === '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                    {field: 'isAbsenteeism', width: 100, title: '是否旷工', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(rowData == '1'){
+                                return '<span style="color: red">是</span>'
+                            }
+                            if(rowData == '0'){
+                                return '否'
+                            }
+                            return '-'
+                        }
+                    },
+                    {field: 'outOfContactOneHourCount', width: 180, title: '失联超1小时情况(次)', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData === '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                    {field: 'contactHour', width: 130, title: '工作时长(小时)', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData === '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                    {field: 'workDistance', width: 120, title: '工作里程(KM)', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData === '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                    {field: 'deductionPercent', width: 150, title: '绩效扣除比例(%)', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData === '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                ]],
+                page: true,
+                parseData: function(data) {
+                    return {
+                        'code': 0,
+                        'msg': '',
+                        'count': data.total,
+                        'data': data.rows
+                    };
+                },
+                done: function(){
+                    dataLoading = false;
+                }
+            });
+        }
+
+
+        // 重载表格
+        function reloadTable(currentPage) {
+            dataLoading = true;
+            var whereParam  = {
+                keywords : $('#keywords').val(),
+                showDay : $('#showDay').val(),
+                userType : 1,
+                departmentId : '1d74dfc8-f3a3-4517-87fe-7acf7891bab4'
+            };
+            table.reload('dataTable', {
+                url: top.restAjax.path(tableUrl, []),
+                where : whereParam,
+                page: {
+                    curr: currentPage
+                },
+                height: $win.height() - 140,
+                done:function(res){
+                    dataLoading = false;
+                }
+            });
+        }
+
+        // 初始化时间
+        function initDateTime(){
+            laydate.render({
+                format : 'yyyy-MM-dd',
+                elem: '#showDay'
+                ,value: new Date()
+            });
+        }
+        initDateTime();
+
+        $(document).on('click', '#updateDataBtn', function() {
+            if($('#showDay').val() == ''){
+                return;
+            }
+            top.dialog.confirm('确定更新吗？', function(index) {
+                top.dialog.close(index);
+                var loadLayerIndex;
+                top.restAjax.put('api/assessment/updateassessment?startDay='+ $('#showDay').val() +'&endDay='+ $('#showDay').val(), {}, null, function(code, data) {
+                    top.dialog.msg('更新成功');
+                    reloadTable();
+                }, function(code, data) {
+                    top.dialog.msg(data.msg);
+                }, function() {
+                    loadLayerIndex = layer.load(2,{shade:0.3});
+                }, function() {
+                    layer.close(loadLayerIndex)
+                });
+            });
+        });
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/static/route/assessment/list_history_zf.html b/src/main/resources/static/route/assessment/list_history_zf.html
new file mode 100644
index 0000000..5fb732c
--- /dev/null
+++ b/src/main/resources/static/route/assessment/list_history_zf.html
@@ -0,0 +1,258 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <base href="/servicecity/">
+    <meta charset="UTF-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=11,chrome=1"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+
+    <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
+    <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+<div class="layui-fluid layui-anim layui-anim-fadein">
+    <div class="layui-row">
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-body">
+                    <div class="test-table-reload-btn layui-form" style="margin-bottom: 5px;">
+                        <div class="layui-inline">
+                            <input type="text" id="startTime" class="layui-input search-item"
+                                   readonly="readonly" placeholder="开始时间" style="height: 38px;width:150px;cursor: pointer" autocomplete="off">
+                        </div>
+                        <div class="layui-inline">
+                            <input type="text" id="endTime" class="layui-input search-item"
+                                   readonly="readonly" placeholder="结束时间" style="height: 38px;width:150px;cursor: pointer" autocomplete="off">
+                        </div>
+                        <button type="button" id="search" class="layui-btn layui-btn-sm">
+                            <i class="fa fa-lg fa-search"></i> 搜索
+                        </button>
+                        <!--<button type="button" id="exportTable" class="layui-btn layui-btn-sm">
+                            <i class="fa fa-lg fa-share"></i> 导出Excel
+                        </button>-->
+                    </div>
+                    <table class="layui-hide" id="dataTable" lay-filter="dataTable"></table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="assets/layuiadmin/layui/layui.js"></script>
+
+<script type="text/javascript">
+    layui.config({
+        base: 'assets/layuiadmin/'
+    }).extend({
+        index: 'lib/index'
+    }).use(['index', 'table', 'laytpl', 'form','laydate'], function() {
+        var $ = layui.$;
+        var $win = $(window);
+        var laytpl = layui.laytpl;
+        var table = layui.table;
+        var admin = layui.admin;
+        var form = layui.form;
+        var laydate = layui.laydate;
+        var tableUrl = 'api/assessment/list-user-sign-history';
+        var dataLoading = false;
+        // 默认为0 1专管员2网格员
+        var userType = '1';
+
+        function init(){
+            laydate.render({
+                elem: '#startTime'
+                ,value: getMonthStartDay(new Date())
+            });
+            laydate.render({
+                elem: '#endTime'
+                ,value: new Date()
+            });
+            $('#communitySelectTemplateBox').hide();
+            initTable();
+        }
+        init();
+
+        form.on('select(changeArea)',function(data){
+            if(data.value == ''){
+                userType = '0';
+                $('#communityId').val('');
+                $('#communitySelectTemplateBox').hide();
+                $('#deptSelectTemplateBox').show();
+            } else {
+                userType = '2';
+                $('#departmentId').val('');
+                $('#deptSelectTemplateBox').hide();
+            }
+        });
+
+        // 初始化表格
+        function initTable() {
+            dataLoading = true;
+            table.render({
+                elem: '#dataTable',
+                id: 'dataTable',
+                url: top.restAjax.path(tableUrl, []),
+                width: admin.screen() > 1 ? '100%' : '',
+                height: $win.height() - 95,
+                toolbar: true,
+                defaultToolbar: ['exports'],
+                where:{
+                    userType : userType,
+                    departmentId : '1d74dfc8-f3a3-4517-87fe-7acf7891bab4'
+                },
+                cols: [[
+                    {field:'rowNum', width:60, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
+                    {field: 'userName', width: 250, title: '姓名', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            return rowData + ' [' + row['userAccount'] + ']';
+                        }
+                    },
+                    {field: 'location', width: 200, title: '街道社区/职能部门', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                    {field: 'signInCount', width: 120, title: '签到次数', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData === '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                    {field: 'signOutCount', width: 120, title: '签退次数', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData === '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                    {field: 'leaveCount', width: 100, title: '请假次数', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData === '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },/*
+                    {field: 'absenteeismCount', width: 100, title: '旷工次数', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData === '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },*/
+                    {field: 'outOfContactOneHourCount', width: 180, title: '失联超1小时情况(次)', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData === '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                    {field: 'contactHour', width: 130, title: '工作时长(小时)', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData === '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                    {field: 'workDistance', width: 120, title: '工作里程(KM)', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData === '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                    {field: 'deductionPercent', width: 150, title: '绩效扣除比例(%)', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData === '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                ]],
+                page: false,
+                parseData: function(data) {
+                    return {
+                        'code': 0,
+                        'msg': '',
+                        'count': data.total,
+                        'data': data.rows
+                    };
+                },
+                done: function(){
+                    dataLoading = false;
+                }
+            });
+        }
+
+        // 重载表格
+        function reloadTable(currentPage) {
+            dataLoading = true;
+            table.reload('dataTable', {
+                url: top.restAjax.path(tableUrl, []),
+                where:{
+                    userType : userType,
+                    departmentId : '1d74dfc8-f3a3-4517-87fe-7acf7891bab4',
+                    startTime : $('#startTime').val(),
+                    endTime : $('#endTime').val()
+                },
+                page: {
+                    curr: currentPage
+                },
+                height: $win.height() - 140,
+                done:function(res){
+                    dataLoading = false;
+                }
+            });
+        }
+
+        // 获取本月第一天日期
+        function getMonthStartDay(date) {
+            var year = date.getFullYear();
+            var month = date.getMonth() + 1;
+            month = month >= 10 ? month : ('0'+ month);
+            return year +'-'+ month +'-01';
+        }
+
+        $(document).on('click', '#search', function() {
+            if(dataLoading){
+                layer.msg('数据加载中,请稍等...');
+                return;
+            }
+            reloadTable(1);
+        });
+
+        $(document).on('click', '#exportTable', function() {
+            /*top.dialog.confirm('确定导出数据？', function(index) {
+                top.dialog.close(index);
+                window.open(getParamsUrl(top.restAjax.path('api/assessment/listusersigninhistorystatustoexcel', [])), '_blank');
+            });*/
+        });
+
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/static/route/bigdata/list-case-info-7dayajjz.html b/src/main/resources/static/route/bigdata/list-case-info-7dayajjz.html
index f47fd69..f10bcc2 100644
--- a/src/main/resources/static/route/bigdata/list-case-info-7dayajjz.html
+++ b/src/main/resources/static/route/bigdata/list-case-info-7dayajjz.html
@@ -407,8 +407,7 @@
                     area: ['70%', '80%'],
                     shadeClose: true,
                     anim: 2,
-                    content: restAjax.path('route/bigdata/show.html?reportCaseId={id}',
-                        [obj.data.reportCaseId]),
+                    content: restAjax.path('route/bigdata/show.html?reportCaseId={id}',  [obj.data.reportCaseId]),
                     end: function() {
                     }
                 });
@@ -421,8 +420,7 @@
                     area: ['70%', '80%'],
                     shadeClose: true,
                     anim: 2,
-                    content: top.restAjax.path('route/bigdata/list_case_log.html?reportCaseId={id}',
-                        [obj.data.reportCaseId]),
+                    content: restAjax.path('route/bigdata/list_case_log.html?reportCaseId={id}', [obj.data.reportCaseId]),
                     end: function() {
                     }
                 });
diff --git a/src/main/resources/static/route/leave/list1.html b/src/main/resources/static/route/leave/list1.html
new file mode 100644
index 0000000..1af5812
--- /dev/null
+++ b/src/main/resources/static/route/leave/list1.html
@@ -0,0 +1,374 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <base href="/servicecity/">
+    <meta charset="UTF-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=11,chrome=1"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+
+    <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
+    <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+    <style>
+        .un-pass-class .layui-layer-btn .layui-layer-btn0{
+            background-color: #FF5722;
+            color: #ffffff;
+            border: 1px solid #dedede;
+        }
+    </style>
+</head>
+<body>
+<div class="layui-fluid layui-anim layui-anim-fadein">
+    <div class="layui-row">
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-body">
+                    <div class="test-table-reload-btn layui-form" style="margin-bottom: 5px;">
+                        <div class="layui-inline">
+                            <input type="text" id="keywords" class="layui-input search-item" placeholder="请假人姓名|手机号" style="height: 38px;width: 150px;" autocomplete="off">
+                        </div>
+                        <div class="layui-inline" style="width: 150px;">
+                            <select id="approverState" name="approverState">
+                                <option value="">审批状态</option>
+                                <option value="0">待审批</option>
+                                <option value="1">同意</option>
+                                <option value="2">不同意</option>
+                            </select>
+                        </div>
+                        <div class="layui-inline">
+                            <input type="text" id="startTime" class="layui-input search-item"
+                                   readonly="readonly" placeholder="开始时间" style="height: 38px;width: 120px;cursor: pointer" autocomplete="off">
+                        </div>
+                        <div class="layui-inline">
+                            <input type="text" id="endTime" class="layui-input search-item"
+                                   readonly="readonly" placeholder="截止时间" style="height: 38px;width: 120px;cursor: pointer" autocomplete="off">
+                        </div>
+                        <button type="button" id="search" class="layui-btn layui-btn-sm">
+                            <i class="fa fa-lg fa-search"></i> 搜索
+                        </button>
+                    </div>
+                    <table class="layui-hide" id="dataTable" lay-filter="dataTable"></table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script id="pass-div-box" type="text/html">
+    <div class="layui-fluid layui-anim layui-anim-fadein">
+        <div class="layui-row">
+            <div class="layui-col-md12 layui-col-sm12">
+                <div class="layui-form">
+                    <div class="">
+                    <textarea id="leaveRefuseSummary" name="leaveRefuseSummary" autocomplete="off" maxlength="255"
+                              placeholder="请填写审批意见" class="layui-textarea"></textarea>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</script>
+<script src="assets/layuiadmin/layui/layui.js"></script>
+<script type="text/javascript">
+    layui.config({
+        base: 'assets/layuiadmin/'
+    }).extend({
+        index: 'lib/index'
+    }).use(['index', 'table', 'laytpl', 'form','laydate'], function() {
+        var $ = layui.$;
+        var $win = $(window);
+        var laytpl = layui.laytpl;
+        var table = layui.table;
+        var admin = layui.admin;
+        var form = layui.form;
+        var laydate = layui.laydate;
+        var tableUrl = 'api/leave/list-page-leave-detail1';
+        var dataLoading = false;
+
+        function init() {
+            laydate.render({
+                elem: '#startTime'
+            });
+            laydate.render({
+                elem: '#endTime'
+            });
+            initTable();
+        }
+        init();
+
+        function initTable() {
+            dataLoading = true;
+            table.render({
+                elem: '#dataTable',
+                id: 'dataTable',
+                url: top.restAjax.path(tableUrl, []),
+                width: admin.screen() > 1 ? '100%' : '',
+                height: $win.height() - 100,
+                limit: 20,
+                limits: [20, 40, 60, 80, 100, 200],
+                request: {
+                    pageName: 'page',
+                    limitName: 'rows'
+                },
+                cols: [[
+                    {field:'rowNum', width:60, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
+                    {field: 'userAvatar', width: 60, title: '头像', align:'center',fixed: 'left',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '<img style="width: 30px;height: 30px;" src="assets/images/profile-photo.jpg"/>';
+                            } else {
+                                return '<img style="width: 30px;height: 30px;" src="route/file/downloadfile/false/'+ rowData +'"/>';
+                            }
+                        }
+                    },
+                    {field: 'leaveUserName', width: 200, title: '请假人', align:'center',fixed: 'left',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            return rowData + '【' + row['userPhone'] + '】';
+                        }
+                    },
+                    {field: 'isSelf', width: 100, title: '公私假', align:'center',fixed: 'left',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(rowData === 0) {
+                                return '公假';
+                            }
+                            if(rowData === 1) {
+                                return '私假';
+                            }
+                            return '错误'
+                        }
+                    },
+                    {field: 'leaveTypeName', width: 100, title: '请假缘由', align:'center',fixed: 'left',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                    {field: 'leaveTime', width: 180, title: '请假时间', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                    {field: 'leaveTimeEnd', width: 180, title: '结束时间', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                    {field: 'leaveTimeLong', width: 100, title: '请假时长', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            return rowData + '天';
+                        }
+                    },
+                    {field: 'leaveSummary', width: 200, title: '详细请假原因', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            return '<span style="color: #1E9FFF">' + rowData + '</span>';
+                        }
+                    },
+                    {field: 'outgoingLocation', width: 200, title: '外出地点', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            return `<a href="javascript:void(0);" lay-event="showOutgoingEvent">${rowData}</a>`;
+                        }
+                    },
+                    {field: 'leaveImg', width: 100, title: '请假条', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            return '<button type="button" class="layui-btn layui-btn-xs layui-btn-normal" lay-event="leaveImgEvent">查看</button>';
+                        }
+                    },
+                    {field: 'leaveState', width: 100, title: '当前状态', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(rowData == '0'){
+                                return '<span style="color: #aa7700">待审批</span>'
+                            }
+                            if(rowData == '1'){
+                                return '<span style="color: #00a0e9">同意</span>'
+                            }
+                            if(rowData == '2'){
+                                return '<span style="color: red">不同意</span>'
+                            }
+                            return '-';
+                        }
+                    },
+                    {field: 'leaveRefuseSummary', width: 120, title: '审批意见', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                    {field: 'approverName', width: 100, title: '1级审批人', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                    {field: 'approverState', width: 120, title: '1级审批状态', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(rowData == '0'){
+                                return '<span style="color: #aa7700">待审批</span>'
+                            }
+                            if(rowData == '1') {
+                                return '<span style="color: #00a0e9">同意</span>'
+                            }
+                            if(rowData == '2') {
+                                return '<span style="color: red">不同意</span>'
+                            }
+                            return '-';
+                        }
+                    },
+                    {field: 'approverRefuseSummary', width: 120, title: '1级审批意见', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                    {field: 'approver2State', width: 120, title: '2级审批状态', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(rowData == '0'){
+                                return '<span style="color: #aa7700">待审批</span>'
+                            }
+                            if(rowData == '1') {
+                                return '<span style="color: #00a0e9">同意</span>'
+                            }
+                            if(rowData == '2') {
+                                return '<span style="color: red">不同意</span>'
+                            }
+                            return '-';
+                        }
+                    },
+                    {field: 'approver2RefuseSummary', width: 120, title: '2级审批意见', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                    {field: 'approver2Name', width: 120, title: '2级审批人', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    }
+                ]],
+                page: true,
+                parseData: function(data) {
+                    return {
+                        'code': 0,
+                        'msg': '',
+                        'count': data.total,
+                        'data': data.rows
+                    };
+                },
+                done: function(){
+                    dataLoading = false;
+                }
+            });
+        }
+
+        // 重载表格
+        function reloadTable(currentPage) {
+            dataLoading = true;
+            table.reload('dataTable', {
+                url: top.restAjax.path(tableUrl, []),
+                where :{
+                    keywords : $('#keywords').val(),
+                    approverState : $('#approverState').val(),
+                    startTime : $('#startTime').val(),
+                    endTime : $('#endTime').val()
+                },
+                page: {
+                    curr: currentPage
+                },
+                height: $win.height() - 100,
+                done:function(){
+                    dataLoading = false;
+                }
+            });
+        }
+
+        table.on('tool(dataTable)', function(obj) {
+            if(obj.event === 'leaveImgEvent') {
+                let data = obj.data;
+                let fileIds = data.leaveImg.split(',');
+                let files = [];
+                $.each(fileIds, function(index, item) {
+                    files.push({
+                        alt: index,
+                        pid: item,
+                        src: `route/file/downloadfile/true/${item}`,
+                        thumb: `route/file/downloadfile/true/${item}`
+                    })
+                })
+                layer.photos({
+                    photos: {
+                        title: `${data.leaveUserName}的请假条`,
+                        id: data.leaveId,
+                        start: 0,
+                        data: files
+                    },
+                    anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机
+                });
+            }
+            if(obj.event === 'showOutgoingEvent') {
+                let data = obj.data;
+                console.log(data);
+            }
+        });
+
+        $(document).on('click', '#search', function() {
+            if(dataLoading){
+                layer.msg('数据加载中,请稍等...');
+                return;
+            }
+            reloadTable(1);
+        });
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/static/route/reportcase/list_community_handle_zf.html b/src/main/resources/static/route/reportcase/list_community_handle_zf.html
new file mode 100644
index 0000000..14bb1cc
--- /dev/null
+++ b/src/main/resources/static/route/reportcase/list_community_handle_zf.html
@@ -0,0 +1,477 @@
+<!doctype html>
+<html lang="zh-CN">
+<head>
+    <base href="/servicecity/">
+    <meta charset="UTF-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=11,chrome=1"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+
+    <!-- 图片 -->
+    <link rel="stylesheet" type="text/css" href="assets/js/vendor/swiper3/css/swiper.min.css"/>
+    <link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css">
+    <!-- 图片 -->
+    <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
+    <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+    <style>
+        .layui-table-cell{
+            height: auto;
+        }
+        .layui-table-body td{
+            height: 210px;
+        }
+        .layui-table img{
+            max-width: 100%;
+        }
+        .info-row {border-bottom: 1px dotted;}
+        .info-row:last-child {border: none;}
+        .info-row .col-left {width:30%;height:28px;text-align:center;border-right:1px dotted;display:inline-block;padding:5px;vertical-align:top;}
+        .info-row .col-right {width:70%;display:inline-block;padding:5px;vertical-align:top;}
+        .info-row .col-line {width:100%;color:black;text-align:center;display:block;padding:5px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
+        .info-row .col-line .fa {color: red; margin-right: 5px;}
+        .info-row .col-content {width:100%;display:inline-block;padding:5px;height:86px;overflow:auto;white-space:normal;word-break:break-all;word-wrap:break-word;vertical-align:top;}
+    </style>
+</head>
+<body>
+<div class="layui-fluid layui-anim layui-anim-fadein">
+    <div class="layui-row">
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-body">
+                    <div class="test-table-reload-btn layui-form" style="margin-bottom: 5px;">
+                        <div class="layui-inline">
+                            <input type="text" id="caseNumber" class="layui-input search-item" placeholder="案件编号" style="height: 38px;width:150px;" autocomplete="off">
+                        </div>
+                        <div class="layui-inline" id="caseTypeSelectTemplateBox" style="width: 150px;"></div>
+                        <script id="caseTypeSelectTemplate" type="text/html">
+                            <select id="caseTypeId" name="caseTypeId" lay-filter="changeCaseType">
+                                <option value="">案件类型</option>
+                                {{# for(var i = 0, item; item = d[i++];) { }}
+                                <option value="{{item.dictId}}">{{item.dictName}}</option>
+                                {{# } }}
+                            </select>
+                        </script>
+                        <div class="layui-inline" id="childCaseTypeSelectTemplateBox" style="width: 150px;"></div>
+                        <script id="childCaseTypeSelectTemplate" type="text/html">
+                            <select id="childCaseTypeId" name="childCaseTypeId">
+                                <option value="">案件子类型</option>
+                                {{# for(var i = 0, item; item = d[i++];) { }}
+                                <option value="{{item.dictId}}">{{item.dictName}}</option>
+                                {{# } }}
+                            </select>
+                        </script>
+                        <div class="layui-inline">
+                            <input type="text" id="startTime" class="layui-input search-item"
+                                   readonly="readonly" placeholder="开始时间" style="height: 38px;width:150px;cursor: pointer" autocomplete="off">
+                        </div>
+                        <div class="layui-inline">
+                            <input type="text" id="endTime" class="layui-input search-item"
+                                   readonly="readonly" placeholder="结束时间" style="height: 38px;width:150px;cursor: pointer" autocomplete="off">
+                        </div>
+                        <button type="button" id="search" class="layui-btn layui-btn-sm">
+                            <i class="fa fa-lg fa-search"></i> 搜索
+                        </button>
+                        <!--<button type="button" id="deleteTableData" class="layui-btn layui-btn-danger layui-btn-sm">
+                            <i class="fa fa-lg fa-trash"></i> 批量删除
+                        </button>-->
+                    </div>
+
+                    <table class="layui-hide" id="dataTable" lay-filter="dataTable"></table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="assets/layuiadmin/layui/layui.js"></script>
+<!-- 图片 -->
+<script type="text/javascript" src="assets/js/vendor/swiper3/js/swiper.min.js"></script>
+<script type="text/javascript" src="assets/js/vendor/viewer/viewer.min.js"></script>
+<!-- 图片 -->
+
+<script type="text/javascript">
+    layui.config({
+        base: 'assets/layuiadmin/'
+    }).extend({
+        index: 'lib/index'
+    }).use(['index', 'table', 'laytpl', 'form','laydate'], function() {
+        var $ = layui.$;
+        var $win = $(window);
+        var laytpl = layui.laytpl;
+        var table = layui.table;
+        var admin = layui.admin;
+        var form = layui.form;
+        var laydate = layui.laydate;
+        // var departmentId = top.restAjax.params(window.location.href).departmentId;
+        var departmentId = '1d74dfc8-f3a3-4517-87fe-7acf7891bab4';
+        var tableUrl = 'api/reportcase/listpagereportcasehandle';
+        var dataLoading = false;
+
+        // 初始化表格
+        function initTable() {
+            dataLoading = true;
+            table.render({
+                elem: '#dataTable',
+                id: 'dataTable',
+                url: top.restAjax.path(getParamsUrl(tableUrl), []),
+                width: admin.screen() > 1 ? '100%' : '',
+                height: $win.height() - 100,
+                limit: 10,
+                limits: [10, 20, 40, 80, 100, 200],
+                request: {
+                    pageName: 'page',
+                    limitName: 'rows'
+                },
+                cols: [[
+                    {field:'rowNum', width:60, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
+                    {type:'checkbox', fixed: 'left'},
+                    {width: 300, title: '案件图片', align:'center',
+                        templet: function(row) {
+                            var photos = row.casePhotos.split(',')
+                            var value = '<div id="photo_'+ row.reportCaseId +'" class="swiper-container" style="width:100%;">' +
+                                '<div class="swiper-wrapper" style="width:100%">';
+                            for(var i = 0, item = photos[i]; item = photos[i++];) {
+                                value += '<div class="swiper-slide" style="width:100%;">' +
+                                    '<img class="swiper-lazy" src="route/file/downloadfile/true/'+ item +'" style="width:270px;height:180px;cursor:pointer;"/>' +
+                                    '<div class="swiper-lazy-preloader"></div>' +
+                                    '</div>';
+                            }
+                            value += '</div><div id="photo_swiper_'+ row.reportCaseId +'" class="swiper-pagination"></div></div>';
+                            setTimeout(function() {
+                                new Swiper('#photo_'+ row.reportCaseId, {
+                                    lazyLoading: true,
+                                    autoplay: 3000,
+                                    pagination : '#photo_swiper_'+ row.reportCaseId,
+                                    paginationClickable :true,
+                                });
+                                new Viewer(document.getElementById('photo_'+ row.reportCaseId));
+                            }, 50);
+                            return value;
+                        }
+                    },
+                    {width: 350, title: '案件信息', align: 'center',
+                        templet: function (row) {
+                            var caseFlowType =  row.caseFlowType;
+                            if(caseFlowType == '1'){
+                                caseFlowType = '(职能部门案件)';
+                            } else {
+                                caseFlowType = '(街镇案件)'
+                            }
+                            var value = '<div style="text-align: left">'+
+                                '<div class="info-row"><span class="col-left">案件编号</span><span class="col-right">'+ row.caseNumber +'</span></div>'+
+                                '<div class="info-row"><span class="col-left">所在地区</span><span class="col-right">'+ row.areaName +'</span></div>'+
+                                '<div class="info-row"><span class="col-left">所在社区</span><span class="col-right">'+ row.communityName +'</span></div>'+
+                                '<div class="info-row"><span class="col-left">案件类型</span><span class="col-right">'+ caseFlowType + row.caseTypeName +'</span></div>'+
+                                '<div class="info-row"><span class="col-left">操作</span>' +
+                                '<span class="col-right">'+
+                                '<div class="btn-group btn-group-xs">' +
+                                '<button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="showEvent">详情</button>'+
+                                '<button type="button" class="layui-btn layui-btn-warm layui-btn-sm" lay-event="caseFlowEvent">流程</button>'+
+                                '</div>'+
+                                '</span>'+
+                                '</div>'+
+                                '</div>'
+                            return value;
+                        }
+                    },
+                    {width: 300, title: '案件内容', align: 'center',
+                        templet: function (row) {
+                            var value = '<div style="text-align: left">'+
+                                '<div class="info-row"><span class="col-left">案件来源</span><span class="col-right">'+ sourceFormatter(row.caseSource) +'</span></div>'+
+                                '<div class="info-row"><a href="javascript:;" class="col-line" lay-event="showLocation"><i class="fa fa-map-marker"></i>'+ row.casePosition +'</a></div>'+
+                                '<div class="info-row"><span class="col-content">'+ row.caseContent +'</span></div>'+
+                                '</div>';
+                            return value;
+                        }
+                    },
+                    {width: 250, title: '案件状态', align: 'center',
+                        templet: function (row) {
+                            var value = '<div style="text-align: left">'+
+                                '<div class="info-row"><span class="col-left">上报时间</span><span class="col-right">'+ row.reportDate +'</span></div>'+
+                                '<div class="info-row"><span class="col-left">上报人员</span><span class="col-right">'+ row.caseReporter +'</span></div>'+
+                                '<div class="info-row"><span class="col-left">案件状态</span><span class="col-right">'+ caseStatusFormatter(row.caseStatus) +'</span></div>'+
+                                '<div class="info-row"><span class="col-left"></span><span class="col-right" style="color: red;">'+ ((row.overDays != null && row.overDays >= 1) ? '【超过'+ row.overDays +'天未处理】' : '') +'</span></div>'+
+                                '<div class="info-row"><span class="col-left"></span><span class="col-right"></span></div>'+
+                                '</div>';
+                            return value;
+                        }
+                    },
+                    {width: 250, title: '下派信息', align: 'center',
+                        templet: function (row) {
+                            var value = '<div style="text-align: left">'+
+                                '<div class="info-row"><span class="col-left">下派时间</span><span class="col-right">'+ row.assignDate +'</span></div>'+
+                                '<div class="info-row"><span class="col-left">处理人员</span><span class="col-right">'+ row.handleUserName +'</span></div>'+
+                                '<div class="info-row"><span class="col-left">处理时限</span><span class="col-right">'+ row.handleTime +'天</span></div>'+
+                                '<div class="info-row"><span class="col-left"></span><span class="col-right"></span></div>'+
+                                '<div class="info-row"><span class="col-left"></span><span class="col-right"></span></div>'+
+                                '</div>';
+                            return value;
+                        }
+                    }
+                ]],
+                page: true,
+                parseData: function(data) {
+                    return {
+                        'code': 0,
+                        'msg': '',
+                        'count': data.total,
+                        'data': data.rows
+                    };
+                },
+                done: function(){
+                    dataLoading = false;
+                }
+            });
+        }
+        setTimeout(function(){
+            initTable();
+        },500);
+
+        // 重载表格
+        function reloadTable(currentPage) {
+            dataLoading = true;
+            table.reload('dataTable', {
+                url: top.restAjax.path(getParamsUrl(tableUrl), []),
+                page: {
+                    curr: currentPage
+                },
+                height: $win.height() - 100,
+                done:function(){
+                    dataLoading = false;
+                }
+            });
+        }
+
+        //初始化案件类型
+        function initCaseType(){
+            top.restAjax.get('api/dict/listdict/46d108b2-4ef9-4f6f-b30c-0c700e3ee852', {}, null, function(code, data) {
+                laytpl(document.getElementById('caseTypeSelectTemplate').innerHTML).render(data, function(html) {
+                    document.getElementById('caseTypeSelectTemplateBox').innerHTML = html;
+                });
+                form.render('select');
+            }, function(code, data) {
+                top.dialog.msg(data.msg);
+            });
+        }
+        initCaseType();
+
+        //初始化子案件类型
+        function initChildCaseType(parentId){
+            if(typeof(parentId) === 'undefined' || '' == parentId){
+                laytpl(document.getElementById('childCaseTypeSelectTemplate').innerHTML).render([], function(html) {
+                    document.getElementById('childCaseTypeSelectTemplateBox').innerHTML = html;
+                });
+            }
+            top.restAjax.get('api/dict/listdict/' + parentId, {}, null, function(code, data) {
+                laytpl(document.getElementById('childCaseTypeSelectTemplate').innerHTML).render(data, function(html) {
+                    document.getElementById('childCaseTypeSelectTemplateBox').innerHTML = html;
+                });
+                form.render('select');
+            }, function(code, data) {
+                top.dialog.msg(data.msg);
+            });
+        }
+        initChildCaseType();
+
+        //初始化时间
+        function initDateTime(){
+            laydate.render({
+                elem: '#startTime'
+                ,value: ''
+            });
+            laydate.render({
+                elem: '#endTime'
+                ,value: ''
+            });
+        }
+        initDateTime();
+
+        function getParamsUrl(url) {
+            var caseTypeId = $('#caseTypeId').val();
+            var childCaseTypeId = $('#childCaseTypeId').val();
+            var startTime = $('#startTime').val();
+            var endTime = $('#endTime').val();
+            var params = '?t='+ new Date().getTime();
+            if('' != departmentId && 'undefined' != typeof(departmentId)) {
+                params += '&departmentId='+ departmentId;
+            }
+            if('' != caseTypeId && '' != childCaseTypeId) {
+                params += '&caseTypeId='+ childCaseTypeId;
+            } else {
+                params += '&caseTypeId='+ caseTypeId;
+            }
+            if('' != startTime) {
+                params += '&startTime='+ startTime;
+            }
+            if('' != endTime) {
+                params += '&endTime='+ endTime;
+            }
+            if('' != $('#caseNumber').val()) {
+                params += '&caseNumber='+ $('#caseNumber').val();
+            }
+            // 职能部门案件
+            params += '&caseFlowType=1';
+            return url + params;
+        }
+
+        // 来源格式化
+        function sourceFormatter(val) {
+            var value;
+            switch (val) {
+                case '1':
+                    value = '群众举报';
+                    break;
+                case '2':
+                    value = '巡检采集';
+                    break;
+                case '3':
+                    value = '专管员上报';
+                    break;
+                default:
+                    value = '未知';
+            }
+            return value;
+        }
+
+        // 案件状态
+        function caseStatusFormatter(val) {
+            var value;
+            switch (val) {
+                case '0':
+                    value = '待受理';
+                    break;
+                case '1':
+                    value = '待立案';
+                    break;
+                case '2':
+                    value = '待下派';
+                    break;
+                case '3':
+                    value = '待处理';
+                    break;
+                case '4':
+                    value = '待检查';
+                    break;
+                case '5':
+                    value = '待结案';
+                    break;
+                case '6':
+                    value = '已归档';
+                    break;
+                default:
+                    value = '异常';
+            }
+            return value;
+        }
+
+        // 删除
+        function remove(ids) {
+            top.dialog.msg(top.dataMessage.delete, {
+                time: 0,
+                btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
+                shade: 0.3,
+                yes: function (index) {
+                    top.dialog.close(index);
+                    var layIndex;
+                    top.restAjax.delete(top.restAjax.path('api/reportcase/removereportcase/{ids}', [ids]), {}, null, function (code, data) {
+                        // success
+                        top.dialog.msg(top.dataMessage.deleteSuccess, {time: 1000}, function () {
+                            reloadTable();
+                        });
+                    }, function (code, data) {
+                        // error
+                        top.dialog.msg(data.msg);
+                    }, function () {
+                        // before
+                        layIndex = top.dialog.msg(top.dataMessage.deleting, {icon: 16, time: 0, shade: 0.3});
+                    }, function () {
+                        // complete
+                        top.dialog.close(layIndex);
+                    });
+                }
+            });
+        }
+
+        table.on('tool(dataTable)', function(obj) {
+            if(obj.event === 'showEvent'){
+                layer.open({
+                    type: 2,
+                    title: '详情',
+                    closeBtn: 1,
+                    area: ['70%', '80%'],
+                    shadeClose: true,
+                    anim: 2,
+                    content: top.restAjax.path('route/reportcase/show.html?reportCaseId={id}',
+                        [obj.data.reportCaseId]),
+                    end: function() {
+                    }
+                });
+            }
+            if(obj.event === 'caseFlowEvent'){
+                layer.open({
+                    type: 2,
+                    title: '案件流程',
+                    closeBtn: 1,
+                    area: ['50%', '60%'],
+                    shadeClose: true,
+                    anim: 2,
+                    content: top.restAjax.path('route/reportcase/list_case_log.html?reportCaseId={id}',
+                        [obj.data.reportCaseId]),
+                    end: function() {
+                    }
+                });
+            }
+            if(obj.event === 'showLocation'){
+                layer.open({
+                    type: 2,
+                    title: '案件位置预览',
+                    closeBtn: 1,
+                    area: ['50%', '60%'],
+                    shadeClose: true,
+                    anim: 2,
+                    content: top.restAjax.path('route/reportcase/map-case-mark.html?reportCaseId={reportCaseId}',
+                        [obj.data.reportCaseId]),
+                    end: function() {
+                    }
+                });
+            }
+            if(obj.event === 'deleteEvent'){
+                remove(obj.data.reportCaseId);
+            }
+        });
+
+        form.on('select(changeCaseType)',function(data){
+            if(data.value == ''){
+                $('#childCaseTypeId').val('');
+                initChildCaseType();
+            } else {
+                initChildCaseType(data.value);
+            }
+        });
+
+        $(document).on('click', '#search', function() {
+            if(dataLoading){
+                layer.msg('数据加载中,请稍等...');
+                return;
+            }
+            reloadTable(1);
+        });
+
+        $(document).on('click', '#deleteTableData', function() {
+            var checkStatus = table.checkStatus('dataTable');
+            if(checkStatus.data.length == 0){
+                layer.msg('请先勾选要删除的数据')
+                return;
+            }
+            var ids = '';
+            for (var i = 0, item;item = checkStatus.data[i++];){
+                if(i > 1) {
+                    ids += '_';
+                }
+                ids += item.reportCaseId;
+            }
+            remove(ids);
+        });
+    })
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/static/route/reportcase/list_community_inspect_zf.html b/src/main/resources/static/route/reportcase/list_community_inspect_zf.html
new file mode 100644
index 0000000..c8079f2
--- /dev/null
+++ b/src/main/resources/static/route/reportcase/list_community_inspect_zf.html
@@ -0,0 +1,466 @@
+<!doctype html>
+<html lang="zh-CN">
+<head>
+    <base href="/servicecity/">
+    <meta charset="UTF-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=11,chrome=1"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+
+    <!-- 图片 -->
+    <link rel="stylesheet" type="text/css" href="assets/js/vendor/swiper3/css/swiper.min.css"/>
+    <link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css">
+    <!-- 图片 -->
+    <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
+    <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+    <style>
+        .layui-table-cell{
+            height: auto;
+        }
+        .layui-table-body td{
+            height: 210px;
+        }
+        .layui-table img{
+            max-width: 100%;
+        }
+        .info-row {border-bottom: 1px dotted;}
+        .info-row:last-child {border: none;}
+        .info-row .col-left {width:30%;height:28px;text-align:center;border-right:1px dotted;display:inline-block;padding:5px;vertical-align:top;}
+        .info-row .col-right {width:70%;display:inline-block;padding:5px;vertical-align:top;}
+        .info-row .col-line {width:100%;color:black;text-align:center;display:block;padding:5px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
+        .info-row .col-line .fa {color: red; margin-right: 5px;}
+        .info-row .col-content {width:100%;display:inline-block;padding:5px;height:86px;overflow:auto;white-space:normal;word-break:break-all;word-wrap:break-word;vertical-align:top;}
+    </style>
+</head>
+<body>
+<div class="layui-fluid layui-anim layui-anim-fadein">
+    <div class="layui-row">
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-body">
+                    <div class="test-table-reload-btn layui-form" style="margin-bottom: 5px;">
+                        <div class="layui-inline" style="width: 150px;">
+                            <input type="hidden" id="areaId" name="areaId" value="">
+                            <input type="text" class="layui-input" id="areaName" name="areaName" value="" readonly="readonly">
+                        </div>
+                        <div class="layui-inline" id="caseTypeSelectTemplateBox" style="width: 150px;"></div>
+                        <script id="caseTypeSelectTemplate" type="text/html">
+                            <select id="caseTypeId" name="caseTypeId" lay-filter="changeCaseType">
+                                <option value="">案件类型</option>
+                                {{# for(var i = 0, item; item = d[i++];) { }}
+                                <option value="{{item.dictId}}">{{item.dictName}}</option>
+                                {{# } }}
+                            </select>
+                        </script>
+                        <div class="layui-inline" id="childCaseTypeSelectTemplateBox" style="width: 150px;"></div>
+                        <script id="childCaseTypeSelectTemplate" type="text/html">
+                            <select id="childCaseTypeId" name="childCaseTypeId">
+                                <option value="">案件子类型</option>
+                                {{# for(var i = 0, item; item = d[i++];) { }}
+                                <option value="{{item.dictId}}">{{item.dictName}}</option>
+                                {{# } }}
+                            </select>
+                        </script>
+                        <div class="layui-inline">
+                            <input type="text" id="startTime" class="layui-input search-item"
+                                   readonly="readonly" placeholder="开始时间" style="height: 38px;width:150px;cursor: pointer" autocomplete="off">
+                        </div>
+                        <div class="layui-inline">
+                            <input type="text" id="endTime" class="layui-input search-item"
+                                   readonly="readonly" placeholder="结束时间" style="height: 38px;width:150px;cursor: pointer" autocomplete="off">
+                        </div>
+                        <button type="button" id="search" class="layui-btn layui-btn-sm">
+                            <i class="fa fa-lg fa-search"></i> 搜索
+                        </button>
+                        <!--<button type="button" id="deleteTableData" class="layui-btn layui-btn-danger layui-btn-sm">
+                            <i class="fa fa-lg fa-trash"></i> 批量删除
+                        </button>-->
+                    </div>
+
+                    <table class="layui-hide" id="dataTable" lay-filter="dataTable"></table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="assets/layuiadmin/layui/layui.js"></script>
+<!-- 图片 -->
+<script type="text/javascript" src="assets/js/vendor/swiper3/js/swiper.min.js"></script>
+<script type="text/javascript" src="assets/js/vendor/viewer/viewer.min.js"></script>
+<!-- 图片 -->
+
+<script type="text/javascript">
+    layui.config({
+        base: 'assets/layuiadmin/'
+    }).extend({
+        index: 'lib/index'
+    }).use(['index', 'table', 'laytpl', 'form','laydate'], function() {
+        var $ = layui.$;
+        var $win = $(window);
+        var laytpl = layui.laytpl;
+        var table = layui.table;
+        var admin = layui.admin;
+        var form = layui.form;
+        var laydate = layui.laydate;
+        var departmentId = '1d74dfc8-f3a3-4517-87fe-7acf7891bab4';
+        var tableUrl = 'api/reportcase/listpagereportcaseinspect';
+        var dataLoading = false;
+
+        // 初始化表格
+        function initTable() {
+            dataLoading = true;
+            table.render({
+                elem: '#dataTable',
+                id: 'dataTable',
+                url: top.restAjax.path(getParamsUrl(tableUrl), []),
+                width: admin.screen() > 1 ? '100%' : '',
+                height: $win.height() - 100,
+                limit: 10,
+                limits: [10, 20, 40, 80, 100, 200],
+                request: {
+                    pageName: 'page',
+                    limitName: 'rows'
+                },
+                cols: [[
+                    {field:'rowNum', width:60, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
+                    {type:'checkbox', fixed: 'left'},
+                    {width: 300, title: '案件图片', align:'center',
+                        templet: function(row) {
+                            var photos = row.casePhotos.split(',')
+                            var value = '<div id="photo_'+ row.reportCaseId +'" class="swiper-container" style="width:100%;">' +
+                                '<div class="swiper-wrapper" style="width:100%">';
+                            for(var i = 0, item = photos[i]; item = photos[i++];) {
+                                value += '<div class="swiper-slide" style="width:100%;">' +
+                                    '<img class="swiper-lazy" src="route/file/downloadfile/true/'+ item +'" style="width:270px;height:180px;cursor:pointer;"/>' +
+                                    '<div class="swiper-lazy-preloader"></div>' +
+                                    '</div>';
+                            }
+                            value += '</div><div id="photo_swiper_'+ row.reportCaseId +'" class="swiper-pagination"></div></div>';
+                            setTimeout(function() {
+                                new Swiper('#photo_'+ row.reportCaseId, {
+                                    lazyLoading: true,
+                                    autoplay: 3000,
+                                    pagination : '#photo_swiper_'+ row.reportCaseId,
+                                    paginationClickable :true,
+                                });
+                                new Viewer(document.getElementById('photo_'+ row.reportCaseId));
+                            }, 50);
+                            return value;
+                        }
+                    },
+                    {width: 350, title: '案件信息', align: 'center',
+                        templet: function (row) {
+                            var value = '<div style="text-align: left">'+
+                                '<div class="info-row"><span class="col-left">案件编号</span><span class="col-right">'+ row.caseNumber +'</span></div>'+
+                                '<div class="info-row"><span class="col-left">所在地区</span><span class="col-right">'+ row.areaName +'</span></div>'+
+                                '<div class="info-row"><span class="col-left">所在社区</span><span class="col-right">'+ row.communityName +'</span></div>'+
+                                '<div class="info-row"><span class="col-left">案件类型</span><span class="col-right">'+ row.caseTypeName +'</span></div>'+
+                                '<div class="info-row"><span class="col-left">操作</span>' +
+                                '<span class="col-right">'+
+                                '<div class="btn-group btn-group-xs">' +
+                                '<button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="showEvent">详情</button>'+
+                                '<button type="button" class="layui-btn layui-btn-warm layui-btn-sm" lay-event="caseFlowEvent">流程</button>'+
+                                '</div>'+
+                                '</span>'+
+                                '</div>'+
+                                '</div>'
+                            return value;
+                        }
+                    },
+                    {width: 300, title: '案件内容', align: 'center',
+                        templet: function (row) {
+                            var value = '<div style="text-align: left">'+
+                                '<div class="info-row"><span class="col-left">案件来源</span><span class="col-right">'+ sourceFormatter(row.caseSource) +'</span></div>'+
+                                '<div class="info-row"><a href="javascript:;" class="col-line" lay-event="showLocation"><i class="fa fa-map-marker"></i>'+ row.casePosition +'</a></div>'+
+                                '<div class="info-row"><span class="col-content">'+ row.caseContent +'</span></div>'+
+                                '</div>';
+                            return value;
+                        }
+                    },
+                    {width: 250, title: '案件状态', align: 'center',
+                        templet: function (row) {
+                            var value = '<div style="text-align: left">'+
+                                '<div class="info-row"><span class="col-left">上报时间</span><span class="col-right">'+ row.reportDate +'</span></div>'+
+                                '<div class="info-row"><span class="col-left">上报人员</span><span class="col-right">'+ row.caseReporter +'</span></div>'+
+                                '<div class="info-row"><span class="col-left">案件状态</span><span class="col-right">'+ caseStatusFormatter(row.caseStatus) +'</span></div>'+
+                                '<div class="info-row"><span class="col-left"></span><span class="col-right" style="color: red;">'+ ((row.overDays != null && row.overDays >= 1) ? '【超过'+ row.overDays +'天未处理】' : '') +'</span></div>'+
+                                '<div class="info-row"><span class="col-left"></span><span class="col-right"></span></div>'+
+                                '</div>';
+                            return value;
+                        }
+                    },
+                    {width: 250, title: '下派信息', align: 'center',
+                        templet: function (row) {
+                            var value = '<div style="text-align: left">'+
+                                '<div class="info-row"><span class="col-left">处理时间</span><span class="col-right">'+ row.handleDate +'</span></div>'+
+                                '<div class="info-row"><span class="col-left">处理人员</span><span class="col-right">'+ row.handleUserName +'</span></div>'+
+                                '<div class="info-row"><span class="col-left">处理时长</span><span class="col-right">'+ row.handleTime +'天</span></div>'+
+                                '<div class="info-row"><span class="col-left">是否超时</span><span class="col-right"></span></div>'+
+                                '<div class="info-row"><span class="col-left"></span><span class="col-right"></span></div>'+
+                                '</div>';
+                            return value;
+                        }
+                    }
+                ]],
+                page: true,
+                parseData: function(data) {
+                    return {
+                        'code': 0,
+                        'msg': '',
+                        'count': data.total,
+                        'data': data.rows
+                    };
+                },
+                done: function(){
+                    dataLoading = false;
+                }
+            });
+        }
+        setTimeout(function(){
+            initTable();
+        },500);
+
+        // 重载表格
+        function reloadTable(currentPage) {
+            dataLoading = true;
+            table.reload('dataTable', {
+                url: top.restAjax.path(getParamsUrl(tableUrl), []),
+                page: {
+                    curr: currentPage
+                },
+                height: $win.height() - 100,
+                done:function(){
+                    dataLoading = false;
+                }
+            });
+        }
+
+        //初始化案件类型
+        function initCaseType(){
+            top.restAjax.get('api/dict/listdict/46d108b2-4ef9-4f6f-b30c-0c700e3ee852', {}, null, function(code, data) {
+                laytpl(document.getElementById('caseTypeSelectTemplate').innerHTML).render(data, function(html) {
+                    document.getElementById('caseTypeSelectTemplateBox').innerHTML = html;
+                });
+                form.render('select');
+            }, function(code, data) {
+                top.dialog.msg(data.msg);
+            });
+        }
+        initCaseType();
+
+        //初始化子案件类型
+        function initChildCaseType(parentId){
+            if(typeof(parentId) === 'undefined' || '' == parentId){
+                laytpl(document.getElementById('childCaseTypeSelectTemplate').innerHTML).render([], function(html) {
+                    document.getElementById('childCaseTypeSelectTemplateBox').innerHTML = html;
+                });
+            }
+            top.restAjax.get('api/dict/listdict/' + parentId, {}, null, function(code, data) {
+                laytpl(document.getElementById('childCaseTypeSelectTemplate').innerHTML).render(data, function(html) {
+                    document.getElementById('childCaseTypeSelectTemplateBox').innerHTML = html;
+                });
+                form.render('select');
+            }, function(code, data) {
+                top.dialog.msg(data.msg);
+            });
+        }
+        initChildCaseType();
+
+        //初始化时间
+        function initDateTime(){
+            laydate.render({
+                elem: '#startTime'
+                ,value: ''
+            });
+            laydate.render({
+                elem: '#endTime'
+                ,value: ''
+            });
+        }
+        initDateTime();
+
+        function getParamsUrl(url) {
+            var caseTypeId = $('#caseTypeId').val();
+            var childCaseTypeId = $('#childCaseTypeId').val();
+            var startTime = $('#startTime').val();
+            var endTime = $('#endTime').val();
+            var params = '?t='+ new Date().getTime();
+            if('' != departmentId && 'undefined' != typeof(departmentId)) {
+                params += '&departmentId='+ departmentId;
+            }
+            if('' != caseTypeId && '' != childCaseTypeId) {
+                params += '&caseTypeId='+ childCaseTypeId;
+            } else {
+                params += '&caseTypeId='+ caseTypeId;
+            }
+            if('' != startTime) {
+                params += '&startTime='+ startTime;
+            }
+            if('' != endTime) {
+                params += '&endTime='+ endTime;
+            }
+            return url + params;
+        }
+
+        // 来源格式化
+        function sourceFormatter(val) {
+            var value;
+            switch (val) {
+                case '1':
+                    value = '群众举报';
+                    break;
+                case '2':
+                    value = '巡检采集';
+                    break;
+                case '3':
+                    value = '专管员上报';
+                    break;
+                default:
+                    value = '未知';
+            }
+            return value;
+        }
+
+        // 案件状态
+        function caseStatusFormatter(val) {
+            var value;
+            switch (val) {
+                case '0':
+                    value = '待受理';
+                    break;
+                case '1':
+                    value = '待立案';
+                    break;
+                case '2':
+                    value = '待下派';
+                    break;
+                case '3':
+                    value = '待处理';
+                    break;
+                case '4':
+                    value = '待检查';
+                    break;
+                case '5':
+                    value = '待结案';
+                    break;
+                case '6':
+                    value = '已归档';
+                    break;
+                default:
+                    value = '异常';
+            }
+            return value;
+        }
+
+        // 删除
+        function remove(ids) {
+            top.dialog.msg(top.dataMessage.delete, {
+                time: 0,
+                btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
+                shade: 0.3,
+                yes: function (index) {
+                    top.dialog.close(index);
+                    var layIndex;
+                    top.restAjax.delete(top.restAjax.path('api/reportcase/removereportcase/{ids}', [ids]), {}, null, function (code, data) {
+                        // success
+                        top.dialog.msg(top.dataMessage.deleteSuccess, {time: 1000}, function () {
+                            reloadTable();
+                        });
+                    }, function (code, data) {
+                        // error
+                        top.dialog.msg(data.msg);
+                    }, function () {
+                        // before
+                        layIndex = top.dialog.msg(top.dataMessage.deleting, {icon: 16, time: 0, shade: 0.3});
+                    }, function () {
+                        // complete
+                        top.dialog.close(layIndex);
+                    });
+                }
+            });
+        }
+
+        table.on('tool(dataTable)', function(obj) {
+            if(obj.event === 'showEvent'){
+                layer.open({
+                    type: 2,
+                    title: '详情',
+                    closeBtn: 1,
+                    area: ['70%', '80%'],
+                    shadeClose: true,
+                    anim: 2,
+                    content: top.restAjax.path('route/reportcase/show.html?reportCaseId={id}',
+                        [obj.data.reportCaseId]),
+                    end: function() {
+                    }
+                });
+            }
+            if(obj.event === 'caseFlowEvent'){
+                layer.open({
+                    type: 2,
+                    title: '案件流程',
+                    closeBtn: 1,
+                    area: ['50%', '60%'],
+                    shadeClose: true,
+                    anim: 2,
+                    content: top.restAjax.path('route/reportcase/list_case_log.html?reportCaseId={id}',
+                        [obj.data.reportCaseId]),
+                    end: function() {
+                    }
+                });
+            }
+            if(obj.event === 'showLocation'){
+                layer.open({
+                    type: 2,
+                    title: '案件位置预览',
+                    closeBtn: 1,
+                    area: ['800px', '565px'],
+                    shadeClose: true,
+                    anim: 2,
+                    content: top.restAjax.path('route/reportcase/map-case-mark.html?reportCaseId={reportCaseId}',
+                        [obj.data.reportCaseId]),
+                    end: function() {
+                    }
+                });
+            }
+            if(obj.event === 'deleteEvent'){
+                remove(obj.data.reportCaseId);
+            }
+        });
+
+        form.on('select(changeCaseType)',function(data){
+            if(data.value == ''){
+                $('#childCaseTypeId').val('');
+                initChildCaseType();
+            } else {
+                initChildCaseType(data.value);
+            }
+        });
+
+        $(document).on('click', '#search', function() {
+            if(dataLoading){
+                layer.msg('数据加载中,请稍等...');
+                return;
+            }
+            reloadTable(1);
+        });
+
+        $(document).on('click', '#deleteTableData', function() {
+            var checkStatus = table.checkStatus('dataTable');
+            if(checkStatus.data.length == 0){
+                layer.msg('请先勾选要删除的数据')
+                return;
+            }
+            var ids = '';
+            for (var i = 0, item;item = checkStatus.data[i++];){
+                if(i > 1) {
+                    ids += '_';
+                }
+                ids += item.reportCaseId;
+            }
+            remove(ids);
+        });
+    })
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/static/route/reportcase/list_community_placeonfile_zf.html b/src/main/resources/static/route/reportcase/list_community_placeonfile_zf.html
new file mode 100644
index 0000000..9efcd7e
--- /dev/null
+++ b/src/main/resources/static/route/reportcase/list_community_placeonfile_zf.html
@@ -0,0 +1,454 @@
+<!doctype html>
+<html lang="zh-CN">
+<head>
+    <base href="/servicecity/">
+    <meta charset="UTF-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=11,chrome=1"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+
+    <!-- 图片 -->
+    <link rel="stylesheet" type="text/css" href="assets/js/vendor/swiper3/css/swiper.min.css"/>
+    <link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css">
+    <!-- 图片 -->
+    <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
+    <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+    <style>
+        .layui-table-cell{
+            height: auto;
+        }
+        .layui-table-body td{
+            height: 210px;
+        }
+        .layui-table img{
+            max-width: 100%;
+        }
+        .info-row {border-bottom: 1px dotted;}
+        .info-row:last-child {border: none;}
+        .info-row .col-left {width:30%;height:28px;text-align:center;border-right:1px dotted;display:inline-block;padding:5px;vertical-align:top;}
+        .info-row .col-right {width:70%;display:inline-block;padding:5px;vertical-align:top;}
+        .info-row .col-line {width:100%;color:black;text-align:center;display:block;padding:5px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
+        .info-row .col-line .fa {color: red; margin-right: 5px;}
+        .info-row .col-content {width:100%;display:inline-block;padding:5px;height:86px;overflow:auto;white-space:normal;word-break:break-all;word-wrap:break-word;vertical-align:top;}
+    </style>
+</head>
+<body>
+<div class="layui-fluid layui-anim layui-anim-fadein">
+    <div class="layui-row">
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-body">
+                    <div class="test-table-reload-btn layui-form" style="margin-bottom: 5px;">
+                        <div class="layui-inline" style="width: 150px;">
+                            <input type="hidden" id="areaId" name="areaId" value="">
+                            <input type="text" class="layui-input" id="areaName" name="areaName" value="" readonly="readonly">
+                        </div>
+                        <div class="layui-inline" id="caseTypeSelectTemplateBox" style="width: 150px;"></div>
+                        <script id="caseTypeSelectTemplate" type="text/html">
+                            <select id="caseTypeId" name="caseTypeId" lay-filter="changeCaseType">
+                                <option value="">案件类型</option>
+                                {{# for(var i = 0, item; item = d[i++];) { }}
+                                <option value="{{item.dictId}}">{{item.dictName}}</option>
+                                {{# } }}
+                            </select>
+                        </script>
+                        <div class="layui-inline" id="childCaseTypeSelectTemplateBox" style="width: 150px;"></div>
+                        <script id="childCaseTypeSelectTemplate" type="text/html">
+                            <select id="childCaseTypeId" name="childCaseTypeId">
+                                <option value="">案件子类型</option>
+                                {{# for(var i = 0, item; item = d[i++];) { }}
+                                <option value="{{item.dictId}}">{{item.dictName}}</option>
+                                {{# } }}
+                            </select>
+                        </script>
+                        <div class="layui-inline">
+                            <input type="text" id="startTime" class="layui-input search-item"
+                                   readonly="readonly" placeholder="开始时间" style="height: 38px;width:150px;cursor: pointer" autocomplete="off">
+                        </div>
+                        <div class="layui-inline">
+                            <input type="text" id="endTime" class="layui-input search-item"
+                                   readonly="readonly" placeholder="结束时间" style="height: 38px;width:150px;cursor: pointer" autocomplete="off">
+                        </div>
+                        <button type="button" id="search" class="layui-btn layui-btn-sm">
+                            <i class="fa fa-lg fa-search"></i> 搜索
+                        </button>
+                        <!--<button type="button" id="deleteTableData" class="layui-btn layui-btn-danger layui-btn-sm">
+                            <i class="fa fa-lg fa-trash"></i> 批量删除
+                        </button>-->
+                    </div>
+
+                    <table class="layui-hide" id="dataTable" lay-filter="dataTable"></table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="assets/layuiadmin/layui/layui.js"></script>
+<!-- 图片 -->
+<script type="text/javascript" src="assets/js/vendor/swiper3/js/swiper.min.js"></script>
+<script type="text/javascript" src="assets/js/vendor/viewer/viewer.min.js"></script>
+<!-- 图片 -->
+
+<script type="text/javascript">
+    layui.config({
+        base: 'assets/layuiadmin/'
+    }).extend({
+        index: 'lib/index'
+    }).use(['index', 'table', 'laytpl', 'form','laydate'], function() {
+        var $ = layui.$;
+        var $win = $(window);
+        var laytpl = layui.laytpl;
+        var table = layui.table;
+        var admin = layui.admin;
+        var form = layui.form;
+        var laydate = layui.laydate;
+        var departmentId = '1d74dfc8-f3a3-4517-87fe-7acf7891bab4';
+        var tableUrl = 'api/reportcase/listpagereportcase?caseStatus=6';
+        var dataLoading = false;
+
+        // 初始化表格
+        function initTable() {
+            dataLoading = true;
+            table.render({
+                elem: '#dataTable',
+                id: 'dataTable',
+                url: top.restAjax.path(getParamsUrl(tableUrl), []),
+                width: admin.screen() > 1 ? '100%' : '',
+                height: $win.height() - 100,
+                limit: 10,
+                limits: [10, 20, 40, 80, 100, 200],
+                request: {
+                    pageName: 'page',
+                    limitName: 'rows'
+                },
+                cols: [[
+                    {field:'rowNum', width:60, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
+                    {type:'checkbox', fixed: 'left'},
+                    {width: 300, title: '案件图片', align:'center',
+                        templet: function(row) {
+                            var photos = row.casePhotos.split(',')
+                            var value = '<div id="photo_'+ row.reportCaseId +'" class="swiper-container" style="width:100%;">' +
+                                '<div class="swiper-wrapper" style="width:100%">';
+                            for(var i = 0, item = photos[i]; item = photos[i++];) {
+                                value += '<div class="swiper-slide" style="width:100%;">' +
+                                    '<img class="swiper-lazy" src="route/file/downloadfile/true/'+ item +'" style="width:270px;height:180px;cursor:pointer;"/>' +
+                                    '<div class="swiper-lazy-preloader"></div>' +
+                                    '</div>';
+                            }
+                            value += '</div><div id="photo_swiper_'+ row.reportCaseId +'" class="swiper-pagination"></div></div>';
+                            setTimeout(function() {
+                                new Swiper('#photo_'+ row.reportCaseId, {
+                                    lazyLoading: true,
+                                    autoplay: 3000,
+                                    pagination : '#photo_swiper_'+ row.reportCaseId,
+                                    paginationClickable :true,
+                                });
+                                new Viewer(document.getElementById('photo_'+ row.reportCaseId));
+                            }, 50);
+                            return value;
+                        }
+                    },
+                    {width: 350, title: '案件信息', align: 'center',
+                        templet: function (row) {
+                            var value = '<div style="text-align: left">'+
+                                '<div class="info-row"><span class="col-left">案件编号</span><span class="col-right">'+ row.caseNumber +'</span></div>'+
+                                '<div class="info-row"><span class="col-left">所在地区</span><span class="col-right">'+ row.areaName +'</span></div>'+
+                                '<div class="info-row"><span class="col-left">所在社区</span><span class="col-right">'+ row.communityName +'</span></div>'+
+                                '<div class="info-row"><span class="col-left">案件类型</span><span class="col-right">'+ row.caseTypeName +'</span></div>'+
+                                '<div class="info-row"><span class="col-left">操作</span>' +
+                                '<span class="col-right">'+
+                                '<div class="btn-group btn-group-xs">' +
+                                '<button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="showEvent">详情</button>'+
+                                '<button type="button" class="layui-btn layui-btn-warm layui-btn-sm" lay-event="caseFlowEvent">流程</button>'+
+                                '</div>'+
+                                '</span>'+
+                                '</div>'+
+                                '</div>'
+                            return value;
+                        }
+                    },
+                    {width: 400, title: '案件内容', align: 'center',
+                        templet: function (row) {
+                            var value = '<div style="text-align: left">'+
+                                '<div class="info-row"><span class="col-left">案件来源</span><span class="col-right">'+ sourceFormatter(row.caseSource) +'</span></div>'+
+                                '<div class="info-row"><a href="javascript:;" class="col-line" lay-event="showLocation"><i class="fa fa-map-marker"></i>'+ row.casePosition +'</a></div>'+
+                                '<div class="info-row"><span class="col-content">'+ row.caseContent +'</span></div>'+
+                                '</div>';
+                            return value;
+                        }
+                    },
+                    {width: 250, title: '案件状态', align: 'center',
+                        templet: function (row) {
+                            var value = '<div style="text-align: left">'+
+                                '<div class="info-row"><span class="col-left">上报时间</span><span class="col-right">'+ row.reportDate +'</span></div>'+
+                                '<div class="info-row"><span class="col-left">上报人员</span><span class="col-right">'+ row.caseReporter +'</span></div>'+
+                                '<div class="info-row"><span class="col-left">案件状态</span><span class="col-right">'+ caseStatusFormatter(row.caseStatus) +'</span></div>'+
+                                '<div class="info-row"><span class="col-left"></span><span class="col-right" style="color: red;">'+ ((row.overDays != null && row.overDays >= 1) ? '【超过'+ row.overDays +'天未处理】' : '') +'</span></div>'+
+                                '<div class="info-row"><span class="col-left"></span><span class="col-right"></span></div>'+
+                                '</div>';
+                            return value;
+                        }
+                    }
+                ]],
+                page: true,
+                parseData: function(data) {
+                    return {
+                        'code': 0,
+                        'msg': '',
+                        'count': data.total,
+                        'data': data.rows
+                    };
+                },
+                done: function(){
+                    dataLoading = false;
+                }
+            });
+        }
+        setTimeout(function(){
+            initTable();
+        },500);
+
+        // 重载表格
+        function reloadTable(currentPage) {
+            dataLoading = true;
+            table.reload('dataTable', {
+                url: top.restAjax.path(getParamsUrl(tableUrl), []),
+                page: {
+                    curr: currentPage
+                },
+                height: $win.height() - 100,
+                done:function(){
+                    dataLoading = false;
+                }
+            });
+        }
+
+        //初始化案件类型
+        function initCaseType(){
+            top.restAjax.get('api/dict/listdict/46d108b2-4ef9-4f6f-b30c-0c700e3ee852', {}, null, function(code, data) {
+                laytpl(document.getElementById('caseTypeSelectTemplate').innerHTML).render(data, function(html) {
+                    document.getElementById('caseTypeSelectTemplateBox').innerHTML = html;
+                });
+                form.render('select');
+            }, function(code, data) {
+                top.dialog.msg(data.msg);
+            });
+        }
+        initCaseType();
+
+        //初始化子案件类型
+        function initChildCaseType(parentId){
+            if(typeof(parentId) === 'undefined' || '' == parentId){
+                laytpl(document.getElementById('childCaseTypeSelectTemplate').innerHTML).render([], function(html) {
+                    document.getElementById('childCaseTypeSelectTemplateBox').innerHTML = html;
+                });
+            }
+            top.restAjax.get('api/dict/listdict/' + parentId, {}, null, function(code, data) {
+                laytpl(document.getElementById('childCaseTypeSelectTemplate').innerHTML).render(data, function(html) {
+                    document.getElementById('childCaseTypeSelectTemplateBox').innerHTML = html;
+                });
+                form.render('select');
+            }, function(code, data) {
+                top.dialog.msg(data.msg);
+            });
+        }
+        initChildCaseType();
+
+        //初始化时间
+        function initDateTime(){
+            laydate.render({
+                elem: '#startTime'
+                ,value: ''
+            });
+            laydate.render({
+                elem: '#endTime'
+                ,value: ''
+            });
+        }
+        initDateTime();
+
+        function getParamsUrl(url) {
+            var caseTypeId = $('#caseTypeId').val();
+            var childCaseTypeId = $('#childCaseTypeId').val();
+            var startTime = $('#startTime').val();
+            var endTime = $('#endTime').val();
+            var params = '&t='+ new Date().getTime();
+            if('' != departmentId && 'undefined' != typeof(departmentId)) {
+                params += '&departmentId='+ departmentId;
+            }
+            if('' != caseTypeId && '' != childCaseTypeId) {
+                params += '&caseTypeId='+ childCaseTypeId;
+            } else {
+                params += '&caseTypeId='+ caseTypeId;
+            }
+            if('' != startTime) {
+                params += '&startTime='+ startTime;
+            }
+            if('' != endTime) {
+                params += '&endTime='+ endTime;
+            }
+            return url + params;
+        }
+
+        // 来源格式化
+        function sourceFormatter(val) {
+            var value;
+            switch (val) {
+                case '1':
+                    value = '群众举报';
+                    break;
+                case '2':
+                    value = '巡检采集';
+                    break;
+                case '3':
+                    value = '专管员上报';
+                    break;
+                default:
+                    value = '未知';
+            }
+            return value;
+        }
+
+        // 案件状态
+        function caseStatusFormatter(val) {
+            var value;
+            switch (val) {
+                case '0':
+                    value = '待受理';
+                    break;
+                case '1':
+                    value = '待立案';
+                    break;
+                case '2':
+                    value = '待下派';
+                    break;
+                case '3':
+                    value = '待处理';
+                    break;
+                case '4':
+                    value = '待检查';
+                    break;
+                case '5':
+                    value = '待结案';
+                    break;
+                case '6':
+                    value = '已归档';
+                    break;
+                default:
+                    value = '异常';
+            }
+            return value;
+        }
+
+        // 删除
+        function remove(ids) {
+            top.dialog.msg(top.dataMessage.delete, {
+                time: 0,
+                btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
+                shade: 0.3,
+                yes: function (index) {
+                    top.dialog.close(index);
+                    var layIndex;
+                    top.restAjax.delete(top.restAjax.path('api/reportcase/removereportcase/{ids}', [ids]), {}, null, function (code, data) {
+                        // success
+                        top.dialog.msg(top.dataMessage.deleteSuccess, {time: 1000}, function () {
+                            reloadTable();
+                        });
+                    }, function (code, data) {
+                        // error
+                        top.dialog.msg(data.msg);
+                    }, function () {
+                        // before
+                        layIndex = top.dialog.msg(top.dataMessage.deleting, {icon: 16, time: 0, shade: 0.3});
+                    }, function () {
+                        // complete
+                        top.dialog.close(layIndex);
+                    });
+                }
+            });
+        }
+
+        table.on('tool(dataTable)', function(obj) {
+            if(obj.event === 'showEvent'){
+                layer.open({
+                    type: 2,
+                    title: '详情',
+                    closeBtn: 1,
+                    area: ['70%', '80%'],
+                    shadeClose: true,
+                    anim: 2,
+                    content: top.restAjax.path('route/reportcase/show.html?reportCaseId={id}',
+                        [obj.data.reportCaseId]),
+                    end: function() {
+                    }
+                });
+            }
+            if(obj.event === 'caseFlowEvent'){
+                layer.open({
+                    type: 2,
+                    title: '案件流程',
+                    closeBtn: 1,
+                    area: ['50%', '60%'],
+                    shadeClose: true,
+                    anim: 2,
+                    content: top.restAjax.path('route/reportcase/list_case_log.html?reportCaseId={id}',
+                        [obj.data.reportCaseId]),
+                    end: function() {
+                    }
+                });
+            }
+            if(obj.event === 'showLocation'){
+                layer.open({
+                    type: 2,
+                    title: '案件位置预览',
+                    closeBtn: 1,
+                    area: ['50%', '60%'],
+                    shadeClose: true,
+                    anim: 2,
+                    content: top.restAjax.path('route/reportcase/map-case-mark.html?reportCaseId={reportCaseId}',
+                        [obj.data.reportCaseId]),
+                    end: function() {
+                    }
+                });
+            }
+            if(obj.event === 'deleteEvent'){
+                remove(obj.data.reportCaseId);
+            }
+        });
+
+        form.on('select(changeCaseType)',function(data){
+            if(data.value == ''){
+                $('#childCaseTypeId').val('');
+                initChildCaseType();
+            } else {
+                initChildCaseType(data.value);
+            }
+        });
+
+        $(document).on('click', '#search', function() {
+            if(dataLoading){
+                layer.msg('数据加载中,请稍等...');
+                return;
+            }
+            reloadTable(1);
+        });
+
+        $(document).on('click', '#deleteTableData', function() {
+            var checkStatus = table.checkStatus('dataTable');
+            if(checkStatus.data.length == 0){
+                layer.msg('请先勾选要删除的数据')
+                return;
+            }
+            var ids = '';
+            for (var i = 0, item;item = checkStatus.data[i++];){
+                if(i > 1) {
+                    ids += '_';
+                }
+                ids += item.reportCaseId;
+            }
+            remove(ids);
+        });
+    })
+</script>
+</body>
+</html>
\ No newline at end of file