根据手机号获取当天的访客申请纪录添加审批状态数据字典名称返回

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;
 
@@ -45,15 +46,17 @@ public interface QhseVisitorManagementDao extends BaseMapper<QhseVisitorManageme
 
 
     @Select("SELECT\n" +
-            "  *\n" +
+            "  a.*,b.NAME \"APPROVALSTATUSNAME\"\n" +
             "FROM\n" +
-            "  qhse_visitor_management\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" +
-            "  DELETED = '0'\n" +
-            "  AND MOBILEPHONENUMBER = #{phone}\n" +
-            "  AND TRUNC(CREATEDATE) = TRUNC(CURRENT_DATE)\n" +
-            "  ORDER BY MODIFYDATE DESC")
-    List<QhseVisitorManagementDo> getRecordByPhone(@Param("phone") String phone);
+            "  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'")

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;
@@ -20,7 +21,7 @@ public interface QhseVisitorManagementService extends IService<QhseVisitorManage
 
     List<Map<String, String>> getUserByCodes(List<String> codes);
 
-    List<QhseVisitorManagementDo> getRecordByPhone(String phone);
+    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;
@@ -47,7 +48,7 @@ public class QhseVisitorManagementServiceImpl extends ServiceImpl<QhseVisitorMan
      * @return
      */
     @Override
-    public List<QhseVisitorManagementDo> getRecordByPhone(String phone) {
+    public List<QhseVisitorManagementVo> getRecordByPhone(String phone) {
         return qhseVisitorManagementDao.getRecordByPhone(phone);
 
     }

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

@@ -4,6 +4,7 @@ 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;
@@ -85,7 +86,7 @@ public class QhseVisitorManagementController  {
         logger.info("/getRecordByPhone 入参 phone: {}", phone);
         try {
             // 业务逻辑
-            List<QhseVisitorManagementDo> list = qhseVisitorManagementService.getRecordByPhone(phone);
+            List<QhseVisitorManagementVo> list = qhseVisitorManagementService.getRecordByPhone(phone);
             return R.ok(list);
         } catch (Exception e) {
             logger.error("查询失败: {}", e.getMessage(), e);