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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
梁琦涛
2021-08-27 10:27:59 +08:00
parent 3633452576 ec6f2a8788
commit 540ef45fa7
4 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/MemberProjectController.java
+3 -3
View File
@@ -93,7 +93,7 @@ public class MemberProjectController extends JeroController<MemberProject, IMemb
*/
@AutoLog(value = "会员项目表-编辑")
@ApiOperation(value="会员项目表-编辑", notes="会员项目表-编辑")
@PutMapping(value = "/edit")
@PostMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody MemberProject memberProject) {
memberProjectService.editById(memberProject);
return Result.OK("编辑成功!");
@@ -107,7 +107,7 @@ public class MemberProjectController extends JeroController<MemberProject, IMemb
*/
@AutoLog(value = "会员项目表-通过id删除")
@ApiOperation(value="会员项目表-通过id删除", notes="会员项目表-通过id删除")
@DeleteMapping(value = "/delete")
@GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
memberProjectService.deleteById(id);
return Result.OK("删除成功!");
@@ -121,7 +121,7 @@ public class MemberProjectController extends JeroController<MemberProject, IMemb
*/
@AutoLog(value = "会员项目表-批量删除")
@ApiOperation(value="会员项目表-批量删除", notes="会员项目表-批量删除")
@DeleteMapping(value = "/deleteBatch")
@GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.memberProjectService.deleteByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/MemberProjectSubitemController.java
+3 -3
View File
@@ -79,7 +79,7 @@ public class MemberProjectSubitemController extends JeroController<MemberProject
*/
@AutoLog(value = "会员项目成员表-编辑")
@ApiOperation(value="会员项目成员表-编辑", notes="会员项目成员表-编辑")
@PutMapping(value = "/edit")
@PostMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody MemberProjectSubitem memberProjectSubitem) {
memberProjectSubitemService.editById(memberProjectSubitem);
return Result.OK("编辑成功!");
@@ -90,7 +90,7 @@ public class MemberProjectSubitemController extends JeroController<MemberProject
*/
@AutoLog(value = "会员项目成员表-通过id删除")
@ApiOperation(value="会员项目成员表-通过id删除", notes="会员项目成员表-通过id删除")
@DeleteMapping(value = "/delete")
@GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id") String id) {
memberProjectSubitemService.deleteById(id);
return Result.OK("删除成功!");
@@ -101,7 +101,7 @@ public class MemberProjectSubitemController extends JeroController<MemberProject
*/
@AutoLog(value = "会员项目成员表-批量删除")
@ApiOperation(value="会员项目成员表-批量删除", notes="会员项目成员表-批量删除")
@DeleteMapping(value = "/deleteBatch")
@GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
this.memberProjectSubitemService.deleteByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProject.java
+8 -15
View File
@@ -1,6 +1,7 @@
package com.jero.member.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -33,24 +34,22 @@ public class MemberProject implements Serializable {
* id
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private String id;
/**
* 创建人
*/
@ApiModelProperty(value = "创建人")
private String createBy;
/**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private java.time.LocalDate createTime;
private Date createTime;
/**
* 更新人
@@ -62,10 +61,10 @@ public class MemberProject implements Serializable {
/**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private java.time.LocalDate updateTime;
private Date updateTime;
/**
* 项目名称
@@ -85,7 +84,6 @@ public class MemberProject implements Serializable {
* 负责人id
*/
@Excel(name = "负责人id", width = 15)
@ApiModelProperty(value = "负责人id")
private String directorId;
@@ -93,7 +91,6 @@ public class MemberProject implements Serializable {
* 负责人名称
*/
@Excel(name = "负责人名称", width = 15)
@ApiModelProperty(value = "负责人名称")
private String directorName;
@@ -101,15 +98,13 @@ public class MemberProject implements Serializable {
* 收费标准
*/
@Excel(name = "收费标准", width = 15)
@ApiModelProperty(value = "收费标准")
private Integer chargStandard;
private Integer chargeStandard;
/**
* 收费通知号
*/
@Excel(name = "收费通知号", width = 15)
@ApiModelProperty(value = "收费通知号")
private String chargeNoticeNo;
@@ -117,7 +112,6 @@ public class MemberProject implements Serializable {
* 收费通知文件id
*/
@Excel(name = "收费通知文件id", width = 15)
@ApiModelProperty(value = "收费通知文件id")
private String chargeNoticeFileId;
@@ -125,7 +119,6 @@ public class MemberProject implements Serializable {
* 备注
*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private String remark;
jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProjectSubitem.java
+4 -4
View File
@@ -46,8 +46,8 @@ public class MemberProjectSubitem implements Serializable {
/**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private java.time.LocalDate createTime;
@@ -60,8 +60,8 @@ public class MemberProjectSubitem implements Serializable {
/**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private java.time.LocalDate updateTime;