From aaa5f2096099d9a8b912ba0072635782556792cb Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 12 Jul 2023 16:08:50 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E5=B7=A5=E4=BD=9C=E7=BB=84-=E6=88=90?= =?UTF-8?q?=E5=91=98=20=E5=A2=9E=E5=8A=A0=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/23年7月.sql | 2 ++ .../PayWorkingGroupSubItemController.java | 27 +++++++++++++++++++ .../entity/PayWorkingGroupSubItem.java | 4 +++ .../xml/PayWorkingGroupSubItemMapper.xml | 6 ++++- .../IPayWorkingGroupSubItemService.java | 5 ++++ .../PayWorkingGroupSubItemServiceImpl.java | 20 ++++++++++++++ .../java/com/jero/project/vo/SetLabelVO.java | 20 ++++++++++++++ .../vo/excel/PayWorkingGroupSubItemExcel.java | 4 +++ 8 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 db/23年7月.sql create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/vo/SetLabelVO.java diff --git a/db/23年7月.sql b/db/23年7月.sql new file mode 100644 index 00000000..4b8d9a9d --- /dev/null +++ b/db/23年7月.sql @@ -0,0 +1,2 @@ +ALTER TABLE `pay_working_group_subitem` + ADD COLUMN `label` varchar(50) NULL COMMENT '标签' AFTER `no_tax_amount`; \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index 575e298a..30b0ddc6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -43,6 +43,7 @@ import com.jero.project.service.IPayWorkingGroupService; import com.jero.project.service.IPayWorkingGroupSubItemContactsService; import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.project.vo.SetChargeInput; +import com.jero.project.vo.SetLabelVO; import com.jero.project.vo.excel.PayWorkingGroupSubItemExcel; import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.service.IPayContactsManagementTemporaryService; @@ -731,5 +732,31 @@ public class PayWorkingGroupSubItemController extends JeroController setLabel(@RequestBody SetLabelVO setLabelVO) { + payWorkingGroupSubItemService.setLabel(setLabelVO); + return Result.OK("设置标签成功！"); + } + /** + * 删除标签 + * + * @return + */ + @AutoLog(value = "删除标签",operateType = 2) + //@RequiresPermissions("") + @PostMapping(value = "/deleteLabel") + @ApiOperation(value = "工作组成员-删除标签") + public Result deleteLabel(@RequestBody SetLabelVO setLabelVO) { + payWorkingGroupSubItemService.deleteLabel(setLabelVO); + return Result.OK("设置标签成功！"); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java index 00f95412..64d73961 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java @@ -575,4 +575,8 @@ public class PayWorkingGroupSubItem implements Serializable { @ApiModelProperty(value = "未税金额") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal noTaxAmount; + + @Excel(name = "标签", width = 15) + @ApiModelProperty(value = "标签") + private String label; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml index 433adc84..24e58bea 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml @@ -43,7 +43,8 @@ pwgs.update_by AS updateBy, pwgs.tax, pwgs.tax_rate, - pwgs.no_tax_amount + pwgs.no_tax_amount, + pwgs.label FROM pay_working_group_subitem pwgs LEFT JOIN pay_payment_record ppr ON ppr.project_id = pwgs.id @@ -64,6 +65,9 @@ and pack = #{payWorkingGroupSubItem.pack} + + and label LIKE concat('%',#{payWorkingGroupSubItem.label},'%') + GROUP BY pwgs.id ORDER BY pwgs.create_time desc diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java index b6ee4b86..a98157ae 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java @@ -8,6 +8,7 @@ import com.jero.project.entity.PayWorkGroupSubletStatistics; import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.entity.PayWorkingGroupSubletSearch; import com.jero.project.vo.SetChargeInput; +import com.jero.project.vo.SetLabelVO; import com.jero.statistics.entity.AllMoney; import javax.servlet.http.HttpServletRequest; @@ -118,4 +119,8 @@ public interface IPayWorkingGroupSubItemService extends IService publishReminderList(Page page, PayWorkingGroupSubItem payWorkingGroupSubItem); + + void setLabel(SetLabelVO setLabelVO); + + void deleteLabel(SetLabelVO setLabelVO); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java index 6388cf01..a41db5bb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java @@ -46,6 +46,7 @@ import com.jero.project.service.IPayWorkingGroupService; import com.jero.project.service.IPayWorkingGroupSubItemContactsService; import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.project.vo.SetChargeInput; +import com.jero.project.vo.SetLabelVO; import com.jero.statistics.entity.AllMoney; import com.jero.temporary.entity.PayCompanyManagementTemporary; import com.jero.temporary.entity.PayContactsManagementTemporary; @@ -1009,6 +1010,25 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.in(PayWorkingGroupSubItem::getId,Arrays.asList(subIds.split(","))); + updateWrapper.set(PayWorkingGroupSubItem::getLabel,label); + payWorkingGroupSubItemMapper.update(null, updateWrapper); + } + + @Override + public void deleteLabel(SetLabelVO setLabelVO) { + String subIds = setLabelVO.getSubIds(); + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.in(PayWorkingGroupSubItem::getId,Arrays.asList(subIds.split(","))); + updateWrapper.set(PayWorkingGroupSubItem::getLabel,null); + payWorkingGroupSubItemMapper.update(null, updateWrapper); + } + /** * @Description 删除项目打包关联，临时企业、联系信息 * @Author lqt diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/SetLabelVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/SetLabelVO.java new file mode 100644 index 00000000..5910a2f4 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/SetLabelVO.java @@ -0,0 +1,20 @@ +package com.jero.project.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @author liJiaRao + * @date 2023-07-12 15:16 + */ +@Data +public class SetLabelVO { + @NotBlank(message = "至少选择一个成员") + @ApiModelProperty(value = "成员ids") + private String subIds; + + @ApiModelProperty(value = "标签") + private String label; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java index 4bd92799..43833878 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java @@ -291,4 +291,8 @@ public class PayWorkingGroupSubItemExcel implements Serializable { @Excel(name = "联系人10备注", width = 15) @ApiModelProperty(value = "联系人10备注") private String remarksTen; + + @Excel(name = "标签", width = 15) + @ApiModelProperty(value = "标签") + private String label; }