Skip to content

S
sunac_report
Commit d43e465c by sunxin
Options

工作台模块bug修复

parent a2a1de96
Showing with 137 additions and 116 deletions
src/main/java/com/ejweb/modules/workbench/Bean/WorkbenchBean.java
......@@ -80,6 +80,7 @@ public class WorkbenchBean {
}
private String area;
//角色
private String userRoleName="";
......
src/main/java/com/ejweb/modules/workbench/service/WorkbenchService.java
......@@ -95,88 +95,92 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> {
workbench.setRepStatusTotal(workbench.getUnProcess() + workbench.getProcessing() + workbench.getProcessed() + workbench.getClosed());
List<HashMap> types = reportDao.getReportType(workbench);
for (HashMap type : types) {
//营销
Object sale = type.get("sale");
workbench.setSale(Integer.valueOf(sale.toString()));
//工程
Object project = type.get("project");
workbench.setProject(Integer.valueOf(project.toString()));
//成本
Object cost = type.get("cost");
workbench.setCost(Integer.valueOf(cost.toString()));
//招采
Object forMining = type.get("forMining");
workbench.setForMining(Integer.valueOf(forMining.toString()));
//财务
Object finance = type.get("finance");
workbench.setFinance(Integer.valueOf(finance.toString()));
//法务
Object forensic = type.get("forensic");
workbench.setForensic(Integer.valueOf(forensic.toString()));
//行政
Object administration = type.get("administration");
workbench.setAdministration(Integer.valueOf(administration.toString()));
//人力
Object manpower = type.get("manpower");
workbench.setManpower(Integer.valueOf(manpower.toString()));
//开发
Object development = type.get("development");
workbench.setDevelopment(Integer.valueOf(development.toString()));
//研发
Object rAndD = type.get("rAndD");
workbench.setrAndD(Integer.valueOf(rAndD.toString()));
//投资
Object iAndD = type.get("iAndD");
workbench.setiAndD(Integer.valueOf(iAndD.toString()));
//其他
Object Other = type.get("Other");
workbench.setOther(Integer.valueOf(Other.toString()));
//物业管理
Object propertyManagement = type.get("propertyManagement");
workbench.setPropertyManagement(Integer.valueOf(propertyManagement.toString()));
//酒店管理
Object hotelManagement = type.get("hotelManagement");
workbench.setHotelManagement(Integer.valueOf(hotelManagement.toString()));
//商业管理
Object syManagement = type.get("businessManagement");
workbench.setBusinessManagement(Integer.valueOf(syManagement.toString()));
}
/* for (HashMap type : types) {
//营销
Object sale = type.get("sale");
workbench.setSale(Integer.valueOf(sale.toString()));
//工程
Object project = type.get("project");
workbench.setProject(Integer.valueOf(project.toString()));
//成本
Object cost = type.get("cost");
workbench.setCost(Integer.valueOf(cost.toString()));
//招采
Object forMining = type.get("forMining");
workbench.setForMining(Integer.valueOf(forMining.toString()));
//财务
Object finance = type.get("finance");
workbench.setFinance(Integer.valueOf(finance.toString()));
//法务
Object forensic = type.get("forensic");
workbench.setForensic(Integer.valueOf(forensic.toString()));
//行政
Object administration = type.get("administration");
workbench.setAdministration(Integer.valueOf(administration.toString()));
//人力
Object manpower = type.get("manpower");
workbench.setManpower(Integer.valueOf(manpower.toString()));
//开发
Object development = type.get("development");
workbench.setDevelopment(Integer.valueOf(development.toString()));
//研发
Object rAndD = type.get("rAndD");
workbench.setrAndD(Integer.valueOf(rAndD.toString()));
//投资
Object iAndD = type.get("iAndD");
workbench.setiAndD(Integer.valueOf(iAndD.toString()));
//其他
Object Other = type.get("Other");
workbench.setOther(Integer.valueOf(Other.toString()));
//物业管理
Object propertyManagement = type.get("propertyManagement");
workbench.setPropertyManagement(Integer.valueOf(propertyManagement.toString()));
//酒店管理
Object hotelManagement = type.get("hotelManagement");
workbench.setHotelManagement(Integer.valueOf(hotelManagement.toString()));
//商业管理
Object syManagement = type.get("businessManagement");
workbench.setBusinessManagement(Integer.valueOf(syManagement.toString()));
}*/
List<HashMap> totals = reportDao.getTotal(workbench);
for (HashMap total : totals) {
if (StringUtils.isNotBlank((String) total.get("report_source"))) {
if ("web".equals((String) total.get("report_source"))) {
if (StringUtils.isNotBlank((String) total.get("REPORT_SOURCE"))) {
if ("web".equals((String) total.get("REPORT_SOURCE"))) {
//官网
workbench.setWeb(Integer.valueOf(String.valueOf(total.get("COUNT(report_source)"))));
} else if ("oa".contains((String) total.get("report_source"))) {
workbench.setWeb(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
} else if ("oa".contains((String) total.get("REPORT_SOURCE"))) {
//融创oa
workbench.setOa(Integer.valueOf(String.valueOf(total.get("COUNT(report_source)"))));
} else if ("supplier".equals(String.valueOf(total.get("report_source")))) {
workbench.setOa(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
} else if ("supplier".equals(String.valueOf(total.get("REPORT_SOURCE")))) {
//供应商
workbench.setSupplier(Integer.valueOf(String.valueOf(total.get("COUNT(report_source)"))));
} else if ("wechat".equals(String.valueOf(total.get("report_source")))) {
workbench.setSupplier(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
} else if ("wechat".equals(String.valueOf(total.get("REPORT_SOURCE")))) {
//微信公众号
workbench.setWeChat(Integer.valueOf(String.valueOf(total.get("COUNT(report_source)"))));
} else if ("sunacE".equals(String.valueOf(total.get("report_source")))) {
workbench.setWeChat(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
} else if ("sunacE".equals(String.valueOf(total.get("REPORT_SOURCE")))) {
//融E
workbench.setSunacE(Integer.valueOf(String.valueOf(total.get("COUNT(report_source)"))));
} else if ("offline".equals(String.valueOf(total.get("report_source")))) {
workbench.setSunacE(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
} else if ("offline".equals(String.valueOf(total.get("REPORT_SOURCE")))) {
//线下扫码
workbench.setOffline(Integer.valueOf(String.valueOf(total.get("COUNT(report_source)"))));
} else if ("tel".equals(String.valueOf(total.get("report_source")))) {
workbench.setOffline(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
} else if ("tel".equals(String.valueOf(total.get("REPORT_SOURCE")))) {
//电话
workbench.setPhone(Integer.valueOf(String.valueOf(total.get("COUNT(report_source)"))));
} else if ("email".equals((String) total.get("report_source"))) {
workbench.setPhone(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
} else if ("email".equals((String) total.get("REPORT_SOURCE"))) {
//邮件
workbench.setEmail(Integer.valueOf(String.valueOf(total.get("COUNT(report_source)"))));
} else if ("visit".equals((String) total.get("report_source"))) {
workbench.setEmail(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
} else if ("visit".equals((String) total.get("REPORT_SOURCE"))) {
//来访
workbench.setVisit(Integer.valueOf(String.valueOf(total.get("COUNT(report_source)"))));
workbench.setVisit(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
}
}
}
workbench.setTotal(workbench.getWeb() + workbench.getOa() + workbench.getSupplier() + workbench.getWeChat() +
workbench.getSunacE() + workbench.getOffline() + workbench.getPhone() + workbench.getEmail() + workbench.getVisit());
return workbench;
}
......
src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java
......@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
import java.util.List;
......@@ -45,16 +46,14 @@ public class WorkbenchController extends BaseController {
private String selAreaTemp;//所选择的区域
@RequiresPermissions("workbench:view")
@RequestMapping(value = {"list", ""})
public String getWorkbench(Model model, WorkbenchBean bean) {
System.out.println("处理状态:======================================"+bean.getProcessStatus());
WorkbenchBean workbench;
selAreaTemp=bean.getArea();
try {
User user = UserUtils.getUser();
bean = getWorkbenchByUser(user, bean);
......@@ -63,6 +62,7 @@ public class WorkbenchController extends BaseController {
} else if ("1".equals(bean.getProcessStatus())) {
bean.setProcessStatus("1");
}
System.out.println("处理状态:======================================"+bean.getProcessStatus());
List<ReportEntity> repList = workbenchService.getRepList(bean);
/*封装类型 类别数据*/
......@@ -121,6 +121,7 @@ public class WorkbenchController extends BaseController {
res.put("bench", bean);
//区域
res.put("supplementGroup",bean.getSupplementGroup());
res.put("area",bean.getArea());
//1.举报状态
res.put("unProcess", bean.getUnProcess());
......@@ -188,7 +189,6 @@ public class WorkbenchController extends BaseController {
bean.setIsAdmin(user.getId());
}
}
bean.setArea(selAreaTemp);
bean = workbenchService.getWorkbench(bean);
} catch (Exception e) {
e.printStackTrace();
......
src/main/resources/mappings/modules/report/ReportDao.xml
......@@ -17,11 +17,7 @@
r.supplement_department AS "supplementDepartment",
r.supplement_informant AS "supplementInformant",
r.supplement_title AS "supplementTitle",
/*r.supplement_type AS "supplementType",*/
ct.name AS "transferDepartment",
b2.label AS "transferGroup",
b3.name AS "transferArea",
/*r.supplement_area AS "supplementArea",*/
r.supplement_project AS "supplementProject",
r.supplement_content AS "supplementContent",
r.deal_person_name AS "dealPersonName",
......@@ -46,7 +42,6 @@
r.report_qq AS "qq",
r.report_weixin AS "weixin",
r.report_ifClue AS "ifClue" ,
b.label AS "supplementGroup",
r.supplement_category AS "supplementCategory",
r.supplement_type AS "supplementType"
......@@ -62,14 +57,17 @@
SELECT
<include refid="reportColumns"/>
,su.name AS "transferName"
,b.label AS "supplementGroup"
,b2.label AS "transferGroup"
,cr2.name AS "transferArea"
,cr.name AS "supplementArea"
FROM ct_bbtc_report r
LEFT JOIN ct_bbtc_sys_user su ON r.exchange_after_user = su.id
LEFT JOIN ct_bbtc_region CR ON r.supplement_area = CR.id
LEFT JOIN ct_bbtc_bus_type CT ON r.transfer_department = CT.id
LEFT JOIN ct_bbtc_sys_dict b on b.id = r.supplement_group
LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.TRANSFERGROUP
LEFT JOIN ct_bbtc_region b3 on b3.id = r.transferArea
LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.transferGroup
LEFT JOIN ct_bbtc_region CR2 ON r.transferArea = CR2.id
/* LEFT JOIN ct_bbtc_bus_type CT
ON R.supplement_group = CT.supplement_group
......@@ -82,6 +80,9 @@
SELECT
<include refid="reportColumns"/>
,su.name AS "transferName"
,b.label AS "supplementGroup"
,b2.label AS "transferGroup"
,cr2.name AS "transferArea"
,cr.name AS "supplementArea"
FROM CT_BBTC_REPORT R
LEFT JOIN CT_BBTC_SYS_USER SU
......@@ -91,12 +92,11 @@
LEFT JOIN CT_BBTC_SYS_ROLE RL
ON RL.ID = UR.ROLE_ID
LEFT JOIN ct_bbtc_sys_dict b on b.id = r.supplement_group
LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.TRANSFERGROUP
LEFT JOIN ct_bbtc_region b3 on b3.id = r.transferArea
LEFT JOIN ct_bbtc_region CR
ON r.supplement_area = CR.id
LEFT JOIN ct_bbtc_region CR ON r.supplement_area = CR.id
LEFT JOIN ct_bbtc_bus_type CT
ON r.transfer_department = CT.id
LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.transferGroup
LEFT JOIN ct_bbtc_region CR2 ON r.transferArea = CR2.id
<where>
1 = 1
<if test="isAdmin == null and isFzAdmin == null">
......@@ -217,6 +217,9 @@
SELECT
<include refid="reportColumns"/>
,su.name AS "transferName"
,b.label AS "supplementGroup"
,b2.label AS "transferGroup"
,cr2.name AS "transferArea"
,cr.name AS "supplementArea"
FROM CT_BBTC_REPORT R
LEFT JOIN CT_BBTC_SYS_USER SU
......@@ -226,12 +229,12 @@
LEFT JOIN CT_BBTC_SYS_ROLE RL
ON RL.ID = UR.ROLE_ID
LEFT JOIN ct_bbtc_sys_dict b on b.id = r.supplement_group
LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.TRANSFERGROUP
LEFT JOIN ct_bbtc_region b3 on b3.id = r.transferArea
LEFT JOIN ct_bbtc_region CR
ON r.supplement_area = CR.id
LEFT JOIN ct_bbtc_bus_type CT
ON r.transfer_department = CT.id
LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.transferGroup
LEFT JOIN ct_bbtc_region CR2 ON r.transferArea = CR2.id
<where>
1 = 1
<if test="supplementType != null and supplementType != ''">
......@@ -272,6 +275,9 @@
SELECT
<include refid="reportColumns"/>
,su.name AS "transferName"
,b.label AS "supplementGroup"
,b2.label AS "transferGroup"
,cr2.name AS "transferArea"
,cr.name AS "supplementArea"
FROM ct_bbtc_report r
......@@ -280,12 +286,12 @@
LEFT JOIN CT_BBTC_SYS_ROLE RL
ON RL.ID = UR.ROLE_ID
LEFT JOIN ct_bbtc_sys_dict b on b.id = r.supplement_group
LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.TRANSFERGROUP
LEFT JOIN ct_bbtc_region b3 on b3.id = r.transferArea
LEFT JOIN ct_bbtc_region CR
ON r.supplement_area = CR.id
LEFT JOIN ct_bbtc_bus_type CT
ON r.transfer_department = CT.id
LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.transferGroup
LEFT JOIN ct_bbtc_region CR2 ON r.transferArea = CR2.id
/* LEFT JOIN ct_bbtc_bus_type CT
ON R.supplement_group = CT.supplement_group
LEFT JOIN ct_bbtc_bus_category CC
......@@ -433,6 +439,9 @@
<select id="findAllList" parameterType="ReportEntity" resultType="ReportEntity">
SELECT
<include refid="reportColumns"/>
,b.label AS "supplementGroup"
,b2.label AS "transferGroup"
,cr2.name AS "transferArea"
,cr.name AS "supplementArea"
FROM ct_bbtc_report r
LEFT JOIN ct_bbtc_region CR
......@@ -440,8 +449,8 @@
LEFT JOIN ct_bbtc_bus_type CT
ON r.transfer_department = CT.id
LEFT JOIN ct_bbtc_sys_dict b on b.id = r.supplement_group
LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.TRANSFERGROUP
LEFT JOIN ct_bbtc_region b3 on b3.id = r.transferArea
LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.transferGroup
LEFT JOIN ct_bbtc_region CR2 ON r.transferArea = CR2.id
/* LEFT JOIN ct_bbtc_bus_type CT
ON R.supplement_group = CT.supplement_group
LEFT JOIN ct_bbtc_bus_category CC
......@@ -928,7 +937,6 @@
r.supplement_informant AS "supplementInformant",
r.supplement_title AS "supplementTitle",
r.supplement_type AS "supplementType",
b.label AS "supplementGroup",
r.supplement_category AS "supplementCategory",
r.supplement_project AS "supplementProject",
r.supplement_content AS "supplementContent",
......@@ -940,15 +948,17 @@
r.create_by AS "createBy",
r.create_date AS "createDate",
r.update_by AS "updateBy",
r.update_date AS "updateDate"
,cr.name AS "supplementArea"
r.update_date AS "updateDate",
cr.name AS "supplementArea",
b.label AS "supplementGroup",
b2.label AS "transferGroup",
cr2.name AS "transferArea"
FROM ct_bbtc_report r
LEFT JOIN ct_bbtc_region CR
ON r.supplement_area = CR.id
LEFT JOIN ct_bbtc_bus_type CT
ON r.transfer_department = CT.id
LEFT JOIN ct_bbtc_region cr ON r.supplement_area = cr.id
LEFT JOIN ct_bbtc_region cr2 ON r.transferArea = cr2.id
LEFT JOIN ct_bbtc_sys_dict b on b.id = r.supplement_group
LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.transferGroup
<where>
r.report_status = #{processStatus}
......@@ -956,18 +966,18 @@
AND r.exchange_after_user = #{isAdmin}
</if>
<if test="startDate != null">
<if test="dbName == 'oracle'">AND create_date >= to_date(#{startDate}, 'yyyy-MM-dd')</if>
<if test="dbName == 'mysql'">AND DATE(create_date) >= #{startDate}</if>
<if test="dbName == 'oracle'">AND r.create_date >= to_date(#{startDate}, 'yyyy-MM-dd')</if>
<if test="dbName == 'mysql'">AND DATE(r.create_date) >= #{startDate}</if>
</if>
<if test="endDate != null">
<if test="dbName == 'oracle'">AND create_date &lt;= to_date( #{endDate}|| ' 23:59:59', 'yyyy-MM-dd
<if test="dbName == 'oracle'">AND r.create_date &lt;= to_date( #{endDate}|| ' 23:59:59', 'yyyy-MM-dd
hh24:mi:ss')
</if>
<if test="dbName == 'mysql'">AND DATE(create_date) &lt;= #{endDate}</if>
<if test="dbName == 'mysql'">AND DATE(r.create_date) &lt;= #{endDate}</if>
</if>
<if test="supplementGroup != null and supplementGroup != ''">
AND r.supplement_group = #{supplementGroup}
AND r.supplement_group = #{supplementGroup}
</if>
<if test="area != null and area !=''">
......@@ -977,9 +987,9 @@
</where>
order by r.create_date desc
) AS W
<if test="dbName == 'oracle'">rownum &lt;= 10</if>
<if test="dbName == 'mysql'">limit 0,10</if>
) w
<if test="dbName == 'oracle'">WHERE rownum &lt;= 10</if>
<if test="dbName == 'mysql'"> limit 0,10</if>
</select>
<select id="getChooseReportList" parameterType="com.ejweb.modules.report.entity.ReportEntity"
......@@ -994,6 +1004,7 @@
r.supplement_title AS "supplementTitle",
r.supplement_type AS "supplementType",
b.label AS "supplementGroup",
b2.label AS "transferGroup",
r.supplement_category AS "supplementCategory",
r.supplement_department AS "supplementDepartment",
r.supplement_informant AS "supplementInformant",
......@@ -1002,15 +1013,16 @@
r.exchange_type AS "exchangeType",
su.name AS "transferName"
,cr.name AS "supplementArea"
,cr2.name AS "transferArea"
FROM ct_bbtc_report r
LEFT JOIN ct_bbtc_sys_user su ON r.exchange_after_user = su.id
LEFT JOIN ct_bbtc_region CR
ON r.supplement_area = CR.id
LEFT JOIN ct_bbtc_bus_type CT
ON r.transfer_department = CT.id
LEFT JOIN ct_bbtc_region CR ON r.supplement_area = CR.id
LEFT JOIN ct_bbtc_bus_type CT ON r.transfer_department = CT.id
LEFT JOIN ct_bbtc_sys_dict b on b.id = r.supplement_group
LEFT JOIN ct_bbtc_region cr2 ON r.transferArea = cr2.id
LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.transferGroup
<where>
1 = 1
<if test="exchangeAfterUser != null and exchangeAfterUser != ''">
......@@ -1079,10 +1091,6 @@
<select id="getTotalNum" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean" resultType="Integer">
SELECT count(*) AS "totalCount"
FROM ct_bbtc_report r
LEFT JOIN ct_bbtc_region CR
ON r.supplement_area = CR.id
LEFT JOIN ct_bbtc_bus_type CT
ON r.transfer_department = CT.id
WHERE 1 = 1
<if test="isAdmin != null">
AND exchange_after_user = #{isAdmin}
......
src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp
......@@ -11,18 +11,23 @@
<script src="${pageContext.request.contextPath}/assets/My97DatePicker/WdatePicker.js"></script>
<script>
$(function () {
/*每次加载页面时去查询区域*/
getRegion();
var startDate = $("#startDate").val();
var endDate = $("#endDate").val();
var supplementGroup = $("#supplementGroup").val();
var selectedArea= "${workbench.area}";
var start = startDate.substring(5).replace("-", ".");
var end = endDate.substring(5).replace("-", ".");
var selectedArea=$("#area").val();
console.log("区域"+selectedArea);
console.log("开始"+start);
console.log("结束"+end);
$.ajax({
type: "POST",
dataType: "JSON",
data: {"startDate": startDate, "endDate": endDate},
data: {"startDate": startDate, "endDate": endDate,"supplementGroup":supplementGroup,"area":selectedArea},
url: "getHighcharts.action",
success: function (result) {
......@@ -483,8 +488,6 @@
/* $('#total').highcharts({
});*/
getRegion();
});
//选择区域
// function selectArea(value){
......@@ -515,6 +518,10 @@
slsb.append(new Option(data1[i].name,data1[i].id));
}
}
var area="${workbench.area}";
if( area != null && area != ''){
$("#area").val(area);
}
},error:function(data){
alert(系统错误);
......@@ -650,11 +657,12 @@
<td>${vs.index + 1}</td>
<td>${report.supplementTitle}</td>
<td align="center">
<c:if test="${report.supplementGroup eq '3437402691677202102'}">集团本部</c:if>
${report.supplementGroup}
<%-- <c:if test="${report.supplementGroup eq '3437402691677202102'}">集团本部</c:if>
<c:if test="${report.supplementGroup eq '3510129313047280678'}">区域集团</c:if>
<c:if test="${report.supplementGroup eq '3565898923067676254'}">服务集团</c:if>
<c:if test="${report.supplementGroup eq '3806696792996264972'}">文化集团</c:if>
<c:if test="${report.supplementGroup eq '3770618512934949260'}">文旅集团</c:if>
<c:if test="${report.supplementGroup eq '3770618512934949260'}">文旅集团</c:if>--%>
<c:if test="${report.supplementGroup eq null}">--</c:if>
</td>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment