diff --git a/ics-admin/src/main/java/com/ics/admin/controller/CustomerController.java b/ics-admin/src/main/java/com/ics/admin/controller/CustomerController.java index 5a55ada..cc26a9e 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/CustomerController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/CustomerController.java @@ -4,7 +4,10 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Maps; import com.ics.admin.domain.Customer; +import com.ics.admin.domain.IcsCustomerStaff; import com.ics.admin.service.ICustomerService; +import com.ics.admin.service.IIcsCustomerStaffService; +import com.ics.common.constant.Constants; import com.ics.common.core.controller.BaseController; import com.ics.common.core.domain.R; import com.ics.common.utils.ValidatorUtils; @@ -32,7 +35,8 @@ public class CustomerController extends BaseController { @Autowired private ICustomerService customerService; - + @Autowired + private IIcsCustomerStaffService icsCustomerStaffService; /** @@ -178,4 +182,31 @@ public class CustomerController extends BaseController { return toAjax(customerService.deleteCustomerByIds(ids)); } -} \ No newline at end of file + + /** + * 查询访客列表 + * @param icsCustomerStaff + * @return + */ + @RequiresPermissions("admin:customer:visit") + @GetMapping("visitList") + public R visitList(IcsCustomerStaff icsCustomerStaff) { + startPage(); + icsCustomerStaff.setDataType(Constants.CUSTOMER_VISIT); + return result(icsCustomerStaffService.selectIcsCustomerStaffList(icsCustomerStaff)); + } + + /** + * 查询企业员工列表 + * @param icsCustomerStaff + * @return + */ + @RequiresPermissions("admin:customer:staff") + @GetMapping("staffList") + public R staffList(IcsCustomerStaff icsCustomerStaff) { + startPage(); + icsCustomerStaff.setDataType(Constants.CUSTOMER_STAFF); + return result(icsCustomerStaffService.selectIcsCustomerStaffList(icsCustomerStaff)); + } + +} diff --git a/ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java b/ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java index c9cdd26..b3c2e4d 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java @@ -84,4 +84,6 @@ public class CustomerStaffController extends BaseController { } + + } diff --git a/ics-web/src/main/java/com/ics/controller/mobile/VisitorApiController.java b/ics-web/src/main/java/com/ics/controller/mobile/VisitorApiController.java index 82f32a4..cd5e692 100644 --- a/ics-web/src/main/java/com/ics/controller/mobile/VisitorApiController.java +++ b/ics-web/src/main/java/com/ics/controller/mobile/VisitorApiController.java @@ -27,7 +27,6 @@ public class VisitorApiController extends BaseController { @GetMapping("list") public R list(IcsCustomerStaff icsCustomerStaff) { startPage(); - icsCustomerStaff.setIcsCustomerId(1L);//临时设置,需要从用户信息中获取 icsCustomerStaff.setDataType(Constants.CUSTOMER_VISIT); return result(icsCustomerStaffService.selectIcsCustomerStaffList(icsCustomerStaff)); } @@ -37,7 +36,6 @@ public class VisitorApiController extends BaseController { */ @PostMapping("save") public R addSave(@RequestBody IcsCustomerStaff icsCustomerStaff) { - icsCustomerStaff.setIcsCustomerId(1L);//临时设置,需要从用户信息中获取 icsCustomerStaff.setCreateTime(new Date()); icsCustomerStaff.setCreateBy(getLoginName()); icsCustomerStaff.setDataType(Constants.CUSTOMER_VISIT);