diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseNoticePersonController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseNoticePersonController.java index 8c298420..7aa32225 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseNoticePersonController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseNoticePersonController.java @@ -52,6 +52,17 @@ public class PurchaseNoticePersonController extends BaseController { return getDataTable(list); } + /** + * 查询新购短信通知人员列表 + */ + @ApiOperation(value = "查询等待选择的新购短信通知人员列表") + @RequiresPermissions("purchase:person:list") + @GetMapping("/listUnSelected") + public TableDataInfo listUnSelected() { + List list = purchaseNoticePersonService.getUnSelectedUserList(); + return getDataTable(list); + } + /** * 导出新购短信通知人员列表 */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseNoticePerson.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseNoticePerson.java index 93a3efe7..06294b7b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseNoticePerson.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseNoticePerson.java @@ -32,15 +32,25 @@ public class PurchaseNoticePerson extends BaseEntity { @ApiModelProperty(value = "用户名") private String userName; + /** 用户名 */ + @Excel(name = "昵称") + @ApiModelProperty(value = "昵称") + private String nickName; + /** 用户角色名 */ @ApiModelProperty(value = "用户角色名") - private String userRoleName; + private String roleName; /** 联系电话 */ @Excel(name = "联系电话") @ApiModelProperty(value = "联系电话") private String telphone; + /** 所属机构名称 */ + @Excel(name = "所属机构名称") + @ApiModelProperty(value = "所属机构名称") + private String deptName; + /** 任务id */ @ApiModelProperty("任务id") private String taskId; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseNoticePersonMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseNoticePersonMapper.java index f3b2b264..c4dea9ee 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseNoticePersonMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseNoticePersonMapper.java @@ -26,6 +26,13 @@ public interface PurchaseNoticePersonMapper { */ public List selectPurchaseNoticePersonList(PurchaseNoticePerson purchaseNoticePerson); + /** + * 查询等待选择的新购短信通知人员列表 + * + * @return 等待选择的新购短信通知人员列表 + */ + public List getUnSelectedUserList(); + /** * 新增新购短信通知人员 * diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseNoticePersonService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseNoticePersonService.java index 61ac332a..ac85cc6f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseNoticePersonService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseNoticePersonService.java @@ -29,6 +29,13 @@ public interface IPurchaseNoticePersonService { */ public List selectPurchaseNoticePersonList(PurchaseNoticePerson purchaseNoticePerson); + /** + * 查询等待选择的新购短信通知人员列表 + * + * @return 等待选择的新购短信通知人员列表 + */ + public List getUnSelectedUserList(); + /** * 批量发送短信 * @param purchaseNoticePersonDto 短信发送信息dto diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseNoticePersonServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseNoticePersonServiceImpl.java index 0b0328f3..45ddd6ef 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseNoticePersonServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseNoticePersonServiceImpl.java @@ -58,6 +58,16 @@ public class PurchaseNoticePersonServiceImpl implements IPurchaseNoticePersonSer return purchaseNoticePersonMapper.selectPurchaseNoticePersonList(purchaseNoticePerson); } + /** + * 查询等待选择的新购短信通知人员列表 + * + * @return 等待选择的新购短信通知人员列表 + */ + @Override + public List getUnSelectedUserList() { + return purchaseNoticePersonMapper.getUnSelectedUserList(); + } + @Override @Transactional public AjaxResult batchSendSms(PurchaseNoticePersonDto purchaseNoticePersonDto) { diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseNoticePersonMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseNoticePersonMapper.xml index 0ff0e4c2..ac48f69b 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseNoticePersonMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseNoticePersonMapper.xml @@ -7,7 +7,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -17,12 +20,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + +