工作组成员功能开发

This commit is contained in:
梁琦涛
2021-09-01 18:49:26 +08:00
parent d5516a244a
commit 0958d4c432
6 changed files with 219 additions and 41 deletions
@@ -80,6 +80,25 @@ public class JeroController<T, S extends IService<T>> {
return mv;
}
/**
* 导出excel
*
* @param
*/
protected ModelAndView exportListXls(List<T> object, Class<T> clazz, String title) {
// Step.3 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
mv.addObject(NormalExcelConstants.FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下
mv.addObject(NormalExcelConstants.CLASS, clazz);
//update-begin--Author:liusq Date:20210126 for:图片导出报错,ImageBasePath未设置--------------------
ExportParams exportParams=new ExportParams(title, title);
exportParams.setImageBasePath(upLoadPath);
//update-end--Author:liusq Date:20210126 for:图片导出报错,ImageBasePath未设置----------------------
mv.addObject(NormalExcelConstants.PARAMS,exportParams);
mv.addObject(NormalExcelConstants.DATA_LIST, null);
return mv;
}
/**
* 根据权限导出excel,传入导出字段参数
*
@@ -2,9 +2,13 @@ package com.jero.project.VO;
import com.jero.project.entity.PayWorkingGroup;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class PayWorkingGroupVO extends PayWorkingGroup implements Serializable {
private PayWorkingGroupPayment obj;
}
@@ -52,7 +52,7 @@ public class PayProjectCommon {
*/
public final static String PROJECT_TYPE1 = "1";
/**
*
* 工作组项目
*/
public final static String PROJECT_TYPE2 = "2";
/**
@@ -60,7 +60,6 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
private IPayPaymentRecordService payPaymentRecordService;
@Autowired
private IPayMailBillService payMailBillService;
/**
* 分页列表查询
*
@@ -160,8 +159,6 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
}
payCompanyManagementTemporaryService.removeById(payCommonProjectOld.getChargeCompanyId());
payContactsManagementTemporaryService.removeByIds(Arrays.asList(payCommonProjectOld.getContactsId(),payCommonProjectOld.getMailContactsId()));
payCommonProject.setChargeCompanyId(payCommonProject.getChargeCompanyId());
payCommonProject.setContactsId(payCommonProject.getContactsId());
payCommonProjectService.updateById(payCommonProject);
return Result.OK("编辑成功!");
}
@@ -262,10 +259,10 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
JSONObject json = new JSONObject();
json.put("project",payCommonProject);
// 企业信息
PayCompanyManagementTemporary payCompanyManagementTemporary = payCompanyManagementTemporaryService.getById(payCommonProject.getChargeCompanyId());
PayCompanyManagementTemporary payCompanyManagementTemporary = payCompanyManagementTemporaryService.getById(payCommonProject.getChargeCompanyTemporaryId());
json.put("company",payCompanyManagementTemporary);
// 联系人信息c
PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(payCommonProject.getContactsId());
PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(payCommonProject.getContactsTemporaryId());
json.put("contacts",payContactsManagementTemporary);
// 到账信息
LambdaQueryWrapper<PayPaymentRecord> queryWrapperPayPaymentRecord = new LambdaQueryWrapper<>();
@@ -1,20 +1,38 @@
package com.jero.project.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.ValidUtil;
import com.jero.mail.service.IPayMailBillService;
import com.jero.mail.vo.MailBillVO;
import com.jero.payment.entity.PayPaymentRecord;
import com.jero.payment.service.IPayPaymentRecordService;
import com.jero.project.common.PayProjectCommon;
import com.jero.project.entity.PayWorkingGroup;
import com.jero.project.entity.PayWorkingGroupSubItem;
import com.jero.project.service.IPayWorkingGroupService;
import com.jero.project.service.IPayWorkingGroupSubItemService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.temporary.entity.PayCompanyManagementTemporary;
import com.jero.temporary.entity.PayContactsManagementTemporary;
import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
import com.jero.temporary.service.IPayContactsManagementTemporaryService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
@@ -32,6 +50,16 @@ import io.swagger.annotations.ApiOperation;
public class PayWorkingGroupSubItemController extends JeroController<PayWorkingGroupSubItem, IPayWorkingGroupSubItemService> {
@Autowired
private IPayWorkingGroupSubItemService payWorkingGroupSubitemService;
@Autowired
private IPayCompanyManagementTemporaryService payCompanyManagementTemporaryService;
@Autowired
private IPayContactsManagementTemporaryService payContactsManagementTemporaryService;
@Autowired
private IPayPaymentRecordService payPaymentRecordService;
@Autowired
private IPayMailBillService payMailBillService;
@Autowired
private IPayWorkingGroupService payWorkingGroupService;
/**
* 分页列表查询
@@ -48,9 +76,10 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
if(StringUtils.isBlank(payWorkingGroupSubitem.getChargeCompanyTemporaryName()) || payWorkingGroupSubitem.getChargeCompanyTemporaryName().length() > 50){
if(!StringUtils.isBlank(payWorkingGroupSubitem.getChargeCompanyTemporaryName()) && payWorkingGroupSubitem.getChargeCompanyTemporaryName().length() > 50){
return Result.error("成员单位长度不能大于50个字符");
}
// todo 缺少到账,开票,邮寄记录查询
QueryWrapper<PayWorkingGroupSubItem> queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroupSubitem, req.getParameterMap());
Page<PayWorkingGroupSubItem> page = new Page<PayWorkingGroupSubItem>(pageNo, pageSize);
IPage<PayWorkingGroupSubItem> pageList = payWorkingGroupSubitemService.page(page, queryWrapper);
@@ -60,28 +89,132 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
/**
* 添加
*
* @param payWorkingGroupSubitem
* @param payWorkingGroupSubItem
* @return
*/
@ApiOperation(value="工作组成员-添加", notes="工作组成员-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubitem) {
payWorkingGroupSubitemService.save(payWorkingGroupSubitem);
@Transactional
public Result<?> add(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubItem) {
StringBuilder msg = ValidUtil.validateAll(payWorkingGroupSubItem);
if(!StringUtils.isBlank(msg)){
return Result.error(msg.toString());
}
try {
// 编辑保存前再次校验来款项目是否存在
LambdaQueryWrapper<PayWorkingGroupSubItem> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PayWorkingGroupSubItem::getChargeCompanyId,payWorkingGroupSubItem.getChargeCompanyId());
queryWrapper.eq(PayWorkingGroupSubItem::getContactsIdOne,payWorkingGroupSubItem.getContactsIdOne());
PayWorkingGroupSubItem payWorkingGroupSubItemNew = payWorkingGroupSubitemService.getOne(queryWrapper);
// 企业和联系人同时存在,则校验不通过
if(!Objects.isNull(payWorkingGroupSubItemNew)) {
return Result.error("工作组成员已存在!");
}
}catch (Exception e){
log.info("工作组成员-添加异常",e);
return Result.error("工作组成员已存在!");
}
PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupSubItem.getWorkingGroupId());
if(Objects.isNull(payWorkingGroup)){
return Result.error("工作组不存在!");
}
payWorkingGroupSubItem = setPayWorkingGroupSubItem(payWorkingGroupSubItem);
payWorkingGroupSubItem.setPack(PayProjectCommon.PACKAGING0);
payWorkingGroupSubItem.setInAccount(PayProjectCommon.IN_ACCOUNT0);
payWorkingGroupSubItem.setMakeInvoice(PayProjectCommon.MAKE_INVOICE0);
payWorkingGroupSubItem.setMail(PayProjectCommon.MAIL0);
payWorkingGroupSubitemService.save(payWorkingGroupSubItem);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param payWorkingGroupSubitem
* @param payWorkingGroupSubItem
* @return
*/
@ApiOperation(value="工作组成员-编辑", notes="工作组成员-编辑")
@PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubitem) {
payWorkingGroupSubitemService.updateById(payWorkingGroupSubitem);
public Result<?> edit(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubItem) {
StringBuilder msg = ValidUtil.validateAll(payWorkingGroupSubItem);
if(!StringUtils.isBlank(msg)){
return Result.error(msg.toString());
}
try {
// 编辑保存前再次校验来款项目是否存在
LambdaQueryWrapper<PayWorkingGroupSubItem> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PayWorkingGroupSubItem::getChargeCompanyId,payWorkingGroupSubItem.getChargeCompanyId());
queryWrapper.eq(PayWorkingGroupSubItem::getContactsIdOne,payWorkingGroupSubItem.getContactsIdOne());
PayWorkingGroupSubItem payWorkingGroupSubItemNew = payWorkingGroupSubitemService.getOne(queryWrapper);
// 来款项目存在,并且编辑id与查询不同,则校验不通过
if(!Objects.isNull(payWorkingGroupSubItemNew)
&& !Objects.equals(payWorkingGroupSubItemNew.getId(),payWorkingGroupSubItem.getId())) {
return Result.error("工作组成员已存在!");
}
}catch (Exception e){
log.info("工作组成员-编辑异常",e);
return Result.error("工作组成员已存在!");
}
PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupSubItem.getWorkingGroupId());
if(Objects.isNull(payWorkingGroup)){
return Result.error("工作组不存在!");
}
payWorkingGroupSubItem = setPayWorkingGroupSubItem(payWorkingGroupSubItem);
payWorkingGroupSubitemService.updateById(payWorkingGroupSubItem);
return Result.OK("编辑成功!");
}
/**
* @Description 插入企业信息,联系人信息到临时表,更新项目记录
* @Author lqt
* @Date 2021/8/31
* @Param payCommonProject
* @Return
* @Exception
*/
private PayWorkingGroupSubItem setPayWorkingGroupSubItem(PayWorkingGroupSubItem payWorkingGroupSubItem){
// 企业
PayCompanyManagementTemporary chargeCompanyName = payCompanyManagementTemporaryService.insertCompanyManagementTemporary(payWorkingGroupSubItem.getChargeCompanyId());
if(Objects.isNull(chargeCompanyName)){
throw new JeroBootException("企业名称为空!");
}
payWorkingGroupSubItem.setChargeCompanyTemporaryId(chargeCompanyName.getId());
payWorkingGroupSubItem.setChargeCompanyTemporaryName(chargeCompanyName.getCompanyName());
// 企业联系人一
PayContactsManagementTemporary contactsNameOne = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getContactsIdOne());
if(Objects.isNull(contactsNameOne)){
throw new JeroBootException("企业联系人一名称为空!");
}
payWorkingGroupSubItem.setContactsTemporaryIdOne(contactsNameOne.getId());
payWorkingGroupSubItem.setContactsTemporaryNameOne(contactsNameOne.getName());
if(!StringUtils.isBlank(payWorkingGroupSubItem.getContactsIdTwo())){
// 企业联系人二
PayContactsManagementTemporary contactsNameTwo = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getContactsIdTwo());
if(Objects.isNull(contactsNameTwo)){
throw new JeroBootException("企业联系人二名称为空!");
}
payWorkingGroupSubItem.setContactsTemporaryIdTwo(contactsNameTwo.getId());
payWorkingGroupSubItem.setContactsTemporaryNameTwo(contactsNameTwo.getName());
}
if(!StringUtils.isBlank(payWorkingGroupSubItem.getContactsIdThree())){
// 企业联系人三
PayContactsManagementTemporary contactsNameThree = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getContactsIdThree());
if(Objects.isNull(contactsNameThree)){
throw new JeroBootException("企业联系人三名称为空!");
}
payWorkingGroupSubItem.setContactsTemporaryIdThree(contactsNameThree.getId());
payWorkingGroupSubItem.setContactsTemporaryNameThree(contactsNameThree.getName());
}
// 邮寄联系人
PayContactsManagementTemporary mailContactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payWorkingGroupSubItem.getMailContactsId());
if(Objects.isNull(mailContactsName)){
throw new JeroBootException("邮寄联系人名称为空!");
}
payWorkingGroupSubItem.setMailContactsTemporaryId(mailContactsName.getId());
payWorkingGroupSubItem.setMailContactsTemporaryName(mailContactsName.getName());
return payWorkingGroupSubItem;
}
/**
* 通过id删除
@@ -92,6 +225,9 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
@ApiOperation(value="工作组成员-通过id删除", notes="工作组成员-通过id删除")
@GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
if(StringUtils.isBlank(id)){
return Result.error("id不能为空!");
}
payWorkingGroupSubitemService.removeById(id);
return Result.OK("删除成功!");
}
@@ -105,6 +241,15 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
@ApiOperation(value="工作组成员-批量删除", notes="工作组成员-批量删除")
@GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
if(StringUtils.isBlank(ids)){
return Result.error("id不能为空!");
}
String[] s = ids.split(",");
for (String s1 : s) {
if(StringUtils.isBlank(s1)){
return Result.error("id不能为空!");
}
}
this.payWorkingGroupSubitemService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
@@ -122,6 +267,22 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
if(payWorkingGroupSubitem==null) {
return Result.error("未找到对应数据");
}
JSONObject json = new JSONObject();
json.put("project",payWorkingGroupSubitem);
// 企业信息
PayCompanyManagementTemporary payCompanyManagementTemporary = payCompanyManagementTemporaryService.getById(payWorkingGroupSubitem.getChargeCompanyTemporaryId());
json.put("company",payCompanyManagementTemporary);
// 联系人信息c
PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(payWorkingGroupSubitem.getContactsTemporaryIdOne());
json.put("contacts",payContactsManagementTemporary);
// 到账信息
LambdaQueryWrapper<PayPaymentRecord> queryWrapperPayPaymentRecord = new LambdaQueryWrapper<>();
queryWrapperPayPaymentRecord.eq(PayPaymentRecord::getProjectId,payWorkingGroupSubitem.getId());
List<PayPaymentRecord> payPaymentRecordList = payPaymentRecordService.list(queryWrapperPayPaymentRecord);
json.put("payPaymentRecord",payPaymentRecordList);
// 开票邮寄记录
List<MailBillVO> listMailBillVO = payMailBillService.selectMailBillVO(payWorkingGroupSubitem.getId(), PayProjectCommon.PROJECT_TYPE2);
json.put("mailBill",listMailBillVO);
return Result.OK(payWorkingGroupSubitem);
}
@@ -134,9 +295,20 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
@GetMapping(value = "/exportXls")
@ApiOperation(value="工作组成员-导出excel", notes="工作组成员-导出excel")
public ModelAndView exportXls(HttpServletRequest request, PayWorkingGroupSubItem payWorkingGroupSubitem) {
return super.exportXls(request, payWorkingGroupSubitem, PayWorkingGroupSubItem.class, "pay_working_group_subitem");
return super.exportXls(request, payWorkingGroupSubitem, PayWorkingGroupSubItem.class, "工作组成员");
}
/**
* 模板下载
*
* @return
*/
@ApiOperation(value="工作组成员-模板下载", notes="工作组成员-模板下载")
@GetMapping(value = "/downloadExcelModel")
public ModelAndView downloadExcelModel() {
return super.exportTemplate(PayWorkingGroupSubItem.class,"工作组成员导入模板");
}
/**
* 通过excel导入数据
*
@@ -4,6 +4,7 @@ import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jero.common.aspect.annotation.Dict;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
@@ -37,98 +38,87 @@ public class PayWorkingGroupSubItem implements Serializable {
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**来款项目*/
@Excel(name = "来款项目", width = 15)
@ApiModelProperty(value = "来款项目")
@Size(max = 100,message = "来款项目长度不能大于100个字符")
private java.lang.String chargeProject;
/**工作组id*/
@Excel(name = "工作组id", width = 15)
@ApiModelProperty(value = "工作组id")
@Size(max = 32,message = "工作组id长度不能大于32个字符")
private java.lang.String workingGroupId;
/**成员单位id*/
@Excel(name = "成员单位id", width = 15)
@ApiModelProperty(value = "成员单位id")
@NotEmpty(message = "成员单位id不能为空!")
@Size(max = 32,message = "成员单位id长度不能大于32个字符")
private java.lang.String chargeCompanyId;
/**临时成员单位id*/
@Excel(name = "临时成员单位id", width = 15)
@ApiModelProperty(value = "临时成员单位id")
private java.lang.String chargeCompanyTemporaryId;
/**临时成员单位*/
@Excel(name = "临时成员单位", width = 15)
@Excel(name = "成员单位", width = 15)
@ApiModelProperty(value = "临时成员单位")
@Size(max = 50,message = "成员单位id长度不能大于50个字符")
private java.lang.String chargeCompanyTemporaryName;
/**企业联系人一id*/
@Excel(name = "企业联系人一id", width = 15)
@ApiModelProperty(value = "企业联系人一id")
@NotEmpty(message = "企业联系人一id不能为空!")
@Size(max = 32,message = "企业联系人一id长度不能大于32个字符")
private java.lang.String contactsIdOne;
/**临时企业联系人一id*/
@Excel(name = "临时企业联系人一id", width = 15)
@ApiModelProperty(value = "临时企业联系人一id")
private java.lang.String contactsTemporaryIdOne;
/**临时企业联系人一名称*/
@Excel(name = "临时企业联系人一名称", width = 15)
@Excel(name = "企业联系人一名称", width = 15)
@ApiModelProperty(value = "临时企业联系人一名称")
private java.lang.String contactsTemporaryNameOne;
/**企业联系人二id*/
@Excel(name = "企业联系人二id", width = 15)
@ApiModelProperty(value = "企业联系人二id")
@Size(max = 32,message = "企业联系人二id长度不能大于32个字符")
private java.lang.String contactsIdTwo;
/**临时企业联系人二id*/
@Excel(name = "临时企业联系人二id", width = 15)
@ApiModelProperty(value = "临时企业联系人二id")
private java.lang.String contactsTemporaryIdTwo;
/**临时企业联系人二名称*/
@Excel(name = "临时企业联系人二名称", width = 15)
@Excel(name = "企业联系人二名称", width = 15)
@ApiModelProperty(value = "临时企业联系人二名称")
private java.lang.String contactsTemporaryNameTwo;
/**企业联系人三id*/
@Excel(name = "企业联系人三id", width = 15)
@ApiModelProperty(value = "企业联系人三id")
@Size(max = 32,message = "企业联系人三id长度不能大于32个字符")
private java.lang.String contactsIdThree;
/**临时企业联系人三id*/
@Excel(name = "临时企业联系人三id", width = 15)
@ApiModelProperty(value = "临时企业联系人三id")
private java.lang.String contactsTemporaryIdThree;
/**临时企业联系人三名称*/
@Excel(name = "临时企业联系人三名称", width = 15)
@Excel(name = "企业联系人三名称", width = 15)
@ApiModelProperty(value = "临时企业联系人三名称")
private java.lang.String contactsTemporaryNameThree;
/**应收金额(元)*/
@Excel(name = "应收金额(元)", width = 15)
@ApiModelProperty(value = "应收金额(元)")
@Max(value = 999999999,message = "应收金额(元)格式错误")
@NotNull(message = "应收金额(元)不能为空!")
private java.lang.Integer receivableAmount;
/**实收金额(元)*/
@Excel(name = "实收金额(元)", width = 15)
@ApiModelProperty(value = "实收金额(元)")
@Max(value = 999999999,message = "实收金额(元)格式错误")
private java.lang.Integer paidAmount;
/**邮寄联系人id*/
@Excel(name = "邮寄联系人id", width = 15)
@ApiModelProperty(value = "邮寄联系人id")
@Size(max = 32,message = "邮寄联系人id长度不能大于32个字符")
@NotEmpty(message = "邮寄联系人id不能为空!")
private java.lang.String mailContactsId;
/**临时邮寄联系人id*/
@Excel(name = "临时邮寄联系人id", width = 15)
@ApiModelProperty(value = "临时邮寄联系人id")
private java.lang.String mailContactsTemporaryId;
/**临时邮寄联系人名称*/
@Excel(name = "临时邮寄联系人名称", width = 15)
@Excel(name = "邮寄联系人名称", width = 15)
@ApiModelProperty(value = "临时邮寄联系人名称")
private java.lang.String mailContactsTemporaryName;
/**来款方式(1:无,2:合同,3:收费通知)*/
@Excel(name = "来款方式(1:无,2:合同,3:收费通知)", width = 15)
@Excel(name = "来款方式", width = 15,dicCode = "payment_type")
@Dict(dicCode = "payment_type")
@ApiModelProperty(value = "来款方式(1:无,2:合同,3:收费通知)")
@NotNull(message = "来款方式不能为空!")
@Size(max = 1,message = "来款方式格式不正确")
private java.lang.Integer chargeWay;
/**合同编号*/
@Excel(name = "合同编号", width = 15)
@@ -142,28 +132,24 @@ public class PayWorkingGroupSubItem implements Serializable {
@Size(max = 50,message = "收费通知号长度不能大于50个字符")
private java.lang.String chargeNoticeNo;
/**收费通知文件id*/
@Excel(name = "收费通知文件id", width = 15)
@ApiModelProperty(value = "收费通知文件id")
@Size(max = 32,message = "收费通知文件id长度不能大于32个字符")
private java.lang.String chargeNoticeId;
/**打包(1:是,0:否)*/
@Excel(name = "打包(1:是,0:否)", width = 15)
@ApiModelProperty(value = "打包(1:是,0:否)")
private java.lang.Integer pack;
/**需要发票(1:增值税普通发票,2:增值税专用发票,3:否)*/
@Excel(name = "需要发票(1:增值税普通发票,2:增值税专用发票,3:否)", width = 15)
@ApiModelProperty(value = "需要发票(1:增值税普通发票,2:增值税专用发票,3:否)")
@Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
@ApiModelProperty(value = "需要发票(1:增值税普通发票,2:增值税专用发票,0:否)")
@Dict(dicCode = "invoice_type")
private java.lang.Integer needInvoice;
/**到账(1:全额(对勾),2:0(X),3:>0 && <总金额(半满标志))*/
@Excel(name = "到账(1:全额(对勾),2:0(X),3:>0 && <总金额(半满标志))", width = 15)
@ApiModelProperty(value = "到账(1:全额(对勾),2:0(X),3:>0 && <总金额(半满标志))")
private java.lang.Integer inAccount;
/**开票(1:全额(对勾),2:0(X),3:>0 && <总金额(半满标志))*/
@Excel(name = "开票(1:全额(对勾),2:0(X),3:>0 && <总金额(半满标志))", width = 15)
@ApiModelProperty(value = "开票(1:全额(对勾),2:0(X),3:>0 && <总金额(半满标志))")
private java.lang.Integer makeInvoice;
/**邮寄((1:全额(对勾),2:0(X),3:>0 && <总金额(半满标志)))*/
@Excel(name = "邮寄((1:全额(对勾),2:0(X),3:>0 && <总金额(半满标志)))", width = 15)
@ApiModelProperty(value = "邮寄((1:全额(对勾),2:0(X),3:>0 && <总金额(半满标志)))")
private java.lang.Integer mail;
/**催款次数*/