|
@@ -83,6 +83,9 @@ public class WzkpRecordUtil {
|
|
|
cl4.add(Calendar.MONTH, -1);
|
|
|
String thisMonth = DateUtil.format(cl4.getTime(), "yyyy-MM");
|
|
|
logger.info("开始生成" + thisMonth + "网站考评的数据");
|
|
|
+ //清空本月的数据
|
|
|
+ tjDao.deleteRecord(firstDay, lastDay);
|
|
|
+ tjDao.deleteDeptRecord(thisMonth);
|
|
|
// 查询是否已初始化
|
|
|
Integer count = tjDao.getCountWebsiteRating(null, thisMonth);
|
|
|
// 部门基础分值配置
|
|
@@ -141,7 +144,7 @@ public class WzkpRecordUtil {
|
|
|
gzqkkfCh.add("动态要闻");
|
|
|
StringJoiner gzqkkfZd = new StringJoiner(",");
|
|
|
if (hlwDataList.size() > 0) {
|
|
|
- for (int j = 0; j < hlwDataList.size(); j++) {
|
|
|
+ for (int j = 0; j <= hlwDataList.size(); j++) {
|
|
|
if (j == 0) {
|
|
|
Date time1 = sdf.parse(hlwDataList.get(j).get("docreltime").toString());
|
|
|
if (exchangeTime(time1) - exchangeTime(firstDay) >= 14) {
|
|
@@ -149,12 +152,12 @@ public class WzkpRecordUtil {
|
|
|
gzqkkfCh.add(hlwDataList.get(j).get("channelname").toString());
|
|
|
gzqkkfZd.add(hlwDataList.get(j).get("chnlid").toString());
|
|
|
}
|
|
|
- } else if (j == hlwDataList.size() - 1) {
|
|
|
- Date time1 = sdf.parse(hlwDataList.get(j).get("docreltime").toString());
|
|
|
+ } else if (j == hlwDataList.size()) {
|
|
|
+ Date time1 = sdf.parse(hlwDataList.get(j - 1).get("docreltime").toString());
|
|
|
if (exchangeTime(lastDay) - exchangeTime(time1) >= 14) {
|
|
|
gzqksum = gzqksum + 1;
|
|
|
- gzqkkfCh.add(hlwDataList.get(j).get("channelname").toString());
|
|
|
- gzqkkfZd.add(hlwDataList.get(j).get("chnlid").toString());
|
|
|
+ gzqkkfCh.add(hlwDataList.get(j - 1).get("channelname").toString());
|
|
|
+ gzqkkfZd.add(hlwDataList.get(j - 1).get("chnlid").toString());
|
|
|
}
|
|
|
} else {
|
|
|
Date time1 = sdf.parse(hlwDataList.get(j - 1).get("docreltime").toString());
|
|
@@ -304,7 +307,7 @@ public class WzkpRecordUtil {
|
|
|
}
|
|
|
tjDao.saveNewRecord(tRecordList);
|
|
|
logger.info("生成加扣分详情成功!");
|
|
|
- logger.info(thisMonth+"网站考评分数生成成功!");
|
|
|
+ logger.info(thisMonth + "网站考评分数生成成功!");
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|