From b497b0d4935e5a04680909ad4f14e08d3295e59f Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Mon, 23 Sep 2024 20:51:21 +0800
Subject: [PATCH] 首页登记记录接口

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml |  426 ++++++++++++++++++++++++++++++++++------------------
 1 files changed, 278 insertions(+), 148 deletions(-)

diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
index 416174b..bd03ddb 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
@@ -11,75 +11,75 @@
 <mapper namespace="cn.huge.module.cases.dao.mapper.CaseInfoMapper">
     <!-- 结果集 -->
     <resultMap id="dataResult" type="cn.huge.module.cases.domain.po.CaseInfo">
-            <result property="id" column="id"/>
-            <result property="caseTitle" column="case_title"/>
-            <result property="caseRef" column="case_ref"/>
-            <result property="caseLevel" column="case_level"/>
-            <result property="visitTime" column="visit_time"/>
-            <result property="visitPeopleNum" column="visit_people_num"/>
-            <result property="mediType" column="medi_type"/>
-            <result property="mediTypeName" column="medi_type_name"/>
-            <result property="caseTypeFirst" column="case_type_first"/>
-            <result property="caseTypeFirstName" column="case_type_first_name"/>
-            <result property="caseType" column="case_type"/>
-            <result property="caseTypeName" column="case_type_name"/>
-            <result property="occurTime" column="occur_time"/>
-            <result property="addr" column="addr"/>
-            <result property="lng" column="lng"/>
-            <result property="lat" column="lat"/>
-            <result property="wgAddr" column="wg_addr"/>
-            <result property="wgLng" column="wg_lng"/>
-            <result property="wgLat" column="wg_lat"/>
-            <result property="queProv" column="que_prov"/>
-            <result property="queProvName" column="que_prov_name"/>
-            <result property="queCity" column="que_city"/>
-            <result property="queCityName" column="que_city_name"/>
-            <result property="queArea" column="que_area"/>
-            <result property="queAreaName" column="que_area_name"/>
-            <result property="queRoad" column="que_road"/>
-            <result property="queRoadName" column="que_road_name"/>
-            <result property="queVillage" column="que_village"/>
-            <result property="queVillageName" column="que_village_name"/>
-            <result property="peopleNum" column="people_num"/>
-            <result property="amount" column="amount"/>
-            <result property="crowd" column="crowd"/>
-            <result property="crowdName" column="crowd_name"/>
-            <result property="canal" column="canal"/>
-            <result property="canalName" column="canal_name"/>
-            <result property="visitWay" column="visit_way"/>
-            <result property="visitWayName" column="visit_way_name"/>
-            <result property="caseDes" column="case_des"/>
-            <result property="caseClaim" column="case_claim"/>
-            <result property="majorStatus" column="major_status"/>
-            <result property="source" column="source"/>
-            <result property="sourceName" column="source_name"/>
-            <result property="caseNo" column="case_no"/>
-            <result property="mediateNo" column="mediate_no"/>
-            <result property="mediateBookNo" column="mediate_book_no"/>
-            <result property="civilNo" column="civil_no"/>
-            <result property="plaintiffs" column="plaintiffs"/>
-            <result property="pagents" column="pagents"/>
-            <result property="defendants" column="defendants"/>
-            <result property="dagents" column="dagents"/>
-            <result property="inputUnitId" column="input_unit_id"/>
-            <result property="inputUnitName" column="input_unit_name"/>
-            <result property="inputUserId" column="input_user_id"/>
-            <result property="inputUserName" column="input_user_name"/>
-            <result property="inputWay" column="input_way"/>
-            <result property="status" column="status"/>
-            <result property="statusName" column="status_name"/>
-            <result property="process" column="process"/>
-            <result property="processName" column="process_name"/>
-            <result property="infoProcess" column="info_process"/>
-            <result property="infoProcessName" column="info_process_name"/>
-            <result property="wantUnitId" column="want_unit_id"/>
-            <result property="wantUnitName" column="want_unit_name"/>
-            <result property="wantUserId" column="want_user_id"/>
-            <result property="wantUserName" column="want_user_name"/>
-            <result property="deleteStatus" column="delete_status"/>
-            <result property="custId" column="cust_id"/>
-            <result property="createTime" column="create_time"/>
-            <result property="updateTime" column="update_time"/>
+        <result property="id" column="id"/>
+        <result property="caseTitle" column="case_title"/>
+        <result property="caseRef" column="case_ref"/>
+        <result property="caseLevel" column="case_level"/>
+        <result property="visitTime" column="visit_time"/>
+        <result property="visitPeopleNum" column="visit_people_num"/>
+        <result property="mediType" column="medi_type"/>
+        <result property="mediTypeName" column="medi_type_name"/>
+        <result property="caseTypeFirst" column="case_type_first"/>
+        <result property="caseTypeFirstName" column="case_type_first_name"/>
+        <result property="caseType" column="case_type"/>
+        <result property="caseTypeName" column="case_type_name"/>
+        <result property="occurTime" column="occur_time"/>
+        <result property="addr" column="addr"/>
+        <result property="lng" column="lng"/>
+        <result property="lat" column="lat"/>
+        <result property="wgAddr" column="wg_addr"/>
+        <result property="wgLng" column="wg_lng"/>
+        <result property="wgLat" column="wg_lat"/>
+        <result property="queProv" column="que_prov"/>
+        <result property="queProvName" column="que_prov_name"/>
+        <result property="queCity" column="que_city"/>
+        <result property="queCityName" column="que_city_name"/>
+        <result property="queArea" column="que_area"/>
+        <result property="queAreaName" column="que_area_name"/>
+        <result property="queRoad" column="que_road"/>
+        <result property="queRoadName" column="que_road_name"/>
+        <result property="queVillage" column="que_village"/>
+        <result property="queVillageName" column="que_village_name"/>
+        <result property="peopleNum" column="people_num"/>
+        <result property="amount" column="amount"/>
+        <result property="crowd" column="crowd"/>
+        <result property="crowdName" column="crowd_name"/>
+        <result property="canal" column="canal"/>
+        <result property="canalName" column="canal_name"/>
+        <result property="visitWay" column="visit_way"/>
+        <result property="visitWayName" column="visit_way_name"/>
+        <result property="caseDes" column="case_des"/>
+        <result property="caseClaim" column="case_claim"/>
+        <result property="majorStatus" column="major_status"/>
+        <result property="source" column="source"/>
+        <result property="sourceName" column="source_name"/>
+        <result property="caseNo" column="case_no"/>
+        <result property="mediateNo" column="mediate_no"/>
+        <result property="mediateBookNo" column="mediate_book_no"/>
+        <result property="civilNo" column="civil_no"/>
+        <result property="plaintiffs" column="plaintiffs"/>
+        <result property="pagents" column="pagents"/>
+        <result property="defendants" column="defendants"/>
+        <result property="dagents" column="dagents"/>
+        <result property="inputUnitId" column="input_unit_id"/>
+        <result property="inputUnitName" column="input_unit_name"/>
+        <result property="inputUserId" column="input_user_id"/>
+        <result property="inputUserName" column="input_user_name"/>
+        <result property="inputWay" column="input_way"/>
+        <result property="status" column="status"/>
+        <result property="statusName" column="status_name"/>
+        <result property="process" column="process"/>
+        <result property="processName" column="process_name"/>
+        <result property="infoProcess" column="info_process"/>
+        <result property="infoProcessName" column="info_process_name"/>
+        <result property="wantUnitId" column="want_unit_id"/>
+        <result property="wantUnitName" column="want_unit_name"/>
+        <result property="wantUserId" column="want_user_id"/>
+        <result property="wantUserName" column="want_user_name"/>
+        <result property="deleteStatus" column="delete_status"/>
+        <result property="custId" column="cust_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
     <resultMap id="dataResult-all" type="cn.huge.module.cases.domain.dto.CasePageDTO">
         <result property="id" column="id"/>
@@ -103,6 +103,8 @@
         <result property="agreeTypeName" column="agree_type_name"/>
         <result property="agreeContent" column="agree_content"/>
         <result property="createTime" column="create_time"/>
+        <result property="plaintiffs" column="plaintiffs"/>
+        <result property="defendants" column="defendants"/>
     </resultMap>
     <!-- 表 -->
     <sql id='table-name'>dyh_case_info</sql>
@@ -118,6 +120,8 @@
         a.input_unit_id,
         a.input_unit_name,
         a.create_time,
+        a.plaintiffs,
+        a.defendants,
         b.medi_result,
         b.medi_result_name,
         b.mediate_unit_id,
@@ -131,7 +135,8 @@
     </sql>
     <!-- 字段 -->
     <sql id="column-part">
-        id,
+        id
+        ,
         case_title,
         case_ref,
         case_level,
@@ -203,79 +208,80 @@
     </sql>
     <!-- 更新实体字段 -->
     <sql id="set-part">
-            <if test="entity.caseTitle != null">case_title = #{entity.caseTitle},</if>
-            <if test="entity.caseRef != null">case_ref = #{entity.caseRef},</if>
-            <if test="entity.caseLevel != null">case_level = #{entity.caseLevel},</if>
-            <if test="entity.visitTime != null">visit_time = #{entity.visitTime},</if>
-            <if test="entity.visitPeopleNum != null">visit_people_num = #{entity.visitPeopleNum},</if>
-            <if test="entity.mediType != null">medi_type = #{entity.mediType},</if>
-            <if test="entity.mediTypeName != null">medi_type_name = #{entity.mediTypeName},</if>
-            <if test="entity.caseTypeFirst != null">case_type_first = #{entity.caseTypeFirst},</if>
-            <if test="entity.caseTypeFirstName != null">case_type_first_name = #{entity.caseTypeFirstName},</if>
-            <if test="entity.caseType != null">case_type = #{entity.caseType},</if>
-            <if test="entity.caseTypeName != null">case_type_name = #{entity.caseTypeName},</if>
-            <if test="entity.occurTime != null">occur_time = #{entity.occurTime},</if>
-            <if test="entity.addr != null">addr = #{entity.addr},</if>
-            <if test="entity.lng != null">lng = #{entity.lng},</if>
-            <if test="entity.lat != null">lat = #{entity.lat},</if>
-            <if test="entity.wgAddr != null">wg_addr = #{entity.wgAddr},</if>
-            <if test="entity.wgLng != null">wg_lng = #{entity.wgLng},</if>
-            <if test="entity.wgLat != null">wg_lat = #{entity.wgLat},</if>
-            <if test="entity.queProv != null">que_prov = #{entity.queProv},</if>
-            <if test="entity.queProvName != null">que_prov_name = #{entity.queProvName},</if>
-            <if test="entity.queCity != null">que_city = #{entity.queCity},</if>
-            <if test="entity.queCityName != null">que_city_name = #{entity.queCityName},</if>
-            <if test="entity.queArea != null">que_area = #{entity.queArea},</if>
-            <if test="entity.queAreaName != null">que_area_name = #{entity.queAreaName},</if>
-            <if test="entity.queRoad != null">que_road = #{entity.queRoad},</if>
-            <if test="entity.queRoadName != null">que_road_name = #{entity.queRoadName},</if>
-            <if test="entity.queVillage != null">que_village = #{entity.queVillage},</if>
-            <if test="entity.queVillageName != null">que_village_name = #{entity.queVillageName},</if>
-            <if test="entity.peopleNum != null">people_num = #{entity.peopleNum},</if>
-            <if test="entity.amount != null">amount = #{entity.amount},</if>
-            <if test="entity.crowd != null">crowd = #{entity.crowd},</if>
-            <if test="entity.crowdName != null">crowd_name = #{entity.crowdName},</if>
-            <if test="entity.canal != null">canal = #{entity.canal},</if>
-            <if test="entity.canalName != null">canal_name = #{entity.canalName},</if>
-            <if test="entity.visitWay != null">visit_way = #{entity.visitWay},</if>
-            <if test="entity.visitWayName != null">visit_way_name = #{entity.visitWayName},</if>
-            <if test="entity.caseDes != null">case_des = #{entity.caseDes},</if>
-            <if test="entity.caseClaim != null">case_claim = #{entity.caseClaim},</if>
-            <if test="entity.majorStatus != null">major_status = #{entity.majorStatus},</if>
-            <if test="entity.source != null">source = #{entity.source},</if>
-            <if test="entity.sourceName != null">source_name = #{entity.sourceName},</if>
-            <if test="entity.caseNo != null">case_no = #{entity.caseNo},</if>
-            <if test="entity.mediateNo != null">mediate_no = #{entity.mediateNo},</if>
-            <if test="entity.mediateBookNo != null">mediate_book_no = #{entity.mediateBookNo},</if>
-            <if test="entity.civilNo != null">civil_no = #{entity.civilNo},</if>
-            <if test="entity.plaintiffs != null">plaintiffs = #{entity.plaintiffs},</if>
-            <if test="entity.pagents != null">pagents = #{entity.pagents},</if>
-            <if test="entity.defendants != null">defendants = #{entity.defendants},</if>
-            <if test="entity.dagents != null">dagents = #{entity.dagents},</if>
-            <if test="entity.inputUnitId != null">input_unit_id = #{entity.inputUnitId},</if>
-            <if test="entity.inputUnitName != null">input_unit_name = #{entity.inputUnitName},</if>
-            <if test="entity.inputUserId != null">input_user_id = #{entity.inputUserId},</if>
-            <if test="entity.inputUserName != null">input_user_name = #{entity.inputUserName},</if>
-            <if test="entity.inputWay != null">input_way = #{entity.inputWay},</if>
-            <if test="entity.status != null">status = #{entity.status},</if>
-            <if test="entity.statusName != null">status_name = #{entity.statusName},</if>
-            <if test="entity.process != null">process = #{entity.process},</if>
-            <if test="entity.processName != null">process_name = #{entity.processName},</if>
-            <if test="entity.infoProcess != null">info_process = #{entity.infoProcess},</if>
-            <if test="entity.infoProcessName != null">info_process_name = #{entity.infoProcessName},</if>
-            <if test="entity.wantUnitId != null">want_unit_id = #{entity.wantUnitId},</if>
-            <if test="entity.wantUnitName != null">want_unit_name = #{entity.wantUnitName},</if>
-            <if test="entity.wantUserId != null">want_user_id = #{entity.wantUserId},</if>
-            <if test="entity.wantUserName != null">want_user_name = #{entity.wantUserName},</if>
-            <if test="entity.deleteStatus != null">delete_status = #{entity.deleteStatus},</if>
-            <if test="entity.custId != null">cust_id = #{entity.custId},</if>
-            <if test="entity.createTime != null">create_time = #{entity.createTime},</if>
-            <if test="entity.updateTime != null">update_time = #{entity.updateTime}</if>
+        <if test="entity.caseTitle != null">case_title = #{entity.caseTitle},</if>
+        <if test="entity.caseRef != null">case_ref = #{entity.caseRef},</if>
+        <if test="entity.caseLevel != null">case_level = #{entity.caseLevel},</if>
+        <if test="entity.visitTime != null">visit_time = #{entity.visitTime},</if>
+        <if test="entity.visitPeopleNum != null">visit_people_num = #{entity.visitPeopleNum},</if>
+        <if test="entity.mediType != null">medi_type = #{entity.mediType},</if>
+        <if test="entity.mediTypeName != null">medi_type_name = #{entity.mediTypeName},</if>
+        <if test="entity.caseTypeFirst != null">case_type_first = #{entity.caseTypeFirst},</if>
+        <if test="entity.caseTypeFirstName != null">case_type_first_name = #{entity.caseTypeFirstName},</if>
+        <if test="entity.caseType != null">case_type = #{entity.caseType},</if>
+        <if test="entity.caseTypeName != null">case_type_name = #{entity.caseTypeName},</if>
+        <if test="entity.occurTime != null">occur_time = #{entity.occurTime},</if>
+        <if test="entity.addr != null">addr = #{entity.addr},</if>
+        <if test="entity.lng != null">lng = #{entity.lng},</if>
+        <if test="entity.lat != null">lat = #{entity.lat},</if>
+        <if test="entity.wgAddr != null">wg_addr = #{entity.wgAddr},</if>
+        <if test="entity.wgLng != null">wg_lng = #{entity.wgLng},</if>
+        <if test="entity.wgLat != null">wg_lat = #{entity.wgLat},</if>
+        <if test="entity.queProv != null">que_prov = #{entity.queProv},</if>
+        <if test="entity.queProvName != null">que_prov_name = #{entity.queProvName},</if>
+        <if test="entity.queCity != null">que_city = #{entity.queCity},</if>
+        <if test="entity.queCityName != null">que_city_name = #{entity.queCityName},</if>
+        <if test="entity.queArea != null">que_area = #{entity.queArea},</if>
+        <if test="entity.queAreaName != null">que_area_name = #{entity.queAreaName},</if>
+        <if test="entity.queRoad != null">que_road = #{entity.queRoad},</if>
+        <if test="entity.queRoadName != null">que_road_name = #{entity.queRoadName},</if>
+        <if test="entity.queVillage != null">que_village = #{entity.queVillage},</if>
+        <if test="entity.queVillageName != null">que_village_name = #{entity.queVillageName},</if>
+        <if test="entity.peopleNum != null">people_num = #{entity.peopleNum},</if>
+        <if test="entity.amount != null">amount = #{entity.amount},</if>
+        <if test="entity.crowd != null">crowd = #{entity.crowd},</if>
+        <if test="entity.crowdName != null">crowd_name = #{entity.crowdName},</if>
+        <if test="entity.canal != null">canal = #{entity.canal},</if>
+        <if test="entity.canalName != null">canal_name = #{entity.canalName},</if>
+        <if test="entity.visitWay != null">visit_way = #{entity.visitWay},</if>
+        <if test="entity.visitWayName != null">visit_way_name = #{entity.visitWayName},</if>
+        <if test="entity.caseDes != null">case_des = #{entity.caseDes},</if>
+        <if test="entity.caseClaim != null">case_claim = #{entity.caseClaim},</if>
+        <if test="entity.majorStatus != null">major_status = #{entity.majorStatus},</if>
+        <if test="entity.source != null">source = #{entity.source},</if>
+        <if test="entity.sourceName != null">source_name = #{entity.sourceName},</if>
+        <if test="entity.caseNo != null">case_no = #{entity.caseNo},</if>
+        <if test="entity.mediateNo != null">mediate_no = #{entity.mediateNo},</if>
+        <if test="entity.mediateBookNo != null">mediate_book_no = #{entity.mediateBookNo},</if>
+        <if test="entity.civilNo != null">civil_no = #{entity.civilNo},</if>
+        <if test="entity.plaintiffs != null">plaintiffs = #{entity.plaintiffs},</if>
+        <if test="entity.pagents != null">pagents = #{entity.pagents},</if>
+        <if test="entity.defendants != null">defendants = #{entity.defendants},</if>
+        <if test="entity.dagents != null">dagents = #{entity.dagents},</if>
+        <if test="entity.inputUnitId != null">input_unit_id = #{entity.inputUnitId},</if>
+        <if test="entity.inputUnitName != null">input_unit_name = #{entity.inputUnitName},</if>
+        <if test="entity.inputUserId != null">input_user_id = #{entity.inputUserId},</if>
+        <if test="entity.inputUserName != null">input_user_name = #{entity.inputUserName},</if>
+        <if test="entity.inputWay != null">input_way = #{entity.inputWay},</if>
+        <if test="entity.status != null">status = #{entity.status},</if>
+        <if test="entity.statusName != null">status_name = #{entity.statusName},</if>
+        <if test="entity.process != null">process = #{entity.process},</if>
+        <if test="entity.processName != null">process_name = #{entity.processName},</if>
+        <if test="entity.infoProcess != null">info_process = #{entity.infoProcess},</if>
+        <if test="entity.infoProcessName != null">info_process_name = #{entity.infoProcessName},</if>
+        <if test="entity.wantUnitId != null">want_unit_id = #{entity.wantUnitId},</if>
+        <if test="entity.wantUnitName != null">want_unit_name = #{entity.wantUnitName},</if>
+        <if test="entity.wantUserId != null">want_user_id = #{entity.wantUserId},</if>
+        <if test="entity.wantUserName != null">want_user_name = #{entity.wantUserName},</if>
+        <if test="entity.deleteStatus != null">delete_status = #{entity.deleteStatus},</if>
+        <if test="entity.custId != null">cust_id = #{entity.custId},</if>
+        <if test="entity.createTime != null">create_time = #{entity.createTime},</if>
+        <if test="entity.updateTime != null">update_time = #{entity.updateTime}</if>
     </sql>
     <!-- 条件 -->
     <sql id="where-part-all">
         <if test="terms != null">
             <where>
+                and delete_status = 0
                 <if test="terms.status != null and terms.status !=''">
                     and a.status = #{terms.status}
                 </if>
@@ -332,7 +338,37 @@
                     and a.que_road = #{terms.queRoad}
                 </if>
                 <if test="terms.isArea != null and terms.isArea !=''">
-                    and a.que_city is not null
+                    and a.que_city is not null and a.que_area is not null and a.que_road is not null
+                </if>
+                <if test="terms.caseRef != null and terms.caseRef !=''">
+                    and a.case_ref = #{terms.caseRef}
+                </if>
+                <if test="terms.plaintiffs != null and terms.plaintiffs !=''">
+                    and a.plaintiffs = #{terms.plaintiffs}
+                </if>
+                <if test="terms.defendants != null and terms.defendants !=''">
+                    and a.defendants = #{terms.defendants}
+                </if>
+                <if test="terms.peopleNumStart != null and terms.peopleNumStart !=''">
+                    and a.people_num  <![CDATA[ >= ]]> #{terms.peopleNumStart}
+                </if>
+                <if test="terms.peopleNumEnd != null and terms.peopleNumEnd !=''">
+                    and a.people_num  <![CDATA[ <= ]]> #{terms.peopleNumEnd}
+                </if>
+                <if test="terms.amountStart != null and terms.amountStart !=''">
+                    and a.amount  <![CDATA[ >= ]]> #{terms.amountStart}
+                </if>
+                <if test="terms.amountEnd != null and terms.amountEnd !=''">
+                    and a.amount  <![CDATA[ <= ]]> #{terms.amountEnd}
+                </if>
+                <if test="terms.evaluateGrade != null and terms.evaluateGrade !=''">
+                    and a.id in(select case_id from dyh_case_evaluate where evaluate_grade = #{terms.evaluateGrade})
+                </if>
+                <if test="terms.mediateUnitId != null and terms.mediateUnitId !=''">
+                    and b.mediate_unit_id = #{terms.mediateUnitId}
+                </if>
+                <if test="terms.assistUnitId != null and terms.assistUnitId !=''">
+                    and b.assist_unit_id = #{terms.assistUnitId}
                 </if>
             </where>
         </if>
@@ -520,7 +556,8 @@
                 </if>
                 <if test="terms.processList != null and terms.processList.size > 0">
                     and process in
-                    <foreach collection="terms.processList" item="process" index="index" open="(" separator="," close=")">
+                    <foreach collection="terms.processList" item="process" index="index" open="(" separator=","
+                             close=")">
                         #{process}
                     </foreach>
                 </if>
@@ -562,14 +599,14 @@
                 </if>
                 <if test="terms.createStart != null and terms.createStart !='' and terms.createEnd != null and terms.createEnd !=''">
                     and (DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createStart}
-                        and DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createEnd})
+                    and DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createEnd})
                 </if>
                 <if test="terms.updateTime != null and terms.updateTime !=''">
                     and DATE_FORMAT(update_time,'%Y-%m-%d') = #{terms.updateTime}
                 </if>
                 <if test="terms.updateStart != null and terms.updateStart !='' and terms.updateEnd != null and terms.updateEnd !=''">
                     and (DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.updateStart}
-                        and DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.updateEnd})
+                    and DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.updateEnd})
                 </if>
             </where>
         </if>
@@ -613,7 +650,7 @@
     <!--  根据编号物理删除  -->
     <delete id="deleteCaseInfo">
         delete from
-        <include refid="table-name" />
+        <include refid="table-name"/>
         where id = #{id}
     </delete>
     <!--  根据条件查询  -->
@@ -621,7 +658,7 @@
         select
         <include refid="column-part"/>
         from
-        <include refid="table-name" />
+        <include refid="table-name"/>
         <include refid="where-part"/>
     </select>
     <!--  根据条件统计  -->
@@ -629,7 +666,7 @@
         select
         COUNT(1)
         from
-        <include refid="table-name" />
+        <include refid="table-name"/>
         <include refid="where-part"/>
     </select>
     <!--  根据条件分页查询  -->
@@ -637,7 +674,7 @@
         SELECT
         <include refid="column-part"/>
         FROM
-        <include refid="table-name" />
+        <include refid="table-name"/>
         <include refid="where-part"/>
         <if test="page.sort != null">
             <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
@@ -651,6 +688,81 @@
     </select>
 
 
+    <sql id="where-register-part">
+        <if test="terms != null">
+            <where>
+                <if test="terms.inputUnitName != null and terms.inputUnitName !=''">
+                    and t1.input_unit_mame = #{inputUnitName}
+                </if>
+                <if test="terms.createStart != null and terms.createStart !='' and terms.createEnd != null and terms.createEnd !=''">
+                    and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createStart}
+                    and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createEnd})
+                </if>
+                <if test="terms.caseLevel != null and terms.caseLevel !=''">
+                    and t1.case_level = #{terms.caseLevel}
+                </if>
+                <if test="terms.caseTypeFirstName != null and terms.caseTypeFirstName !=''">
+                    and t1.case_type_first_name = #{caseTypeFirstName}
+                </if>
+                <if test="terms.caseType != null and terms.caseType !=''">
+                    and t1.case_type = #{terms.caseType}
+                </if>
+                <if test="terms.canal != null and terms.canal !=''">
+                    and t1.canal = #{terms.canal}
+                </if>
+                <if test="terms.canalName != null and terms.canalName !=''">
+                    and t1.canal_name = #{terms.canalName}
+                </if>
+                <if test="terms.plaintiffs != null and terms.plaintiffs !=''">
+                    and t1.plaintiffs = #{terms.plaintiffs}
+                </if>
+                <if test="terms.defendants != null and terms.defendants !=''">
+                    and t1.defendants = #{terms.defendants}
+                </if>
+                <if test="terms.statusName != null and terms.statusName !=''">
+                    and t1.statusName = #{terms.statusName}
+                </if>
+                <if test="terms.mediResultName != null and terms.mediResultName !=''">
+                    and t2.medi_result_name = #{terms.mediResultName}
+                </if>
+            </where>
+        </if>
+    </sql>
+
+    <select id="pageTermsCaseRegister" resultType="cn.huge.module.cases.domain.dto.CaseRegisterDTO">
+        SELECT
+        t1.id as caseId,t1.create_time as createTime,t1.input_user_name as inputUserName,t1.status_name as statusName,t1.case_level as
+        caseLevel,t1.canal_name as canalName,
+        t1.case_type_first_name as caseTypeFirstName,t1.case_type_name as caseTypeName,t1.plaintiffs as
+        plaintiffs,t1.defendants as defendants,t2.medi_result_name as mediResultName,
+        t3.number as superviseCount,
+        t4.id as caseTaskId
+        FROM
+        dyh_case_info t1
+        left join dyh_case_info_unfold t2 on t1.id = t2.id
+        left join (select count(*) as number ,case_id from dyh_case_supervise group by case_id) t3 on t3.case_id=t1.id
+        left join (select id ,case_id from dyh_case_task limit 1) t4 on t1.id = t4.case_id
+        <include refid="where-register-part"/>
+        <if test="page.sort != null">
+            <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
+                isnull(${s.property}), ${s.property} ${s.direction}
+            </foreach>
+        </if>
+        <if test="page.sort == null">
+            order by isnull(t1.create_time), t1.create_time desc
+        </if>
+        limit #{page.offset}, #{page.size}
+    </select>
+
+
+    <select id="countTermsCaseRegister" resultType="java.lang.Long" >
+        SELECT
+        count(t1.id)
+        FROM
+        dyh_case_info t1
+        left join dyh_case_info_unfold t2 on t1.id = t2.id
+        <include refid="where-register-part"/>
+    </select>
     <!--  根据条件统计  -->
     <select id="countTermsAll" resultType="java.lang.Long">
         select
@@ -680,14 +792,32 @@
     <!--  统计分析(区域)  -->
     <select id="statisticsArea" resultType="cn.huge.module.cases.domain.dto.CaseStatisticsAreaDTO">
         SELECT
-        a.que_area as areaCode,a.que_area_name as areaName,count(1) as caseNum,
+        <if test="terms.areaType == null or terms.areaType ==''">
+            a.que_area as areaCode,a.que_area_name as areaName,
+        </if>
+        <if test='terms.areaType != null and terms.areaType =="1"'>
+            a.que_area as areaCode,a.que_area_name as areaName,
+        </if>
+        <if test='terms.areaType != null and terms.areaType =="2"'>
+            a.que_road as areaCode,a.que_road_name as areaName,
+        </if>
+        count(1) as caseNum,
         sum(case when b.medi_result = '22_00025-1' then 1 else 0 end) as resolveNum,
         sum(case when b.medi_result is null and a.info_process <![CDATA[ < ]]> 4 then 1 else 0 end) as resolveingNum,
         sum(case when b.medi_result = '22_00025-2' then 1 else 0 end) as unResolveNum
         FROM
         dyh_case_info a LEFT JOIN dyh_case_info_unfold b on a.id = b.id
         <include refid="where-part-all"/>
-        group by a.que_area
+        <if test="terms.areaType == null or terms.areaType ==''">
+            group by a.que_area
+        </if>
+        <if test='terms.areaType != null and terms.areaType =="1"'>
+            group by a.que_area
+        </if>
+        <if test='terms.areaType != null and terms.areaType =="2"'>
+            group by a.que_road
+        </if>
+
     </select>
     <!--  统计分析(基础)  -->
     <select id="statisticsBase" resultType="cn.huge.module.cases.domain.dto.CaseStatisticsBaseDTO">

--
Gitblit v1.8.0