Skip to content

S
sunac_report
Commit cede9b8f by mengxy
Options

提交reportDao冲突部分代码

parent 1baecdb2
Showing with 151 additions and 7 deletions
pom.xml
......@@ -608,8 +608,14 @@
<groupId>com.kingdee.eas.cp.eip.sso.ltpa</groupId>
<artifactId>LTPATokenManager</artifactId>
<version>1.0.0</version>
</dependency>
<!--JFreeChart-->
<dependency>
<groupId>jfree</groupId>
<artifactId>jfreechart</artifactId>
<version>1.0.13</version>
</dependency>
<!-- 自定义jar依赖包
<dependency>
<groupId>com.thinkgem.jeesite</groupId>
......
report_sunac.iml
......@@ -9,10 +9,6 @@
<webroots>
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
</webroots>
<sourceRoots>
<root url="file://$MODULE_DIR$/src/main/java" />
<root url="file://$MODULE_DIR$/src/main/resources" />
</sourceRoots>
</configuration>
</facet>
<facet type="Spring" name="Spring">
......@@ -67,7 +63,7 @@
<orderEntry type="module-library">
<library name="Maven: com.alibaba:jconsole:1.8.0">
<CLASSES>
<root url="jar://C:/Program Files/Java/jdk1.8.0/lib/jconsole.jar!/" />
<root url="jar://C:/Program Files/Java/jdk1.8.0_131/lib/jconsole.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
......@@ -76,7 +72,7 @@
<orderEntry type="module-library">
<library name="Maven: com.alibaba:tools:1.8.0">
<CLASSES>
<root url="jar://C:/Program Files/Java/jdk1.8.0/lib/tools.jar!/" />
<root url="jar://C:/Program Files/Java/jdk1.8.0_131/lib/tools.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
......@@ -92,6 +88,13 @@
<orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet.jsp:jsp-api:2.1" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.6.1" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.6.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.6.1" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-core:2.6.1" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.16" level="project" />
<orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
<orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-web:2.0.4" level="project" />
<orderEntry type="library" name="Maven: redis.clients:jedis:2.5.1" level="project" />
......@@ -251,5 +254,7 @@
</library>
</orderEntry>
<orderEntry type="library" name="Maven: com.kingdee.eas.cp.eip.sso.ltpa:LTPATokenManager:1.0.0" level="project" />
<orderEntry type="library" name="Maven: jfree:jfreechart:1.0.13" level="project" />
<orderEntry type="library" name="Maven: jfree:jcommon:1.0.16" level="project" />
</component>
</module>
\ No newline at end of file
src/main/java/com/ejweb/modules/report/dao/ReportDao.java
......@@ -5,7 +5,9 @@ import com.ejweb.core.persistence.annotation.MyBatisDao;
import com.ejweb.modules.report.entity.ReportAttachmentEntity;
import com.ejweb.modules.report.entity.ReportEntity;
import com.ejweb.modules.sys.entity.User;
import com.ejweb.modules.workbench.Bean.WorkbenchBean;
import java.util.HashMap;
import java.util.List;
/**
......@@ -56,4 +58,29 @@ public interface ReportDao extends CrudDao<ReportEntity> {
* @return
*/
public int updateReportStatus(ReportEntity reportEntity);
/**
* 举报状态数据
*/
public List<HashMap> getReportStatus(WorkbenchBean benchBean) throws Exception;
/**
* 举报结果数据
*/
public List<HashMap> getReportResult(WorkbenchBean benchBean) throws Exception;
/**
* 总体
*/
public List<HashMap> getTotal(WorkbenchBean benchBean) throws Exception;
/**
* 举报类型
*/
public List<HashMap> getReportType(WorkbenchBean benchBean) throws Exception;
/**
* 举报列表
*/
public List<ReportEntity> getRepList(WorkbenchBean benchBean) throws Exception;
}
src/main/resources/mappings/modules/report/ReportDao.xml
......@@ -214,5 +214,109 @@
<if test="dbName == 'mssql'">'%,'+#{id}+',%'</if>
<if test="dbName == 'mysql'">CONCAT('%,', #{id}, ',%')</if>
</update>
<select id="getReportStatus" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean" resultType="java.util.HashMap">
select report_status,COUNT(report_status)
FROM report
WHERE 1=1
<if test="isAdmin != null">
AND exchange_after_user = #{isAdmin}
</if>
<if test="startDate != null">
AND create_date >= #{startDate}
</if>
<if test="endDate != null">
AND create_date &lt;= CONCAT(#{endDate}," 23:59:59")
</if>
GROUP BY report_status
</select>
<select id="getReportResult" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean" resultType="java.util.HashMap">
select deal_result,COUNT(deal_result)
FROM report
WHERE report_status='2'
<if test="isAdmin != null">
AND exchange_after_user = #{isAdmin}
</if>
<if test="startDate != null">
AND create_date >= #{startDate}
</if>
<if test="endDate != null">
AND create_date &lt;= CONCAT(#{endDate}," 23:59:59")
</if>
GROUP BY deal_result
</select>
<select id="getTotal" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean" resultType="java.util.HashMap">
select report_source,COUNT(report_source)
FROM report
WHERE 1=1
<if test="isAdmin != null">
AND exchange_after_user = #{isAdmin}
</if>
<if test="startDate != null">
AND create_date >= #{startDate}
</if>
<if test="endDate != null">
AND create_date &lt;= CONCAT(#{endDate}," 23:59:59")
</if>
GROUP BY report_source
</select>
<select id="getReportType" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean" resultType="java.util.HashMap">
select supplement_type,COUNT(supplement_type)
FROM report
WHERE 1=1
<if test="isAdmin != null">
AND exchange_after_user = #{isAdmin}
</if>
<if test="startDate != null">
AND create_date >= #{startDate}
</if>
<if test="endDate != null">
AND create_date &lt;= CONCAT(#{endDate}," 23:59:59")
</if>
GROUP BY supplement_type
</select>
<select id="getRepList" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean" resultType="ReportEntity">
SELECT
r.id AS "id",
r.report_project AS "reportProject",
r.report_city AS "reportCity",
r.report_time AS "reportTime",
r.report_content AS "reportContent",
r.report_person_name AS "reportPersonName",
r.report_person_tel AS "reportPersonTel",
r.report_person_email AS "reportPersonEmail",
r.report_source AS "reportSource",
r.report_status AS "reportStatus",
r.supplement_company AS "supplementCompany",
r.supplement_department AS "supplementDepartment",
r.supplement_informant AS "supplementInformant",
r.supplement_title AS "supplementTitle",
r.supplement_type AS "supplementType",
r.supplement_area AS "supplementArea",
r.supplement_project AS "supplementProject",
r.supplement_content AS "supplementContent",
r.deal_person_name AS "dealPersonName",
r.deal_result AS "dealResult",
r.exchange_before_user AS "exchangeBeforeUser",
r.exchange_after_user AS "exchangeAfterUser",
r.create_by AS "createBy",
r.create_date AS "createDate",
r.update_by AS "updateBy",
r.update_date AS "updateDate"
FROM report r
WHERE r.report_status = #{processStatus}
<if test="startDate != null">
AND r.create_date >= #{startDate}
</if>
<if test="endDate != null">
AND r.create_date &lt;= CONCAT(#{endDate}," 23:59:59")
</if>
order by r.create_date desc
limit 0,10
</select>
</mapper>
\ No newline at end of file
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