update 标协会员修改成资料网员新增的方式
This commit is contained in:
@@ -0,0 +1,10 @@
|
||||
ALTER TABLE `tb_member_project`
|
||||
MODIFY COLUMN `project_name` varchar(50) COMMENT '标协会员项目',
|
||||
ADD COLUMN `charge_standard` decimal(12, 2) COMMENT '收费标准',
|
||||
ADD COLUMN `charge_notice_no` varchar(150) COMMENT '收费通知号',
|
||||
ADD COLUMN `charge_notice_file_id` varchar(500) COMMENT '收费通知文件id',
|
||||
ADD COLUMN `council_charge_standard` decimal(12, 2) COMMENT '理事会收费标准',
|
||||
ADD COLUMN `council_charge_notice_no` varchar(150) COMMENT '理事会收费通知号',
|
||||
ADD COLUMN `council_charge_notice_file_id` varchar(500) COMMENT '理事会收费通知文件id',
|
||||
ADD COLUMN `remark` varchar(600) COMMENT '备注';
|
||||
|
||||
+60
@@ -8,6 +8,8 @@ import javax.servlet.http.HttpServletResponse;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.member.entity.TbMemberProject;
|
||||
import com.jero.member.entity.TbMemberProject;
|
||||
import com.jero.member.entity.TbMemberProjectFile;
|
||||
import com.jero.member.service.ITbMemberProjectService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
@@ -53,4 +55,62 @@ public class TbMemberProjectController extends JeroController<TbMemberProject, I
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*/
|
||||
//@RequiresPermissions(":add")
|
||||
@AutoLog(value = "标协会员项目表-添加")
|
||||
@ApiOperation(value = "标协会员项目表-添加", notes = "标协会员项目表-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody TbMemberProject tbMemberProject) {
|
||||
tbMemberProjectService.add(tbMemberProject);
|
||||
return Result.OK("添加成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*/
|
||||
//@RequiresPermissions(":edit")
|
||||
@AutoLog(value = "标协会员项目表-编辑")
|
||||
@ApiOperation(value = "标协会员项目表-编辑", notes = "标协会员项目表-编辑")
|
||||
@PostMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody TbMemberProject tbMemberProject) {
|
||||
tbMemberProjectService.editById(tbMemberProject);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*/
|
||||
//@RequiresPermissions(":delete")
|
||||
@AutoLog(value = "标协会员项目表-通过id删除")
|
||||
@ApiOperation(value = "标协会员项目表-通过id删除", notes = "标协会员项目表-通过id删除")
|
||||
@GetMapping(value = "/delete")
|
||||
public Result<?> delete(@RequestParam(name = "id") String id) {
|
||||
tbMemberProjectService.deleteById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*/
|
||||
//@RequiresPermissions(":batchDel")
|
||||
@AutoLog(value = "标协会员项目表-批量删除")
|
||||
@ApiOperation(value = "标协会员项目表-批量删除", notes = "标协会员项目表-批量删除")
|
||||
@GetMapping(value = "/deleteBatch")
|
||||
public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
|
||||
List<String> idList = Arrays.asList(ids.split(","));
|
||||
this.tbMemberProjectService.deleteByIds(idList);
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*/
|
||||
@ApiOperation(value = "标协会员项目-导出excel")
|
||||
@GetMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, TbMemberProject tbMemberProject) {
|
||||
return super.exportXls(request, tbMemberProject, TbMemberProject.class, "标协会员项目");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+63
-2
@@ -16,6 +16,9 @@ import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import javax.validation.constraints.DecimalMax;
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
/**
|
||||
* @Description: 标协会员项目表
|
||||
* @Author: jero-boot
|
||||
@@ -56,8 +59,8 @@ public class TbMemberProject implements Serializable {
|
||||
private java.util.Date updateTime;
|
||||
|
||||
/**项目名称*/
|
||||
@Excel(name = "项目名称", width = 15)
|
||||
@ApiModelProperty(value = "项目名称")
|
||||
@Excel(name = "标协会员项目", width = 15)
|
||||
@ApiModelProperty(value = "标协会员项目")
|
||||
private String projectName;
|
||||
|
||||
/**运行年份*/
|
||||
@@ -72,4 +75,62 @@ public class TbMemberProject implements Serializable {
|
||||
@Excel(name = "负责人", width = 15)
|
||||
@ApiModelProperty(value = "负责人")
|
||||
private String directorName;
|
||||
|
||||
/**
|
||||
* 收费标准
|
||||
*/
|
||||
@Excel(name = "收费标准", width = 15)
|
||||
@ApiModelProperty(value = "收费标准")
|
||||
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||
@DecimalMax(value = "9999999999.99",message = "收费标准格式错误")
|
||||
private BigDecimal chargeStandard;
|
||||
|
||||
/**
|
||||
* 收费通知号
|
||||
*/
|
||||
@Excel(name = "收费通知号", width = 15)
|
||||
@ApiModelProperty(value = "收费通知号")
|
||||
@Size(max = 50, message = "收费通知号最大为50个字符")
|
||||
private String chargeNoticeNo;
|
||||
|
||||
/**
|
||||
* 收费通知文件id
|
||||
*/
|
||||
@ApiModelProperty(value = "收费通知文件id")
|
||||
@Size(max = 50, message = "收费通知号最大为50个字符")
|
||||
private String chargeNoticeFileId;
|
||||
|
||||
/**
|
||||
* 理事会收费标准
|
||||
*/
|
||||
@Excel(name = "理事会收费标准", width = 15)
|
||||
@ApiModelProperty(value = "理事会收费标准")
|
||||
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||
@DecimalMax(value = "9999999999.99",message = "理事会收费标准格式错误")
|
||||
private BigDecimal councilChargeStandard;
|
||||
|
||||
/**
|
||||
* 收费通知号
|
||||
*/
|
||||
@Excel(name = "理事会收费通知号", width = 15)
|
||||
@ApiModelProperty(value = "理事会收费通知号")
|
||||
@Size(max = 50, message = "理事会收费通知号最大为50个字符")
|
||||
private String councilChargeNoticeNo;
|
||||
|
||||
/**
|
||||
* 理事会收费通知文件id
|
||||
*/
|
||||
@ApiModelProperty(value = "理事会收费通知文件id")
|
||||
@Size(max = 50, message = "理事会收费通知号最大为50个字符")
|
||||
private String councilChargeNoticeFileId;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@Excel(name = "备注", width = 15)
|
||||
@ApiModelProperty(value = "备注")
|
||||
@Size(max = 200, message = "备注最大为200个字符")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -23,19 +23,6 @@ public class MemberProjectJob implements Job{
|
||||
private ITbMemberProjectService memberProjectService;
|
||||
@Override
|
||||
public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
|
||||
LambdaQueryWrapper<TbMemberProject> wrapper1 = new LambdaQueryWrapper<>();
|
||||
int year = DateUtil.year(new Date());
|
||||
String projectName = year + "年标协会员";
|
||||
wrapper1.eq(TbMemberProject::getProjectName, projectName);
|
||||
|
||||
TbMemberProject memberProject = memberProjectService.getOne(wrapper1);
|
||||
if (memberProject == null) {
|
||||
memberProject = new TbMemberProject();
|
||||
memberProject.setProjectName(projectName);
|
||||
memberProject.setYear(String.valueOf(year));
|
||||
memberProject.setDirectorId("e9ca23d68d884d4ebb19d07889727dae");
|
||||
memberProject.setDirectorName("BXGLZ");
|
||||
memberProjectService.save(memberProject);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user