diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java
index 65036c466..c108308e2 100644
--- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java
+++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java
@@ -62,6 +62,7 @@ public class SysDeptDTO extends TreeNode implements Serializable {
*/
private String typeKey;
+
/**
* 部门编码
*/
@@ -72,6 +73,16 @@ public class SysDeptDTO extends TreeNode implements Serializable {
*/
private String gisGridId;
+ /**
+ * 办公电话
+ */
+ private String telephone;
+
+ /**
+ * 书记主任
+ */
+ private String secretaryName;
+
public String getGisGridId() {
return gisGridId;
}
@@ -228,4 +239,21 @@ public class SysDeptDTO extends TreeNode implements Serializable {
public void setDisCenterZoningCode(String disCenterZoningCode) {
this.disCenterZoningCode = disCenterZoningCode;
}
+
+
+ public String getTelephone() {
+ return telephone;
+ }
+
+ public void setTelephone(String telephone) {
+ this.telephone = telephone;
+ }
+
+ public String getSecretaryName() {
+ return secretaryName;
+ }
+
+ public void setSecretaryName(String secretaryName) {
+ this.secretaryName = secretaryName;
+ }
}
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java
index e9d8b1aa2..5f61955a1 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java
@@ -112,4 +112,16 @@ public class SysDeptEntity extends BaseEntity {
* 市中心区划编码
*/
private String disCenterZoningCode;
+
+
+ /**
+ * 办公电话
+ */
+ private String telephone;
+
+ /**
+ * 书记主任
+ */
+ private String secretaryName;
+
}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcPartyMemberRegistDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcPartyMemberRegistDTO.java
new file mode 100644
index 000000000..c1fafeaf7
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcPartyMemberRegistDTO.java
@@ -0,0 +1,94 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 打卡列表
+ *
+ * @author wanggongfeng
+ * @since v1.0.0 2019-12-18
+ */
+@Data
+public class EpdcPartyMemberRegistDTO implements Serializable {
+
+ private static final long serialVersionUID = 2965431582541649116L;
+
+ /**
+ * 现居住社区
+ */
+ private String liveCommunity;
+
+ /**
+ * 现居住社区书记主任
+ */
+ private String liveAddress;
+
+ /**
+ * 现居住社区联系电话
+ */
+ private String liveMobile;
+
+ /**
+ * 现居住社区办公电话
+ */
+ private String liveTelephone;
+
+
+ /**
+ * 现居住社区办公电话
+ */
+ private String liveSecretaryName;
+
+
+ /**
+ * 现居住社区
+ */
+ private String couplingCommunity;
+
+ /**
+ * 现居住社区书记主任
+ */
+ private String couplingAddress;
+
+ /**
+ * 现居住社区联系电话
+ */
+ private String couplingMobile;
+
+ /**
+ * 现居住社区办公电话
+ */
+ private String couplingelephone;
+
+
+ /**
+ * 现居住社区办公电话
+ */
+ private String couplingSecretaryName;
+
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java
index 7dcf48166..dffbfdf54 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java
@@ -6,10 +6,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.dto.form.UserLoginLogDTO;
import com.elink.esua.epdc.dto.form.*;
-import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
-import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
-import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO;
-import com.elink.esua.epdc.dto.result.UserActivePointsResultDTO;
+import com.elink.esua.epdc.dto.result.*;
import com.elink.esua.epdc.service.AppUserService;
import com.elink.esua.epdc.user.dto.epdc.form.*;
import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserGridResultDTO;
@@ -429,7 +426,7 @@ public class ApiAppUserController {
* @return
*/
@PostMapping("/reportparty/save")
- public Result saveReportparty(@LoginUser TokenDto tokenDto, @RequestBody ReportPartyDTO dto) {
+ public Result saveReportparty(@LoginUser TokenDto tokenDto, @RequestBody ReportPartyDTO dto) {
dto.setDeptId(tokenDto.getGridId());
return appUserService.saveReportparty(dto);
}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
index d12d3761d..e9cc637f2 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
@@ -11,10 +11,7 @@ import com.elink.esua.epdc.dto.form.SendMessageFormDTO;
import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -216,4 +213,7 @@ public interface AdminFeignClient {
@PostMapping("sys/voluntarystyle/getListByDeptId")
Result> getVoluntarystyleListByDeptId(VoluntaryStyleDTO dto);
+
+ @PostMapping(value = "sys/dept/getDept", consumes = MediaType.APPLICATION_JSON_VALUE)
+ Result getDept(@RequestBody CityCenterFromDTO formDTO);
}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
index 4020eb1de..e6492bbf2 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
@@ -127,4 +127,9 @@ public class AdminFeignClientFallback implements AdminFeignClient {
public Result> getVoluntarystyleListByDeptId(VoluntaryStyleDTO dto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getVoluntarystyleListByDeptId", dto);
}
+
+ @Override
+ public Result getDept(CityCenterFromDTO formDTO) {
+ return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDept", formDTO);
+ }
}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java
index 998f317fe..5bc5448ab 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java
@@ -5,10 +5,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.form.UserLoginLogDTO;
import com.elink.esua.epdc.dto.form.*;
import com.elink.esua.epdc.dto.form.v2.EpdcCompleteUserInfoFormV2DTO;
-import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
-import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
-import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO;
-import com.elink.esua.epdc.dto.result.UserActivePointsResultDTO;
+import com.elink.esua.epdc.dto.result.*;
import com.elink.esua.epdc.user.dto.epdc.form.*;
import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserGridResultDTO;
import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserInfoResultDTO;
@@ -365,7 +362,7 @@ public interface AppUserService {
* @param dto
* @return
*/
- Result saveReportparty(ReportPartyDTO dto);
+ Result saveReportparty(ReportPartyDTO dto);
/**
* 红色尖兵
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
index 59931f85d..0c111b20c 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
@@ -25,10 +25,7 @@ import com.elink.esua.epdc.dto.form.*;
import com.elink.esua.epdc.dto.form.v2.EpdcCompleteUserInfoFormV2DTO;
import com.elink.esua.epdc.dto.group.form.GroupUserFormDTO;
import com.elink.esua.epdc.dto.group.form.GroupUserPartyMemberFormDTO;
-import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
-import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
-import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO;
-import com.elink.esua.epdc.dto.result.UserActivePointsResultDTO;
+import com.elink.esua.epdc.dto.result.*;
import com.elink.esua.epdc.feign.*;
import com.elink.esua.epdc.jwt.JwtTokenProperties;
import com.elink.esua.epdc.jwt.JwtTokenUtils;
@@ -42,6 +39,7 @@ import com.elink.esua.epdc.user.dto.epdc.EpdcCompleteAppUserDTO;
import com.elink.esua.epdc.user.dto.epdc.EpdcGridLeaderRegisterDTO;
import com.elink.esua.epdc.user.dto.epdc.form.*;
import com.elink.esua.epdc.user.dto.epdc.result.*;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserInfoResultDTO;
import com.elink.esua.epdc.user.dto.party.FlowPartyDTO;
import com.elink.esua.epdc.user.dto.party.KnightPionnerDTO;
import com.elink.esua.epdc.user.dto.party.RedSpearheadDTO;
@@ -1632,8 +1630,31 @@ public class AppUserServiceImpl implements AppUserService {
}
@Override
- public Result saveReportparty(ReportPartyDTO dto) {
- return userFeignClient.saveReportparty(dto);
+ public Result saveReportparty(ReportPartyDTO dto) {
+
+ EpdcPartyMemberRegistDTO partyMemberRegistDTO = new EpdcPartyMemberRegistDTO();
+ CityCenterFromDTO formDTO = new CityCenterFromDTO();
+ if(dto.getDeptId()!=null){
+ formDTO.setDeptId(dto.getDeptId());
+ SysDeptDTO liveDept = adminFeignClient.getDept(formDTO).getData();
+ partyMemberRegistDTO.setLiveAddress(liveDept.getAddress());
+ partyMemberRegistDTO.setLiveCommunity(liveDept.getName());
+ partyMemberRegistDTO.setLiveMobile(liveDept.getMobile());
+ partyMemberRegistDTO.setLiveSecretaryName(liveDept.getSecretaryName());
+ partyMemberRegistDTO.setLiveTelephone(liveDept.getTelephone());
+ }
+ if (null != dto.getCouplingCommunity()) {
+ formDTO.setDeptId(Long.parseLong(String.join(",", dto.getCouplingCommunity())));
+ SysDeptDTO couplingDept = adminFeignClient.getDept(formDTO).getData();
+ partyMemberRegistDTO.setCouplingAddress(couplingDept.getAddress());
+ partyMemberRegistDTO.setCouplingCommunity(couplingDept.getName());
+ partyMemberRegistDTO.setCouplingMobile(couplingDept.getMobile());
+ partyMemberRegistDTO.setCouplingSecretaryName(couplingDept.getSecretaryName());
+ partyMemberRegistDTO.setCouplingelephone(couplingDept.getTelephone());
+ }
+ userFeignClient.saveReportparty(dto);
+
+ return new Result().ok(partyMemberRegistDTO);
}
@Override