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 2466e9a..026bb39 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
@@ -371,7 +371,7 @@
      */
     @RequestMapping(value = "/toHandleListPage")
     @ResponseBody
-    public Object toHandleListPage(String isOvertime, String isEmergent) {
+    public Object toHandleListPage(String isOvertime, String isEmergent, String isShop) {
 
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
@@ -389,6 +389,11 @@
             queryCondition.setCaseLevel(String.valueOf(CaseLevelEnum.EMERGENT.getState()));
         }
 
+        //三包案卷
+        if (isShop != null) {
+            queryCondition.setIsShop(isShop);
+        }
+
         //app的处置人员访问
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();

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 2466e9a..026bb39 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
@@ -371,7 +371,7 @@
      */
     @RequestMapping(value = "/toHandleListPage")
     @ResponseBody
-    public Object toHandleListPage(String isOvertime, String isEmergent) {
+    public Object toHandleListPage(String isOvertime, String isEmergent, String isShop) {
 
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
@@ -389,6 +389,11 @@
             queryCondition.setCaseLevel(String.valueOf(CaseLevelEnum.EMERGENT.getState()));
         }
 
+        //三包案卷
+        if (isShop != null) {
+            queryCondition.setIsShop(isShop);
+        }
+
         //app的处置人员访问
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
index 2f9f859..9ea04b3 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
@@ -304,7 +304,11 @@
         a.URGE_REMARKS as urgeRemarks,
         a.URGE_USERID as urgeUserid,
         a.REGISTER_REMARKS as registerRemarks,
-        a.SUPERVISE_USERID as superviseUserid
+        a.SUPERVISE_USERID as superviseUserid,
+        a.PUNISH_TYPE as punishType,
+        a.PUNISH_REMARKS as punishRemarks,
+        a.PUNISH_IMAGE as punishImage,
+        a.PUNISH_TIME as punishTime
         from case_view a
         where 1=1
         <if test="id!=null and id!=''">
@@ -339,10 +343,10 @@
         <if test="actUserId!=null and actUserId!=''">
             and a.ACT_USER_ID= #{actUserId}
         </if>
-        --         是否是五包案卷
-        <if test="queryCondition.isShop!=null and queryCondition.isShop!=''">
-            and a.SHOP_ID is not null
-        </if>
+        <!--&#45;&#45;         是否是五包案卷-->
+        <!--<if test="queryCondition.isShop!=null and queryCondition.isShop!=''">-->
+            <!--and a.SHOP_ID is not null-->
+        <!--</if>-->
         --         案卷状态（节点）
         <if test="queryCondition.caseState!=null and queryCondition.caseState!=''">
             and a.CASE_STATE= #{queryCondition.caseState}
@@ -445,12 +449,12 @@
             and a.FILING_TYPE  = #{queryCondition.filingType}
         </if>
         --         五包案件
-        <if test='queryCondition.isShopCase=="1"'>
-            and a.SHOP_ID  > 0
+        <if test='queryCondition.isShopCase=="1" or queryCondition.isShop=="1"'>
+            and a.SHOP_ID is not null
         </if>
         --         非五包案件
-        <if test='queryCondition.isShopCase=="0"'>
-            and a.SHOP_ID  = 0
+        <if test='queryCondition.isShopCase=="0" or queryCondition.isShop=="0"'>
+            and a.SHOP_ID is null
         </if>
         group by a.CASEID
         ORDER BY a.CREATE_TIME DESC

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 2466e9a..026bb39 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
@@ -371,7 +371,7 @@
      */
     @RequestMapping(value = "/toHandleListPage")
     @ResponseBody
-    public Object toHandleListPage(String isOvertime, String isEmergent) {
+    public Object toHandleListPage(String isOvertime, String isEmergent, String isShop) {
 
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
 
@@ -389,6 +389,11 @@
             queryCondition.setCaseLevel(String.valueOf(CaseLevelEnum.EMERGENT.getState()));
         }
 
+        //三包案卷
+        if (isShop != null) {
+            queryCondition.setIsShop(isShop);
+        }
+
         //app的处置人员访问
         ShiroUser shiroUser = service.getCurrLoginUser();
         List<String> roles = shiroUser.getRoleTips();
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
index 2f9f859..9ea04b3 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
@@ -304,7 +304,11 @@
         a.URGE_REMARKS as urgeRemarks,
         a.URGE_USERID as urgeUserid,
         a.REGISTER_REMARKS as registerRemarks,
-        a.SUPERVISE_USERID as superviseUserid
+        a.SUPERVISE_USERID as superviseUserid,
+        a.PUNISH_TYPE as punishType,
+        a.PUNISH_REMARKS as punishRemarks,
+        a.PUNISH_IMAGE as punishImage,
+        a.PUNISH_TIME as punishTime
         from case_view a
         where 1=1
         <if test="id!=null and id!=''">
@@ -339,10 +343,10 @@
         <if test="actUserId!=null and actUserId!=''">
             and a.ACT_USER_ID= #{actUserId}
         </if>
-        --         是否是五包案卷
-        <if test="queryCondition.isShop!=null and queryCondition.isShop!=''">
-            and a.SHOP_ID is not null
-        </if>
+        <!--&#45;&#45;         是否是五包案卷-->
+        <!--<if test="queryCondition.isShop!=null and queryCondition.isShop!=''">-->
+            <!--and a.SHOP_ID is not null-->
+        <!--</if>-->
         --         案卷状态（节点）
         <if test="queryCondition.caseState!=null and queryCondition.caseState!=''">
             and a.CASE_STATE= #{queryCondition.caseState}
@@ -445,12 +449,12 @@
             and a.FILING_TYPE  = #{queryCondition.filingType}
         </if>
         --         五包案件
-        <if test='queryCondition.isShopCase=="1"'>
-            and a.SHOP_ID  > 0
+        <if test='queryCondition.isShopCase=="1" or queryCondition.isShop=="1"'>
+            and a.SHOP_ID is not null
         </if>
         --         非五包案件
-        <if test='queryCondition.isShopCase=="0"'>
-            and a.SHOP_ID  = 0
+        <if test='queryCondition.isShopCase=="0" or queryCondition.isShop=="0"'>
+            and a.SHOP_ID is null
         </if>
         group by a.CASEID
         ORDER BY a.CREATE_TIME DESC
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/warpper/CwsCaseWarpper.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/warpper/CwsCaseWarpper.java
index a4d2f86..5895093 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/warpper/CwsCaseWarpper.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/warpper/CwsCaseWarpper.java
@@ -50,6 +50,12 @@
             map.put("reportTime",reportTime);
         }
 
+        //将时间字段转成string，以保留时分秒
+        if (!ToolUtil.isEmpty(map.get("punishTime"))) {
+            String punishTime = formatter.format(map.get("punishTime"));
+            map.put("punishTime",punishTime);
+        }
+
         //案件状态
         if (!ToolUtil.isEmpty(map.get("caseState"))) {
             int state = Integer.valueOf(String.valueOf(map.get("caseState")));