diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java index d154ae60..2aa046a9 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java @@ -72,21 +72,22 @@ public class PurchaseCheckDetails extends BaseEntity { private Long bindNum; /** 验收结论 */ - @Excel(name = "验收结论") + //@Excel(name = "验收结论") @ApiModelProperty(value = "验收结论") private String checkResult; /** 物资厂家id */ - @Excel(name = "物资厂家id") + //@Excel(name = "物资厂家id") @ApiModelProperty(value = "物资厂家id") private Long supplierId; /** 物资厂家名称 */ @ApiModelProperty(value = "物资厂家名称") + @Excel(name = "物资厂家名称") private String supplierName; /** 0-未验收,1-已验收,2-待通知,3-验收不通过,4-已入库,5-入库驳回,6-综合服务中心审核通过,7-综合服务中心不通过 */ - @Excel(name = "0-未验收,1-已验收,2-待通知,3-验收不通过,4-已入库,5-入库驳回,6-综合服务中心审核通过,7-综合服务中心不通过") + //@Excel(name = "0-未验收,1-已验收,2-待通知,3-验收不通过,4-已入库,5-入库驳回,6-综合服务中心审核通过,7-综合服务中心不通过") @ApiModelProperty(value = "0-未验收,1-已验收,2-待通知,3-验收不通过,4-已入库,5-入库驳回,6-综合服务中心审核通过,7-综合服务中心不通过") private Integer status; @@ -97,12 +98,12 @@ public class PurchaseCheckDetails extends BaseEntity { private Date productionTime; /** 验收图片 */ - @Excel(name = "验收图片") + //@Excel(name = "验收图片") @ApiModelProperty(value = "验收图片") private String checkUrlName; /** 验收图片名称 */ - @Excel(name = "验收图片名称") + //@Excel(name = "验收图片名称") @ApiModelProperty(value = "验收图片名称") private String checkUrl; @@ -123,17 +124,17 @@ public class PurchaseCheckDetails extends BaseEntity { private Date inputTime; /** 验收附件名称 */ - @Excel(name = "验收附件名称") + //@Excel(name = "验收附件名称") @ApiModelProperty(value = "验收附件名称") private String fileName; /** 验收附件 */ - @Excel(name = "验收附件") + //@Excel(name = "验收附件") @ApiModelProperty(value = "验收附件") private String fileUrl; /** 数据所属组织 */ - @Excel(name = "数据所属组织") + //@Excel(name = "数据所属组织") @ApiModelProperty(value = "数据所属组织") private Long companyId; @@ -142,7 +143,7 @@ public class PurchaseCheckDetails extends BaseEntity { private String fixCode; /** 验收附件列表 */ - @Excel(name = "验收附件列表") + //@Excel(name = "验收附件列表") @ApiModelProperty(value = "验收附件列表") private List bmFileInfos; } 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 9bd53852..c21e32ed 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 @@ -42,7 +42,6 @@ public class PurchaseCheckInfo extends BaseEntity { /** 采购日期 */ @ApiModelProperty(value = "采购日期") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @Excel(name = "采购日期", width = 30, dateFormat = "yyyy-MM-dd") private Date purchaseTime; /** 到货日期 */ @@ -69,7 +68,6 @@ public class PurchaseCheckInfo extends BaseEntity { /** 数据所属组织 */ @Excel(name = "数据所属组织") - @ApiModelProperty(value = "数据所属组织") private Long companyId; /** 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 97b39737..b46d7e61 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 @@ -73,7 +73,7 @@ public class PurchaseNoticePersonServiceImpl implements IPurchaseNoticePersonSer public AjaxResult batchSendSms(PurchaseNoticePersonDto purchaseNoticePersonDto) { String splitPhoneNumber = String.join(",", purchaseNoticePersonDto.getPhoneNumbers()); try { - String sendResult = SmsUtils.smsToken(splitPhoneNumber, purchaseNoticePersonDto.getContent(), null); + String sendResult = SmsUtils.smsToken(splitPhoneNumber, purchaseNoticePersonDto.getContent(), "60"); if (sendResult != null) { // 发送短信后修改任务状态 tmTaskMapper.updateTmTask(new TmTask() diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml index 149d0326..2a983551 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml @@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -260,17 +260,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + task_id = #{taskId} + - select count(1) from purchase_check_details