修改数据

report_sunac.iml

 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="web" name="Web">
       <configuration>
@@ -63,7 +63,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
         <CLASSES>
-          <root url="jar://D:/java/lib/jconsole.jar!/" />
+          <root url="jar://D:/jdk/java/lib/jconsole.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -72,7 +72,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:tools:1.8.0">
         <CLASSES>
-          <root url="jar://D:/java/lib/tools.jar!/" />
+          <root url="jar://D:/jdk/java/lib/tools.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

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

@@ -230,5 +230,5 @@ public interface ReportDao extends CrudDao<ReportEntity> {
      */
     public int deleteNotice(ReportEntity reportEntity);
 
-
+    public String selectExchangeAfterUser(String report);
 }

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

@@ -289,7 +289,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
                 //当前只有杨杨是系统管理员，处理后消息发给杨杨，以后如果新增了系统管理员需修改
                 //findAdmin（）方法获取所有系统管理员
 //                reportNotice.setSendToId("8434980248282724540228");
-                reportNotice.setSendToId("1");
+                reportNotice.setSendToId("8434980248282724540228");
                 reportNotice.setTitle("“" + reportEntity.getSupplementTitle() + "”已由" + user.getName() + "于" + dateStr + "处理完成");
             }
             if (flag.equals("meanWhile")) {
@@ -365,7 +365,10 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
      */
     public List<ReportEntity> getReportList(ReportEntity reportEntity) {
         List<ReportEntity> reportList = dao.findList(reportEntity);
+        String exchangeAfterUser = "";
         for (ReportEntity report : reportList) {
+            exchangeAfterUser = reportDao.selectExchangeAfterUser(report.getExchangeAfterUser());
+            report.setTransferName(exchangeAfterUser);
             String typeStr = "";
             if (StringUtils.isNoneBlank(report.getSupplementType())) {
                 String[] types = report.getSupplementType().split(",");
@@ -565,7 +568,11 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
      */
     public List<ReportEntity> getReportQyList(ReportEntity reportEntity) {
         List<ReportEntity> reportList = reportDao.findQyList(reportEntity);
-        for (ReportEntity report : reportList) {
+        String exchangeAfterUser = "";
+        for (ReportEntity report : reportList)
+        {
+            exchangeAfterUser = reportDao.selectExchangeAfterUser(report.getExchangeAfterUser());
+            report.setTransferName(exchangeAfterUser);
             String typeStr = "";
             if (StringUtils.isNoneBlank(report.getSupplementType())) {
                 String[] types = report.getSupplementType().split(",");
@@ -606,6 +613,70 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
                 typeStr = typeStr.substring(0, typeStr.length() - 1);
             }
             report.setSupplementType(typeStr);
+
+            //移交部门
+            String TransferDepartment = report.getTransferDepartment();
+            if (StringUtils.isNoneBlank(report.getTransferDepartment())) {
+                if (TransferDepartment.equals("1")) {
+                    TransferDepartment = "营销";
+                } else if (TransferDepartment.equals("2")) {
+                    TransferDepartment = "工程";
+                } else if (TransferDepartment.equals("3")) {
+                    TransferDepartment = "成本";
+                } else if (TransferDepartment.equals("4")) {
+                    TransferDepartment = "招采";
+                } else if (TransferDepartment.equals("5")) {
+                    TransferDepartment = "财务";
+                } else if (TransferDepartment.equals("6")) {
+                    TransferDepartment = "法务";
+                } else if (TransferDepartment.equals("7")) {
+                    TransferDepartment = "行政";
+                } else if (TransferDepartment.equals("8")) {
+                    TransferDepartment = "人力";
+                } else if (TransferDepartment.equals("9")) {
+                    TransferDepartment = "开发";
+                } else if (TransferDepartment.equals("10")) {
+                    TransferDepartment = "研发";
+                } else if (TransferDepartment.equals("11")) {
+                    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 = "";
+            }
+            report.setTransferDepartment(TransferDepartment);
+            //举报途径
+            String reportSource = report.getReportSource();
+            if (StringUtils.isNotBlank(reportSource)) {
+                if (reportSource.equals("oa")) {
+                    reportSource = "融创OA系统";
+                } else if (reportSource.equals("supplier")) {
+                    reportSource = "供应商系统";
+                } else if (reportSource.equals("wechat")) {
+                    reportSource = "微信公众号";
+                } else if (reportSource.equals("sunacE")) {
+                    reportSource = "融E";
+                } else if (reportSource.equals("offline")) {
+                    reportSource = "线下扫码";
+                } else if (reportSource.equals("tel")) {
+                    reportSource = "电话";
+                } else if (reportSource.equals("email")) {
+                    reportSource = "邮件";
+                } else if (reportSource.equals("visit")) {
+                    reportSource = "来访";
+                }
+            } else {
+                reportSource = "";
+            }
+            report.setReportSource(reportSource);
+            //状态
             String reportStatus = report.getReportStatus();
             if (StringUtils.isNotBlank(reportStatus)) {
                 if (reportStatus.equals("0")) {
@@ -689,6 +760,8 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
                 isSendEmail = "否";
             }
             report.setIsSendEmail(isSendEmail);
+
+
         }
         return reportList;
     }

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

@@ -5,6 +5,7 @@ import com.ejweb.core.persistence.Page;
 import com.ejweb.core.utils.DateUtils;
 import com.ejweb.core.utils.StringUtils;
 import com.ejweb.core.utils.excel.ExportExcel;
+import com.ejweb.modules.report.dao.ReportDao;
 import com.ejweb.modules.report.entity.ReportAttachmentEntity;
 import com.ejweb.modules.report.entity.ReportEntity;
 import com.ejweb.modules.report.service.ReportService;
@@ -44,6 +45,9 @@ public class ReportController extends BaseController {
     @Autowired
     private NoticeService noticeService;
 
+    @Autowired
+    private ReportDao reportdao;
+
     @ModelAttribute
     public ReportEntity get(@RequestParam(required = false) String id) {
         if (StringUtils.isNotBlank(id)) {
@@ -165,8 +169,9 @@ public class ReportController extends BaseController {
                     report.setOaname(value + "-" + report.getOaname());
                 }
             }
-
-        }
+            String exchangeAfterUser = reportdao.selectExchangeAfterUser(report.getExchangeAfterUser());
+            report.setTransferName(exchangeAfterUser);
+    }
 
         page.setList(reportlist);
         boolean isAdmin = reportService.checkRole(user);
@@ -291,7 +296,10 @@ public class ReportController extends BaseController {
                 if (StringUtils.isNoneBlank(report.getOaname())) {
                     report.setOaname(value + "-" + report.getOaname());
                 }
+
             }
+            String exchangeAfterUser = reportdao.selectExchangeAfterUser(report.getExchangeAfterUser());
+            report.setTransferName(exchangeAfterUser);
         }
         page.setList(reportlist);
         boolean isAdmin = reportService.checkRole(user);

src/main/java/com/ejweb/modules/workbench/service/WorkbenchService.java

@@ -67,7 +67,7 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> {
             }
 
         }
-        workbench.setRepResultTotal(workbench.getComplainNum() + workbench.getInvalid() + workbench.getVerified() + workbench.getConfirmed());
+        workbench.setRepResultTotal(workbench.getComplainNum() + workbench.getInvalid() + workbench.getVerified() + workbench.getConfirmed() + workbench.getUnreaListic() + workbench.getTransfer());
         workbench.setUnsettled(workbench.getTotalCount() - workbench.getRepResultTotal());
         List<HashMap> statusList = reportDao.getReportStatus(workbench);
         //举报状态
@@ -108,7 +108,7 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> {
             workbench.setFinance(Integer.valueOf(finance.toString()));
             //法务
             Object forensic = type.get("forensic");
-            workbench.setFinance(Integer.valueOf(forensic.toString()));
+            workbench.setForensic(Integer.valueOf(forensic.toString()));
             //行政
             Object administration = type.get("administration");
             workbench.setAdministration(Integer.valueOf(administration.toString()));
@@ -116,8 +116,8 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> {
             Object manpower = type.get("manpower");
             workbench.setManpower(Integer.valueOf(manpower.toString()));
             //开发
-            Object businessManagement = type.get("development");
-            workbench.setBusinessManagement(Integer.valueOf(businessManagement.toString()));
+            Object development = type.get("development");
+            workbench.setDevelopment(Integer.valueOf(development.toString()));
             //研发
             Object rAndD = type.get("rAndD");
             workbench.setrAndD(Integer.valueOf(rAndD.toString()));
@@ -126,16 +126,16 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> {
             workbench.setiAndD(Integer.valueOf(iAndD.toString()));
             //其他
             Object Other = type.get("Other");
-            workbench.setComplain(Integer.valueOf(Other.toString()));
+            workbench.setOther(Integer.valueOf(Other.toString()));
             //物业管理
             Object propertyManagement = type.get("propertyManagement");
-            workbench.setiAndD(Integer.valueOf(propertyManagement.toString()));
+            workbench.setPropertyManagement(Integer.valueOf(propertyManagement.toString()));
             //酒店管理
             Object hotelManagement = type.get("hotelManagement");
-            workbench.setiAndD(Integer.valueOf(hotelManagement.toString()));
+            workbench.setHotelManagement(Integer.valueOf(hotelManagement.toString()));
             //商业管理
             Object syManagement = type.get("businessManagement");
-            workbench.setiAndD(Integer.valueOf(syManagement.toString()));
+            workbench.setBusinessManagement(Integer.valueOf(syManagement.toString()));
         }
         List<HashMap> totals = reportDao.getTotal(workbench);
         for (HashMap total : totals) {

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

@@ -73,12 +73,13 @@ public class WorkbenchController extends BaseController {
             res.put("complainNum", bean.getComplainNum());
             res.put("verified", bean.getVerified());
             res.put("confirmed", bean.getConfirmed());
-            res.put("unreaListic", bean.getConfirmed());
-            res.put("transfer", 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("startDate", bean.getStartDate());
             res.put("endDate", bean.getEndDate());
             //举报类型
-            res.put("sale", bean.getLand());
+            res.put("sale", bean.getSale());
             res.put("project", bean.getProject());
             res.put("cost", bean.getCost());
             res.put("forMining", bean.getForMining());

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

@@ -57,21 +57,15 @@
         <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
+        LEFT JOIN ct_bbtc_sys_user SU
+        ON r.create_by = SU.ID
         <where>
             1 = 1
             <if test="isAdmin == null">
                 AND r.exchange_after_user = #{exchangeAfterUser} AND r.create_by != #{exchangeAfterUser}
             </if>
             <if test="isAdmin != null">
-                AND r.supplement_area ='Group' AND su.area NOT IN ('North China',
-                'BeiJing',
-                'ShangHai',
-                'SouthWest',
-                'SouthEast',
-                'Central China',
-                'GuangShen',
-                'Hainan') OR r.create_by = #{isAdmin}
+                AND su.role_id='1'
             </if>
             <if test="reportStatus != null and reportStatus != ''">
                 AND r.report_status = #{reportStatus}
@@ -152,7 +146,9 @@
                 'SouthEast',
                 'Central China',
                 'GuangShen',
-                'Hainan')
+                'Hainan',
+                'Group',
+                'PropertyGroup')
             </if>
             <if test="reportStatus != null and reportStatus != ''">
                 AND r.report_status = #{reportStatus}
@@ -574,7 +570,8 @@
     <select id="getReportType" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean"
             resultType="java.util.HashMap">
         SELECT
-        SUM(CASE WHEN supplement_type||',' LIKE '1,%' OR supplement_type||',' LIKE '%,1,%' THEN 1 ELSE 0 END) AS "sale",
+        SUM(CASE WHEN supplement_type||',' LIKE '1,%' OR supplement_type||',' LIKE '%,1,%' THEN 1 ELSE 0 END) AS
+        "sale",
         SUM(CASE WHEN supplement_type||',' LIKE '2,%' OR supplement_type||',' LIKE '%,2,%' THEN 1 ELSE 0 END) AS
         "project",
         SUM(CASE WHEN supplement_type||',' LIKE '3,%' OR supplement_type||',' LIKE '%,3,%' THEN 1 ELSE 0 END) AS
@@ -597,11 +594,11 @@
         "iAndD",
         SUM(CASE WHEN supplement_type||',' LIKE '12,%' OR supplement_type||',' LIKE '%,12,%' THEN 1 ELSE 0 END) AS
         "Other",
-        SUM(CASE WHEN supplement_type||',' LIKE '2,%' OR supplement_type||',' LIKE '%,2,%' THEN 1 ELSE 0 END) AS
+        SUM(CASE WHEN supplement_type||',' LIKE '13,%' OR supplement_type||',' LIKE '%,13,%' THEN 1 ELSE 0 END) AS
         "propertyManagement",
-        SUM(CASE WHEN supplement_type||',' LIKE '3,%' OR supplement_type||',' LIKE '%,3,%' THEN 1 ELSE 0 END) AS
+        SUM(CASE WHEN supplement_type||',' LIKE '14,%' OR supplement_type||',' LIKE '%,14,%' THEN 1 ELSE 0 END) AS
         "hotelManagement",
-        SUM(CASE WHEN supplement_type||',' LIKE '4,%' OR supplement_type||',' LIKE '%,4,%' THEN 1 ELSE 0 END) AS
+        SUM(CASE WHEN supplement_type||',' LIKE '15,%' OR supplement_type||',' LIKE '%,15,%' THEN 1 ELSE 0 END) AS
         "businessManagement"
         FROM ct_bbtc_report
         WHERE 1=1
@@ -765,4 +762,14 @@
         delete from CT_BBTC_REPORT_NOTICE
         where report_id = #{id}
     </delete>
+
+
+    <select id="selectExchangeAfterUser" parameterType="ReportEntity" resultType="String">
+        SELECT
+        su.name
+        FROM
+        ct_bbtc_sys_user su
+        WHERE
+        su.id=#{report}
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -252,7 +252,7 @@
 <div class="control-group">
     <label class="control-label">处理结论:</label>
     <div class="controls">
-        <c:if test="${isAdmin eq true && report.reportStatus eq '2'}"><form:select id="dealResult" path="dealResult"
+        <c:if test="${isAdmin eq true && report.reportStatus eq '2'}"><form:select path="dealResult"
                                                                                    class="input-small"
                                                                                    onchange="showDone();">
             <form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value"

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

@@ -219,7 +219,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.unsettled + '<br/>移交其它部门&nbsp;:&nbsp;' + result.transfer,
+                            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.reportWeichuli + '<br/>移交其它部门&nbsp;:&nbsp;' + result.transfer,
                             useHTML: true,
                             verticalAlign: 'top',
                             x: -5,
@@ -248,7 +248,7 @@
                                 ['举报受理', result.verified],
                                 ['举报属实', result.confirmed],
                                 ['举报不实', result.unreaListic],
-                                ['举报未处理', result.unsettled],
+                                ['举报未处理',result.reportWeichuli],
                                 ['移交其它部门', result.transfer]
                             ]
                         }]