From 5b65b67e758f9f4e081e910969cab47fc9c63813 Mon Sep 17 00:00:00 2001
From: wans <747101512@qq.com>
Date: Wed, 7 Jul 2021 18:14:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=81=8C=E8=83=BD=E6=A1=88?=
 =?UTF-8?q?=E4=BB=B6=E5=92=8C=E8=A1=97=E9=81=93=E6=A1=88=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReportCaseCommunityController.java        |  7 ++++++
 .../impl/ReportCaseServiceImpl.java           | 20 ++++++++++++++++
 .../mapper/reportcase/reportcase-mapper.xml   | 15 ++++++------
 .../static/route/reportcase/case_forward.html |  6 ++---
 .../route/reportcase/case_forward_back.html   |  8 +++----
 .../static/route/reportcase/list_accept.html  | 23 ++++++++-----------
 .../reportcase/list_community_accept.html     | 13 ++++-------
 7 files changed, 57 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/cm/systemcity/controller/apis/reportcase/ReportCaseCommunityController.java b/src/main/java/com/cm/systemcity/controller/apis/reportcase/ReportCaseCommunityController.java
index 3023fb8..c0e4195 100644
--- a/src/main/java/com/cm/systemcity/controller/apis/reportcase/ReportCaseCommunityController.java
+++ b/src/main/java/com/cm/systemcity/controller/apis/reportcase/ReportCaseCommunityController.java
@@ -33,6 +33,13 @@ public class ReportCaseCommunityController extends AbstractController {
     @Autowired
     private IReportCaseService reportCaseService;
 
+    /**
+     * 这个方法好像弃用掉了 wans
+     * 2021年7月7日16:39:41
+     * @param page
+     * @return
+     * @throws SearchException
+     */
     @ApiOperation(value = "镇街案件受理分页列表", notes = "镇街案件受理分页列表接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "page", value = "当前页码", paramType = "form", dataType = "Integer", defaultValue = "1"),
diff --git a/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseServiceImpl.java b/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseServiceImpl.java
index 17c6923..5f169b9 100755
--- a/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseServiceImpl.java
+++ b/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseServiceImpl.java
@@ -227,6 +227,26 @@ public class ReportCaseServiceImpl extends BaseService implements IReportCaseSer
             page.getParams().put("reporterId", appTokenUser.getId());
         }
         PageHelper.startPage(page.getPage(), page.getRows());
+        /**
+         * 案件需要判断是否有areaId地区ID
+         * 如果存在则需要加上转发状态，只有转发到街镇或者案件类型为街镇案件的才显示
+         * 如果不存在则需要查询所有职能部门案件及未转发的案件
+         * 如果查询已经归档的案件的话 不区分职能部门案件还是街镇案件 全部显示
+         */
+        if(page.getParams().get("areaId") != null
+                && !"".equals(page.getParams().get("areaId").toString())){
+            // 查询街镇案件与转发案件
+            page.getParams().put("streetCase", "1");
+        } else {
+            // 查询职能部门案件及未转发的案件
+            page.getParams().put("deptCase", "1");
+        }
+        // 如果查询已经归档的案件的话 不区分职能部门案件还是街镇案件 全部显示
+        if(page.getParams().get("caseStatus") != null
+                && "6".equals(page.getParams().get("caseStatus").toString())){
+            page.getParams().remove("streetCase");
+            page.getParams().remove("deptCase");
+        }
         List<ReportCaseDTO> reportCaseDTOs = reportCaseDao.listReportCase(page.getParams());
         PageInfo<ReportCaseDTO> pageInfo = new PageInfo<>(reportCaseDTOs);
         return new SuccessResultList<>(reportCaseDTOs, pageInfo.getPageNum(), pageInfo.getTotal());
diff --git a/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml b/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml
index f4e9a33..20e4a1f 100755
--- a/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml
+++ b/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml
@@ -318,14 +318,15 @@
         <if test="userId != null and userId != ''">
             AND t1.creator = #{userId}
         </if>
-        <!-- 查询已转发和职能部门案件 -->
-        <if test="caseFlowType == 'normal'">
-            AND (t1.case_flow_forward = '1' OR t1.case_flow_forward IS NULL OR t1.case_flow_type = '1')
+        <!-- 职能部门案件 -->
+        <if test="deptCase != null and deptCase !=''">
+            AND (
+              t1.case_flow_forward = '0'
+            )
         </if>
-        <!-- 查询镇街案件 -->
-        <if test="caseFlowType == 'other'">
-            AND (t1.case_flow_type = '2')
-            AND (t1.case_flow_forward = '0' OR t1.case_flow_forward = '2')
+        <!-- 镇街案件 -->
+        <if test="streetCase != null and streetCase !=''">
+            AND (t1.case_flow_type = '2' OR t1.case_flow_forward = '1')
         </if>
         ORDER BY t1.gmt_create DESC
     </select>
diff --git a/src/main/resources/static/route/reportcase/case_forward.html b/src/main/resources/static/route/reportcase/case_forward.html
index 726e9f8..0aa9fc6 100644
--- a/src/main/resources/static/route/reportcase/case_forward.html
+++ b/src/main/resources/static/route/reportcase/case_forward.html
@@ -18,10 +18,10 @@
                 <div class="layui-row">
                     <div class="layui-col-md12 layui-col-sm12">
                         <div class="layui-form-item layui-form-text">
-                            <label class="layui-form-label">转发意见说明</label>
+                            <label class="layui-form-label">填写转发原由</label>
                             <div class="layui-input-block">
-                                <textarea id="opinion" name="opinion" autocomplete="off" maxlength="255"
-                                          placeholder="转发意见说明" class="layui-textarea" lay-verify="required"></textarea>
+                                <textarea id="opinion" name="opinion" autocomplete="off" maxlength="500"
+                                          placeholder="填写转发原由" class="layui-textarea" lay-verify="required"></textarea>
                             </div>
                         </div>
                     </div>
diff --git a/src/main/resources/static/route/reportcase/case_forward_back.html b/src/main/resources/static/route/reportcase/case_forward_back.html
index dda95b0..e3805d1 100644
--- a/src/main/resources/static/route/reportcase/case_forward_back.html
+++ b/src/main/resources/static/route/reportcase/case_forward_back.html
@@ -18,10 +18,10 @@
                 <div class="layui-row">
                     <div class="layui-col-md12 layui-col-sm12">
                         <div class="layui-form-item layui-form-text">
-                            <label class="layui-form-label">回退说明</label>
+                            <label class="layui-form-label">回退原由</label>
                             <div class="layui-input-block">
-                                <textarea id="opinion" name="opinion" autocomplete="off" maxlength="255"
-                                          placeholder="请输入回退说明" class="layui-textarea" lay-verify="required"></textarea>
+                                <textarea id="opinion" name="opinion" autocomplete="off" maxlength="500"
+                                          placeholder="请填写回退原由" class="layui-textarea" lay-verify="required"></textarea>
                             </div>
                         </div>
                     </div>
@@ -63,7 +63,7 @@
             //封装数据
             var formObject = {};
             formObject['opinion'] = formData.field['opinion'];
-            formObject['caseFlowForward'] = '2';
+            formObject['caseFlowForward'] = '0';
             var loadLayerIndex;
             top.restAjax.get(top.restAjax.path('api/reportcase/getforwardreportcaseback/{reportCaseId}', [reportCaseId]), formObject, null, function(code, data) {
                 // success
diff --git a/src/main/resources/static/route/reportcase/list_accept.html b/src/main/resources/static/route/reportcase/list_accept.html
index 55ed4dc..07ddeca 100755
--- a/src/main/resources/static/route/reportcase/list_accept.html
+++ b/src/main/resources/static/route/reportcase/list_accept.html
@@ -39,10 +39,10 @@
             <div class="layui-card">
                 <div class="layui-card-body">
                     <div class="test-table-reload-btn layui-form" style="margin-bottom: 5px;">
-                        <div class="layui-inline" id="areaSelectTemplateBox" style="width: 150px;"></div>
+                        <div class="layui-inline" id="areaSelectTemplateBox" style="width: 160px;"></div>
                         <script id="areaSelectTemplate" type="text/html">
                             <select id="areaId" name="areaId">
-                                <option value="">两镇一办</option>
+                                <option value="">筛选街镇</option>
                                 {{# for(var i = 0, item; item = d[i++];) { }}
                                 <option value="{{item.dictId}}">{{item.dictName}}</option>
                                 {{# } }}
@@ -158,22 +158,19 @@
                             if(row.caseFlowType == '2'){
                                 castFlowType = '街镇案件'
                             }
-                            if(row.caseFlowType == '3'){
-                                castFlowType = '其他类案件'
-                            }
                             var value = '<div style="text-align: left">'+
                                 '<div class="info-row"><span class="col-left">案件编号</span><span class="col-right">'+ row.caseNumber +'</span></div>'+
                                 '<div class="info-row"><span class="col-left">所在地区</span><span class="col-right">'+ row.areaName +'</span></div>'+
                                 '<div class="info-row"><span class="col-left">所在社区</span><span class="col-right">'+ row.communityName +'</span></div>'+
-                                '<div class="info-row"><span class="col-left">案件类型</span><span class="col-right">('+ castFlowType + ')' + row.caseTypeName +'</span></div>'+
+                                '<div class="info-row"><span class="col-left">案件类型</span><span class="col-right">('+ castFlowType + ') ' + row.caseTypeName +'</span></div>'+
                                 '<div class="info-row"><span class="col-left">操作</span>' +
                                 '<span class="col-right">'+
-                                '<div class="btn-group btn-group-xs">' +
+                                '<div class="layui-btn-group btn-group-xs">' +
                                 '<button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="showEvent">详情</button>'+
                                 '<button type="button" class="layui-btn layui-btn-sm" lay-event="acceptEvent">受理</button>'+
                                 '<button type="button" class="layui-btn layui-btn-warm layui-btn-sm" lay-event="caseFlowEvent">流程</button>';
-                                if (row.caseFlowForward == '1'){
-                                    value += '<button type="button" class="layui-btn layui-btn-danger layui-btn-sm" lay-event="caseFlowForwardBack">回退</button>';
+                                if (row.caseFlowType == '1'){
+                                    value += '<button type="button" class="layui-btn layui-btn-danger layui-btn-sm" lay-event="caseFlowForward">转发街镇</button>';
                                 }
                                 value +
                                 '</div>'+
@@ -462,15 +459,15 @@
                     }
                 });
             }
-            if(obj.event === 'caseFlowForwardBack'){
+            if(obj.event === 'caseFlowForward'){
                 layer.open({
                     type: 2,
-                    title: '转发回退',
+                    title: '转发案件',
                     closeBtn: 1,
                     area: ['40%', '30%'],
-                    shadeClose: true,
+                    shadeClose: false,
                     anim: 2,
-                    content: top.restAjax.path('route/reportcase/case_forward_back.html?reportCaseId={id}',
+                    content: top.restAjax.path('route/reportcase/case_forward.html?reportCaseId={id}',
                         [obj.data.reportCaseId]),
                     end: function() {
                         reloadTable()
diff --git a/src/main/resources/static/route/reportcase/list_community_accept.html b/src/main/resources/static/route/reportcase/list_community_accept.html
index 86acfc2..03e3e75 100644
--- a/src/main/resources/static/route/reportcase/list_community_accept.html
+++ b/src/main/resources/static/route/reportcase/list_community_accept.html
@@ -153,13 +153,10 @@
                     },
                     {width: 400, title: '案件信息', align: 'center',
                         templet: function (row) {
-                            var castFlowType = '职能部门案件';
+                            var castFlowType = '职能部门案件-转发';
                             if(row.caseFlowType == '2'){
                                 castFlowType = '街镇案件'
                             }
-                            if(row.caseFlowType == '3'){
-                                castFlowType = '其他类案件'
-                            }
                             var value = '<div style="text-align: left">'+
                                 '<div class="info-row"><span class="col-left">案件编号</span><span class="col-right">'+ row.caseNumber +'</span></div>'+
                                 '<div class="info-row"><span class="col-left">所在地区</span><span class="col-right">'+ row.areaName +'</span></div>'+
@@ -171,8 +168,8 @@
                                 '<button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="showEvent">详情</button>'+
                                 '<button type="button" class="layui-btn layui-btn-sm" lay-event="acceptEvent">受理</button>'+
                                 '<button type="button" class="layui-btn layui-btn-warm layui-btn-sm" lay-event="caseFlowEvent">流程</button>';
-                                if (row.caseFlowForward == '1'){
-                                    value += '<button type="button" class="layui-btn layui-btn-danger layui-btn-sm" lay-event="caseFlowForwardBack">回退</button>';
+                                if (row.caseFlowType == '1'){
+                                    value += '<button type="button" class="layui-btn layui-btn-danger layui-btn-sm" lay-event="caseFlowForwardBack">回退转发</button>';
                                 }
                                 value += '</div></span></div></div>';
                             return value;
@@ -460,10 +457,10 @@
             if(obj.event === 'caseFlowForwardBack'){
                 layer.open({
                     type: 2,
-                    title: '转发回退',
+                    title: '回退转发',
                     closeBtn: 1,
                     area: ['40%', '30%'],
-                    shadeClose: true,
+                    shadeClose: false,
                     anim: 2,
                     content: top.restAjax.path('route/reportcase/case_forward_back.html?reportCaseId={id}',
                         [obj.data.reportCaseId]),