diff --git a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/dto/visitor/app/VisitorsAppDTO.java b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/dto/visitor/app/VisitorsAppDTO.java index c62af4d1f..deed018df 100644 --- a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/dto/visitor/app/VisitorsAppDTO.java +++ b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/dto/visitor/app/VisitorsAppDTO.java @@ -43,7 +43,7 @@ public class VisitorsAppDTO { * 描述 */ @Schema(description="描述") - private String description; + private String reasonValue; /** diff --git a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/dto/visitor/app/VisitorsYYAppDTO.java b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/dto/visitor/app/VisitorsYYAppDTO.java index fc800178c..e80363b59 100644 --- a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/dto/visitor/app/VisitorsYYAppDTO.java +++ b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/dto/visitor/app/VisitorsYYAppDTO.java @@ -43,7 +43,7 @@ public class VisitorsYYAppDTO { * 描述 */ @Schema(description="描述") - private String description; + private String reasonValue; /** diff --git a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/visitor/app/VisitorsAppPageVo.java b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/visitor/app/VisitorsAppPageVo.java index b34733b79..2ac800404 100644 --- a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/visitor/app/VisitorsAppPageVo.java +++ b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/visitor/app/VisitorsAppPageVo.java @@ -41,7 +41,7 @@ public class VisitorsAppPageVo { * 描述 */ @Schema(description="拜访原因") - private String description; + private String reasonValue; /** * 审核状态 diff --git a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/visitor/app/VisitorsAppVo.java b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/visitor/app/VisitorsAppVo.java index 197e8b360..2f1d6484b 100644 --- a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/visitor/app/VisitorsAppVo.java +++ b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/visitor/app/VisitorsAppVo.java @@ -49,7 +49,7 @@ public class VisitorsAppVo{ * 描述 */ @Schema(description="描述") - private String description; + private String reasonValue; /** * 审核状态 @@ -67,7 +67,7 @@ public class VisitorsAppVo{ * 接待人 */ @Schema(description="接待人") - private Long userName; + private String userName; /** * 车牌号id @@ -105,6 +105,9 @@ public class VisitorsAppVo{ private String isDrive; + private String isOtherPeople; + + /** * 审核原因 */ diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/VisitorsController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/VisitorsController.java index 88cdfef2b..591ee2f48 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/VisitorsController.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/VisitorsController.java @@ -149,8 +149,8 @@ public class VisitorsController { * @return R */ @Operation(summary = "通过token查询" , description = "通过token查询" ) - @GetMapping("/app/get/{token}" ) - public R getByToken(@PathVariable("token" ) String token) { + @GetMapping("/app/get/visitorDetail" ) + public R getByToken(@RequestParam("token") String token) { return R.ok(visitorsService.getByToken(token)); } @@ -161,8 +161,8 @@ public class VisitorsController { * @return R */ @Operation(summary = "通过token查询" , description = "通过token查询" ) - @GetMapping("/app/check/{token}" ) - public R checkByToken(@PathVariable("token" ) String token) { + @PostMapping("/app/verify" ) + public R checkByToken(@RequestParam("token" ) String token) { LambdaQueryWrapper visitorsEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); visitorsEntityLambdaQueryWrapper.eq(VisitorsEntity::getToken,token); diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/VisitorsEntity.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/VisitorsEntity.java index 9b1127655..46babceea 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/VisitorsEntity.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/VisitorsEntity.java @@ -50,8 +50,8 @@ public class VisitorsEntity extends Model { /** * 描述 */ - @Schema(description="描述") - private String description; + @Schema(description="拜访原因") + private String reasonValue; /** * 审核状态 diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/VisitorsMapper.xml b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/VisitorsMapper.xml index ac2ef3eca..4c2b4e682 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/VisitorsMapper.xml +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/VisitorsMapper.xml @@ -8,7 +8,7 @@ - +