Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/Enum/QrcodeColorEnum.java

@@ -23,4 +23,13 @@ public enum QrcodeColorEnum {
         }
         return null;
     }
+    public static String getName(String code) {
+
+        for (QrcodeColorEnum qrcodeColorEnum : QrcodeColorEnum.values()) {
+            if (qrcodeColorEnum.getCode().equals(code)) {
+                return qrcodeColorEnum.getName();
+            }
+        }
+        return null;
+    }
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/PersonBasicMapper.java

 package com.yeejoin.amos.boot.module.jxiop.api.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.EXPersonUser;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.StationBasicDto;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.UserMapperDto;
@@ -8,6 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 人员基本信息 Mapper 接口
@@ -44,4 +46,13 @@ public interface PersonBasicMapper extends BaseMapper<PersonBasic> {
                                            @Param("orgCode") String orgCode,
                                            @Param("ids")  String [] ids
     );
+
+    List<Map<String, Object>> getPersonYardStatistics(@Param("parentCode") String parentCode);
+
+
+    List<Map<String, Object>> getPersonYardByPage(@Param("current") Integer current,
+                                                  @Param("size")  Integer size,
+                                                  @Param("parentCode") String parentCode);
+
+    Integer getPersonYardByPageCount(@Param("parentCode") String parentCode);
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/PersonBasicMapper.xml

@@ -193,5 +193,50 @@
 
     </select>
 
+    <select id="getPersonYardStatistics" resultType="java.util.Map">
+        SELECT
+            qrcode_color as qrCodeColor,
+            count( 1 ) as value
+        FROM
+            person_basic
+            <where>
+                <if test="parentCode != null and parentCode != ''">
+                    AND project_org_code like concat(#{parentCode},'%')
+                </if>
+            </where>
+        GROUP BY
+            qrcode_color
+    </select>
 
+    <select id="getPersonYardByPage" resultType="java.util.Map">
+        SELECT
+        ifnull(b.name, '') as name ,
+        ifnull(a.qrcode_color, '') AS qrCodeColor,
+        ifnull(c.station_name, '') AS stationName
+        FROM
+        person_basic a
+        LEFT JOIN person_account b ON a.sequence_nbr = b.person_id
+        LEFT JOIN station_basic c ON a.project_org_code = c.project_org_code
+        <where>
+            <if test="parentCode != null and parentCode != ''">
+                AND a.project_org_code like concat(#{parentCode},'%')
+            </if>
+        </where>
+        ORDER BY  a.rec_date DESC
+        limit #{current},#{size}
+    </select>
+
+    <select id="getPersonYardByPageCount" resultType="java.lang.Integer">
+        SELECT
+        count(1)
+        FROM
+        person_basic a
+        LEFT JOIN person_account b ON a.sequence_nbr = b.person_id
+        LEFT JOIN station_basic c ON a.project_org_code = c.project_org_code
+        <where>
+            <if test="parentCode != null and parentCode != ''">
+                AND a.project_org_code like concat(#{parentCode},'%')
+            </if>
+        </where>
+    </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/PersonBasicController.java

@@ -14,6 +14,8 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 
 import java.text.ParseException;
 import java.util.List;
+import java.util.Map;
+
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.PersonBasicServiceImpl;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -177,4 +179,33 @@ public class PersonBasicController extends BaseController {
         response.setDevMessage(message);
         return response;
     }
+
+    /**
+     * 评估大屏 - 人员赋码环形图查询
+     *
+     * @param parentCode 父级code
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getPersonYardStatistics")
+    @ApiOperation(httpMethod = "GET", value = "评估大屏 - 人员赋码环形图查询", notes = "评估大屏 - 人员赋码环形图查询")
+    public ResponseModel<List<Map<String, Object>>> getPersonYardStatistics(@RequestParam(required = false, value = "parentCode") String parentCode) {
+        List<Map<String, Object>> resultList = personBasicServiceImpl.getPersonYardStatistics(parentCode);
+        return ResponseHelper.buildResponse(resultList);
+    }
+
+    /**
+     * 评估大屏 - 人员赋码列表查询
+     *
+     * @param parentCode 父级code
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getPersonYardByPage")
+    @ApiOperation(httpMethod = "GET", value = "评估大屏 - 人员赋码列表查询", notes = "评估大屏 - 人员赋码列表查询")
+    public ResponseModel<Page<Map<String, Object>>> getPersonYardByPage(@RequestParam(required = false, value = "parentCode") String parentCode,
+                                                                        @RequestParam(value = "current") Integer current,
+                                                                        @RequestParam(value = "size") Integer size) {
+        Page<Map<String, Object>> resultList = personBasicServiceImpl.getPersonYardByPage(parentCode, current, size);
+        return ResponseHelper.buildResponse(resultList);
+    }
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

@@ -602,4 +602,30 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         return page;
     }
 
+    public List<Map<String, Object>> getPersonYardStatistics(String parentCode) {
+        List<Map<String, Object>> resultList = personBasicMapper.getPersonYardStatistics(parentCode);
+        resultList.forEach(item -> {
+            String name = QrcodeColorEnum.getName(String.valueOf(item.get("qrCodeColor")));
+            item.put("name", name);
+            item.put("value", Integer.parseInt(item.get("value").toString()));
+        });
+        return resultList;
+    }
+
+
+    public Page<Map<String, Object>> getPersonYardByPage(String parentCode, Integer current, Integer size) {
+        List<Map<String, Object>> resultList = personBasicMapper.getPersonYardByPage((current - 1) * size, size , parentCode);
+        Integer count = personBasicMapper.getPersonYardByPageCount(parentCode);
+
+        resultList.forEach(item -> {
+            String name = QrcodeColorEnum.getName(String.valueOf(item.get("qrCodeColor")));
+            item.put("name", name);
+        });
+        Page<Map<String, Object>> mapPage = new Page<>();
+        mapPage.setRecords(resultList);
+        mapPage.setCurrent(current);
+        mapPage.setSize(size);
+        mapPage.setTotal(count);
+        return mapPage;
+    }
 }
\ No newline at end of file