Merge branch 'master' of http://116.63.33.55/git/nazw

nngkxxdp/src/main/java/com/example/nngkxxdp/controller/ApiArticleController.java

@@ -257,8 +257,8 @@ public class ApiArticleController {
 	 * @return
 	 */
 	@GetMapping("/getLoginDeptReleaseArticle")
-	public Map<String, Object> getLoginDeptReleaseArticle(String deptName) {
-		List<Map<String, Object>> getDeptReleaseArticle = articleService.getDeptReleaseArticle(deptName);
+	public Map<String, Object> getLoginDeptReleaseArticle(String deptId) {
+		List<Map<String, Object>> getDeptReleaseArticle = articleService.getDeptReleaseArticle(deptId);
 		return SendUtil.send(true, ConstStr.RESULT_SUCCESS, getDeptReleaseArticle);
 	}
 

nngkxxdp/src/main/java/com/example/nngkxxdp/dao/ArticleDao.java

@@ -195,6 +195,17 @@ public interface ArticleDao {
 	List<Map<String, Object>> getDeptReleaseArticle(@Param("deptName") String deptName);
 
 	/**
+	 * @Title: getDeptReleaseArticle
+	 * @Description: 获取部门下栏目文章更新情况（华龙网数据源）
+	 * @author: LEIHY
+	 * @date: 2021年10月28日 下午4:15:48
+	 * @returnType List<Map<String,Object>>
+	 * @param deptName
+	 * @return
+	 */
+	List<Map<String, Object>> getDeptReleaseArticleNew(@Param("list") List<String> list);
+
+	/**
 	 * 获取最新文章或最热文章
 	 * @param articleType
 	 */

nngkxxdp/src/main/java/com/example/nngkxxdp/dao/DeptDao.java

@@ -22,4 +22,11 @@ public interface DeptDao {
      * @return
      */
     List<Dept> getDeptByType(@Param("type") Integer type);
+
+    /**
+     * 根据部门ID获取部门街镇
+     * @param type
+     * @return
+     */
+    Dept getDeptById(@Param("deptId") String deptId);
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/service/ArticleService.java

@@ -139,7 +139,7 @@ public interface ArticleService {
 	 * @param deptName
 	 * @return
 	 */
-	List<Map<String, Object>> getDeptReleaseArticle(String deptName);
+	List<Map<String, Object>> getDeptReleaseArticle(String deptId);
 
 	/**
 	 * 获取最新文章或最热文章

nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/ArticleServiceImpl.java

@@ -368,8 +368,11 @@ public class ArticleServiceImpl implements ArticleService {
 	 * @return
 	 */
 	@Override
-	public List<Map<String, Object>> getDeptReleaseArticle(String deptName) {
-		List<Map<String, Object>> getDeptReleaseArticle = articleDao.getDeptReleaseArticle(deptName);
+	public List<Map<String, Object>> getDeptReleaseArticle(String deptId) {
+//		List<Map<String, Object>> getDeptReleaseArticle = articleDao.getDeptReleaseArticle(deptName);
+		Dept dept = deptDao.getDeptById(deptId);
+
+		List<Map<String, Object>> getDeptReleaseArticle = articleDao.getDeptReleaseArticleNew(Arrays.asList(dept.getHaveChnlid().split(",")));
 		return getDeptReleaseArticle;
 	}
 

nngkxxdp/src/main/resources/mapper/ArticleDao.xml

@@ -680,6 +680,26 @@
 		ORDER BY releaseDate
     </select>
 
+    <!-- 获取部门下栏目文章更新情况（华龙网数据源） -->
+    <select id="getDeptReleaseArticleNew" resultType="map" parameterType="String">
+        SELECT
+            b.CHNLID,
+            b.CHNLIDNAME,
+            a.frequency,
+            DATE_FORMAT(MAX(b.DOCRELTIME), '%Y-%m-%d') lastUpdateTime
+        FROM
+            column_relation a
+            LEFT JOIN save_hlw_interface_data b ON a.chnlid = b.CHNLID
+        WHERE
+            a.chnlid IN
+            <foreach collection="list" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            AND frequency > 0
+        GROUP BY
+            a.chnlid
+    </select>
+
     <select id="getNewestOrHotArticle" resultType="map">
         select
             *

nngkxxdp/src/main/resources/mapper/DeptDao.xml

@@ -27,6 +27,20 @@
 			sortid = #{type}
 	</select>
 
+	<select id="getDeptById" resultType="com.example.nngkxxdp.entity.Dept">
+		SELECT
+			deptid,
+			deptname,
+			sortid,
+			base_score,
+			dept_url,
+			have_chnlid
+		FROM
+			t_dept
+		WHERE
+			deptid = #{deptId}
+	</select>
+
 
 </mapper>
 

nngkxxdp/src/main/resources/mapper/TjDao.xml

@@ -202,7 +202,9 @@
 			(tp.target_score - tp.score) AS finalscore,
 			tr.type,
 			tr.score as addscore,
-			tr.zdy_event
+			tr.zdy_event,
+			(CASE WHEN tr.type = 0 THEN tr.score ELSE 0 END) as addtionalScore,
+			(CASE WHEN tr.type = 1 THEN tr.score ELSE 0 END) as subScore
 		FROM
 			t_record tr
 		LEFT JOIN t_partition tp ON tr.p_id = tp.p_id

nngkxxdp/src/main/resources/static/intelligence/css/intelligence.css

@@ -821,7 +821,7 @@ footer {
 	}
 
 	.red_center {
-		bottom: 0;
+		bottom: -0.7%;
 		left: -1%;
 	}
 

nngkxxdp/src/main/resources/static/page/index.html

@@ -1077,7 +1077,7 @@
 
 
                                 <div class="bgline"></div>
-                                <div class="rightSameContent rightBottomSameContent  " style="height: 470px;">
+                                <div class="rightSameContent rightBottomSameContent  " style="height: 526px;">
                                     <div class="commonTitle">
                                         <i></i>
                                         <span class="iconfont icon-pingjia"></span>

nngkxxdp/src/main/resources/static/page/js/base/updataState.item.js

@@ -2,7 +2,7 @@ let _html
 
 function getSpecialState() {
     getUpdate()
-    detailed(1)
+    // detailed(1)
 }
 
 $('.special-column-box').on('click', '.minli', function () {

nngkxxdp/src/main/resources/static/page/js/base/welcome.js

@@ -1,4 +1,5 @@
 var hasDept_status = true;
+var noHandleItemNum = 0;
 layui.use(['element', 'layer', 'util', 'table', 'laydate', 'form'], function() {
 	 element = layui.element,
 		layer = layui.layer,
@@ -31,36 +32,37 @@ layui.use(['element', 'layer', 'util', 'table', 'laydate', 'form'], function() {
 	});
 	
 	//查询愉快办事项个数
-	getProblemsCount(sessionStorage.DEPTNID);
+	// getProblemsCount(sessionStorage.DEPTNID);
 
-	var datas = getLoginDeptReleaseArticle(sessionStorage.DEPTNAME);
+	var datas = getLoginDeptReleaseArticle(sessionStorage.DEPTNID);
 	table.render({
 		elem: '#w-table',
 		width: 1080,
 		cols: [
 			[ //标题栏
 				{
-					field: 'columnSecondName',
+					field: 'chnlidname',
 					title: '栏目名称',
 				}, {
-					field: 'updateDay',
+					field: 'frequency',
 					title: '更新指标',
 					templet : function(d) {
-						console.log(d.updateDay)
-						return d.updateDay ? d.updateDay + '天' : '180天';
+						console.log(d.frequency)
+						return d.frequency ? d.frequency + '天' : '180天';
 					}
 				}, {
-					field: 'releaseDate',
+					field: 'lastUpdateTime',
 					title: '最近更新时间',
 				}, {
 					field: 'tip',
 					title: '提醒',
 					templet : function(d) {
-						let oldTime = new Date(d.releaseDate.replace('-', '/'));
-						oldTime = oldTime.setDate(oldTime.getDate() + (d.updateDay ? d.updateDay : 180));
+						let oldTime = new Date(d.lastUpdateTime.replace('-', '/'));
+						oldTime = oldTime.setDate(Number(oldTime.getDate()) + Number((d.frequency ? d.frequency : 180)));
 						oldTime = new Date(oldTime);
 						let time = oldTime.getTime() - new Date().getTime();
 						if (time <= 0) {
+							noHandleItemNum += 1;
 							return '已经超期，请立即更新';
 						} else {
 							let days = parseInt(time)/(24*60*60*1000);
@@ -72,7 +74,8 @@ layui.use(['element', 'layer', 'util', 'table', 'laydate', 'form'], function() {
 			]
 		],
 		data:datas,
-		even: true
+		even: true,
+		done: tableDone
 	});
 	
 	var datas = websiteRating(sessionStorage.DEPTNID, 1);
@@ -152,22 +155,22 @@ layui.use(['element', 'layer', 'util', 'table', 'laydate', 'form'], function() {
 						return d.targetRequirement ? d.targetRequirement : '-';
 					}
 				}, {
-					field: 'score',
+					field: 'subScore',
 					title: '扣分',
 					templet: function(d){
-						if (d.type) {
-							return d.score ? d.score: d.addscore;
+						if (d.subScore) {
+							return d.subScore;
 						}
 						return "-";
 					}
 				}, {
-					field: 'addsort',
+					field: 'addtionalScore',
 					title: '得分',
 					templet: function(d){
-						if (d.type) {
-							return d.finalscore ? d.finalscore : 0;
+						if (d.addtionalScore) {
+							return d.addtionalScore;
 						}
-						return d.addscore;
+						return '-';
 					}
 				}
 			]
@@ -297,21 +300,21 @@ layui.use(['element', 'layer', 'util', 'table', 'laydate', 'form'], function() {
 
 });
 
-function getProblemsCount(deptId){
-	get("/api/article/getProblemsCount", true, {
-		"deptId" : deptId
-	}, function(res){
-		if(res.result){
-			$("#problemsCount").text(res.data);
-		}
-	},function(err){
-	})
-}
+// function getProblemsCount(deptId){
+// 	get("/api/article/getProblemsCount", true, {
+// 		"deptId" : deptId
+// 	}, function(res){
+// 		if(res.result){
+// 			$("#problemsCount").text(res.data);
+// 		}
+// 	},function(err){
+// 	})
+// }
 
-function getLoginDeptReleaseArticle(deptName){
+function getLoginDeptReleaseArticle(deptId){
 	var datas = null;
 	get("/api/article/getLoginDeptReleaseArticle", false, {
-		"deptName" : deptName
+		"deptId" : deptId
 	}, function(res){
 		if(res.result){
 			datas = res.data;
@@ -507,3 +510,6 @@ function getDeptLists() {
     })
 }
 
+function tableDone(res, curr, count) {
+	$("#problemsCount").text(noHandleItemNum);
+}

nngkxxdp/src/main/resources/static/wzkp/wzkp.html

@@ -506,7 +506,7 @@
                                         </form>
                                     </div>
                                     <div class="add_detailed">
-                                        <div class="rank_title"><span></span>&nbsp;&nbsp;<p>详细数据</p></div>
+                                        <div class="rank_title"><span></span>&nbsp;&nbsp;<p>加扣分详情</p></div>
                                         <div class="content_hide">
                                             <table id="addDetail11" class="layui-table table_css_two" lay-even
                                                    lay-skin="line">
@@ -743,7 +743,7 @@
                                         </form>
                                     </div>
                                     <div class="add_detailed">
-                                        <div class="rank_title"><span></span>&nbsp;&nbsp;<p>详细数据</p></div>
+                                        <div class="rank_title"><span></span>&nbsp;&nbsp;<p>加扣分详情</p></div>
                                         <div class="content_hide">
                                             <table id="addDetail12" class="layui-table table_css_two" lay-even
                                                    lay-skin="line">
@@ -980,7 +980,7 @@
                                         </form>
                                     </div>
                                     <div class="add_detailed">
-                                        <div class="rank_title"><span></span>&nbsp;&nbsp;<p>详细数据</p></div>
+                                        <div class="rank_title"><span></span>&nbsp;&nbsp;<p>加扣分详情</p></div>
                                         <div class="content_hide">
                                             <table id="addDetail13" class="layui-table table_css_two" lay-even
                                                    lay-skin="line">
@@ -1239,7 +1239,7 @@
                                         </form>
                                     </div>
                                     <div class="add_detailed">
-                                        <div class="rank_title"><span></span>&nbsp;&nbsp;<p>详细数据</p></div>
+                                        <div class="rank_title"><span></span>&nbsp;&nbsp;<p>加扣分详情</p></div>
                                         <div class="content_hide">
                                             <table id="addDetail00" class="layui-table table_css_two" lay-even
                                                    lay-skin="line">
@@ -1476,7 +1476,7 @@
                                         </form>
                                     </div>
                                     <div class="add_detailed">
-                                        <div class="rank_title"><span></span>&nbsp;&nbsp;<p>详细数据</p></div>
+                                        <div class="rank_title"><span></span>&nbsp;&nbsp;<p>加扣分详情</p></div>
                                         <div class="content_hide">
                                             <table id="addDetail01" class="layui-table table_css_two" lay-even
                                                    lay-skin="line">
@@ -1713,7 +1713,7 @@
                                         </form>
                                     </div>
                                     <div class="add_detailed">
-                                        <div class="rank_title"><span></span>&nbsp;&nbsp;<p>详细数据</p></div>
+                                        <div class="rank_title"><span></span>&nbsp;&nbsp;<p>加扣分详情</p></div>
                                         <div class="content_hide">
                                             <table id="addDetail02" class="layui-table table_css_two" lay-even
                                                    lay-skin="line">
@@ -1950,7 +1950,7 @@
                                         </form>
                                     </div>
                                     <div class="add_detailed">
-                                        <div class="rank_title"><span></span>&nbsp;&nbsp;<p>详细数据</p></div>
+                                        <div class="rank_title"><span></span>&nbsp;&nbsp;<p>加扣分详情</p></div>
                                         <div class="content_hide">
                                             <table id="addDetail03" class="layui-table table_css_two" lay-even
                                                    lay-skin="line">
@@ -2013,7 +2013,7 @@
     function getYearMonthDay() {
         let date = new Date();
         date.setDate(0);
-        return date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate();
+        return date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate();
     }
 
     //是否展示时间选择器
@@ -2202,7 +2202,7 @@
             elem: '#monInput1',
             type: 'month',
             max: getYearMonthDay(),
-            min: '2000-01-01',
+            min: '2020-01-01',
             value: getYearMonth(),
             done: function (value, date, endDate) {
                 dateDone(value, hasDept, type);
@@ -2212,7 +2212,7 @@
             elem: '#monInput0',
             type: 'month',
             max: getYearMonthDay(),
-            min: '2000-01-01',
+            min: '2020-01-01',
             value: getYearMonth(),
             done: function (value, date, endDate) {
                 dateDone(value, hasDept, type);
@@ -2381,7 +2381,7 @@
                     , {field: 'totalScore', title: '总分(基础分/加分)', width: 200}
                     , {type: 'numbers', title: '排名', width: 120}
                     , {field: 'sign', title: '环比上月排名', width: 150, templet: rankingMonth}
-                    , {field: 'addScore', align:'center',title: addBasic(), templet: progressTemplet}
+                    , {field: 'addScore', align: 'center', title: addBasic(), templet: progressTemplet}
                 ]]
                 , data: dataList1
                 , done: function (res, curr, count) {
@@ -2407,7 +2407,7 @@
                     , {field: 'totalScore', title: '总分(基础分/加分)', width: 200}
                     , {type: 'numbers', title: '排名', width: 120}
                     , {title: '环比上' + china + '排名', width: 150}
-                    , {field: 'addScore',align:'center', title: addBasic(), templet: progressTemplet}
+                    , {field: 'addScore', align: 'center', title: addBasic(), templet: progressTemplet}
                 ]]
                 , data: dataList1
                 , done: function (res, curr, count) {
@@ -2504,7 +2504,13 @@
 
         option = {
             tooltip: {
-                trigger: 'axis'
+                trigger: 'axis',
+                formatter: function (params) {
+                    let htmlStr = '<div>';
+                    htmlStr += params[0].axisValue.substring(0, 4) + "年" + params[0].axisValue.substring(5, 6) + "月" + "<br>";
+                    htmlStr += "总分" + params[0].data + "</div>";
+                    return htmlStr;
+                }
             },
             xAxis: {
                 type: 'category',
@@ -2518,7 +2524,9 @@
                 left: '3%',
                 right: '4%',
                 bottom: '3%',
+                tooltip: true,
                 containLabel: true
+
             },
             series: [{
                 data: [],
@@ -2632,12 +2640,12 @@
             , page: false //开启分页
             , limit: obj.length
             , cols: [[ //表头
-                {field: 'target', title: '指标'}
+                {field: 'target', title: '指标',width:120}
                 , {field: 'targetScore', title: '分值', width: 70}
-                , {field: 'event', title: '指标要求', width: 560}
-                , {field: 'targetRequirement', title: '加扣分指标', width: 170}
+                , {field: 'event', title: '指标要求', width: 420}
+                , {field: 'targetRequirement', title: '加扣分指标', width: 270}
                 , {field: 'targetDeduct', title: '加扣分原因', width: 200}
-                , {field: 'addscore', title: '加(扣)分', width: 100, template: addscoreTemplate}
+                , {field: 'addscore', title: '加(扣)分', templet: addscoreTemplate}
             ]]
             , data: obj
         });

nngkxxdp/src/main/resources/static/zdjc/sy.html

@@ -98,8 +98,7 @@
 							热门问题:
 						</div>
 						<div class="th_con">
-							
-						
+
 						</div>
 						<div class="more">
 							<i class="layui-icon layui-icon-down"></i>
@@ -372,6 +371,22 @@
 			function openWindow(data) {
 				//console.log(dataMap[data])
 				sessionStorage.ELK_ARTICLE = JSON.stringify(dataMap[data].sourceAsMap);
+				var ELK_ARTICLE=sessionStorage.getItem("ELK_ARTICLE");
+				console.log(ELK_ARTICLE);
+				if(ELK_ARTICLE==""){
+					alert("进入！")
+					$.ajax({
+						url: PATH + '/elk/getarticle',
+						type: 'get',
+						data: {
+							"id":data
+						},
+						success:function(obj) {
+							console.log(obj);
+							sessionStorage.ELK_ARTICLE = JSON.stringify(dataMap[data].sourceAsMap);
+						},
+					});
+				}
 				window.location = 'xq.html';
 			}