bug修复

src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/InspectHiddenDangerLibraryMapper.xml

@@ -26,6 +26,6 @@
         SELECT a.*
         from inspect_hidden_danger_library a
         WHERE a.sn = #{sn}
-
+        order by a.order_sort
     </select>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/inspection/mapper/xml/InspectTableLibraryMapper.xml

@@ -1,11 +1,11 @@
 <?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.zhgd.xmgl.modules.inspection.mapper.InspectTableLibraryMapper">
-
     <update id="updateInspectTableLibraryName">
-        UPDATE inspect_table_library SET full_name=REPLACE(full_name, #{oldFullName}, #{newFullName})
+        UPDATE inspect_table_library
-        WHERE full_name LIKE N'${oldFullName}%' and sn = #{sn};
+        SET full_name=REPLACE(full_name, #{oldFullName}, #{newFullName})
-
+        WHERE full_name LIKE N'${oldFullName}%'
+        and sn = #{sn};
     </update>
     <select id="selectLibraryByNameList" resultType="com.zhgd.xmgl.modules.inspection.entity.InspectTableLibrary">
         SELECT a.*
@@ -16,11 +16,21 @@
     <select id="selectCurrentUserTableCount" resultType="java.lang.Integer">
         SELECT COUNT(1)
         from acceptance_table_check_task
-        WHERE classify_id=#{id} and status=1
+        WHERE classify_id = #{id}
+        and status = 1
     </select>
     <select id="selectTableLibraryList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
-        SELECT a.*
+        SELECT id,
+        classify_name,
+        `code`,
+        sn,
+        full_name,
+        DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%S'),
+        parent_id,
+        remark,
+        order_sort
         from inspect_table_library a
         WHERE a.sn = #{sn}
+        order by a.order_sort
     </select>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/led/entity/LedBigScreenRegion.java

@@ -41,7 +41,7 @@ public class LedBigScreenRegion implements Serializable {
      */
     @Excel(name = "区域内容", width = 15)
     @ApiModelProperty(value = "区域内容")
-    private java.lang.Object regionContent;
+    private java.lang.String regionContent;
     /**
      * 区域高度
      */

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

@@ -349,7 +349,10 @@ public class WorkerInfoController {
     }
 
     @ApiOperation(value = "统计按工种分布的人员数量", notes = "统计按工种分布的人员数量")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "query", required = false, dataType = "String"),
             @ApiImplicitParam(name = "projectSnList", value = "项目SN列表", paramType = "query", required = false, dataType = "String")
+    })
     @PostMapping("/countWorkerNumGroupByWorkerType")
     public Result<List<TypeNumVo>> countWorkerNumGroupByWorkerType(@RequestBody Map<String, Object> map) {
         return Result.success(workerInfoService.countWorkerNumGroupByWorkerType(map));
@@ -501,7 +504,7 @@ public class WorkerInfoController {
             @ApiImplicitParam(name = "userEnterpriseId", value = "用户能查看的企业", paramType = "query", required = false, dataType = "String"),
     })
     @PostMapping("/selectWorkerTeamStatistics")
-    public Result<List<Map<String, Object>>> selectWorkerTeamStatistics(@RequestBody Map<String, Object> map) {
+    public Result<List<WorkerTeamStatisticsVo>> selectWorkerTeamStatistics(@RequestBody Map<String, Object> map) {
         return Result.success(workerInfoService.selectWorkerTeamStatistics(map));
     }
 

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

@@ -20,9 +20,12 @@ public class PersonTypeAndEduStatisticsVo {
     @Data
     public static class PresencePerson {
 
+        @ApiModelProperty(value = "管理人员人数（在场人数）")
         private Integer glPersonTotal;
+        @ApiModelProperty(value = "临时工人数（在场人数）")
         private Integer lsPersonTotal;
         private String total_worker_type_num;
+        @ApiModelProperty(value = "劳务工人数（在场人数）")
         private Integer lwPersonTotal;
         @ApiModelProperty(value = "实时总人数（在场人数）")
         private String totalPerson;
@@ -32,8 +35,11 @@ public class PersonTypeAndEduStatisticsVo {
     @Data
     public static class AttendancePerson {
 
+        @ApiModelProperty(value = "管理人员人数（出勤人数）")
         private Integer glPersonTotal;
+        @ApiModelProperty(value = "临时工人数（出勤人数）")
         private Integer lsPersonTotal;
+        @ApiModelProperty(value = "劳务工人数（出勤人数）")
         private Integer lwPersonTotal;
         @ApiModelProperty(value = "日累计人数（出勤人数）")
         private String totalPerson;
@@ -43,9 +49,12 @@ public class PersonTypeAndEduStatisticsVo {
     @Data
     public static class ToaltPerson {
 
+        @ApiModelProperty(value = "管理人员人数（实名制人数）")
         private Integer glPersonTotal;
         private String total_team_num;
+        @ApiModelProperty(value = "临时工人数（实名制人数）")
         private Integer lsPersonTotal;
+        @ApiModelProperty(value = "劳务工人数（实名制人数）")
         private Integer lwPersonTotal;
         @ApiModelProperty(value = "总人数（实名制人数）")
         private String totalPerson;

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

@@ -0,0 +1,21 @@
+package com.zhgd.xmgl.modules.worker.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class WorkerTeamStatisticsVo {
+
+    @ApiModelProperty(value = "班组名称")
+    private String teamName;
+    @ApiModelProperty(value = "班组ID")
+    private String teamId;
+    private String name;
+    @ApiModelProperty(value = "出勤人数")
+    private Integer attendancePersonTotal;
+    @ApiModelProperty(value = "在场人数")
+    private Integer presencePersonTotal;
+    @ApiModelProperty(value = "在册人数")
+    private Integer totalPerson;
+
+}

src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoService.java

@@ -45,7 +45,7 @@ public interface IWorkerInfoService extends IService<WorkerInfo> {
 
     Map<String, Object> selectWorkerPersonTypeStatistics(Map<String, Object> map);
 
-    List<Map<String, Object>> selectWorkerTeamStatistics(Map<String, Object> map);
+    List<WorkerTeamStatisticsVo> selectWorkerTeamStatistics(Map<String, Object> map);
 
     List<Map<String, Object>> selectWorkerDepartmentStatistics(Map<String, Object> map);
 

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

@@ -404,7 +404,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
     public Map<String, Object> selectWorkerOverviewStatistics(Map<String, Object> map) {
         Map<String, Object> data = new HashMap<>();
         Map<String, Object> personType = selectWorkerPersonTypeStatistics(map);
-        List<Map<String, Object>> teamList = selectWorkerTeamStatistics(map);
+        List<WorkerTeamStatisticsVo> teamList = selectWorkerTeamStatistics(map);
         //map.put("sn",MapUtils.getString(map,"projectSn"));
         int totalEducationPerson = workerSafeEducationMapper.getProjectSafeEducationPersonToltal(map);
         data.put("totalEducationPerson", totalEducationPerson);
@@ -445,7 +445,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
     }
 
     @Override
-    public List<Map<String, Object>> selectWorkerTeamStatistics(Map<String, Object> map) {
+    public List<WorkerTeamStatisticsVo> selectWorkerTeamStatistics(Map<String, Object> map) {
         QueryWrapper<TeamInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(TeamInfo::getProjectSn, MapUtils.getString(map, "projectSn"));
         List<TeamInfo> list = teamInfoMapper.selectTeamInfoList(map);
@@ -511,7 +511,8 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
                 tempList.add(data);
             }
         }
-        return tempList;
+        List<WorkerTeamStatisticsVo> voList = tempList.stream().map(e -> BeanUtil.toBean(e, WorkerTeamStatisticsVo.class)).collect(Collectors.toList());
+        return voList;
     }
 
     private Map<Integer, Integer> getListToMap(List<Map<String, Object>> list, String key, String value) {
@@ -1162,9 +1163,10 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
             list.addAll(departmentList);
         }
         //班组统计
-        List<Map<String, Object>> teamList = selectWorkerTeamStatistics(map);
+        List<WorkerTeamStatisticsVo> teamList = selectWorkerTeamStatistics(map);
+        List<Map<String, Object>> teamMapList = teamList.stream().map(e -> BeanUtil.beanToMap(e)).collect(Collectors.toList());
         if (teamList.size() > 0) {
-            list.addAll(teamList);
+            list.addAll(teamMapList);
         }
         Integer totalPerson = 0;
         Integer presencePersonTotal = 0;