add 工作组-成员 增加标签
This commit is contained in:
@@ -0,0 +1,2 @@
|
||||
ALTER TABLE `pay_working_group_subitem`
|
||||
ADD COLUMN `label` varchar(50) NULL COMMENT '标签' AFTER `no_tax_amount`;
|
||||
+27
@@ -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<PayWorkingG
|
||||
return Result.OK("文件导入成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置标签
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "设置标签",operateType = 2)
|
||||
//@RequiresPermissions("")
|
||||
@PostMapping(value = "/setLabel")
|
||||
@ApiOperation(value = "工作组成员-设置标签")
|
||||
public Result<?> 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("设置标签成功!");
|
||||
}
|
||||
}
|
||||
|
||||
+4
@@ -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;
|
||||
}
|
||||
|
||||
+5
-1
@@ -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
|
||||
<where>
|
||||
@@ -64,6 +65,9 @@
|
||||
<if test="payWorkingGroupSubItem.pack != null">
|
||||
and pack = #{payWorkingGroupSubItem.pack}
|
||||
</if>
|
||||
<if test="payWorkingGroupSubItem.label != null and payWorkingGroupSubItem.label != ''">
|
||||
and label LIKE concat('%',#{payWorkingGroupSubItem.label},'%')
|
||||
</if>
|
||||
</where>
|
||||
GROUP BY pwgs.id
|
||||
ORDER BY pwgs.create_time desc
|
||||
|
||||
+5
@@ -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<PayWorkingGroup
|
||||
|
||||
|
||||
IPage<PayWorkingGroupSubItem> publishReminderList(Page<PayWorkingGroupSubItem> page, PayWorkingGroupSubItem payWorkingGroupSubItem);
|
||||
|
||||
void setLabel(SetLabelVO setLabelVO);
|
||||
|
||||
void deleteLabel(SetLabelVO setLabelVO);
|
||||
}
|
||||
|
||||
+20
@@ -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<PayWorkingGro
|
||||
return payWorkingGroupSubItemIPage;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setLabel(SetLabelVO setLabelVO) {
|
||||
String subIds = setLabelVO.getSubIds();
|
||||
String label = setLabelVO.getLabel();
|
||||
LambdaUpdateWrapper<PayWorkingGroupSubItem> 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<PayWorkingGroupSubItem> updateWrapper = new LambdaUpdateWrapper<>();
|
||||
updateWrapper.in(PayWorkingGroupSubItem::getId,Arrays.asList(subIds.split(",")));
|
||||
updateWrapper.set(PayWorkingGroupSubItem::getLabel,null);
|
||||
payWorkingGroupSubItemMapper.update(null, updateWrapper);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description 删除项目打包关联,临时企业、联系信息
|
||||
* @Author lqt
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
+4
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user