[修改] 切分支 提targer

adc-da-report/target/classes/license.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<License>
+    <Data>
+        <Products>
+            <Product>Aspose.Total for Java</Product>
+            <Product>Aspose.Words for Java</Product>
+        </Products>
+        <EditionType>Enterprise</EditionType>
+        <SubscriptionExpiry>20991231</SubscriptionExpiry>
+        <LicenseExpiry>20991231</LicenseExpiry>
+        <SerialNumber>8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7</SerialNumber>
+    </Data>
+    <Signature>sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU=</Signature>
+</License>

adc-da-report/target/classes/mybatis/mapper/mysql/LabelManageMapper.xml

@@ -0,0 +1,9 @@
+<?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.adc.da.report.dao.mysql.LabelDao">
+
+    <select id="getMaxNum" parameterType="string" resultType="int">
+        select max(t.orderNum)  from TS_LABEL t where type=#{type}
+    </select>
+
+</mapper>

adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml

@@ -0,0 +1,300 @@
+<?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.adc.da.report.dao.mysql.ReportDao">
+
+    <!-- 通用查询结果列 -->
+    <sql id="BaseColumnList">
+        id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel,
+        createUserId, createDate, updateDate, del_flag,secrecy_last
+    </sql>
+
+    <sql id="BaseColumnValue">
+        #{Vo.id},#{Vo.name},#{Vo.keycontent},#{Vo.maincontent},#{Vo.department},#{Vo.year},#{Vo.fileId},
+        #{Vo.confidentialLevel},#{Vo.privacyLevel},
+        #{Vo.createUserId},
+        #{Vo.createDate},#{Vo.updateDate},#{Vo.del_flag},
+        #{Vo.secrecyLast}
+    </sql>
+
+    <insert id="saveReportAct">
+        insert into TT_REPORT_MANAGE (<include refid="BaseColumnList"/>)
+        value (
+        #{Vo.dataId},#{Vo.name},#{Vo.keyContent},#{Vo.mainContent},#{Vo.department},#{Vo.year},#{Vo.fileId},
+        #{Vo.confidentialLevel},#{Vo.privacyLevel},
+        #{Vo.createUserId},
+        #{Vo.createDate},#{Vo.updateDate},#{Vo.delFlag},
+        #{Vo.secrecyLast})
+    </insert>
+
+    <select id="getReportDateList" parameterType="string" resultType="string">
+       select distinct year from TT_REPORT_MANAGE t1
+        left join TR_REPORT_USER t2 on t1.id=t2.reportId
+        where del_flag='0'
+        <if test="usid !='' and usid !=null">
+            and t2.userId=#{usid}
+        </if>
+        ORDER BY year DESC
+    </select>
+
+
+    <select id="getAddReportPage" resultType="com.adc.da.report.vo.ReportVo">
+
+        SELECT
+        eo.id,
+        eo.NAME,
+        eo.keycontent,
+        eo.maincontent,
+        eo.DEPARTMENT,
+        eo.YEAR,
+        eo.fileid,
+        eo.confidentialLevel,
+        eo.privacyLevel,
+        eo.createUserId,
+               u.usname as createUserName,
+        pa.report_id,
+        pa.user_id
+        FROM
+        TT_REPORT_MANAGE eo
+        LEFT JOIN tr_report_user ru ON eo.id = ru.reportId
+        LEFT JOIN power_apply pa ON pa.report_id = eo.id
+        LEFT JOIN ts_user u on u.USID = eo.createUserId
+        WHERE
+        eo.DEL_FLAG = 0
+        <if test="pageVO.usid !='' and pageVO.usid != null">
+            AND eo.id NOT IN ( SELECT ru.reportId FROM tr_report_user ru WHERE ru.userId =  #{pageVO.usid} )
+            AND eo.id NOT IN ( SELECT tt.report_id FROM power_apply tt WHERE tt.user_id = #{pageVO.usid} )
+            AND eo.id NOT IN (SELECT tt.report_id FROM power_apply_act tt 	LEFT JOIN bus_process_name pro on tt.prc_id = pro.PRC_ID WHERE tt.user_id = #{pageVO.usid} and
+            del_flag != 1 and  pro.SUBMIT_STATUS = 1)
+        </if>
+        <if test="pageVO.name !='' and pageVO.name != null">
+            and name like  CONCAT(CONCAT('%',#{pageVO.name}),'%')
+        </if>
+        <!--年份搜索-->
+        <if test="pageVO.year != null and pageVO.year.size() > 0">
+            and year in
+            <foreach collection="pageVO.year" item="year" open="(" separator="," close=")">
+                #{year}
+            </foreach>
+        </if>
+
+        <if test="pageVO.ids != null and pageVO.ids.size() > 0">
+            and eo.id in
+            <foreach collection="pageVO.ids" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        GROUP BY
+        eo.id
+        ORDER BY
+        eo.updateDate DESC
+
+
+
+
+
+    </select>
+
+    <select id="page" resultType="com.adc.da.report.vo.ReportVo">
+
+        SELECT
+        eo.id AS id,
+        eo.`NAME` AS NAME,
+        eo.keycontent AS keyContent,
+        eo.maincontent AS mainContent,
+        eo.DEPARTMENT AS department,
+        eo.`YEAR` AS `year`,
+        eo.fileid AS fileId,
+        eo.confidentialLevel AS confidentialLevel,
+        eo.privacyLevel AS privacyLevel,
+        eo.createUserId AS createUserId,
+        tu.USNAME AS uploader,
+        eo.createDate AS createDate,
+        thumbUpCount.thumbUp AS thumbUp,
+        clicksCount.clicks AS clicks,
+        downloadCount.download AS download,
+        AVG( trur.user_rating ) AS reportRating,
+        IF(bpn.id is null,1,
+            IF(bpn.SUBMIT_STATUS = 1,0,1)
+            ) as  isAct
+        FROM
+        TT_REPORT_MANAGE eo
+        LEFT JOIN ts_report_content rc ON eo.id = rc.report_id
+        LEFT JOIN ts_user tu ON tu.USID = eo.createUserId
+        LEFT JOIN tr_report_user ru ON eo.id = ru.reportId
+        LEFT JOIN (SELECT report_id, COUNT(id) AS thumbUp FROM report_log_book WHERE type = 3 GROUP BY report_id) AS thumbUpCount ON eo.id = thumbUpCount.report_id
+        LEFT JOIN (SELECT report_id, COUNT(id) AS clicks FROM report_log_book WHERE type = 1 GROUP BY report_id) AS clicksCount ON eo.id = clicksCount.report_id
+        LEFT JOIN (SELECT report_id, COUNT(id) AS download FROM report_log_book WHERE type = 2 GROUP BY report_id) AS downloadCount ON eo.id = downloadCount.report_id
+        LEFT JOIN ts_report_user_rating AS trur ON eo.id = trur.report_id
+        LEFT JOIN bus_process_name as bpn on bpn.data_id = eo.id and bpn.prc_type != '5'
+        WHERE
+        eo.DEL_FLAG = 0
+        <!--全文模糊搜索-->
+        <if test="pageVO.keyContent !='' and pageVO.keyContent != null">
+            and rc.report_content like  CONCAT(CONCAT('%',#{pageVO.keyContent}),'%')
+        </if>
+        <if test="pageVO.name !='' and pageVO.name != null">
+            and name like  CONCAT(CONCAT('%',#{pageVO.name}),'%')
+        </if>
+
+        <!--年份搜索-->
+        <if test="pageVO.year != null and pageVO.year.size() > 0">
+            and year in
+            <foreach collection="pageVO.year" item="year" open="(" separator="," close=")">
+                #{year}
+            </foreach>
+        </if>
+
+        <if test="pageVO.ids != null and pageVO.ids.size() > 0">
+            and eo.id in
+            <foreach collection="pageVO.ids" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <!--id搜索-->
+        <if test="idSet !=null and idSet.size() > 0">
+            and eo.id  in
+            <foreach collection="idSet" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        GROUP BY
+        eo.id
+        <if test="pageVO.orderByTime == 1">
+            ORDER BY
+            eo.createDate DESC
+        </if>
+        <if test="pageVO.orderByClicks == 1">
+            ORDER BY
+            clicksCount.clicks DESC
+        </if>
+        <if test="pageVO.orderByDownload == 1">
+            ORDER BY
+            downloadCount.download DESC
+        </if>
+    </select>
+
+    <select id="reportManagerPage" parameterType="com.adc.da.report.vo.ReportQueryVo" resultType="com.adc.da.report.vo.ReportVo">
+        SELECT DISTINCT
+        t.id,
+        t.year,
+        t.name,
+        t.keycontent,
+        t.fileId,
+        t.createDate,
+        t.department,
+        t.maincontent,
+        t.confidentialLevel,
+        t.privacyLevel,
+        IF(bpn.id is null,1,
+        IF(bpn.SUBMIT_STATUS = 1,0,1)
+        ) as  isAct
+        FROM `tt_report_manage` AS t
+        LEFT JOIN bus_process_name as bpn on bpn.data_id = t.id and bpn.prc_type = '5'
+        WHERE t.del_flag = 0
+        <!--报表名称搜索-->
+        <if test="Vo.name != null and Vo.name != ''">
+            and t.name like CONCAT(CONCAT('%',#{Vo.name}),'%')
+        </if>
+
+        <!--年份搜索-->
+        <if test="Vo.year != null and Vo.year.size() > 0">
+            and t.year in
+            <foreach collection="Vo.year" item="year" open="(" separator="," close=")">
+                #{year}
+            </foreach>
+        </if>
+
+        <!--id搜索-->
+        <if test="idSet !=null and idSet.size() > 0">
+            and t.id in
+            <foreach collection="idSet" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+
+        <!--id搜索-->
+        <if test="Vo.ids !=null and Vo.ids.size() > 0">
+            and t.id in
+            <foreach collection="Vo.ids" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+
+        <!--用户搜索-->
+        <if test="Vo.usid != null and Vo.usid != ''">
+            and t.createUserId=#{Vo.usid}
+        </if>
+
+        ORDER BY updateDate desc
+    </select>
+    <select id="isAct" resultType="java.lang.String">
+        SELECT rep.name FROM
+        bus_process_name pro
+        WHERE pro.CREAT_USER = #{Vo.usid}
+        and pro.SUBMIT_STATUS = 1
+        and pro.DATA_ID in
+        <foreach collection="Vo.ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+        GROUP BY rep.id;
+    </select>
+
+    <select id="selectByidAndName" resultType="java.lang.Long">
+        select  count(1) from  tt_report_manage rep
+        <where>
+            rep.Name = #{Vo.name}
+            and rep.del_flag = 0
+            <if test="Vo.id != null and Vo.id != ''">
+              and  rep.id != #{Vo.id}
+            </if>
+        </where>
+    </select>
+    <select id="isReportNameOccupyByEO" resultType="java.lang.Long">
+        select  count(1) from  tt_report_manage rep
+        <where>
+            rep.Name = #{Vo.name}
+            and rep.del_flag = 0
+            <if test="Vo.id != null and Vo.id != ''">
+                and  rep.id != #{Vo.id}
+            </if>
+        </where>
+    </select>
+    <select id="isReportNameOccupyByAct" resultType="java.lang.Long">
+        select  count(1) from  tt_report_manage_act rep
+        LEFT JOIN bus_process_name pro on rep.prc_id=pro.PRC_ID
+        <where>
+            pro.SUBMIT_STATUS = 1
+            and rep.Name = #{Vo.name}
+            and rep.del_flag = 0
+            <if test="Vo.id != null and Vo.id != ''">
+                and  rep.data_id != #{Vo.id}
+            </if>
+        </where>
+
+    </select>
+
+    <select id="reportDetail" resultType="com.adc.da.report.vo.ReportDetailVo">
+        SELECT
+            rm.id AS id,
+            rm.name AS `name`,
+            rm.createUserId AS createUserId,
+            u.USNAME AS uploaderName,
+            rm.keycontent AS keycontent,
+            rm.maincontent AS maincontent,
+            rm.department AS department,
+            rm.`year` AS `year`,
+            rm.fileId AS fileId,
+            f.file_name as fileName,
+            rm.confidentialLevel AS confidentialLevel,
+            rm.privacyLevel AS privacyLevel
+        FROM `tt_report_manage` AS rm
+            LEFT JOIN ts_user AS u ON u.USID = rm.createUserId
+            LEFT JOIN ts_org as org on org.id = rm.department
+            LEFT JOIN ts_file as f on rm.fileId=f.file_id
+            WHERE rm.id = #{reportId}
+            AND rm.del_flag = 0
+    </select>
+    <select id="selectDDL" resultType="com.adc.da.report.eo.ReportEntity">
+        SELECT * FROM tt_report_manage WHERE secrecy_last &lt;= NOW()
+    </select>
+</mapper>

adc-da-report/target/classes/mybatis/mapper/mysql/ReportUserCommentDao.xml

@@ -0,0 +1,23 @@
+<?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.adc.da.report.dao.mysql.ReportUserCommentDao">
+
+    <select id="page" resultType="com.adc.da.report.vo.ReportCommentVo">
+        SELECT
+            ruc.id AS id,
+            ruc.user_id AS userId,
+            u.USNAME AS userName,
+            ruc.comment AS comment,
+            ruc.create_time AS createTime
+        FROM
+            `ts_report_user_comment` AS ruc
+                INNER JOIN ts_user AS u ON u.USID = ruc.user_id
+        WHERE
+            ruc.del_flag = 0
+        AND
+            ruc.report_id = #{dto.reportId}
+        ORDER BY ruc.create_time DESC
+    </select>
+</mapper>