Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
575fcc80 由 康伟
选项

kangwei: 大屏接口， 

         结算详情中权限问题
1 个父辈 1314beb2
内嵌 并排
正在显示 11 个修改的文件 包含 191 行增加 和 39 行删除
sk-module-biz/src/main/java/com/skua/modules/emergency/controller/EventMapController.java
......@@ -5,7 +5,7 @@ import com.skua.core.aspect.annotation.AutoLog;
import com.skua.core.context.BaseContextHandler;
import com.skua.modules.emergency.service.IEmergencyRiskEventService;
import com.skua.modules.emergency.vo.DangerDatabaseResult;
import com.skua.modules.emergency.vo.EventOverviewVO;
import com.skua.modules.emergency.vo.DangerEventOverviewVO;
import com.skua.modules.emergency.vo.MapDatabaseResult;
import com.skua.modules.emergency.vo.RiskDatabaseResult;
import com.skua.tool.util.DateUtils;
......@@ -30,6 +30,34 @@ public class EventMapController {
@AutoLog(value = "风险库统计(数字)")
@ApiOperation(value="风险库统计", notes="风险库统计")
@GetMapping(value = "/dangerEventStatistics")
public Result<DangerEventOverviewVO> dangerEventStatistics(String departIds, String startDate, String endDate){
Result<DangerEventOverviewVO> result = new Result<>();
if(StringUtils.isEmpty(departIds)){
departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
}
DangerEventOverviewVO eventOverview = emergencyRiskEventService.getDangerEventStatistics( departIds, startDate,endDate);
result.setSuccess(true);
result.setResult(eventOverview);
return result;
}
@AutoLog(value = "安全检查列表")
@ApiOperation(value="安全检查列表", notes="安全检查列表")
@GetMapping(value = "/dangerEventStatisticsList")
public Result<List<DangerEventOverviewVO>> dangerEventStatisticsList(String departIds,String startDate, String endDate){
Result<List<DangerEventOverviewVO>> result = new Result<>();
//String departIds = BaseContextHandler.getDeparts();
if(StringUtils.isEmpty(departIds)){
departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
}
List<DangerEventOverviewVO> dataList = emergencyRiskEventService.getDangerEventStatisticsList( departIds, startDate,endDate);
result.setSuccess(true);
result.setResult(dataList);
return result;
}
@AutoLog(value = "风险库统计(数字)")
@ApiOperation(value="风险库统计", notes="风险库统计")
@GetMapping(value = "/riskLibraryStatistics")
public Result<RiskDatabaseResult> riskLibraryStatistics(String departIds,String startDate, String endDate){
Result<RiskDatabaseResult> result = new Result<>();
......
sk-module-biz/src/main/java/com/skua/modules/emergency/service/IEmergencyRiskEventService.java
......@@ -5,7 +5,7 @@ import com.skua.modules.emergency.dto.EmergencyRiskEventHandleDto;
import com.skua.modules.emergency.entity.EmergencyRiskEvent;
import com.baomidou.mybatisplus.extension.service.IService;
import com.skua.modules.emergency.vo.DangerDatabaseResult;
import com.skua.modules.emergency.vo.EventOverviewVO;
import com.skua.modules.emergency.vo.DangerEventOverviewVO;
import com.skua.modules.emergency.vo.MapDatabaseResult;
import com.skua.modules.emergency.vo.RiskDatabaseResult;
......@@ -71,4 +71,22 @@ public interface IEmergencyRiskEventService extends IService<EmergencyRiskEvent>
* @return
*/
public List<RiskDatabaseResult> getRiskLibraryStatisticsList(String departIds, String startDate, String endDate);
/***
* 隐患事件统计(数字)
* @param departIds
* @param startDate
* @param endDate
* @return
*/
DangerEventOverviewVO getDangerEventStatistics(String departIds, String startDate, String endDate);
/**
* 隐患事件统计（列表）
* @param departIds
* @param startDate
* @param endDate
* @return
*/
List<DangerEventOverviewVO> getDangerEventStatisticsList(String departIds, String startDate, String endDate);
}
......
sk-module-biz/src/main/java/com/skua/modules/emergency/service/impl/EmergencyRiskEventServiceImpl.java
......@@ -6,7 +6,6 @@ import com.skua.core.context.SpringContextUtils;
import com.skua.core.exception.JeecgBootException;
import com.skua.core.util.ConvertUtils;
import com.skua.core.util.DateUtils;
import com.skua.modules.dataAnalysis.vo.SafeProgressVO;
import com.skua.modules.emergency.dto.EmergencyRiskEventAddDTO;
import com.skua.modules.emergency.dto.EmergencyRiskEventHandleDto;
import com.skua.modules.emergency.entity.EmergencyRiskEvent;
......@@ -14,6 +13,7 @@ import com.skua.modules.emergency.enums.DicEmergencyRiskEventHandleResultEnums;
import com.skua.modules.emergency.mapper.EmergencyRiskEventMapper;
import com.skua.modules.emergency.service.IEmergencyRiskEventService;
import com.skua.modules.emergency.vo.DangerDatabaseResult;
import com.skua.modules.emergency.vo.DangerEventOverviewVO;
import com.skua.modules.emergency.vo.MapDatabaseResult;
import com.skua.modules.emergency.vo.RiskDatabaseResult;
import com.skua.modules.flow.business.service.FlowBusinessService;
......@@ -193,11 +193,68 @@ public class EmergencyRiskEventServiceImpl extends ServiceImpl<EmergencyRiskEven
public List<RiskDatabaseResult> getRiskLibraryStatisticsList(String departIds, String startDate, String endDate){
String sql = " select d.id 'dpart_id',d.depart_name , ifnull(aa.count,0) 'aqyhCount',ifnull(bb.count,0) 'yhpcCount', ifnull(cc.count,0) 'ycCount', ifnull(dd.count,0) 'xjCount'";
sql += getRiskLibraryStatisticsSql(departIds, startDate, endDate);
List<RiskDatabaseResult> dataList = getJdbcTemplate().query(sql,new BeanPropertyRowMapper<RiskDatabaseResult>(RiskDatabaseResult.class));
return dataList;
}
/***
* 隐患事件统计(数字)
* @param departIds
* @param startDate
* @param endDate
* @return
*/
public DangerEventOverviewVO getDangerEventStatistics(String departIds, String startDate, String endDate){
String sql = " select sum(ifnull(aa.count,0)) 'yhNoHandleNum', sum(ifnull(bb.count,0)) 'yhHandleNum', sum(ifnull(cc.count,0)) 'fxpcNoHandleNum', sum(ifnull(dd.count,0)) 'fxpcHandleNum',sum(ifnull(ee.count,0)) 'fxqyNum', sum(ifnull(ff.count,0)) 'fxdNum', sum(ifnull(gg.count,0)) 'jcxNum'";
sql += getDangerEventStatisticsSql(departIds, startDate, endDate);
List<DangerEventOverviewVO> dataList = getJdbcTemplate().query(sql,new BeanPropertyRowMapper<DangerEventOverviewVO>(DangerEventOverviewVO.class));
if(dataList != null && !dataList.isEmpty()){
return dataList.get(0);
}
return new DangerEventOverviewVO(0,0,0,0,0,0,0);
}
/**
* 隐患事件统计（列表）
* @param departIds
* @param startDate
* @param endDate
* @return
*/
public List<DangerEventOverviewVO> getDangerEventStatisticsList(String departIds, String startDate, String endDate){
String sql = " select d.id 'dpart_id',d.depart_name , ifnull(aa.count,0) 'yhNoHandleNum',ifnull(bb.count,0) 'yhHandleNum', ifnull(cc.count,0) 'fxpcNoHandleNum', ifnull(dd.count,0) 'fxpcHandleNum',ifnull(ee.count,0) 'fxqyNum', ifnull(ff.count,0) 'fxdNum', ifnull(gg.count,0) 'jcxNum'";
sql += getDangerEventStatisticsSql(departIds, startDate, endDate);
List<DangerEventOverviewVO> dataList = getJdbcTemplate().query(sql,new BeanPropertyRowMapper<DangerEventOverviewVO>(DangerEventOverviewVO.class));
return dataList;
}
private String getDangerEventStatisticsSql(String departIds, String startDate, String endDate){
String sql = "";
sql += " from sys_depart d ";
//隐患处理中
sql += " left join ( select t.depart_id , count(1) 'count' from ajh_rectification_info t where t.handle_result = 1 and t.rec_ord_report_date >='"+startDate+"' and t.rec_ord_report_date <='"+endDate+"' group by t.depart_id) aa on aa.depart_id = d.id";
// 隐患已处理
sql += " left join ( select t.depart_id , count(1) 'count' from ajh_rectification_info t where t.handle_result = 3 and t.rec_ord_report_date >='"+startDate+"' and t.rec_ord_report_date <='"+endDate+"' group by t.depart_id) bb on bb.depart_id = d.id ";
//风险排查处理中
sql += " left join ( select depart_id ,count(id) 'count' from danger_inspection_record where status<2 and report_date >= '"+startDate+" 00:00:00' and report_date <='"+endDate+" 23:59:59' group by depart_id ) cc on cc.depart_id = d.id";
//风险排查：已经处理
sql += " left join ( select depart_id ,count(id) 'count' from danger_inspection_record where status=2 and report_date >= '"+startDate+" 00:00:00' and report_date <='"+endDate+" 23:59:59' group by depart_id ) dd on dd.depart_id = d.id";
//风险区域数量
sql += " left join ( select depart_id ,count(id) 'count' from danger_level_manage group by depart_id ) ee on ee.depart_id = d.id";
//风险点数量
sql += " left join ( select dlm.depart_id,count(dii.id) 'count' from danger_inspect_info dii left join danger_level_manage dlm on dii.danger_id = dlm.id group by dlm.depart_id ) ff on ff.depart_id = d.id";
//隐患排查检查项
sql += " left join ( select dlm.depart_id,count(dii.id) 'count' from danger_inspect_item dii left join danger_level_manage dlm on dii.danger_id = dlm.id group by dlm.depart_id ) gg on gg.depart_id = d.id";
sql += " where d.depart_type =1 ";
if(org.apache.commons.lang.StringUtils.isNotEmpty(departIds)){
sql += " and d.id in ("+ JSUtils.quoteEach(departIds,",") +")";
}
return sql;
}
private JdbcTemplate getJdbcTemplate(){
JdbcTemplate jdbcTemplate = (JdbcTemplate) SpringContextUtils.getBean("master");
return jdbcTemplate;
......
sk-module-biz/src/main/java/com/skua/modules/emergency/vo/DangerEventOverviewVO.java 0 → 100644
package com.skua.modules.emergency.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @auther kangwei
* @create 2025-03-05-13:39
*/
@Data
public class DangerEventOverviewVO {
/**厂站ID*/
@ApiModelProperty(value = "厂站ID")
private String departId;
/**厂站名称*/
@ApiModelProperty(value = "厂站名称")
private String departName;
/**隐患处理数*/
@ApiModelProperty(value = "隐患处理数")
private Integer yhNoHandleNum ;
/**隐患已处理数*/
@ApiModelProperty(value = "隐患已处理数")
private Integer yhHandleNum;
@ApiModelProperty(value = "'风险排查处理中'")
private Integer fxpcNoHandleNum;
@ApiModelProperty(value = "'风险排查：已经处理'")
private Integer fxpcHandleNum;
/**异常数*/
@ApiModelProperty(value = "'风险区域数量'")
private Integer fxqyNum;
@ApiModelProperty(value = "'风险点数量'")
private Integer fxdNum;
@ApiModelProperty(value = "''隐患排查检查项''")
private Integer jcxNum;
public DangerEventOverviewVO() {
}
public DangerEventOverviewVO(Integer yhNoHandleNum, Integer yhHandleNum, Integer fxpcNoHandleNum, Integer fxpcHandleNum, Integer fxqyNum, Integer fxdNum, Integer jcxNum) {
this.yhNoHandleNum = yhNoHandleNum;
this.yhHandleNum = yhHandleNum;
this.fxpcNoHandleNum = fxpcNoHandleNum;
this.fxpcHandleNum = fxpcHandleNum;
this.fxqyNum = fxqyNum;
this.fxdNum = fxdNum;
this.jcxNum = jcxNum;
}
}
sk-module-biz/src/main/java/com/skua/modules/emergency/vo/EventOverviewVO.java deleted 100644 → 0
package com.skua.modules.emergency.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @auther kangwei
* @create 2025-03-05-13:39
*/
@Data
public class EventOverviewVO {
/**厂站ID*/
@ApiModelProperty(value = "厂站ID")
private String departId;
/**厂站名称*/
@ApiModelProperty(value = "厂站名称")
private String departName;
/**安全隐患数*/
@ApiModelProperty(value = "安全隐患数")
private Integer aqyhCount ;
/**风险排查数*/
@ApiModelProperty(value = "风险排查数")
private Integer fxpcCount;
/**异常数*/
@ApiModelProperty(value = "异常数")
private Integer ycCount;
@ApiModelProperty(value = "巡检数量")
private Integer xjCount;
}
sk-module-biz/src/main/java/com/skua/modules/emergency/vo/RiskDatabaseResult.java
......@@ -37,6 +37,9 @@ public class RiskDatabaseResult {
private Integer xjCount;
public RiskDatabaseResult(){
}
public RiskDatabaseResult(Integer fxkCount, Integer aqyhCount, Integer yhpcCount, Integer ycCount, Integer xjCount) {
this.fxkCount = fxkCount;
this.aqyhCount = aqyhCount;
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/ErpSettlementItemMapper.xml
......@@ -10,8 +10,8 @@
select d.depart_name, sm.supp_name supplierName,pc.project_name, pc.contract_name,pc.contract_code, mf.jishu_file_path, mf.appearance_info, mf.matched_info ,mf.handle_msg,mf.sender_sign,mf.receiver_sign,
pm.good_brand , pm.good_origin,pm.tax_amount,pm.unit_price,
ss.sparepart_code,ss.sparepart_name, ss.specification,ss.measuring_unit,
si.id,si.settlement_id,si.depart_id,si.material_in_id,si.purchase_contract_id,si.distribut_contract_id,si.sparepart_id,si.material_num,si.arrive_time,
(pm.unit_price * si.material_num)'total_price',round(pm.unit_price * si.material_num *100 /(100+ ifnull(pm.tax_amount,0)) ,2) total_price_tax
si.id,si.settlement_id,si.depart_id,si.material_in_id,si.purchase_contract_id,si.distribut_contract_id,si.sparepart_id,si.material_num,si.arrive_time,si.good_code,
round(pm.unit_price * si.material_num,2)'total_price',round(pm.unit_price * si.material_num *100 /(100+ ifnull(pm.tax_amount,0)) ,2) total_price_tax
from erp_settlement_item si
left join sys_depart d on d.id = si.depart_id
left join erp_purchase_material pm on (pm.contract_id =si.purchase_contract_id and pm.good_code = si.good_code )
......@@ -26,8 +26,8 @@
select d.depart_name, dc.contract_name ,dc.project_name,dc.contract_code, mf.jishu_file_path, mf.appearance_info, mf.matched_info ,mf.handle_msg,mf.sender_sign,mf.receiver_sign,
dm.tax_amount,dm.distribut_price 'unit_price',
ss.sparepart_code,ss.sparepart_name, ss.specification,ss.measuring_unit,
si.id,si.settlement_id,si.depart_id,si.material_in_id,si.distribut_contract_id,si.purchase_contract_id,si.sparepart_id,si.material_num,si.arrive_time,
(dm.distribut_price * si.material_num)'total_price',round(dm.distribut_price * si.material_num *100 /(100+ ifnull(dm.tax_amount,0)) ,2) total_price_tax
si.id,si.settlement_id,si.depart_id,si.material_in_id,si.distribut_contract_id,si.purchase_contract_id,si.sparepart_id,si.material_num,si.arrive_time,si.good_code,
round(dm.distribut_price * si.material_num,2)'total_price',round(dm.distribut_price * si.material_num *100 /(100+ ifnull(dm.tax_amount,0)) ,2) total_price_tax
from erp_settlement_item si
left join sys_depart d on d.id = si.depart_id
......
sk-module-system/src/main/java/com/skua/modules/system/mapper/SysDepartMapper.java
......@@ -139,6 +139,9 @@ public interface SysDepartMapper extends BaseMapper<SysDepart> {
String getDepartTreeByParentDepartId(@Param("parentDepartId")String parentDepartId);
String getChildDepartId(@Param("departIds") String departIds);
/** 根据部门父id查询子集部门的集合(级联)*/
String getChildDepartIdByParentId(@Param("departIds") String departIds ,@Param("parentId") String parentId,@Param("departType") String departType);
List<SysDeptUserVO> queryDeptAndUserTreeList(@Param("departId") String departId);
......
sk-module-system/src/main/java/com/skua/modules/system/mapper/xml/SysDepartMapper.xml
......@@ -259,6 +259,23 @@
depart_type,
depart_order
</select>
<select id="getChildDepartIdByParentId" resultType="java.lang.String">
SELECT
GROUP_CONCAT( id SEPARATOR ',' ) AS depart_ids
FROM
sys_depart
WHERE 1=1
<if test="departType != null and departType !=''"> and depart_type=#{departType}</if>
and (parent_id = #{parentId} OR parent_id IN (SELECT id FROM sys_depart WHERE parent_id = #{parentId}))
<if test="departIds != null and departIds !=''">
and id in
<foreach item="item" index="index" collection="departIds.split(',')" open="(" separator="," close=")">
'${item}'
</foreach>
</if>
</select>
<select id="queryDeptAndUserTreeList" parameterType="java.lang.String" resultType="com.skua.modules.system.vo.SysDeptUserVO">
SELECT
*
......
sk-module-system/src/main/java/com/skua/modules/system/service/ISysDepartService.java
......@@ -177,6 +177,8 @@ public interface ISysDepartService extends IService<SysDepart>{
List<DepartTree> getJimuDepartTree(DepartTree departTree);
String getChildDepartId(String departIds);
/** 根据部门父id查询子集部门的集合(级联)*/
String getChildDepartId(String departIds, String parentId, String departType);
List<SysDeptUserVO> queryDeptAndUserTreeList(String departId,String userType);
......
sk-module-system/src/main/java/com/skua/modules/system/service/impl/SysDepartServiceImpl.java
......@@ -545,6 +545,10 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
public String getChildDepartId(String departIds) {
return sysDepartMapper.getChildDepartId(departIds);
}
/** 根据部门父id查询子集部门的集合(级联)*/
public String getChildDepartId(String departIds, String parentId, String departType){
return sysDepartMapper.getChildDepartIdByParentId(departIds,parentId, departType);
}
@Override
public List<SysDeptUserVO> queryDeptAndUserTreeList(String departId, String userType) {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!