大屏接口和下发bug

src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/StatsEnterpriseWeekVo.java

@@ -5,6 +5,8 @@ import lombok.Data;
 
 @Data
 public class StatsEnterpriseWeekVo {
+    @ApiModelProperty("事故报警总数")
+    private Integer emergencyNum;
     @ApiModelProperty("在场人员数量")
     private Integer highWorkerNumThisWeek;
     @ApiModelProperty("在职人员数量")

src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java

@@ -43,6 +43,8 @@ import com.zhgd.xmgl.modules.worker.mapper.WorkerAttendanceMapper;
 import com.zhgd.xmgl.modules.worker.service.IEnterpriseInfoService;
 import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService;
 import com.zhgd.xmgl.modules.worker.service.IWorkerInfoService;
+import com.zhgd.xmgl.modules.xz.emergency.entity.XzEmergencyRecord;
+import com.zhgd.xmgl.modules.xz.emergency.service.IXzEmergencyRecordService;
 import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord;
 import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService;
 import com.zhgd.xmgl.modules.xz.service.impl.XzSupplierQualificationApplyServiceImpl;
@@ -51,6 +53,7 @@ import com.zhgd.xmgl.modules.xz.special.service.*;
 import com.zhgd.xmgl.security.entity.UserInfo;
 import com.zhgd.xmgl.security.util.SecurityUtils;
 import com.zhgd.xmgl.util.ListUtils;
+import com.zhgd.xmgl.util.MapBuilder;
 import com.zhgd.xmgl.util.MessageUtil;
 import com.zhgd.xmgl.util.PageUtil;
 import org.apache.commons.collections.CollectionUtils;
@@ -103,6 +106,8 @@ public class EnterpriseInfoServiceImpl extends ServiceImpl<EnterpriseInfoMapper,
     IXzSpecialOperationFireSafetyService iXzSpecialOperationFireSafetyService;
     @Resource
     IXzTemporaryElectricitySafeService xzTemporaryElectricitySafeService;
+    @Resource
+    IXzEmergencyRecordService xzEmergencyRecordService;
     @Autowired
     private EnterpriseInfoMapper enterpriseInfoMapper;
     @Autowired
@@ -574,6 +579,12 @@ public class EnterpriseInfoServiceImpl extends ServiceImpl<EnterpriseInfoMapper,
         vo.setSafeScore(safeScore);
         int highWorkerNumThisWeek = getHighInDayThisWeek(enterpriseId, projectSn, beginOfWeek);
         vo.setHighWorkerNumThisWeek(highWorkerNumThisWeek);
+        int emergencyNum = xzEmergencyRecordService.queryCount(new MapBuilder<String, Object>()
+                .put("projectSn", projectSn)
+                .put("enterpriseId", enterpriseId)
+                .put("beginOfWeek", beginOfWeek)
+                .build());
+        vo.setEmergencyNum(emergencyNum);
         return vo;
     }
 

src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java

@@ -1821,6 +1821,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
                             continue;
                         }
                         workerInfo.setId(oldWorkerInfo.getId());
+                        workerInfo.setFieldAcquisitionUrl(oldWorkerInfo.getFieldAcquisitionUrl());
                         workerInfoService.editWorkerForUploadExcel(workerInfo);
                     } else {
                         String uuid = UUID.randomUUID().toString().replace("-", "").toUpperCase();
@@ -1866,6 +1867,11 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
 
     @Transactional(rollbackFor = Exception.class)
     public void editWorkerForUploadExcel(WorkerInfo workerInfo) {
+        xzHikvisionSyncMapper.delete(new LambdaQueryWrapper<XzHikvisionSync>()
+                .eq(XzHikvisionSync::getBigType, 1)
+                .eq(XzHikvisionSync::getWhoId, workerInfo.getId())
+        );
+        workerInfo.setSendSuccessStatus(4);
         workerInfoMapper.updateById(workerInfo);
         //同步海康
         this.editWorkerForHikvision(workerInfo);

src/main/java/com/zhgd/xmgl/modules/xz/emergency/mapper/XzEmergencyRecordMapper.java

@@ -13,6 +13,7 @@ import com.zhgd.xmgl.modules.xz.emergency.entity.XzEmergencyRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -37,4 +38,6 @@ public interface XzEmergencyRecordMapper extends BaseMapper<XzEmergencyRecord> {
     List<SectorOneVo> countEmergencyTyped(@Param("param") Map<String, Object> param);
 
     List<CountAlarmNumByEnterpriseOne> countAlarmNumByEnterprise(@Param("param") Map<String, Object> param);
+
+    Integer queryCount(HashMap<String, Object> param);
 }

src/main/java/com/zhgd/xmgl/modules/xz/emergency/mapper/xml/XzEmergencyRecordMapper.xml

@@ -83,4 +83,14 @@
         and t.alarm_time >= CONCAT(DATE_FORMAT(DATE_SUB(now(), interval 7 day), '%Y-%m-%d'), ' 00:00:00')
         group by date,wi.enterprise_id
     </select>
+
+    <select id="queryCount" resultType="java.lang.Integer">
+        select
+        count(*)
+        from xz_emergency_record as t
+        left join worker_info wi on wi.id = t.alarm_person_id
+        where t.project_sn=#{param.projectSn}
+        and t.alarm_time >= #{param.beginOfWeek}
+        and wi.enterprise_id = #{param.enterpriseId}
+    </select>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/xz/emergency/service/IXzEmergencyRecordService.java

@@ -38,4 +38,6 @@ public interface IXzEmergencyRecordService extends IService<XzEmergencyRecord> {
     SectorVo countEmergencyTyped(Map<String, Object> param);
 
     List<CountAlarmNumByEnterpriseVo> countAlarmNumByEnterprise(Map<String, Object> param);
+
+    int queryCount(HashMap<String, Object> param);
 }

src/main/java/com/zhgd/xmgl/modules/xz/emergency/service/impl/XzEmergencyRecordServiceImpl.java

@@ -262,6 +262,11 @@ public class XzEmergencyRecordServiceImpl extends ServiceImpl<XzEmergencyRecordM
         return countAlarmNumByEnterpriseVolist;
     }
 
+    @Override
+    public int queryCount(HashMap<String, Object> param) {
+        return baseMapper.queryCount(param);
+    }
+
     private List<CountAlarmNumByEnterpriseOne> fillEmpty(Map<String, CountAlarmNumByEnterpriseOne> enterpriseIdMap, List<CountAlarmNumByEnterpriseOne> ones, String date) {
         List<String> idList = ones.stream().map(CountAlarmNumByEnterpriseOne::getEnterpriseId).collect(Collectors.toList());
         for (Map.Entry<String, CountAlarmNumByEnterpriseOne> entry : enterpriseIdMap.entrySet()) {