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

@@ -5,6 +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.MapDatabaseResult;
 import com.skua.modules.emergency.vo.RiskDatabaseResult;
 import com.skua.tool.util.DateUtils;
@@ -27,6 +28,34 @@ public class EventMapController {
 	@Autowired
 	private IEmergencyRiskEventService emergencyRiskEventService;
 
+	@AutoLog(value = "风险库统计(数字)")
+	@ApiOperation(value="风险库统计", notes="风险库统计")
+	@GetMapping(value = "/riskLibraryStatistics")
+	public Result<RiskDatabaseResult> riskLibraryStatistics(String departIds,String startDate, String endDate){
+		Result<RiskDatabaseResult> result = new Result<>();
+		if(StringUtils.isEmpty(departIds)){
+			departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
+		}
+		RiskDatabaseResult  eventOverview = emergencyRiskEventService.getRiskLibraryStatistics( departIds, startDate,endDate);
+		result.setSuccess(true);
+		result.setResult(eventOverview);
+		return result;
+	}
+
+	@AutoLog(value = "安全检查列表")
+	@ApiOperation(value="安全检查列表", notes="安全检查列表")
+	@GetMapping(value = "/riskLibraryStatisticsList")
+	public Result<List<RiskDatabaseResult>> getRiskLibraryStatisticsList(String departIds,String startDate, String endDate){
+		Result<List<RiskDatabaseResult>> result = new Result<>();
+		//String departIds = BaseContextHandler.getDeparts();
+		if(StringUtils.isEmpty(departIds)){
+			departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
+		}
+		List<RiskDatabaseResult>  dataList = emergencyRiskEventService.getRiskLibraryStatisticsList( departIds, startDate,endDate);
+		result.setSuccess(true);
+		result.setResult(dataList);
+		return result;
+	}
 	/**
 	 * 	安全隐患事件数量
 	 */

@@ -5,6 +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.MapDatabaseResult;
 import com.skua.modules.emergency.vo.RiskDatabaseResult;
 
@@ -52,4 +53,22 @@ public interface IEmergencyRiskEventService extends IService<EmergencyRiskEvent>
      * @return
      */
     List<MapDatabaseResult> getMapData(String departIds,  String startDate,String endDate);
+
+    /***
+     * 风险库统计
+     * @param departIds
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    RiskDatabaseResult getRiskLibraryStatistics(String departIds, String startDate, String endDate);
+
+    /***
+     * 风险库统计列表
+     * @param departIds
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    public  List<RiskDatabaseResult> getRiskLibraryStatisticsList(String departIds, String startDate, String endDate);
 }

@@ -2,9 +2,11 @@ package com.skua.modules.emergency.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.skua.core.context.BaseContextHandler;
+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;
@@ -34,6 +36,8 @@ import com.skua.tool.util.UniqIdUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -169,6 +173,55 @@ public class EmergencyRiskEventServiceImpl extends ServiceImpl<EmergencyRiskEven
         return list;
     }
 
+    /***
+     * 风险库统计
+     * @param departIds
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    public  RiskDatabaseResult getRiskLibraryStatistics(String departIds, String startDate, String endDate){
+        String sql = " select sum(ifnull(aa.count,0)) 'aqyhCount',sum(ifnull(bb.count,0) )'yhpcCount', sum(ifnull(cc.count,0)) 'ycCount', sum(ifnull(dd.count,0)) 'xjCount'";
+        sql += getRiskLibraryStatisticsSql(departIds,  startDate,  endDate);
+
+        List<RiskDatabaseResult> dataList = getJdbcTemplate().query(sql,new BeanPropertyRowMapper<RiskDatabaseResult>(RiskDatabaseResult.class));
+        if(dataList != null && !dataList.isEmpty()){
+            return dataList.get(0);
+        }
+        return new RiskDatabaseResult(0,0,0,0,0);
+    }
+    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;
+    }
+
+    private JdbcTemplate getJdbcTemplate(){
+        JdbcTemplate jdbcTemplate = (JdbcTemplate) SpringContextUtils.getBean("master");
+        return jdbcTemplate;
+    }
+    private String getRiskLibraryStatisticsSql(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.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 depart_id ,count(id) 'count' from danger_inspection_record where    report_date >= '"+startDate+" 00:00:00' and report_date <='"+endDate+" 23:59:59' group by depart_id ) bb on bb.depart_id = d.id ";
+        // 异常
+        sql += " left join ( select t.depart_id , count(1) 'count' from problem_report_plan t  where t.report_time >='"+startDate+"' and t.report_time <='"+endDate+"' group by t.depart_id) cc on  cc.depart_id  = d.id";
+        //巡检
+        sql += " left join ( select t.depart_id , count(1) 'count' from inspection_task t  where t.task_start_time >='"+startDate+"' and t.task_end_time <='"+endDate+"' group by t.depart_id) dd on  dd.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;
+    }
+
+
     @Override
     public List<MapDatabaseResult> getMapData(String departIds,String startDate,String endDate) {
       /*  if(StringUtils.isEmpty(year)){

+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;
+}

@@ -19,13 +19,29 @@ public class RiskDatabaseResult {
 	/**风险库数量*/
     @ApiModelProperty(value = "风险库数量")
 	private Integer fxkCount;
+
+	/**安全隐患数*/
+	@ApiModelProperty(value = "安全隐患数")
+	private Integer aqyhCount ;
+
 	/**隐患排查数量*/
     @ApiModelProperty(value = "隐患排查数量")
 	private Integer yhpcCount;
-	/**隐患排查事件数量*/
-    @ApiModelProperty(value = "隐患排查事件数量")
-	private Integer aqyhCount;
+
+
+	/**异常数*/
+	@ApiModelProperty(value = "异常数")
+	private Integer ycCount;
 
 	@ApiModelProperty(value = "巡检数量")
 	private Integer xjCount;
+
+
+	public RiskDatabaseResult(Integer fxkCount, Integer aqyhCount, Integer yhpcCount, Integer ycCount, Integer xjCount) {
+		this.fxkCount = fxkCount;
+		this.aqyhCount = aqyhCount;
+		this.yhpcCount = yhpcCount;
+		this.ycCount = ycCount;
+		this.xjCount = xjCount;
+	}
 }

@@ -324,12 +324,15 @@ public class MaterialINController {
 	@AutoLog(value = "erp--物料(药剂)入库-批量送审")
 	@ApiOperation(value="erp--物料(药剂)入库-批量送审", notes="erp--物料(药剂)入库-批量送审")
 	@GetMapping(value = "/batchSendAudit")
-	public Result<MaterialIN> batchSendAudit(@RequestParam(name="ids",required=true) String ids) {
+	public Result<MaterialIN> batchSendAudit(@RequestParam(name="ids",required=true) String ids,String auditStatus) {
 		Result<MaterialIN> result = new Result<MaterialIN>();
 		if(ids==null || "".equals(ids.trim())) {
 			result.error500("参数不识别！");
 		}else {
-			String auditStatus = "1";
+			//String auditStatus = "1";
+			if(StringUtils.isEmpty(auditStatus)){
+				auditStatus = "1";
+			}
 			this.materialINService.batchSendAudit(JSUtils.quoteEach(ids,","),auditStatus);
 			result.success("批量送审成功!");
 		}

@@ -3,6 +3,7 @@ package com.skua.modules.erp.mapper;
 import java.util.List;
 
 import com.skua.modules.erp.vo.ErpSettlementItemVO;
+import com.skua.tool.annotation.Anonymous;
 import org.apache.ibatis.annotations.Param;
 import com.skua.modules.erp.entity.ErpSettlementItem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -14,6 +15,8 @@ public interface ErpSettlementItemMapper extends BaseMapper<ErpSettlementItem> {
 
     void deleteBySettlementId(@Param("settlementId") String settlementId);
 
+    @Anonymous
     List<ErpSettlementItemVO> queryListBySupplier(@Param("settlementId") String settlementId);
+    @Anonymous
     List<ErpSettlementItemVO> queryListByWaterDepart(@Param("settlementId") String settlementId);
 }

@@ -41,7 +41,7 @@ public interface MaterialINMapper extends BaseMapper<MaterialIN> {
      * @param auditStatus
      * @return
      */
-    public int batchSendAudit(@Param("id")String ids, @Param("auditStatus")String auditStatus);
+    public int batchSendAudit(@Param("ids")String ids, @Param("auditStatus")String auditStatus);
 
 
 }

@@ -151,7 +151,7 @@ public class WorkAnalysisController {
             sql += " and d.id in ("+ JSUtils.quoteEach(departIds,",") +")";
         }
         sql += " order by  (ifnull(aaa.count,0) + ifnull(bbb.count,0) + ifnull(ccc.count,0) + ifnull(ddd.count,0) + ifnull(fff.count,0) ) asc ";
-        System.out.println("sql = "+sql);
+        //System.out.println("sql = "+sql);
         List<SafeProgressVO> dataList = getJdbcTemplate().query(sql,new BeanPropertyRowMapper<SafeProgressVO>(SafeProgressVO.class));
         result.setResult(dataList);
         result.setSuccess(true);
@@ -330,6 +330,7 @@ public class WorkAnalysisController {
         sql += " left join ( select dep_id,count(user_id) 'count' from sys_user_depart where user_id in("+userIds+") group by dep_id  )ddd on ddd.dep_id = d.id";
         //风险排查任务
         sql += " left join ( select depart_id ,count(id) 'count' from danger_inspection_record where  status = '2' and    end_date >= '"+startTime+" 00:00:00' and end_date <='"+endTime+" 23:59:59' group by depart_id ) eee on eee.depart_id = d.id ";
+        sql += " left join ( select depart_id ,count(id) 'count' from danger_inspection_record where    report_date >= '"+startTime+" 00:00:00' and report_date <='"+endTime+" 23:59:59' group by depart_id ) ggg on ggg.depart_id = d.id ";
         sql += " left join( select  sum(  (DATEDIFF('"+endTime+"', '"+startTime+"') +1)*24/ dlm.frequency )  'count' , dlm.depart_id  from  danger_level_manage dlm where dlm.frequency IS NOT NULL and frequency <> '' ) fff on fff.depart_id = d.id ";
 
         return sql ;