diff --git a/src/main/java/com/ydool/boot/modules/rddb/entity/Appoint.java b/src/main/java/com/ydool/boot/modules/rddb/entity/Appoint.java index c79dd96..5ff104d 100644 --- a/src/main/java/com/ydool/boot/modules/rddb/entity/Appoint.java +++ b/src/main/java/com/ydool/boot/modules/rddb/entity/Appoint.java @@ -42,7 +42,7 @@ public class Appoint extends BaseEntity { @ApiModelProperty(value = "表决结果") private String votingResult; @ApiModelProperty(value = "测评结果") - String evaluationResults; + private String evaluationResults; /** * 测评对象 */ @@ -203,5 +203,5 @@ public class Appoint extends BaseEntity { private Boolean status; @ApiModelProperty(value = "打分分数") - String score; + private String score; } diff --git a/src/main/java/com/ydool/boot/modules/rddb/entity/request/appoint/state/AppointPublicStateRequest.java b/src/main/java/com/ydool/boot/modules/rddb/entity/request/appoint/state/AppointPublicStateRequest.java index 11ff157..e8e78e5 100644 --- a/src/main/java/com/ydool/boot/modules/rddb/entity/request/appoint/state/AppointPublicStateRequest.java +++ b/src/main/java/com/ydool/boot/modules/rddb/entity/request/appoint/state/AppointPublicStateRequest.java @@ -11,7 +11,7 @@ public class AppointPublicStateRequest { * 测评对象 */ @ApiModelProperty(value = "admin机关办公/ rddb代表/ voter选民 多个用英文逗号间隔") - private String obj; + private String obj2; @ApiModelProperty(value = "附件名 英文逗号间隔") String announcementFileAttachmentName; @ApiModelProperty(value = "附件路径 英文逗号间隔") diff --git a/src/main/java/com/ydool/boot/modules/rddb/entity/request/appoint/state/AppointScoreStateRequest.java b/src/main/java/com/ydool/boot/modules/rddb/entity/request/appoint/state/AppointScoreStateRequest.java index 024cfa9..9d72720 100644 --- a/src/main/java/com/ydool/boot/modules/rddb/entity/request/appoint/state/AppointScoreStateRequest.java +++ b/src/main/java/com/ydool/boot/modules/rddb/entity/request/appoint/state/AppointScoreStateRequest.java @@ -77,6 +77,6 @@ public class AppointScoreStateRequest { * 测评对象 */ @ApiModelProperty(value = "admin机关办公/ rddb代表/ voter选民 多个用英文逗号间隔") - private String obj2; + private String obj; } diff --git a/src/main/java/com/ydool/boot/modules/rddb/service/AppointService.java b/src/main/java/com/ydool/boot/modules/rddb/service/AppointService.java index 88e87af..9a57ebf 100644 --- a/src/main/java/com/ydool/boot/modules/rddb/service/AppointService.java +++ b/src/main/java/com/ydool/boot/modules/rddb/service/AppointService.java @@ -14,6 +14,7 @@ import com.ydool.boot.core.exception.ResultException; import com.ydool.boot.core.service.BaseService; import com.ydool.boot.modules.rddb.entity.*; import com.ydool.boot.modules.rddb.entity.bo.AppointBo; +import com.ydool.boot.modules.rddb.entity.dto.AppointDto; import com.ydool.boot.modules.rddb.entity.request.CommentRequest; import com.ydool.boot.modules.rddb.entity.request.ScoreRequest; import com.ydool.boot.modules.rddb.entity.request.appoint.AppointVoteRequest; @@ -162,7 +163,8 @@ public class AppointService extends BaseService { notice.setType("gg"); notice.setObj(appoint.getObj()); notice.setFlow("任免督职-考试公示"); - notice.setJsonString(JSONUtil.toJsonStr(AppointWrapper.build().entityVO(appoint))); + AppointDto appointDto = AppointWrapper.build().entityVO(appoint); + notice.setJsonString(JSONUtil.toJsonStr(appointDto)); noticeService.save(notice); return appoint; } @@ -284,7 +286,8 @@ public class AppointService extends BaseService { notice.setType("gg"); notice.setObj(appoint.getObj2()); notice.setFlow("任免督职-常委会公告"); - notice.setJsonString(JSONUtil.toJsonStr(AppointWrapper.build().entityVO(appoint))); + AppointDto appointDto = AppointWrapper.build().entityVO(appoint); + notice.setJsonString(JSONUtil.toJsonStr(appointDto)); noticeService.save(notice); return !flag ? Ret.fail("操作失败") : Ret.ok().data(AppointWrapper.build().entityVO(appoint)); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 71f3c10..37f81b1 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -6,7 +6,7 @@ #local db.user = root -db.pass = zhujg@1985 +db.pass = Wang09211108 db.url = jdbc:mysql://127.0.0.1:3306/ydool_rd?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8 db.driver = com.mysql.cj.jdbc.Driver