diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/AuditingPartyMemberFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/AuditingPartyMemberFormDTO.java new file mode 100644 index 0000000000..b48456f0cb --- /dev/null +++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/AuditingPartyMemberFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 党员认证-待审核列表入参 + * @Author yinzuomei + * @Date 2020/4/26 15:59 + */ +@Data +public class AuditingPartyMemberFormDTO implements Serializable { + private static final long serialVersionUID = 6022180109189321760L; + + /** + * 网格ID + */ + @NotBlank(message = "网格id不能为空") + private String gridId; +} + diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java index 7aafa4d24c..83b2fa05ca 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java @@ -1,5 +1,11 @@ package com.epmet.controller; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.AuditingPartyMemberFormDTO; +import com.epmet.service.ResiPartyMemberService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -11,5 +17,20 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("partymember") public class ResiPartyMemberController { + @Autowired + private ResiPartyMemberService resiPartyMemberService; + + /** + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 待审核列表:自动审核失败且已经录入了补充信息的 + * @Date 2020/4/26 16:04 + **/ + @PostMapping("auditing") + public Result auditing(@RequestBody AuditingPartyMemberFormDTO formDTO) { + return resiPartyMemberService.auditing(formDTO); + } } + diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java new file mode 100644 index 0000000000..1a28cd0f2e --- /dev/null +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java @@ -0,0 +1,20 @@ +package com.epmet.service; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.AuditingPartyMemberFormDTO; + +/** + * @Description 基层治理-党员认证 + * @Author yinzuomei + * @Date 2020/4/26 16:02 + */ +public interface ResiPartyMemberService { + /** + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 待审核列表 + * @Date 2020/4/26 16:04 + **/ + Result auditing(AuditingPartyMemberFormDTO formDTO); +} diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java new file mode 100644 index 0000000000..3cacef6577 --- /dev/null +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java @@ -0,0 +1,24 @@ +package com.epmet.service.impl; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.AuditingPartyMemberFormDTO; +import com.epmet.service.ResiPartyMemberService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; + +/** + * @Description 基层治理-党员认证 + * @Author yinzuomei + * @Date 2020/4/26 16:02 + */ +@Service +public class ResiPartyMemberServiceImpl implements ResiPartyMemberService { + protected final Logger logger = LoggerFactory.getLogger(getClass()); + + @Override + public Result auditing(AuditingPartyMemberFormDTO formDTO) { + return null; + } +} + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/redis/migration/db.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/redis/migration/db.sql index a60097daac..a20663b2ce 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/redis/migration/db.sql +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/redis/migration/db.sql @@ -2,4 +2,6 @@ ALTER TABLE resi_warmhearted_apply ADD ( READ_FLAG VARCHAR (255) DEFAULT NULL COMMENT '审核人员已读未读标识(未读:unread 界面显示红点; 已读:read 不显示红点)', MESSAGE_TEXT VARCHAR (500) DEFAULT NULL COMMENT '消息通知内容' -); \ No newline at end of file +); +-- 修改党员认证结果2020-04-26 +alter table partymember_info modify column CONFIRM_RESULT varchar(20) COMMENT '认证结果:auto_confirm_success:自动认证成功,auto_confirm_failed:自动认证失败,approved:人工审核通过,rejected :拒绝)'; \ No newline at end of file