fix bug 40726 会员项目-资料网员-添加成员页面-下载模板有多余的字段
This commit is contained in:
+5
-1
@@ -198,7 +198,10 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
|
||||
@ApiOperation(value = "会员项目成员表-导入数据", notes = "会员项目成员表-通过id查询")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
request.getParameter("");
|
||||
String projectId = request.getParameter("projectId");
|
||||
if (StringUtils.isBlank(projectId)) {
|
||||
throw new JeroBootException("项目id为空");
|
||||
}
|
||||
List<Object> excelData = super.getExcelData(request, PayMemberProjectSubitemExcel.class);
|
||||
if (excelData.isEmpty()) {
|
||||
throw new JeroBootException("导入数据为空,请填写数据之后重新导入!");
|
||||
@@ -209,6 +212,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
|
||||
errorRowNum += 1;
|
||||
//复制属性
|
||||
PayMemberProjectSubitemExcel projectSubitemExcel = (PayMemberProjectSubitemExcel) obj;
|
||||
projectSubitemExcel.setProjectId(projectId);
|
||||
PayMemberProjectSubitem projectSubitem = new PayMemberProjectSubitem();
|
||||
|
||||
//应收金额
|
||||
|
||||
+2
-2
@@ -77,7 +77,7 @@ public class PayMemberProjectSubitem implements Serializable {
|
||||
/**
|
||||
* 会员项目id
|
||||
*/
|
||||
@Excel(name = "会员项目名称", width = 15, dictTable = "pay_member_project", dicText = "project_name", dicCode = "id")
|
||||
//@Excel(name = "会员项目名称", width = 15, dictTable = "pay_member_project", dicText = "project_name", dicCode = "id")
|
||||
@ApiModelProperty(value = "会员项目id")
|
||||
@NotBlank(message = "会员项目不能为空")
|
||||
@Size(max = 50, message = "会员项目最大为50字符")
|
||||
@@ -242,7 +242,7 @@ public class PayMemberProjectSubitem implements Serializable {
|
||||
private Integer mail;
|
||||
|
||||
/**开票金额*/
|
||||
@Excel(name = "开票金额", width = 15)
|
||||
//@Excel(name = "开票金额", width = 15)
|
||||
@ApiModelProperty(value = "开票金额")
|
||||
@DecimalMax(value = "9999999999.99",message = "开票金额格式错误")
|
||||
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||
|
||||
-3
@@ -25,10 +25,7 @@ public class PayMemberProjectSubitemExcel {
|
||||
/**
|
||||
* 会员项目id
|
||||
*/
|
||||
@Excel(name = "会员项目名称", width = 15, dictTable = "pay_member_project", dicText = "project_name", dicCode = "id")
|
||||
@ApiModelProperty(value = "会员项目id")
|
||||
@NotBlank(message = "会员项目不能为空")
|
||||
@Size(max = 50, message = "会员项目最大为50字符")
|
||||
private String projectId;
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user