外来人员

huimv-admin/src/main/java/com/huimv/admin/controller/SysAccountMultilevelController.java

@@ -156,4 +156,9 @@ public class SysAccountMultilevelController {
                              @RequestParam(value = "papersCode", required = false) String papersCode) throws IOException {
         return accountMultilevelService.updateUser(httpServletRequest,img,userName,phone,workPost,workLocation,workLocationId,workName,papersType,papersCode);
     }
+
+    @PostMapping("/getDetail")
+    public Result getDetail(HttpServletRequest httpServletRequest){
+        return new Result(ResultCode.SUCCESS,accountMultilevelService.getById(TokenSign.getMemberIdByJwtToken(httpServletRequest)) )
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/service/impl/BillPersonnelAdmissionServiceImpl.java

@@ -181,8 +181,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         String id = paramsMap.get("id");
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         BillPersonnelAdmission billPersonnelAdmission = billPersonnelAdmissionMapper.selectById(id);
-//        Integer userType = TokenSign.getUserTypeByJwtToken(httpServletRequest);
-        Integer userType = 3;
+        Integer userType = TokenSign.getUserTypeByJwtToken(httpServletRequest);
         billPersonnelAdmission.setPassDate(LocalDateTime.now());
         billPersonnelAdmission.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
         billPersonnelAdmission.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));

huimv-admin/src/main/resources/com/huimv/admin/mapper/BillPersonnelAdmissionMapper.xml

@@ -27,7 +27,7 @@
         <result column="process_id" property="processId" />
     </resultMap>
     <select id="listAll" resultType="com.huimv.admin.entity.vo.FactoryDirectorVo">
-        SELECT id,admission_user_name AS 'userName', bill_status, isolate_location, isolate_start_date AS 'startTime', isolate_end_date AS 'endTime', NULL AS check_date, NULL AS test_location, NULL AS vistit_type, NULL AS dest_name, NULL AS vistit_date,3 AS 'type'
+        SELECT id,admission_user_name AS 'userName', bill_status, isolate_location, isolate_start_date AS check_date, isolate_start_date AS 'startTime', isolate_end_date AS 'endTime', NULL AS test_location, NULL AS vistit_type, NULL AS dest_name, NULL AS vistit_date,3 AS 'type'
 FROM bill_isolate WHERE farm_id = #{farmId} AND vistit_type = #{type}
 
 UNION ALL