1.地铁盘查7.27更新

src/main/java/com/metro/entity/ro/passrecords/SelectPassreCordsPageListReq.java

@@ -42,4 +42,7 @@ public class SelectPassreCordsPageListReq extends BaseEntity implements Serializ
 
     @ApiModelProperty(value = "安检口")
     private String branchId;
+
+    @ApiModelProperty(value = "民警账号",hidden = true)
+    private String staffCardId;
 }

src/main/java/com/metro/entity/search/WarningSearch.java

@@ -35,4 +35,7 @@ public class WarningSearch extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "安检口")
     private String branchId;
+
+    @ApiModelProperty(value = "民警账号",hidden = true)
+    private String staffCardId;
 }

src/main/java/com/metro/service/impl/PassreCordsServiceImpl.java

@@ -71,8 +71,7 @@ public class PassreCordsServiceImpl extends BaseService implements PassreCordsSe
     public IPage<SelectPassreCordsPageListResp> page(SelectPassreCordsPageListReq req) {
         JPersonVO userInfo = jPersonsService.getUserInfo();
         if(userInfo.getType() == 3){
-            req.setBranchId(userInfo.getBranchId());
-            req.setCompanyId(userInfo.getCompanyId());
+            req.setStaffCardId(userInfo.getCardId());
         } else if (userInfo.getType() == 2) {
             req.setCompanyId(userInfo.getCompanyId());
         }
@@ -118,8 +117,7 @@ public class PassreCordsServiceImpl extends BaseService implements PassreCordsSe
     public IPage<WarningVO> warningPageList(WarningSearch warningSearch) {
         JPersonVO userInfo = jPersonsService.getUserInfo();
         if(userInfo.getType() == 3){
-            warningSearch.setBranchId(userInfo.getBranchId());
-            warningSearch.setCompanyId(userInfo.getCompanyId());
+            warningSearch.setStaffCardId(userInfo.getCardId());
         } else if (userInfo.getType() == 2) {
             warningSearch.setCompanyId(userInfo.getCompanyId());
         }
@@ -311,16 +309,20 @@ public class PassreCordsServiceImpl extends BaseService implements PassreCordsSe
         }
 
         JPersonVO userInfo = jPersonsService.getUserInfo();
-        if(StringUtils.isNotEmpty(userInfo.getCompanyId())){
-            wrapper.eq(PassreCords::getCompanyId, userInfo.getCompanyId());
-            if(StringUtils.isNotEmpty(userInfo.getBranchId())){
-                wrapper.eq(PassreCords::getBranchId, userInfo.getBranchId());
+        if(userInfo.getType() != 3){
+            if(StringUtils.isNotEmpty(userInfo.getCompanyId())){
+                wrapper.eq(PassreCords::getCompanyId, userInfo.getCompanyId());
+                if(StringUtils.isNotEmpty(userInfo.getBranchId())){
+                    wrapper.eq(PassreCords::getBranchId, userInfo.getBranchId());
+                }
             }
         }
+
         wrapper.like(StringUtils.isNotEmpty(req.getXm()), PassreCords::getXm, req.getXm());
         wrapper.eq(StringUtils.isNotEmpty(req.getCompanyId()), PassreCords::getCompanyId, req.getCompanyId());
         wrapper.eq(StringUtils.isNotEmpty(req.getBranchId()), PassreCords::getBranchId, req.getBranchId());
         wrapper.eq(StringUtils.isNotEmpty(req.getCardId()), PassreCords::getCardId, req.getCardId());
+        wrapper.eq(StringUtils.isNotEmpty(req.getStaffCardId()), PassreCords::getStaffCardId, req.getStaffCardId());
         wrapper.eq(StringUtils.isNotEmpty(req.getPhone()), PassreCords::getPhone, req.getPhone());
         wrapper.eq(req.getPass() != null, PassreCords::getPass, req.getPass());
         wrapper.gt(StringUtils.isNotEmpty(req.getStartTime()), PassreCords::getPassTime, req.getStartTime());

src/main/java/com/metro/service/job/AdminDataShowTodayTask.java

@@ -58,13 +58,13 @@ public class AdminDataShowTodayTask {
 
             /*2.获取数据库中，今日0点之后的数据*/
             Integer todayNumber = 0;//今日盘查人数
-            Integer todayWarningNumber = 0;//今日异常人数
+            Integer todayExceptionNumber = 0;//今日异常人数
             Integer todayDoubtNumber = 0;//今日存疑人数
             Integer todayArrestNumber = 0;//今日抓捕人数
             todayNumber = passreCordsLessVOS.stream().mapToInt(PassreCordsLessVO::getNumber).sum();
             todayDoubtNumber = passreCordsLessVOS.stream().filter(p -> p.getPass() == 1 /*|| p.getPass() == 3*/).mapToInt(PassreCordsLessVO::getNumber).sum();
             todayArrestNumber = passreCordsLessVOS.stream().filter(p -> p.getPass() == 0).mapToInt(PassreCordsLessVO::getNumber).sum();
-            int totalWarningNumber = passreCordsLessVOS.stream().filter(p -> p.getPass() == 3).mapToInt(PassreCordsLessVO::getNumber).sum();
+            todayExceptionNumber = passreCordsLessVOS.stream().filter(p -> p.getPass() == 3).mapToInt(PassreCordsLessVO::getNumber).sum();
 
             DataShow dataShow5 = selectByCompanyIdAndType(company, DataShowTopEnum.TODAY_NUMBER.getType());
             DataShow dataShow6 = selectByCompanyIdAndType(company, DataShowTopEnum.TODAY_EXCEPTION_NUMBER.getType());
@@ -72,7 +72,7 @@ public class AdminDataShowTodayTask {
             DataShow dataShow8 = selectByCompanyIdAndType(company, DataShowTopEnum.TODAY_ARREST_NUMBER.getType());
 
             DataShowEdit(dataShow5,DataShowTopEnum.TODAY_NUMBER.getType(),todayNumber,company);
-            DataShowEdit(dataShow6,DataShowTopEnum.TODAY_EXCEPTION_NUMBER.getType(),todayWarningNumber,company);
+            DataShowEdit(dataShow6,DataShowTopEnum.TODAY_EXCEPTION_NUMBER.getType(),todayExceptionNumber,company);
             DataShowEdit(dataShow7,DataShowTopEnum.TODAY_DOUBT_NUMBER.getType(),todayDoubtNumber,company);
             DataShowEdit(dataShow8,DataShowTopEnum.TODAY_ARREST_NUMBER.getType(),todayArrestNumber,company);
 

src/main/resources/mapper/PassreCordsMapper.xml

@@ -21,6 +21,9 @@
             <if test="warningSearch.cardId !=null and warningSearch.cardId !=''">
                 and card_id = #{warningSearch.cardId}
             </if>
+            <if test="warningSearch.staffCardId !=null and warningSearch.staffCardId !=''">
+                and staff_card_id = #{warningSearch.staffCardId}
+            </if>
             <if test="warningSearch.phone !=null and warningSearch.phone !=''">
                 and phone = #{warningSearch.phone}
             </if>

src/main/resources/mapper/WarFruitMapper.xml

@@ -28,6 +28,9 @@
         <if test="policeSearch.endTime !=null and policeSearch.endTime !=''">
             AND  <![CDATA[ b.date <= #{policeSearch.endTime}]]>
         </if>
+        <if test="policeSearch.cardId != null and policeSearch.cardId != '' ">
+            AND  p.card_id = #{policeSearch.cardId}
+        </if>
         GROUP BY p.card_id
         ORDER BY number desc
     </select>