From fcb145541a6476a24c5ca647ca23123849b7be0c Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 27 Aug 2021 10:17:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20=E6=9B=B4=E6=94=B9=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E6=96=B9=E5=BC=8F=E4=B8=BAget=EF=BC=8Cpost?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MemberProjectController.java | 6 +++--- .../MemberProjectSubitemController.java | 6 +++--- .../com/jero/member/entity/MemberProject.java | 21 +++++++------------ .../member/entity/MemberProjectSubitem.java | 8 +++---- 4 files changed, 17 insertions(+), 24 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/MemberProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/MemberProjectController.java index 45e1bd50..505d9811 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/MemberProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/MemberProjectController.java @@ -93,7 +93,7 @@ public class MemberProjectController extends JeroController edit(@Validated @RequestBody MemberProject memberProject) { memberProjectService.editById(memberProject); return Result.OK("编辑成功!"); @@ -107,7 +107,7 @@ public class MemberProjectController extends JeroController delete(@RequestParam(name="id",required=true) String id) { memberProjectService.deleteById(id); return Result.OK("删除成功!"); @@ -121,7 +121,7 @@ public class MemberProjectController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.memberProjectService.deleteByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/MemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/MemberProjectSubitemController.java index 636e1c88..854ecc9b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/MemberProjectSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/MemberProjectSubitemController.java @@ -79,7 +79,7 @@ public class MemberProjectSubitemController extends JeroController edit(@Validated @RequestBody MemberProjectSubitem memberProjectSubitem) { memberProjectSubitemService.editById(memberProjectSubitem); return Result.OK("编辑成功!"); @@ -90,7 +90,7 @@ public class MemberProjectSubitemController extends JeroController delete(@RequestParam(name="id") String id) { memberProjectSubitemService.deleteById(id); return Result.OK("删除成功!"); @@ -101,7 +101,7 @@ public class MemberProjectSubitemController extends JeroController deleteBatch(@RequestParam(name="ids") String ids) { this.memberProjectSubitemService.deleteByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProject.java index 13ac0cf5..c967ad85 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProject.java @@ -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,7 +98,6 @@ public class MemberProject implements Serializable { * 收费标准 */ @Excel(name = "收费标准", width = 15) - @ApiModelProperty(value = "收费标准") private Integer chargStandard; @@ -109,7 +105,6 @@ public class MemberProject implements Serializable { * 收费通知号 */ @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; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProjectSubitem.java index 9bccc32a..554f91f9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProjectSubitem.java @@ -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; From ec6f2a8788793d2c71e4030f53f82a5a825ad3c6 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 27 Aug 2021 10:22:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/member/entity/MemberProject.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProject.java index c967ad85..886c7571 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProject.java @@ -99,7 +99,7 @@ public class MemberProject implements Serializable { */ @Excel(name = "收费标准", width = 15) @ApiModelProperty(value = "收费标准") - private Integer chargStandard; + private Integer chargeStandard; /** * 收费通知号