运维概览人员打卡从idx迁移至 jcs

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirefightersMapper.java

@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.common.api.mapper;
 import java.util.List;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 
 import org.apache.ibatis.annotations.Param;
@@ -52,4 +54,6 @@ public interface FirefightersMapper extends BaseMapper<Firefighters> {
     List<Map<String, Object>> getUsrSignInfoByBizOrgCode(@Param("bizOrgCode") String bizOrgCode);
 
     List<Map<String, Object>> getUserInfoByYJYA(String bizOrgCode);
+
+    IPage<Map<String, Object>> selectSignPersonList(Page page, @Param("bizOrgCode") String bizOrgCode);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFirefightersService.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.common.api.service;
 import java.util.List;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
@@ -40,4 +41,6 @@ public interface IFirefightersService {
     Map<String,Object> getCompanyName(String bizOrgCode);
 
     List<Map<String, Object>> getUserInfoByYJYA(String bizOrgCode);
+
+    IPage<Map<String, Object>> signPersonPageList(int current, int size, String bizOrgCode);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -697,4 +697,27 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
                     ) a
             ) total
     </select>
+
+    <select id="selectSignPersonList" resultType="java.util.Map">
+        SELECT c.biz_org_name,
+               IFNULL(( SELECT field_value FROM cb_dynamic_form_instance dfi WHERE dfi.field_code = 'personImg' AND dfi.instance_id = c.sequence_nbr ), '') AS personImg,
+               IF(cfp.job_title IS NULL OR cfp.job_title = '', NULL, cfp.job_title) job_title,
+               IFNULL( cf.mobile_phone, '' ) telephone,
+               cs.sign_time AS sign_time
+        FROM
+            cb_org_usr c
+                RIGHT JOIN cb_sign cs ON c.sequence_nbr = cs.USER_ID
+                LEFT JOIN cb_firefighters cf ON CONCAT( c.sequence_nbr, '' ) = cf.org_usr_id
+                AND cf.is_delete = 0
+                LEFT JOIN cb_firefighters_post cfp ON cfp.org_usr_id = c.sequence_nbr
+                AND cfp.is_delete = 0
+        WHERE
+            c.sequence_nbr IS NOT NULL
+          AND cs.sign_time LIKE concat( CURRENT_DATE (), '%' )
+          AND c.biz_org_code LIKE concat(#{bizOrgCode},'%')
+        GROUP BY
+            cs.USER_ID
+        ORDER BY
+            cs.sign_time DESC
+    </select>
 </mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersServiceImpl.java

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 import java.util.*;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.*;
@@ -367,4 +369,12 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 	public List<Map<String, Object>> getUserInfoByYJYA(String bizOrgCode) {
 		return firefightersMapper.getUserInfoByYJYA(bizOrgCode);
 	}
+
+	@Override
+	public IPage<Map<String, Object>> signPersonPageList(int current, int size, String bizOrgCode) {
+		Page page = new Page();
+		page.setCurrent(current);
+		page.setSize(size);
+		return firefightersMapper.selectSignPersonList(page, bizOrgCode);
+	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/BigScreenController.java

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -65,4 +66,27 @@ public class BigScreenController extends BaseController {
         }
         return CommonResponseUtil.success(userInfoByYJYA);
     }
+
+    /**
+     * 今日打卡驻站消防队员列表清单--分页【运维概览 页面用】
+     *
+     * @return ResponseModel
+     */
+    @PersonIdentify
+    @GetMapping(value = "/sign-person")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "今日打卡驻站消防队员列表清单", notes = "今今日打卡驻站消防队员列表清单")
+    public ResponseModel signPersonPageList(
+            @ApiParam(value = "当前页", required = true) @RequestParam(value = "current") int current,
+            @ApiParam(value = "页面大小", required = true) @RequestParam(value = "size") int size) {
+        ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        String bizOrgCode = null;
+        if(null != reginParam) {
+            bizOrgCode = reginParam.getPersonIdentity().getBizOrgCode();
+            if (StringUtils.isEmpty(bizOrgCode)) {
+                return CommonResponseUtil.success(null);
+            }
+        }
+        return CommonResponseUtil.success(iFirefightersService.signPersonPageList(current, size, bizOrgCode));
+    }
 }