diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
index 5edda35..2466e9a 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.common.constant.Const;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
@@ -29,8 +30,6 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -56,6 +55,7 @@
     private int maxRowsExcel;
     @Value("${casic.config.config-path}")
     private String templatePath;
+
     /**
      * 获取列表
      */
@@ -73,30 +73,32 @@
     public Object listPage(String condition) {
         Page<CwsCase> page = new PageFactory<CwsCase>().defaultPage();
         EntityWrapper<CwsCase> query = new EntityWrapper<>();
-        page =  cwsCaseService.selectPage(page,query);
+        page = cwsCaseService.selectPage(page, query);
         return super.packForBT(page);
     }
+
     /**
      * 新增-pc
      */
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, HttpServletRequest request) {
-        if(cwsCaseService.createNewPC(cwsCase,isNeedVerify,isNeedRevisit,bzhours,bzminis,verifyPersonId)){
+        if (cwsCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId)) {
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("服务器异常");
         }
     }
+
     /**
      * 新增-app
      */
     @RequestMapping(value = "/addAPP")
     @ResponseBody
     public Object addAPP(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, HttpServletRequest request) {
-        if(cwsCaseService.createNewAPP(cwsCase,isNeedVerify,isNeedRevisit,bzhours,bzminis,verifyPersonId)){
+        if (cwsCaseService.createNewAPP(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId)) {
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("服务器异常");
         }
     }
@@ -107,9 +109,9 @@
     @RequestMapping(value = "/addWeChat")
     @ResponseBody
     public Object addWeChat(CwsCase cwsCase, Integer isNeedRevisit, HttpServletRequest request) {
-        if(cwsCaseService.createNewWeChat(cwsCase,isNeedRevisit)){
+        if (cwsCaseService.createNewWeChat(cwsCase, isNeedRevisit)) {
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("服务器异常");
         }
     }
@@ -151,7 +153,7 @@
     @RequestMapping(value = "/detail/{id}")
     @ResponseBody
     public Object detail(@PathVariable("id") String id) {
-        List<Map<String,Object>> results = cwsCaseService.caseDetailById(Long.valueOf(id));
+        List<Map<String, Object>> results = cwsCaseService.caseDetailById(Long.valueOf(id));
         new CwsCaseWarpper(results).warp();
         return ResponseData.success(results);
     }
@@ -175,10 +177,10 @@
     @ResponseBody
     public Object historyByPhoneListPage(String reporterPhone) {
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
-        results = cwsCaseService.historyByPhone(page,reporterPhone);
+        results = cwsCaseService.historyByPhone(page, reporterPhone);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -205,7 +207,7 @@
 //        }
 
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         //待核实状态案卷
@@ -215,11 +217,11 @@
         //如果是app的监督员访问此接口，则需按人员过滤数据权限，获取监督员id
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
-        if(roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())){
+        if (roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
-            results = cwsCaseService.workList(page,null,null,actUserId,queryCondition);
-        }else { //pc端的监督指挥系统查看待核实案卷
-            results = cwsCaseService.workList(page,null,null,null,queryCondition);
+            results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
+        } else { //pc端的监督指挥系统查看待核实案卷
+            results = cwsCaseService.workList(page, null, null, null, queryCondition);
         }
 
         new CwsCaseWarpper(results).warp();
@@ -241,9 +243,9 @@
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
         List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) count = results.size() + "";
         return ResponseData.success(count);
     }
 
@@ -254,14 +256,14 @@
     @RequestMapping(value = "/verifiedListPage")
     @ResponseBody
     public Object verifiedListPage() {
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        QueryCondition queryCondition=new QueryCondition();
+        QueryCondition queryCondition = new QueryCondition();
         queryCondition.setVerifyPersonId(actUserId);
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -278,7 +280,7 @@
     public Object toRegisterListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_REGISTERED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>>  results = queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -290,7 +292,7 @@
     public Object preRegisterListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.PRE_REGISTER.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -302,7 +304,7 @@
     public Object toDistributeListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_DISTRIBUTED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -316,9 +318,9 @@
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
         List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) count = results.size() + "";
         return ResponseData.success(count);
     }
 
@@ -330,7 +332,7 @@
     public Object preDistributeListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.PRE_DISTRIBUTE.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -343,7 +345,7 @@
         int caseState = CaseStateEnum.TO_BE_HANDLED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -357,21 +359,20 @@
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
         List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) count = results.size() + "";
         return ResponseData.success(count);
     }
 
 
-
     /**
      * 待处理分页查询，即app处理待办
      */
     @RequestMapping(value = "/toHandleListPage")
     @ResponseBody
-    public Object toHandleListPage(String isOvertime,String isEmergent) {
-        List<Map<String,Object>> results = null;
+    public Object toHandleListPage(String isOvertime, String isEmergent) {
+
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         //待处理状态案卷
@@ -379,30 +380,33 @@
         queryCondition.setCaseState(String.valueOf(CaseStateEnum.APP_HANDLE.getState()));
 
         //超时案卷
-        if(isOvertime!=null&&isOvertime.equals("1")){
+        if (isOvertime != null && isOvertime.equals("1")) {
             queryCondition.setIsOvertime("1");
         }
 
         //紧急案卷
-        if(isEmergent!=null&&isEmergent.equals("1")){
+        if (isEmergent != null && isEmergent.equals("1")) {
             queryCondition.setCaseLevel(String.valueOf(CaseLevelEnum.EMERGENT.getState()));
         }
 
         //app的处置人员访问
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
-        if(roles.contains(CwsRoleEnums.PROCESS.getRoleTip())){
+        List<Map<String, Object>> results = null;
+
+        if (roles.contains(CwsRoleEnums.PROCESS.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
-            results = cwsCaseService.workList(page,null,null,actUserId,queryCondition);
+            results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
         } else {
             //pc端的监督指挥系统查看处理中案卷
-            results = cwsCaseService.workList(page,null,null,null,queryCondition);
+            results = cwsCaseService.workList(page, null, null, null, queryCondition);
         }
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
 
         return ResponseData.success(super.packForBT(page));
     }
+
     /**
      * 已处理分页查询，即app处理已办
      */
@@ -410,14 +414,14 @@
     @ResponseBody
     public Object handledListPage() {
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        QueryCondition queryCondition=new QueryCondition();
+        QueryCondition queryCondition = new QueryCondition();
         queryCondition.setProcessPersonid(actUserId);
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -434,7 +438,7 @@
     public Object handleAuditListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.HANDLE_AUDIT.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -446,7 +450,7 @@
     public Object toDisCheckListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_CHECKED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -456,7 +460,7 @@
     @RequestMapping(value = "/toCheckListPage")
     @ResponseBody
     public Object toCheckListPage() {
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         //待核查状态案卷
@@ -466,7 +470,7 @@
         //app监督员访问接口
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
-        if(roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
+        if (roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
             results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
         }
@@ -489,10 +493,11 @@
         int caseState = CaseStateEnum.CHECK_SCENE.getState();
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
-        List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        List<Map<String, Object>> results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) {
+            count = results.size() + "";
+        }
         return ResponseData.success(count);
     }
 
@@ -503,14 +508,14 @@
     @ResponseBody
     public Object checkedListPage() {
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        QueryCondition queryCondition=new QueryCondition();
+        QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCheckPersonId(actUserId);
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -526,8 +531,8 @@
     public Object toFinishListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_CLOSED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
-        return ResponseData.success(results );
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
+        return ResponseData.success(results);
     }
 
     /**
@@ -538,7 +543,7 @@
     public Object toChangeListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_ADJUSTED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -550,7 +555,7 @@
     public Object toAdjustInstructionListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.HANDLE_MAN_FEEDBACK_ADJUSTMENT.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -565,7 +570,7 @@
 
         //部门权限
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -576,9 +581,11 @@
     @ResponseBody
     public Object toDeptAdjustInstructionListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.HANDLE_MAN_FEEDBACK_DELAY.getState();
-        queryCondition.setCaseState(String.valueOf(caseState));//申请延期
-        queryCondition.setCaseState2(CaseStateEnum.HANDLE_MAN_FEEDBACK_POSTPONE.getState()+"");//申请缓办
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        //申请延期
+        queryCondition.setCaseState(String.valueOf(caseState));
+        //申请缓办
+        queryCondition.setCaseState2(CaseStateEnum.HANDLE_MAN_FEEDBACK_POSTPONE.getState() + "");
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -592,7 +599,7 @@
         queryCondition.setCaseState(String.valueOf(caseState));
         //部门权限
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -606,7 +613,7 @@
         int caseState = CaseStateEnum.TO_BE_HANDLED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsPostpone("1");
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -619,7 +626,7 @@
         int caseState = CaseStateEnum.TO_BE_HANDLED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsDelay("1");
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -633,7 +640,7 @@
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsPostpone("1");
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -647,7 +654,7 @@
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsDelay("1");
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -662,7 +669,7 @@
         //未完成案卷
         queryCondition.setIsComplete("0");
 
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -673,7 +680,7 @@
     @ResponseBody
     public Object isRevisitListPage(QueryCondition queryCondition) {
         queryCondition.setIsRevisit("1");
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -693,111 +700,73 @@
         //未完成案卷
         queryCondition.setIsComplete("0");
 
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
-
-
     /**
      * “超期查询”查询条件列表
      */
     @RequestMapping(value = "/specialQueryList")
     @ResponseBody
     public Object specialQueryList() {
-        List<Map<String,Object>> results = null;
-        results = SpecialQueryEnum.toList();
-        return ResponseData.success(results);
+        return ResponseData.success(SpecialQueryEnum.toList());
     }
 
-
     /**
      * 综合查询
      */
     @RequestMapping(value = "/queryListPage")
     @ResponseBody
     public Object queryListPage(QueryCondition queryCondition) {
-        int specialQuery =0;
-        specialQuery= queryCondition.getSpecialQuery();
-        if(specialQuery>0) {
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            String today = formatter.format(new Date());
-            if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
-                //未超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("0");
-            } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()){
-                //超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()){
-                //超期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()){
-                //按期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("0");
-            }else if(specialQuery == SpecialQueryEnum.NO_CLOSE.getState()){
-                //未结案
-                queryCondition.setIsClose("0");
-            }else if(specialQuery == SpecialQueryEnum.REGISTERED.getState()){
-                //已立案
-                queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+"");
-                //queryCondition.setRegisterTimeEnd(today);
-            }
-        }
-
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
-        return ResponseData.success(results);
+        return ResponseData.success(queryByCondition(caseQueryConditionByState(queryCondition)));
     }
 
 
-
     /**
      * 待办
      */
     @RequestMapping(value = "/workListPage")
     @ResponseBody
     public Object workListPage(QueryCondition queryCondition) {
-        List<Map<String,Object>> results = null;
+
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
+        List<Map<String, Object>> results = null;
         //处置单位
-        if(roles.contains(CwsRoleEnums.ADMINISTRATOR.getRoleTip())){
-            results = cwsCaseService.workList(page,null,null,null,queryCondition);
+        if (roles.contains(CwsRoleEnums.ADMINISTRATOR.getRoleTip())) {
+            results = cwsCaseService.workList(page, null, null, null, queryCondition);
         }
         //处置单位
-        else if(roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())){
+        else if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
             String onedeptid = String.valueOf(shiroUser.getDeptId());
-            results = cwsCaseService.workList(page,null,onedeptid,null,queryCondition);
+            results = cwsCaseService.workList(page, null, onedeptid, null, queryCondition);
         }
         //处置人员、监督员
-        else if(roles.contains(CwsRoleEnums.PROCESS.getRoleTip())||roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())){
+        else if (roles.contains(CwsRoleEnums.PROCESS.getRoleTip()) || roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
-            results = cwsCaseService.workList(page,null,null,actUserId,queryCondition);
-        }
-        else{
+            results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
+        } else {
             String groupId = null;
             //指挥长
-            if(roles.contains(CwsRoleEnums.COMMANDER.getRoleTip())){
+            if (roles.contains(CwsRoleEnums.COMMANDER.getRoleTip())) {
                 groupId = CwsRoleEnums.COMMANDER.getRoleTip();
             }
             //派遣员
-            else if(roles.contains(CwsRoleEnums.DISPATCHER.getRoleTip())){
+            else if (roles.contains(CwsRoleEnums.DISPATCHER.getRoleTip())) {
                 groupId = CwsRoleEnums.DISPATCHER.getRoleTip();
             }
             //值班长
-            else if(roles.contains(CwsRoleEnums.MONITOR.getRoleTip())){
+            else if (roles.contains(CwsRoleEnums.MONITOR.getRoleTip())) {
                 groupId = CwsRoleEnums.MONITOR.getRoleTip();
             }
             //受理员
-            else if(roles.contains(CwsRoleEnums.RECEIVER.getRoleTip())){
+            else if (roles.contains(CwsRoleEnums.RECEIVER.getRoleTip())) {
                 groupId = CwsRoleEnums.RECEIVER.getRoleTip();
             }
-            results = cwsCaseService.workList(page,groupId,null,null,queryCondition);
+            results = cwsCaseService.workList(page, groupId, null, null, queryCondition);
         }
 
         new CwsCaseWarpper(results).warp();
@@ -813,12 +782,12 @@
     @RequestMapping(value = "/completedListPage")
     @ResponseBody
     public Object completedListPage(QueryCondition queryCondition) {
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -827,104 +796,77 @@
     }
 
 
-
-
-
-    public PageInfoBT<Map<String, Object>> queryByCondition(QueryCondition queryCondition){
-        List<Map<String,Object>> results = null;
+    /**
+     * 分页查询
+     *
+     * @param queryCondition
+     * @return
+     */
+    public PageInfoBT<Map<String, Object>> queryByCondition(QueryCondition queryCondition) {
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-        DataScope dataScope =null;
-        try {
-            if (queryCondition.isDataScope() == true) {
-                dataScope = service.getCurrUserDataScope();
-                dataScope.setScopeName("ONEDEPTID");
-            }
-            else {
-                String isRevisit = queryCondition.getIsRevisit();
-                String isOvertime = queryCondition.getIsOvertime();
-                String caseLevel = queryCondition.getCaseLevel();
-
-                //回访、超时、紧急案件的查询需要判断是否有数据权限
-                if ((isRevisit != null && isRevisit.equals("1"))|| (isOvertime != null && isOvertime.equals("1"))|| (caseLevel != null && caseLevel.equals("1"))) {
-                    ShiroUser shiroUser = service.getCurrLoginUser();
-                    List<String> roles = shiroUser.getRoleTips();
-                    if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
-                        dataScope = service.getCurrUserDataScope();
-                        dataScope.setScopeName("ONEDEPTID");
-                    }
-                }
-            }
-        }
-        catch (Exception e){
-            String mes = e.getMessage().toString();
-            String mes2=mes;
-        }
-
-        results = cwsCaseService.queryByCondition(page,dataScope,queryCondition);
-
-
+        List<Map<String, Object>> results = cwsCaseService.queryByCondition(page, caseDataScope(queryCondition), queryCondition);
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
-
         return super.packForBT(page);
     }
 
-
+    /**
+     * 根据案卷状态设置查询条件
+     *
+     * @param queryCondition
+     * @return
+     */
+    private QueryCondition caseQueryConditionByState(QueryCondition queryCondition) {
+        int specialQuery = 0;
+        specialQuery = queryCondition.getSpecialQuery();
+        if (specialQuery > 0) {
+            if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
+                //未超期未处置 /处置中
+                queryCondition.setProcessState("1");
+                queryCondition.setIsOvertime("0");
+            } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()) {
+                //超期未处置 //处置中
+                queryCondition.setProcessState("1");
+                queryCondition.setIsOvertime("1");
+            } else if (specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()) {
+                //超期处置 //处置完成
+                queryCondition.setProcessState("2");
+                queryCondition.setIsProcessOvertime("1");
+            } else if (specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()) {
+                //按期处置 //处置完成
+                queryCondition.setProcessState("2");
+                queryCondition.setIsProcessOvertime("0");
+            } else if (specialQuery == SpecialQueryEnum.NO_CLOSE.getState()) {
+                //未结案
+                queryCondition.setIsClose("0");
+            } else if (specialQuery == SpecialQueryEnum.REGISTERED.getState()) {
+                //已立案
+                queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState() + "");
+                //queryCondition.setRegisterTimeEnd(today);
+            }
+        }
+        return queryCondition;
+    }
 
     /**
      * 综合查询导出
      */
     @RequestMapping(value = "/export")
-//    @ResponseBody
-    public void export(QueryCondition queryCondition,HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)throws IOException  {
-        int specialQuery =0;
-        specialQuery= queryCondition.getSpecialQuery();
-        if(specialQuery>0) {
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            String today = formatter.format(new Date());
-            if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
-                //未超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("0");
-            } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()){
-                //超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()){
-                //超期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()){
-                //按期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("0");
-            }else if(specialQuery == SpecialQueryEnum.NO_CLOSE.getState()){
-                //未结案
-                queryCondition.setIsClose("0");
-            }else if(specialQuery == SpecialQueryEnum.REGISTERED.getState()){
-                //已立案
-                queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+"");
-                //queryCondition.setRegisterTimeEnd(today);
-            }
-        }
-
-        List<Map<String, Object>> results =  queryExportByCondition(queryCondition);
+    public void export(QueryCondition queryCondition, HttpServletResponse httpServletResponse) throws IOException {
+        List<Map<String, Object>> results = queryExportByCondition(caseQueryConditionByState(queryCondition));
         FileInputStream fileInputStream = null;
         if (ToolUtil.isEmpty(results)) {
-            fileInputStream = new FileInputStream(templatePath + "/accessEmpty.xlsx");
+            fileInputStream = new FileInputStream(templatePath + "/temp/accessEmpty.xlsx");
         } else {
-            fileInputStream = new FileInputStream(templatePath + "/caseRecTemplate.xlsx");
+            fileInputStream = new FileInputStream(templatePath + "/temp/caseRecTemplate.xlsx");
         }
-
         try {
             httpServletResponse.setContentType("application/octet-stream");
             httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "caseRecTemplate.xlsx");
-
             Map<String, Object> var = new HashMap<>();
             var.put("标题", "案卷综合查询一览表");
             var.put("list", results);
             ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var);
-
         } catch (IOException e) {
             e.printStackTrace();
         } catch (Exception e) {
@@ -936,27 +878,24 @@
         }
     }
 
-
-    public List<Map<String,Object>> queryExportByCondition(QueryCondition queryCondition){
-        List<Map<String,Object>> results = null;
-        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-        page.setLimit(maxRowsExcel);
-        page.setSize(maxRowsExcel);
-        page.setOffset(0);
-        page.setSearchCount(false);
-        DataScope dataScope =null;
+    /**
+     * 案卷查询权限判定
+     *
+     * @param queryCondition
+     * @return
+     */
+    private DataScope caseDataScope(QueryCondition queryCondition) {
+        DataScope dataScope = null;
         try {
             if (queryCondition.isDataScope() == true) {
                 dataScope = service.getCurrUserDataScope();
                 dataScope.setScopeName("ONEDEPTID");
-            }
-            else {
+            } else {
                 String isRevisit = queryCondition.getIsRevisit();
                 String isOvertime = queryCondition.getIsOvertime();
                 String caseLevel = queryCondition.getCaseLevel();
-
                 //回访、超时、紧急案件的查询需要判断是否有数据权限
-                if ((isRevisit != null && isRevisit.equals("1"))|| (isOvertime != null && isOvertime.equals("1"))|| (caseLevel != null && caseLevel.equals("1"))) {
+                if ((isRevisit != null && isRevisit.equals(Const.ONE)) || (isOvertime != null && isOvertime.equals(Const.ONE)) || (caseLevel != null && caseLevel.equals(Const.ONE))) {
                     ShiroUser shiroUser = service.getCurrLoginUser();
                     List<String> roles = shiroUser.getRoleTips();
                     if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
@@ -965,13 +904,28 @@
                     }
                 }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        catch (Exception e){
-            String mes = e.getMessage().toString();
-        }
-        results = cwsCaseService.queryByCondition(page,dataScope,queryCondition);
+        return dataScope;
+    }
+
+    /**
+     * 导出数据检索条件
+     *
+     * @param queryCondition
+     * @return
+     */
+    public List<Map<String, Object>> queryExportByCondition(QueryCondition queryCondition) {
+        List<Map<String, Object>> results = null;
+        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+        page.setLimit(maxRowsExcel);
+        page.setSize(maxRowsExcel);
+        page.setOffset(0);
+        page.setSearchCount(false);
+        results = cwsCaseService.queryByCondition(page, caseDataScope(queryCondition), queryCondition);
         new CwsCaseWarpper(results).warp();
-        return  results;
+        return results;
     }
 
 }

diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
index 5edda35..2466e9a 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.common.constant.Const;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
@@ -29,8 +30,6 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -56,6 +55,7 @@
     private int maxRowsExcel;
     @Value("${casic.config.config-path}")
     private String templatePath;
+
     /**
      * 获取列表
      */
@@ -73,30 +73,32 @@
     public Object listPage(String condition) {
         Page<CwsCase> page = new PageFactory<CwsCase>().defaultPage();
         EntityWrapper<CwsCase> query = new EntityWrapper<>();
-        page =  cwsCaseService.selectPage(page,query);
+        page = cwsCaseService.selectPage(page, query);
         return super.packForBT(page);
     }
+
     /**
      * 新增-pc
      */
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, HttpServletRequest request) {
-        if(cwsCaseService.createNewPC(cwsCase,isNeedVerify,isNeedRevisit,bzhours,bzminis,verifyPersonId)){
+        if (cwsCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId)) {
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("服务器异常");
         }
     }
+
     /**
      * 新增-app
      */
     @RequestMapping(value = "/addAPP")
     @ResponseBody
     public Object addAPP(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, HttpServletRequest request) {
-        if(cwsCaseService.createNewAPP(cwsCase,isNeedVerify,isNeedRevisit,bzhours,bzminis,verifyPersonId)){
+        if (cwsCaseService.createNewAPP(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId)) {
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("服务器异常");
         }
     }
@@ -107,9 +109,9 @@
     @RequestMapping(value = "/addWeChat")
     @ResponseBody
     public Object addWeChat(CwsCase cwsCase, Integer isNeedRevisit, HttpServletRequest request) {
-        if(cwsCaseService.createNewWeChat(cwsCase,isNeedRevisit)){
+        if (cwsCaseService.createNewWeChat(cwsCase, isNeedRevisit)) {
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("服务器异常");
         }
     }
@@ -151,7 +153,7 @@
     @RequestMapping(value = "/detail/{id}")
     @ResponseBody
     public Object detail(@PathVariable("id") String id) {
-        List<Map<String,Object>> results = cwsCaseService.caseDetailById(Long.valueOf(id));
+        List<Map<String, Object>> results = cwsCaseService.caseDetailById(Long.valueOf(id));
         new CwsCaseWarpper(results).warp();
         return ResponseData.success(results);
     }
@@ -175,10 +177,10 @@
     @ResponseBody
     public Object historyByPhoneListPage(String reporterPhone) {
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
-        results = cwsCaseService.historyByPhone(page,reporterPhone);
+        results = cwsCaseService.historyByPhone(page, reporterPhone);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -205,7 +207,7 @@
 //        }
 
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         //待核实状态案卷
@@ -215,11 +217,11 @@
         //如果是app的监督员访问此接口，则需按人员过滤数据权限，获取监督员id
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
-        if(roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())){
+        if (roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
-            results = cwsCaseService.workList(page,null,null,actUserId,queryCondition);
-        }else { //pc端的监督指挥系统查看待核实案卷
-            results = cwsCaseService.workList(page,null,null,null,queryCondition);
+            results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
+        } else { //pc端的监督指挥系统查看待核实案卷
+            results = cwsCaseService.workList(page, null, null, null, queryCondition);
         }
 
         new CwsCaseWarpper(results).warp();
@@ -241,9 +243,9 @@
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
         List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) count = results.size() + "";
         return ResponseData.success(count);
     }
 
@@ -254,14 +256,14 @@
     @RequestMapping(value = "/verifiedListPage")
     @ResponseBody
     public Object verifiedListPage() {
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        QueryCondition queryCondition=new QueryCondition();
+        QueryCondition queryCondition = new QueryCondition();
         queryCondition.setVerifyPersonId(actUserId);
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -278,7 +280,7 @@
     public Object toRegisterListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_REGISTERED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>>  results = queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -290,7 +292,7 @@
     public Object preRegisterListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.PRE_REGISTER.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -302,7 +304,7 @@
     public Object toDistributeListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_DISTRIBUTED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -316,9 +318,9 @@
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
         List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) count = results.size() + "";
         return ResponseData.success(count);
     }
 
@@ -330,7 +332,7 @@
     public Object preDistributeListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.PRE_DISTRIBUTE.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -343,7 +345,7 @@
         int caseState = CaseStateEnum.TO_BE_HANDLED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -357,21 +359,20 @@
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
         List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) count = results.size() + "";
         return ResponseData.success(count);
     }
 
 
-
     /**
      * 待处理分页查询，即app处理待办
      */
     @RequestMapping(value = "/toHandleListPage")
     @ResponseBody
-    public Object toHandleListPage(String isOvertime,String isEmergent) {
-        List<Map<String,Object>> results = null;
+    public Object toHandleListPage(String isOvertime, String isEmergent) {
+
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         //待处理状态案卷
@@ -379,30 +380,33 @@
         queryCondition.setCaseState(String.valueOf(CaseStateEnum.APP_HANDLE.getState()));
 
         //超时案卷
-        if(isOvertime!=null&&isOvertime.equals("1")){
+        if (isOvertime != null && isOvertime.equals("1")) {
             queryCondition.setIsOvertime("1");
         }
 
         //紧急案卷
-        if(isEmergent!=null&&isEmergent.equals("1")){
+        if (isEmergent != null && isEmergent.equals("1")) {
             queryCondition.setCaseLevel(String.valueOf(CaseLevelEnum.EMERGENT.getState()));
         }
 
         //app的处置人员访问
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
-        if(roles.contains(CwsRoleEnums.PROCESS.getRoleTip())){
+        List<Map<String, Object>> results = null;
+
+        if (roles.contains(CwsRoleEnums.PROCESS.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
-            results = cwsCaseService.workList(page,null,null,actUserId,queryCondition);
+            results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
         } else {
             //pc端的监督指挥系统查看处理中案卷
-            results = cwsCaseService.workList(page,null,null,null,queryCondition);
+            results = cwsCaseService.workList(page, null, null, null, queryCondition);
         }
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
 
         return ResponseData.success(super.packForBT(page));
     }
+
     /**
      * 已处理分页查询，即app处理已办
      */
@@ -410,14 +414,14 @@
     @ResponseBody
     public Object handledListPage() {
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        QueryCondition queryCondition=new QueryCondition();
+        QueryCondition queryCondition = new QueryCondition();
         queryCondition.setProcessPersonid(actUserId);
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -434,7 +438,7 @@
     public Object handleAuditListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.HANDLE_AUDIT.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -446,7 +450,7 @@
     public Object toDisCheckListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_CHECKED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -456,7 +460,7 @@
     @RequestMapping(value = "/toCheckListPage")
     @ResponseBody
     public Object toCheckListPage() {
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         //待核查状态案卷
@@ -466,7 +470,7 @@
         //app监督员访问接口
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
-        if(roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
+        if (roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
             results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
         }
@@ -489,10 +493,11 @@
         int caseState = CaseStateEnum.CHECK_SCENE.getState();
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
-        List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        List<Map<String, Object>> results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) {
+            count = results.size() + "";
+        }
         return ResponseData.success(count);
     }
 
@@ -503,14 +508,14 @@
     @ResponseBody
     public Object checkedListPage() {
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        QueryCondition queryCondition=new QueryCondition();
+        QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCheckPersonId(actUserId);
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -526,8 +531,8 @@
     public Object toFinishListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_CLOSED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
-        return ResponseData.success(results );
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
+        return ResponseData.success(results);
     }
 
     /**
@@ -538,7 +543,7 @@
     public Object toChangeListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_ADJUSTED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -550,7 +555,7 @@
     public Object toAdjustInstructionListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.HANDLE_MAN_FEEDBACK_ADJUSTMENT.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -565,7 +570,7 @@
 
         //部门权限
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -576,9 +581,11 @@
     @ResponseBody
     public Object toDeptAdjustInstructionListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.HANDLE_MAN_FEEDBACK_DELAY.getState();
-        queryCondition.setCaseState(String.valueOf(caseState));//申请延期
-        queryCondition.setCaseState2(CaseStateEnum.HANDLE_MAN_FEEDBACK_POSTPONE.getState()+"");//申请缓办
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        //申请延期
+        queryCondition.setCaseState(String.valueOf(caseState));
+        //申请缓办
+        queryCondition.setCaseState2(CaseStateEnum.HANDLE_MAN_FEEDBACK_POSTPONE.getState() + "");
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -592,7 +599,7 @@
         queryCondition.setCaseState(String.valueOf(caseState));
         //部门权限
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -606,7 +613,7 @@
         int caseState = CaseStateEnum.TO_BE_HANDLED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsPostpone("1");
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -619,7 +626,7 @@
         int caseState = CaseStateEnum.TO_BE_HANDLED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsDelay("1");
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -633,7 +640,7 @@
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsPostpone("1");
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -647,7 +654,7 @@
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsDelay("1");
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -662,7 +669,7 @@
         //未完成案卷
         queryCondition.setIsComplete("0");
 
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -673,7 +680,7 @@
     @ResponseBody
     public Object isRevisitListPage(QueryCondition queryCondition) {
         queryCondition.setIsRevisit("1");
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -693,111 +700,73 @@
         //未完成案卷
         queryCondition.setIsComplete("0");
 
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
-
-
     /**
      * “超期查询”查询条件列表
      */
     @RequestMapping(value = "/specialQueryList")
     @ResponseBody
     public Object specialQueryList() {
-        List<Map<String,Object>> results = null;
-        results = SpecialQueryEnum.toList();
-        return ResponseData.success(results);
+        return ResponseData.success(SpecialQueryEnum.toList());
     }
 
-
     /**
      * 综合查询
      */
     @RequestMapping(value = "/queryListPage")
     @ResponseBody
     public Object queryListPage(QueryCondition queryCondition) {
-        int specialQuery =0;
-        specialQuery= queryCondition.getSpecialQuery();
-        if(specialQuery>0) {
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            String today = formatter.format(new Date());
-            if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
-                //未超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("0");
-            } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()){
-                //超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()){
-                //超期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()){
-                //按期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("0");
-            }else if(specialQuery == SpecialQueryEnum.NO_CLOSE.getState()){
-                //未结案
-                queryCondition.setIsClose("0");
-            }else if(specialQuery == SpecialQueryEnum.REGISTERED.getState()){
-                //已立案
-                queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+"");
-                //queryCondition.setRegisterTimeEnd(today);
-            }
-        }
-
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
-        return ResponseData.success(results);
+        return ResponseData.success(queryByCondition(caseQueryConditionByState(queryCondition)));
     }
 
 
-
     /**
      * 待办
      */
     @RequestMapping(value = "/workListPage")
     @ResponseBody
     public Object workListPage(QueryCondition queryCondition) {
-        List<Map<String,Object>> results = null;
+
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
+        List<Map<String, Object>> results = null;
         //处置单位
-        if(roles.contains(CwsRoleEnums.ADMINISTRATOR.getRoleTip())){
-            results = cwsCaseService.workList(page,null,null,null,queryCondition);
+        if (roles.contains(CwsRoleEnums.ADMINISTRATOR.getRoleTip())) {
+            results = cwsCaseService.workList(page, null, null, null, queryCondition);
         }
         //处置单位
-        else if(roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())){
+        else if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
             String onedeptid = String.valueOf(shiroUser.getDeptId());
-            results = cwsCaseService.workList(page,null,onedeptid,null,queryCondition);
+            results = cwsCaseService.workList(page, null, onedeptid, null, queryCondition);
         }
         //处置人员、监督员
-        else if(roles.contains(CwsRoleEnums.PROCESS.getRoleTip())||roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())){
+        else if (roles.contains(CwsRoleEnums.PROCESS.getRoleTip()) || roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
-            results = cwsCaseService.workList(page,null,null,actUserId,queryCondition);
-        }
-        else{
+            results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
+        } else {
             String groupId = null;
             //指挥长
-            if(roles.contains(CwsRoleEnums.COMMANDER.getRoleTip())){
+            if (roles.contains(CwsRoleEnums.COMMANDER.getRoleTip())) {
                 groupId = CwsRoleEnums.COMMANDER.getRoleTip();
             }
             //派遣员
-            else if(roles.contains(CwsRoleEnums.DISPATCHER.getRoleTip())){
+            else if (roles.contains(CwsRoleEnums.DISPATCHER.getRoleTip())) {
                 groupId = CwsRoleEnums.DISPATCHER.getRoleTip();
             }
             //值班长
-            else if(roles.contains(CwsRoleEnums.MONITOR.getRoleTip())){
+            else if (roles.contains(CwsRoleEnums.MONITOR.getRoleTip())) {
                 groupId = CwsRoleEnums.MONITOR.getRoleTip();
             }
             //受理员
-            else if(roles.contains(CwsRoleEnums.RECEIVER.getRoleTip())){
+            else if (roles.contains(CwsRoleEnums.RECEIVER.getRoleTip())) {
                 groupId = CwsRoleEnums.RECEIVER.getRoleTip();
             }
-            results = cwsCaseService.workList(page,groupId,null,null,queryCondition);
+            results = cwsCaseService.workList(page, groupId, null, null, queryCondition);
         }
 
         new CwsCaseWarpper(results).warp();
@@ -813,12 +782,12 @@
     @RequestMapping(value = "/completedListPage")
     @ResponseBody
     public Object completedListPage(QueryCondition queryCondition) {
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -827,104 +796,77 @@
     }
 
 
-
-
-
-    public PageInfoBT<Map<String, Object>> queryByCondition(QueryCondition queryCondition){
-        List<Map<String,Object>> results = null;
+    /**
+     * 分页查询
+     *
+     * @param queryCondition
+     * @return
+     */
+    public PageInfoBT<Map<String, Object>> queryByCondition(QueryCondition queryCondition) {
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-        DataScope dataScope =null;
-        try {
-            if (queryCondition.isDataScope() == true) {
-                dataScope = service.getCurrUserDataScope();
-                dataScope.setScopeName("ONEDEPTID");
-            }
-            else {
-                String isRevisit = queryCondition.getIsRevisit();
-                String isOvertime = queryCondition.getIsOvertime();
-                String caseLevel = queryCondition.getCaseLevel();
-
-                //回访、超时、紧急案件的查询需要判断是否有数据权限
-                if ((isRevisit != null && isRevisit.equals("1"))|| (isOvertime != null && isOvertime.equals("1"))|| (caseLevel != null && caseLevel.equals("1"))) {
-                    ShiroUser shiroUser = service.getCurrLoginUser();
-                    List<String> roles = shiroUser.getRoleTips();
-                    if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
-                        dataScope = service.getCurrUserDataScope();
-                        dataScope.setScopeName("ONEDEPTID");
-                    }
-                }
-            }
-        }
-        catch (Exception e){
-            String mes = e.getMessage().toString();
-            String mes2=mes;
-        }
-
-        results = cwsCaseService.queryByCondition(page,dataScope,queryCondition);
-
-
+        List<Map<String, Object>> results = cwsCaseService.queryByCondition(page, caseDataScope(queryCondition), queryCondition);
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
-
         return super.packForBT(page);
     }
 
-
+    /**
+     * 根据案卷状态设置查询条件
+     *
+     * @param queryCondition
+     * @return
+     */
+    private QueryCondition caseQueryConditionByState(QueryCondition queryCondition) {
+        int specialQuery = 0;
+        specialQuery = queryCondition.getSpecialQuery();
+        if (specialQuery > 0) {
+            if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
+                //未超期未处置 /处置中
+                queryCondition.setProcessState("1");
+                queryCondition.setIsOvertime("0");
+            } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()) {
+                //超期未处置 //处置中
+                queryCondition.setProcessState("1");
+                queryCondition.setIsOvertime("1");
+            } else if (specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()) {
+                //超期处置 //处置完成
+                queryCondition.setProcessState("2");
+                queryCondition.setIsProcessOvertime("1");
+            } else if (specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()) {
+                //按期处置 //处置完成
+                queryCondition.setProcessState("2");
+                queryCondition.setIsProcessOvertime("0");
+            } else if (specialQuery == SpecialQueryEnum.NO_CLOSE.getState()) {
+                //未结案
+                queryCondition.setIsClose("0");
+            } else if (specialQuery == SpecialQueryEnum.REGISTERED.getState()) {
+                //已立案
+                queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState() + "");
+                //queryCondition.setRegisterTimeEnd(today);
+            }
+        }
+        return queryCondition;
+    }
 
     /**
      * 综合查询导出
      */
     @RequestMapping(value = "/export")
-//    @ResponseBody
-    public void export(QueryCondition queryCondition,HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)throws IOException  {
-        int specialQuery =0;
-        specialQuery= queryCondition.getSpecialQuery();
-        if(specialQuery>0) {
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            String today = formatter.format(new Date());
-            if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
-                //未超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("0");
-            } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()){
-                //超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()){
-                //超期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()){
-                //按期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("0");
-            }else if(specialQuery == SpecialQueryEnum.NO_CLOSE.getState()){
-                //未结案
-                queryCondition.setIsClose("0");
-            }else if(specialQuery == SpecialQueryEnum.REGISTERED.getState()){
-                //已立案
-                queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+"");
-                //queryCondition.setRegisterTimeEnd(today);
-            }
-        }
-
-        List<Map<String, Object>> results =  queryExportByCondition(queryCondition);
+    public void export(QueryCondition queryCondition, HttpServletResponse httpServletResponse) throws IOException {
+        List<Map<String, Object>> results = queryExportByCondition(caseQueryConditionByState(queryCondition));
         FileInputStream fileInputStream = null;
         if (ToolUtil.isEmpty(results)) {
-            fileInputStream = new FileInputStream(templatePath + "/accessEmpty.xlsx");
+            fileInputStream = new FileInputStream(templatePath + "/temp/accessEmpty.xlsx");
         } else {
-            fileInputStream = new FileInputStream(templatePath + "/caseRecTemplate.xlsx");
+            fileInputStream = new FileInputStream(templatePath + "/temp/caseRecTemplate.xlsx");
         }
-
         try {
             httpServletResponse.setContentType("application/octet-stream");
             httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "caseRecTemplate.xlsx");
-
             Map<String, Object> var = new HashMap<>();
             var.put("标题", "案卷综合查询一览表");
             var.put("list", results);
             ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var);
-
         } catch (IOException e) {
             e.printStackTrace();
         } catch (Exception e) {
@@ -936,27 +878,24 @@
         }
     }
 
-
-    public List<Map<String,Object>> queryExportByCondition(QueryCondition queryCondition){
-        List<Map<String,Object>> results = null;
-        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-        page.setLimit(maxRowsExcel);
-        page.setSize(maxRowsExcel);
-        page.setOffset(0);
-        page.setSearchCount(false);
-        DataScope dataScope =null;
+    /**
+     * 案卷查询权限判定
+     *
+     * @param queryCondition
+     * @return
+     */
+    private DataScope caseDataScope(QueryCondition queryCondition) {
+        DataScope dataScope = null;
         try {
             if (queryCondition.isDataScope() == true) {
                 dataScope = service.getCurrUserDataScope();
                 dataScope.setScopeName("ONEDEPTID");
-            }
-            else {
+            } else {
                 String isRevisit = queryCondition.getIsRevisit();
                 String isOvertime = queryCondition.getIsOvertime();
                 String caseLevel = queryCondition.getCaseLevel();
-
                 //回访、超时、紧急案件的查询需要判断是否有数据权限
-                if ((isRevisit != null && isRevisit.equals("1"))|| (isOvertime != null && isOvertime.equals("1"))|| (caseLevel != null && caseLevel.equals("1"))) {
+                if ((isRevisit != null && isRevisit.equals(Const.ONE)) || (isOvertime != null && isOvertime.equals(Const.ONE)) || (caseLevel != null && caseLevel.equals(Const.ONE))) {
                     ShiroUser shiroUser = service.getCurrLoginUser();
                     List<String> roles = shiroUser.getRoleTips();
                     if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
@@ -965,13 +904,28 @@
                     }
                 }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        catch (Exception e){
-            String mes = e.getMessage().toString();
-        }
-        results = cwsCaseService.queryByCondition(page,dataScope,queryCondition);
+        return dataScope;
+    }
+
+    /**
+     * 导出数据检索条件
+     *
+     * @param queryCondition
+     * @return
+     */
+    public List<Map<String, Object>> queryExportByCondition(QueryCondition queryCondition) {
+        List<Map<String, Object>> results = null;
+        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+        page.setLimit(maxRowsExcel);
+        page.setSize(maxRowsExcel);
+        page.setOffset(0);
+        page.setSearchCount(false);
+        results = cwsCaseService.queryByCondition(page, caseDataScope(queryCondition), queryCondition);
         new CwsCaseWarpper(results).warp();
-        return  results;
+        return results;
     }
 
 }
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/ProcessDetailController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/ProcessDetailController.java
index aec815c..09fc603 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/ProcessDetailController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/ProcessDetailController.java
@@ -24,11 +24,9 @@
 @RequestMapping("/processDetail")
 public class ProcessDetailController extends BaseController {
 
-
     @Autowired
     private IProcessDetailService processDetailService;
 
-
     /**
      * 获取列表
      */
@@ -89,18 +87,4 @@
         processDetailService.updateById(processDetail);
         return ResponseData.success();
     }
-
-    /**
-     * 详情
-     */
-    @RequestMapping(value = "/detail/{processDetailId}")
-    @ResponseBody
-    public Object detail(@PathVariable("processDetailId") String processDetailId) {
-//        ResultData<ProcessDetail> resultData = new ResultData<ProcessDetail>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(processDetailService.selectById(processDetailId));
-//        return resultData;
-        return ResponseData.success();
-    }
 }

diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
index 5edda35..2466e9a 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.common.constant.Const;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
@@ -29,8 +30,6 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -56,6 +55,7 @@
     private int maxRowsExcel;
     @Value("${casic.config.config-path}")
     private String templatePath;
+
     /**
      * 获取列表
      */
@@ -73,30 +73,32 @@
     public Object listPage(String condition) {
         Page<CwsCase> page = new PageFactory<CwsCase>().defaultPage();
         EntityWrapper<CwsCase> query = new EntityWrapper<>();
-        page =  cwsCaseService.selectPage(page,query);
+        page = cwsCaseService.selectPage(page, query);
         return super.packForBT(page);
     }
+
     /**
      * 新增-pc
      */
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, HttpServletRequest request) {
-        if(cwsCaseService.createNewPC(cwsCase,isNeedVerify,isNeedRevisit,bzhours,bzminis,verifyPersonId)){
+        if (cwsCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId)) {
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("服务器异常");
         }
     }
+
     /**
      * 新增-app
      */
     @RequestMapping(value = "/addAPP")
     @ResponseBody
     public Object addAPP(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, HttpServletRequest request) {
-        if(cwsCaseService.createNewAPP(cwsCase,isNeedVerify,isNeedRevisit,bzhours,bzminis,verifyPersonId)){
+        if (cwsCaseService.createNewAPP(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId)) {
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("服务器异常");
         }
     }
@@ -107,9 +109,9 @@
     @RequestMapping(value = "/addWeChat")
     @ResponseBody
     public Object addWeChat(CwsCase cwsCase, Integer isNeedRevisit, HttpServletRequest request) {
-        if(cwsCaseService.createNewWeChat(cwsCase,isNeedRevisit)){
+        if (cwsCaseService.createNewWeChat(cwsCase, isNeedRevisit)) {
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("服务器异常");
         }
     }
@@ -151,7 +153,7 @@
     @RequestMapping(value = "/detail/{id}")
     @ResponseBody
     public Object detail(@PathVariable("id") String id) {
-        List<Map<String,Object>> results = cwsCaseService.caseDetailById(Long.valueOf(id));
+        List<Map<String, Object>> results = cwsCaseService.caseDetailById(Long.valueOf(id));
         new CwsCaseWarpper(results).warp();
         return ResponseData.success(results);
     }
@@ -175,10 +177,10 @@
     @ResponseBody
     public Object historyByPhoneListPage(String reporterPhone) {
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
-        results = cwsCaseService.historyByPhone(page,reporterPhone);
+        results = cwsCaseService.historyByPhone(page, reporterPhone);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -205,7 +207,7 @@
 //        }
 
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         //待核实状态案卷
@@ -215,11 +217,11 @@
         //如果是app的监督员访问此接口，则需按人员过滤数据权限，获取监督员id
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
-        if(roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())){
+        if (roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
-            results = cwsCaseService.workList(page,null,null,actUserId,queryCondition);
-        }else { //pc端的监督指挥系统查看待核实案卷
-            results = cwsCaseService.workList(page,null,null,null,queryCondition);
+            results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
+        } else { //pc端的监督指挥系统查看待核实案卷
+            results = cwsCaseService.workList(page, null, null, null, queryCondition);
         }
 
         new CwsCaseWarpper(results).warp();
@@ -241,9 +243,9 @@
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
         List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) count = results.size() + "";
         return ResponseData.success(count);
     }
 
@@ -254,14 +256,14 @@
     @RequestMapping(value = "/verifiedListPage")
     @ResponseBody
     public Object verifiedListPage() {
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        QueryCondition queryCondition=new QueryCondition();
+        QueryCondition queryCondition = new QueryCondition();
         queryCondition.setVerifyPersonId(actUserId);
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -278,7 +280,7 @@
     public Object toRegisterListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_REGISTERED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>>  results = queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -290,7 +292,7 @@
     public Object preRegisterListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.PRE_REGISTER.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -302,7 +304,7 @@
     public Object toDistributeListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_DISTRIBUTED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -316,9 +318,9 @@
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
         List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) count = results.size() + "";
         return ResponseData.success(count);
     }
 
@@ -330,7 +332,7 @@
     public Object preDistributeListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.PRE_DISTRIBUTE.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -343,7 +345,7 @@
         int caseState = CaseStateEnum.TO_BE_HANDLED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -357,21 +359,20 @@
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
         List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) count = results.size() + "";
         return ResponseData.success(count);
     }
 
 
-
     /**
      * 待处理分页查询，即app处理待办
      */
     @RequestMapping(value = "/toHandleListPage")
     @ResponseBody
-    public Object toHandleListPage(String isOvertime,String isEmergent) {
-        List<Map<String,Object>> results = null;
+    public Object toHandleListPage(String isOvertime, String isEmergent) {
+
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         //待处理状态案卷
@@ -379,30 +380,33 @@
         queryCondition.setCaseState(String.valueOf(CaseStateEnum.APP_HANDLE.getState()));
 
         //超时案卷
-        if(isOvertime!=null&&isOvertime.equals("1")){
+        if (isOvertime != null && isOvertime.equals("1")) {
             queryCondition.setIsOvertime("1");
         }
 
         //紧急案卷
-        if(isEmergent!=null&&isEmergent.equals("1")){
+        if (isEmergent != null && isEmergent.equals("1")) {
             queryCondition.setCaseLevel(String.valueOf(CaseLevelEnum.EMERGENT.getState()));
         }
 
         //app的处置人员访问
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
-        if(roles.contains(CwsRoleEnums.PROCESS.getRoleTip())){
+        List<Map<String, Object>> results = null;
+
+        if (roles.contains(CwsRoleEnums.PROCESS.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
-            results = cwsCaseService.workList(page,null,null,actUserId,queryCondition);
+            results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
         } else {
             //pc端的监督指挥系统查看处理中案卷
-            results = cwsCaseService.workList(page,null,null,null,queryCondition);
+            results = cwsCaseService.workList(page, null, null, null, queryCondition);
         }
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
 
         return ResponseData.success(super.packForBT(page));
     }
+
     /**
      * 已处理分页查询，即app处理已办
      */
@@ -410,14 +414,14 @@
     @ResponseBody
     public Object handledListPage() {
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        QueryCondition queryCondition=new QueryCondition();
+        QueryCondition queryCondition = new QueryCondition();
         queryCondition.setProcessPersonid(actUserId);
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -434,7 +438,7 @@
     public Object handleAuditListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.HANDLE_AUDIT.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -446,7 +450,7 @@
     public Object toDisCheckListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_CHECKED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -456,7 +460,7 @@
     @RequestMapping(value = "/toCheckListPage")
     @ResponseBody
     public Object toCheckListPage() {
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         //待核查状态案卷
@@ -466,7 +470,7 @@
         //app监督员访问接口
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
-        if(roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
+        if (roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
             results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
         }
@@ -489,10 +493,11 @@
         int caseState = CaseStateEnum.CHECK_SCENE.getState();
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
-        List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        List<Map<String, Object>> results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) {
+            count = results.size() + "";
+        }
         return ResponseData.success(count);
     }
 
@@ -503,14 +508,14 @@
     @ResponseBody
     public Object checkedListPage() {
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        QueryCondition queryCondition=new QueryCondition();
+        QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCheckPersonId(actUserId);
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -526,8 +531,8 @@
     public Object toFinishListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_CLOSED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
-        return ResponseData.success(results );
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
+        return ResponseData.success(results);
     }
 
     /**
@@ -538,7 +543,7 @@
     public Object toChangeListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_ADJUSTED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -550,7 +555,7 @@
     public Object toAdjustInstructionListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.HANDLE_MAN_FEEDBACK_ADJUSTMENT.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -565,7 +570,7 @@
 
         //部门权限
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -576,9 +581,11 @@
     @ResponseBody
     public Object toDeptAdjustInstructionListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.HANDLE_MAN_FEEDBACK_DELAY.getState();
-        queryCondition.setCaseState(String.valueOf(caseState));//申请延期
-        queryCondition.setCaseState2(CaseStateEnum.HANDLE_MAN_FEEDBACK_POSTPONE.getState()+"");//申请缓办
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        //申请延期
+        queryCondition.setCaseState(String.valueOf(caseState));
+        //申请缓办
+        queryCondition.setCaseState2(CaseStateEnum.HANDLE_MAN_FEEDBACK_POSTPONE.getState() + "");
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -592,7 +599,7 @@
         queryCondition.setCaseState(String.valueOf(caseState));
         //部门权限
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -606,7 +613,7 @@
         int caseState = CaseStateEnum.TO_BE_HANDLED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsPostpone("1");
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -619,7 +626,7 @@
         int caseState = CaseStateEnum.TO_BE_HANDLED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsDelay("1");
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -633,7 +640,7 @@
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsPostpone("1");
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -647,7 +654,7 @@
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsDelay("1");
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -662,7 +669,7 @@
         //未完成案卷
         queryCondition.setIsComplete("0");
 
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -673,7 +680,7 @@
     @ResponseBody
     public Object isRevisitListPage(QueryCondition queryCondition) {
         queryCondition.setIsRevisit("1");
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -693,111 +700,73 @@
         //未完成案卷
         queryCondition.setIsComplete("0");
 
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
-
-
     /**
      * “超期查询”查询条件列表
      */
     @RequestMapping(value = "/specialQueryList")
     @ResponseBody
     public Object specialQueryList() {
-        List<Map<String,Object>> results = null;
-        results = SpecialQueryEnum.toList();
-        return ResponseData.success(results);
+        return ResponseData.success(SpecialQueryEnum.toList());
     }
 
-
     /**
      * 综合查询
      */
     @RequestMapping(value = "/queryListPage")
     @ResponseBody
     public Object queryListPage(QueryCondition queryCondition) {
-        int specialQuery =0;
-        specialQuery= queryCondition.getSpecialQuery();
-        if(specialQuery>0) {
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            String today = formatter.format(new Date());
-            if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
-                //未超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("0");
-            } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()){
-                //超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()){
-                //超期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()){
-                //按期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("0");
-            }else if(specialQuery == SpecialQueryEnum.NO_CLOSE.getState()){
-                //未结案
-                queryCondition.setIsClose("0");
-            }else if(specialQuery == SpecialQueryEnum.REGISTERED.getState()){
-                //已立案
-                queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+"");
-                //queryCondition.setRegisterTimeEnd(today);
-            }
-        }
-
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
-        return ResponseData.success(results);
+        return ResponseData.success(queryByCondition(caseQueryConditionByState(queryCondition)));
     }
 
 
-
     /**
      * 待办
      */
     @RequestMapping(value = "/workListPage")
     @ResponseBody
     public Object workListPage(QueryCondition queryCondition) {
-        List<Map<String,Object>> results = null;
+
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
+        List<Map<String, Object>> results = null;
         //处置单位
-        if(roles.contains(CwsRoleEnums.ADMINISTRATOR.getRoleTip())){
-            results = cwsCaseService.workList(page,null,null,null,queryCondition);
+        if (roles.contains(CwsRoleEnums.ADMINISTRATOR.getRoleTip())) {
+            results = cwsCaseService.workList(page, null, null, null, queryCondition);
         }
         //处置单位
-        else if(roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())){
+        else if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
             String onedeptid = String.valueOf(shiroUser.getDeptId());
-            results = cwsCaseService.workList(page,null,onedeptid,null,queryCondition);
+            results = cwsCaseService.workList(page, null, onedeptid, null, queryCondition);
         }
         //处置人员、监督员
-        else if(roles.contains(CwsRoleEnums.PROCESS.getRoleTip())||roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())){
+        else if (roles.contains(CwsRoleEnums.PROCESS.getRoleTip()) || roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
-            results = cwsCaseService.workList(page,null,null,actUserId,queryCondition);
-        }
-        else{
+            results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
+        } else {
             String groupId = null;
             //指挥长
-            if(roles.contains(CwsRoleEnums.COMMANDER.getRoleTip())){
+            if (roles.contains(CwsRoleEnums.COMMANDER.getRoleTip())) {
                 groupId = CwsRoleEnums.COMMANDER.getRoleTip();
             }
             //派遣员
-            else if(roles.contains(CwsRoleEnums.DISPATCHER.getRoleTip())){
+            else if (roles.contains(CwsRoleEnums.DISPATCHER.getRoleTip())) {
                 groupId = CwsRoleEnums.DISPATCHER.getRoleTip();
             }
             //值班长
-            else if(roles.contains(CwsRoleEnums.MONITOR.getRoleTip())){
+            else if (roles.contains(CwsRoleEnums.MONITOR.getRoleTip())) {
                 groupId = CwsRoleEnums.MONITOR.getRoleTip();
             }
             //受理员
-            else if(roles.contains(CwsRoleEnums.RECEIVER.getRoleTip())){
+            else if (roles.contains(CwsRoleEnums.RECEIVER.getRoleTip())) {
                 groupId = CwsRoleEnums.RECEIVER.getRoleTip();
             }
-            results = cwsCaseService.workList(page,groupId,null,null,queryCondition);
+            results = cwsCaseService.workList(page, groupId, null, null, queryCondition);
         }
 
         new CwsCaseWarpper(results).warp();
@@ -813,12 +782,12 @@
     @RequestMapping(value = "/completedListPage")
     @ResponseBody
     public Object completedListPage(QueryCondition queryCondition) {
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -827,104 +796,77 @@
     }
 
 
-
-
-
-    public PageInfoBT<Map<String, Object>> queryByCondition(QueryCondition queryCondition){
-        List<Map<String,Object>> results = null;
+    /**
+     * 分页查询
+     *
+     * @param queryCondition
+     * @return
+     */
+    public PageInfoBT<Map<String, Object>> queryByCondition(QueryCondition queryCondition) {
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-        DataScope dataScope =null;
-        try {
-            if (queryCondition.isDataScope() == true) {
-                dataScope = service.getCurrUserDataScope();
-                dataScope.setScopeName("ONEDEPTID");
-            }
-            else {
-                String isRevisit = queryCondition.getIsRevisit();
-                String isOvertime = queryCondition.getIsOvertime();
-                String caseLevel = queryCondition.getCaseLevel();
-
-                //回访、超时、紧急案件的查询需要判断是否有数据权限
-                if ((isRevisit != null && isRevisit.equals("1"))|| (isOvertime != null && isOvertime.equals("1"))|| (caseLevel != null && caseLevel.equals("1"))) {
-                    ShiroUser shiroUser = service.getCurrLoginUser();
-                    List<String> roles = shiroUser.getRoleTips();
-                    if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
-                        dataScope = service.getCurrUserDataScope();
-                        dataScope.setScopeName("ONEDEPTID");
-                    }
-                }
-            }
-        }
-        catch (Exception e){
-            String mes = e.getMessage().toString();
-            String mes2=mes;
-        }
-
-        results = cwsCaseService.queryByCondition(page,dataScope,queryCondition);
-
-
+        List<Map<String, Object>> results = cwsCaseService.queryByCondition(page, caseDataScope(queryCondition), queryCondition);
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
-
         return super.packForBT(page);
     }
 
-
+    /**
+     * 根据案卷状态设置查询条件
+     *
+     * @param queryCondition
+     * @return
+     */
+    private QueryCondition caseQueryConditionByState(QueryCondition queryCondition) {
+        int specialQuery = 0;
+        specialQuery = queryCondition.getSpecialQuery();
+        if (specialQuery > 0) {
+            if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
+                //未超期未处置 /处置中
+                queryCondition.setProcessState("1");
+                queryCondition.setIsOvertime("0");
+            } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()) {
+                //超期未处置 //处置中
+                queryCondition.setProcessState("1");
+                queryCondition.setIsOvertime("1");
+            } else if (specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()) {
+                //超期处置 //处置完成
+                queryCondition.setProcessState("2");
+                queryCondition.setIsProcessOvertime("1");
+            } else if (specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()) {
+                //按期处置 //处置完成
+                queryCondition.setProcessState("2");
+                queryCondition.setIsProcessOvertime("0");
+            } else if (specialQuery == SpecialQueryEnum.NO_CLOSE.getState()) {
+                //未结案
+                queryCondition.setIsClose("0");
+            } else if (specialQuery == SpecialQueryEnum.REGISTERED.getState()) {
+                //已立案
+                queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState() + "");
+                //queryCondition.setRegisterTimeEnd(today);
+            }
+        }
+        return queryCondition;
+    }
 
     /**
      * 综合查询导出
      */
     @RequestMapping(value = "/export")
-//    @ResponseBody
-    public void export(QueryCondition queryCondition,HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)throws IOException  {
-        int specialQuery =0;
-        specialQuery= queryCondition.getSpecialQuery();
-        if(specialQuery>0) {
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            String today = formatter.format(new Date());
-            if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
-                //未超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("0");
-            } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()){
-                //超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()){
-                //超期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()){
-                //按期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("0");
-            }else if(specialQuery == SpecialQueryEnum.NO_CLOSE.getState()){
-                //未结案
-                queryCondition.setIsClose("0");
-            }else if(specialQuery == SpecialQueryEnum.REGISTERED.getState()){
-                //已立案
-                queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+"");
-                //queryCondition.setRegisterTimeEnd(today);
-            }
-        }
-
-        List<Map<String, Object>> results =  queryExportByCondition(queryCondition);
+    public void export(QueryCondition queryCondition, HttpServletResponse httpServletResponse) throws IOException {
+        List<Map<String, Object>> results = queryExportByCondition(caseQueryConditionByState(queryCondition));
         FileInputStream fileInputStream = null;
         if (ToolUtil.isEmpty(results)) {
-            fileInputStream = new FileInputStream(templatePath + "/accessEmpty.xlsx");
+            fileInputStream = new FileInputStream(templatePath + "/temp/accessEmpty.xlsx");
         } else {
-            fileInputStream = new FileInputStream(templatePath + "/caseRecTemplate.xlsx");
+            fileInputStream = new FileInputStream(templatePath + "/temp/caseRecTemplate.xlsx");
         }
-
         try {
             httpServletResponse.setContentType("application/octet-stream");
             httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "caseRecTemplate.xlsx");
-
             Map<String, Object> var = new HashMap<>();
             var.put("标题", "案卷综合查询一览表");
             var.put("list", results);
             ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var);
-
         } catch (IOException e) {
             e.printStackTrace();
         } catch (Exception e) {
@@ -936,27 +878,24 @@
         }
     }
 
-
-    public List<Map<String,Object>> queryExportByCondition(QueryCondition queryCondition){
-        List<Map<String,Object>> results = null;
-        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-        page.setLimit(maxRowsExcel);
-        page.setSize(maxRowsExcel);
-        page.setOffset(0);
-        page.setSearchCount(false);
-        DataScope dataScope =null;
+    /**
+     * 案卷查询权限判定
+     *
+     * @param queryCondition
+     * @return
+     */
+    private DataScope caseDataScope(QueryCondition queryCondition) {
+        DataScope dataScope = null;
         try {
             if (queryCondition.isDataScope() == true) {
                 dataScope = service.getCurrUserDataScope();
                 dataScope.setScopeName("ONEDEPTID");
-            }
-            else {
+            } else {
                 String isRevisit = queryCondition.getIsRevisit();
                 String isOvertime = queryCondition.getIsOvertime();
                 String caseLevel = queryCondition.getCaseLevel();
-
                 //回访、超时、紧急案件的查询需要判断是否有数据权限
-                if ((isRevisit != null && isRevisit.equals("1"))|| (isOvertime != null && isOvertime.equals("1"))|| (caseLevel != null && caseLevel.equals("1"))) {
+                if ((isRevisit != null && isRevisit.equals(Const.ONE)) || (isOvertime != null && isOvertime.equals(Const.ONE)) || (caseLevel != null && caseLevel.equals(Const.ONE))) {
                     ShiroUser shiroUser = service.getCurrLoginUser();
                     List<String> roles = shiroUser.getRoleTips();
                     if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
@@ -965,13 +904,28 @@
                     }
                 }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        catch (Exception e){
-            String mes = e.getMessage().toString();
-        }
-        results = cwsCaseService.queryByCondition(page,dataScope,queryCondition);
+        return dataScope;
+    }
+
+    /**
+     * 导出数据检索条件
+     *
+     * @param queryCondition
+     * @return
+     */
+    public List<Map<String, Object>> queryExportByCondition(QueryCondition queryCondition) {
+        List<Map<String, Object>> results = null;
+        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+        page.setLimit(maxRowsExcel);
+        page.setSize(maxRowsExcel);
+        page.setOffset(0);
+        page.setSearchCount(false);
+        results = cwsCaseService.queryByCondition(page, caseDataScope(queryCondition), queryCondition);
         new CwsCaseWarpper(results).warp();
-        return  results;
+        return results;
     }
 
 }
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/ProcessDetailController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/ProcessDetailController.java
index aec815c..09fc603 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/ProcessDetailController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/ProcessDetailController.java
@@ -24,11 +24,9 @@
 @RequestMapping("/processDetail")
 public class ProcessDetailController extends BaseController {
 
-
     @Autowired
     private IProcessDetailService processDetailService;
 
-
     /**
      * 获取列表
      */
@@ -89,18 +87,4 @@
         processDetailService.updateById(processDetail);
         return ResponseData.success();
     }
-
-    /**
-     * 详情
-     */
-    @RequestMapping(value = "/detail/{processDetailId}")
-    @ResponseBody
-    public Object detail(@PathVariable("processDetailId") String processDetailId) {
-//        ResultData<ProcessDetail> resultData = new ResultData<ProcessDetail>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(processDetailService.selectById(processDetailId));
-//        return resultData;
-        return ResponseData.success();
-    }
 }
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java
index 4be9366..fe49638 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java
@@ -20,9 +20,12 @@
 import com.casic.missiles.modular.cwscase.service.IStatusService;
 import com.casic.missiles.modular.dictexpand.service.IDictExpandService;
 import com.casic.missiles.modular.enums.CaseStateEnum;
+import com.casic.missiles.modular.enums.CwsRoleEnums;
 import com.casic.missiles.modular.enums.SourceEnum;
 import com.casic.missiles.modular.flowable.dto.ProcessDcmsDto;
+import com.casic.missiles.modular.flowable.dto.ProcessUserDTO;
 import com.casic.missiles.modular.flowable.service.ICaseFlowService;
+import com.casic.missiles.modular.flowable.service.ICommonWorkflowService;
 import com.casic.missiles.modular.system.model.Area;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -66,6 +69,8 @@
     private IStatusService statusService;
     @Autowired
     private IProcessDetailService processDetailService;
+    @Autowired
+    private ICommonWorkflowService workflowService;
 
     @Override
     public Integer countCaseToday() {
@@ -332,7 +337,7 @@
 
         for (Map<String, Object> map : results) {
             String createUserName = "";
-
+            currProcessing(map);
             //大小类
             map = warpper(map);
 
@@ -471,6 +476,8 @@
     public List<Map<String, Object>> workList(Page page, String groupId, String onedeptid, String actUserId, QueryCondition queryCondition) {
         List<Map<String, Object>> results = this.baseMapper.workList(page, groupId, onedeptid, actUserId, queryCondition);
         for (Map<String, Object> map : results) {
+            //当前处理情况设置
+            currProcessing(map);
             //大小类
             map = warpper(map);
 
@@ -478,10 +485,40 @@
         return results;
     }
 
+    private void currProcessing(Map<String, Object> map) {
+        //设置当前处理用户信息
+        Object processId = map.get("processId");
+        if (ToolUtil.isNotEmpty(processId)) {
+            ProcessUserDTO userDto = workflowService.queryIdentityLinks(String.valueOf(processId));
+            if (userDto != null) {
+                if (ToolUtil.isNotEmpty(userDto.getUserId())) {
+                    map.put("currUserId", userDto.getUserId());
+                    map.put("currUserName", service.getUserById(userDto.getUserId(), null).getName());
+                }
+                for (String group : userDto.getGroups()) {
+                    //角色分组数据
+                    String roleName = CwsRoleEnums.ADMINISTRATOR.getRoleNameByTip(group);
+                    if (ToolUtil.isNotEmpty(roleName)) {
+                        map.put("currRoleName", roleName);
+                        map.put("currRoleId", group);
+                    } else {
+                        String deptName = service.getDeptName(group);
+                        if (ToolUtil.isNotEmpty(deptName)) {
+                            map.put("currDeptId", group);
+                            map.put("currDeptName", deptName);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     @Override
     public List<Map<String, Object>> completedList(Page page, String actUserId, QueryCondition queryCondition) {
         List<Map<String, Object>> results = this.baseMapper.completedList(page, actUserId, queryCondition);
         for (Map<String, Object> map : results) {
+            //当前处理情况设置
+            currProcessing(map);
             //大小类
             map = warpper(map);
 
@@ -491,6 +528,7 @@
 
     /**
      * 案件撤销
+     *
      * @param bizId 案卷ID
      */
     @Override

diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
index 5edda35..2466e9a 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.common.constant.Const;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
@@ -29,8 +30,6 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -56,6 +55,7 @@
     private int maxRowsExcel;
     @Value("${casic.config.config-path}")
     private String templatePath;
+
     /**
      * 获取列表
      */
@@ -73,30 +73,32 @@
     public Object listPage(String condition) {
         Page<CwsCase> page = new PageFactory<CwsCase>().defaultPage();
         EntityWrapper<CwsCase> query = new EntityWrapper<>();
-        page =  cwsCaseService.selectPage(page,query);
+        page = cwsCaseService.selectPage(page, query);
         return super.packForBT(page);
     }
+
     /**
      * 新增-pc
      */
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, HttpServletRequest request) {
-        if(cwsCaseService.createNewPC(cwsCase,isNeedVerify,isNeedRevisit,bzhours,bzminis,verifyPersonId)){
+        if (cwsCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId)) {
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("服务器异常");
         }
     }
+
     /**
      * 新增-app
      */
     @RequestMapping(value = "/addAPP")
     @ResponseBody
     public Object addAPP(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, HttpServletRequest request) {
-        if(cwsCaseService.createNewAPP(cwsCase,isNeedVerify,isNeedRevisit,bzhours,bzminis,verifyPersonId)){
+        if (cwsCaseService.createNewAPP(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId)) {
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("服务器异常");
         }
     }
@@ -107,9 +109,9 @@
     @RequestMapping(value = "/addWeChat")
     @ResponseBody
     public Object addWeChat(CwsCase cwsCase, Integer isNeedRevisit, HttpServletRequest request) {
-        if(cwsCaseService.createNewWeChat(cwsCase,isNeedRevisit)){
+        if (cwsCaseService.createNewWeChat(cwsCase, isNeedRevisit)) {
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("服务器异常");
         }
     }
@@ -151,7 +153,7 @@
     @RequestMapping(value = "/detail/{id}")
     @ResponseBody
     public Object detail(@PathVariable("id") String id) {
-        List<Map<String,Object>> results = cwsCaseService.caseDetailById(Long.valueOf(id));
+        List<Map<String, Object>> results = cwsCaseService.caseDetailById(Long.valueOf(id));
         new CwsCaseWarpper(results).warp();
         return ResponseData.success(results);
     }
@@ -175,10 +177,10 @@
     @ResponseBody
     public Object historyByPhoneListPage(String reporterPhone) {
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
-        results = cwsCaseService.historyByPhone(page,reporterPhone);
+        results = cwsCaseService.historyByPhone(page, reporterPhone);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -205,7 +207,7 @@
 //        }
 
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         //待核实状态案卷
@@ -215,11 +217,11 @@
         //如果是app的监督员访问此接口，则需按人员过滤数据权限，获取监督员id
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
-        if(roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())){
+        if (roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
-            results = cwsCaseService.workList(page,null,null,actUserId,queryCondition);
-        }else { //pc端的监督指挥系统查看待核实案卷
-            results = cwsCaseService.workList(page,null,null,null,queryCondition);
+            results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
+        } else { //pc端的监督指挥系统查看待核实案卷
+            results = cwsCaseService.workList(page, null, null, null, queryCondition);
         }
 
         new CwsCaseWarpper(results).warp();
@@ -241,9 +243,9 @@
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
         List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) count = results.size() + "";
         return ResponseData.success(count);
     }
 
@@ -254,14 +256,14 @@
     @RequestMapping(value = "/verifiedListPage")
     @ResponseBody
     public Object verifiedListPage() {
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        QueryCondition queryCondition=new QueryCondition();
+        QueryCondition queryCondition = new QueryCondition();
         queryCondition.setVerifyPersonId(actUserId);
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -278,7 +280,7 @@
     public Object toRegisterListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_REGISTERED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>>  results = queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -290,7 +292,7 @@
     public Object preRegisterListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.PRE_REGISTER.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -302,7 +304,7 @@
     public Object toDistributeListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_DISTRIBUTED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -316,9 +318,9 @@
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
         List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) count = results.size() + "";
         return ResponseData.success(count);
     }
 
@@ -330,7 +332,7 @@
     public Object preDistributeListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.PRE_DISTRIBUTE.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -343,7 +345,7 @@
         int caseState = CaseStateEnum.TO_BE_HANDLED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -357,21 +359,20 @@
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
         List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) count = results.size() + "";
         return ResponseData.success(count);
     }
 
 
-
     /**
      * 待处理分页查询，即app处理待办
      */
     @RequestMapping(value = "/toHandleListPage")
     @ResponseBody
-    public Object toHandleListPage(String isOvertime,String isEmergent) {
-        List<Map<String,Object>> results = null;
+    public Object toHandleListPage(String isOvertime, String isEmergent) {
+
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         //待处理状态案卷
@@ -379,30 +380,33 @@
         queryCondition.setCaseState(String.valueOf(CaseStateEnum.APP_HANDLE.getState()));
 
         //超时案卷
-        if(isOvertime!=null&&isOvertime.equals("1")){
+        if (isOvertime != null && isOvertime.equals("1")) {
             queryCondition.setIsOvertime("1");
         }
 
         //紧急案卷
-        if(isEmergent!=null&&isEmergent.equals("1")){
+        if (isEmergent != null && isEmergent.equals("1")) {
             queryCondition.setCaseLevel(String.valueOf(CaseLevelEnum.EMERGENT.getState()));
         }
 
         //app的处置人员访问
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
-        if(roles.contains(CwsRoleEnums.PROCESS.getRoleTip())){
+        List<Map<String, Object>> results = null;
+
+        if (roles.contains(CwsRoleEnums.PROCESS.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
-            results = cwsCaseService.workList(page,null,null,actUserId,queryCondition);
+            results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
         } else {
             //pc端的监督指挥系统查看处理中案卷
-            results = cwsCaseService.workList(page,null,null,null,queryCondition);
+            results = cwsCaseService.workList(page, null, null, null, queryCondition);
         }
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
 
         return ResponseData.success(super.packForBT(page));
     }
+
     /**
      * 已处理分页查询，即app处理已办
      */
@@ -410,14 +414,14 @@
     @ResponseBody
     public Object handledListPage() {
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        QueryCondition queryCondition=new QueryCondition();
+        QueryCondition queryCondition = new QueryCondition();
         queryCondition.setProcessPersonid(actUserId);
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -434,7 +438,7 @@
     public Object handleAuditListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.HANDLE_AUDIT.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -446,7 +450,7 @@
     public Object toDisCheckListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_CHECKED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -456,7 +460,7 @@
     @RequestMapping(value = "/toCheckListPage")
     @ResponseBody
     public Object toCheckListPage() {
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         //待核查状态案卷
@@ -466,7 +470,7 @@
         //app监督员访问接口
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
-        if(roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
+        if (roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
             results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
         }
@@ -489,10 +493,11 @@
         int caseState = CaseStateEnum.CHECK_SCENE.getState();
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
-        List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        List<Map<String, Object>> results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) {
+            count = results.size() + "";
+        }
         return ResponseData.success(count);
     }
 
@@ -503,14 +508,14 @@
     @ResponseBody
     public Object checkedListPage() {
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        QueryCondition queryCondition=new QueryCondition();
+        QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCheckPersonId(actUserId);
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -526,8 +531,8 @@
     public Object toFinishListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_CLOSED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
-        return ResponseData.success(results );
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
+        return ResponseData.success(results);
     }
 
     /**
@@ -538,7 +543,7 @@
     public Object toChangeListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_ADJUSTED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -550,7 +555,7 @@
     public Object toAdjustInstructionListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.HANDLE_MAN_FEEDBACK_ADJUSTMENT.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -565,7 +570,7 @@
 
         //部门权限
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -576,9 +581,11 @@
     @ResponseBody
     public Object toDeptAdjustInstructionListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.HANDLE_MAN_FEEDBACK_DELAY.getState();
-        queryCondition.setCaseState(String.valueOf(caseState));//申请延期
-        queryCondition.setCaseState2(CaseStateEnum.HANDLE_MAN_FEEDBACK_POSTPONE.getState()+"");//申请缓办
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        //申请延期
+        queryCondition.setCaseState(String.valueOf(caseState));
+        //申请缓办
+        queryCondition.setCaseState2(CaseStateEnum.HANDLE_MAN_FEEDBACK_POSTPONE.getState() + "");
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -592,7 +599,7 @@
         queryCondition.setCaseState(String.valueOf(caseState));
         //部门权限
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -606,7 +613,7 @@
         int caseState = CaseStateEnum.TO_BE_HANDLED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsPostpone("1");
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -619,7 +626,7 @@
         int caseState = CaseStateEnum.TO_BE_HANDLED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsDelay("1");
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -633,7 +640,7 @@
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsPostpone("1");
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -647,7 +654,7 @@
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsDelay("1");
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -662,7 +669,7 @@
         //未完成案卷
         queryCondition.setIsComplete("0");
 
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -673,7 +680,7 @@
     @ResponseBody
     public Object isRevisitListPage(QueryCondition queryCondition) {
         queryCondition.setIsRevisit("1");
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -693,111 +700,73 @@
         //未完成案卷
         queryCondition.setIsComplete("0");
 
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
-
-
     /**
      * “超期查询”查询条件列表
      */
     @RequestMapping(value = "/specialQueryList")
     @ResponseBody
     public Object specialQueryList() {
-        List<Map<String,Object>> results = null;
-        results = SpecialQueryEnum.toList();
-        return ResponseData.success(results);
+        return ResponseData.success(SpecialQueryEnum.toList());
     }
 
-
     /**
      * 综合查询
      */
     @RequestMapping(value = "/queryListPage")
     @ResponseBody
     public Object queryListPage(QueryCondition queryCondition) {
-        int specialQuery =0;
-        specialQuery= queryCondition.getSpecialQuery();
-        if(specialQuery>0) {
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            String today = formatter.format(new Date());
-            if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
-                //未超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("0");
-            } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()){
-                //超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()){
-                //超期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()){
-                //按期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("0");
-            }else if(specialQuery == SpecialQueryEnum.NO_CLOSE.getState()){
-                //未结案
-                queryCondition.setIsClose("0");
-            }else if(specialQuery == SpecialQueryEnum.REGISTERED.getState()){
-                //已立案
-                queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+"");
-                //queryCondition.setRegisterTimeEnd(today);
-            }
-        }
-
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
-        return ResponseData.success(results);
+        return ResponseData.success(queryByCondition(caseQueryConditionByState(queryCondition)));
     }
 
 
-
     /**
      * 待办
      */
     @RequestMapping(value = "/workListPage")
     @ResponseBody
     public Object workListPage(QueryCondition queryCondition) {
-        List<Map<String,Object>> results = null;
+
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
+        List<Map<String, Object>> results = null;
         //处置单位
-        if(roles.contains(CwsRoleEnums.ADMINISTRATOR.getRoleTip())){
-            results = cwsCaseService.workList(page,null,null,null,queryCondition);
+        if (roles.contains(CwsRoleEnums.ADMINISTRATOR.getRoleTip())) {
+            results = cwsCaseService.workList(page, null, null, null, queryCondition);
         }
         //处置单位
-        else if(roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())){
+        else if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
             String onedeptid = String.valueOf(shiroUser.getDeptId());
-            results = cwsCaseService.workList(page,null,onedeptid,null,queryCondition);
+            results = cwsCaseService.workList(page, null, onedeptid, null, queryCondition);
         }
         //处置人员、监督员
-        else if(roles.contains(CwsRoleEnums.PROCESS.getRoleTip())||roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())){
+        else if (roles.contains(CwsRoleEnums.PROCESS.getRoleTip()) || roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
-            results = cwsCaseService.workList(page,null,null,actUserId,queryCondition);
-        }
-        else{
+            results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
+        } else {
             String groupId = null;
             //指挥长
-            if(roles.contains(CwsRoleEnums.COMMANDER.getRoleTip())){
+            if (roles.contains(CwsRoleEnums.COMMANDER.getRoleTip())) {
                 groupId = CwsRoleEnums.COMMANDER.getRoleTip();
             }
             //派遣员
-            else if(roles.contains(CwsRoleEnums.DISPATCHER.getRoleTip())){
+            else if (roles.contains(CwsRoleEnums.DISPATCHER.getRoleTip())) {
                 groupId = CwsRoleEnums.DISPATCHER.getRoleTip();
             }
             //值班长
-            else if(roles.contains(CwsRoleEnums.MONITOR.getRoleTip())){
+            else if (roles.contains(CwsRoleEnums.MONITOR.getRoleTip())) {
                 groupId = CwsRoleEnums.MONITOR.getRoleTip();
             }
             //受理员
-            else if(roles.contains(CwsRoleEnums.RECEIVER.getRoleTip())){
+            else if (roles.contains(CwsRoleEnums.RECEIVER.getRoleTip())) {
                 groupId = CwsRoleEnums.RECEIVER.getRoleTip();
             }
-            results = cwsCaseService.workList(page,groupId,null,null,queryCondition);
+            results = cwsCaseService.workList(page, groupId, null, null, queryCondition);
         }
 
         new CwsCaseWarpper(results).warp();
@@ -813,12 +782,12 @@
     @RequestMapping(value = "/completedListPage")
     @ResponseBody
     public Object completedListPage(QueryCondition queryCondition) {
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -827,104 +796,77 @@
     }
 
 
-
-
-
-    public PageInfoBT<Map<String, Object>> queryByCondition(QueryCondition queryCondition){
-        List<Map<String,Object>> results = null;
+    /**
+     * 分页查询
+     *
+     * @param queryCondition
+     * @return
+     */
+    public PageInfoBT<Map<String, Object>> queryByCondition(QueryCondition queryCondition) {
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-        DataScope dataScope =null;
-        try {
-            if (queryCondition.isDataScope() == true) {
-                dataScope = service.getCurrUserDataScope();
-                dataScope.setScopeName("ONEDEPTID");
-            }
-            else {
-                String isRevisit = queryCondition.getIsRevisit();
-                String isOvertime = queryCondition.getIsOvertime();
-                String caseLevel = queryCondition.getCaseLevel();
-
-                //回访、超时、紧急案件的查询需要判断是否有数据权限
-                if ((isRevisit != null && isRevisit.equals("1"))|| (isOvertime != null && isOvertime.equals("1"))|| (caseLevel != null && caseLevel.equals("1"))) {
-                    ShiroUser shiroUser = service.getCurrLoginUser();
-                    List<String> roles = shiroUser.getRoleTips();
-                    if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
-                        dataScope = service.getCurrUserDataScope();
-                        dataScope.setScopeName("ONEDEPTID");
-                    }
-                }
-            }
-        }
-        catch (Exception e){
-            String mes = e.getMessage().toString();
-            String mes2=mes;
-        }
-
-        results = cwsCaseService.queryByCondition(page,dataScope,queryCondition);
-
-
+        List<Map<String, Object>> results = cwsCaseService.queryByCondition(page, caseDataScope(queryCondition), queryCondition);
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
-
         return super.packForBT(page);
     }
 
-
+    /**
+     * 根据案卷状态设置查询条件
+     *
+     * @param queryCondition
+     * @return
+     */
+    private QueryCondition caseQueryConditionByState(QueryCondition queryCondition) {
+        int specialQuery = 0;
+        specialQuery = queryCondition.getSpecialQuery();
+        if (specialQuery > 0) {
+            if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
+                //未超期未处置 /处置中
+                queryCondition.setProcessState("1");
+                queryCondition.setIsOvertime("0");
+            } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()) {
+                //超期未处置 //处置中
+                queryCondition.setProcessState("1");
+                queryCondition.setIsOvertime("1");
+            } else if (specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()) {
+                //超期处置 //处置完成
+                queryCondition.setProcessState("2");
+                queryCondition.setIsProcessOvertime("1");
+            } else if (specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()) {
+                //按期处置 //处置完成
+                queryCondition.setProcessState("2");
+                queryCondition.setIsProcessOvertime("0");
+            } else if (specialQuery == SpecialQueryEnum.NO_CLOSE.getState()) {
+                //未结案
+                queryCondition.setIsClose("0");
+            } else if (specialQuery == SpecialQueryEnum.REGISTERED.getState()) {
+                //已立案
+                queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState() + "");
+                //queryCondition.setRegisterTimeEnd(today);
+            }
+        }
+        return queryCondition;
+    }
 
     /**
      * 综合查询导出
      */
     @RequestMapping(value = "/export")
-//    @ResponseBody
-    public void export(QueryCondition queryCondition,HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)throws IOException  {
-        int specialQuery =0;
-        specialQuery= queryCondition.getSpecialQuery();
-        if(specialQuery>0) {
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            String today = formatter.format(new Date());
-            if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
-                //未超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("0");
-            } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()){
-                //超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()){
-                //超期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()){
-                //按期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("0");
-            }else if(specialQuery == SpecialQueryEnum.NO_CLOSE.getState()){
-                //未结案
-                queryCondition.setIsClose("0");
-            }else if(specialQuery == SpecialQueryEnum.REGISTERED.getState()){
-                //已立案
-                queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+"");
-                //queryCondition.setRegisterTimeEnd(today);
-            }
-        }
-
-        List<Map<String, Object>> results =  queryExportByCondition(queryCondition);
+    public void export(QueryCondition queryCondition, HttpServletResponse httpServletResponse) throws IOException {
+        List<Map<String, Object>> results = queryExportByCondition(caseQueryConditionByState(queryCondition));
         FileInputStream fileInputStream = null;
         if (ToolUtil.isEmpty(results)) {
-            fileInputStream = new FileInputStream(templatePath + "/accessEmpty.xlsx");
+            fileInputStream = new FileInputStream(templatePath + "/temp/accessEmpty.xlsx");
         } else {
-            fileInputStream = new FileInputStream(templatePath + "/caseRecTemplate.xlsx");
+            fileInputStream = new FileInputStream(templatePath + "/temp/caseRecTemplate.xlsx");
         }
-
         try {
             httpServletResponse.setContentType("application/octet-stream");
             httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "caseRecTemplate.xlsx");
-
             Map<String, Object> var = new HashMap<>();
             var.put("标题", "案卷综合查询一览表");
             var.put("list", results);
             ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var);
-
         } catch (IOException e) {
             e.printStackTrace();
         } catch (Exception e) {
@@ -936,27 +878,24 @@
         }
     }
 
-
-    public List<Map<String,Object>> queryExportByCondition(QueryCondition queryCondition){
-        List<Map<String,Object>> results = null;
-        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-        page.setLimit(maxRowsExcel);
-        page.setSize(maxRowsExcel);
-        page.setOffset(0);
-        page.setSearchCount(false);
-        DataScope dataScope =null;
+    /**
+     * 案卷查询权限判定
+     *
+     * @param queryCondition
+     * @return
+     */
+    private DataScope caseDataScope(QueryCondition queryCondition) {
+        DataScope dataScope = null;
         try {
             if (queryCondition.isDataScope() == true) {
                 dataScope = service.getCurrUserDataScope();
                 dataScope.setScopeName("ONEDEPTID");
-            }
-            else {
+            } else {
                 String isRevisit = queryCondition.getIsRevisit();
                 String isOvertime = queryCondition.getIsOvertime();
                 String caseLevel = queryCondition.getCaseLevel();
-
                 //回访、超时、紧急案件的查询需要判断是否有数据权限
-                if ((isRevisit != null && isRevisit.equals("1"))|| (isOvertime != null && isOvertime.equals("1"))|| (caseLevel != null && caseLevel.equals("1"))) {
+                if ((isRevisit != null && isRevisit.equals(Const.ONE)) || (isOvertime != null && isOvertime.equals(Const.ONE)) || (caseLevel != null && caseLevel.equals(Const.ONE))) {
                     ShiroUser shiroUser = service.getCurrLoginUser();
                     List<String> roles = shiroUser.getRoleTips();
                     if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
@@ -965,13 +904,28 @@
                     }
                 }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        catch (Exception e){
-            String mes = e.getMessage().toString();
-        }
-        results = cwsCaseService.queryByCondition(page,dataScope,queryCondition);
+        return dataScope;
+    }
+
+    /**
+     * 导出数据检索条件
+     *
+     * @param queryCondition
+     * @return
+     */
+    public List<Map<String, Object>> queryExportByCondition(QueryCondition queryCondition) {
+        List<Map<String, Object>> results = null;
+        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+        page.setLimit(maxRowsExcel);
+        page.setSize(maxRowsExcel);
+        page.setOffset(0);
+        page.setSearchCount(false);
+        results = cwsCaseService.queryByCondition(page, caseDataScope(queryCondition), queryCondition);
         new CwsCaseWarpper(results).warp();
-        return  results;
+        return results;
     }
 
 }
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/ProcessDetailController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/ProcessDetailController.java
index aec815c..09fc603 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/ProcessDetailController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/ProcessDetailController.java
@@ -24,11 +24,9 @@
 @RequestMapping("/processDetail")
 public class ProcessDetailController extends BaseController {
 
-
     @Autowired
     private IProcessDetailService processDetailService;
 
-
     /**
      * 获取列表
      */
@@ -89,18 +87,4 @@
         processDetailService.updateById(processDetail);
         return ResponseData.success();
     }
-
-    /**
-     * 详情
-     */
-    @RequestMapping(value = "/detail/{processDetailId}")
-    @ResponseBody
-    public Object detail(@PathVariable("processDetailId") String processDetailId) {
-//        ResultData<ProcessDetail> resultData = new ResultData<ProcessDetail>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(processDetailService.selectById(processDetailId));
-//        return resultData;
-        return ResponseData.success();
-    }
 }
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java
index 4be9366..fe49638 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java
@@ -20,9 +20,12 @@
 import com.casic.missiles.modular.cwscase.service.IStatusService;
 import com.casic.missiles.modular.dictexpand.service.IDictExpandService;
 import com.casic.missiles.modular.enums.CaseStateEnum;
+import com.casic.missiles.modular.enums.CwsRoleEnums;
 import com.casic.missiles.modular.enums.SourceEnum;
 import com.casic.missiles.modular.flowable.dto.ProcessDcmsDto;
+import com.casic.missiles.modular.flowable.dto.ProcessUserDTO;
 import com.casic.missiles.modular.flowable.service.ICaseFlowService;
+import com.casic.missiles.modular.flowable.service.ICommonWorkflowService;
 import com.casic.missiles.modular.system.model.Area;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -66,6 +69,8 @@
     private IStatusService statusService;
     @Autowired
     private IProcessDetailService processDetailService;
+    @Autowired
+    private ICommonWorkflowService workflowService;
 
     @Override
     public Integer countCaseToday() {
@@ -332,7 +337,7 @@
 
         for (Map<String, Object> map : results) {
             String createUserName = "";
-
+            currProcessing(map);
             //大小类
             map = warpper(map);
 
@@ -471,6 +476,8 @@
     public List<Map<String, Object>> workList(Page page, String groupId, String onedeptid, String actUserId, QueryCondition queryCondition) {
         List<Map<String, Object>> results = this.baseMapper.workList(page, groupId, onedeptid, actUserId, queryCondition);
         for (Map<String, Object> map : results) {
+            //当前处理情况设置
+            currProcessing(map);
             //大小类
             map = warpper(map);
 
@@ -478,10 +485,40 @@
         return results;
     }
 
+    private void currProcessing(Map<String, Object> map) {
+        //设置当前处理用户信息
+        Object processId = map.get("processId");
+        if (ToolUtil.isNotEmpty(processId)) {
+            ProcessUserDTO userDto = workflowService.queryIdentityLinks(String.valueOf(processId));
+            if (userDto != null) {
+                if (ToolUtil.isNotEmpty(userDto.getUserId())) {
+                    map.put("currUserId", userDto.getUserId());
+                    map.put("currUserName", service.getUserById(userDto.getUserId(), null).getName());
+                }
+                for (String group : userDto.getGroups()) {
+                    //角色分组数据
+                    String roleName = CwsRoleEnums.ADMINISTRATOR.getRoleNameByTip(group);
+                    if (ToolUtil.isNotEmpty(roleName)) {
+                        map.put("currRoleName", roleName);
+                        map.put("currRoleId", group);
+                    } else {
+                        String deptName = service.getDeptName(group);
+                        if (ToolUtil.isNotEmpty(deptName)) {
+                            map.put("currDeptId", group);
+                            map.put("currDeptName", deptName);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     @Override
     public List<Map<String, Object>> completedList(Page page, String actUserId, QueryCondition queryCondition) {
         List<Map<String, Object>> results = this.baseMapper.completedList(page, actUserId, queryCondition);
         for (Map<String, Object> map : results) {
+            //当前处理情况设置
+            currProcessing(map);
             //大小类
             map = warpper(map);
 
@@ -491,6 +528,7 @@
 
     /**
      * 案件撤销
+     *
      * @param bizId 案卷ID
      */
     @Override
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java
index 08d54a6..69bfa10 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java
@@ -133,7 +133,7 @@
     }
 
     /**
-     * 根据小时、分钟计算截止时间，一般案件按每天的实际工时算，紧急案件按自然时间算
+     * 根据小时,分钟计算截止时间，一般案件按每天的实际工时算，紧急案件按自然时间算
      *
      * @param caseLevel 案卷等级
      * @param beginTime 计算的开始时间（"yyyy-MM-dd HH:mm:ss"），非延期时，就是当前时间，延期时，则是延期前的截止时间
@@ -173,9 +173,10 @@
             }
         }
 
-        //计算每天的工作时长
-        Long diff1 = (endAM.getTime() - startAM.getTime()) / (1000 * 60);//上午上班时长（分钟数）
-        Long diff2 = (endPM.getTime() - startPM.getTime()) / (1000 * 60);//下午上班时长（分钟数）
+        //计算每天的工作时长 上午上班时长（分钟数）
+        Long diff1 = (endAM.getTime() - startAM.getTime()) / (1000 * 60);
+        //下午上班时长（分钟数）
+        Long diff2 = (endPM.getTime() - startPM.getTime()) / (1000 * 60);
         //当天剩余的中午休息时长（分钟数）
         int inter = 0;
         if ((beginTime.before(startPM)||beginTime.equals(startPM)) && (beginTime.after(endAM)||beginTime.equals(endAM))) {
@@ -230,7 +231,7 @@
                         beginCal.add(Calendar.DATE, -1);
                     }
                 }
-//                beginCal.add(Calendar.DATE, addDay);
+                beginCal.add(Calendar.DATE, addDay);
                 beginCal.add(Calendar.MINUTE, addMin);
                 Timestamp endTime0 = new Timestamp(beginCal.getTimeInMillis());
                 //如果截止时间在下午，则需要往后推迟中午的休息时长

diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
index 5edda35..2466e9a 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.common.constant.Const;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
@@ -29,8 +30,6 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -56,6 +55,7 @@
     private int maxRowsExcel;
     @Value("${casic.config.config-path}")
     private String templatePath;
+
     /**
      * 获取列表
      */
@@ -73,30 +73,32 @@
     public Object listPage(String condition) {
         Page<CwsCase> page = new PageFactory<CwsCase>().defaultPage();
         EntityWrapper<CwsCase> query = new EntityWrapper<>();
-        page =  cwsCaseService.selectPage(page,query);
+        page = cwsCaseService.selectPage(page, query);
         return super.packForBT(page);
     }
+
     /**
      * 新增-pc
      */
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, HttpServletRequest request) {
-        if(cwsCaseService.createNewPC(cwsCase,isNeedVerify,isNeedRevisit,bzhours,bzminis,verifyPersonId)){
+        if (cwsCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId)) {
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("服务器异常");
         }
     }
+
     /**
      * 新增-app
      */
     @RequestMapping(value = "/addAPP")
     @ResponseBody
     public Object addAPP(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, HttpServletRequest request) {
-        if(cwsCaseService.createNewAPP(cwsCase,isNeedVerify,isNeedRevisit,bzhours,bzminis,verifyPersonId)){
+        if (cwsCaseService.createNewAPP(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId)) {
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("服务器异常");
         }
     }
@@ -107,9 +109,9 @@
     @RequestMapping(value = "/addWeChat")
     @ResponseBody
     public Object addWeChat(CwsCase cwsCase, Integer isNeedRevisit, HttpServletRequest request) {
-        if(cwsCaseService.createNewWeChat(cwsCase,isNeedRevisit)){
+        if (cwsCaseService.createNewWeChat(cwsCase, isNeedRevisit)) {
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("服务器异常");
         }
     }
@@ -151,7 +153,7 @@
     @RequestMapping(value = "/detail/{id}")
     @ResponseBody
     public Object detail(@PathVariable("id") String id) {
-        List<Map<String,Object>> results = cwsCaseService.caseDetailById(Long.valueOf(id));
+        List<Map<String, Object>> results = cwsCaseService.caseDetailById(Long.valueOf(id));
         new CwsCaseWarpper(results).warp();
         return ResponseData.success(results);
     }
@@ -175,10 +177,10 @@
     @ResponseBody
     public Object historyByPhoneListPage(String reporterPhone) {
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
-        results = cwsCaseService.historyByPhone(page,reporterPhone);
+        results = cwsCaseService.historyByPhone(page, reporterPhone);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -205,7 +207,7 @@
 //        }
 
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         //待核实状态案卷
@@ -215,11 +217,11 @@
         //如果是app的监督员访问此接口，则需按人员过滤数据权限，获取监督员id
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
-        if(roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())){
+        if (roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
-            results = cwsCaseService.workList(page,null,null,actUserId,queryCondition);
-        }else { //pc端的监督指挥系统查看待核实案卷
-            results = cwsCaseService.workList(page,null,null,null,queryCondition);
+            results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
+        } else { //pc端的监督指挥系统查看待核实案卷
+            results = cwsCaseService.workList(page, null, null, null, queryCondition);
         }
 
         new CwsCaseWarpper(results).warp();
@@ -241,9 +243,9 @@
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
         List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) count = results.size() + "";
         return ResponseData.success(count);
     }
 
@@ -254,14 +256,14 @@
     @RequestMapping(value = "/verifiedListPage")
     @ResponseBody
     public Object verifiedListPage() {
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        QueryCondition queryCondition=new QueryCondition();
+        QueryCondition queryCondition = new QueryCondition();
         queryCondition.setVerifyPersonId(actUserId);
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -278,7 +280,7 @@
     public Object toRegisterListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_REGISTERED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>>  results = queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -290,7 +292,7 @@
     public Object preRegisterListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.PRE_REGISTER.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -302,7 +304,7 @@
     public Object toDistributeListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_DISTRIBUTED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -316,9 +318,9 @@
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
         List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) count = results.size() + "";
         return ResponseData.success(count);
     }
 
@@ -330,7 +332,7 @@
     public Object preDistributeListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.PRE_DISTRIBUTE.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -343,7 +345,7 @@
         int caseState = CaseStateEnum.TO_BE_HANDLED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -357,21 +359,20 @@
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
         List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) count = results.size() + "";
         return ResponseData.success(count);
     }
 
 
-
     /**
      * 待处理分页查询，即app处理待办
      */
     @RequestMapping(value = "/toHandleListPage")
     @ResponseBody
-    public Object toHandleListPage(String isOvertime,String isEmergent) {
-        List<Map<String,Object>> results = null;
+    public Object toHandleListPage(String isOvertime, String isEmergent) {
+
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         //待处理状态案卷
@@ -379,30 +380,33 @@
         queryCondition.setCaseState(String.valueOf(CaseStateEnum.APP_HANDLE.getState()));
 
         //超时案卷
-        if(isOvertime!=null&&isOvertime.equals("1")){
+        if (isOvertime != null && isOvertime.equals("1")) {
             queryCondition.setIsOvertime("1");
         }
 
         //紧急案卷
-        if(isEmergent!=null&&isEmergent.equals("1")){
+        if (isEmergent != null && isEmergent.equals("1")) {
             queryCondition.setCaseLevel(String.valueOf(CaseLevelEnum.EMERGENT.getState()));
         }
 
         //app的处置人员访问
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
-        if(roles.contains(CwsRoleEnums.PROCESS.getRoleTip())){
+        List<Map<String, Object>> results = null;
+
+        if (roles.contains(CwsRoleEnums.PROCESS.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
-            results = cwsCaseService.workList(page,null,null,actUserId,queryCondition);
+            results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
         } else {
             //pc端的监督指挥系统查看处理中案卷
-            results = cwsCaseService.workList(page,null,null,null,queryCondition);
+            results = cwsCaseService.workList(page, null, null, null, queryCondition);
         }
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
 
         return ResponseData.success(super.packForBT(page));
     }
+
     /**
      * 已处理分页查询，即app处理已办
      */
@@ -410,14 +414,14 @@
     @ResponseBody
     public Object handledListPage() {
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        QueryCondition queryCondition=new QueryCondition();
+        QueryCondition queryCondition = new QueryCondition();
         queryCondition.setProcessPersonid(actUserId);
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -434,7 +438,7 @@
     public Object handleAuditListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.HANDLE_AUDIT.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -446,7 +450,7 @@
     public Object toDisCheckListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_CHECKED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -456,7 +460,7 @@
     @RequestMapping(value = "/toCheckListPage")
     @ResponseBody
     public Object toCheckListPage() {
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         //待核查状态案卷
@@ -466,7 +470,7 @@
         //app监督员访问接口
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
-        if(roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
+        if (roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
             results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
         }
@@ -489,10 +493,11 @@
         int caseState = CaseStateEnum.CHECK_SCENE.getState();
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
-        List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        List<Map<String, Object>> results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) {
+            count = results.size() + "";
+        }
         return ResponseData.success(count);
     }
 
@@ -503,14 +508,14 @@
     @ResponseBody
     public Object checkedListPage() {
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        QueryCondition queryCondition=new QueryCondition();
+        QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCheckPersonId(actUserId);
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -526,8 +531,8 @@
     public Object toFinishListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_CLOSED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
-        return ResponseData.success(results );
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
+        return ResponseData.success(results);
     }
 
     /**
@@ -538,7 +543,7 @@
     public Object toChangeListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_ADJUSTED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -550,7 +555,7 @@
     public Object toAdjustInstructionListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.HANDLE_MAN_FEEDBACK_ADJUSTMENT.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -565,7 +570,7 @@
 
         //部门权限
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -576,9 +581,11 @@
     @ResponseBody
     public Object toDeptAdjustInstructionListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.HANDLE_MAN_FEEDBACK_DELAY.getState();
-        queryCondition.setCaseState(String.valueOf(caseState));//申请延期
-        queryCondition.setCaseState2(CaseStateEnum.HANDLE_MAN_FEEDBACK_POSTPONE.getState()+"");//申请缓办
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        //申请延期
+        queryCondition.setCaseState(String.valueOf(caseState));
+        //申请缓办
+        queryCondition.setCaseState2(CaseStateEnum.HANDLE_MAN_FEEDBACK_POSTPONE.getState() + "");
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -592,7 +599,7 @@
         queryCondition.setCaseState(String.valueOf(caseState));
         //部门权限
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -606,7 +613,7 @@
         int caseState = CaseStateEnum.TO_BE_HANDLED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsPostpone("1");
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -619,7 +626,7 @@
         int caseState = CaseStateEnum.TO_BE_HANDLED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsDelay("1");
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -633,7 +640,7 @@
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsPostpone("1");
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -647,7 +654,7 @@
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsDelay("1");
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -662,7 +669,7 @@
         //未完成案卷
         queryCondition.setIsComplete("0");
 
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -673,7 +680,7 @@
     @ResponseBody
     public Object isRevisitListPage(QueryCondition queryCondition) {
         queryCondition.setIsRevisit("1");
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -693,111 +700,73 @@
         //未完成案卷
         queryCondition.setIsComplete("0");
 
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
-
-
     /**
      * “超期查询”查询条件列表
      */
     @RequestMapping(value = "/specialQueryList")
     @ResponseBody
     public Object specialQueryList() {
-        List<Map<String,Object>> results = null;
-        results = SpecialQueryEnum.toList();
-        return ResponseData.success(results);
+        return ResponseData.success(SpecialQueryEnum.toList());
     }
 
-
     /**
      * 综合查询
      */
     @RequestMapping(value = "/queryListPage")
     @ResponseBody
     public Object queryListPage(QueryCondition queryCondition) {
-        int specialQuery =0;
-        specialQuery= queryCondition.getSpecialQuery();
-        if(specialQuery>0) {
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            String today = formatter.format(new Date());
-            if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
-                //未超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("0");
-            } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()){
-                //超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()){
-                //超期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()){
-                //按期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("0");
-            }else if(specialQuery == SpecialQueryEnum.NO_CLOSE.getState()){
-                //未结案
-                queryCondition.setIsClose("0");
-            }else if(specialQuery == SpecialQueryEnum.REGISTERED.getState()){
-                //已立案
-                queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+"");
-                //queryCondition.setRegisterTimeEnd(today);
-            }
-        }
-
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
-        return ResponseData.success(results);
+        return ResponseData.success(queryByCondition(caseQueryConditionByState(queryCondition)));
     }
 
 
-
     /**
      * 待办
      */
     @RequestMapping(value = "/workListPage")
     @ResponseBody
     public Object workListPage(QueryCondition queryCondition) {
-        List<Map<String,Object>> results = null;
+
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
+        List<Map<String, Object>> results = null;
         //处置单位
-        if(roles.contains(CwsRoleEnums.ADMINISTRATOR.getRoleTip())){
-            results = cwsCaseService.workList(page,null,null,null,queryCondition);
+        if (roles.contains(CwsRoleEnums.ADMINISTRATOR.getRoleTip())) {
+            results = cwsCaseService.workList(page, null, null, null, queryCondition);
         }
         //处置单位
-        else if(roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())){
+        else if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
             String onedeptid = String.valueOf(shiroUser.getDeptId());
-            results = cwsCaseService.workList(page,null,onedeptid,null,queryCondition);
+            results = cwsCaseService.workList(page, null, onedeptid, null, queryCondition);
         }
         //处置人员、监督员
-        else if(roles.contains(CwsRoleEnums.PROCESS.getRoleTip())||roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())){
+        else if (roles.contains(CwsRoleEnums.PROCESS.getRoleTip()) || roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
-            results = cwsCaseService.workList(page,null,null,actUserId,queryCondition);
-        }
-        else{
+            results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
+        } else {
             String groupId = null;
             //指挥长
-            if(roles.contains(CwsRoleEnums.COMMANDER.getRoleTip())){
+            if (roles.contains(CwsRoleEnums.COMMANDER.getRoleTip())) {
                 groupId = CwsRoleEnums.COMMANDER.getRoleTip();
             }
             //派遣员
-            else if(roles.contains(CwsRoleEnums.DISPATCHER.getRoleTip())){
+            else if (roles.contains(CwsRoleEnums.DISPATCHER.getRoleTip())) {
                 groupId = CwsRoleEnums.DISPATCHER.getRoleTip();
             }
             //值班长
-            else if(roles.contains(CwsRoleEnums.MONITOR.getRoleTip())){
+            else if (roles.contains(CwsRoleEnums.MONITOR.getRoleTip())) {
                 groupId = CwsRoleEnums.MONITOR.getRoleTip();
             }
             //受理员
-            else if(roles.contains(CwsRoleEnums.RECEIVER.getRoleTip())){
+            else if (roles.contains(CwsRoleEnums.RECEIVER.getRoleTip())) {
                 groupId = CwsRoleEnums.RECEIVER.getRoleTip();
             }
-            results = cwsCaseService.workList(page,groupId,null,null,queryCondition);
+            results = cwsCaseService.workList(page, groupId, null, null, queryCondition);
         }
 
         new CwsCaseWarpper(results).warp();
@@ -813,12 +782,12 @@
     @RequestMapping(value = "/completedListPage")
     @ResponseBody
     public Object completedListPage(QueryCondition queryCondition) {
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -827,104 +796,77 @@
     }
 
 
-
-
-
-    public PageInfoBT<Map<String, Object>> queryByCondition(QueryCondition queryCondition){
-        List<Map<String,Object>> results = null;
+    /**
+     * 分页查询
+     *
+     * @param queryCondition
+     * @return
+     */
+    public PageInfoBT<Map<String, Object>> queryByCondition(QueryCondition queryCondition) {
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-        DataScope dataScope =null;
-        try {
-            if (queryCondition.isDataScope() == true) {
-                dataScope = service.getCurrUserDataScope();
-                dataScope.setScopeName("ONEDEPTID");
-            }
-            else {
-                String isRevisit = queryCondition.getIsRevisit();
-                String isOvertime = queryCondition.getIsOvertime();
-                String caseLevel = queryCondition.getCaseLevel();
-
-                //回访、超时、紧急案件的查询需要判断是否有数据权限
-                if ((isRevisit != null && isRevisit.equals("1"))|| (isOvertime != null && isOvertime.equals("1"))|| (caseLevel != null && caseLevel.equals("1"))) {
-                    ShiroUser shiroUser = service.getCurrLoginUser();
-                    List<String> roles = shiroUser.getRoleTips();
-                    if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
-                        dataScope = service.getCurrUserDataScope();
-                        dataScope.setScopeName("ONEDEPTID");
-                    }
-                }
-            }
-        }
-        catch (Exception e){
-            String mes = e.getMessage().toString();
-            String mes2=mes;
-        }
-
-        results = cwsCaseService.queryByCondition(page,dataScope,queryCondition);
-
-
+        List<Map<String, Object>> results = cwsCaseService.queryByCondition(page, caseDataScope(queryCondition), queryCondition);
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
-
         return super.packForBT(page);
     }
 
-
+    /**
+     * 根据案卷状态设置查询条件
+     *
+     * @param queryCondition
+     * @return
+     */
+    private QueryCondition caseQueryConditionByState(QueryCondition queryCondition) {
+        int specialQuery = 0;
+        specialQuery = queryCondition.getSpecialQuery();
+        if (specialQuery > 0) {
+            if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
+                //未超期未处置 /处置中
+                queryCondition.setProcessState("1");
+                queryCondition.setIsOvertime("0");
+            } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()) {
+                //超期未处置 //处置中
+                queryCondition.setProcessState("1");
+                queryCondition.setIsOvertime("1");
+            } else if (specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()) {
+                //超期处置 //处置完成
+                queryCondition.setProcessState("2");
+                queryCondition.setIsProcessOvertime("1");
+            } else if (specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()) {
+                //按期处置 //处置完成
+                queryCondition.setProcessState("2");
+                queryCondition.setIsProcessOvertime("0");
+            } else if (specialQuery == SpecialQueryEnum.NO_CLOSE.getState()) {
+                //未结案
+                queryCondition.setIsClose("0");
+            } else if (specialQuery == SpecialQueryEnum.REGISTERED.getState()) {
+                //已立案
+                queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState() + "");
+                //queryCondition.setRegisterTimeEnd(today);
+            }
+        }
+        return queryCondition;
+    }
 
     /**
      * 综合查询导出
      */
     @RequestMapping(value = "/export")
-//    @ResponseBody
-    public void export(QueryCondition queryCondition,HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)throws IOException  {
-        int specialQuery =0;
-        specialQuery= queryCondition.getSpecialQuery();
-        if(specialQuery>0) {
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            String today = formatter.format(new Date());
-            if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
-                //未超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("0");
-            } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()){
-                //超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()){
-                //超期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()){
-                //按期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("0");
-            }else if(specialQuery == SpecialQueryEnum.NO_CLOSE.getState()){
-                //未结案
-                queryCondition.setIsClose("0");
-            }else if(specialQuery == SpecialQueryEnum.REGISTERED.getState()){
-                //已立案
-                queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+"");
-                //queryCondition.setRegisterTimeEnd(today);
-            }
-        }
-
-        List<Map<String, Object>> results =  queryExportByCondition(queryCondition);
+    public void export(QueryCondition queryCondition, HttpServletResponse httpServletResponse) throws IOException {
+        List<Map<String, Object>> results = queryExportByCondition(caseQueryConditionByState(queryCondition));
         FileInputStream fileInputStream = null;
         if (ToolUtil.isEmpty(results)) {
-            fileInputStream = new FileInputStream(templatePath + "/accessEmpty.xlsx");
+            fileInputStream = new FileInputStream(templatePath + "/temp/accessEmpty.xlsx");
         } else {
-            fileInputStream = new FileInputStream(templatePath + "/caseRecTemplate.xlsx");
+            fileInputStream = new FileInputStream(templatePath + "/temp/caseRecTemplate.xlsx");
         }
-
         try {
             httpServletResponse.setContentType("application/octet-stream");
             httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "caseRecTemplate.xlsx");
-
             Map<String, Object> var = new HashMap<>();
             var.put("标题", "案卷综合查询一览表");
             var.put("list", results);
             ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var);
-
         } catch (IOException e) {
             e.printStackTrace();
         } catch (Exception e) {
@@ -936,27 +878,24 @@
         }
     }
 
-
-    public List<Map<String,Object>> queryExportByCondition(QueryCondition queryCondition){
-        List<Map<String,Object>> results = null;
-        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-        page.setLimit(maxRowsExcel);
-        page.setSize(maxRowsExcel);
-        page.setOffset(0);
-        page.setSearchCount(false);
-        DataScope dataScope =null;
+    /**
+     * 案卷查询权限判定
+     *
+     * @param queryCondition
+     * @return
+     */
+    private DataScope caseDataScope(QueryCondition queryCondition) {
+        DataScope dataScope = null;
         try {
             if (queryCondition.isDataScope() == true) {
                 dataScope = service.getCurrUserDataScope();
                 dataScope.setScopeName("ONEDEPTID");
-            }
-            else {
+            } else {
                 String isRevisit = queryCondition.getIsRevisit();
                 String isOvertime = queryCondition.getIsOvertime();
                 String caseLevel = queryCondition.getCaseLevel();
-
                 //回访、超时、紧急案件的查询需要判断是否有数据权限
-                if ((isRevisit != null && isRevisit.equals("1"))|| (isOvertime != null && isOvertime.equals("1"))|| (caseLevel != null && caseLevel.equals("1"))) {
+                if ((isRevisit != null && isRevisit.equals(Const.ONE)) || (isOvertime != null && isOvertime.equals(Const.ONE)) || (caseLevel != null && caseLevel.equals(Const.ONE))) {
                     ShiroUser shiroUser = service.getCurrLoginUser();
                     List<String> roles = shiroUser.getRoleTips();
                     if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
@@ -965,13 +904,28 @@
                     }
                 }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        catch (Exception e){
-            String mes = e.getMessage().toString();
-        }
-        results = cwsCaseService.queryByCondition(page,dataScope,queryCondition);
+        return dataScope;
+    }
+
+    /**
+     * 导出数据检索条件
+     *
+     * @param queryCondition
+     * @return
+     */
+    public List<Map<String, Object>> queryExportByCondition(QueryCondition queryCondition) {
+        List<Map<String, Object>> results = null;
+        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+        page.setLimit(maxRowsExcel);
+        page.setSize(maxRowsExcel);
+        page.setOffset(0);
+        page.setSearchCount(false);
+        results = cwsCaseService.queryByCondition(page, caseDataScope(queryCondition), queryCondition);
         new CwsCaseWarpper(results).warp();
-        return  results;
+        return results;
     }
 
 }
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/ProcessDetailController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/ProcessDetailController.java
index aec815c..09fc603 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/ProcessDetailController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/ProcessDetailController.java
@@ -24,11 +24,9 @@
 @RequestMapping("/processDetail")
 public class ProcessDetailController extends BaseController {
 
-
     @Autowired
     private IProcessDetailService processDetailService;
 
-
     /**
      * 获取列表
      */
@@ -89,18 +87,4 @@
         processDetailService.updateById(processDetail);
         return ResponseData.success();
     }
-
-    /**
-     * 详情
-     */
-    @RequestMapping(value = "/detail/{processDetailId}")
-    @ResponseBody
-    public Object detail(@PathVariable("processDetailId") String processDetailId) {
-//        ResultData<ProcessDetail> resultData = new ResultData<ProcessDetail>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(processDetailService.selectById(processDetailId));
-//        return resultData;
-        return ResponseData.success();
-    }
 }
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java
index 4be9366..fe49638 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java
@@ -20,9 +20,12 @@
 import com.casic.missiles.modular.cwscase.service.IStatusService;
 import com.casic.missiles.modular.dictexpand.service.IDictExpandService;
 import com.casic.missiles.modular.enums.CaseStateEnum;
+import com.casic.missiles.modular.enums.CwsRoleEnums;
 import com.casic.missiles.modular.enums.SourceEnum;
 import com.casic.missiles.modular.flowable.dto.ProcessDcmsDto;
+import com.casic.missiles.modular.flowable.dto.ProcessUserDTO;
 import com.casic.missiles.modular.flowable.service.ICaseFlowService;
+import com.casic.missiles.modular.flowable.service.ICommonWorkflowService;
 import com.casic.missiles.modular.system.model.Area;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -66,6 +69,8 @@
     private IStatusService statusService;
     @Autowired
     private IProcessDetailService processDetailService;
+    @Autowired
+    private ICommonWorkflowService workflowService;
 
     @Override
     public Integer countCaseToday() {
@@ -332,7 +337,7 @@
 
         for (Map<String, Object> map : results) {
             String createUserName = "";
-
+            currProcessing(map);
             //大小类
             map = warpper(map);
 
@@ -471,6 +476,8 @@
     public List<Map<String, Object>> workList(Page page, String groupId, String onedeptid, String actUserId, QueryCondition queryCondition) {
         List<Map<String, Object>> results = this.baseMapper.workList(page, groupId, onedeptid, actUserId, queryCondition);
         for (Map<String, Object> map : results) {
+            //当前处理情况设置
+            currProcessing(map);
             //大小类
             map = warpper(map);
 
@@ -478,10 +485,40 @@
         return results;
     }
 
+    private void currProcessing(Map<String, Object> map) {
+        //设置当前处理用户信息
+        Object processId = map.get("processId");
+        if (ToolUtil.isNotEmpty(processId)) {
+            ProcessUserDTO userDto = workflowService.queryIdentityLinks(String.valueOf(processId));
+            if (userDto != null) {
+                if (ToolUtil.isNotEmpty(userDto.getUserId())) {
+                    map.put("currUserId", userDto.getUserId());
+                    map.put("currUserName", service.getUserById(userDto.getUserId(), null).getName());
+                }
+                for (String group : userDto.getGroups()) {
+                    //角色分组数据
+                    String roleName = CwsRoleEnums.ADMINISTRATOR.getRoleNameByTip(group);
+                    if (ToolUtil.isNotEmpty(roleName)) {
+                        map.put("currRoleName", roleName);
+                        map.put("currRoleId", group);
+                    } else {
+                        String deptName = service.getDeptName(group);
+                        if (ToolUtil.isNotEmpty(deptName)) {
+                            map.put("currDeptId", group);
+                            map.put("currDeptName", deptName);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     @Override
     public List<Map<String, Object>> completedList(Page page, String actUserId, QueryCondition queryCondition) {
         List<Map<String, Object>> results = this.baseMapper.completedList(page, actUserId, queryCondition);
         for (Map<String, Object> map : results) {
+            //当前处理情况设置
+            currProcessing(map);
             //大小类
             map = warpper(map);
 
@@ -491,6 +528,7 @@
 
     /**
      * 案件撤销
+     *
      * @param bizId 案卷ID
      */
     @Override
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java
index 08d54a6..69bfa10 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java
@@ -133,7 +133,7 @@
     }
 
     /**
-     * 根据小时、分钟计算截止时间，一般案件按每天的实际工时算，紧急案件按自然时间算
+     * 根据小时,分钟计算截止时间，一般案件按每天的实际工时算，紧急案件按自然时间算
      *
      * @param caseLevel 案卷等级
      * @param beginTime 计算的开始时间（"yyyy-MM-dd HH:mm:ss"），非延期时，就是当前时间，延期时，则是延期前的截止时间
@@ -173,9 +173,10 @@
             }
         }
 
-        //计算每天的工作时长
-        Long diff1 = (endAM.getTime() - startAM.getTime()) / (1000 * 60);//上午上班时长（分钟数）
-        Long diff2 = (endPM.getTime() - startPM.getTime()) / (1000 * 60);//下午上班时长（分钟数）
+        //计算每天的工作时长 上午上班时长（分钟数）
+        Long diff1 = (endAM.getTime() - startAM.getTime()) / (1000 * 60);
+        //下午上班时长（分钟数）
+        Long diff2 = (endPM.getTime() - startPM.getTime()) / (1000 * 60);
         //当天剩余的中午休息时长（分钟数）
         int inter = 0;
         if ((beginTime.before(startPM)||beginTime.equals(startPM)) && (beginTime.after(endAM)||beginTime.equals(endAM))) {
@@ -230,7 +231,7 @@
                         beginCal.add(Calendar.DATE, -1);
                     }
                 }
-//                beginCal.add(Calendar.DATE, addDay);
+                beginCal.add(Calendar.DATE, addDay);
                 beginCal.add(Calendar.MINUTE, addMin);
                 Timestamp endTime0 = new Timestamp(beginCal.getTimeInMillis());
                 //如果截止时间在下午，则需要往后推迟中午的休息时长
diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/FlowDcmsUserFactory.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/FlowDcmsUserFactory.java
index 8f0089b..1099366 100644
--- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/FlowDcmsUserFactory.java
+++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/FlowDcmsUserFactory.java
@@ -20,12 +20,12 @@
     public static FlowUserDto createFlowUser(ShiroUser shiroUser) {
         FlowUserDto dto = new FlowUserDto();
         //非登录立案案件
-        if(shiroUser==null){
+        if (shiroUser == null) {
             return dto;
         }
         dto.setUserId(String.valueOf(shiroUser.getId()));
         dto.setDeptId(String.valueOf(shiroUser.getDeptId()));
-        List<String> cwsTips = CwsRoleEnums.getTips();
+        List<String> cwsTips = CwsRoleEnums.ADMINISTRATOR.getTips();
         for (String roleTip : shiroUser.getRoleTips()) {
             if (cwsTips.contains(roleTip)) {
                 dto.setRoleTip(roleTip);

diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
index 5edda35..2466e9a 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.common.constant.Const;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
@@ -29,8 +30,6 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -56,6 +55,7 @@
     private int maxRowsExcel;
     @Value("${casic.config.config-path}")
     private String templatePath;
+
     /**
      * 获取列表
      */
@@ -73,30 +73,32 @@
     public Object listPage(String condition) {
         Page<CwsCase> page = new PageFactory<CwsCase>().defaultPage();
         EntityWrapper<CwsCase> query = new EntityWrapper<>();
-        page =  cwsCaseService.selectPage(page,query);
+        page = cwsCaseService.selectPage(page, query);
         return super.packForBT(page);
     }
+
     /**
      * 新增-pc
      */
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, HttpServletRequest request) {
-        if(cwsCaseService.createNewPC(cwsCase,isNeedVerify,isNeedRevisit,bzhours,bzminis,verifyPersonId)){
+        if (cwsCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId)) {
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("服务器异常");
         }
     }
+
     /**
      * 新增-app
      */
     @RequestMapping(value = "/addAPP")
     @ResponseBody
     public Object addAPP(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, HttpServletRequest request) {
-        if(cwsCaseService.createNewAPP(cwsCase,isNeedVerify,isNeedRevisit,bzhours,bzminis,verifyPersonId)){
+        if (cwsCaseService.createNewAPP(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId)) {
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("服务器异常");
         }
     }
@@ -107,9 +109,9 @@
     @RequestMapping(value = "/addWeChat")
     @ResponseBody
     public Object addWeChat(CwsCase cwsCase, Integer isNeedRevisit, HttpServletRequest request) {
-        if(cwsCaseService.createNewWeChat(cwsCase,isNeedRevisit)){
+        if (cwsCaseService.createNewWeChat(cwsCase, isNeedRevisit)) {
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("服务器异常");
         }
     }
@@ -151,7 +153,7 @@
     @RequestMapping(value = "/detail/{id}")
     @ResponseBody
     public Object detail(@PathVariable("id") String id) {
-        List<Map<String,Object>> results = cwsCaseService.caseDetailById(Long.valueOf(id));
+        List<Map<String, Object>> results = cwsCaseService.caseDetailById(Long.valueOf(id));
         new CwsCaseWarpper(results).warp();
         return ResponseData.success(results);
     }
@@ -175,10 +177,10 @@
     @ResponseBody
     public Object historyByPhoneListPage(String reporterPhone) {
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
-        results = cwsCaseService.historyByPhone(page,reporterPhone);
+        results = cwsCaseService.historyByPhone(page, reporterPhone);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -205,7 +207,7 @@
 //        }
 
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         //待核实状态案卷
@@ -215,11 +217,11 @@
         //如果是app的监督员访问此接口，则需按人员过滤数据权限，获取监督员id
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
-        if(roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())){
+        if (roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
-            results = cwsCaseService.workList(page,null,null,actUserId,queryCondition);
-        }else { //pc端的监督指挥系统查看待核实案卷
-            results = cwsCaseService.workList(page,null,null,null,queryCondition);
+            results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
+        } else { //pc端的监督指挥系统查看待核实案卷
+            results = cwsCaseService.workList(page, null, null, null, queryCondition);
         }
 
         new CwsCaseWarpper(results).warp();
@@ -241,9 +243,9 @@
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
         List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) count = results.size() + "";
         return ResponseData.success(count);
     }
 
@@ -254,14 +256,14 @@
     @RequestMapping(value = "/verifiedListPage")
     @ResponseBody
     public Object verifiedListPage() {
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        QueryCondition queryCondition=new QueryCondition();
+        QueryCondition queryCondition = new QueryCondition();
         queryCondition.setVerifyPersonId(actUserId);
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -278,7 +280,7 @@
     public Object toRegisterListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_REGISTERED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>>  results = queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -290,7 +292,7 @@
     public Object preRegisterListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.PRE_REGISTER.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -302,7 +304,7 @@
     public Object toDistributeListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_DISTRIBUTED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -316,9 +318,9 @@
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
         List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) count = results.size() + "";
         return ResponseData.success(count);
     }
 
@@ -330,7 +332,7 @@
     public Object preDistributeListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.PRE_DISTRIBUTE.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -343,7 +345,7 @@
         int caseState = CaseStateEnum.TO_BE_HANDLED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -357,21 +359,20 @@
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
         List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) count = results.size() + "";
         return ResponseData.success(count);
     }
 
 
-
     /**
      * 待处理分页查询，即app处理待办
      */
     @RequestMapping(value = "/toHandleListPage")
     @ResponseBody
-    public Object toHandleListPage(String isOvertime,String isEmergent) {
-        List<Map<String,Object>> results = null;
+    public Object toHandleListPage(String isOvertime, String isEmergent) {
+
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         //待处理状态案卷
@@ -379,30 +380,33 @@
         queryCondition.setCaseState(String.valueOf(CaseStateEnum.APP_HANDLE.getState()));
 
         //超时案卷
-        if(isOvertime!=null&&isOvertime.equals("1")){
+        if (isOvertime != null && isOvertime.equals("1")) {
             queryCondition.setIsOvertime("1");
         }
 
         //紧急案卷
-        if(isEmergent!=null&&isEmergent.equals("1")){
+        if (isEmergent != null && isEmergent.equals("1")) {
             queryCondition.setCaseLevel(String.valueOf(CaseLevelEnum.EMERGENT.getState()));
         }
 
         //app的处置人员访问
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
-        if(roles.contains(CwsRoleEnums.PROCESS.getRoleTip())){
+        List<Map<String, Object>> results = null;
+
+        if (roles.contains(CwsRoleEnums.PROCESS.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
-            results = cwsCaseService.workList(page,null,null,actUserId,queryCondition);
+            results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
         } else {
             //pc端的监督指挥系统查看处理中案卷
-            results = cwsCaseService.workList(page,null,null,null,queryCondition);
+            results = cwsCaseService.workList(page, null, null, null, queryCondition);
         }
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
 
         return ResponseData.success(super.packForBT(page));
     }
+
     /**
      * 已处理分页查询，即app处理已办
      */
@@ -410,14 +414,14 @@
     @ResponseBody
     public Object handledListPage() {
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        QueryCondition queryCondition=new QueryCondition();
+        QueryCondition queryCondition = new QueryCondition();
         queryCondition.setProcessPersonid(actUserId);
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -434,7 +438,7 @@
     public Object handleAuditListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.HANDLE_AUDIT.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -446,7 +450,7 @@
     public Object toDisCheckListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_CHECKED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -456,7 +460,7 @@
     @RequestMapping(value = "/toCheckListPage")
     @ResponseBody
     public Object toCheckListPage() {
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         //待核查状态案卷
@@ -466,7 +470,7 @@
         //app监督员访问接口
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
-        if(roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
+        if (roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
             results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
         }
@@ -489,10 +493,11 @@
         int caseState = CaseStateEnum.CHECK_SCENE.getState();
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
-        List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        List<Map<String, Object>> results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) {
+            count = results.size() + "";
+        }
         return ResponseData.success(count);
     }
 
@@ -503,14 +508,14 @@
     @ResponseBody
     public Object checkedListPage() {
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        QueryCondition queryCondition=new QueryCondition();
+        QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCheckPersonId(actUserId);
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -526,8 +531,8 @@
     public Object toFinishListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_CLOSED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
-        return ResponseData.success(results );
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
+        return ResponseData.success(results);
     }
 
     /**
@@ -538,7 +543,7 @@
     public Object toChangeListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_ADJUSTED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -550,7 +555,7 @@
     public Object toAdjustInstructionListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.HANDLE_MAN_FEEDBACK_ADJUSTMENT.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -565,7 +570,7 @@
 
         //部门权限
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -576,9 +581,11 @@
     @ResponseBody
     public Object toDeptAdjustInstructionListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.HANDLE_MAN_FEEDBACK_DELAY.getState();
-        queryCondition.setCaseState(String.valueOf(caseState));//申请延期
-        queryCondition.setCaseState2(CaseStateEnum.HANDLE_MAN_FEEDBACK_POSTPONE.getState()+"");//申请缓办
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        //申请延期
+        queryCondition.setCaseState(String.valueOf(caseState));
+        //申请缓办
+        queryCondition.setCaseState2(CaseStateEnum.HANDLE_MAN_FEEDBACK_POSTPONE.getState() + "");
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -592,7 +599,7 @@
         queryCondition.setCaseState(String.valueOf(caseState));
         //部门权限
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -606,7 +613,7 @@
         int caseState = CaseStateEnum.TO_BE_HANDLED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsPostpone("1");
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -619,7 +626,7 @@
         int caseState = CaseStateEnum.TO_BE_HANDLED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsDelay("1");
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -633,7 +640,7 @@
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsPostpone("1");
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -647,7 +654,7 @@
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsDelay("1");
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -662,7 +669,7 @@
         //未完成案卷
         queryCondition.setIsComplete("0");
 
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -673,7 +680,7 @@
     @ResponseBody
     public Object isRevisitListPage(QueryCondition queryCondition) {
         queryCondition.setIsRevisit("1");
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -693,111 +700,73 @@
         //未完成案卷
         queryCondition.setIsComplete("0");
 
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
-
-
     /**
      * “超期查询”查询条件列表
      */
     @RequestMapping(value = "/specialQueryList")
     @ResponseBody
     public Object specialQueryList() {
-        List<Map<String,Object>> results = null;
-        results = SpecialQueryEnum.toList();
-        return ResponseData.success(results);
+        return ResponseData.success(SpecialQueryEnum.toList());
     }
 
-
     /**
      * 综合查询
      */
     @RequestMapping(value = "/queryListPage")
     @ResponseBody
     public Object queryListPage(QueryCondition queryCondition) {
-        int specialQuery =0;
-        specialQuery= queryCondition.getSpecialQuery();
-        if(specialQuery>0) {
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            String today = formatter.format(new Date());
-            if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
-                //未超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("0");
-            } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()){
-                //超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()){
-                //超期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()){
-                //按期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("0");
-            }else if(specialQuery == SpecialQueryEnum.NO_CLOSE.getState()){
-                //未结案
-                queryCondition.setIsClose("0");
-            }else if(specialQuery == SpecialQueryEnum.REGISTERED.getState()){
-                //已立案
-                queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+"");
-                //queryCondition.setRegisterTimeEnd(today);
-            }
-        }
-
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
-        return ResponseData.success(results);
+        return ResponseData.success(queryByCondition(caseQueryConditionByState(queryCondition)));
     }
 
 
-
     /**
      * 待办
      */
     @RequestMapping(value = "/workListPage")
     @ResponseBody
     public Object workListPage(QueryCondition queryCondition) {
-        List<Map<String,Object>> results = null;
+
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
+        List<Map<String, Object>> results = null;
         //处置单位
-        if(roles.contains(CwsRoleEnums.ADMINISTRATOR.getRoleTip())){
-            results = cwsCaseService.workList(page,null,null,null,queryCondition);
+        if (roles.contains(CwsRoleEnums.ADMINISTRATOR.getRoleTip())) {
+            results = cwsCaseService.workList(page, null, null, null, queryCondition);
         }
         //处置单位
-        else if(roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())){
+        else if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
             String onedeptid = String.valueOf(shiroUser.getDeptId());
-            results = cwsCaseService.workList(page,null,onedeptid,null,queryCondition);
+            results = cwsCaseService.workList(page, null, onedeptid, null, queryCondition);
         }
         //处置人员、监督员
-        else if(roles.contains(CwsRoleEnums.PROCESS.getRoleTip())||roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())){
+        else if (roles.contains(CwsRoleEnums.PROCESS.getRoleTip()) || roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
-            results = cwsCaseService.workList(page,null,null,actUserId,queryCondition);
-        }
-        else{
+            results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
+        } else {
             String groupId = null;
             //指挥长
-            if(roles.contains(CwsRoleEnums.COMMANDER.getRoleTip())){
+            if (roles.contains(CwsRoleEnums.COMMANDER.getRoleTip())) {
                 groupId = CwsRoleEnums.COMMANDER.getRoleTip();
             }
             //派遣员
-            else if(roles.contains(CwsRoleEnums.DISPATCHER.getRoleTip())){
+            else if (roles.contains(CwsRoleEnums.DISPATCHER.getRoleTip())) {
                 groupId = CwsRoleEnums.DISPATCHER.getRoleTip();
             }
             //值班长
-            else if(roles.contains(CwsRoleEnums.MONITOR.getRoleTip())){
+            else if (roles.contains(CwsRoleEnums.MONITOR.getRoleTip())) {
                 groupId = CwsRoleEnums.MONITOR.getRoleTip();
             }
             //受理员
-            else if(roles.contains(CwsRoleEnums.RECEIVER.getRoleTip())){
+            else if (roles.contains(CwsRoleEnums.RECEIVER.getRoleTip())) {
                 groupId = CwsRoleEnums.RECEIVER.getRoleTip();
             }
-            results = cwsCaseService.workList(page,groupId,null,null,queryCondition);
+            results = cwsCaseService.workList(page, groupId, null, null, queryCondition);
         }
 
         new CwsCaseWarpper(results).warp();
@@ -813,12 +782,12 @@
     @RequestMapping(value = "/completedListPage")
     @ResponseBody
     public Object completedListPage(QueryCondition queryCondition) {
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -827,104 +796,77 @@
     }
 
 
-
-
-
-    public PageInfoBT<Map<String, Object>> queryByCondition(QueryCondition queryCondition){
-        List<Map<String,Object>> results = null;
+    /**
+     * 分页查询
+     *
+     * @param queryCondition
+     * @return
+     */
+    public PageInfoBT<Map<String, Object>> queryByCondition(QueryCondition queryCondition) {
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-        DataScope dataScope =null;
-        try {
-            if (queryCondition.isDataScope() == true) {
-                dataScope = service.getCurrUserDataScope();
-                dataScope.setScopeName("ONEDEPTID");
-            }
-            else {
-                String isRevisit = queryCondition.getIsRevisit();
-                String isOvertime = queryCondition.getIsOvertime();
-                String caseLevel = queryCondition.getCaseLevel();
-
-                //回访、超时、紧急案件的查询需要判断是否有数据权限
-                if ((isRevisit != null && isRevisit.equals("1"))|| (isOvertime != null && isOvertime.equals("1"))|| (caseLevel != null && caseLevel.equals("1"))) {
-                    ShiroUser shiroUser = service.getCurrLoginUser();
-                    List<String> roles = shiroUser.getRoleTips();
-                    if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
-                        dataScope = service.getCurrUserDataScope();
-                        dataScope.setScopeName("ONEDEPTID");
-                    }
-                }
-            }
-        }
-        catch (Exception e){
-            String mes = e.getMessage().toString();
-            String mes2=mes;
-        }
-
-        results = cwsCaseService.queryByCondition(page,dataScope,queryCondition);
-
-
+        List<Map<String, Object>> results = cwsCaseService.queryByCondition(page, caseDataScope(queryCondition), queryCondition);
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
-
         return super.packForBT(page);
     }
 
-
+    /**
+     * 根据案卷状态设置查询条件
+     *
+     * @param queryCondition
+     * @return
+     */
+    private QueryCondition caseQueryConditionByState(QueryCondition queryCondition) {
+        int specialQuery = 0;
+        specialQuery = queryCondition.getSpecialQuery();
+        if (specialQuery > 0) {
+            if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
+                //未超期未处置 /处置中
+                queryCondition.setProcessState("1");
+                queryCondition.setIsOvertime("0");
+            } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()) {
+                //超期未处置 //处置中
+                queryCondition.setProcessState("1");
+                queryCondition.setIsOvertime("1");
+            } else if (specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()) {
+                //超期处置 //处置完成
+                queryCondition.setProcessState("2");
+                queryCondition.setIsProcessOvertime("1");
+            } else if (specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()) {
+                //按期处置 //处置完成
+                queryCondition.setProcessState("2");
+                queryCondition.setIsProcessOvertime("0");
+            } else if (specialQuery == SpecialQueryEnum.NO_CLOSE.getState()) {
+                //未结案
+                queryCondition.setIsClose("0");
+            } else if (specialQuery == SpecialQueryEnum.REGISTERED.getState()) {
+                //已立案
+                queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState() + "");
+                //queryCondition.setRegisterTimeEnd(today);
+            }
+        }
+        return queryCondition;
+    }
 
     /**
      * 综合查询导出
      */
     @RequestMapping(value = "/export")
-//    @ResponseBody
-    public void export(QueryCondition queryCondition,HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)throws IOException  {
-        int specialQuery =0;
-        specialQuery= queryCondition.getSpecialQuery();
-        if(specialQuery>0) {
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            String today = formatter.format(new Date());
-            if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
-                //未超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("0");
-            } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()){
-                //超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()){
-                //超期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()){
-                //按期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("0");
-            }else if(specialQuery == SpecialQueryEnum.NO_CLOSE.getState()){
-                //未结案
-                queryCondition.setIsClose("0");
-            }else if(specialQuery == SpecialQueryEnum.REGISTERED.getState()){
-                //已立案
-                queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+"");
-                //queryCondition.setRegisterTimeEnd(today);
-            }
-        }
-
-        List<Map<String, Object>> results =  queryExportByCondition(queryCondition);
+    public void export(QueryCondition queryCondition, HttpServletResponse httpServletResponse) throws IOException {
+        List<Map<String, Object>> results = queryExportByCondition(caseQueryConditionByState(queryCondition));
         FileInputStream fileInputStream = null;
         if (ToolUtil.isEmpty(results)) {
-            fileInputStream = new FileInputStream(templatePath + "/accessEmpty.xlsx");
+            fileInputStream = new FileInputStream(templatePath + "/temp/accessEmpty.xlsx");
         } else {
-            fileInputStream = new FileInputStream(templatePath + "/caseRecTemplate.xlsx");
+            fileInputStream = new FileInputStream(templatePath + "/temp/caseRecTemplate.xlsx");
         }
-
         try {
             httpServletResponse.setContentType("application/octet-stream");
             httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "caseRecTemplate.xlsx");
-
             Map<String, Object> var = new HashMap<>();
             var.put("标题", "案卷综合查询一览表");
             var.put("list", results);
             ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var);
-
         } catch (IOException e) {
             e.printStackTrace();
         } catch (Exception e) {
@@ -936,27 +878,24 @@
         }
     }
 
-
-    public List<Map<String,Object>> queryExportByCondition(QueryCondition queryCondition){
-        List<Map<String,Object>> results = null;
-        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-        page.setLimit(maxRowsExcel);
-        page.setSize(maxRowsExcel);
-        page.setOffset(0);
-        page.setSearchCount(false);
-        DataScope dataScope =null;
+    /**
+     * 案卷查询权限判定
+     *
+     * @param queryCondition
+     * @return
+     */
+    private DataScope caseDataScope(QueryCondition queryCondition) {
+        DataScope dataScope = null;
         try {
             if (queryCondition.isDataScope() == true) {
                 dataScope = service.getCurrUserDataScope();
                 dataScope.setScopeName("ONEDEPTID");
-            }
-            else {
+            } else {
                 String isRevisit = queryCondition.getIsRevisit();
                 String isOvertime = queryCondition.getIsOvertime();
                 String caseLevel = queryCondition.getCaseLevel();
-
                 //回访、超时、紧急案件的查询需要判断是否有数据权限
-                if ((isRevisit != null && isRevisit.equals("1"))|| (isOvertime != null && isOvertime.equals("1"))|| (caseLevel != null && caseLevel.equals("1"))) {
+                if ((isRevisit != null && isRevisit.equals(Const.ONE)) || (isOvertime != null && isOvertime.equals(Const.ONE)) || (caseLevel != null && caseLevel.equals(Const.ONE))) {
                     ShiroUser shiroUser = service.getCurrLoginUser();
                     List<String> roles = shiroUser.getRoleTips();
                     if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
@@ -965,13 +904,28 @@
                     }
                 }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        catch (Exception e){
-            String mes = e.getMessage().toString();
-        }
-        results = cwsCaseService.queryByCondition(page,dataScope,queryCondition);
+        return dataScope;
+    }
+
+    /**
+     * 导出数据检索条件
+     *
+     * @param queryCondition
+     * @return
+     */
+    public List<Map<String, Object>> queryExportByCondition(QueryCondition queryCondition) {
+        List<Map<String, Object>> results = null;
+        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+        page.setLimit(maxRowsExcel);
+        page.setSize(maxRowsExcel);
+        page.setOffset(0);
+        page.setSearchCount(false);
+        results = cwsCaseService.queryByCondition(page, caseDataScope(queryCondition), queryCondition);
         new CwsCaseWarpper(results).warp();
-        return  results;
+        return results;
     }
 
 }
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/ProcessDetailController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/ProcessDetailController.java
index aec815c..09fc603 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/ProcessDetailController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/ProcessDetailController.java
@@ -24,11 +24,9 @@
 @RequestMapping("/processDetail")
 public class ProcessDetailController extends BaseController {
 
-
     @Autowired
     private IProcessDetailService processDetailService;
 
-
     /**
      * 获取列表
      */
@@ -89,18 +87,4 @@
         processDetailService.updateById(processDetail);
         return ResponseData.success();
     }
-
-    /**
-     * 详情
-     */
-    @RequestMapping(value = "/detail/{processDetailId}")
-    @ResponseBody
-    public Object detail(@PathVariable("processDetailId") String processDetailId) {
-//        ResultData<ProcessDetail> resultData = new ResultData<ProcessDetail>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(processDetailService.selectById(processDetailId));
-//        return resultData;
-        return ResponseData.success();
-    }
 }
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java
index 4be9366..fe49638 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java
@@ -20,9 +20,12 @@
 import com.casic.missiles.modular.cwscase.service.IStatusService;
 import com.casic.missiles.modular.dictexpand.service.IDictExpandService;
 import com.casic.missiles.modular.enums.CaseStateEnum;
+import com.casic.missiles.modular.enums.CwsRoleEnums;
 import com.casic.missiles.modular.enums.SourceEnum;
 import com.casic.missiles.modular.flowable.dto.ProcessDcmsDto;
+import com.casic.missiles.modular.flowable.dto.ProcessUserDTO;
 import com.casic.missiles.modular.flowable.service.ICaseFlowService;
+import com.casic.missiles.modular.flowable.service.ICommonWorkflowService;
 import com.casic.missiles.modular.system.model.Area;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -66,6 +69,8 @@
     private IStatusService statusService;
     @Autowired
     private IProcessDetailService processDetailService;
+    @Autowired
+    private ICommonWorkflowService workflowService;
 
     @Override
     public Integer countCaseToday() {
@@ -332,7 +337,7 @@
 
         for (Map<String, Object> map : results) {
             String createUserName = "";
-
+            currProcessing(map);
             //大小类
             map = warpper(map);
 
@@ -471,6 +476,8 @@
     public List<Map<String, Object>> workList(Page page, String groupId, String onedeptid, String actUserId, QueryCondition queryCondition) {
         List<Map<String, Object>> results = this.baseMapper.workList(page, groupId, onedeptid, actUserId, queryCondition);
         for (Map<String, Object> map : results) {
+            //当前处理情况设置
+            currProcessing(map);
             //大小类
             map = warpper(map);
 
@@ -478,10 +485,40 @@
         return results;
     }
 
+    private void currProcessing(Map<String, Object> map) {
+        //设置当前处理用户信息
+        Object processId = map.get("processId");
+        if (ToolUtil.isNotEmpty(processId)) {
+            ProcessUserDTO userDto = workflowService.queryIdentityLinks(String.valueOf(processId));
+            if (userDto != null) {
+                if (ToolUtil.isNotEmpty(userDto.getUserId())) {
+                    map.put("currUserId", userDto.getUserId());
+                    map.put("currUserName", service.getUserById(userDto.getUserId(), null).getName());
+                }
+                for (String group : userDto.getGroups()) {
+                    //角色分组数据
+                    String roleName = CwsRoleEnums.ADMINISTRATOR.getRoleNameByTip(group);
+                    if (ToolUtil.isNotEmpty(roleName)) {
+                        map.put("currRoleName", roleName);
+                        map.put("currRoleId", group);
+                    } else {
+                        String deptName = service.getDeptName(group);
+                        if (ToolUtil.isNotEmpty(deptName)) {
+                            map.put("currDeptId", group);
+                            map.put("currDeptName", deptName);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     @Override
     public List<Map<String, Object>> completedList(Page page, String actUserId, QueryCondition queryCondition) {
         List<Map<String, Object>> results = this.baseMapper.completedList(page, actUserId, queryCondition);
         for (Map<String, Object> map : results) {
+            //当前处理情况设置
+            currProcessing(map);
             //大小类
             map = warpper(map);
 
@@ -491,6 +528,7 @@
 
     /**
      * 案件撤销
+     *
      * @param bizId 案卷ID
      */
     @Override
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java
index 08d54a6..69bfa10 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java
@@ -133,7 +133,7 @@
     }
 
     /**
-     * 根据小时、分钟计算截止时间，一般案件按每天的实际工时算，紧急案件按自然时间算
+     * 根据小时,分钟计算截止时间，一般案件按每天的实际工时算，紧急案件按自然时间算
      *
      * @param caseLevel 案卷等级
      * @param beginTime 计算的开始时间（"yyyy-MM-dd HH:mm:ss"），非延期时，就是当前时间，延期时，则是延期前的截止时间
@@ -173,9 +173,10 @@
             }
         }
 
-        //计算每天的工作时长
-        Long diff1 = (endAM.getTime() - startAM.getTime()) / (1000 * 60);//上午上班时长（分钟数）
-        Long diff2 = (endPM.getTime() - startPM.getTime()) / (1000 * 60);//下午上班时长（分钟数）
+        //计算每天的工作时长 上午上班时长（分钟数）
+        Long diff1 = (endAM.getTime() - startAM.getTime()) / (1000 * 60);
+        //下午上班时长（分钟数）
+        Long diff2 = (endPM.getTime() - startPM.getTime()) / (1000 * 60);
         //当天剩余的中午休息时长（分钟数）
         int inter = 0;
         if ((beginTime.before(startPM)||beginTime.equals(startPM)) && (beginTime.after(endAM)||beginTime.equals(endAM))) {
@@ -230,7 +231,7 @@
                         beginCal.add(Calendar.DATE, -1);
                     }
                 }
-//                beginCal.add(Calendar.DATE, addDay);
+                beginCal.add(Calendar.DATE, addDay);
                 beginCal.add(Calendar.MINUTE, addMin);
                 Timestamp endTime0 = new Timestamp(beginCal.getTimeInMillis());
                 //如果截止时间在下午，则需要往后推迟中午的休息时长
diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/FlowDcmsUserFactory.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/FlowDcmsUserFactory.java
index 8f0089b..1099366 100644
--- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/FlowDcmsUserFactory.java
+++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/FlowDcmsUserFactory.java
@@ -20,12 +20,12 @@
     public static FlowUserDto createFlowUser(ShiroUser shiroUser) {
         FlowUserDto dto = new FlowUserDto();
         //非登录立案案件
-        if(shiroUser==null){
+        if (shiroUser == null) {
             return dto;
         }
         dto.setUserId(String.valueOf(shiroUser.getId()));
         dto.setDeptId(String.valueOf(shiroUser.getDeptId()));
-        List<String> cwsTips = CwsRoleEnums.getTips();
+        List<String> cwsTips = CwsRoleEnums.ADMINISTRATOR.getTips();
         for (String roleTip : shiroUser.getRoleTips()) {
             if (cwsTips.contains(roleTip)) {
                 dto.setRoleTip(roleTip);
diff --git a/casic-service-support/src/main/java/com/casic/missiles/modular/enums/CwsRoleEnums.java b/casic-service-support/src/main/java/com/casic/missiles/modular/enums/CwsRoleEnums.java
index c357a57..be773f0 100644
--- a/casic-service-support/src/main/java/com/casic/missiles/modular/enums/CwsRoleEnums.java
+++ b/casic-service-support/src/main/java/com/casic/missiles/modular/enums/CwsRoleEnums.java
@@ -1,19 +1,26 @@
 package com.casic.missiles.modular.enums;
 
+import com.casic.missiles.modular.flowable.enums.FlowRoleEnums;
+import org.springframework.beans.factory.annotation.Autowired;
+
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
  * 城管角色枚举
  */
-public enum CwsRoleEnums {
+public enum CwsRoleEnums implements FlowRoleEnums {
+    /**
+     *
+     */
     ADMINISTRATOR("administrator","超级管理员"),
     SUPERVISOR("supervisor", "监督员"),
     RECEIVER("receiver", "受理员"),
     DISPATCHER("dispatcher", "派遣员"),
     MONITOR("monitor", "值班长"),
     COMMANDER("commander", "指挥长"),
-    TWOLEVEL("twoLevel", "处置单位"),
+    TWOLEVEL("twoLevel", "派遣员"),
     LEADER("leader", "局领导"),
     PROCESS("process", "处置人员");
 
@@ -33,12 +40,23 @@
         return roleName;
     }
 
+    @Override
+    public String getRoleNameByTip(String tip) {
+        for (CwsRoleEnums state : values()) {
+            if (state.getRoleTip().equals(tip)) {
+                return state.roleName;
+            }
+        }
+        return null;
+    }
+
     /**
      * 获取审批角色标识集合
      *
      * @return
      */
-    public static List<String> getTips() {
+    @Override
+    public List<String> getTips() {
         List<String> tips = new ArrayList<>();
         for (CwsRoleEnums cwsRoleEnums : CwsRoleEnums.values()) {
             tips.add(cwsRoleEnums.roleTip);

diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
index 5edda35..2466e9a 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.common.constant.Const;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
@@ -29,8 +30,6 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -56,6 +55,7 @@
     private int maxRowsExcel;
     @Value("${casic.config.config-path}")
     private String templatePath;
+
     /**
      * 获取列表
      */
@@ -73,30 +73,32 @@
     public Object listPage(String condition) {
         Page<CwsCase> page = new PageFactory<CwsCase>().defaultPage();
         EntityWrapper<CwsCase> query = new EntityWrapper<>();
-        page =  cwsCaseService.selectPage(page,query);
+        page = cwsCaseService.selectPage(page, query);
         return super.packForBT(page);
     }
+
     /**
      * 新增-pc
      */
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, HttpServletRequest request) {
-        if(cwsCaseService.createNewPC(cwsCase,isNeedVerify,isNeedRevisit,bzhours,bzminis,verifyPersonId)){
+        if (cwsCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId)) {
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("服务器异常");
         }
     }
+
     /**
      * 新增-app
      */
     @RequestMapping(value = "/addAPP")
     @ResponseBody
     public Object addAPP(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, HttpServletRequest request) {
-        if(cwsCaseService.createNewAPP(cwsCase,isNeedVerify,isNeedRevisit,bzhours,bzminis,verifyPersonId)){
+        if (cwsCaseService.createNewAPP(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId)) {
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("服务器异常");
         }
     }
@@ -107,9 +109,9 @@
     @RequestMapping(value = "/addWeChat")
     @ResponseBody
     public Object addWeChat(CwsCase cwsCase, Integer isNeedRevisit, HttpServletRequest request) {
-        if(cwsCaseService.createNewWeChat(cwsCase,isNeedRevisit)){
+        if (cwsCaseService.createNewWeChat(cwsCase, isNeedRevisit)) {
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("服务器异常");
         }
     }
@@ -151,7 +153,7 @@
     @RequestMapping(value = "/detail/{id}")
     @ResponseBody
     public Object detail(@PathVariable("id") String id) {
-        List<Map<String,Object>> results = cwsCaseService.caseDetailById(Long.valueOf(id));
+        List<Map<String, Object>> results = cwsCaseService.caseDetailById(Long.valueOf(id));
         new CwsCaseWarpper(results).warp();
         return ResponseData.success(results);
     }
@@ -175,10 +177,10 @@
     @ResponseBody
     public Object historyByPhoneListPage(String reporterPhone) {
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
-        results = cwsCaseService.historyByPhone(page,reporterPhone);
+        results = cwsCaseService.historyByPhone(page, reporterPhone);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -205,7 +207,7 @@
 //        }
 
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         //待核实状态案卷
@@ -215,11 +217,11 @@
         //如果是app的监督员访问此接口，则需按人员过滤数据权限，获取监督员id
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
-        if(roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())){
+        if (roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
-            results = cwsCaseService.workList(page,null,null,actUserId,queryCondition);
-        }else { //pc端的监督指挥系统查看待核实案卷
-            results = cwsCaseService.workList(page,null,null,null,queryCondition);
+            results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
+        } else { //pc端的监督指挥系统查看待核实案卷
+            results = cwsCaseService.workList(page, null, null, null, queryCondition);
         }
 
         new CwsCaseWarpper(results).warp();
@@ -241,9 +243,9 @@
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
         List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) count = results.size() + "";
         return ResponseData.success(count);
     }
 
@@ -254,14 +256,14 @@
     @RequestMapping(value = "/verifiedListPage")
     @ResponseBody
     public Object verifiedListPage() {
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        QueryCondition queryCondition=new QueryCondition();
+        QueryCondition queryCondition = new QueryCondition();
         queryCondition.setVerifyPersonId(actUserId);
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -278,7 +280,7 @@
     public Object toRegisterListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_REGISTERED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>>  results = queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -290,7 +292,7 @@
     public Object preRegisterListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.PRE_REGISTER.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -302,7 +304,7 @@
     public Object toDistributeListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_DISTRIBUTED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -316,9 +318,9 @@
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
         List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) count = results.size() + "";
         return ResponseData.success(count);
     }
 
@@ -330,7 +332,7 @@
     public Object preDistributeListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.PRE_DISTRIBUTE.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -343,7 +345,7 @@
         int caseState = CaseStateEnum.TO_BE_HANDLED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -357,21 +359,20 @@
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
         List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) count = results.size() + "";
         return ResponseData.success(count);
     }
 
 
-
     /**
      * 待处理分页查询，即app处理待办
      */
     @RequestMapping(value = "/toHandleListPage")
     @ResponseBody
-    public Object toHandleListPage(String isOvertime,String isEmergent) {
-        List<Map<String,Object>> results = null;
+    public Object toHandleListPage(String isOvertime, String isEmergent) {
+
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         //待处理状态案卷
@@ -379,30 +380,33 @@
         queryCondition.setCaseState(String.valueOf(CaseStateEnum.APP_HANDLE.getState()));
 
         //超时案卷
-        if(isOvertime!=null&&isOvertime.equals("1")){
+        if (isOvertime != null && isOvertime.equals("1")) {
             queryCondition.setIsOvertime("1");
         }
 
         //紧急案卷
-        if(isEmergent!=null&&isEmergent.equals("1")){
+        if (isEmergent != null && isEmergent.equals("1")) {
             queryCondition.setCaseLevel(String.valueOf(CaseLevelEnum.EMERGENT.getState()));
         }
 
         //app的处置人员访问
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
-        if(roles.contains(CwsRoleEnums.PROCESS.getRoleTip())){
+        List<Map<String, Object>> results = null;
+
+        if (roles.contains(CwsRoleEnums.PROCESS.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
-            results = cwsCaseService.workList(page,null,null,actUserId,queryCondition);
+            results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
         } else {
             //pc端的监督指挥系统查看处理中案卷
-            results = cwsCaseService.workList(page,null,null,null,queryCondition);
+            results = cwsCaseService.workList(page, null, null, null, queryCondition);
         }
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
 
         return ResponseData.success(super.packForBT(page));
     }
+
     /**
      * 已处理分页查询，即app处理已办
      */
@@ -410,14 +414,14 @@
     @ResponseBody
     public Object handledListPage() {
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        QueryCondition queryCondition=new QueryCondition();
+        QueryCondition queryCondition = new QueryCondition();
         queryCondition.setProcessPersonid(actUserId);
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -434,7 +438,7 @@
     public Object handleAuditListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.HANDLE_AUDIT.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -446,7 +450,7 @@
     public Object toDisCheckListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_CHECKED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -456,7 +460,7 @@
     @RequestMapping(value = "/toCheckListPage")
     @ResponseBody
     public Object toCheckListPage() {
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         //待核查状态案卷
@@ -466,7 +470,7 @@
         //app监督员访问接口
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
-        if(roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
+        if (roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
             results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
         }
@@ -489,10 +493,11 @@
         int caseState = CaseStateEnum.CHECK_SCENE.getState();
         QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCaseState(String.valueOf(caseState));
-        List<Map<String, Object>> results = null;
-        results = cwsCaseService.queryByCondition(null,queryCondition);
-        String count="";
-        if(results!=null) count = results.size()+"";
+        List<Map<String, Object>> results = cwsCaseService.queryByCondition(null, queryCondition);
+        String count = "";
+        if (results != null) {
+            count = results.size() + "";
+        }
         return ResponseData.success(count);
     }
 
@@ -503,14 +508,14 @@
     @ResponseBody
     public Object checkedListPage() {
 
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        QueryCondition queryCondition=new QueryCondition();
+        QueryCondition queryCondition = new QueryCondition();
         queryCondition.setCheckPersonId(actUserId);
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -526,8 +531,8 @@
     public Object toFinishListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_CLOSED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
-        return ResponseData.success(results );
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
+        return ResponseData.success(results);
     }
 
     /**
@@ -538,7 +543,7 @@
     public Object toChangeListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.TO_BE_ADJUSTED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -550,7 +555,7 @@
     public Object toAdjustInstructionListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.HANDLE_MAN_FEEDBACK_ADJUSTMENT.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -565,7 +570,7 @@
 
         //部门权限
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -576,9 +581,11 @@
     @ResponseBody
     public Object toDeptAdjustInstructionListPage(QueryCondition queryCondition) {
         int caseState = CaseStateEnum.HANDLE_MAN_FEEDBACK_DELAY.getState();
-        queryCondition.setCaseState(String.valueOf(caseState));//申请延期
-        queryCondition.setCaseState2(CaseStateEnum.HANDLE_MAN_FEEDBACK_POSTPONE.getState()+"");//申请缓办
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        //申请延期
+        queryCondition.setCaseState(String.valueOf(caseState));
+        //申请缓办
+        queryCondition.setCaseState2(CaseStateEnum.HANDLE_MAN_FEEDBACK_POSTPONE.getState() + "");
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -592,7 +599,7 @@
         queryCondition.setCaseState(String.valueOf(caseState));
         //部门权限
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -606,7 +613,7 @@
         int caseState = CaseStateEnum.TO_BE_HANDLED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsPostpone("1");
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -619,7 +626,7 @@
         int caseState = CaseStateEnum.TO_BE_HANDLED.getState();
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsDelay("1");
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -633,7 +640,7 @@
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsPostpone("1");
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -647,7 +654,7 @@
         queryCondition.setCaseState(String.valueOf(caseState));
         queryCondition.setIsDelay("1");
         queryCondition.setDataScope(true);
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -662,7 +669,7 @@
         //未完成案卷
         queryCondition.setIsComplete("0");
 
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -673,7 +680,7 @@
     @ResponseBody
     public Object isRevisitListPage(QueryCondition queryCondition) {
         queryCondition.setIsRevisit("1");
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
@@ -693,111 +700,73 @@
         //未完成案卷
         queryCondition.setIsComplete("0");
 
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
+        PageInfoBT<Map<String, Object>> results = queryByCondition(queryCondition);
         return ResponseData.success(results);
     }
 
-
-
     /**
      * “超期查询”查询条件列表
      */
     @RequestMapping(value = "/specialQueryList")
     @ResponseBody
     public Object specialQueryList() {
-        List<Map<String,Object>> results = null;
-        results = SpecialQueryEnum.toList();
-        return ResponseData.success(results);
+        return ResponseData.success(SpecialQueryEnum.toList());
     }
 
-
     /**
      * 综合查询
      */
     @RequestMapping(value = "/queryListPage")
     @ResponseBody
     public Object queryListPage(QueryCondition queryCondition) {
-        int specialQuery =0;
-        specialQuery= queryCondition.getSpecialQuery();
-        if(specialQuery>0) {
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            String today = formatter.format(new Date());
-            if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
-                //未超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("0");
-            } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()){
-                //超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()){
-                //超期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()){
-                //按期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("0");
-            }else if(specialQuery == SpecialQueryEnum.NO_CLOSE.getState()){
-                //未结案
-                queryCondition.setIsClose("0");
-            }else if(specialQuery == SpecialQueryEnum.REGISTERED.getState()){
-                //已立案
-                queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+"");
-                //queryCondition.setRegisterTimeEnd(today);
-            }
-        }
-
-        PageInfoBT<Map<String, Object>> results =  queryByCondition(queryCondition);
-        return ResponseData.success(results);
+        return ResponseData.success(queryByCondition(caseQueryConditionByState(queryCondition)));
     }
 
 
-
     /**
      * 待办
      */
     @RequestMapping(value = "/workListPage")
     @ResponseBody
     public Object workListPage(QueryCondition queryCondition) {
-        List<Map<String,Object>> results = null;
+
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
+        List<Map<String, Object>> results = null;
         //处置单位
-        if(roles.contains(CwsRoleEnums.ADMINISTRATOR.getRoleTip())){
-            results = cwsCaseService.workList(page,null,null,null,queryCondition);
+        if (roles.contains(CwsRoleEnums.ADMINISTRATOR.getRoleTip())) {
+            results = cwsCaseService.workList(page, null, null, null, queryCondition);
         }
         //处置单位
-        else if(roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())){
+        else if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
             String onedeptid = String.valueOf(shiroUser.getDeptId());
-            results = cwsCaseService.workList(page,null,onedeptid,null,queryCondition);
+            results = cwsCaseService.workList(page, null, onedeptid, null, queryCondition);
         }
         //处置人员、监督员
-        else if(roles.contains(CwsRoleEnums.PROCESS.getRoleTip())||roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())){
+        else if (roles.contains(CwsRoleEnums.PROCESS.getRoleTip()) || roles.contains(CwsRoleEnums.SUPERVISOR.getRoleTip())) {
             String actUserId = String.valueOf(shiroUser.getId());
-            results = cwsCaseService.workList(page,null,null,actUserId,queryCondition);
-        }
-        else{
+            results = cwsCaseService.workList(page, null, null, actUserId, queryCondition);
+        } else {
             String groupId = null;
             //指挥长
-            if(roles.contains(CwsRoleEnums.COMMANDER.getRoleTip())){
+            if (roles.contains(CwsRoleEnums.COMMANDER.getRoleTip())) {
                 groupId = CwsRoleEnums.COMMANDER.getRoleTip();
             }
             //派遣员
-            else if(roles.contains(CwsRoleEnums.DISPATCHER.getRoleTip())){
+            else if (roles.contains(CwsRoleEnums.DISPATCHER.getRoleTip())) {
                 groupId = CwsRoleEnums.DISPATCHER.getRoleTip();
             }
             //值班长
-            else if(roles.contains(CwsRoleEnums.MONITOR.getRoleTip())){
+            else if (roles.contains(CwsRoleEnums.MONITOR.getRoleTip())) {
                 groupId = CwsRoleEnums.MONITOR.getRoleTip();
             }
             //受理员
-            else if(roles.contains(CwsRoleEnums.RECEIVER.getRoleTip())){
+            else if (roles.contains(CwsRoleEnums.RECEIVER.getRoleTip())) {
                 groupId = CwsRoleEnums.RECEIVER.getRoleTip();
             }
-            results = cwsCaseService.workList(page,groupId,null,null,queryCondition);
+            results = cwsCaseService.workList(page, groupId, null, null, queryCondition);
         }
 
         new CwsCaseWarpper(results).warp();
@@ -813,12 +782,12 @@
     @RequestMapping(value = "/completedListPage")
     @ResponseBody
     public Object completedListPage(QueryCondition queryCondition) {
-        List<Map<String,Object>> results = null;
+        List<Map<String, Object>> results = null;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
         ShiroUser shiroUser = service.getCurrLoginUser();
         String actUserId = String.valueOf(shiroUser.getId());
-        results = cwsCaseService.completedList(page,actUserId,queryCondition);
+        results = cwsCaseService.completedList(page, actUserId, queryCondition);
 
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
@@ -827,104 +796,77 @@
     }
 
 
-
-
-
-    public PageInfoBT<Map<String, Object>> queryByCondition(QueryCondition queryCondition){
-        List<Map<String,Object>> results = null;
+    /**
+     * 分页查询
+     *
+     * @param queryCondition
+     * @return
+     */
+    public PageInfoBT<Map<String, Object>> queryByCondition(QueryCondition queryCondition) {
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-        DataScope dataScope =null;
-        try {
-            if (queryCondition.isDataScope() == true) {
-                dataScope = service.getCurrUserDataScope();
-                dataScope.setScopeName("ONEDEPTID");
-            }
-            else {
-                String isRevisit = queryCondition.getIsRevisit();
-                String isOvertime = queryCondition.getIsOvertime();
-                String caseLevel = queryCondition.getCaseLevel();
-
-                //回访、超时、紧急案件的查询需要判断是否有数据权限
-                if ((isRevisit != null && isRevisit.equals("1"))|| (isOvertime != null && isOvertime.equals("1"))|| (caseLevel != null && caseLevel.equals("1"))) {
-                    ShiroUser shiroUser = service.getCurrLoginUser();
-                    List<String> roles = shiroUser.getRoleTips();
-                    if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
-                        dataScope = service.getCurrUserDataScope();
-                        dataScope.setScopeName("ONEDEPTID");
-                    }
-                }
-            }
-        }
-        catch (Exception e){
-            String mes = e.getMessage().toString();
-            String mes2=mes;
-        }
-
-        results = cwsCaseService.queryByCondition(page,dataScope,queryCondition);
-
-
+        List<Map<String, Object>> results = cwsCaseService.queryByCondition(page, caseDataScope(queryCondition), queryCondition);
         new CwsCaseWarpper(results).warp();
         page.setRecords(results);
-
         return super.packForBT(page);
     }
 
-
+    /**
+     * 根据案卷状态设置查询条件
+     *
+     * @param queryCondition
+     * @return
+     */
+    private QueryCondition caseQueryConditionByState(QueryCondition queryCondition) {
+        int specialQuery = 0;
+        specialQuery = queryCondition.getSpecialQuery();
+        if (specialQuery > 0) {
+            if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
+                //未超期未处置 /处置中
+                queryCondition.setProcessState("1");
+                queryCondition.setIsOvertime("0");
+            } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()) {
+                //超期未处置 //处置中
+                queryCondition.setProcessState("1");
+                queryCondition.setIsOvertime("1");
+            } else if (specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()) {
+                //超期处置 //处置完成
+                queryCondition.setProcessState("2");
+                queryCondition.setIsProcessOvertime("1");
+            } else if (specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()) {
+                //按期处置 //处置完成
+                queryCondition.setProcessState("2");
+                queryCondition.setIsProcessOvertime("0");
+            } else if (specialQuery == SpecialQueryEnum.NO_CLOSE.getState()) {
+                //未结案
+                queryCondition.setIsClose("0");
+            } else if (specialQuery == SpecialQueryEnum.REGISTERED.getState()) {
+                //已立案
+                queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState() + "");
+                //queryCondition.setRegisterTimeEnd(today);
+            }
+        }
+        return queryCondition;
+    }
 
     /**
      * 综合查询导出
      */
     @RequestMapping(value = "/export")
-//    @ResponseBody
-    public void export(QueryCondition queryCondition,HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)throws IOException  {
-        int specialQuery =0;
-        specialQuery= queryCondition.getSpecialQuery();
-        if(specialQuery>0) {
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            String today = formatter.format(new Date());
-            if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
-                //未超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("0");
-            } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()){
-                //超期未处置
-                queryCondition.setProcessState("1");//处置中
-                queryCondition.setIsOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()){
-                //超期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("1");
-            }else if(specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()){
-                //按期处置
-                queryCondition.setProcessState("2");//处置完成
-                queryCondition.setIsProcessOvertime("0");
-            }else if(specialQuery == SpecialQueryEnum.NO_CLOSE.getState()){
-                //未结案
-                queryCondition.setIsClose("0");
-            }else if(specialQuery == SpecialQueryEnum.REGISTERED.getState()){
-                //已立案
-                queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+"");
-                //queryCondition.setRegisterTimeEnd(today);
-            }
-        }
-
-        List<Map<String, Object>> results =  queryExportByCondition(queryCondition);
+    public void export(QueryCondition queryCondition, HttpServletResponse httpServletResponse) throws IOException {
+        List<Map<String, Object>> results = queryExportByCondition(caseQueryConditionByState(queryCondition));
         FileInputStream fileInputStream = null;
         if (ToolUtil.isEmpty(results)) {
-            fileInputStream = new FileInputStream(templatePath + "/accessEmpty.xlsx");
+            fileInputStream = new FileInputStream(templatePath + "/temp/accessEmpty.xlsx");
         } else {
-            fileInputStream = new FileInputStream(templatePath + "/caseRecTemplate.xlsx");
+            fileInputStream = new FileInputStream(templatePath + "/temp/caseRecTemplate.xlsx");
         }
-
         try {
             httpServletResponse.setContentType("application/octet-stream");
             httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "caseRecTemplate.xlsx");
-
             Map<String, Object> var = new HashMap<>();
             var.put("标题", "案卷综合查询一览表");
             var.put("list", results);
             ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var);
-
         } catch (IOException e) {
             e.printStackTrace();
         } catch (Exception e) {
@@ -936,27 +878,24 @@
         }
     }
 
-
-    public List<Map<String,Object>> queryExportByCondition(QueryCondition queryCondition){
-        List<Map<String,Object>> results = null;
-        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-        page.setLimit(maxRowsExcel);
-        page.setSize(maxRowsExcel);
-        page.setOffset(0);
-        page.setSearchCount(false);
-        DataScope dataScope =null;
+    /**
+     * 案卷查询权限判定
+     *
+     * @param queryCondition
+     * @return
+     */
+    private DataScope caseDataScope(QueryCondition queryCondition) {
+        DataScope dataScope = null;
         try {
             if (queryCondition.isDataScope() == true) {
                 dataScope = service.getCurrUserDataScope();
                 dataScope.setScopeName("ONEDEPTID");
-            }
-            else {
+            } else {
                 String isRevisit = queryCondition.getIsRevisit();
                 String isOvertime = queryCondition.getIsOvertime();
                 String caseLevel = queryCondition.getCaseLevel();
-
                 //回访、超时、紧急案件的查询需要判断是否有数据权限
-                if ((isRevisit != null && isRevisit.equals("1"))|| (isOvertime != null && isOvertime.equals("1"))|| (caseLevel != null && caseLevel.equals("1"))) {
+                if ((isRevisit != null && isRevisit.equals(Const.ONE)) || (isOvertime != null && isOvertime.equals(Const.ONE)) || (caseLevel != null && caseLevel.equals(Const.ONE))) {
                     ShiroUser shiroUser = service.getCurrLoginUser();
                     List<String> roles = shiroUser.getRoleTips();
                     if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
@@ -965,13 +904,28 @@
                     }
                 }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        catch (Exception e){
-            String mes = e.getMessage().toString();
-        }
-        results = cwsCaseService.queryByCondition(page,dataScope,queryCondition);
+        return dataScope;
+    }
+
+    /**
+     * 导出数据检索条件
+     *
+     * @param queryCondition
+     * @return
+     */
+    public List<Map<String, Object>> queryExportByCondition(QueryCondition queryCondition) {
+        List<Map<String, Object>> results = null;
+        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+        page.setLimit(maxRowsExcel);
+        page.setSize(maxRowsExcel);
+        page.setOffset(0);
+        page.setSearchCount(false);
+        results = cwsCaseService.queryByCondition(page, caseDataScope(queryCondition), queryCondition);
         new CwsCaseWarpper(results).warp();
-        return  results;
+        return results;
     }
 
 }
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/ProcessDetailController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/ProcessDetailController.java
index aec815c..09fc603 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/ProcessDetailController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/ProcessDetailController.java
@@ -24,11 +24,9 @@
 @RequestMapping("/processDetail")
 public class ProcessDetailController extends BaseController {
 
-
     @Autowired
     private IProcessDetailService processDetailService;
 
-
     /**
      * 获取列表
      */
@@ -89,18 +87,4 @@
         processDetailService.updateById(processDetail);
         return ResponseData.success();
     }
-
-    /**
-     * 详情
-     */
-    @RequestMapping(value = "/detail/{processDetailId}")
-    @ResponseBody
-    public Object detail(@PathVariable("processDetailId") String processDetailId) {
-//        ResultData<ProcessDetail> resultData = new ResultData<ProcessDetail>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(processDetailService.selectById(processDetailId));
-//        return resultData;
-        return ResponseData.success();
-    }
 }
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java
index 4be9366..fe49638 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java
@@ -20,9 +20,12 @@
 import com.casic.missiles.modular.cwscase.service.IStatusService;
 import com.casic.missiles.modular.dictexpand.service.IDictExpandService;
 import com.casic.missiles.modular.enums.CaseStateEnum;
+import com.casic.missiles.modular.enums.CwsRoleEnums;
 import com.casic.missiles.modular.enums.SourceEnum;
 import com.casic.missiles.modular.flowable.dto.ProcessDcmsDto;
+import com.casic.missiles.modular.flowable.dto.ProcessUserDTO;
 import com.casic.missiles.modular.flowable.service.ICaseFlowService;
+import com.casic.missiles.modular.flowable.service.ICommonWorkflowService;
 import com.casic.missiles.modular.system.model.Area;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -66,6 +69,8 @@
     private IStatusService statusService;
     @Autowired
     private IProcessDetailService processDetailService;
+    @Autowired
+    private ICommonWorkflowService workflowService;
 
     @Override
     public Integer countCaseToday() {
@@ -332,7 +337,7 @@
 
         for (Map<String, Object> map : results) {
             String createUserName = "";
-
+            currProcessing(map);
             //大小类
             map = warpper(map);
 
@@ -471,6 +476,8 @@
     public List<Map<String, Object>> workList(Page page, String groupId, String onedeptid, String actUserId, QueryCondition queryCondition) {
         List<Map<String, Object>> results = this.baseMapper.workList(page, groupId, onedeptid, actUserId, queryCondition);
         for (Map<String, Object> map : results) {
+            //当前处理情况设置
+            currProcessing(map);
             //大小类
             map = warpper(map);
 
@@ -478,10 +485,40 @@
         return results;
     }
 
+    private void currProcessing(Map<String, Object> map) {
+        //设置当前处理用户信息
+        Object processId = map.get("processId");
+        if (ToolUtil.isNotEmpty(processId)) {
+            ProcessUserDTO userDto = workflowService.queryIdentityLinks(String.valueOf(processId));
+            if (userDto != null) {
+                if (ToolUtil.isNotEmpty(userDto.getUserId())) {
+                    map.put("currUserId", userDto.getUserId());
+                    map.put("currUserName", service.getUserById(userDto.getUserId(), null).getName());
+                }
+                for (String group : userDto.getGroups()) {
+                    //角色分组数据
+                    String roleName = CwsRoleEnums.ADMINISTRATOR.getRoleNameByTip(group);
+                    if (ToolUtil.isNotEmpty(roleName)) {
+                        map.put("currRoleName", roleName);
+                        map.put("currRoleId", group);
+                    } else {
+                        String deptName = service.getDeptName(group);
+                        if (ToolUtil.isNotEmpty(deptName)) {
+                            map.put("currDeptId", group);
+                            map.put("currDeptName", deptName);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     @Override
     public List<Map<String, Object>> completedList(Page page, String actUserId, QueryCondition queryCondition) {
         List<Map<String, Object>> results = this.baseMapper.completedList(page, actUserId, queryCondition);
         for (Map<String, Object> map : results) {
+            //当前处理情况设置
+            currProcessing(map);
             //大小类
             map = warpper(map);
 
@@ -491,6 +528,7 @@
 
     /**
      * 案件撤销
+     *
      * @param bizId 案卷ID
      */
     @Override
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java
index 08d54a6..69bfa10 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java
@@ -133,7 +133,7 @@
     }
 
     /**
-     * 根据小时、分钟计算截止时间，一般案件按每天的实际工时算，紧急案件按自然时间算
+     * 根据小时,分钟计算截止时间，一般案件按每天的实际工时算，紧急案件按自然时间算
      *
      * @param caseLevel 案卷等级
      * @param beginTime 计算的开始时间（"yyyy-MM-dd HH:mm:ss"），非延期时，就是当前时间，延期时，则是延期前的截止时间
@@ -173,9 +173,10 @@
             }
         }
 
-        //计算每天的工作时长
-        Long diff1 = (endAM.getTime() - startAM.getTime()) / (1000 * 60);//上午上班时长（分钟数）
-        Long diff2 = (endPM.getTime() - startPM.getTime()) / (1000 * 60);//下午上班时长（分钟数）
+        //计算每天的工作时长 上午上班时长（分钟数）
+        Long diff1 = (endAM.getTime() - startAM.getTime()) / (1000 * 60);
+        //下午上班时长（分钟数）
+        Long diff2 = (endPM.getTime() - startPM.getTime()) / (1000 * 60);
         //当天剩余的中午休息时长（分钟数）
         int inter = 0;
         if ((beginTime.before(startPM)||beginTime.equals(startPM)) && (beginTime.after(endAM)||beginTime.equals(endAM))) {
@@ -230,7 +231,7 @@
                         beginCal.add(Calendar.DATE, -1);
                     }
                 }
-//                beginCal.add(Calendar.DATE, addDay);
+                beginCal.add(Calendar.DATE, addDay);
                 beginCal.add(Calendar.MINUTE, addMin);
                 Timestamp endTime0 = new Timestamp(beginCal.getTimeInMillis());
                 //如果截止时间在下午，则需要往后推迟中午的休息时长
diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/FlowDcmsUserFactory.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/FlowDcmsUserFactory.java
index 8f0089b..1099366 100644
--- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/FlowDcmsUserFactory.java
+++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/util/FlowDcmsUserFactory.java
@@ -20,12 +20,12 @@
     public static FlowUserDto createFlowUser(ShiroUser shiroUser) {
         FlowUserDto dto = new FlowUserDto();
         //非登录立案案件
-        if(shiroUser==null){
+        if (shiroUser == null) {
             return dto;
         }
         dto.setUserId(String.valueOf(shiroUser.getId()));
         dto.setDeptId(String.valueOf(shiroUser.getDeptId()));
-        List<String> cwsTips = CwsRoleEnums.getTips();
+        List<String> cwsTips = CwsRoleEnums.ADMINISTRATOR.getTips();
         for (String roleTip : shiroUser.getRoleTips()) {
             if (cwsTips.contains(roleTip)) {
                 dto.setRoleTip(roleTip);
diff --git a/casic-service-support/src/main/java/com/casic/missiles/modular/enums/CwsRoleEnums.java b/casic-service-support/src/main/java/com/casic/missiles/modular/enums/CwsRoleEnums.java
index c357a57..be773f0 100644
--- a/casic-service-support/src/main/java/com/casic/missiles/modular/enums/CwsRoleEnums.java
+++ b/casic-service-support/src/main/java/com/casic/missiles/modular/enums/CwsRoleEnums.java
@@ -1,19 +1,26 @@
 package com.casic.missiles.modular.enums;
 
+import com.casic.missiles.modular.flowable.enums.FlowRoleEnums;
+import org.springframework.beans.factory.annotation.Autowired;
+
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
  * 城管角色枚举
  */
-public enum CwsRoleEnums {
+public enum CwsRoleEnums implements FlowRoleEnums {
+    /**
+     *
+     */
     ADMINISTRATOR("administrator","超级管理员"),
     SUPERVISOR("supervisor", "监督员"),
     RECEIVER("receiver", "受理员"),
     DISPATCHER("dispatcher", "派遣员"),
     MONITOR("monitor", "值班长"),
     COMMANDER("commander", "指挥长"),
-    TWOLEVEL("twoLevel", "处置单位"),
+    TWOLEVEL("twoLevel", "派遣员"),
     LEADER("leader", "局领导"),
     PROCESS("process", "处置人员");
 
@@ -33,12 +40,23 @@
         return roleName;
     }
 
+    @Override
+    public String getRoleNameByTip(String tip) {
+        for (CwsRoleEnums state : values()) {
+            if (state.getRoleTip().equals(tip)) {
+                return state.roleName;
+            }
+        }
+        return null;
+    }
+
     /**
      * 获取审批角色标识集合
      *
      * @return
      */
-    public static List<String> getTips() {
+    @Override
+    public List<String> getTips() {
         List<String> tips = new ArrayList<>();
         for (CwsRoleEnums cwsRoleEnums : CwsRoleEnums.values()) {
             tips.add(cwsRoleEnums.roleTip);
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index 53c1757..8a93e47 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -31,6 +31,6 @@
     cancelNodes: 30303,30302,30304 #允许撤销的节点key
 logging:
   level.root: info
-  level.com.casic: debug
+  level.com.casic: error
   path: logs/
   file: missiles.log
\ No newline at end of file