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 dcd57809..27854fa3 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 @@ -1,6 +1,7 @@ package com.bonus.material.purchase.controller; import java.util.List; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import com.bonus.common.log.enums.OperaType; import com.bonus.material.common.annotation.PreventRepeatSubmit; @@ -26,15 +27,15 @@ import com.bonus.common.core.web.page.TableDataInfo; /** * 新购短信通知人员Controller - * - * @author xsheng - * @date 2024-10-16 + * + * @author syruan */ @Api(tags = "新购短信通知人员接口") @RestController @RequestMapping("/purchase_notice_person") public class PurchaseNoticePersonController extends BaseController { - @Autowired + + @Resource private IPurchaseNoticePersonService purchaseNoticePersonService; /** @@ -89,13 +90,29 @@ public class PurchaseNoticePersonController extends BaseController { } } + /** + * 批量新增--新购短信通知人员 + */ + @ApiOperation(value = "批量新增新购短信通知人员") + @PreventRepeatSubmit + @RequiresPermissions("purchase:person:add") + @SysLog(title = "批量新增新购短信通知人员", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->批量新增新购短信通知人员") + @PostMapping("/batchAddNoticePerson") + public AjaxResult batchAddNoticePerson(@RequestBody List purchaseNoticePersonList) { + try { + return toAjax(purchaseNoticePersonService.insertBatchPurchaseNoticePerson(purchaseNoticePersonList)); + } catch (Exception e) { + return error("系统错误, " + e.getMessage()); + } + } + /** * 修改新购短信通知人员 */ @ApiOperation(value = "修改新购短信通知人员") @PreventRepeatSubmit @RequiresPermissions("purchase:person:edit") - @SysLog(title = "新购短信通知人员", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改新购短信通知人员") + @SysLog(title = "新购短信通知人员", businessType = OperaType.UPDATE, module = "仓储管理->修改新购短信通知人员") @PutMapping public AjaxResult edit(@RequestBody PurchaseNoticePerson purchaseNoticePerson) { try { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java index 96498bb7..6f2acd88 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java @@ -30,6 +30,9 @@ public class PurchaseCheckInfo extends BaseEntity { @ApiModelProperty(value = "任务状态") private String taskStatus; + @ApiModelProperty(value = "采购单号") + private String code; + /** 采购日期 */ @ApiModelProperty(value = "采购日期") @JsonFormat(pattern = "yyyy-MM-dd") @@ -64,4 +67,7 @@ public class PurchaseCheckInfo extends BaseEntity { @ApiModelProperty(value = "采购数量--外层Table字段") private String purchaseMaNumber; + @ApiModelProperty(value = "操作人名称") + private String createUserName; + } 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 ed50a9d5..ad7612fd 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,6 +32,10 @@ public class PurchaseNoticePerson extends BaseEntity { @ApiModelProperty(value = "用户名") private String userName; + /** 用户角色名 */ + @ApiModelProperty(value = "用户角色名") + private String userRoleName; + /** 联系电话 */ @Excel(name = "联系电话") @ApiModelProperty(value = "联系电话") 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 9d8ee7e7..f3b2b264 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 @@ -34,6 +34,14 @@ public interface PurchaseNoticePersonMapper { */ public int insertPurchaseNoticePerson(PurchaseNoticePerson purchaseNoticePerson); + /** + * 批量新购短信通知人员 + * + * @param purchaseNoticePersonList 新购短信通知人员集合 + * @return 结果 + */ + int insertBatchPurchaseNoticePerson(List purchaseNoticePersonList); + /** * 修改新购短信通知人员 * 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 5d6d1b68..f9799d6e 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 @@ -34,6 +34,14 @@ public interface IPurchaseNoticePersonService { */ public int insertPurchaseNoticePerson(PurchaseNoticePerson purchaseNoticePerson); + /** + * 批量新增新购短信通知人员 + * + * @param purchaseNoticePersonList 新购短信通知人员集合 + * @return 结果 + */ + int insertBatchPurchaseNoticePerson(List purchaseNoticePersonList); + /** * 修改新购短信通知人员 * diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index 6270cf0e..81a62df9 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -64,7 +64,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { @Override public List selectPurchaseCheckInfoList(PurchaseCheckInfo purchaseCheckInfoDto) { // 查询新购info列表 - List purchaseCheckInfos = purchaseCheckInfoMapper.selectPurchaseCheckInfoList(purchaseCheckInfoDto); + List purchaseCheckInfos = purchaseCheckInfoMapper.selectPurchaseCheckInfoJoinList(purchaseCheckInfoDto); // 过滤info列表中空的对象 purchaseCheckInfos.removeIf(purchaseCheckInfo -> purchaseCheckInfo.getTaskId() == null); 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 ae3c689b..1f04a425 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,21 @@ public class PurchaseNoticePersonServiceImpl implements IPurchaseNoticePersonSer } } + /** + * 批量新增新购短信通知人员 + * + * @param purchaseNoticePersonList 新购短信通知人员集合 + * @return 结果 + */ + @Override + public int insertBatchPurchaseNoticePerson(List purchaseNoticePersonList) { + try { + return purchaseNoticePersonMapper.insertBatchPurchaseNoticePerson(purchaseNoticePersonList); + } catch (Exception e) { + throw new RuntimeException("批量新增执行SQL错误:" + e.getMessage()); + } + } + /** * 修改新购短信通知人员 * diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml index 03042160..40a0da1c 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml @@ -6,10 +6,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -30,10 +32,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select pci.id, pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.create_by, pci.create_time, pci.update_by, pci.update_time, pci.remark, pci.company_id, - t.task_status, t.task_type + t.task_status, t.task_type, t.code, su.user_name as create_user_name from purchase_check_info pci left join tm_task t on t.task_id = pci.task_id + left join sys_user su ON pci.create_by = su.user_id