Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
72643557 由 张雷
选项

Merge remote-tracking branch 'origin/master' into master

2 个父辈 524108c0 ed637cd3
内嵌 并排
正在显示 5 个修改的文件 包含 155 行增加 和 47 行删除
sk-base-common/src/main/java/com/skua/tool/util/DateUtils.java
......@@ -28,7 +28,7 @@ public class DateUtils {
}
public static void main(String[] args) {
System.out.println( formatDate("2024-01-01","yyyy-MM"));
System.out.println( formatDate("2024-01","yyyy-MM"));
}
/***
* 字符串日期格式化
......@@ -627,5 +627,37 @@ public class DateUtils {
}
return monthList;
}
/***
* 获取当前年
* @return
*/
public static int getCurrentYear(){
Date currentDate = new Date();
Calendar calendar = Calendar.getInstance();
calendar.setTime(currentDate);
return calendar.get(Calendar.YEAR);
}
/***
* 获取当前时间
* @return
*/
public static String getCurrentDate(){
LocalDateTime now = LocalDateTime.now();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
String formattedDate = now.format(formatter);
return formattedDate;
}
public static int getDateYear(String date){
Date currentDate = str2Date(date,"yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
calendar.setTime(currentDate);
return calendar.get(Calendar.YEAR);
}
public static int getDateMonth(String date){
Date currentDate = str2Date(date,"yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
calendar.setTime(currentDate);
return calendar.get(Calendar.MONTH)+1;
}
}
......
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhRectificationInfoController.java
......@@ -323,6 +323,7 @@ public class AjhRectificationInfoController {
* @param paramType 查询类型
* @return
*/
@ApiOperation(value="安全态势总览数据统计", notes="安全态势总览数据统计")
@RequestMapping(value = "/searchCenus", method = RequestMethod.GET)
public Map<String,Object> searchSafeCensus(@RequestParam(name="now",required=true) String now,@RequestParam(name="paramType") String paramType) {
Map<String, Object> result = ajhRectificationInfoService.searchSafeCensus(now, paramType);
......
sk-module-biz/src/main/java/com/skua/modules/ajh/mapper/AjhRectificationInfoMapper.java
......@@ -16,32 +16,36 @@ import java.util.Map;
* 隐患检查
*/
public interface AjhRectificationInfoMapper extends BaseMapper<AjhRectificationInfo> {
// top 头部统计
List<Map<String, Object>> topCensus(@Param("nowMonth") String nowMonth, @Param("nowYear") String nowYear, @Param("lastYear") String lastYear);
// 文件统计
List<Map<String, Object>> docCensus(@Param("nowMonth") String nowMonth, @Param("nowYear") String nowYear, @Param("lastYear") String lastYear);
// 隐患统计
List<Map<String, Object>> yhCensus(@Param("now") String now, @Param("last_month") String last_month, @Param("last_year") String last_year);
List<Map<String, Object>> yhCensus(@Param("nowMonth") String nowMonth, @Param("nowYear") String nowYear, @Param("lastYear") String lastYear);
//教育培训
List<Map<String, Object>> jyCensus(@Param("now") String now, @Param("last_month") String last_month, @Param("last_year") String last_year);
List<Map<String, Object>> jyCensus(@Param("nowMonth") String nowMonth, @Param("nowYear") String nowYear, @Param("lastYear") String lastYear);
//应急演练
List<Map<String, Object>> yjCensus(@Param("now") String now, @Param("last_month") String last_month, @Param("last_year") String last_year);
List<Map<String, Object>> yjCensus(@Param("nowMonth") String nowMonth, @Param("nowYear") String nowYear, @Param("lastYear") String lastYear);
//危化资料
List<Map<String, Object>> whCensus(@Param("now") String now, @Param("last_month") String last_month, @Param("last_year") String last_year);
List<Map<String, Object>> whCensus(@Param("nowMonth") String nowMonth, @Param("nowYear") String nowYear, @Param("lastYear") String lastYear);
//危险废物
List<Map<String, Object>> wxCensus(@Param("now") String now, @Param("last_month") String last_month, @Param("last_year") String last_year);
List<Map<String, Object>> wxCensus(@Param("nowMonth") String nowMonth, @Param("nowYear") String nowYear, @Param("lastYear") String lastYear);
//集团安全文件
List<Map<String, Object>> jtaqCensus(@Param("now") String now, @Param("last_month") String last_month, @Param("last_year") String last_year);
List<Map<String, Object>> jtaqCensus(@Param("nowMonth") String nowMonth, @Param("nowYear") String nowYear, @Param("lastYear") String lastYear);
//安全管理文件
List<Map<String, Object>> safeCensus(@Param("now") String now, @Param("last_month") String last_month, @Param("last_year") String last_year);
List<Map<String, Object>> safeCensus(@Param("nowMonth") String nowMonth, @Param("nowYear") String nowYear, @Param("lastYear") String lastYear);
/**
......@@ -105,7 +109,7 @@ public interface AjhRectificationInfoMapper extends BaseMapper<AjhRectificationI
* 安全隐患地图点位统计
* </pre>
*
* @param null
* @param
* @author Li Yuanyuan，2023/6/14 15:07
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
......@@ -167,4 +171,6 @@ public interface AjhRectificationInfoMapper extends BaseMapper<AjhRectificationI
"GROUP BY\n" +
"\trec_ord_body")
List<Map<String, Object>> getStructNoHandleDetail(@Param(Constants.WRAPPER) QueryWrapper queryWrapper);
}
......
sk-module-biz/src/main/java/com/skua/modules/ajh/mapper/xml/AjhRectificationInfoMapper.xml
<?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.skua.modules.ajh.mapper.AjhRectificationInfoMapper">
<!-- topCensus-->
<select id="topCensus" resultType="java.util.Map">
select
'年度安全隐患统计' as 'name','yh' as 'code',
SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 7 ) = #{nowMonth} THEN 1 ELSE 0 END ) as now,
SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 4 ) = #{nowYear} THEN 1 ELSE 0 END) as nowYear,
SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 4 ) = #{lastYear} THEN 1 ELSE 0 END ) as last_year
from ajh_rectification_info sr
UNION
select
'年度教育培训统计' as 'name','jy' as 'code',
SUM( CASE WHEN LEFT ( sr.edu_tra_date, 7 ) = #{nowMonth} THEN 1 ELSE 0 END ) as now,
SUM( CASE WHEN LEFT ( sr.edu_tra_date, 4 ) = #{nowYear} THEN 1 ELSE 0 END) as nowYear,
SUM( CASE WHEN LEFT ( sr.edu_tra_date, 4 ) = #{lastYear} THEN 1 ELSE 0 END ) as last_year
from ajh_edu_training sr
UNION
select
'年度应急演练统计' as 'name','yj' as 'code',
SUM( CASE WHEN LEFT ( sr.exe_time, 7 ) = #{nowMonth} THEN 1 ELSE 0 END ) as now,
SUM( CASE WHEN LEFT ( sr.exe_time, 4 ) = #{nowYear} THEN 1 ELSE 0 END) as nowYear,
SUM( CASE WHEN LEFT ( sr.exe_time, 4 ) = #{lastYear} THEN 1 ELSE 0 END ) as last_year
from ajh_exercise_situation sr
UNION
select
'年度危险作业时间(起)' as 'name','wx' as 'code',
SUM( CASE WHEN LEFT ( sr.operation_date, 7 ) = #{nowMonth} THEN 1 ELSE 0 END ) as now,
SUM( CASE WHEN LEFT ( sr.operation_date, 4 ) = #{nowYear} THEN 1 ELSE 0 END) as nowYear,
SUM( CASE WHEN LEFT ( sr.operation_date, 4 ) = #{lastYear} THEN 1 ELSE 0 END ) as last_year
from dangerous_operation_manage sr
UNION
select
'特种设备数量(起)' as 'name','tzsb' as 'code',
count(1) as 'nowYear' , '0' as 'now' ,'0' as 'last_year'
from equipment_info where is_special =1
</select>
<!-- docCensus 文档统计-->
<select id="docCensus" resultType="java.util.Map">
select
'安全管理文件(本)' as 'name','doc' as 'code',
count(id) as 'total_num',
SUM( CASE WHEN fac_informationtype ='flfg' THEN 1 ELSE 0 END ) as flfg_num,
SUM( CASE WHEN fac_informationtype ='bzgf' THEN 1 ELSE 0 END ) as bzgf_num,
SUM( CASE WHEN fac_informationtype ='gzzd' THEN 1 ELSE 0 END ) as gzzd_num
from material_info
</select>
<!--隐患统计-->
<select id="yhCensus" resultType="java.util.Map">
SELECT
sd.depart_name,
SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 7 ) = #{now} THEN 1 ELSE 0 END ) as now,
SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 7 ) =#{last_month} THEN 1 ELSE 0 END) as last_month,
SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 7 ) =#{last_year} THEN 1 ELSE 0 END ) as last_year
SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 7 ) = #{nowMonth} THEN 1 ELSE 0 END ) as now,
SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 4 ) =#{nowYear} THEN 1 ELSE 0 END) as nowYear,
SUM( CASE WHEN LEFT ( sr.rec_ord_whenlong, 4 ) =#{lastYear} THEN 1 ELSE 0 END ) as last_year
FROM
sys_factory_info sf
LEFT JOIN sys_depart sd ON sf.depart_id = sd.id
......@@ -18,9 +66,9 @@
<select id="jyCensus" resultType="java.util.Map">
SELECT
sd.depart_name,
SUM( CASE WHEN LEFT ( sr.edu_tra_date, 7 ) =#{now} THEN 1 ELSE 0 END ) as now,
SUM( CASE WHEN LEFT ( sr.edu_tra_date, 7 ) =#{last_month} THEN 1 ELSE 0 END) as last_month,
SUM( CASE WHEN LEFT ( sr.edu_tra_date, 7 ) =#{last_year} THEN 1 ELSE 0 END ) as last_year
SUM( CASE WHEN LEFT ( sr.edu_tra_date, 7 ) =#{nowMonth} THEN 1 ELSE 0 END ) as now,
SUM( CASE WHEN LEFT ( sr.edu_tra_date, 4 ) =#{nowYear} THEN 1 ELSE 0 END) as nowYear,
SUM( CASE WHEN LEFT ( sr.edu_tra_date, 4 ) =#{lastYear} THEN 1 ELSE 0 END ) as last_year
FROM
sys_factory_info sf
LEFT JOIN sys_depart sd ON sf.depart_id = sd.id
......@@ -32,9 +80,9 @@
<select id="yjCensus" resultType="java.util.Map">
SELECT
sd.depart_name,
SUM( CASE WHEN LEFT ( sr.exe_time, 7 ) =#{now} THEN 1 ELSE 0 END ) as now,
SUM( CASE WHEN LEFT ( sr.exe_time, 7 ) =#{last_month} THEN 1 ELSE 0 END) as last_month,
SUM( CASE WHEN LEFT ( sr.exe_time, 7 ) =#{last_month} THEN 1 ELSE 0 END ) as last_year
SUM( CASE WHEN LEFT ( sr.exe_time, 7 ) =#{nowMonth} THEN 1 ELSE 0 END ) as now,
SUM( CASE WHEN LEFT ( sr.exe_time, 4 ) =#{nowYear} THEN 1 ELSE 0 END) as nowYear,
SUM( CASE WHEN LEFT ( sr.exe_time, 4 ) =#{lastYear} THEN 1 ELSE 0 END ) as last_year
FROM
sys_factory_info sf
LEFT JOIN sys_depart sd ON sf.depart_id = sd.id
......@@ -46,9 +94,9 @@
<select id="whCensus" resultType="java.util.Map">
SELECT
sd.depart_name,
SUM( CASE WHEN LEFT ( sr.create_time, 7 ) =#{now} THEN 1 ELSE 0 END ) as now,
SUM( CASE WHEN LEFT ( sr.create_time, 7 ) =#{last_month} THEN 1 ELSE 0 END) as last_month,
SUM( CASE WHEN LEFT ( sr.create_time, 7 ) =#{last_month} THEN 1 ELSE 0 END ) as last_year
SUM( CASE WHEN LEFT ( sr.create_time, 7 ) =#{nowMonth} THEN 1 ELSE 0 END ) as now,
SUM( CASE WHEN LEFT ( sr.create_time, 4 ) =#{nowYear} THEN 1 ELSE 0 END) as nowYear,
SUM( CASE WHEN LEFT ( sr.create_time, 4 ) =#{lastYear} THEN 1 ELSE 0 END ) as last_year
FROM
sys_factory_info sf
LEFT JOIN sys_depart sd ON sf.depart_id = sd.id
......@@ -60,9 +108,9 @@
<select id="wxCensus" resultType="java.util.Map">
SELECT
sd.depart_name,
SUM( CASE WHEN LEFT ( sr.pro_come_date, 7 ) =#{now} THEN 1 ELSE 0 END ) as now,
SUM( CASE WHEN LEFT ( sr.pro_come_date, 7 ) =#{last_month} THEN 1 ELSE 0 END) as last_month,
SUM( CASE WHEN LEFT ( sr.pro_come_date, 7 ) =#{last_month} THEN 1 ELSE 0 END ) as last_year
SUM( CASE WHEN LEFT ( sr.pro_come_date, 7 ) =#{nowMonth} THEN 1 ELSE 0 END ) as now,
SUM( CASE WHEN LEFT ( sr.pro_come_date, 4 ) =#{nowYear} THEN 1 ELSE 0 END) as nowYear,
SUM( CASE WHEN LEFT ( sr.pro_come_date, 4 ) =#{lastYear} THEN 1 ELSE 0 END ) as last_year
FROM
sys_factory_info sf
LEFT JOIN sys_depart sd ON sf.depart_id = sd.id
......@@ -75,9 +123,9 @@
<select id="jtaqCensus" resultType="java.util.Map">
SELECT
sd.depart_name,
SUM( CASE WHEN LEFT ( sr.acc_rep_time, 7 ) =#{now} THEN 1 ELSE 0 END ) as now,
SUM( CASE WHEN LEFT ( sr.acc_rep_time, 7 ) =#{last_month} THEN 1 ELSE 0 END) as last_month,
SUM( CASE WHEN LEFT ( sr.acc_rep_time, 7 ) =#{last_month} THEN 1 ELSE 0 END ) as last_year
SUM( CASE WHEN LEFT ( sr.acc_rep_time, 7 ) =#{nowMonth} THEN 1 ELSE 0 END ) as now,
SUM( CASE WHEN LEFT ( sr.acc_rep_time, 4 ) =#{nowYear} THEN 1 ELSE 0 END) as nowYear,
SUM( CASE WHEN LEFT ( sr.acc_rep_time,4 ) =#{lastYear} THEN 1 ELSE 0 END ) as last_year
FROM
sys_factory_info sf
LEFT JOIN sys_depart sd ON sf.depart_id = sd.id
......@@ -88,9 +136,9 @@
<select id="safeCensus" resultType="java.util.Map">
SELECT
sd.depart_name,
SUM( CASE WHEN LEFT ( sr.docu_date, 7 ) =#{now} THEN 1 ELSE 0 END ) as now,
SUM( CASE WHEN LEFT ( sr.docu_date, 7 ) =#{last_month} THEN 1 ELSE 0 END) as last_month,
SUM( CASE WHEN LEFT ( sr.docu_date, 7 ) =#{last_month} THEN 1 ELSE 0 END ) as last_year
SUM( CASE WHEN LEFT ( sr.docu_date, 7 ) =#{nowMonth} THEN 1 ELSE 0 END ) as now,
SUM( CASE WHEN LEFT ( sr.docu_date, 4 ) =#{nowYear} THEN 1 ELSE 0 END) as nowYear,
SUM( CASE WHEN LEFT ( sr.docu_date, 4 ) =#{lastYear} THEN 1 ELSE 0 END ) as last_year
FROM
sys_factory_info sf
LEFT JOIN sys_depart sd ON sf.depart_id = sd.id
......
sk-module-biz/src/main/java/com/skua/modules/ajh/service/impl/AjhRectificationInfoServiceImpl.java
......@@ -38,7 +38,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.text.ParseException;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
......@@ -68,46 +67,68 @@ public class AjhRectificationInfoServiceImpl extends ServiceImpl<AjhRectificatio
@Override
public Map<String, Object> searchSafeCensus(String now, String paramType) {
String lastYear = DateUtils.getLastYearMonthOfMonth(now);
String lastMonth = DateUtils.getLastMonthOfMonth(now);
String nowMonth = now;//本月
String[] dateList = now.split("-");
String lastYear = null;
String nowYear = null;
if(dateList.length > 1){
nowYear = dateList[0];
lastYear = Integer.parseInt(nowYear)-1+"";
}
Map<String, Object> result = new HashMap<>();
switch(paramType){
case "top" :
List<Map<String, Object>> topResult = baseMapper.topCensus(nowMonth, nowYear, lastYear);
result.put("top",topResult);
return result;
case "doc" :
List<Map<String, Object>> docResult = baseMapper.docCensus(nowMonth, nowYear, lastYear);
result.put("doc",docResult);
return result;
case "yh" :
List<Map<String, Object>> yhResult = baseMapper.yhCensus(now, lastMonth, lastYear);
List<Map<String, Object>> yhResult = baseMapper.yhCensus(nowMonth, nowYear, lastYear);
result.put("yh",yhResult);
return result;
case "jy" :
List<Map<String, Object>> jyResutl = baseMapper.jyCensus(now, lastMonth, lastYear);
List<Map<String, Object>> jyResutl = baseMapper.jyCensus(nowMonth, nowYear, lastYear);
result.put("jy",jyResutl);
return result;
case "yj" :
List<Map<String, Object>> yjResult = baseMapper.yjCensus(now, lastMonth, lastYear);
List<Map<String, Object>> yjResult = baseMapper.yjCensus(nowMonth, nowYear, lastYear);
result.put("yj",yjResult);
return result;
case "wh" :
List<Map<String, Object>> whResult = baseMapper.whCensus(now, lastMonth, lastYear);
List<Map<String, Object>> whResult = baseMapper.whCensus(nowMonth, nowYear, lastYear);
result.put("wh",whResult);
return result;
case "wx" :
List<Map<String, Object>> wxResult = baseMapper.wxCensus(now, lastMonth, lastYear);
List<Map<String, Object>> wxResult = baseMapper.wxCensus(nowMonth, nowYear, lastYear);
result.put("wx",wxResult);
return result;
case "jt":
List<Map<String, Object>> jtReuslt = baseMapper.jtaqCensus(now, lastMonth, lastYear);
List<Map<String, Object>> jtReuslt = baseMapper.jtaqCensus(nowMonth, nowYear, lastYear);
result.put("jt",jtReuslt);
return result;
case "sa" :
List<Map<String, Object>> saResult = baseMapper.safeCensus(now, lastMonth, lastYear);
List<Map<String, Object>> saResult = baseMapper.safeCensus(nowMonth, nowYear, lastYear);
result.put("sa",saResult);
return result;
default :
List<Map<String, Object>> yhResult1 = baseMapper.yhCensus(now, lastMonth, lastYear);
List<Map<String, Object>> jyResutl1 = baseMapper.jyCensus(now, lastMonth, lastYear);
List<Map<String, Object>> yjResult1 = baseMapper.yjCensus(now, lastMonth, lastYear);
List<Map<String, Object>> whResult1 = baseMapper.whCensus(now, lastMonth, lastYear);
List<Map<String, Object>> wxResult1 = baseMapper.wxCensus(now, lastMonth, lastYear);
List<Map<String, Object>> jtReuslt1 = baseMapper.jtaqCensus(now, lastMonth, lastYear);
List<Map<String, Object>> saResult1 = baseMapper.safeCensus(now, lastMonth, lastYear);
List<Map<String, Object>> topResult1 = baseMapper.topCensus(nowMonth, nowYear, lastYear);
List<Map<String, Object>> docResult1 = baseMapper.docCensus(nowMonth, nowYear, lastYear);
List<Map<String, Object>> yhResult1 = baseMapper.yhCensus(nowMonth, nowYear, lastYear);
List<Map<String, Object>> jyResutl1 = baseMapper.jyCensus(nowMonth, nowYear, lastYear);
List<Map<String, Object>> yjResult1 = baseMapper.yjCensus(nowMonth, nowYear, lastYear);
List<Map<String, Object>> whResult1 = baseMapper.whCensus(nowMonth, nowYear, lastYear);
List<Map<String, Object>> wxResult1 = baseMapper.wxCensus(nowMonth, nowYear, lastYear);
List<Map<String, Object>> jtReuslt1 = baseMapper.jtaqCensus(nowMonth, nowYear, lastYear);
List<Map<String, Object>> saResult1 = baseMapper.safeCensus(nowMonth, nowYear, lastYear);
result.put("top",topResult1);
result.put("doc",docResult1);
result.put("yh",yhResult1);
result.put("jy",jyResutl1);
result.put("yj",yjResult1);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!