举报列表 跟踪 业务类型 类别相对变更

src/main/java/com/ejweb/modules/report/entity/ReportEntity.java

@@ -33,6 +33,16 @@ public class ReportEntity extends DataEntity<ReportEntity> {
     private String supplementTitle;    //标题
     private String supplementType;    //业务类型地产 物业 酒店 商业
     private String transferGroup;   //移交部门所属集团
+    private String transferArea;   //移交区域
+
+    public String getTransferArea() {
+        return transferArea;
+    }
+
+    public void setTransferArea(String transferArea) {
+        this.transferArea = transferArea;
+    }
+
     private String transferDepartment;//移交部门 1 营销 2 工程 3 成本 4 招采 5人力 6物业 7投诉
     private String supplementArea;    //被举报区域
     private String supplementProject;    //被举报项目

src/main/resources/mappings/modules/report/ReportDao.xml

@@ -20,6 +20,7 @@
         /*r.supplement_type AS "supplementType",*/
         ct.name AS "transferDepartment",
          b2.label AS "transferGroup",
+         b3.name AS "transferArea",
         /*r.supplement_area AS "supplementArea",*/
         r.supplement_project AS "supplementProject",
         r.supplement_content AS "supplementContent",
@@ -68,6 +69,7 @@
         LEFT JOIN  ct_bbtc_bus_type CT ON r.transfer_department = CT.id
         LEFT JOIN ct_bbtc_sys_dict b on b.id = r.supplement_group
         LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.TRANSFERGROUP
+        LEFT JOIN ct_bbtc_region b3 on b3.id = r.transferArea
 
        /* LEFT JOIN ct_bbtc_bus_type CT
         ON R.supplement_group = CT.supplement_group
@@ -90,6 +92,7 @@
         ON RL.ID = UR.ROLE_ID
         LEFT JOIN ct_bbtc_sys_dict b on b.id = r.supplement_group
         LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.TRANSFERGROUP
+        LEFT JOIN ct_bbtc_region b3 on b3.id = r.transferArea
         LEFT JOIN ct_bbtc_region CR
         ON r.supplement_area = CR.id
         LEFT JOIN  ct_bbtc_bus_type CT
@@ -178,6 +181,10 @@
                 AND r.transferGroup = #{transferGroup}
             </if>
 
+              <if test="transferArea != null and transferArea != ''">
+                AND r.transferArea = #{transferArea}
+            </if>
+
             <if test="transferDepartment != null and transferDepartment != ''">
                 AND r.transfer_department LIKE
                 <if test="dbName == 'oracle'">'%'||#{transferDepartment}||'%'</if>
@@ -220,6 +227,7 @@
         ON RL.ID = UR.ROLE_ID
         LEFT JOIN ct_bbtc_sys_dict b on b.id = r.supplement_group
         LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.TRANSFERGROUP
+        LEFT JOIN ct_bbtc_region b3 on b3.id = r.transferArea
         LEFT JOIN ct_bbtc_region CR
         ON r.supplement_area = CR.id
         LEFT JOIN  ct_bbtc_bus_type CT
@@ -247,6 +255,9 @@
             <if test="transferGroup != null and transferGroup != ''">
                 AND r.transferGroup = #{transferGroup}
             </if>
+             <if test="transferArea != null and transferArea != ''">
+                AND r.transferArea = #{transferArea}
+            </if>
 
             <if test="transferDepartment != null and transferDepartment != ''">
                 AND r.transfer_department LIKE
@@ -270,6 +281,7 @@
         ON RL.ID = UR.ROLE_ID
         LEFT JOIN ct_bbtc_sys_dict b on b.id = r.supplement_group
         LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.TRANSFERGROUP
+        LEFT JOIN ct_bbtc_region b3 on b3.id = r.transferArea
         LEFT JOIN ct_bbtc_region CR
         ON r.supplement_area = CR.id
         LEFT JOIN  ct_bbtc_bus_type CT
@@ -387,6 +399,9 @@
             <if test="transferGroup != null and transferGroup != ''">
                 AND r.transferGroup = #{transferGroup}
             </if>
+              <if test="transferArea != null and transferArea != ''">
+                AND r.transferArea = #{transferArea}
+            </if>
 
             <if test="transferDepartment != null and transferDepartment != ''">
                 AND r.transfer_department LIKE
@@ -426,6 +441,7 @@
         ON r.transfer_department = CT.id
         LEFT JOIN ct_bbtc_sys_dict b on b.id = r.supplement_group
         LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.TRANSFERGROUP
+        LEFT JOIN ct_bbtc_region b3 on b3.id = r.transferArea
        /* LEFT JOIN ct_bbtc_bus_type CT
         ON R.supplement_group = CT.supplement_group
         LEFT JOIN ct_bbtc_bus_category CC
@@ -546,6 +562,7 @@
         supplement_informant = #{supplementInformant},
         supplement_type = #{supplementType},
         transferGroup=#{transferGroup},
+        transferArea=#{transferArea},
         transfer_department=#{transferDepartment},
         supplement_area = #{supplementArea},
         supplement_project = #{supplementProject},