Merge remote-tracking branch 'origin/master'

qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/QhseVisitorManagementDao.java

@@ -2,6 +2,7 @@ package com.rongwei.bscommon.sys.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rongwei.bsentity.domain.QhseVisitorManagementDo;
+import com.rongwei.bsentity.vo.QhseVisitorManagementVo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
@@ -42,5 +43,23 @@ public interface QhseVisitorManagementDao extends BaseMapper<QhseVisitorManageme
             "  e.code " +
             "</script>")
     List<Map<String, String>> getUserByCodes(@Param("codes") List<String> codes);
+
+
+    @Select("SELECT\n" +
+            "  a.*,b.NAME \"APPROVALSTATUSNAME\"\n" +
+            "FROM\n" +
+            "  qhse_visitor_management a\n" +
+            "  LEFT JOIN sys_dict b ON a.APPROVALSTATUS = b.VALUE and b.DELETED ='0' and b.DICTTYPE ='fk_audit_status'\n" +
+            "WHERE\n" +
+            "  a.DELETED = '0'\n" +
+            "  AND a.MOBILEPHONENUMBER = #{phone}\n" +
+            "  AND TRUNC(a.CREATEDATE) = TRUNC(CURRENT_DATE)\n" +
+            "ORDER BY\n" +
+            "  a.MODIFYDATE DESC")
+    List<QhseVisitorManagementVo> getRecordByPhone(@Param("phone") String phone);
+
+
+    @Select("SELECT count(ID) \"count\" FROM qhse_blacklist WHERE IDNUMBER = #{idNumber} AND DELETED = '0'")
+    int getBlackListByIdNum(@Param("idNumber") String idNumber);
 }
 

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseVisitorManagementService.java

@@ -2,6 +2,7 @@ package com.rongwei.bscommon.sys.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.domain.QhseVisitorManagementDo;
+import com.rongwei.bsentity.vo.QhseVisitorManagementVo;
 import com.rongwei.rwcommon.vo.generalsql.MasterSlaveInsertVo;
 
 import java.util.List;
@@ -19,5 +20,9 @@ public interface QhseVisitorManagementService extends IService<QhseVisitorManage
     void generalMsInsert(MasterSlaveInsertVo masterSlaveInsert);
 
     List<Map<String, String>> getUserByCodes(List<String> codes);
+
+    List<QhseVisitorManagementVo> getRecordByPhone(String phone);
+
+    int getBlackListByIdNum(String idnumber);
 }
 

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseVisitorManagementServiceImpl.java

@@ -5,6 +5,7 @@ import com.rongwei.bscommon.sys.common.fegin.AdminFeginService;
 import com.rongwei.bscommon.sys.dao.QhseVisitorManagementDao;
 import com.rongwei.bscommon.sys.service.QhseVisitorManagementService;
 import com.rongwei.bsentity.domain.QhseVisitorManagementDo;
+import com.rongwei.bsentity.vo.QhseVisitorManagementVo;
 import com.rongwei.rwcommon.vo.generalsql.MasterSlaveInsertVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -27,6 +28,9 @@ public class QhseVisitorManagementServiceImpl extends ServiceImpl<QhseVisitorMan
     @Autowired
     private QhseVisitorManagementDao qhseVisitorManagementDao;
 
+    @Autowired
+    private QhseVisitorManagementService qhseVisitorManagementService;
+
     @Override
     public void generalMsInsert(MasterSlaveInsertVo masterSlaveInsert) {
         adminFeginService.generalMsInsert(masterSlaveInsert);
@@ -36,5 +40,27 @@ public class QhseVisitorManagementServiceImpl extends ServiceImpl<QhseVisitorMan
     public List<Map<String, String>> getUserByCodes(List<String> codes) {
        return qhseVisitorManagementDao.getUserByCodes(codes);
     }
+
+    /**
+     * 查询当天的手机号的访客纪录
+     *
+     * @param phone
+     * @return
+     */
+    @Override
+    public List<QhseVisitorManagementVo> getRecordByPhone(String phone) {
+        return qhseVisitorManagementDao.getRecordByPhone(phone);
+
+    }
+
+    /**
+     * 根据身份证查询 改身份证是否在黑名单中
+     * @param idNumber
+     * @return
+     */
+    @Override
+    public int getBlackListByIdNum(String idNumber) {
+        return qhseVisitorManagementDao.getBlackListByIdNum(idNumber);
+    }
 }
 

qhse-entity/src/main/java/com/rongwei/bsentity/vo/QhseVisitorManagementVo.java

@@ -0,0 +1,13 @@
+package com.rongwei.bsentity.vo;
+
+import com.rongwei.bsentity.domain.QhseVisitorManagementDo;
+import lombok.Data;
+
+@Data
+public class QhseVisitorManagementVo extends QhseVisitorManagementDo {
+
+    /**
+     * 审批状态名称
+     */
+    private String APPROVALSTATUSNAME;
+}

qhse-server/src/main/java/com/rongwei/controller/QhseVisitorManagementController.java

@@ -2,7 +2,9 @@ package com.rongwei.controller;
 
 import com.rongwei.bscommon.sys.service.QhseVisitorManagementService;
 import com.rongwei.bscommon.sys.service.SysPagePartService;
+import com.rongwei.bsentity.domain.QhseVisitorManagementDo;
 import com.rongwei.bsentity.domain.SysPagePartDo;
+import com.rongwei.bsentity.vo.QhseVisitorManagementVo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.rwcommon.vo.generalsql.MasterSlaveInsertVo;
@@ -63,6 +65,7 @@ public class QhseVisitorManagementController  {
 
     @PostMapping("/getUserByCodes")
     public R getUserByCodes(@RequestBody List<String> codes) {
+        logger.info("/getUserByCodes 入参 codes: {}", codes.toString());
         try {
             List<Map<String, String>> userByCodes = qhseVisitorManagementService.getUserByCodes(codes);
             return R.ok(userByCodes);
@@ -72,5 +75,41 @@ public class QhseVisitorManagementController  {
         }
     }
 
+
+    /**
+     *根据手机号获取当天的访客申请纪录
+     * @param
+     * @return
+     */
+    @GetMapping("/getRecordByPhone/{phone}")
+    public R getRecordByPhone(@PathVariable String phone) {
+        logger.info("/getRecordByPhone 入参 phone: {}", phone);
+        try {
+            // 业务逻辑
+            List<QhseVisitorManagementVo> list = qhseVisitorManagementService.getRecordByPhone(phone);
+            return R.ok(list);
+        } catch (Exception e) {
+            logger.error("查询失败: {}", e.getMessage(), e);
+            return R.error(e.getMessage());
+        }
+    }
+
+    /**
+     * 根据身份证号获取 黑名单信息
+     * @param idNumber
+     * @return
+     */
+    @GetMapping("/getBlackListByIdNum/{idNumber}")  // 路径参数
+    public R getBlackListByIdNum(@PathVariable String idNumber) {
+        logger.info("/getBlackListByIdNum 入参 idNumber: {}", idNumber);
+        try {
+            int count = qhseVisitorManagementService.getBlackListByIdNum(idNumber);
+            return R.ok(count);
+        } catch (Exception e) {
+            logger.error("查询失败: {}", e.getMessage(), e);
+            return R.error(e.getMessage());
+        }
+    }
+
 }