20190715提交

.idea/artifacts/report_sunac_war_exploded.xml

 <component name="ArtifactManager">
   <artifact type="exploded-war" name="report_sunac:war exploded">
-    <output-path>$PROJECT_DIR$/out/artifacts/report_sunac_war_exploded</output-path>
+    <output-path>$PROJECT_DIR$/target/report_sunac</output-path>
     <root id="root">
       <element id="directory" name="WEB-INF">
         <element id="directory" name="classes">
@@ -38,8 +38,6 @@
           <element id="library" level="project" name="Maven: org.mybatis:mybatis:3.3.0" />
           <element id="library" level="project" name="Maven: org.mybatis:mybatis-spring:1.2.3" />
           <element id="library" level="project" name="Maven: com.alibaba:druid:1.0.29" />
-          <element id="library" level="module" name="Maven: com.alibaba:jconsole:1.8.0" module-name="report_sunac" />
-          <element id="library" level="module" name="Maven: com.alibaba:tools:1.8.0" module-name="report_sunac" />
           <element id="library" level="project" name="Maven: mysql:mysql-connector-java:5.1.30" />
           <element id="library" level="project" name="Maven: net.sourceforge.jtds:jtds:1.3.1" />
           <element id="library" level="project" name="Maven: org.springframework:spring-web:4.2.2.RELEASE" />
@@ -147,16 +145,9 @@
           <element id="library" level="project" name="Maven: xerces:xercesImpl:2.8.1" />
           <element id="library" level="project" name="Maven: com.google.zxing:core:2.2" />
           <element id="library" level="project" name="Maven: com.google.zxing:javase:2.2" />
-          <element id="library" level="module" name="Maven: org.wltea:analyzer:2012_u6" module-name="report_sunac" />
-          <element id="library" level="module" name="Maven: net.coobird:thumbnailator:0.4.2" module-name="report_sunac" />
-          <element id="library" level="module" name="Maven: com.ckfinder:apache-ant-zip:2.3" module-name="report_sunac" />
-          <element id="library" level="module" name="Maven: com.ckfinder:ckfinder:2.3" module-name="report_sunac" />
-          <element id="library" level="module" name="Maven: com.ckfinder:ckfinderplugin-fileeditor:2.3" module-name="report_sunac" />
-          <element id="library" level="module" name="Maven: com.ckfinder:ckfinderplugin-imageresize:2.3" module-name="report_sunac" />
           <element id="library" level="project" name="Maven: junit:junit:4.11" />
           <element id="library" level="project" name="Maven: org.hamcrest:hamcrest-core:1.3" />
           <element id="library" level="project" name="Maven: org.springframework:spring-test:4.2.2.RELEASE" />
-          <element id="library" level="module" name="Maven: bitwalker:UserAgentUtils:1.13" module-name="report_sunac" />
           <element id="library" level="project" name="Maven: com.kingdee.eas.cp.eip.sso.ltpa:LTPATokenManager:1.0.0" />
           <element id="library" level="project" name="Maven: jfree:jfreechart:1.0.13" />
           <element id="library" level="project" name="Maven: jfree:jcommon:1.0.16" />
@@ -164,8 +155,10 @@
           <element id="library" level="project" name="Maven: com.itextpdf:itext-asian:5.2.0" />
         </element>
       </element>
+      <element id="directory" name="META-INF">
+        <element id="file-copy" path="$PROJECT_DIR$/target/report_sunac/META-INF/MANIFEST.MF" />
+      </element>
       <element id="javaee-facet-resources" facet="report_sunac/web/Web" />
-      <element id="dir-copy" path="$PROJECT_DIR$" />
     </root>
   </artifact>
 </component>
\ No newline at end of file

.idea/compiler.xml

@@ -6,6 +6,10 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
+        <module name="api-cloudweb" />
+        <module name="api-commons" />
+        <module name="api-core" />
+        <module name="api-domain" />
         <module name="ejweb-manage" />
         <module name="it-faq-manage" />
         <module name="report_sunac" />
@@ -13,7 +17,21 @@
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel target="1.8">
+      <module name="api-cloud" target="1.8" />
+      <module name="api-cloudweb" target="1.8" />
+      <module name="api-commons" target="1.8" />
+      <module name="api-core" target="1.8" />
+      <module name="api-domain" target="1.8" />
       <module name="report_sunac" target="1.8" />
     </bytecodeTargetLevel>
   </component>
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
+      <module name="api-cloud" options="-parameters" />
+      <module name="api-cloudweb" options="-parameters" />
+      <module name="api-commons" options="-parameters" />
+      <module name="api-core" options="-parameters" />
+      <module name="api-domain" options="-parameters" />
+    </option>
+  </component>
 </project>
\ No newline at end of file

.idea/encodings.xml

@@ -2,6 +2,11 @@
 <project version="4">
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+    <file url="file://D:/xinao-officeassets-core" charset="UTF-8" />
+    <file url="file://D:/xinao-officeassets-core/api-cloudweb" charset="UTF-8" />
+    <file url="file://D:/xinao-officeassets-core/api-commons" charset="UTF-8" />
+    <file url="file://D:/xinao-officeassets-core/api-core" charset="UTF-8" />
+    <file url="file://D:/xinao-officeassets-core/api-domain" charset="UTF-8" />
     <file url="file://E:/sunac_report" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file

.idea/misc.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="FrameworkDetectionExcludesConfiguration">
-    <file type="web" url="file://$PROJECT_DIR$" />
     <file type="web" url="file://E:/sunac_report" />
+    <file type="web" url="file://$PROJECT_DIR$" />
   </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
@@ -14,7 +14,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file

report_sunac.iml

@@ -60,7 +60,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
         <CLASSES>
-          <root url="jar://D:/jdk/java/lib/jconsole.jar!/" />
+          <root url="jar://D:/java jdk/lib/jconsole.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -69,7 +69,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:tools:1.8.0">
         <CLASSES>
-          <root url="jar://D:/jdk/java/lib/tools.jar!/" />
+          <root url="jar://D:/java jdk/lib/tools.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

src/main/java/com/ejweb/core/filter/CORSFilter.java

@@ -43,6 +43,7 @@ public class CORSFilter implements Filter {
 
         // Authorize (allow) all domains to consume the content
         ((HttpServletResponse) servletResponse).addHeader("Access-Control-Allow-Origin", "*");
+        ((HttpServletResponse) servletResponse).setHeader("Access-Control-Allow-Headers", "accept,content-type");
         ((HttpServletResponse) servletResponse).addHeader("Access-Control-Allow-Methods","GET, OPTIONS, HEAD, PUT, POST");
 
         HttpServletResponse resp = (HttpServletResponse) servletResponse;

src/main/java/com/ejweb/core/geoip/IPSeeker.java

@@ -15,8 +15,7 @@ import java.util.Map;
 import java.util.StringTokenizer;
 
 import org.apache.log4j.Logger;
-import org.geo.split.RegionEntity;
-import org.geo.split.RegionSplit;
+
 
 import com.ejweb.conf.GConstants;
 import com.maxmind.geoip2.DatabaseReader;
@@ -24,6 +23,8 @@ import com.maxmind.geoip2.model.CityResponse;
 import com.maxmind.geoip2.record.City;
 import com.maxmind.geoip2.record.Country;
 import com.maxmind.geoip2.record.Subdivision;
+import org.geo.split.RegionEntity;
+import org.geo.split.RegionSplit;
 
 /**
  * 

src/main/java/com/ejweb/modules/report/dao/CtBbtcBusCategoryDao.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
+ */
+package com.ejweb.modules.report.dao;
+import com.ejweb.core.persistence.CrudDao;
+import com.ejweb.core.persistence.annotation.MyBatisDao;
+import com.ejweb.modules.report.entity.CtBbtcBusCategory;
+
+/**
+ * 业务类别DAO接口
+ * @author haoqm
+ * @version 2019-07-12
+ */
+@MyBatisDao
+public interface CtBbtcBusCategoryDao extends CrudDao<CtBbtcBusCategory> {
+	
+}
\ No newline at end of file

src/main/java/com/ejweb/modules/report/dao/CtBbtcBusTypeDao.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
+ */
+package com.ejweb.modules.report.dao;
+
+import com.ejweb.core.persistence.CrudDao;
+import com.ejweb.core.persistence.annotation.MyBatisDao;
+import com.ejweb.modules.report.entity.CtBbtcBusType;
+/**
+ * 业务类型DAO接口
+ * @author haoqm
+ * @version 2019-07-12
+ */
+@MyBatisDao
+public interface CtBbtcBusTypeDao extends CrudDao<CtBbtcBusType> {
+	
+}
\ No newline at end of file

src/main/java/com/ejweb/modules/report/dao/CtBbtcRegionDao.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
+ */
+package com.ejweb.modules.report.dao;
+
+import com.ejweb.core.persistence.CrudDao;
+import com.ejweb.core.persistence.annotation.MyBatisDao;
+import com.ejweb.modules.report.entity.CtBbtcRegion;
+
+/**
+ * 区域基础资料DAO接口
+ * @author haoqm
+ * @version 2019-07-12
+ */
+@MyBatisDao
+public interface CtBbtcRegionDao extends CrudDao<CtBbtcRegion> {
+	
+}
\ No newline at end of file

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

+/**
+ * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
+ */
+package com.ejweb.modules.report.entity;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.ejweb.core.persistence.DataEntity;
+
+/**
+ * 业务类别Entity
+ * @author haoqm
+ * @version 2019-07-12
+ */
+public class CtBbtcBusCategory extends DataEntity<CtBbtcBusCategory> {
+	
+	private static final long serialVersionUID = 1L;
+	private String number;		// 业务类别编码
+	private String name;		// 业务类别名称
+	private CtBbtcBusType type;		// 所属业务类型
+	
+	public CtBbtcBusCategory() {
+		super();
+	}
+
+	public CtBbtcBusCategory(String id){
+		super(id);
+	}
+
+	@Length(min=0, max=64, message="业务类别编码长度必须介于 0 和 64 之间")
+	public String getNumber() {
+		return number;
+	}
+
+	public void setNumber(String number) {
+		this.number = number;
+	}
+	
+	@Length(min=0, max=255, message="业务类别名称长度必须介于 0 和 255 之间")
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	@Length(min=0, max=64, message="所属业务类型长度必须介于 0 和 64 之间")
+	public CtBbtcBusType getType() {
+		return type;
+	}
+
+	public void setType(CtBbtcBusType type) {
+		this.type = type;
+	}
+	
+}
\ No newline at end of file

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

+/**
+ * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
+ */
+package com.ejweb.modules.report.entity;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.ejweb.core.persistence.DataEntity;
+import com.ejweb.modules.sys.entity.Dict;
+/**
+ * 业务类型Entity
+ * @author haoqm
+ * @version 2019-07-12
+ */
+public class CtBbtcBusType extends DataEntity<CtBbtcBusType> {
+	
+	private static final long serialVersionUID = 1L;
+	private String number;		// 业务类型编码
+	private String name;		// 业务类型名称
+	private String group;		// 所属集团
+	private String groupName;		// 所属集团名称
+	public CtBbtcBusType() {
+		super();
+	}
+
+	public CtBbtcBusType(String id){
+		super(id);
+	}
+
+	@Length(min=0, max=64, message="业务类型编码长度必须介于 0 和 64 之间")
+	public String getNumber() {
+		return number;
+	}
+
+	public void setNumber(String number) {
+		this.number = number;
+	}
+	
+	@Length(min=0, max=64, message="业务类型名称长度必须介于 0 和 64 之间")
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	@Length(min=0, max=64, message="所属集团长度必须介于 0 和 64 之间")
+	public String getGroup() {
+		return group;
+	}
+
+	public void setGroup(String group) {
+		this.group = group;
+	}
+	public String getGroupName() {
+		return groupName;
+	}
+
+	public void setGroupName(String groupName) {
+		this.groupName = groupName;
+	}
+}
\ No newline at end of file

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

+/**
+ * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
+ */
+package com.ejweb.modules.report.entity;
+
+import com.ejweb.modules.sys.entity.Dict;
+import org.hibernate.validator.constraints.Length;
+import com.ejweb.core.persistence.DataEntity;
+
+/**
+ * 区域基础资料Entity
+ * @author haoqm
+ * @version 2019-07-12
+ */
+public class CtBbtcRegion extends DataEntity<CtBbtcRegion> {
+	
+	private static final long serialVersionUID = 1L;
+	private String number;		// 区域编码
+	private String name;		// 区域名称
+	private String group;		// 所属集团
+	private String groupName;		// 所属集团名称
+
+	public CtBbtcRegion() {
+		super();
+	}
+
+	public CtBbtcRegion(String id){
+		super(id);
+	}
+
+	@Length(min=0, max=64, message="区域编码长度必须介于 0 和 64 之间")
+	public String getNumber() {
+		return number;
+	}
+
+	public void setNumber(String number) {
+		this.number = number;
+	}
+	
+	@Length(min=0, max=255, message="区域名称长度必须介于 0 和 255 之间")
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	@Length(min=0, max=64, message="所属集团长度必须介于 0 和 64 之间")
+	public String getGroup() {
+		return group;
+	}
+
+	public void setGroup(String group) {
+		this.group = group;
+	}
+
+	public String getGroupName() {
+		return groupName;
+	}
+
+	public void setGroupName(String groupName) {
+		this.groupName = groupName;
+	}
+	
+}
\ No newline at end of file

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

@@ -63,6 +63,17 @@ public class ReportEntity extends DataEntity<ReportEntity> {
     private String qq; //qq
     private String weixin; //微信号
     private String ifClue; //联系人是否可见
+
+
+    public String getFlage() {
+        return flage;
+    }
+
+    public void setFlage(String flage) {
+        this.flage = flage;
+    }
+
+    private String flage; //頁簽
     public String getIfClue() {
         return ifClue;
     }

src/main/java/com/ejweb/modules/report/service/CtBbtcBusCategoryService.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
+ */
+package com.ejweb.modules.report.service;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import com.ejweb.core.persistence.Page;
+import com.ejweb.core.service.CrudService;
+import com.ejweb.modules.report.entity.CtBbtcBusCategory;
+import com.ejweb.modules.report.dao.CtBbtcBusCategoryDao;
+
+/**
+ * 业务类别Service
+ * @author haoqm
+ * @version 2019-07-12
+ */
+@Service
+@Transactional(readOnly = true)
+public class CtBbtcBusCategoryService extends CrudService<CtBbtcBusCategoryDao, CtBbtcBusCategory> {
+
+	public CtBbtcBusCategory get(String id) {
+		return super.get(id);
+	}
+	
+	public List<CtBbtcBusCategory> findList(CtBbtcBusCategory ctBbtcBusCategory) {
+		return super.findList(ctBbtcBusCategory);
+	}
+	
+	public Page<CtBbtcBusCategory> findPage(Page<CtBbtcBusCategory> page, CtBbtcBusCategory ctBbtcBusCategory) {
+		return super.findPage(page, ctBbtcBusCategory);
+	}
+	
+	@Transactional(readOnly = false)
+	public void save(CtBbtcBusCategory ctBbtcBusCategory) {
+		super.save(ctBbtcBusCategory);
+	}
+	
+	@Transactional(readOnly = false)
+	public void delete(CtBbtcBusCategory ctBbtcBusCategory) {
+		super.delete(ctBbtcBusCategory);
+	}
+	
+}
\ No newline at end of file

src/main/java/com/ejweb/modules/report/service/CtBbtcBusTypeService.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
+ */
+package com.ejweb.modules.report.service;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import com.ejweb.core.persistence.Page;
+import com.ejweb.core.service.CrudService;
+import com.ejweb.modules.report.entity.CtBbtcBusType;
+import com.ejweb.modules.report.dao.CtBbtcBusTypeDao;
+
+
+/**
+ * 业务类型Service
+ * @author haoqm
+ * @version 2019-07-12
+ */
+@Service
+@Transactional(readOnly = true)
+public class CtBbtcBusTypeService extends CrudService<CtBbtcBusTypeDao, CtBbtcBusType> {
+
+	public CtBbtcBusType get(String id) {
+		return super.get(id);
+	}
+	
+	public List<CtBbtcBusType> findList(CtBbtcBusType ctBbtcBusType) {
+		return super.findList(ctBbtcBusType);
+	}
+	
+	public Page<CtBbtcBusType> findPage(Page<CtBbtcBusType> page, CtBbtcBusType ctBbtcBusType) {
+		return super.findPage(page, ctBbtcBusType);
+	}
+	
+	@Transactional(readOnly = false)
+	public void save(CtBbtcBusType ctBbtcBusType) {
+		super.save(ctBbtcBusType);
+	}
+	
+	@Transactional(readOnly = false)
+	public void delete(CtBbtcBusType ctBbtcBusType) {
+		super.delete(ctBbtcBusType);
+	}
+	
+}
\ No newline at end of file

src/main/java/com/ejweb/modules/report/service/CtBbtcRegionService.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
+ */
+package com.ejweb.modules.report.service;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import com.ejweb.core.persistence.Page;
+import com.ejweb.core.service.CrudService;
+import com.ejweb.modules.report.entity.CtBbtcRegion;
+import com.ejweb.modules.report.dao.CtBbtcRegionDao;
+
+
+/**
+ * 区域基础资料Service
+ * @author haoqm
+ * @version 2019-07-12
+ */
+@Service
+@Transactional(readOnly = true)
+public class CtBbtcRegionService extends CrudService<CtBbtcRegionDao, CtBbtcRegion> {
+
+	public CtBbtcRegion get(String id) {
+		return super.get(id);
+	}
+	
+	public List<CtBbtcRegion> findList(CtBbtcRegion ctBbtcRegion) {
+		return super.findList(ctBbtcRegion);
+	}
+	
+	public Page<CtBbtcRegion> findPage(Page<CtBbtcRegion> page, CtBbtcRegion ctBbtcRegion) {
+		return super.findPage(page, ctBbtcRegion);
+	}
+	
+	@Transactional(readOnly = false)
+	public void save(CtBbtcRegion ctBbtcRegion) {
+		super.save(ctBbtcRegion);
+	}
+	
+	@Transactional(readOnly = false)
+	public void delete(CtBbtcRegion ctBbtcRegion) {
+		super.delete(ctBbtcRegion);
+	}
+	
+}
\ No newline at end of file

src/main/java/com/ejweb/modules/report/service/ReportService.java

@@ -405,14 +405,14 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
                         value = "研发";
                     } else if (value.equals("11")) {
                         value = "投资";
+                    }else if (value.equals("15")) {
+                        value = "商业";
                     } else if (value.equals("12")) {
                         value = "其他";
                     } else if (value.equals("13")) {
                         value = "物业管理";
                     } else if (value.equals("14")) {
                         value = "文旅管理";
-                    } else if (value.equals("15")) {
-                        value = "商业";
                     }
                     typeStr = typeStr + value + ",";
                 }
@@ -445,14 +445,14 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
                     TransferDepartment = "研发";
                 } else if (TransferDepartment.equals("11")) {
                     TransferDepartment = "投资";
+                }   else if (TransferDepartment.equals("15")) {
+                    TransferDepartment = "商业";
                 } else if (TransferDepartment.equals("12")) {
                     TransferDepartment = "其他";
                 } else if (TransferDepartment.equals("13")) {
                     TransferDepartment = "物业管理";
                 } else if (TransferDepartment.equals("14")) {
                     TransferDepartment = "文旅管理";
-                } else if (TransferDepartment.equals("15")) {
-                    TransferDepartment = "商业";
                 }
             } else {
                 TransferDepartment = "";
@@ -610,14 +610,14 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
                         value = "研发";
                     } else if (value.equals("11")) {
                         value = "投资";
-                    } else if (value.equals("12")) {
+                    } else if (value.equals("15")) {
+                        value = "商业";
+                    } else if(value.equals("12")) {
                         value = "其他";
                     } else if (value.equals("13")) {
                         value = "物业管理";
                     } else if (value.equals("14")) {
                         value = "文旅管理";
-                    } else if (value.equals("15")) {
-                        value = "商业";
                     }
                     typeStr = typeStr + value + ",";
                 }
@@ -650,14 +650,14 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
                     TransferDepartment = "研发";
                 } else if (TransferDepartment.equals("11")) {
                     TransferDepartment = "投资";
+                }else if (TransferDepartment.equals("15")) {
+                    TransferDepartment = "商业";
                 } else if (TransferDepartment.equals("12")) {
                     TransferDepartment = "其他";
                 } else if (TransferDepartment.equals("13")) {
                     TransferDepartment = "物业管理";
                 } else if (TransferDepartment.equals("14")) {
                     TransferDepartment = "文旅管理";
-                } else if (TransferDepartment.equals("15")) {
-                    TransferDepartment = "商业";
                 }
             } else {
                 TransferDepartment = "";

src/main/java/com/ejweb/modules/report/web/CtBbtcBusCategoryController.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
+ */
+package com.ejweb.modules.report.web;
+
+import com.ejweb.core.base.BaseController;
+import com.ejweb.core.persistence.Page;
+
+import com.ejweb.core.utils.StringUtils;
+import com.ejweb.modules.report.entity.CtBbtcBusCategory;
+import com.ejweb.modules.report.service.CtBbtcBusCategoryService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 业务类别Controller
+ * @author haoqm
+ * @version 2019-07-12
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/report/ctBbtcBusCategory")
+public class CtBbtcBusCategoryController extends BaseController {
+	/**
+	 * 管理基础路径
+	 */
+	@Value("${adminPath}")
+	protected String adminPath;
+	@Autowired
+	private CtBbtcBusCategoryService ctBbtcBusCategoryService;
+	
+	@ModelAttribute
+	public CtBbtcBusCategory get(@RequestParam(required=false) String id) {
+		CtBbtcBusCategory entity = null;
+		if (StringUtils.isNotBlank(id)){
+			entity = ctBbtcBusCategoryService.get(id);
+		}
+		if (entity == null){
+			entity = new CtBbtcBusCategory();
+		}
+		return entity;
+	}
+	
+	@RequiresPermissions("report:ctBbtcBusCategory:view")
+	@RequestMapping(value = {"list", ""})
+	public String list(CtBbtcBusCategory ctBbtcBusCategory, HttpServletRequest request, HttpServletResponse response, Model model) {
+		Page<CtBbtcBusCategory> page = ctBbtcBusCategoryService.findPage(new Page<CtBbtcBusCategory>(request, response), ctBbtcBusCategory); 
+		model.addAttribute("page", page);
+		return "modules/report/ctBbtcBusCategoryList";
+	}
+
+	@RequiresPermissions("report:ctBbtcBusCategory:view")
+	@RequestMapping(value = "form")
+	public String form(CtBbtcBusCategory ctBbtcBusCategory, Model model) {
+		model.addAttribute("ctBbtcBusCategory", ctBbtcBusCategory);
+		return "modules/report/ctBbtcBusCategoryForm";
+	}
+
+	@RequiresPermissions("report:ctBbtcBusCategory:edit")
+	@RequestMapping(value = "save")
+	public String save(CtBbtcBusCategory ctBbtcBusCategory, Model model, RedirectAttributes redirectAttributes) {
+		if (!beanValidator(model, ctBbtcBusCategory)){
+			return form(ctBbtcBusCategory, model);
+		}
+		ctBbtcBusCategoryService.save(ctBbtcBusCategory);
+		addMessage(redirectAttributes, "保存业务类别成功");
+		return "redirect:"+adminPath+"/report/ctBbtcBusCategory/?repage";
+	}
+	
+	@RequiresPermissions("report:ctBbtcBusCategory:edit")
+	@RequestMapping(value = "delete")
+	public String delete(CtBbtcBusCategory ctBbtcBusCategory, RedirectAttributes redirectAttributes) {
+		ctBbtcBusCategoryService.delete(ctBbtcBusCategory);
+		addMessage(redirectAttributes, "删除业务类别成功");
+		return "redirect:"+adminPath+"/report/ctBbtcBusCategory/?repage";
+	}
+
+}
\ No newline at end of file

src/main/java/com/ejweb/modules/report/web/CtBbtcBusTypeController.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
+ */
+package com.ejweb.modules.report.web;
+
+import com.ejweb.core.base.BaseController;
+import com.ejweb.core.persistence.Page;
+
+import com.ejweb.core.utils.StringUtils;
+import com.ejweb.modules.report.entity.CtBbtcBusType;
+import com.ejweb.modules.report.service.CtBbtcBusTypeService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+/**
+ * 业务类型Controller
+ * @author haoqm
+ * @version 2019-07-12
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/report/ctBbtcBusType")
+public class CtBbtcBusTypeController extends BaseController {
+	/**
+	 * 管理基础路径
+	 */
+	@Value("${adminPath}")
+	protected String adminPath;
+
+	@Autowired
+	private CtBbtcBusTypeService ctBbtcBusTypeService;
+	
+	@ModelAttribute
+	public CtBbtcBusType get(@RequestParam(required=false) String id) {
+		CtBbtcBusType entity = null;
+		if (StringUtils.isNotBlank(id)){
+			entity = ctBbtcBusTypeService.get(id);
+		}
+		if (entity == null){
+			entity = new CtBbtcBusType();
+		}
+		return entity;
+	}
+	
+	@RequiresPermissions("report:ctBbtcBusType:view")
+	@RequestMapping(value = {"list", ""})
+	public String list(CtBbtcBusType ctBbtcBusType, HttpServletRequest request, HttpServletResponse response, Model model) {
+		Page<CtBbtcBusType> page = ctBbtcBusTypeService.findPage(new Page<CtBbtcBusType>(request, response), ctBbtcBusType); 
+		model.addAttribute("page", page);
+		return "modules/report/ctBbtcBusTypeList";
+	}
+
+	@RequiresPermissions("report:ctBbtcBusType:view")
+	@RequestMapping(value = "form")
+	public String form(CtBbtcBusType ctBbtcBusType, Model model) {
+		model.addAttribute("ctBbtcBusType", ctBbtcBusType);
+		return "modules/report/ctBbtcBusTypeForm";
+	}
+
+	@RequiresPermissions("report:ctBbtcBusType:edit")
+	@RequestMapping(value = "save")
+	public String save(CtBbtcBusType ctBbtcBusType, Model model, RedirectAttributes redirectAttributes) {
+		if (!beanValidator(model, ctBbtcBusType)){
+			return form(ctBbtcBusType, model);
+		}
+		ctBbtcBusTypeService.save(ctBbtcBusType);
+		addMessage(redirectAttributes, "保存业务类型成功");
+		return "redirect:"+adminPath+"/report/ctBbtcBusType/?repage";
+	}
+	
+	@RequiresPermissions("report:ctBbtcBusType:edit")
+	@RequestMapping(value = "delete")
+	public String delete(CtBbtcBusType ctBbtcBusType, RedirectAttributes redirectAttributes) {
+		ctBbtcBusTypeService.delete(ctBbtcBusType);
+		addMessage(redirectAttributes, "删除业务类型成功");
+		return "redirect:"+adminPath+"/report/ctBbtcBusType/?repage";
+	}
+
+}
\ No newline at end of file

src/main/java/com/ejweb/modules/report/web/CtBbtcRegionController.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
+ */
+package com.ejweb.modules.report.web;
+
+import com.ejweb.core.base.BaseController;
+import com.ejweb.core.persistence.Page;
+
+import com.ejweb.core.utils.StringUtils;
+import com.ejweb.modules.report.entity.CtBbtcRegion;
+import com.ejweb.modules.report.service.CtBbtcRegionService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 区域基础资料Controller
+ * @author haoqm
+ * @version 2019-07-12
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/report/ctBbtcRegion")
+public class CtBbtcRegionController extends BaseController {
+	/**
+	 * 管理基础路径
+	 */
+	@Value("${adminPath}")
+	protected String adminPath;
+	@Autowired
+	private CtBbtcRegionService ctBbtcRegionService;
+	
+	@ModelAttribute
+	public CtBbtcRegion get(@RequestParam(required=false) String id) {
+		CtBbtcRegion entity = null;
+		if (StringUtils.isNotBlank(id)){
+			entity = ctBbtcRegionService.get(id);
+		}
+		if (entity == null){
+			entity = new CtBbtcRegion();
+		}
+		return entity;
+	}
+	
+	@RequiresPermissions("report:ctBbtcRegion:view")
+	@RequestMapping(value = {"list", ""})
+	public String list(CtBbtcRegion ctBbtcRegion, HttpServletRequest request, HttpServletResponse response, Model model) {
+		Page<CtBbtcRegion> page = ctBbtcRegionService.findPage(new Page<CtBbtcRegion>(request, response), ctBbtcRegion); 
+		model.addAttribute("page", page);
+		return "modules/report/ctBbtcRegionList";
+	}
+
+	@RequiresPermissions("report:ctBbtcRegion:view")
+	@RequestMapping(value = "form")
+	public String form(CtBbtcRegion ctBbtcRegion, Model model) {
+		model.addAttribute("ctBbtcRegion", ctBbtcRegion);
+		return "modules/report/ctBbtcRegionForm";
+	}
+
+	@RequiresPermissions("report:ctBbtcRegion:edit")
+	@RequestMapping(value = "save")
+	public String save(CtBbtcRegion ctBbtcRegion, Model model, RedirectAttributes redirectAttributes) {
+		if (!beanValidator(model, ctBbtcRegion)){
+			return form(ctBbtcRegion, model);
+		}
+		ctBbtcRegionService.save(ctBbtcRegion);
+		addMessage(redirectAttributes, "保存区域基础资料成功");
+		return "redirect:"+adminPath+"/report/ctBbtcRegion/?repage";
+	}
+	
+	@RequiresPermissions("report:ctBbtcRegion:edit")
+	@RequestMapping(value = "delete")
+	public String delete(CtBbtcRegion ctBbtcRegion, RedirectAttributes redirectAttributes) {
+		ctBbtcRegionService.delete(ctBbtcRegion);
+		addMessage(redirectAttributes, "删除区域基础资料成功");
+		return "redirect:"+adminPath+"/report/ctBbtcRegion/?repage";
+	}
+
+}
\ No newline at end of file

src/main/java/com/ejweb/modules/report/web/ReportController.java

@@ -77,6 +77,7 @@ public class ReportController extends BaseController {
     public String list(ReportEntity reportEntity, String flag, HttpServletRequest request, HttpServletResponse response, Model model) {
         //判断登录人的角色
         User user = UserUtils.getUser();
+//        User user = UserUtils.getByLoginName("wuhaifeng1");
         //判断标签状态 flag为空，跳转到核查中举报列表 flag为0，跳转到未处理举报列表 flag为1，跳转到举报列表, flag为2，跳转到已处理举报列表
         if (StringUtils.isNotBlank(flag)) {
             if (flag.equals("0")) {
@@ -87,6 +88,7 @@ public class ReportController extends BaseController {
                 if (flag.equals("4")) {
                     if (StringUtils.isBlank(reportEntity.getReportStatus())) {
                         reportEntity.setDealResult("7");
+                        reportEntity.setFlage("1");
                     }
                 } else {
                     if (StringUtils.isBlank(reportEntity.getReportStatus())) {
@@ -223,6 +225,7 @@ public class ReportController extends BaseController {
                 if (flag.equals("4")) {
                     if (StringUtils.isBlank(reportEntity.getReportStatus())) {
                         reportEntity.setDealResult("7");
+                        reportEntity.setFlage("1");
                     }
                 } else {
                     if (StringUtils.isBlank(reportEntity.getReportStatus())) {
@@ -389,7 +392,8 @@ public class ReportController extends BaseController {
         reportAttachment.setAttachmentType("0");
         if (StringUtils.isNoneBlank(reportEntity.getSupplementType())) {
             String supplementType = "";
-            String[] supplementTypes = {"营销", "工程", "成本", "招采", "财务", "法务", "行政", "人力", "开发", "研发", "投资", "商业","其他", "物业管理", "文旅管理"};
+            String[] supplementTypes = {"营销", "工程", "成本", "招采", "财务", "法务", "行政", "人力", "开发", "研发", "投资", "其他", "物业管理", "文旅管理","商业"};
+
             String typeNumber[] = reportEntity.getSupplementType().split(",");
             for (int i = 0; i < typeNumber.length; i++) {
                 supplementType += supplementTypes[Integer.valueOf(typeNumber[i]) - 1] + ",";
@@ -449,14 +453,14 @@ public class ReportController extends BaseController {
                 reportEntity.setTransferDepartment("研发");
             } else if (reportEntity.getTransferDepartment().equals("11")) {
                 reportEntity.setTransferDepartment("投资");
+            } else if (reportEntity.getTransferDepartment().equals("15")) {
+                reportEntity.setTransferDepartment("商业");
             } else if (reportEntity.getTransferDepartment().equals("12")) {
                 reportEntity.setTransferDepartment("其他");
             } else if (reportEntity.getTransferDepartment().equals("13")) {
                 reportEntity.setTransferDepartment("物业管理");
             } else if (reportEntity.getTransferDepartment().equals("14")) {
                 reportEntity.setTransferDepartment("文旅管理");
-            } else if (reportEntity.getTransferDepartment().equals("15")) {
-                reportEntity.setTransferDepartment("商业");
             }
         }
         if (isAdmin.equals("1") || isAdmin.equals("2")) {
@@ -492,7 +496,8 @@ public class ReportController extends BaseController {
         List<Office> officeList = reportService.getOfficeList(new Office());
         List<Position> positionList = reportService.getPositionList();
         User userEntity = new User();
-        Page<User> page = reportService.findUserPage(new Page<User>(request, response), userEntity);
+        Page<User> page = reportService.findUserPage(new Page<User>(1, 30), userEntity);
+        // Page<User> page = reportService.findUserPage(new Page<User>(request, response), userEntity);
 
         //获取举报提交文件列表
         ReportAttachmentEntity reportAttachment = new ReportAttachmentEntity();
@@ -512,7 +517,7 @@ public class ReportController extends BaseController {
         //业务类型
         String supplementTypeStr = "";
         if (StringUtils.isNotBlank(reportEntity.getSupplementType())) {
-            String[] supplementTypes = {"营销", "工程", "成本", "招采", "财务", "法务", "行政", "人力", "开发", "研发", "投资", "商业","其他", "物业管理", "文旅管理" };
+            String[] supplementTypes = {"营销", "工程", "成本", "招采", "财务", "法务", "行政", "人力", "开发", "研发", "投资", "其他", "物业管理", "文旅管理","商业"};
             String typeNumber[] = reportEntity.getSupplementType().split(",");
             for (int i = 0; i < typeNumber.length; i++) {
                 supplementTypeStr += supplementTypes[Integer.valueOf(typeNumber[i]) - 1] + ",";
@@ -586,22 +591,18 @@ public class ReportController extends BaseController {
         if ("ifDone".equals(ifDone)) {
             reportEntity.setReportStatus("2");
         }
-
-
         //判断如果是辅助管理员
-        if (reportService.updateCheckRole(transferUser).equals("辅助管理员")) {
-            reportEntity.setExchangeBeforeUser(transferUser);
-
+        if (reportService.checkRole(user).equals("2") || reportService.updateCheckRole(transferUser).equals("辅助管理员")) {
+            reportEntity.setExchangeBeforeUser(user.getId());
         }
+
         if (StringUtils.isBlank(reportEntity.getExchangeAfterUser())) {
             String exchangeAfterUser = reportService.findExchangeUser(reportEntity.getId());
             reportEntity.setExchangeAfterUser(exchangeAfterUser);
         }
-        if (reportEntity.getDealResult().equals("6") || reportEntity.getDealResult().equals("6") || reportEntity.getDealResult().equals("1") || reportEntity.getDealResult().equals("2") || reportEntity.getDealResult().equals("4")
-                || (reportEntity.getDealResult().equals("3") && StringUtils.isNotBlank(ifDone))) {
-            if (StringUtils.isBlank(reportEntity.getDealPersonName())) {
-                reportEntity.setDealPersonName(reportEntity.getDealPerson());
-            }
+//
+        if (StringUtils.isBlank(reportEntity.getDealPersonName())) {
+            reportEntity.setDealPersonName(reportEntity.getDealPerson());
         }
         reportService.saveTrack(reportEntity, transferUser);
 
@@ -633,6 +634,7 @@ public class ReportController extends BaseController {
     @RequestMapping(value = "viewTransfer")
     public void viewTransfer(User user, String flag, HttpServletRequest request, HttpServletResponse
             response, Model model) throws IOException {
+
         Page<User> page = reportService.findUserPage(new Page<User>(request, response), user);
         StringBuffer html = new StringBuffer();
         html.append("<table id='contentTable' class='table table-striped table-bordered table-condensed'>");
@@ -729,7 +731,8 @@ public class ReportController extends BaseController {
             } else {
                 if (flag.equals("4")) {
                     if (StringUtils.isBlank(reportEntity.getReportStatus())) {
-                        reportEntity.setReportStatus("4");
+                        reportEntity.setDealResult("7");
+                        reportEntity.setFlage("1");
                     }
                 } else {
                     if (StringUtils.isBlank(reportEntity.getReportStatus())) {
@@ -787,7 +790,8 @@ public class ReportController extends BaseController {
             } else {
                 if (flag.equals("4")) {
                     if (StringUtils.isBlank(reportEntity.getReportStatus())) {
-                        reportEntity.setReportStatus("4");
+                        reportEntity.setDealResult("7");
+                        reportEntity.setFlage("1");
                     }
                 } else {
                     if (StringUtils.isBlank(reportEntity.getReportStatus())) {
@@ -880,14 +884,14 @@ public class ReportController extends BaseController {
                         value = "研发";
                     } else if (value.equals("11")) {
                         value = "投资";
+                    } else if (value.equals("15")) {
+                        value = "商业";
                     } else if (value.equals("12")) {
                         value = "其他";
                     } else if (value.equals("13")) {
                         value = "物业管理";
                     } else if (value.equals("14")) {
                         value = "文旅管理";
-                    } else if (value.equals("15")) {
-                        value = "商业";
                     }
                     typeStr = typeStr + value + ",";
                 }
@@ -939,7 +943,6 @@ public class ReportController extends BaseController {
     @RequestMapping(value = "conclusion")
     public String closeConclusion(ReportEntity reportEntity) {
         reportService.updateConclusion(reportEntity);
-        //return "modules/report/reportDetail";
         return "redirect:" + adminPath + "/report/list/?repage&flag=0";
     }
 

src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java

@@ -74,14 +74,14 @@ public class WorkbenchController extends BaseController {
             res.put("closed", bean.getClosed());
             //举报结果
             res.put("unsettled", bean.getUnsettled());
-            res.put("invalid", bean.getInvalid());
-            res.put("complainNum", bean.getComplainNum());
-            res.put("verified", bean.getVerified());
-            res.put("confirmed", bean.getConfirmed());
-            res.put("unreaListic", bean.getUnreaListic());
-            res.put("reportWeichuli", bean.getTotalCount() - bean.getInvalid() - bean.getComplainNum() - bean.getVerified() - bean.getConfirmed() - bean.getUnreaListic() - bean.getTransfer());
-            res.put("transfer", bean.getTransfer());
-            res.put("clue", bean.getClue());
+            res.put("resultNum", bean.getComplainNum()+bean.getInvalid()+bean.getVerified()+bean.getConfirmed()+bean.getUnreaListic()+bean.getTransfer()+bean.getClue()); //總數
+            res.put("complainNum", bean.getComplainNum()); //移交客诉
+            res.put("invalid", bean.getInvalid());//举报无效
+            res.put("verified", bean.getVerified()); //举报受理
+            res.put("confirmed", bean.getConfirmed());//举报属实
+            res.put("unreaListic", bean.getUnreaListic());//举报不实
+            res.put("transfer", bean.getTransfer()); //移交其他部门
+            res.put("clue", bean.getClue());//转为线索
             res.put("startDate", bean.getStartDate());
             res.put("endDate", bean.getEndDate());
             //举报类型

src/main/resources/jdbc.properties

@@ -17,13 +17,22 @@ db.table.prefix=sunac_
 #jdbc.password= sunac
 
 #正式数据库
-jdbc.type=oracle
-jdbc.driver.class=oracle.jdbc.driver.OracleDriver
-jdbc.url=jdbc:oracle:thin:@192.168.2.24:1521:eas1
-jdbc.username= easdba
-jdbc.password= Sunac_1918
+#jdbc.type=oracle
+#jdbc.driver.class=oracle.jdbc.driver.OracleDriver
+#jdbc.url=jdbc:oracle:thin:@192.168.2.24:1521:eas1
+#jdbc.username= easdba
+#jdbc.password= Sunac_1918
 #
 
+#本地测试库
+jdbc.type=mysql
+jdbc.driver.class=com.mysql.jdbc.Driver
+jdbc.url=jdbc\:mysql\://localhost\:3306/sunac_report?useUnicode\=true&characterEncoding\=utf-8
+jdbc.username=root
+jdbc.password=123456
+
+
+
 #初始化连接
 jdbc.initialSize=0
 #连接池的最大活动个数

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ejweb.modules.report.dao.CtBbtcBusCategoryDao">
+    
+	<sql id="ctBbtcBusCategoryColumns">
+		a.id AS "id",
+		a.number AS "number",
+		a.name AS "name",
+		a.type AS "type"
+	</sql>
+	
+	<sql id="ctBbtcBusCategoryJoins">
+	</sql>
+    
+	<select id="get" resultType="CtBbtcBusCategory">
+		SELECT 
+			<include refid="ctBbtcBusCategoryColumns"/>
+		FROM ct_bbtc_bus_category a
+		<include refid="ctBbtcBusCategoryJoins"/>
+		WHERE a.id = #{id}
+	</select>
+	
+	<select id="findList" resultType="CtBbtcBusCategory">
+		SELECT 
+			<include refid="ctBbtcBusCategoryColumns"/>
+		FROM ct_bbtc_bus_category a
+		<include refid="ctBbtcBusCategoryJoins"/>
+		<where>
+			
+			<if test="name != null and name != ''">
+				AND a.name LIKE 
+					<if test="dbName == 'oracle'">'%'||#{name}||'%'</if>
+					<if test="dbName == 'mssql'">'%'+#{name}+'%'</if>
+					<if test="dbName == 'mysql'">concat('%',#{name},'%')</if>
+			</if>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+	
+	<select id="findAllList" resultType="CtBbtcBusCategory">
+		SELECT 
+			<include refid="ctBbtcBusCategoryColumns"/>
+		FROM ct_bbtc_bus_category a
+		<include refid="ctBbtcBusCategoryJoins"/>
+		<where>
+			
+		</where>		
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+	
+	<insert id="insert">
+		INSERT INTO ct_bbtc_bus_category(
+			id,
+			number,
+			name,
+			type
+		) VALUES (
+			#{id},
+			#{number},
+			#{name},
+			#{type}
+		)
+	</insert>
+	
+	<update id="update">
+		UPDATE ct_bbtc_bus_category SET 	
+			number = #{number},
+			name = #{name},
+			type = #{type}
+		WHERE id = #{id}
+	</update>
+	
+	<update id="delete">
+		DELETE FROM ct_bbtc_bus_category
+		WHERE id = #{id}
+	</update>
+	
+</mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ejweb.modules.report.dao.CtBbtcBusTypeDao">
+    
+	<sql id="ctBbtcBusTypeColumns">
+		a.id AS "id",
+		a.number AS "number",
+		a.name AS "name",
+		a.supplement_group AS "group",
+		b.label AS "groupName"
+	</sql>
+	
+	<sql id="ctBbtcBusTypeJoins">
+		LEFT JOIN ct_bbtc_sys_dict b on b.id = a.supplement_group
+	</sql>
+    
+	<select id="get" resultType="CtBbtcBusType">
+		SELECT 
+			<include refid="ctBbtcBusTypeColumns"/>
+		FROM ct_bbtc_bus_type a
+		<include refid="ctBbtcBusTypeJoins"/>
+		WHERE a.id = #{id}
+	</select>
+	
+	<select id="findList" resultType="CtBbtcBusType">
+		SELECT 
+			<include refid="ctBbtcBusTypeColumns"/>
+		FROM ct_bbtc_bus_type a
+		<include refid="ctBbtcBusTypeJoins"/>
+		<where>
+			
+			<if test="name != null and name != ''">
+				AND a.name LIKE 
+					<if test="dbName == 'oracle'">'%'||#{name}||'%'</if>
+					<if test="dbName == 'mssql'">'%'+#{name}+'%'</if>
+					<if test="dbName == 'mysql'">concat('%',#{name},'%')</if>
+			</if>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+	
+	<select id="findAllList" resultType="CtBbtcBusType">
+		SELECT 
+			<include refid="ctBbtcBusTypeColumns"/>
+		FROM ct_bbtc_bus_type a
+		<include refid="ctBbtcBusTypeJoins"/>
+		<where>
+			
+		</where>		
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+	
+	<insert id="insert">
+		INSERT INTO ct_bbtc_bus_type(
+			id,
+			number,
+			name,
+			supplement_group
+		) VALUES (
+			#{id},
+			#{number},
+			#{name},
+			#{group}
+		)
+	</insert>
+	
+	<update id="update">
+		UPDATE ct_bbtc_bus_type SET 	
+			number = #{number},
+			name = #{name},
+			supplement_group = #{group}
+		WHERE id = #{id}
+	</update>
+	
+	<update id="delete">
+		DELETE FROM ct_bbtc_bus_type
+		WHERE id = #{id}
+	</update>
+	
+</mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ejweb.modules.report.dao.CtBbtcRegionDao">
+    
+	<sql id="ctBbtcRegionColumns">
+		a.id AS "id",
+		a.number AS "number",
+		a.name AS "name",
+		a.supplement_group AS "group",
+		b.label AS "groupName"
+	</sql>
+	
+	<sql id="ctBbtcRegionJoins">
+		LEFT JOIN ct_bbtc_sys_dict b on b.id = a.supplement_group
+	</sql>
+    
+	<select id="get" resultType="CtBbtcRegion">
+		SELECT 
+			<include refid="ctBbtcRegionColumns"/>
+		FROM ct_bbtc_region a
+		<include refid="ctBbtcRegionJoins"/>
+		WHERE a.id = #{id}
+	</select>
+	
+	<select id="findList" resultType="CtBbtcRegion">
+		SELECT 
+			<include refid="ctBbtcRegionColumns"/>
+		FROM ct_bbtc_region a
+		<include refid="ctBbtcRegionJoins"/>
+		<where>
+			
+			<if test="name != null and name != ''">
+				AND a.name LIKE 
+					<if test="dbName == 'oracle'">'%'||#{name}||'%'</if>
+					<if test="dbName == 'mssql'">'%'+#{name}+'%'</if>
+					<if test="dbName == 'mysql'">concat('%',#{name},'%')</if>
+			</if>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+	
+	<select id="findAllList" resultType="CtBbtcRegion">
+		SELECT 
+			<include refid="ctBbtcRegionColumns"/>
+		FROM ct_bbtc_region a
+		<include refid="ctBbtcRegionJoins"/>
+		<where>
+			
+		</where>		
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+	
+	<insert id="insert">
+		INSERT INTO ct_bbtc_region(
+			id,
+			number,
+			name,
+			supplement_group
+		) VALUES (
+			#{id},
+			#{number},
+			#{name},
+			#{group}
+		)
+	</insert>
+	
+	<update id="update">
+		UPDATE ct_bbtc_region SET 	
+			number = #{number},
+			name = #{name},
+			supplement_group = #{group}
+		WHERE id = #{id}
+	</update>
+	
+	<update id="delete">
+		DELETE FROM ct_bbtc_region
+		WHERE id = #{id}
+	</update>
+	
+</mapper>
\ No newline at end of file

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

@@ -64,9 +64,13 @@
         SELECT
         <include refid="reportColumns"/>
         ,su.name AS "transferName"
-        FROM ct_bbtc_report r
-        LEFT JOIN ct_bbtc_sys_user SU
-        ON r.create_by = SU.ID
+        FROM CT_BBTC_REPORT R
+        LEFT JOIN CT_BBTC_SYS_USER SU
+        ON R.CREATE_BY = SU.ID
+        LEFT JOIN CT_BBTC_SYS_USER2ROLE UR
+        ON UR.USER_ID = SU.ID
+        LEFT JOIN CT_BBTC_SYS_ROLE RL
+        ON RL.ID = UR.ROLE_ID
         <where>
             1 = 1
             <if test="isAdmin == null and isFzAdmin == null">
@@ -78,9 +82,7 @@
             <if test="isFzAdmin != null">
                 AND ((R.EXCHANGE_BEFORE_USER = #{exchangeBeforeUser} OR
                 R.EXCHANGE_AFTER_USER = #{exchangeBeforeUser}
-                OR R.CREATE_BY = #{exchangeBeforeUser}) AND
-                su.role_id='1'or su.role_id='2')
-
+                OR R.CREATE_BY = #{exchangeBeforeUser})) AND SU.AREA IS NULL
             </if>
             <if test="reportStatus != null and reportStatus != ''">
                 AND r.report_status = #{reportStatus}
@@ -128,6 +130,7 @@
             </if>
             <if test="dealResult != null and dealResult != ''">
                 AND r.deal_result = #{dealResult}
+
             </if>
             <if test="supplementInformant != null and supplementInformant != ''">
                 AND r.supplement_informant LIKE
@@ -147,6 +150,14 @@
             <if test="oaname != null and oaname != ''">
                 AND r.oa_name = #{oaname}
             </if>
+            <choose>
+                <when test="flage != null and flage != ''">
+                    AND r.deal_result = 7
+                </when>
+                <otherwise>
+                    AND (  r.deal_result != 7  OR r.deal_result IS NULL )
+                </otherwise>
+            </choose>
         </where>
         ORDER BY r.update_date DESC
     </select>
@@ -158,8 +169,8 @@
         FROM ct_bbtc_report r
         LEFT JOIN ct_bbtc_sys_user su ON r.create_by = su.id
         LEFT JOIN CT_BBTC_SYS_USER2ROLE UR ON UR.USER_ID = su.ID
-        LEFT JOIN CT_BBTC_SYS_ROLE R
-        ON R.ID = UR.ROLE_ID
+        LEFT JOIN CT_BBTC_SYS_ROLE RL
+        ON RL.ID = UR.ROLE_ID
         <where>
             1 = 1
             <if test="isAdmin == null and isFzAdmin == null">
@@ -178,7 +189,7 @@
                 'PropertyGroup')
             </if>
             <if test="isFzAdmin != null">
-                AND r.exchange_before_user = #{exchangeBeforeUser}
+                AND r.Exchange_After_User = #{exchangeBeforeUser}
                 AND r.create_by != #{exchangeBeforeUser}
                 AND su.area IN ('North China',
                 'BeiJing',
@@ -237,6 +248,7 @@
             </if>
             <if test="dealResult != null and dealResult != ''">
                 AND r.deal_result = #{dealResult}
+
             </if>
             <if test="supplementInformant != null and supplementInformant != ''">
                 AND r.supplement_informant LIKE
@@ -256,6 +268,14 @@
             <if test="oaname != null and oaname != ''">
                 AND r.oa_name = #{oaname}
             </if>
+            <choose>
+                <when test="flage != null and flage != ''">
+                    AND r.deal_result = 7
+                </when>
+                <otherwise>
+                    AND (  r.deal_result != 7  OR r.deal_result IS NULL )
+                </otherwise>
+            </choose>
         </where>
         ORDER BY r.update_date DESC
     </select>

src/main/webapp/WEB-INF/views/modules/report/ctBbtcBusCategoryForm.jsp

+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<html>
+<head>
+	<title>业务类别管理</title>
+	<meta name="decorator" content="default"/>
+	<script type="text/javascript">
+		$(document).ready(function() {
+			//$("#name").focus();
+			$("#inputForm").validate({
+				submitHandler: function(form){
+					loading('正在提交，请稍等...');
+					form.submit();
+				},
+				errorContainer: "#messageBox",
+				errorPlacement: function(error, element) {
+					$("#messageBox").text("输入有误，请先更正。");
+					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+						error.appendTo(element.parent().parent());
+					} else {
+						error.insertAfter(element);
+					}
+				}
+			});
+		});
+	</script>
+</head>
+<body>
+	<ul class="nav nav-tabs">
+		<li><a href="${ctx}/report/ctBbtcBusCategory/">业务类别列表</a></li>
+		<li class="active"><a href="${ctx}/report/ctBbtcBusCategory/form?id=${ctBbtcBusCategory.id}">业务类别<shiro:hasPermission name="report:ctBbtcBusCategory:edit">${not empty ctBbtcBusCategory.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="report:ctBbtcBusCategory:edit">查看</shiro:lacksPermission></a></li>
+	</ul><br/>
+	<form:form id="inputForm" modelAttribute="ctBbtcBusCategory" action="${ctx}/report/ctBbtcBusCategory/save" method="post" class="form-horizontal">
+		<form:hidden path="id"/>
+		<sys:message content="${message}"/>		
+		<div class="control-group">
+			<label class="control-label">业务类别编码：</label>
+			<div class="controls">
+				<form:input path="number" htmlEscape="false" maxlength="64" class="input-xlarge "/>
+				<span class="help-inline"><font color="red">*</font> </span>
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label">业务类别名称：</label>
+			<div class="controls">
+				<form:input path="name" htmlEscape="false" maxlength="255" class="input-xlarge "/>
+				<span class="help-inline"><font color="red">*</font> </span>
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label">所属业务类型：</label>
+			<div class="controls">
+				<form:select onchange="resetPageNo();" path="type" class="input-small">
+					<form:option value=" ">请选择</form:option>
+					<form:options items="${ctBbtcBusType}" itemLabel="name" itemValue="id"
+								  htmlEscape="false"/></form:select>
+				<%--<form:input path="type" htmlEscape="false" maxlength="64" class="input-xlarge "/>--%>
+				<span class="help-inline"><font color="red">*</font> </span>
+			</div>
+		</div>
+		<div class="form-actions">
+			<shiro:hasPermission name="report:ctBbtcBusCategory:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>
+			<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
+		</div>
+	</form:form>
+</body>
+</html>
\ No newline at end of file

src/main/webapp/WEB-INF/views/modules/report/ctBbtcBusCategoryList.jsp

+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<html>
+<head>
+	<title>业务类别管理</title>
+	<meta name="decorator" content="default"/>
+	<script type="text/javascript">
+		$(document).ready(function() {
+			
+		});
+		function page(n,s){
+			$("#pageNo").val(n);
+			$("#pageSize").val(s);
+			$("#searchForm").submit();
+        	return false;
+        }
+	</script>
+</head>
+<body>
+	<ul class="nav nav-tabs">
+		<li class="active"><a href="${ctx}/report/ctBbtcBusCategory/">业务类别列表</a></li>
+		<shiro:hasPermission name="report:ctBbtcBusCategory:edit"><li><a href="${ctx}/report/ctBbtcBusCategory/form">业务类别添加</a></li></shiro:hasPermission>
+	</ul>
+	<form:form id="searchForm" modelAttribute="ctBbtcBusCategory" action="${ctx}/report/ctBbtcBusCategory/" method="post" class="breadcrumb form-search">
+		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+		<ul class="ul-form">
+			<li><label style="width: auto;">业务类别名称：</label>
+				<form:input path="name" htmlEscape="false" maxlength="255" class="input-medium"/>
+			</li>
+			<li class="btns"><input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/></li>
+			<li class="clearfix"></li>
+		</ul>
+	</form:form>
+	<sys:message content="${message}"/>
+	<table id="contentTable" class="table table-striped table-bordered table-condensed">
+		<thead>
+			<tr>
+				<th>业务类别编码</th>
+				<th>业务类别名称</th>
+				<th>所属业务类型</th>
+				<shiro:hasPermission name="report:ctBbtcBusCategory:edit"><th>操作</th></shiro:hasPermission>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach items="${page.list}" var="ctBbtcBusCategory">
+			<tr>
+				<td><a href="${ctx}/report/ctBbtcBusCategory/form?id=${ctBbtcBusCategory.id}">
+					${ctBbtcBusCategory.number}
+				</a></td>
+				<td>
+					${ctBbtcBusCategory.name}
+				</td>
+				<td>
+					${ctBbtcBusCategory.type}
+				</td>
+				<shiro:hasPermission name="report:ctBbtcBusCategory:edit"><td>
+    				<a href="${ctx}/report/ctBbtcBusCategory/form?id=${ctBbtcBusCategory.id}">修改</a>
+					<a href="${ctx}/report/ctBbtcBusCategory/delete?id=${ctBbtcBusCategory.id}" onclick="return confirmx('确认要删除该业务类别吗？', this.href)">删除</a>
+				</td></shiro:hasPermission>
+			</tr>
+		</c:forEach>
+		</tbody>
+	</table>
+	<div class="pagination">${page}</div>
+</body>
+</html>
\ No newline at end of file

src/main/webapp/WEB-INF/views/modules/report/ctBbtcBusTypeForm.jsp

+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<html>
+<head>
+	<title>业务类型管理</title>
+	<meta name="decorator" content="default"/>
+	<script type="text/javascript">
+		$(document).ready(function() {
+			//$("#name").focus();
+			$("#inputForm").validate({
+				submitHandler: function(form){
+					loading('正在提交，请稍等...');
+					form.submit();
+				},
+				errorContainer: "#messageBox",
+				errorPlacement: function(error, element) {
+					$("#messageBox").text("输入有误，请先更正。");
+					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+						error.appendTo(element.parent().parent());
+					} else {
+						error.insertAfter(element);
+					}
+				}
+			});
+		});
+	</script>
+</head>
+<body>
+	<ul class="nav nav-tabs">
+		<li><a href="${ctx}/report/ctBbtcBusType/">业务类型列表</a></li>
+		<li class="active"><a href="${ctx}/report/ctBbtcBusType/form?id=${ctBbtcBusType.id}">业务类型<shiro:hasPermission name="report:ctBbtcBusType:edit">${not empty ctBbtcBusType.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="report:ctBbtcBusType:edit">查看</shiro:lacksPermission></a></li>
+	</ul><br/>
+	<form:form id="inputForm" modelAttribute="ctBbtcBusType" action="${ctx}/report/ctBbtcBusType/save" method="post" class="form-horizontal">
+		<form:hidden path="id"/>
+		<sys:message content="${message}"/>		
+		<div class="control-group">
+			<label class="control-label">业务类型编码：</label>
+			<div class="controls">
+				<form:input path="number" htmlEscape="false" maxlength="64" class="input-xlarge required"/>
+				<span class="help-inline"><font color="red">*</font> </span>
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label">业务类型名称：</label>
+			<div class="controls">
+				<form:input path="name" htmlEscape="false" maxlength="64" class="input-xlarge required"/>
+				<span class="help-inline"><font color="red">*</font> </span>
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label">所属集团：</label>
+			<div class="controls">
+				<form:select onchange="resetPageNo();" path="group" class="input-xlarge required">
+					<form:option value="">请选择</form:option>
+					<form:options items="${fns:getDictList('supplement_group')}" itemLabel="label" itemValue="id"
+								  htmlEscape="false"/></form:select>
+				<%--<form:input path="group" htmlEscape="false" maxlength="64" class="input-xlarge "/>--%>
+				<span class="help-inline"><font color="red">*</font> </span>
+			</div>
+		</div>
+		<div class="form-actions">
+			<shiro:hasPermission name="report:ctBbtcBusType:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>
+			<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
+		</div>
+	</form:form>
+</body>
+</html>
\ No newline at end of file

src/main/webapp/WEB-INF/views/modules/report/ctBbtcBusTypeList.jsp

+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<html>
+<head>
+	<title>业务类型管理</title>
+	<meta name="decorator" content="default"/>
+	<script type="text/javascript">
+		$(document).ready(function() {
+			
+		});
+		function page(n,s){
+			$("#pageNo").val(n);
+			$("#pageSize").val(s);
+			$("#searchForm").submit();
+        	return false;
+        }
+	</script>
+</head>
+<body>
+	<ul class="nav nav-tabs">
+		<li class="active"><a href="${ctx}/report/ctBbtcBusType/">业务类型列表</a></li>
+		<shiro:hasPermission name="report:ctBbtcBusType:edit"><li><a href="${ctx}/report/ctBbtcBusType/form">业务类型添加</a></li></shiro:hasPermission>
+	</ul>
+	<form:form id="searchForm" modelAttribute="ctBbtcBusType" action="${ctx}/report/ctBbtcBusType/" method="post" class="breadcrumb form-search">
+		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+		<ul class="ul-form">
+			<li><label style="width: auto;">业务类型名称：</label>
+				<form:input path="name" htmlEscape="false" maxlength="64" class="input-medium"/>
+			</li>
+			<li class="btns"><input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/></li>
+			<li class="clearfix"></li>
+		</ul>
+	</form:form>
+	<sys:message content="${message}"/>
+	<table id="contentTable" class="table table-striped table-bordered table-condensed">
+		<thead>
+			<tr>
+				<th>业务类型编码</th>
+				<th>业务类型名称</th>
+				<th>所属集团</th>
+				<shiro:hasPermission name="report:ctBbtcBusType:edit"><th>操作</th></shiro:hasPermission>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach items="${page.list}" var="ctBbtcBusType">
+			<tr>
+				<td><a href="${ctx}/report/ctBbtcBusType/form?id=${ctBbtcBusType.id}">
+					${ctBbtcBusType.number}
+				</a></td>
+				<td>
+					${ctBbtcBusType.name}
+				</td>
+				<td>
+					${ctBbtcBusType.groupName}
+				</td>
+				<shiro:hasPermission name="report:ctBbtcBusType:edit"><td>
+    				<a href="${ctx}/report/ctBbtcBusType/form?id=${ctBbtcBusType.id}">修改</a>
+					<a href="${ctx}/report/ctBbtcBusType/delete?id=${ctBbtcBusType.id}" onclick="return confirmx('确认要删除该业务类型吗？', this.href)">删除</a>
+				</td></shiro:hasPermission>
+			</tr>
+		</c:forEach>
+		</tbody>
+	</table>
+	<div class="pagination">${page}</div>
+</body>
+</html>
\ No newline at end of file

src/main/webapp/WEB-INF/views/modules/report/ctBbtcRegionForm.jsp

+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<html>
+<head>
+	<title>区域基础资料管理</title>
+	<meta name="decorator" content="default"/>
+	<script type="text/javascript">
+		$(document).ready(function() {
+			//$("#name").focus();
+			$("#inputForm").validate({
+				submitHandler: function(form){
+					loading('正在提交，请稍等...');
+					form.submit();
+				},
+				errorContainer: "#messageBox",
+				errorPlacement: function(error, element) {
+					$("#messageBox").text("输入有误，请先更正。");
+					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+						error.appendTo(element.parent().parent());
+					} else {
+						error.insertAfter(element);
+					}
+				}
+			});
+		});
+	</script>
+</head>
+<body>
+	<ul class="nav nav-tabs">
+		<li><a href="${ctx}/report/ctBbtcRegion/">区域基础资料列表</a></li>
+		<li class="active"><a href="${ctx}/report/ctBbtcRegion/form?id=${ctBbtcRegion.id}">区域基础资料<shiro:hasPermission name="report:ctBbtcRegion:edit">${not empty ctBbtcRegion.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="report:ctBbtcRegion:edit">查看</shiro:lacksPermission></a></li>
+	</ul><br/>
+	<form:form id="inputForm" modelAttribute="ctBbtcRegion" action="${ctx}/report/ctBbtcRegion/save" method="post" class="form-horizontal">
+		<form:hidden path="id"/>
+		<sys:message content="${message}"/>		
+		<div class="control-group">
+			<label class="control-label">区域编码：</label>
+			<div class="controls">
+				<form:input path="number" htmlEscape="false" maxlength="64" class="input-xlarge required"/>
+				<span class="help-inline"><font color="red">*</font> </span>
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label">区域名称：</label>
+			<div class="controls">
+				<form:input path="name" htmlEscape="false" maxlength="255" class="input-xlarge required"/>
+				<span class="help-inline"><font color="red">*</font> </span>
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label">所属集团：</label>
+			<div class="controls">
+				<form:select onchange="resetPageNo();" path="group" class="input-xlarge required">
+					<form:option value="">请选择</form:option>
+					<form:options items="${fns:getDictList('supplement_group')}" itemLabel="label" itemValue="id"
+								  htmlEscape="false"/></form:select>
+				<%--<form:input path="group" htmlEscape="false" maxlength="64" class="input-xlarge "/>--%>
+				<span class="help-inline"><font color="red">*</font> </span>
+			</div>
+		</div>
+		<div class="form-actions">
+			<shiro:hasPermission name="report:ctBbtcRegion:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>
+			<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
+		</div>
+	</form:form>
+</body>
+</html>
\ No newline at end of file

src/main/webapp/WEB-INF/views/modules/report/ctBbtcRegionList.jsp

+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<html>
+<head>
+	<title>区域基础资料管理</title>
+	<meta name="decorator" content="default"/>
+	<script type="text/javascript">
+		$(document).ready(function() {
+			
+		});
+		function page(n,s){
+			$("#pageNo").val(n);
+			$("#pageSize").val(s);
+			$("#searchForm").submit();
+        	return false;
+        }
+	</script>
+</head>
+<body>
+	<ul class="nav nav-tabs">
+		<li class="active"><a href="${ctx}/report/ctBbtcRegion/">区域基础资料列表</a></li>
+		<shiro:hasPermission name="report:ctBbtcRegion:edit"><li><a href="${ctx}/report/ctBbtcRegion/form">区域基础资料添加</a></li></shiro:hasPermission>
+	</ul>
+	<form:form id="searchForm" modelAttribute="ctBbtcRegion" action="${ctx}/report/ctBbtcRegion/" method="post" class="breadcrumb form-search">
+		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+		<ul class="ul-form">
+			<li><label>区域名称：</label>
+				<form:input path="name" htmlEscape="false" maxlength="255" class="input-medium"/>
+			</li>
+			<li class="btns"><input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/></li>
+			<li class="clearfix"></li>
+		</ul>
+	</form:form>
+	<sys:message content="${message}"/>
+	<table id="contentTable" class="table table-striped table-bordered table-condensed">
+		<thead>
+			<tr>
+				<th>区域编码</th>
+				<th>区域名称</th>
+				<th>所属集团</th>
+				<shiro:hasPermission name="report:ctBbtcRegion:edit"><th>操作</th></shiro:hasPermission>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach items="${page.list}" var="ctBbtcRegion">
+			<tr>
+				<td><a href="${ctx}/report/ctBbtcRegion/form?id=${ctBbtcRegion.id}">
+					${ctBbtcRegion.number}
+				</a></td>
+				<td>
+					${ctBbtcRegion.name}
+				</td>
+				<td>
+					${ctBbtcRegion.groupName}
+				</td>
+				<shiro:hasPermission name="report:ctBbtcRegion:edit"><td>
+    				<a href="${ctx}/report/ctBbtcRegion/form?id=${ctBbtcRegion.id}">修改</a>
+					<a href="${ctx}/report/ctBbtcRegion/delete?id=${ctBbtcRegion.id}" onclick="return confirmx('确认要删除该区域基础资料吗？', this.href)">删除</a>
+				</td></shiro:hasPermission>
+			</tr>
+		</c:forEach>
+		</tbody>
+	</table>
+	<div class="pagination">${page}</div>
+</body>
+</html>
\ No newline at end of file

src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp

@@ -6,66 +6,73 @@
     <meta name="decorator" content="default"/>
     <script type="text/javascript">
         $(document).ready(function () {
-
             var ifClue = "${report.ifClue}";
             if (ifClue == '1') {
                 $("#ifClue").prop("checked", true);
-                $('#ifClue').attr("disabled","disabled");
+                $('#ifClue').attr("disabled", "disabled");
             } else {
                 $("#ifClue").prop("checked", false);
-                $('#ifClue').attr("disabled","disabled");
+                $('#ifClue').attr("disabled", "disabled");
             }
+            //显示是否完成选择框
 
-            var count = "${result}";
-            parent.refreshPromt(count);
-            $("input[type='text']").attr("disabled", true);
-
-            $("#btnTrack").click(function () {
-                window.location.href = "${ctx}/report/track?id=${report.id}";
-            });
-
-            var supplementArea = "${report.supplementArea}";
-            if (supplementArea == "North China") {
-                supplementArea = "华北区域公司";
-            } else if (supplementArea == "BeiJing") {
-                supplementArea = "北京区域公司";
-            } else if (supplementArea == "ShangHai") {
-                supplementArea = "上海区域公司";
-            } else if (supplementArea == "SouthWest") {
-                supplementArea = "西南区域公司";
-            } else if (supplementArea == "SouthEast") {
-                supplementArea = "东南区域公司";
-            } else if (supplementArea == "Central China") {
-                supplementArea = "华中区域公司";
-            } else if (supplementArea == "GuangShen") {
-                supplementArea = "广深区域公司";
-            } else if (supplementArea == "Hainan") {
-                supplementArea = "海南区域公司";
-            } else if (supplementArea == "Group") {
-                supplementArea = "集团本部";
-            } else if (supplementArea == "PropertyGroup") {
-                supplementArea = "物业集团";
+            var admin ="${isAdmin}";
+            var fzadmin ="${isAdmin}";
+            var status ="${report.reportStatus}";
+            if ((admin == '1' || fzadmin == '2')&& status == '2') {
+                $("#deal").hide();
             }
-            $("#supplementArea").val(supplementArea);
+        var count = "${result}";
+        parent.refreshPromt(count);
+        $("input[type='text']").attr("disabled", true);
 
-            var dealResult = "${report.dealResult}";
-            if (dealResult == "1") {
-                dealResult = "移交客诉";
-            } else if (dealResult == "2") {
-                dealResult = "举报无效";
-            } else if (dealResult == "3") {
-                dealResult = "举报受理";
-            } else if (dealResult == "4") {
-                dealResult = "举报属实";
-            } else if (dealResult == "5") {
-                dealResult = "举报不实";
-            } else if (dealResult == "6") {
-                dealResult = "移交其他部门";
-            } else if (dealResult == "7") {
-                dealResult = "转为线索";
-            }
-            $("#dealResult").val(dealResult);
+        $("#btnTrack").click(function () {
+            window.location.href = "${ctx}/report/track?id=${report.id}";
         });
+
+        var supplementArea = "${report.supplementArea}";
+        if (supplementArea == "North China") {
+            supplementArea = "华北区域公司";
+        } else if (supplementArea == "BeiJing") {
+            supplementArea = "北京区域公司";
+        } else if (supplementArea == "ShangHai") {
+            supplementArea = "上海区域公司";
+        } else if (supplementArea == "SouthWest") {
+            supplementArea = "西南区域公司";
+        } else if (supplementArea == "SouthEast") {
+            supplementArea = "东南区域公司";
+        } else if (supplementArea == "Central China") {
+            supplementArea = "华中区域公司";
+        } else if (supplementArea == "GuangShen") {
+            supplementArea = "广深区域公司";
+        } else if (supplementArea == "Hainan") {
+            supplementArea = "海南区域公司";
+        } else if (supplementArea == "Group") {
+            supplementArea = "集团本部";
+        } else if (supplementArea == "PropertyGroup") {
+            supplementArea = "物业集团";
+        }
+        $("#supplementArea").val(supplementArea);
+
+        var dealResult = "${report.dealResult}";
+        if (dealResult == "1") {
+            dealResult = "移交客诉";
+        } else if (dealResult == "2") {
+            dealResult = "举报无效";
+        } else if (dealResult == "3") {
+            dealResult = "举报受理";
+        } else if (dealResult == "4") {
+            dealResult = "举报属实";
+        } else if (dealResult == "5") {
+            dealResult = "举报不实";
+        } else if (dealResult == "6") {
+            dealResult = "移交其他部门";
+        } else if (dealResult == "7") {
+            dealResult = "转为线索";
+        }
+        $("#deal").val(dealResult);
+        })
+        ;
         var requestFlag = true;
 
         function openDownloadDialog(id) {
@@ -121,6 +128,7 @@
             }
         }
 
+
         function clues(id) {
             var msg = "您真的确定要转为线索吗？\n\n请确认！";
             if (confirm(msg) == true) {
@@ -284,8 +292,8 @@
 <c:if test="${isAdmin eq '1'|| isAdmin eq '2'}">
 <div class="control-group">
     <label class="control-label">是否显示举报人信息:</label>
-    <div class="controls" >
-        <input type="checkbox" id="ifClue" name="ifClue" Value="" />
+    <div class="controls">
+        <input type="checkbox" id="ifClue" name="ifClue" Value=""/>
     </div>
 </div>
 </c:if>
@@ -324,6 +332,16 @@
     </div>
 </div>
 <div class="control-group">
+    <label class="control-label">调查建议:</label>
+        <%--<div class="controls">--%>
+        <%--<form:input path="suggestion" htmlEscape="false" maxlength="200" class="input-xlarge"/>--%>
+        <%--</div>--%>
+    <div class="controls">
+        <form:textarea id="suggestion" htmlEscape="false" style="width:90%" path="suggestion" rows="6"
+                       maxlength="500" class="input-xxlarge" disabled="true"/>
+    </div>
+</div>
+<div class="control-group">
     <label class="control-label">附件:</label>
     <div class="controls">
         <c:forEach items="${supplementAttachmentList}" var="supplementAttachment" varStatus="vs">
@@ -353,16 +371,16 @@
 <div class="control-group">
     <label class="control-label">处理结论:</label>
     <div class="controls">
-        <c:if test="${(isAdmin eq '1' ||isAdmin eq '2')&& report.reportStatus eq '2'}"><form:select
-                path="dealResult"
-                class="input-small"
-                onchange="showDone();">
-            <form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value"
-                          htmlEscape="false"/></form:select></c:if>
-        <c:if test="${isAdmin != '1' || report.reportStatus != '2'}"><form:input id="dealResult" path=""
-                                                                                 value="${report.dealResult}"
-                                                                                 htmlEscape="false" maxlength="200"
-                                                                                 class="input-xlarge required"/></c:if>
+        <c:if test="${(isAdmin eq '1' ||isAdmin eq '2')&& report.reportStatus eq '2'}">
+            <form:select path="dealResult" class="input-small required" onchange="showDone();">
+                <form:option value=""></form:option>
+                <form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value"
+                              htmlEscape="false"/></form:select></c:if>
+            <form:input path=""
+                        id="deal" disabled="true"
+                        value="${report.dealResult}"
+                        htmlEscape="false" maxlength="200"
+                        class="input-xlarge required"/>
     </div>
     <div id="selectType" class="control-group" style="display:none">
         <label class="control-label">移交部门:</label>
@@ -376,8 +394,6 @@
             <span class="help-inline"><font color="red">*</font> </span>
         </div>
     </div>
-
-
     <c:if test="${report.dealResult eq '6'}">
         <div id="transferDepartmentid" class="control-group">
             <label class="control-label">移交部门:</label>
@@ -394,25 +410,22 @@
 <li class="btns">
     <label style="width:auto;">
         <c:if test="${report.reportStatus eq '1'||report.reportStatus eq '0'}"><input id="btnTrack"
-                                                                                        class="btn btn-primary"
-                                                                                        type="button"
-                                                                                        value="跟踪"/>&nbsp;&nbsp;</c:if>
+                                                                                      class="btn btn-primary"
+                                                                                      type="button"
+                                                                                      value="跟踪"/>&nbsp;&nbsp;</c:if>
         <input id="btnDocument" class="btn btn-primary" type="button" value="转为文档"
                onclick="openDownloadDialog('${report.id}')"/>&nbsp;&nbsp;
         <input id="btnReturn" class="btn btn-primary" type="button" value="返回" onclick="history.go(-1)"/>&nbsp;&nbsp;
-        <c:if test="${(isAdmin eq '1'|| isAdmin eq '2')&& report.reportStatus eq '2'}"><input id="btnClose"
-                                                                                              class="btn btn-primary"
-                                                                                              type="submit"
-                                                                                              value="关闭"/>&nbsp;&nbsp;</c:if>
+        <c:if test="${(isAdmin eq '1'|| isAdmin eq '2')&& report.reportStatus eq '2'}"><input
+                class="btn btn-primary"
+                type="submit"
+                value="关闭"/>&nbsp;&nbsp;</c:if>
         <c:if test="${isAdmin eq '1'&&(report.reportStatus eq '3'||report.reportStatus eq '2') }"><input id="btnClose"
                                                                                                          class="btn btn-primary"
                                                                                                          type="button"
                                                                                                          onclick="again('${report.id}')"
                                                                                                          value="重新跟踪"/> &nbsp;&nbsp;</c:if>
-            <%--<c:if test="${report.reportStatus eq '0' || report.reportStatus eq '1'}"><input id="btnClose" class="btn btn-primary"--%>
-            <%--type="button"--%>
-            <%--onclick="clues('${report.id}')"--%>
-            <%--value="转为线索"/></c:if>--%>
+
     </label>
 </li>
 </form:form>

src/main/webapp/WEB-INF/views/modules/report/reportForm.jsp

@@ -204,8 +204,12 @@
     </div>
     <div class="control-group">
         <label class="control-label">调查建议:</label>
+        <%--<div class="controls">--%>
+            <%--<form:input path="suggestion" htmlEscape="false" maxlength="200" class="input-xlarge"/>--%>
+        <%--</div>--%>
         <div class="controls">
-            <form:input path="suggestion" htmlEscape="false" maxlength="200" class="input-xlarge"/>
+            <form:textarea id="suggestion" htmlEscape="false" style="width:90%" path="suggestion" rows="6"
+                           maxlength="500" class="input-xxlarge"/>
         </div>
     </div>
     <div class="control-group">

src/main/webapp/WEB-INF/views/modules/report/reportQyList.jsp

+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
+<html>
+<head>
+    <title>举报管理</title>
+    <meta name="decorator" content="default"/>
+    <script type="text/javascript">
+
+        var requestFlag = true;
+        $(document).ready(function () {
+            $("#btnExport").click(function () {
+                top.$.jBox.confirm("确认要导出数据吗？", "系统提示", function (v, h, f) {
+                    if (v == "ok") {
+                        $("#searchForm").attr("action", "${ctx}/report/qyexport");
+                        $("#searchForm").submit();
+                    }
+                }, {buttonsFocus: 1});
+                top.$('.jbox-body .jbox-icon').css('top', '55px');
+            });
+            $("#btnSubmit").click(function () {
+                $("#searchForm").attr("action", "${ctx}/report/qylist");
+                $("#searchForm").submit();
+            });
+            $("#btnAdd").click(function () {
+                window.location.href = "${ctx}/report/form";
+            });
+            $("#btnReset").click(function () {
+                var flag = $("#flag").val();
+                window.location.href = "${ctx}/report/qylist?flag=" + flag;
+            });
+            //序号连续
+            var i = 1;
+            var pageNo = $("#pageNo").val();
+            var pageSize = $("#pageSize").val();
+            $(".reportList").each(function () {
+                var num = (pageNo - 1) * pageSize + i;
+                i += 1;
+                $(this).children("td:first-child").html(num);
+            });
+        });
+
+        function page(n, s) {
+            $("#pageNo").val(n);
+            $("#pageSize").val(s);
+            $("#searchForm").attr("action", "${ctx}/report/qylist");
+            $("#searchForm").submit();
+            return false;
+        }
+
+        function resetPageNo() {
+            $("#pageNo").val(0);
+        }
+
+        function openDownloadDialog(id) {
+            if (requestFlag == true) {
+                $.ajax({
+                    url: "${ctx}/report/toWord?id=" + id,
+                    dataType: "text",
+                    traditional: true,//这里设置为true
+                    cache: false,
+                    beforeSend: function () {
+                        requestFlag = false;
+                    },
+                    success: function (url) { //登录成功后返回的数据
+                        window.open(url, "_blank");
+                    },
+                    error: function () {
+                        alert("数据错误！");
+                    },
+                    complete: function () {
+                        requestFlag = true;
+                    }
+                });
+            } else {
+                top.$.jBox.tip('正在加载，请稍等', 'warning');
+            }
+        }
+
+        window.onload = function () {
+            var tTD; //用来存储当前更改宽度的Table Cell,避免快速移动鼠标的问题
+            var table = document.getElementById("contentTable");
+            for (j = 0; j < table.rows[0].cells.length; j++) {
+                table.rows[0].cells[j].onmousedown = function () {
+//记录单元格
+                    tTD = this;
+                    if (event.offsetX > tTD.offsetWidth - 10) {
+                        tTD.mouseDown = true;
+                        tTD.oldX = event.x;
+                        tTD.oldWidth = tTD.offsetWidth;
+                    }
+//记录Table宽度
+//table = tTD; while (table.tagName != ‘TABLE') table = table.parentElement;
+//tTD.tableWidth = table.offsetWidth;
+                };
+                table.rows[0].cells[j].onmouseup = function () {
+//结束宽度调整
+                    if (tTD == undefined) tTD = this;
+                    tTD.mouseDown = false;
+                    tTD.style.cursor = 'default';
+                };
+                table.rows[0].cells[j].onmousemove = function () {
+//更改鼠标样式
+                    if (event.offsetX > this.offsetWidth - 10)
+                        this.style.cursor = 'col-resize';
+                    else
+                        this.style.cursor = 'default';
+//取出暂存的Table Cell
+                    if (tTD == undefined) tTD = this;
+//调整宽度
+                    if (tTD.mouseDown != null && tTD.mouseDown == true) {
+                        tTD.style.cursor = 'default';
+                        if (tTD.oldWidth + (event.x - tTD.oldX) > 0)
+                            tTD.width = tTD.oldWidth + (event.x - tTD.oldX);
+//调整列宽
+                        tTD.style.width = tTD.width;
+                        tTD.style.cursor = 'col-resize';
+//调整该列中的每个Cell
+                        table = tTD;
+                        while (table.tagName != 'TABLE') table = table.parentElement;
+                        for (j = 0; j < table.rows.length; j++) {
+                            table.rows[j].cells[tTD.cellIndex].width = tTD.width;
+                        }
+//调整整个表
+//table.width = tTD.tableWidth + (tTD.offsetWidth – tTD.oldWidth);
+//table.style.width = table.width;
+                    }
+                };
+            }
+
+        }
+
+        function del(id) {
+            var msg = "您真的确定要删除吗？\n\n请确认！";
+            if (confirm(msg) == true) {
+
+                $.ajax({
+                    type: "post",
+                    url: "${ctx}/report/deleteconclusion",
+                    data: {"id": id},
+                    dataType: "json",
+                });
+                location.reload();
+                alert("删除成功")
+            } else {
+                return false;
+            }
+        }
+
+        function aa() {
+            var a = document.getElementById("t_r_content").scrollTop;
+            var b = document.getElementById("t_r_content").scrollLeft;
+            document.getElementById("cl_freeze").scrollTop = a;
+            document.getElementById("t_r_t").scrollLeft = b;
+        }
+
+        function overShow() {
+            var showDiv = document.getElementById('showDiv');
+            showDiv.style.left = event.clientX;
+            showDiv.style.top = event.clientY;
+            showDiv.style.display = 'block';
+            showDiv.innerHTML = '鼠标停留显示内容2';
+        }
+
+        function outHide() {
+            var showDiv = document.getElementById('showDiv');
+            showDiv.style.display = 'none';
+            showDiv.innerHTML = '';
+        }
+
+
+
+    </script>
+
+    <style type="text/css">
+        table {
+
+            table-layout: fixed;
+        }
+
+        th {
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+
+        }
+
+        td {
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+
+        }
+
+        table {
+            border-collapse: collapse;
+            border-spacing: 0px;
+
+        }
+
+        table td {
+
+            height: 25px;
+            border-left: 0px;
+        }
+
+        table th {
+
+            white-space: nowrap;
+            text-align: center;
+            height: 21px;
+            border-top: 0px;
+            border-left: 0px;
+        }
+
+        .t_left {
+            width: 30%;
+            float: left;
+        }
+
+        /*t_r_content和cl_freeze高度相差20px， 高度为外观显示高度，可根据情况调整*/
+        .t_r_content {
+            width: 100%;
+            height: 410px;
+            background: #fff;
+            overflow: auto;
+        }
+
+        .cl_freeze {
+            height: 410px;
+
+            width: 101%;
+        }
+
+        /* width 调整左边标题列宽度（左侧外观显示宽度）; 指定为width:auto 在Opera下显示有问题; height比 t_r_content 高度小20px*/
+        /* width 宽度为 右侧外观显示宽度 实际显示宽度大小为“t_r”宽度加上“cl_freeze”宽度 */
+        /* 如果显示不正常，调整 t_r的width 使其和t_left的width之和小于100%；等于100%时会有问题*/
+        .t_r {
+            width: 70%;
+            float: left;
+        }
+
+        .t_r table {
+            width: 1700px;
+        }
+
+        .t_r_title {
+            width: 1720px;
+        }
+
+        /*宽度比 t_r table 大20px （至少大20，小了滚动条滑到右侧显示有问题）*/
+        .t_r_t {
+
+            overflow: hidden;
+        }
+
+        .bordertop {
+            border-top: 0px;
+        }
+
+        #content {
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
+            width: 200px;
+        }
+    </style>
+</head>
+<body>
+<ul class="nav nav-tabs">
+    <li <c:if test="${flag eq '1'}">class="active"</c:if>><a href="${ctx}/report/qylist?flag=1">跟踪中举报列表</a></li>
+    <li <c:if test="${flag eq '0'}">class="active"</c:if>><a href="${ctx}/report/qylist?flag=0">未处理举报列表</a></li>
+    <li <c:if test="${flag eq '4'}">class="active"</c:if>><a href="${ctx}/report/qylist?flag=4">线索列表</a></li>
+    <li <c:if test="${flag eq null or flag eq ''}">class="active"</c:if>><a href="${ctx}/report/qylist">举报列表</a></li>
+
+    <%--<li style="float: right;"><input id="btnAdd" class="btn btn-primary" type="button" value="举报录入"/></li>--%>
+</ul>
+<form:form id="searchForm" modelAttribute="report" action="${ctx}/report/qylist" method="post"
+           class="breadcrumb form-search">
+<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+<input id="flag" name="flag" type="hidden" value="${flag}"/>
+<ul class="ul-form">
+    <li><label>标题：</label><form:input onchange="resetPageNo();" path="supplementTitle" htmlEscape="false"
+                                      maxlength="50" class="input-small"/></li>
+    <li><label>被举报项目/部门：</label><form:input onchange="resetPageNo();" path="reportProject" htmlEscape="false"
+                                            maxlength="50" class="input-small"
+                                            style="position:relative;top:-12.5px"/></li>
+    <li><label>举报时间：</label><input id="reportTimeFrom" name="reportTimeFrom" onchange="resetPageNo();"
+                                   readonly="readonly" type="text"
+                                   maxlength="200" class="input-mini Wdate required"
+                                   value="${report.reportTimeFrom}"
+                                   onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true,maxDate:'#F{$dp.$D(\'reportTimeTo\')}'});"/>
+    </li>
+    <li><label>至：</label><input id="reportTimeTo" name="reportTimeTo" onchange="resetPageNo();" readonly="readonly"
+                                type="text"
+                                maxlength="200" class="input-mini Wdate required" value="${report.reportTimeTo}"
+                                onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true,minDate:'#F{$dp.$D(\'reportTimeFrom\')}'});"/>
+    </li>
+
+    <li><label>举报人：</label><form:input onchange="resetPageNo();" path="reportPersonName" htmlEscape="false"
+                                       maxlength="50" class="input-small"/></li>
+    <li><label>举报人电话：</label><form:input onchange="resetPageNo();" path="reportPersonTel" htmlEscape="false"
+                                         maxlength="50" class="input-small"/></li>
+    <li><label>业务类型：</label><form:select onchange="resetPageNo();" path="supplementType" class="input-small">
+        <form:option value=" ">请选择</form:option>
+        <form:options items="${fns:getDictList('supplement_type')}" itemLabel="label" itemValue="value"
+                      htmlEscape="false"/></form:select></li>
+    <li><label>状态：</label><form:select onchange="resetPageNo();" path="reportStatus" class="input-small">
+        <form:option value=" ">请选择</form:option>
+        <form:options items="${fns:getDictList('report_status')}" itemLabel="label" itemValue="value"
+                      htmlEscape="false"/></form:select></li>
+    <li><label>被举报人：</label><form:input onchange="resetPageNo();" path="supplementInformant" htmlEscape="false"
+                                        maxlength="50" class="input-small"/></li>
+    <li><label>处理结论：</label><form:select onchange="resetPageNo();" path="dealResult" class="input-small">
+        <form:option value=" ">请选择</form:option>
+        <form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value"
+                      htmlEscape="false"/></form:select></li>
+    <li><label>区域：</label><form:select onchange="resetPageNo();" path="supplementArea" class="input-small">
+        <form:option value=" ">请选择</form:option>
+        <form:options items="${fns:getDictList('supplement_area')}" itemLabel="label" itemValue="value"
+                      htmlEscape="false"/></form:select></li>
+    <li><label>举报途径：</label><form:select onchange="resetPageNo();" path="reportSource" class="input-small">
+        <form:option value=" ">请选择</form:option>
+        <form:options items="${fns:getDictList('report_source')}" itemLabel="label" itemValue="value"
+                      htmlEscape="false"/></form:select></li>
+    <c:if test="${isAdmin eq '1' || isAdmin eq '2'}">
+        <li><label>移交给：</label><form:select onchange="resetPageNo();" path="selectExchangeAfterUser" class="input-small">
+            <form:option value=" ">请选择</form:option>
+            <form:options items="${fns:getTransferName()}" itemLabel="label" itemValue="value"
+                          htmlEscape="false"/></form:select></li></c:if>
+    <c:if test="${isAdmin eq '1' || isAdmin eq '2'}">
+        <li><label>录入人：</label><form:select onchange="resetPageNo();" path="oaname" class="input-small">
+            <form:option value=" ">请选择</form:option>
+            <form:options items="${fns:getTransferName()}" itemLabel="label" itemValue="label"
+                          htmlEscape="false"/></form:select></li></c:if>
+    <li class="clearfix"></li>
+    <li class="btns">
+            <%--  <label style="width:auto;">--%>&nbsp;&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary"
+                                                                          type="submit" value="筛选"/>&nbsp;&nbsp;
+        <input id="btnReset" class="btn btn-primary" type="button" value="重置"/>&nbsp;&nbsp;
+        <input id="btnExport" class="btn btn-primary" type="button" value="导出"/></label>
+    </li>
+    <li class="clearfix"></li>
+</ul>
+</form:form>
+<sys:message content="${message}"/>
+<div style="width:100%">
+    <div class="t_left">
+        <div class="cl_freeze" id="cl_freeze">
+            <table class=" table-striped table-bordered table-condensed" cellspacing="0" cellpadding="2" border="2">
+                <thead>
+                <tr>
+
+                    <th style="width:5%">ID</th>
+
+                    <th style="width:15%">标题</th>
+                </tr>
+                </thead>
+                <tbody>
+                <c:if test="${page.list.size()>0}">
+                <c:forEach items="${page.list}" var="report" varStatus="vs">
+                <tr class="reportList">
+                    <td align="center" style="width:5%"></td>
+                    <td align="left" style="width:15%" title= ${report.supplementTitle}>${report.supplementTitle}</td>
+
+                    </c:forEach>
+                    </c:if>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+    <div class="t_r">
+        <div class="t_r_t" id="t_r_t">
+            <div class="t_r_content" id="t_r_content" onscroll="aa()">
+                <div class="t_r_title">
+                    <table id="contentTable" class=" table-striped table-bordered table-condensed" cellspacing="0"
+                           cellpadding="2" border="2">
+                        <thead>
+                        <tr>
+                            <th style="width:10%">业务类型</th>
+                            <th>被举报项目/部门</th>
+                            <th>录入人</th>
+                            <th>举报人</th>
+                            <th>举报人电话</th>
+                            <th>举报途径</th>
+                            <th>区域</th>
+                            <th>被举报人</th>
+                            <th>举报时间</th>
+                            <th>状态</th>
+                            <th>处理结论</th>
+                            <th>移交部门</th>
+                            <th>处理人</th>
+                            <c:if test="${isAdmin eq '1'||isAdmin eq '2'}">
+                                <th>移交给</th>
+                            </c:if>
+                            <th>内容</th>
+                            <th>举报信息补充内容</th>
+                            <th>IP来源</th>
+                            <th>IP所属城市</th>
+                            <th>邮件发送</th>
+                            <th style="width:10%">操作</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <c:if test="${page.list.size()>0}">
+                            <c:forEach items="${page.list}" var="report" varStatus="vs">
+                                <tr>
+                                    <td align="center">${report.supplementType}</td>
+                                    <td align="center">${report.reportProject}</td>
+                                    <td align="center">${report.oaname}</td>
+                                    <td align="center">${report.reportPersonName}</td>
+                                    <td align="center">${report.reportPersonTel}</td>
+                                    <td align="center"><c:if test="${report.reportSource eq 'web'}">官网</c:if>
+                                        <c:if test="${report.reportSource eq 'oa'}">融创OA系统</c:if>
+                                        <c:if test="${report.reportSource eq 'supplier'}">供应商系统</c:if>
+                                        <c:if test="${report.reportSource eq 'wechat'}">微信公众号</c:if>
+                                        <c:if test="${report.reportSource eq 'sunacE'}">融E</c:if>
+                                        <c:if test="${report.reportSource eq 'offline'}">线下扫码</c:if>
+                                        <c:if test="${report.reportSource eq 'tel'}">电话</c:if>
+                                        <c:if test="${report.reportSource eq 'email'}">邮件</c:if>
+                                        <c:if test="${report.reportSource eq 'visit'}">来访</c:if>
+                                        <c:if test="${report.reportSource eq null}">--</c:if></td>
+                                    <td align="center">
+                                        <c:if test="${report.supplementArea eq 'PropertyGroup'}">物业集团</c:if>
+                                        <c:if test="${report.supplementArea eq 'North China'}">华北区域公司</c:if>
+                                        <c:if test="${report.supplementArea eq 'BeiJing'}">北京区域公司</c:if>
+                                        <c:if test="${report.supplementArea eq 'ShangHai'}">上海区域公司</c:if>
+                                        <c:if test="${report.supplementArea eq 'SouthWest'}">西南区域公司</c:if>
+                                        <c:if test="${report.supplementArea eq 'SouthEast'}">东南区域公司</c:if>
+                                        <c:if test="${report.supplementArea eq 'Central China'}">华中区域公司</c:if>
+                                        <c:if test="${report.supplementArea eq 'GuangShen'}">广深区域公司</c:if>
+                                        <c:if test="${report.supplementArea eq 'Hainan'}">海南区域公司</c:if>
+                                        <c:if test="${report.supplementArea eq 'Group'}">集团本部</c:if>
+                                        <c:if test="${report.supplementArea eq null}">--</c:if>
+                                    </td>
+                                    <td align="center">
+                                        <c:if test="${report.supplementInformant eq null}">--</c:if>
+                                        <c:if test="${report.supplementInformant ne null}">${report.supplementInformant}</c:if>
+                                    </td>
+                                    <td align="center">${report.reportTime}</td>
+                                    <td align="center">
+                                        <c:if test="${report.reportStatus eq '0'}">未处理</c:if>
+                                        <c:if test="${report.reportStatus eq '1'}">跟踪中</c:if>
+                                        <c:if test="${report.reportStatus eq '2'}">已处理</c:if>
+                                        <c:if test="${report.reportStatus eq '3'}">已关闭</c:if>
+                                        <c:if test="${report.reportStatus eq '4'}">待处理</c:if>
+                                    </td>
+                                    <td align="center">
+                                        <c:if test="${report.dealResult eq null}">--</c:if>
+                                        <c:if test="${report.dealResult eq '1'}">移交客诉</c:if>
+                                        <c:if test="${report.dealResult eq '2'}">举报无效</c:if>
+                                        <c:if test="${report.dealResult eq '3'}">举报受理</c:if>
+                                        <c:if test="${report.dealResult eq '4'}">举报属实</c:if>
+                                        <c:if test="${report.dealResult eq '5'}">举报不实</c:if>
+                                        <c:if test="${report.dealResult eq '6'}">移交其他部门</c:if>
+                                        <c:if test="${report.dealResult eq '7'}">转为线索</c:if>
+                                    </td>
+                                    <td align="center">
+                                        <c:if test="${report.transferDepartment eq null}">--</c:if>
+                                        <c:if test="${report.transferDepartment eq '1'}">营销</c:if>
+                                        <c:if test="${report.transferDepartment eq '2'}">工程</c:if>
+                                        <c:if test="${report.transferDepartment eq '3'}">成本</c:if>
+                                        <c:if test="${report.transferDepartment eq '4'}">招采</c:if>
+                                        <c:if test="${report.transferDepartment eq '5'}">财务</c:if>
+                                        <c:if test="${report.transferDepartment eq '6'}">法务</c:if>
+                                        <c:if test="${report.transferDepartment eq '7'}">行政</c:if>
+                                        <c:if test="${report.transferDepartment eq '8'}">人力</c:if>
+                                        <c:if test="${report.transferDepartment eq '9'}">开发</c:if>
+                                        <c:if test="${report.transferDepartment eq '10'}">研发</c:if>
+                                        <c:if test="${report.transferDepartment eq '11'}">投资</c:if>
+                                        <c:if test="${report.transferDepartment eq '15'}">商业</c:if>
+                                        <c:if test="${report.transferDepartment eq '12'}">其他</c:if>
+                                        <c:if test="${report.transferDepartment eq '13'}">物业管理</c:if>
+                                        <c:if test="${report.transferDepartment eq '14'}">文旅管理</c:if>
+
+                                    </td>
+                                    <td align="center">
+                                        <c:if test="${report.dealPersonName eq null}">--</c:if>
+                                        <c:if test="${report.dealPersonName ne null}">${report.dealPersonName}</c:if>
+                                    </td>
+                                    <c:if test="${isAdmin eq '1'||isAdmin eq '2'}">
+                                        <td align="center">
+                                            <c:if test="${report.transferName eq null && report.exchangeType eq null}">--</c:if>
+                                            <c:if test="${report.transferName ne null && report.exchangeType ne null}">${report.transferName}</c:if>
+                                        </td>
+                                    </c:if>
+
+                                    <td align="center" title= ${report.reportContent}>${report.reportContent}</td>
+                                    <td align="center"
+                                        title= ${report.supplementContent}>${report.supplementContent}</td>
+                                    <td align="center">${report.reportIp}</td>
+                                    <td align="center">${report.ipCity}</td>
+                                    <td align="center">
+                                        <c:if test="${report.isSendEmail eq '1'}">是</c:if>
+                                        <c:if test="${report.isSendEmail eq null}">否</c:if>
+                                    </td>
+                                    <td align="center">
+
+                                        <a href="${ctx}/report/view?id=${report.id}">查看</a>
+                                        <c:if test="${report.reportStatus eq '1'||report.reportStatus eq '0'}"><a
+                                                href="${ctx}/report/track?id=${report.id}">跟踪</a></c:if>
+                                        <c:if test="${isAdmin eq '1'}">
+                                            <a href="#" onclick="del('${report.id}')">删除</a></c:if>
+                                        <a href="#" onclick="openDownloadDialog('${report.id}')">转为文档</a>
+
+                                    </td>
+                                </tr>
+                            </c:forEach>
+                        </c:if>
+                        </tbody>
+                    </table>
+                    <div id="showDiv"
+                         style="position: absolute; background-color: white; border: 1px solid black;"></div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<c:if test="${page.list.size()=='0'}">
+<span style="color: #999999;margin: 20px 0 70px 20px;display: block;">未查询到相关内容</span>
+</c:if>
+<c:if test="${page.list.size()>0}">
+<div class="pagination">${page}</div>
+</c:if>
+
+</html>
\ No newline at end of file

src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp

@@ -687,7 +687,7 @@
     <br>
     <label class="control-label">处理结论:</label>
     <div class="controls">
-        <form:select path="dealResult" id="dealResult" class="input-small required" onchange="showDone();">
+        <form:select path="dealResult" id="dealResult"  class="input-small required" onchange="showDone();">
             <form:option value=" ">请选择</form:option>
             <form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value"
                           htmlEscape="false"/>
@@ -776,61 +776,31 @@
                     $("#chooseItem").empty();
                 }
 
-                function page(n, s) {
-                    $("#pageNo").val(n);
-                    $("#pageSize").val(s);
-                    $.ajax({
-                        url: "${ctx}/report/viewTransfer?flag=1",
-                        dataType: "html",
-                        data: $('#searchForm').serialize(),
-                        cache: false,
-                        success: function (data) { //登录成功后返回的数据
-                            $("#userList").empty();
-                            $("#userList").html($(data));
-                        },
-                        error: function () {
-                            alert("数据错误！");
-                        }
-                    });
-                    return false;
-                }
+                <%--function page(n, s) {--%>
+                    <%--$("#pageNo").val(n);--%>
+                    <%--$("#pageSize").val(s);--%>
+                    <%--$.ajax({--%>
+                        <%--url: "${ctx}/report/viewTransfer?flag=1",--%>
+                        <%--dataType: "html",--%>
+                        <%--data: $('#searchForm').serialize(),--%>
+                        <%--cache: false,--%>
+                        <%--success: function (data) { //登录成功后返回的数据--%>
+                            <%--$("#userList").empty();--%>
+                            <%--$("#userList").html($(data));--%>
+                        <%--},--%>
+                        <%--error: function () {--%>
+                            <%--alert("数据错误！");--%>
+                        <%--}--%>
+                    <%--});--%>
+                    <%--return false;--%>
+                <%--}--%>
 
                 function resetPageNo() {
                     $("#pageNo").val(0);
                 }
             </script>
             <span class="title">选择移交人员</span>
-            <%-- <form:form id="searchForm" modelAttribute="user" action="#" method="post" class="breadcrumb form-search">
-                  <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
-                  <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-                  <ul class="ul-form">
-                      <li><label>员工号：</label><form:input onchange="resetPageNo();" path="no" htmlEscape="false"
-                                                         maxlength="50" class="input-small"/></li>
-                      <li><label>姓名：</label><form:input onchange="resetPageNo();" path="name" htmlEscape="false"
-                                                        maxlength="50" class="input-small"/></li>
-                      <li><label>手机号：</label><form:input onchange="resetPageNo();" path="mobile" htmlEscape="false"
-                                                         maxlength="50" class="input-small"/></li>
-                      <li><label>公司：</label><form:select onchange="resetPageNo();" path="company.id" class="input-small ">
-                          <form:option value=" ">请选择</form:option>
-                          <form:options items="${companyList}" itemLabel="name" itemValue="id" htmlEscape="false"/>
-                      </form:select></li>
-                      <li class="clearfix"></li>
-                      <li><label>部门：</label><form:select onchange="resetPageNo();" path="office.id" class="input-small">
-                          <form:option value=" ">请选择</form:option>
-                          <form:options items="${officeList}" itemLabel="name" itemValue="id"
-                                        htmlEscape="false"/></form:select></li>
-                      <li><label>职位：</label><form:select onchange="resetPageNo();" path="position.name"
-                                                         class="input-small">
-                          <form:option value=" " selected="selected">请选择</form:option>
-                          <form:options items="${positionList}" itemLabel="name" itemValue="id"
-                                        htmlEscape="false"/></form:select></li>
-                      <li class="btns">
-                          <label style="width:auto;"><input id="btnSearch" class="btn btn-primary" type="button"
-                                                            value="筛选"/>&nbsp;&nbsp;</label>
-                      </li>
-                      <li class="clearfix"></li>
-                  </ul>
-              </form:form>--%>
+
             <div id="userList">
                 <table id="contentTable" class="table table-striped table-bordered table-condensed">
                     <thead>

src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp

@@ -224,7 +224,7 @@
                         },
                         subtitle: {//副标题
                             align: 'right',
-                            text: '总数&nbsp;:&nbsp;' + result.bench.totalCount + '<br/>举报无效&nbsp;:&nbsp;' + result.invalid + '<br/>移交客诉&nbsp;:&nbsp;' + result.complainNum + '<br/>举报受理&nbsp;:&nbsp;' + result.verified + '<br/>举报属实&nbsp;:&nbsp;' + result.confirmed + '<br/>举报不实&nbsp;:&nbsp;' + result.unreaListic + '<br/>转为线索&nbsp;:&nbsp;' + result.clue +'<br/>移交其它部门&nbsp;:&nbsp;' + result.transfer,
+                            text: '总数&nbsp;:&nbsp;' + result.resultNum + '<br/>举报无效&nbsp;:&nbsp;' + result.invalid + '<br/>移交客诉&nbsp;:&nbsp;' + result.complainNum + '<br/>举报受理&nbsp;:&nbsp;' + result.verified + '<br/>举报属实&nbsp;:&nbsp;' + result.confirmed + '<br/>举报不实&nbsp;:&nbsp;' + result.unreaListic + '<br/>转为线索&nbsp;:&nbsp;' + result.clue +'<br/>移交其它部门&nbsp;:&nbsp;' + result.transfer,
                             useHTML: true,
                             verticalAlign: 'top',
                             x: -5,