LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 会员项目导出

Browse Source
This commit is contained in:
lijiarao
2021-08-31 15:02:03 +08:00
parent 136aef9cb8
commit 2601b99409
4 changed files with 52 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
+10 -1
View File
@@ -82,7 +82,8 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
@AutoLog(value = "会员项目成员表-编辑")
@ApiOperation(value="会员项目成员表-编辑", notes="会员项目成员表-编辑")
@PostMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody PayMemberProjectSubitem payMemberProjectSubitem) {
public Result<?> edit(@RequestBody PayMemberProjectSubitem payMemberProjectSubitem) {
ValidUtil.validate(payMemberProjectSubitem);
memberProjectSubitemService.editById(payMemberProjectSubitem);
return Result.OK("编辑成功!");
}
@@ -131,6 +132,14 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
return super.exportXls(request, payMemberProjectSubitem, PayMemberProjectSubitem.class, "会员项目成员表");
}
/**
* 导出excel
*/
@RequestMapping(value = "/exportTemplate")
public ModelAndView exportTemplate() {
return super.exportTemplate(PayMemberProjectSubitem.class, "会员项目成员表");
}
/**
* 通过excel导入数据
*/
jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProject.java
+6 -8
View File
@@ -85,21 +85,20 @@ public class PayMemberProject implements Serializable {
*/
@Excel(name = "运行年份", width = 15)
@ApiModelProperty(value = "运行年份")
@Pattern(regexp = "^\\d{4}$", message = "运行年份必须为4位字符", groups = GroupA.class)
@Pattern(regexp = "^\\d{4}$", message = "运行年份必须为4位字符")
private String particularYear;
/**
* 负责人id
*/
@Excel(name = "负责人id", width = 15)
@Excel(name = "负责人名称", width = 15,dictTable = "sys_user",dicText = "username",dicCode = "id")
@ApiModelProperty(value = "负责人id")
@NotBlank(message = "负责人不能为空", groups = GroupB.class)
@NotBlank(message = "负责人不能为空")
private String directorId;
/**
* 负责人名称
*/
@Excel(name = "负责人名称", width = 15)
@ApiModelProperty(value = "负责人名称")
private String directorName;
@@ -115,15 +114,14 @@ public class PayMemberProject implements Serializable {
*/
@Excel(name = "收费通知号", width = 15)
@ApiModelProperty(value = "收费通知号")
@Size(max = 50, message = "收费通知号最大为50个字符", groups = GroupC.class)
@Size(max = 50, message = "收费通知号最大为50个字符")
private String chargeNoticeNo;
/**
* 收费通知文件id
*/
@Excel(name = "收费通知文件id", width = 15)
@ApiModelProperty(value = "收费通知文件id")
@Size(max = 50, message = "收费通知号最大为50个字符", groups = GroupD.class)
@Size(max = 50, message = "收费通知号最大为50个字符")
private String chargeNoticeFileId;
/**
@@ -131,7 +129,7 @@ public class PayMemberProject implements Serializable {
*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
@Size(max = 200, message = "备注最大为200个字符", groups = GroupE.class)
@Size(max = 200, message = "备注最大为200个字符")
private String remark;
}
jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
+15 -16
View File
@@ -75,48 +75,46 @@ public class PayMemberProjectSubitem implements Serializable {
/**
* 会员项目id
*/
@Excel(name = "会员项目id", width = 15)
@Excel(name = "会员项目名称", width = 15,dictTable = "pay_member_project",dicText = "project_name",dicCode = "id")
@ApiModelProperty(value = "会员项目id")
@NotBlank(message = "会员项目id不能为空")
@Size(max = 50,message = "会员项目id最大为50字符")
@NotBlank(message = "会员项目不能为空")
@Size(max = 50,message = "会员项目最大为50字符")
private String projectId;
/**
* 企业id
*/
@Excel(name = "企业id", width = 15)
@Excel(name = "企业名称", width = 15,dictTable = "pay_company_management",dicText = "company_name",dicCode = "id")
@ApiModelProperty(value = "企业id")
@NotBlank(message = "企业id不能为空")
@Size(max = 50,message = "企业id最大为50字符")
@NotBlank(message = "企业不能为空")
@Size(max = 50,message = "企业最大为50字符")
private String companyId;
/**
* 企业名称
*/
@Excel(name = "企业名称", width = 15)
@ApiModelProperty(value = "企业名称")
private String companyName;
/**
* 企业联系人id
*/
@Excel(name = "企业联系人id", width = 15)
@Excel(name = "企业联系人名称", width = 15,dictTable = "pay_contacts_management",dicText = "name",dicCode = "id")
@ApiModelProperty(value = "企业联系人id")
@NotBlank(message = "企业联系人id不能为空")
@Size(max = 50,message = "企业联系人id最大为50字符")
@NotBlank(message = "企业联系人不能为空")
@Size(max = 50,message = "企业联系人最大为50字符")
private String companyContactId;
/**
* 企业联系人名称
*/
@Excel(name = "企业联系人名称", width = 15)
@ApiModelProperty(value = "企业联系人名称")
private String companyContactName;
/**
* 邮寄联系人id
*/
@Excel(name = "邮寄联系人id", width = 15)
@Excel(name = "邮寄联系人姓名", width = 15,dictTable = "pay_contacts_management",dicText = "name",dicCode = "id")
@ApiModelProperty(value = "邮寄联系人id")
@NotBlank(message = "邮寄联系人不能为空")
private String postContactId;
@@ -124,7 +122,6 @@ public class PayMemberProjectSubitem implements Serializable {
/**
* 邮寄联系人姓名
*/
@Excel(name = "邮寄联系人姓名", width = 15)
@ApiModelProperty(value = "邮寄联系人姓名")
private String postContactName;
@@ -134,6 +131,7 @@ public class PayMemberProjectSubitem implements Serializable {
@Excel(name = "应收金额", width = 15)
@ApiModelProperty(value = "应收金额")
@NotNull(message = "应收金额不能为空")
@Max(value = 999999999,message = "应收金额格式错误")
private Integer amountReceivable;
/**
@@ -141,6 +139,7 @@ public class PayMemberProjectSubitem implements Serializable {
*/
@Excel(name = "实收金额", width = 15)
@ApiModelProperty(value = "实收金额")
@Max(value = 999999999,message = "应收金额格式错误")
private Integer paidAmount;
/**
@@ -165,7 +164,6 @@ public class PayMemberProjectSubitem implements Serializable {
/**
* 收费通知文件id
*/
@Excel(name = "收费通知文件id", width = 15)
@ApiModelProperty(value = "收费通知文件id")
@NotBlank(message = "收费通知文件id不能为空",groups = ChargeNotice.class)
@Size(max = 50,message = "收费通知文件id最大为50字符",groups = ChargeNotice.class)
@@ -185,7 +183,7 @@ public class PayMemberProjectSubitem implements Serializable {
*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
@Size(max = 200, message = "备注最大为200个字符", groups = GroupE.class)
@Size(max = 200, message = "备注最大为200个字符")
private String remark;
/**
@@ -202,6 +200,8 @@ public class PayMemberProjectSubitem implements Serializable {
@Excel(name = "需要发票", width = 15)
@ApiModelProperty(value = "需要发票")
@Dict(dicCode = "invoice_type")
@Min(0)
@Max(2)
private Integer needInvoice;
/**
@@ -209,7 +209,6 @@ public class PayMemberProjectSubitem implements Serializable {
*/
@Excel(name = "到账", width = 15)
@ApiModelProperty(value = "到账")
@Dict(dicCode = "yn")
private Integer inAccount;
/**
jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java
+21 -9
View File
@@ -36,6 +36,25 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
*/
@Override
public void add(PayMemberProjectSubitem payMemberProjectSubitem) {
validMemberProjectSubitem(payMemberProjectSubitem);
payMemberProjectSubitem.setAmountReceivable(0);
save(payMemberProjectSubitem);
}
/**
* 更新
*/
@Override
public void editById(PayMemberProjectSubitem payMemberProjectSubitem) {
validMemberProjectSubitem(payMemberProjectSubitem);
saveOrUpdate(payMemberProjectSubitem);
}
/**
* 校验会员项目成员
* @param payMemberProjectSubitem 会员项目成员
*/
private void validMemberProjectSubitem(PayMemberProjectSubitem payMemberProjectSubitem) {
//校验企业
String companyId = payMemberProjectSubitem.getCompanyId();
PayCompanyManagement payCompanyManagement = companyManagementMapper.selectById(companyId);
@@ -83,16 +102,9 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
if (paymentMethod.equals(3)){
ValidUtil.validate(payMemberProjectSubitem, ChargeNotice.class);
}
save(payMemberProjectSubitem);
}
}
/**
* 更新
*/
@Override
public void editById(PayMemberProjectSubitem payMemberProjectSubitem) {
saveOrUpdate(payMemberProjectSubitem);
}
/**
* 通过id删除