修改APP版本中煤

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/AppVersionController.java

@@ -155,11 +155,13 @@ public class AppVersionController {
       */
      @ApiOperation(value = "查询一条APP版本管理信息", notes = "查询一条APP版本管理信息" , httpMethod="POST")
      @PostMapping(value = "/getAppVersion")
-     public Result<AppVersion> getAppVersion() {
+     public Result<AppVersion> getAppVersion(@RequestBody AppVersion appVersion) {
          Result<AppVersion> result = new Result<AppVersion>();
-         QueryWrapper<AppVersion> queryWrapper=new QueryWrapper<>();
+		 if (appVersion.getId() == null) {
-         AppVersion appVersion = appVersionService.getOne(queryWrapper);
+			 appVersion.setId(2L);
-         result.setResult(appVersion);
+		 }
+         AppVersion appVersionEntity = appVersionService.getById(appVersion.getId());
+         result.setResult(appVersionEntity);
          result.setSuccess(true);
          return result;
      }

src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java

@@ -158,6 +158,7 @@ public class WorkerInfoController {
             @ApiImplicitParam(name = "isFilterQualityRegionEnterprise", value = "是否查询过滤区域管理下的企业，1是", paramType = "body", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "letter", value = "首字母", paramType = "body", required = false, dataType = "String"),
             @ApiImplicitParam(name = "safeScoreLevel", value = "安全得分风险（1高风险2中风险3低风险）", paramType = "body", required = false, dataType = "String"),
+            @ApiImplicitParam(name = "qualityRegionId", value = "区域ID", paramType = "body", required = false, dataType = "String"),
     })
     @PostMapping(value = "/selectWorkerInfoList")
     public Result<IPage<WorkerInfo>> selectWorkerInfoList(@RequestBody Map<String, Object> map) {

src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java

@@ -715,4 +715,6 @@ public interface WorkerInfoMapper extends BaseMapper<WorkerInfo> {
      * @return
      */
     double getAvgSafeScore(@Param("list") List<Long> enterpriseIds, @Param("projectSn") String projectSn);
+
+    int selectWorkerNumByMl(@Param("projectSn") String projectSn);
 }

src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml

@@ -2562,4 +2562,14 @@
         </foreach>
         and project_sn = #{projectSn}
     </select>
+
+    <select id="selectWorkerNumByMl" resultType="java.lang.Integer" parameterType="java.util.Map">
+        SELECT COUNT(DISTINCT(id)) from (SELECT
+             w1.id id
+         FROM
+             worker_info w1
+                 INNER JOIN worker_attendance_presence p ON w1.person_sn = p.person_sn WHERE w1.project_sn = #{projectSn}
+         UNION
+         SELECT worker_info_id id FROM safety_hat_dev WHERE `online` = 1 AND project_sn = #{projectSn}) a
+    </select>
 </mapper>

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

@@ -55,6 +55,9 @@ import com.zhgd.xmgl.modules.project.entity.bo.ProjectStatisticsCountBo;
 import com.zhgd.xmgl.modules.project.mapper.ProjectEnterpriseMapper;
 import com.zhgd.xmgl.modules.project.mapper.ProjectMapper;
 import com.zhgd.xmgl.modules.project.service.IProjectUfaceConfigService;
+import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatFence;
+import com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatFenceMapper;
+import com.zhgd.xmgl.modules.safetyhat.service.ISafetyHatFenceService;
 import com.zhgd.xmgl.modules.video.mapper.AiAnalyseHardWareAlarmRecordMapper;
 import com.zhgd.xmgl.modules.worker.entity.*;
 import com.zhgd.xmgl.modules.worker.entity.dto.GetWorkerInfoByDevDto;
@@ -265,7 +268,8 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
     @Lazy
     @Autowired
     private IExamTrainRecordService examTrainRecordService;
-
+    @Autowired
+    private ISafetyHatFenceService safetyHatFenceService;
     /**
      * 人员管理分页
      *
@@ -274,6 +278,14 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
      */
     @Override
     public IPage<WorkerInfo> selectWorkerInfoList(Map<String, Object> map) {
+        // 区域人员
+        String qualityRegionId = MapUtils.getString(map, "qualityRegionId");
+        if (StringUtils.isNotEmpty(qualityRegionId)) {
+            String workerInFence = safetyHatFenceService.getWorkerInFence(qualityRegionId);
+            if (StringUtils.isNotEmpty(workerInFence)) {
+                map.put("workerInfos", workerInFence);
+            }
+        }
         int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString());
         int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10000).toString());
         map.put("workerInfoGreenScore", PropertiesUtil.getWorkerInfoGreenScore());
@@ -656,6 +668,8 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
             WorkerManageStatisticsVo.PresenceCount presencecount = workerInfoMapper.getWorkerPresenceStatistics(map);
             map.put("timeType", 1);
             int currentMonthEducationPerson = workerSafeEducationMapper.getCurrentMonthSafeEducationPersonToltal(map);
+            int workerNumMl = workerInfoMapper.selectWorkerNumByMl(MapUtils.getString(map, "sn"));
+            data.put("workerNumMl", workerNumMl);
             data.put("devcount", devcount);
             data.put("projectcount", projectcount);
             data.put("workercount", workercount);