elink-star
/
esua-epdc-cloud
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'feature/dangjian'

master
luyan 2 years ago
parent
0802ac78fd 521209c3ad
commit
6a4f25292e
9 changed files with 121 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ActivityPartyDTO.java
  2. 5
      esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ReportPartyDTO.java
  3. 5
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/ReportPartyEntity.java
  4. 19
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ActivityPartyServiceImpl.java
  5. 20
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/FlowPartyServiceImpl.java
  6. 14
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/IntoPartyServiceImpl.java
  7. 19
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/KnightPionnerServiceImpl.java
  8. 19
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/RedSpearheadServiceImpl.java
  9. 19
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java

2
esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ActivityPartyDTO.java
View File

@ -93,7 +93,7 @@ public class ActivityPartyDTO implements Serializable {
/**
* 所有部门ID
*/
private String allDeptIds;
private String[] allDeptIds;
/**
* 所有部门名称

5
esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ReportPartyDTO.java
View File

@ -59,6 +59,11 @@ public class ReportPartyDTO implements Serializable {
*/
private String deptId;
/**
* 是否在市北居住
*/
private Integer shiBei;
/**
* 居住小区名称
*/

5
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/ReportPartyEntity.java
View File

@ -55,6 +55,11 @@ public class ReportPartyEntity extends DeptScope {
*/
private String deptId;
/**
* 是否在市北居住
*/
private Integer shiBei;
/**
* 居住小区名称
*/

19
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ActivityPartyServiceImpl.java
View File

@ -24,6 +24,8 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.commons.tools.exception.RenException;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
@ -110,6 +112,9 @@ public class ActivityPartyServiceImpl extends BaseServiceImpl<ActivityPartyDao,
@Override
@Transactional(rollbackFor = Exception.class)
public void save(ActivityPartyDTO dto) {
if (dto.getAllDeptIds().length == 0) {
setDeptId(dto);
}
ActivityPartyEntity entity = ConvertUtils.sourceToTarget(dto, ActivityPartyEntity.class);
if (null != dto.getReportPartyIds()) {
String[] partyIds = dto.getReportPartyIds();
@ -129,6 +134,8 @@ public class ActivityPartyServiceImpl extends BaseServiceImpl<ActivityPartyDao,
if (StringUtils.isNotEmpty(String.valueOf(dto.getDeptId()))) {
entity.setDeptId(String.valueOf(dto.getDeptId()));
parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
} else {
parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
}
if (!parentResult.success() || parentResult.getData() == null) {
throw new RenException("获取部门信息失败");
@ -145,6 +152,9 @@ public class ActivityPartyServiceImpl extends BaseServiceImpl<ActivityPartyDao,
@Override
@Transactional(rollbackFor = Exception.class)
public void update(ActivityPartyDTO dto) {
if (dto.getAllDeptIds().length == 0) {
setDeptId(dto);
}
ActivityPartyEntity entity = ConvertUtils.sourceToTarget(dto, ActivityPartyEntity.class);
if (null != dto.getReportPartyIds()) {
String[] partyIds = dto.getReportPartyIds();
@ -164,6 +174,8 @@ public class ActivityPartyServiceImpl extends BaseServiceImpl<ActivityPartyDao,
if (StringUtils.isNotEmpty(String.valueOf(dto.getDeptId()))) {
entity.setDeptId(String.valueOf(dto.getDeptId()));
parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
} else {
parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
}
if (!parentResult.success() || parentResult.getData() == null) {
throw new RenException("获取部门信息失败");
@ -184,4 +196,11 @@ public class ActivityPartyServiceImpl extends BaseServiceImpl<ActivityPartyDao,
baseDao.deleteBatchIds(Arrays.asList(ids));
}
private void setDeptId(ActivityPartyDTO dto) {
UserDetail user = SecurityUser.getUser();
String deptId = String.valueOf(user.getDeptId());
dto.setDeptId(user.getDeptId());
dto.setAllDeptIds(new String[]{deptId});
}
}

20
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/FlowPartyServiceImpl.java
View File

@ -23,6 +23,8 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.commons.tools.exception.RenException;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
@ -103,11 +105,16 @@ public class FlowPartyServiceImpl extends BaseServiceImpl<FlowPartyDao, FlowPart
@Override
@Transactional(rollbackFor = Exception.class)
public void save(FlowPartyDTO dto) {
if (dto.getAllDeptIds().length == 0) {
setDeptId(dto);
}
FlowPartyEntity entity = ConvertUtils.sourceToTarget(dto, FlowPartyEntity.class);
Result<ParentAndAllDeptDTO> parentResult = null;
if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
} else {
parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
}
if (!parentResult.success() || parentResult.getData() == null) {
throw new RenException("获取部门信息失败");
@ -125,11 +132,17 @@ public class FlowPartyServiceImpl extends BaseServiceImpl<FlowPartyDao, FlowPart
@Override
@Transactional(rollbackFor = Exception.class)
public void update(FlowPartyDTO dto) {
if (dto.getAllDeptIds().length == 0) {
setDeptId(dto);
}
FlowPartyEntity entity = ConvertUtils.sourceToTarget(dto, FlowPartyEntity.class);
Result<ParentAndAllDeptDTO> parentResult = null;
if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
} else {
parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
}
if (!parentResult.success() || parentResult.getData() == null) {
throw new RenException("获取部门信息失败");
@ -150,4 +163,11 @@ public class FlowPartyServiceImpl extends BaseServiceImpl<FlowPartyDao, FlowPart
baseDao.deleteBatchIds(Arrays.asList(ids));
}
private void setDeptId(FlowPartyDTO dto) {
UserDetail user = SecurityUser.getUser();
String deptId = String.valueOf(user.getDeptId());
dto.setDeptId(user.getDeptId());
dto.setAllDeptIds(new String[]{deptId});
}
}

14
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/IntoPartyServiceImpl.java
View File

@ -23,6 +23,8 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.commons.tools.exception.RenException;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
@ -92,11 +94,16 @@ public class IntoPartyServiceImpl extends BaseServiceImpl<IntoPartyDao, IntoPart
@Override
@Transactional(rollbackFor = Exception.class)
public void save(IntoPartyFormDTO dto) {
if (dto.getAllDeptIds().length == 0) {
setDeptId(dto);
}
IntoPartyEntity entity = ConvertUtils.sourceToTarget(dto, IntoPartyEntity.class);
Result<ParentAndAllDeptDTO> parentResult = null;
if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
entity.setDeptId(Long.parseLong(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]));
parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
} else {
parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
}
if (!parentResult.success() || parentResult.getData() == null) {
throw new RenException("获取部门信息失败");
@ -125,4 +132,11 @@ public class IntoPartyServiceImpl extends BaseServiceImpl<IntoPartyDao, IntoPart
baseDao.deleteBatchIds(Arrays.asList(ids));
}
private void setDeptId(IntoPartyFormDTO dto) {
UserDetail user = SecurityUser.getUser();
String deptId = String.valueOf(user.getDeptId());
dto.setDeptId(deptId);
dto.setAllDeptIds(new String[]{deptId});
}
}

19
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/KnightPionnerServiceImpl.java
View File

@ -23,6 +23,8 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.commons.tools.exception.RenException;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
@ -103,11 +105,17 @@ public class KnightPionnerServiceImpl extends BaseServiceImpl<KnightPionnerDao,
@Override
@Transactional(rollbackFor = Exception.class)
public void save(KnightPionnerDTO dto) {
if (dto.getAllDeptIds().length == 0) {
setDeptId(dto);
}
KnightPionnerEntity entity = ConvertUtils.sourceToTarget(dto, KnightPionnerEntity.class);
Result<ParentAndAllDeptDTO> parentResult = null;
if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
} else {
parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
}
if (!parentResult.success() || parentResult.getData() == null) {
throw new RenException("获取部门信息失败");
@ -124,11 +132,16 @@ public class KnightPionnerServiceImpl extends BaseServiceImpl<KnightPionnerDao,
@Override
@Transactional(rollbackFor = Exception.class)
public void update(KnightPionnerDTO dto) {
if (dto.getAllDeptIds().length == 0) {
setDeptId(dto);
}
KnightPionnerEntity entity = ConvertUtils.sourceToTarget(dto, KnightPionnerEntity.class);
Result<ParentAndAllDeptDTO> parentResult = null;
if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
} else {
parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
}
if (!parentResult.success() || parentResult.getData() == null) {
throw new RenException("获取部门信息失败");
@ -149,4 +162,10 @@ public class KnightPionnerServiceImpl extends BaseServiceImpl<KnightPionnerDao,
baseDao.deleteBatchIds(Arrays.asList(ids));
}
private void setDeptId(KnightPionnerDTO dto) {
UserDetail user = SecurityUser.getUser();
String deptId = String.valueOf(user.getDeptId());
dto.setDeptId(user.getDeptId());
dto.setAllDeptIds(new String[]{deptId});
}
}

19
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/RedSpearheadServiceImpl.java
View File

@ -23,6 +23,8 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.commons.tools.exception.RenException;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
@ -103,11 +105,16 @@ public class RedSpearheadServiceImpl extends BaseServiceImpl<RedSpearheadDao, Re
@Override
@Transactional(rollbackFor = Exception.class)
public void save(RedSpearheadDTO dto) {
if (dto.getAllDeptIds().length == 0) {
setDeptId(dto);
}
RedSpearheadEntity entity = ConvertUtils.sourceToTarget(dto, RedSpearheadEntity.class);
Result<ParentAndAllDeptDTO> parentResult = null;
if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
} else {
parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
}
if (!parentResult.success() || parentResult.getData() == null) {
throw new RenException("获取部门信息失败");
@ -124,11 +131,16 @@ public class RedSpearheadServiceImpl extends BaseServiceImpl<RedSpearheadDao, Re
@Override
@Transactional(rollbackFor = Exception.class)
public void update(RedSpearheadDTO dto) {
if (dto.getAllDeptIds().length == 0) {
setDeptId(dto);
}
RedSpearheadEntity entity = ConvertUtils.sourceToTarget(dto, RedSpearheadEntity.class);
Result<ParentAndAllDeptDTO> parentResult = null;
if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
} else {
parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
}
if (!parentResult.success() || parentResult.getData() == null) {
throw new RenException("获取部门信息失败");
@ -149,4 +161,11 @@ public class RedSpearheadServiceImpl extends BaseServiceImpl<RedSpearheadDao, Re
baseDao.deleteBatchIds(Arrays.asList(ids));
}
private void setDeptId(RedSpearheadDTO dto) {
UserDetail user = SecurityUser.getUser();
String deptId = String.valueOf(user.getDeptId());
dto.setDeptId(user.getDeptId());
dto.setAllDeptIds(new String[]{deptId});
}
}

19
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java
View File

@ -23,6 +23,8 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.commons.tools.exception.RenException;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
@ -94,11 +96,16 @@ public class ReportPartyServiceImpl extends BaseServiceImpl<ReportPartyDao, Repo
@Override
@Transactional(rollbackFor = Exception.class)
public void save(ReportPartyDTO dto) {
if (dto.getAllDeptIds().length == 0) {
setDeptId(dto);
}
ReportPartyEntity entity = ConvertUtils.sourceToTarget(dto, ReportPartyEntity.class);
Result<ParentAndAllDeptDTO> parentResult = null;
if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
} else {
parentResult = adminFeignClient.getParentAndAllDept(dto.getDeptId());
}
if (!parentResult.success() || parentResult.getData() == null) {
throw new RenException("获取部门信息失败");
@ -115,11 +122,16 @@ public class ReportPartyServiceImpl extends BaseServiceImpl<ReportPartyDao, Repo
@Override
@Transactional(rollbackFor = Exception.class)
public void update(ReportPartyDTO dto) {
if (dto.getAllDeptIds().length == 0) {
setDeptId(dto);
}
ReportPartyEntity entity = ConvertUtils.sourceToTarget(dto, ReportPartyEntity.class);
Result<ParentAndAllDeptDTO> parentResult = null;
if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
} else {
parentResult = adminFeignClient.getParentAndAllDept(dto.getDeptId());
}
if (!parentResult.success() || parentResult.getData() == null) {
throw new RenException("获取部门信息失败");
@ -140,4 +152,11 @@ public class ReportPartyServiceImpl extends BaseServiceImpl<ReportPartyDao, Repo
baseDao.deleteBatchIds(Arrays.asList(ids));
}
private void setDeptId(ReportPartyDTO dto) {
UserDetail user = SecurityUser.getUser();
String deptId = String.valueOf(user.getDeptId());
dto.setDeptId(deptId);
dto.setAllDeptIds(new String[]{deptId});
}
}

Write Preview
Loading…
Cancel
Save