Browse Source

Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master'

dev
yinzuomei 2 years ago
parent
commit
8f83353e49
  1. 13
      epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictDataController.java
  2. 2
      epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictDataService.java
  3. 30
      epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/SysDictDataServiceImpl.java
  4. 2
      epmet-cloud-generator/src/main/resources/application.yml
  5. 35
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerStaffDTO.java
  6. 39
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java
  7. 16
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java
  8. 10
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java
  9. 26
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java
  10. 34
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java
  11. 26
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java
  12. 8
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java
  13. 17
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodAddFormDTO.java
  14. 12
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java
  15. 33
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java
  16. 80
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityBuildingManagerPageFormDTO.java
  17. 26
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java
  18. 110
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityBuildingManagerDTO.java
  19. 29
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java
  20. 99
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java
  21. 111
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java
  22. 54
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
  23. 18
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java
  24. 50
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CommunityBuildingManagerDao.java
  25. 5
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPropertyManagementDao.java
  26. 86
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CommunityBuildingManagerEntity.java
  27. 27
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java
  28. 8
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java
  29. 17
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodEntity.java
  30. 9
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java
  31. 66
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java
  32. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java
  33. 144
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java
  34. 20
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
  35. 29
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java
  36. 94
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CommunityBuildingManagerDao.xml
  37. 6
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml
  38. 25
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java
  39. 139
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java
  40. 28
      epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java
  41. 140
      epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java
  42. 4
      epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiTripReportSyncProcessor.java
  43. 37
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
  44. 8
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

13
epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictDataController.java

@ -20,6 +20,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.SysDictDataDTO;
import com.epmet.service.SysDictDataService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -118,6 +119,18 @@ public class SysDictDataController {
return new Result<List<OptionResultDTO>>().ok(sysDictDataService.getNationOption());
}
/**
* 字典下拉框接口
* @param dictType
* @return
*/
@PostMapping("dictOption/{dictType}")
public Result<List<OptionResultDTO>> getDictOption(@PathVariable("dictType")String dictType) {
if(StringUtils.isBlank(dictType)){
return new Result<>();
}
return new Result<List<OptionResultDTO>>().ok(sysDictDataService.getDictOption(dictType));
}
/**
* @Description 人员关系
* @Param

2
epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictDataService.java

@ -92,4 +92,6 @@ public interface SysDictDataService extends BaseService<SysDictDataEntity> {
List<DictTreeResultDTO> dictListTree(String dictType);
List<SysDictDataDTO> getDictDataList(String dictType);
List<OptionResultDTO> getDictOption(String dictType);
}

30
epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/SysDictDataServiceImpl.java

@ -23,14 +23,17 @@ import com.epmet.commons.tools.redis.RedisUtils;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.TreeUtils;
import com.epmet.dao.SysDictDataDao;
import com.epmet.dao.SysDictTypeDao;
import com.epmet.dto.SysDictDataDTO;
import com.epmet.entity.SysDictDataEntity;
import com.epmet.entity.SysDictTypeEntity;
import com.epmet.service.SysDictDataService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@ -43,6 +46,9 @@ import java.util.stream.Collectors;
*/
@Service
public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysDictDataEntity> implements SysDictDataService {
@Autowired
private SysDictTypeDao sysDictTypeDao;
@Autowired
private RedisUtils redisUtils;
@ -284,4 +290,28 @@ public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysD
return baseDao.selectDictDataList(dictType);
}
/**
* 传入dictType返回字典列表
* @param dictType
* @return
*/
@Override
public List<OptionResultDTO> getDictOption(String dictType) {
LambdaQueryWrapper<SysDictTypeEntity> queryWrapper=new LambdaQueryWrapper<>();
queryWrapper.eq(SysDictTypeEntity::getDictType,dictType);
SysDictTypeEntity sysDictTypeEntity=sysDictTypeDao.selectOne(queryWrapper);
if(null==sysDictTypeEntity){
return new ArrayList<>();
}
LambdaQueryWrapper<SysDictDataEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SysDictDataEntity::getDictTypeId,sysDictTypeEntity.getId() );
wrapper.orderByAsc(SysDictDataEntity::getSort);
List<SysDictDataEntity> list = baseDao.selectList(wrapper);
return list.stream().map(item -> {
OptionResultDTO dto = new OptionResultDTO();
dto.setValue(item.getDictValue());
dto.setLabel(item.getDictLabel());
return dto;
}).collect(Collectors.toList());
}
}

2
epmet-cloud-generator/src/main/resources/application.yml

@ -9,7 +9,7 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource
#MySQL配置
driverClassName: com.mysql.jdbc.Driver
url: jdbc:mysql://118.190.150.119:43306/epmet_gov_org?useUnicode=true&characterEncoding=UTF-8&useSSL=false
url: jdbc:mysql://192.168.1.140:3306/epmet_gov_org?useUnicode=true&characterEncoding=UTF-8&useSSL=false
username: root
password: root
#oracle配置

35
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerStaffDTO.java

@ -134,4 +134,39 @@ public class CustomerStaffDTO implements Serializable {
*/
private String password;
/**
* 烟台用当前登录用户
*/
private String currentUserId;
/**
* 烟台需求党组织职务
*/
private String partyPosition;
/**
* 烟台需求村居委员职务
*/
private String viliagePosition;
/**
* 烟台需求工作职责
*/
private String duty;
/**
* 烟台需求备注
*/
private String remark;
/**
* 文化程度
*/
private String culture;
/**
* 身份证
*/
private String idCard;
}

39
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java

@ -48,4 +48,43 @@ public class StaffDetailV2FormDTO implements Serializable {
private List<String> szsqRoles;
private String customerId;
/**
* 烟台用当前登录用户
*/
private String currentUserId;
/**
* 烟台需求党组织职务
*/
private String partyPosition;
/**
* 烟台需求村居委员职务
*/
private String viliagePosition;
/**
* 烟台需求工作职责
*/
private String duty;
/**
* 烟台需求备注
*/
private String remark;
/**
* 文化程度
*/
private String culture;
/**
* 身份证
*/
private String idCard;
/**
* 居住地址
*/
private String address;
}

16
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java

@ -165,4 +165,20 @@ public class IcNeighborHoodDTO implements Serializable {
*/
private String buildingName;
/**
* 烟台需求自然村/小区
*/
private String viliageType;
/**
* 烟台需求面积
*/
private String area;
/**
* 烟台需求开放类型
*/
private String openType;
/**
* 烟台需求建筑年代
*/
private String buildYear;
}

10
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java

@ -48,6 +48,16 @@ public class IcPropertyManagementDTO implements Serializable {
*/
private String customerId;
/**
* 烟台需求物业联系人姓名
*/
private String contactName;
/**
* 烟台需求物业联系人电话
*/
private String contactMobile;
/**
* 删除标识 0未删除1已删除
*/

26
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java

@ -124,4 +124,30 @@ public class AddAgencyV2FormDTO implements Serializable {
*/
@Length(max = 500,message ="最多输入500字",groups =DefaultUserShowGroup.class )
private String remark;
/**
* 村居/社区书记姓名
*/
private String secretaryName;
/**
* 村居/社区书记电话
*/
private String secretaryMobile;
/**
* 值班电话
*/
private String dutyMobile;
/**
* 统一社会信用代码
*/
private String unifiedSocialCreditCode;
/**
* 统一社会信用代码证书图片附件
*/
private String unifiedSocialCreditCodeCertificate;
/**
* 详细地址
*/
private String fullAddress;
}

34
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java

@ -78,4 +78,38 @@ public class AddStaffV2FromDTO implements Serializable {
* 烟台用当前登录用户
*/
private String currentUserId;
/**
* 烟台需求党组织职务
*/
private String partyPosition;
/**
* 烟台需求村居委员职务
*/
private String viliagePosition;
/**
* 烟台需求工作职责
*/
private String duty;
/**
* 烟台需求备注
*/
private String remark;
/**
* 文化程度
*/
private String culture;
/**
* 身份证
*/
private String idCard;
/**
* 居住地址
*/
private String address;
}

26
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java

@ -113,4 +113,30 @@ public class EditAgencyFormDTO implements Serializable {
@Length(max = 500,message = "最多输入500字",groups =DefaultUserShowGroup.class )
private String remark;
/**
* 村居/社区书记姓名
*/
private String secretaryName;
/**
* 村居/社区书记电话
*/
private String secretaryMobile;
/**
* 值班电话
*/
private String dutyMobile;
/**
* 统一社会信用代码
*/
private String unifiedSocialCreditCode;
/**
* 统一社会信用代码证书图片附件
*/
private String unifiedSocialCreditCodeCertificate;
/**
* 详细地址
*/
private String fullAddress;
}

8
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java

@ -112,5 +112,13 @@ public class IcHouseAddFormDTO implements Serializable {
* 房屋可编辑编码
*/
private String coding;
/**
* 所在楼层
*/
private String floor;
/**
* 面积
*/
private String area;
}

17
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodAddFormDTO.java

@ -113,6 +113,21 @@ public class IcNeighborHoodAddFormDTO extends PageFormDTO {
* 实有楼栋数
*/
private Integer realBuilding;
/**
* 烟台需求自然村/小区
*/
private String viliageType;
/**
* 烟台需求面积
*/
private String area;
/**
* 烟台需求开放类型
*/
private String openType;
/**
* 烟台需求建筑年代
*/
private String buildYear;
}

12
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java

@ -52,6 +52,18 @@ public class IcPropertyManagementFormDTO implements Serializable {
@Length(max = 50, message = "物业名称不能超过50个字", groups = {AddShowGroup.class})
private String name;
/**
* 烟台需求物业联系人姓名
*/
@Length(max = 30, message = "物业联系人不能超过30个字", groups = {AddShowGroup.class, UpdateShowGroup.class})
private String contactName;
/**
* 烟台需求物业联系人电话
*/
@Length(max = 30, message = "联系电话不能超过30个字",groups = {AddShowGroup.class, UpdateShowGroup.class})
private String contactMobile;
private String customerId;
@NotNull(message = "pageNo不能为空", groups = PageGroup.class)

33
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java

@ -74,4 +74,37 @@ public class StaffSubmitFromDTO implements Serializable {
* 社会自组织: community_org
*/
private String deptType;
/**
* 烟台需求党组织职务
*/
private String partyPosition;
/**
* 烟台需求村居委员职务
*/
private String viliagePosition;
/**
* 烟台需求工作职责
*/
private String duty;
/**
* 烟台需求备注
*/
private String remark;
/**
* 文化程度
*/
private String culture;
/**
* 身份证
*/
private String idCard;
/**
* 居住地址
*/
private String address;
}

80
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityBuildingManagerPageFormDTO.java

@ -0,0 +1,80 @@
package com.epmet.dto.form.yt;
import com.epmet.commons.tools.dto.form.PageFormDTO;
import lombok.Data;
/**
* @Description
* @Author yzm
* @Date 2023/5/6 13:53
*/
@Data
public class CommunityBuildingManagerPageFormDTO extends PageFormDTO {
// start
private String customerId;
private String staffId;
/**
* 工作人员所属组织的org_id_path
* 列表数据应查询本组织及下级
* 网格的全路径包含网格id
*/
private String orgIdPath;
// end
/**
* 姓名
*/
private String name;
/**
* 联系电话
*/
private String phone;
/**
* 身份证号
*/
private String idCard;
/**
* 类型0楼长1单元长
*/
private String type;
/**
* 所属区县id取名字关联customer_agency
*/
private String districtId;
/**
* 所属街道id取名字关联customer_agency
*/
private String streetId;
/**
* 所属社区id取名字关联customer_agency
*/
private String communityId;
/**
* 所属网格id取名字关联customer_grid
*/
private String gridId;
/**
* 所属小区id
*/
private String viliageId;
/**
* 所属楼栋id
*/
private String buildingId;
/**
* 所属单元id; 单元长时必填此列
*/
private String unitId;
}

26
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java

@ -137,4 +137,30 @@ public class AgencysResultDTO implements Serializable {
private String remark;
private String coordinates;
/**
* 村居/社区书记姓名
*/
private String secretaryName;
/**
* 村居/社区书记电话
*/
private String secretaryMobile;
/**
* 值班电话
*/
private String dutyMobile;
/**
* 统一社会信用代码
*/
private String unifiedSocialCreditCode;
/**
* 统一社会信用代码证书图片附件
*/
private String unifiedSocialCreditCodeCertificate;
/**
* 详细地址
*/
private String fullAddress;
}

110
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityBuildingManagerDTO.java

@ -0,0 +1,110 @@
package com.epmet.dto.result;
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 楼长单元长信息表烟台
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2023-05-06
*/
@Data
public class CommunityBuildingManagerDTO implements Serializable {
private static final long serialVersionUID = -2526419541953300212L;
public interface AddShowGroup extends CustomerClientShowGroup {
}
public interface UpdateShowGroup extends CustomerClientShowGroup {
}
/**
* 主键烟台需求
*/
@NotBlank(message ="id不能为空" ,groups = {UpdateShowGroup.class})
private String id;
/**
* 客户Id customer.id
*/
private String customerId;
/**
* 姓名
*/
@Length(max = 50,message = "姓名最多输入50字",groups = {AddShowGroup.class,UpdateShowGroup.class})
@NotBlank(message ="姓名不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class})
private String name;
/**
* 联系电话
*/
@Length(max = 50,message = "联系电话最多输入50字",groups = {AddShowGroup.class,UpdateShowGroup.class})
@NotBlank(message ="联系电话不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class})
private String phone;
/**
* 身份证号
*/
@Length(max = 50,message = "身份证号最多输入50字",groups = {AddShowGroup.class,UpdateShowGroup.class})
@NotBlank(message ="身份证号不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class})
private String idCard;
/**
* 类型0楼长1单元长
*/
@NotBlank(message ="类型不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class})
private String type;
/**
* 所属区县id取名字关联customer_agency
*/
@NotBlank(message ="所属区县不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class})
private String districtId;
/**
* 所属街道id取名字关联customer_agency
*/
@NotBlank(message ="所属街道不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class})
private String streetId;
/**
* 所属社区id取名字关联customer_agency
*/
@NotBlank(message ="所属社区不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class})
private String communityId;
/**
* 所属网格id取名字关联customer_grid
*/
@NotBlank(message ="所属网格不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class})
private String gridId;
/**
* 网格的全路径包含网格id
*/
private String orgIdPath;
/**
* 所属小区id
*/
@NotBlank(message ="所属小区不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class})
private String viliageId;
/**
* 所属楼栋id
*/
@NotBlank(message ="楼栋不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class})
private String buildingId;
/**
* 所属单元id; 单元长时必填此列
*/
private String unitId;
}

29
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java

@ -55,4 +55,33 @@ public class StaffInitResultDTO implements Serializable {
* xxx-xxx
*/
private String agencyName;
/**
* 烟台需求党组织职务
*/
private String partyPosition;
/**
* 烟台需求村居委员职务
*/
private String viliagePosition;
/**
* 烟台需求工作职责
*/
private String duty;
/**
* 烟台需求备注
*/
private String remark;
/**
* 文化程度
*/
private String culture;
private String address;
}

99
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java

@ -0,0 +1,99 @@
package com.epmet.dto.result.yt;
import lombok.Data;
import java.io.Serializable;
/**
* 楼长单元长信息表烟台
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2023-05-06
*/
@Data
public class CommunityBuildingManagerResultDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键烟台需求
*/
private String id;
/**
* 客户Id customer.id
*/
private String customerId;
/**
* 姓名
*/
private String name;
/**
* 联系电话
*/
private String phone;
/**
* 身份证号
*/
private String idCard;
/**
* 类型0楼长1单元长
*/
private String type;
/**
* 所属区县id取名字关联customer_agency
*/
private String districtId;
private String districtName;
/**
* 所属街道id取名字关联customer_agency
*/
private String streetId;
private String streetName;
/**
* 所属社区id取名字关联customer_agency
*/
private String communityId;
private String communityName;
/**
* 所属网格id取名字关联customer_grid
*/
private String gridId;
private String gridName;
/**
* 网格的全路径包含网格id
*/
private String orgIdPath;
/**
* 所属小区id
*/
private String viliageId;
private String viliageName;
/**
* 所属楼栋id
*/
private String buildingId;
private String buildingName;
/**
* 所属单元id; 单元长时必填此列
*/
private String unitId;
/**
* 所属单元id; 单元长时必填此列
*/
private String unitName;
}

111
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java

@ -0,0 +1,111 @@
package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.aop.NoRepeatSubmit;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.form.yt.CommunityBuildingManagerPageFormDTO;
import com.epmet.dto.result.CommunityBuildingManagerDTO;
import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO;
import com.epmet.service.CommunityBuildingManagerService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 楼长单元长信息表烟台
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2023-05-06
*/
@RestController
@RequestMapping("communityBuildingManager")
public class CommunityBuildingManagerController {
@Autowired
private CommunityBuildingManagerService communityBuildingManagerService;
/**
* 列表分页查询
* @param formDTO
* @return
*/
@RequestMapping("page")
public Result<PageData<CommunityBuildingManagerResultDTO>> page(@LoginUser TokenDto tokenDto, @RequestBody CommunityBuildingManagerPageFormDTO formDTO){
formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setStaffId(tokenDto.getUserId());
PageData<CommunityBuildingManagerResultDTO> page = communityBuildingManagerService.page(formDTO);
return new Result<PageData<CommunityBuildingManagerResultDTO>>().ok(page);
}
/**
* 查看详情
* @param id
* @return
*/
@RequestMapping(value = "detail/{id}",method = {RequestMethod.POST})
public Result<CommunityBuildingManagerResultDTO> get(@PathVariable("id") String id){
CommunityBuildingManagerResultDTO data = communityBuildingManagerService.get(id);
return new Result<CommunityBuildingManagerResultDTO>().ok(data);
}
/**
* 新增楼长/单元长
* todo: 同步到具体的楼栋
* @param dto
* @return
*/
@NoRepeatSubmit
@PostMapping("save")
public Result save(@LoginUser TokenDto tokenDto,@RequestBody CommunityBuildingManagerDTO dto){
dto.setCustomerId(tokenDto.getCustomerId());
ValidatorUtils.validateEntity(dto, CommunityBuildingManagerDTO.AddShowGroup.class);
//类型:0楼长;1单元长
if("1".equals(dto.getType())&& StringUtils.isBlank(dto.getUnitId())){
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"单元长必须选择所属单元","单元长必须选择所属单元");
}
communityBuildingManagerService.save(dto);
return new Result();
}
/**
* 编辑楼长/单元长
* todo: 同步到具体的楼栋
* @param dto
* @return
*/
@NoRepeatSubmit
@PostMapping("update")
public Result update(@RequestBody CommunityBuildingManagerDTO dto){
ValidatorUtils.validateEntity(dto, CommunityBuildingManagerDTO.UpdateShowGroup.class);
//类型:0楼长;1单元长
if("1".equals(dto.getType())&& StringUtils.isBlank(dto.getUnitId())){
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"单元长必须选择所属单元","单元长必须选择所属单元");
}
communityBuildingManagerService.update(dto);
return new Result();
}
/**
* 批量删除楼长/单元长
* todo: 同时清空楼栋表里的信息
* @param ids
* @return
*/
@PostMapping("delete")
public Result delete(@RequestBody List<String> ids){
if(!CollectionUtils.isEmpty(ids)){
communityBuildingManagerService.delete(ids);
}
return new Result();
}
}

54
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java

@ -19,6 +19,9 @@ package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.constant.AppClientConstant;
import com.epmet.commons.tools.enums.OrgLevelEnum;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
@ -41,6 +44,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@ -564,4 +568,54 @@ public class CustomerAgencyController {
return new Result<PageData<CommunityListByAgencyIdResultDTO>>().ok(customerAgencyService.getCommunityList(dto));
}
/**
* 返回区县列表
* @param tokenDto
* @return
*/
@PostMapping("districtList")
public Result<List<CustomerAgencyDTO>> districtList(@LoginUser TokenDto tokenDto){
Map<String, Object> params=new HashMap<>();
params.put("CUSTOMER_ID",tokenDto.getCustomerId());
params.put("LEVEL",OrgLevelEnum.DISTRICT.getCode());
params.put("PID",null);
return new Result<List<CustomerAgencyDTO>>().ok(customerAgencyService.list(params));
}
/**
* 返回街道列表必传区县
* @param tokenDto
* @param districtId
* @return
*/
@PostMapping("streetList/{districtId}")
public Result<List<CustomerAgencyDTO>> streetList(@LoginUser TokenDto tokenDto,@PathVariable("districtId")String districtId){
if(StringUtils.isBlank(districtId)){
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"districtId为空","请先选择区县");
}
Map<String, Object> params=new HashMap<>();
params.put("CUSTOMER_ID",tokenDto.getCustomerId());
params.put("LEVEL",OrgLevelEnum.STREET.getCode());
params.put("PID",districtId);
return new Result<List<CustomerAgencyDTO>>().ok(customerAgencyService.list(params));
}
/**
* 返回社区列表街道必传
* @param tokenDto
* @param streetId
* @return
*/
@PostMapping("communityList/{streetId}")
public Result<List<CustomerAgencyDTO>> communityList(@LoginUser TokenDto tokenDto,@PathVariable("streetId")String streetId){
if(StringUtils.isBlank(streetId)){
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"streetId为空","请先选择街道");
}
Map<String, Object> params=new HashMap<>();
params.put("CUSTOMER_ID",tokenDto.getCustomerId());
params.put("LEVEL",OrgLevelEnum.COMMUNITY.getCode());
params.put("PID",streetId);
return new Result<List<CustomerAgencyDTO>>().ok(customerAgencyService.list(params));
}
}

18
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java

@ -49,13 +49,15 @@ public class PropertyManagementController {
@Autowired
private PropertyManagementService propertyManagementService;
/**
* 分页查询物业列表
* 物业管理-分页查询物业列表
*/
@PostMapping("page")
public Result<PageData<IcPropertyManagementDTO>> page(@RequestBody IcPropertyManagementFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO,IcPropertyManagementFormDTO.PageGroup.class);
return new Result<PageData<IcPropertyManagementDTO>>().ok(propertyManagementService.page(formDTO.getPageNo(),formDTO.getPageSize(),formDTO.getName()));
return new Result<PageData<IcPropertyManagementDTO>>().ok(propertyManagementService.page(formDTO.getPageNo(),formDTO.getPageSize(),formDTO.getName(),
formDTO.getContactName(),formDTO.getContactMobile()));
}
/**
@ -68,7 +70,7 @@ public class PropertyManagementController {
}
/**
* 新增物业
* 物业管理-新增物业
* 新增小区页面添加小区也调用此接口
* @param tokenDTO
* @param formDTO
@ -84,6 +86,11 @@ public class PropertyManagementController {
return new Result().ok(map);
}
/**
* 物业管理-修改
* @param formDTO
* @return
*/
@PostMapping("update")
public Result update(@RequestBody IcPropertyManagementFormDTO formDTO){
//效验数据
@ -92,6 +99,11 @@ public class PropertyManagementController {
return new Result();
}
/**
* 物业管理-删除
* @param formDTO
* @return
*/
@PostMapping("delete")
public Result delete(@RequestBody IcPropertyManagementFormDTO formDTO){
//效验数据

50
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CommunityBuildingManagerDao.java

@ -0,0 +1,50 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO;
import com.epmet.entity.CommunityBuildingManagerEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 楼长单元长信息表烟台
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2023-05-06
*/
@Mapper
public interface CommunityBuildingManagerDao extends BaseDao<CommunityBuildingManagerEntity> {
/**
* 楼长单元长分页列表查询
* @param customerId
* @param orgIdPath
* @param name
* @param phone
* @param idCard
* @param type
* @param districtId
* @param streetId
* @param communityId
* @param gridId
* @param viliageId
* @param buildingId
* @param unitId
* @return
*/
List<CommunityBuildingManagerResultDTO> pageList(@Param("customerId") String customerId,
@Param("orgIdPath")String orgIdPath,
@Param("name")String name,
@Param("phone")String phone,
@Param("idCard")String idCard,
@Param("type")String type,
@Param("districtId")String districtId,
@Param("streetId")String streetId,
@Param("communityId")String communityId,
@Param("gridId")String gridId,
@Param("viliageId")String viliageId,
@Param("buildingId")String buildingId,
@Param("unitId")String unitId,
@Param("id")String id);
}

5
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPropertyManagementDao.java

@ -59,5 +59,8 @@ public interface IcPropertyManagementDao extends BaseDao<IcPropertyManagementEnt
*/
List<IcPropertyManagementDTO> selectPropertyNameList(String neighborhoodId);
List<IcPropertyManagementDTO> queryList(@Param("customerId") String customerId,@Param("name")String name);
List<IcPropertyManagementDTO> queryList(@Param("customerId") String customerId,
@Param("name")String name,
@Param("contactName") String contactName,
@Param("contactMobile") String contactMobile);
}

86
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CommunityBuildingManagerEntity.java

@ -0,0 +1,86 @@
package com.epmet.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 楼长单元长信息表烟台
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2023-05-06
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("community_building_manager")
public class CommunityBuildingManagerEntity extends BaseEpmetEntity {
private static final long serialVersionUID = 1L;
/**
* 客户Id customer.id
*/
private String customerId;
/**
* 姓名
*/
private String name;
/**
* 联系电话
*/
private String phone;
/**
* 身份证号
*/
private String idCard;
/**
* 类型0楼长1单元长
*/
private String type;
/**
* 所属区县id取名字关联customer_agency
*/
private String districtId;
/**
* 所属街道id取名字关联customer_agency
*/
private String streetId;
/**
* 所属社区id取名字关联customer_agency
*/
private String communityId;
/**
* 所属网格id取名字关联customer_grid
*/
private String gridId;
/**
* 网格的全路径包含网格id
*/
private String orgIdPath;
/**
* 所属小区id
*/
private String viliageId;
/**
* 所属楼栋id
*/
private String buildingId;
/**
* 所属单元id; 单元长时必填此列
*/
private String unitId;
}

27
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java

@ -149,4 +149,31 @@ public class CustomerAgencyEntity extends BaseEpmetEntity {
*/
private String remark;
/**
* 村居/社区书记姓名
*/
private String secretaryName;
/**
* 村居/社区书记电话
*/
private String secretaryMobile;
/**
* 值班电话
*/
private String dutyMobile;
/**
* 统一社会信用代码
*/
private String unifiedSocialCreditCode;
/**
* 统一社会信用代码证书图片附件
*/
private String unifiedSocialCreditCodeCertificate;
/**
* 详细地址
*/
private String fullAddress;
}

8
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java

@ -136,4 +136,12 @@ public class IcHouseEntity extends BaseEpmetEntity {
* 房屋可编辑编码
*/
private String coding;
/**
* 所在楼层
*/
private String floor;
/**
* 面积
*/
private String area;
}

17
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodEntity.java

@ -121,4 +121,21 @@ public class IcNeighborHoodEntity extends BaseEpmetEntity {
* 二维码地址
*/
private String qrcodeUrl;
/**
* 烟台需求自然村/小区
*/
private String viliageType;
/**
* 烟台需求面积
*/
private String area;
/**
* 烟台需求开放类型
*/
private String openType;
/**
* 烟台需求建筑年代
*/
private String buildYear;
}

9
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java

@ -40,4 +40,13 @@ public class IcPropertyManagementEntity extends BaseEpmetEntity {
*/
private String name;
private String customerId;
/**
* 烟台需求物业联系人姓名
*/
private String contactName;
/**
* 烟台需求物业联系人电话
*/
private String contactMobile;
}

66
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java

@ -0,0 +1,66 @@
package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.form.yt.CommunityBuildingManagerPageFormDTO;
import com.epmet.dto.result.CommunityBuildingManagerDTO;
import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO;
import com.epmet.entity.CommunityBuildingManagerEntity;
import java.util.List;
/**
* 楼长单元长信息表烟台
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2023-05-06
*/
public interface CommunityBuildingManagerService extends BaseService<CommunityBuildingManagerEntity> {
/**
* 默认分页
*
* @param formDTO
* @return PageData<CommunityBuildingManagerResultDTO>
* @author generator
* @date 2023-05-06
*/
PageData<CommunityBuildingManagerResultDTO> page(CommunityBuildingManagerPageFormDTO formDTO);
/**
* 查看详情
*
* @param id
* @return CommunityBuildingManagerResultDTO
* @author generator
* @date 2023-05-06
*/
CommunityBuildingManagerResultDTO get(String id);
/**
* 新增楼长/单元长
* todo: 同步到具体的楼栋表
*
* @param dto
* @return
*/
void save(CommunityBuildingManagerDTO dto);
/**
* 编辑楼长/单元长
* todo: 同步到具体的楼栋
*
* @param dto
* @return
*/
void update(CommunityBuildingManagerDTO dto);
/**
* 批量删除楼长/单元长
* todo: 同时清空楼栋表里的信息
*
* @param ids
* @return
*/
void delete(List<String> ids);
}

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java

@ -39,5 +39,5 @@ public interface PropertyManagementService {
void update(IcPropertyManagementFormDTO formDTO);
void delete(IcPropertyManagementFormDTO formDTO);
PageData<IcPropertyManagementDTO> page(Integer pageNo, Integer pageSize, String name);
PageData<IcPropertyManagementDTO> page(Integer pageNo, Integer pageSize, String name,String contactName,String contactMobile);
}

144
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java

@ -0,0 +1,144 @@
package com.epmet.service.impl;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.EpmetRequestHolder;
import com.epmet.commons.tools.utils.PidUtils;
import com.epmet.commons.tools.utils.SpringContextUtils;
import com.epmet.dao.CommunityBuildingManagerDao;
import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.form.yt.CommunityBuildingManagerPageFormDTO;
import com.epmet.dto.result.CommunityBuildingManagerDTO;
import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO;
import com.epmet.entity.CommunityBuildingManagerEntity;
import com.epmet.service.CommunityBuildingManagerService;
import com.epmet.service.CustomerGridService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.List;
/**
* 楼长单元长信息表烟台
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2023-05-06
*/
@Service
public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl<CommunityBuildingManagerDao, CommunityBuildingManagerEntity> implements CommunityBuildingManagerService {
/**
* 列表分页查询
*
* @param formDTO
* @return
*/
@Override
public PageData<CommunityBuildingManagerResultDTO> page(CommunityBuildingManagerPageFormDTO formDTO) {
// 默认查询本组织及下级
CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
if (null == staffInfoCacheResult) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询工作人员信息异常staffId:" + formDTO.getStaffId(), "查询工作人员信息异常");
}
formDTO.setOrgIdPath(PidUtils.convertPid2OrgIdPath(staffInfoCacheResult.getAgencyId(), staffInfoCacheResult.getAgencyPIds()));
PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
List<CommunityBuildingManagerResultDTO> resList = baseDao.pageList(formDTO.getCustomerId(),
formDTO.getOrgIdPath(),
formDTO.getName(),
formDTO.getPhone(),
formDTO.getIdCard(),
formDTO.getType(),
formDTO.getDistrictId(),
formDTO.getStreetId(),
formDTO.getCommunityId(),
formDTO.getGridId(),
formDTO.getViliageId(),
formDTO.getBuildingId(),
formDTO.getUnitId(), null);
PageInfo<CommunityBuildingManagerResultDTO> pageInfo = new PageInfo<>(resList);
return new PageData<>(resList, pageInfo.getTotal(),formDTO.getPageSize());
}
/**
* 查看详情
*
* @param id
* @return
*/
@Override
public CommunityBuildingManagerResultDTO get(String id) {
List<CommunityBuildingManagerResultDTO> resList = baseDao.pageList(EpmetRequestHolder.getLoginUserCustomerId(),
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null, id);
if (CollectionUtils.isEmpty(resList)) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "community_building_manager表记录不存在:id:" + id, "记录不存在");
}
return resList.get(NumConstant.ZERO);
}
/**
* 新增楼长/单元长
* todo: 同步到具体的楼栋表
*
* @param addFormDto
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void save(CommunityBuildingManagerDTO addFormDto) {
// 唯一性判断,同一个楼可以有多个楼长吗?待定。。。
CommunityBuildingManagerEntity entity = ConvertUtils.sourceToTarget(addFormDto, CommunityBuildingManagerEntity.class);
CustomerGridDTO gridDTO = SpringContextUtils.getBean(CustomerGridService.class).get(addFormDto.getGridId());
entity.setOrgIdPath(PidUtils.convertPid2OrgIdPath(gridDTO.getId(), gridDTO.getPids()));
insert(entity);
}
/**
* 编辑楼长/单元长
* todo: 同步到具体的楼栋
*
* @param updateFormDto
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void update(CommunityBuildingManagerDTO updateFormDto) {
CommunityBuildingManagerEntity entity = ConvertUtils.sourceToTarget(updateFormDto, CommunityBuildingManagerEntity.class);
CustomerGridDTO gridDTO = SpringContextUtils.getBean(CustomerGridService.class).get(updateFormDto.getGridId());
entity.setOrgIdPath(PidUtils.convertPid2OrgIdPath(gridDTO.getId(), gridDTO.getPids()));
updateById(entity);
}
/**
* 批量删除楼长/单元长
* todo: 同时清空楼栋表里的信息
*
* @param ids
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(List<String> ids) {
baseDao.deleteBatchIds(ids);
}
}

20
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java

@ -18,7 +18,6 @@
package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@ -45,7 +44,6 @@ import com.epmet.constant.CustomerGridConstant;
import com.epmet.dao.*;
import com.epmet.dto.*;
import com.epmet.dto.form.*;
import com.epmet.dto.region.LogOperationResultDTO;
import com.epmet.dto.result.*;
import com.epmet.entity.CustomerAgencyEntity;
import com.epmet.entity.CustomerDepartmentEntity;
@ -136,12 +134,16 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
return ConvertUtils.sourceToTarget(entityList, CustomerAgencyDTO.class);
}
private QueryWrapper<CustomerAgencyEntity> getWrapper(Map<String, Object> params) {
String id = (String) params.get(FieldConstant.ID_HUMP);
QueryWrapper<CustomerAgencyEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
private LambdaQueryWrapper<CustomerAgencyEntity> getWrapper(Map<String, Object> map) {
String id = map.containsKey(FieldConstant.ID_HUMP) ? (String) map.get(FieldConstant.ID_HUMP) : null;
String customerId = map.containsKey("CUSTOMER_ID") ? (String) map.get("CUSTOMER_ID") : null;
String level = map.containsKey("LEVEL") ? (String) map.get("LEVEL") : null;
String pid = map.containsKey("PID") ? (String) map.get("PID") : null;
LambdaQueryWrapper<CustomerAgencyEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), CustomerAgencyEntity::getId, id)
.eq(StringUtils.isNotBlank(customerId), CustomerAgencyEntity::getCustomerId, customerId)
.eq(StringUtils.isNotBlank(level), CustomerAgencyEntity::getLevel, level)
.eq(StringUtils.isNotBlank(pid), CustomerAgencyEntity::getPid, pid);
return wrapper;
}
@ -1244,7 +1246,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
/**
* 递归查询子节点
* @param root 根节点
* @param all 所有节点
* @param 所有节点
* @return 根节点信息
*/
private void convert2AgencyTreeResult(AgencyTreeResultDTO root, List<ExtStaffPermissionResultDTO> agencyList, List<ExtGridResultDTO> gridList) {

29
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java

@ -1,6 +1,7 @@
package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.page.PageData;
@ -22,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@Slf4j
@ -73,6 +75,10 @@ public class PropertyManagementServiceImpl implements PropertyManagementService
return icPropertyManagementEntity.getId();
}
/**
* 物业管理-修改
* @param formDTO
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void update(IcPropertyManagementFormDTO formDTO) {
@ -80,8 +86,14 @@ public class PropertyManagementServiceImpl implements PropertyManagementService
if (null != entity) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"物业名称已存在","物业名称已存在");
}
IcPropertyManagementEntity icPropertyManagementEntity = ConvertUtils.sourceToTarget(formDTO, IcPropertyManagementEntity.class);
icPropertyManagementDao.updateById(icPropertyManagementEntity);
LambdaUpdateWrapper<IcPropertyManagementEntity> updateWrapper=new LambdaUpdateWrapper<>();
updateWrapper.eq(IcPropertyManagementEntity::getId,formDTO.getId())
.set(IcPropertyManagementEntity::getName,formDTO.getName())
.set(IcPropertyManagementEntity::getContactName,formDTO.getContactName())
.set(IcPropertyManagementEntity::getContactMobile,formDTO.getContactMobile())
.set(IcPropertyManagementEntity::getUpdatedTime,new Date())
.set(IcPropertyManagementEntity::getUpdatedBy,EpmetRequestHolder.getLoginUserId());
icPropertyManagementDao.update(null,updateWrapper);
}
/**
@ -99,11 +111,18 @@ public class PropertyManagementServiceImpl implements PropertyManagementService
icPropertyManagementDao.deleteById(formDTO.getId());
}
/**
* 物业管理-列表查询
* @param pageNo
* @param pageSize
* @param name
* @return
*/
@Override
public PageData<IcPropertyManagementDTO> page(Integer pageNo, Integer pageSize, String name) {
public PageData<IcPropertyManagementDTO> page(Integer pageNo, Integer pageSize, String name,String contactName,String contactMobile) {
PageHelper.startPage(pageNo,pageSize);
List<IcPropertyManagementDTO> list=icPropertyManagementDao.queryList(EpmetRequestHolder.getLoginUserCustomerId(),name);
List<IcPropertyManagementDTO> list=icPropertyManagementDao.queryList(EpmetRequestHolder.getLoginUserCustomerId(),name,contactName,contactMobile);
PageInfo<IcPropertyManagementDTO> pageInfo = new PageInfo<>(list);
return new PageData<>(list, pageInfo.getTotal());
return new PageData<>(list, pageInfo.getTotal(),pageSize);
}
}

94
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CommunityBuildingManagerDao.xml

@ -0,0 +1,94 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.dao.CommunityBuildingManagerDao">
<resultMap type="com.epmet.entity.CommunityBuildingManagerEntity" id="communityBuildingManagerMap">
<result property="id" column="ID"/>
<result property="customerId" column="CUSTOMER_ID"/>
<result property="name" column="NAME"/>
<result property="phone" column="PHONE"/>
<result property="idCard" column="ID_CARD"/>
<result property="type" column="TYPE"/>
<result property="districtId" column="DISTRICT_ID"/>
<result property="streetId" column="STREET_ID"/>
<result property="communityId" column="COMMUNITY_ID"/>
<result property="gridId" column="GRID_ID"/>
<result property="orgIdPath" column="ORG_ID_PATH"/>
<result property="viliageId" column="VILIAGE_ID"/>
<result property="buildingId" column="BUILDING_ID"/>
<result property="unitId" column="UNIT_ID"/>
<result property="delFlag" column="DEL_FLAG"/>
<result property="revision" column="REVISION"/>
<result property="createdBy" column="CREATED_BY"/>
<result property="createdTime" column="CREATED_TIME"/>
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
<!-- 分页查询 -->
<select id="pageList" parameterType="map" resultType="com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO">
SELECT
m.*,
d.ORGANIZATION_NAME AS districtName,
s.ORGANIZATION_NAME AS streetName,
c.ORGANIZATION_NAME AS communityName,
cg.GRID_NAME AS gridName,
n.NEIGHBOR_HOOD_NAME AS viliageName,
b.BUILDING_NAME AS buildingName,
u.UNIT_NAME AS unitName
FROM
community_building_manager m
LEFT JOIN customer_agency d ON ( m.DISTRICT_ID = d.ID )
LEFT JOIN customer_agency s ON ( m.STREET_ID = s.ID )
LEFT JOIN customer_agency c ON ( m.COMMUNITY_ID = c.ID )
LEFT JOIN customer_grid cg ON ( m.GRID_ID = cg.ID )
LEFT JOIN ic_neighbor_hood n ON ( m.VILIAGE_ID = n.ID )
LEFT JOIN ic_building b ON ( m.BUILDING_ID = b.ID )
LEFT JOIN ic_building_unit u ON ( m.UNIT_ID = u.ID )
WHERE
m.DEL_FLAG = '0'
AND m.CUSTOMER_ID = #{customerId}
<if test="name != null and name != ''">
AND m.`NAME` LIKE concat( '%', #{name}, '%' )
</if>
<if test="phone != null and phone != ''">
AND m.PHONE LIKE concat( '%', #{phone}, '%' )
</if>
<if test="idCard != null and idCard != ''">
AND m.ID_CARD LIKE concat( '%', #{idCard}, '%' )
</if>
<if test="type != null and type != ''">
AND m.TYPE = #{type}
</if>
<if test="districtId != null and districtId != ''">
AND m.DISTRICT_ID = #{districtId}
</if>
<if test="streetId != null and streetId != ''">
AND m.STREET_ID = #{streetId}
</if>
<if test="communityId != null and communityId != ''">
AND m.COMMUNITY_ID = #{communityId}
</if>
<if test="gridId != null and gridId != ''">
AND m.GRID_ID = #{gridId}
</if>
<if test="viliageId != null and viliageId != ''">
AND m.VILIAGE_ID = #{viliageId}
</if>
<if test="buildingId != null and buildingId != ''">
AND m.BUILDING_ID = #{buildingId}
</if>
<if test="unitId != null and unitId != ''">
AND m.UNIT_ID = #{unitId}
</if>
<if test="orgIdPath != null and orgIdPath != ''">
AND m.ORG_ID_PATH LIKE concat( #{orgIdPath}, '%' )
</if>
<if test="id != null and id != ''">
AND m.id = #{id}
</if>
ORDER BY
m.ID ASC
</select>
</mapper>

6
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml

@ -80,6 +80,12 @@
<if test="name != null and name != ''">
and m.name like concat('%',#{name},'%')
</if>
<if test="contactName != null and contactName != ''">
and m.CONTACT_NAME like concat('%',#{contactName},'%')
</if>
<if test="contactMobile != null and contactMobile != ''">
and m.CONTACT_MOBILE like concat('%',#{contactMobile},'%')
</if>
order by m.CREATED_TIME desc
</select>
</mapper>

25
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java

@ -150,4 +150,29 @@ public class CustomerStaffDTO implements Serializable {
*/
private String idCard;
/**
* 烟台需求党组织职务
*/
private String partyPosition;
/**
* 烟台需求村居委员职务
*/
private String viliagePosition;
/**
* 烟台需求工作职责
*/
private String duty;
/**
* 烟台需求备注
*/
private String remark;
/**
* 文化程度
*/
private String culture;
}

139
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java

@ -105,6 +105,11 @@ public class IcResiUserDTO implements Serializable {
*/
private String idCard;
/**
* 证件类型烟台需求来源于字典表dict_type=yt_id_card_type;1身份证号2护照3港澳通行证4军人证5台胞证6其他
*/
private String idCardType;
/**
* 出生日期
*/
@ -125,6 +130,26 @@ public class IcResiUserDTO implements Serializable {
*/
private String contactsMobile;
/**
* 烟台需求重点人群名称对应字典表dict_type:yt_key_point_user_type
*/
private String keyPointUserType;
/**
* 烟台需求国籍
*/
private String nationality;
/**
* 烟台需求人口类型名称对应字典表dict_type:yt_population_type
*/
private String populationType;
/**
* 烟台需求政治面貌名称对应字典表dict_type:yt_politics_status
*/
private String politicsStatus;
/**
* 九小场所url
*/
@ -401,9 +426,9 @@ public class IcResiUserDTO implements Serializable {
private String jg;
/**
* 户籍所在地
* 户籍所在地;烟台需求对应户籍详细地址
*/
private String hjszd;
private String hjszd;
/**
* 现居住地
@ -415,6 +440,111 @@ public class IcResiUserDTO implements Serializable {
*/
private String rhzk;
/**
* 烟台需求是否现居住0否1是对应字典表dict_type:
*/
private String isNowLive;
/**
* 烟台需求居住省
*/
private String livingProvince;
/**
* 烟台需求居住市
*/
private String livingCity;
/**
* 烟台需求居住区
*/
private String livingArea;
/**
* 烟台需求居住街道
*/
private String livingStreet;
/**
* 烟台需求居住社区
*/
private String livingCommunity;
/**
* 烟台需求居住小区
*/
private String livingViliageName;
/**
* 烟台需求居住楼号
*/
private String livingBuildingNo;
/**
* 烟台需求居住单元号
*/
private String livingUnitNo;
/**
* 烟台需求居住房间号
*/
private String livingHouseNo;
/**
* 烟台需求户籍所在省
*/
private String registerProvince;
/**
* 烟台需求户籍所在市
*/
private String registerCity;
/**
* 烟台需求户籍所在区县
*/
private String registerArea;
/**
* 烟台需求户籍所在街道
*/
private String registerStreet;
/**
* 烟台需求户籍所在社区
*/
private String registerCommunity;
/**
* 烟台需求户籍所在小区名称
*/
private String registerViliageName;
/**
* 烟台需求户籍楼号
*/
private String registerBuildingNo;
/**
* 烟台需求户籍单元号
*/
private String registerUnitNo;
/**
* 烟台需求户籍房间号
*/
private String registerHouseNo;
/**
* 烟台需求户别对应字典表dict_type:yt_household_category
*/
private String householdCategory;
/**
* 烟台需求户号
*/
private String houseHoldId;
/**
* 居住信息备注
*/
@ -465,6 +595,11 @@ public class IcResiUserDTO implements Serializable {
*/
private String jtxxRemakes;
/**
* 烟台需求与户主关系60对应字典表dict_type:yt_Householder_relationship_type
*/
private String yt_yhzgx;
/**
* 用户状态0:正常;1:迁出;2:注销
*/

28
epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java

@ -111,4 +111,32 @@ public class CustomerStaffEntity extends BaseEpmetEntity {
* 身份证号
*/
private String idCard;
/**
* 烟台需求党组织职务
*/
private String partyPosition;
/**
* 烟台需求村居委员职务
*/
private String viliagePosition;
/**
* 烟台需求工作职责
*/
private String duty;
/**
* 烟台需求备注
*/
private String remark;
/**
* 文化程度
*/
private String culture;
}

140
epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java

@ -102,7 +102,7 @@ public class IcResiUserEntity extends BaseEpmetEntity {
private String idCard;
/**
* 证件类型1身份证号2护照
* 证件类型烟台需求来源于字典表dict_type=yt_id_card_type;1身份证号2护照3港澳通行证4军人证5台胞证6其他
*/
private String idCardType;
@ -126,7 +126,27 @@ public class IcResiUserEntity extends BaseEpmetEntity {
*/
private String contactsMobile;
/**
/**
* 烟台需求重点人群名称对应字典表dict_type:yt_key_point_user_type
*/
private String keyPointUserType;
/**
* 烟台需求国籍
*/
private String nationality;
/**
* 烟台需求人口类型名称对应字典表dict_type:yt_population_type
*/
private String populationType;
/**
* 烟台需求政治面貌名称对应字典表dict_type:yt_politics_status
*/
private String politicsStatus;
/**
* 九小场所url
*/
private String ninePlace;
@ -395,9 +415,9 @@ public class IcResiUserEntity extends BaseEpmetEntity {
*/
private String jg;
/**
* 户籍所在地
*/
/**
* 户籍所在地;烟台需求对应户籍详细地址
*/
private String hjszd;
/**
@ -410,6 +430,111 @@ public class IcResiUserEntity extends BaseEpmetEntity {
*/
private String rhzk;
/**
* 烟台需求是否现居住0否1是对应字典表dict_type:
*/
private String isNowLive;
/**
* 烟台需求居住省
*/
private String livingProvince;
/**
* 烟台需求居住市
*/
private String livingCity;
/**
* 烟台需求居住区
*/
private String livingArea;
/**
* 烟台需求居住街道
*/
private String livingStreet;
/**
* 烟台需求居住社区
*/
private String livingCommunity;
/**
* 烟台需求居住小区
*/
private String livingViliageName;
/**
* 烟台需求居住楼号
*/
private String livingBuildingNo;
/**
* 烟台需求居住单元号
*/
private String livingUnitNo;
/**
* 烟台需求居住房间号
*/
private String livingHouseNo;
/**
* 烟台需求户籍所在省
*/
private String registerProvince;
/**
* 烟台需求户籍所在市
*/
private String registerCity;
/**
* 烟台需求户籍所在区县
*/
private String registerArea;
/**
* 烟台需求户籍所在街道
*/
private String registerStreet;
/**
* 烟台需求户籍所在社区
*/
private String registerCommunity;
/**
* 烟台需求户籍所在小区名称
*/
private String registerViliageName;
/**
* 烟台需求户籍楼号
*/
private String registerBuildingNo;
/**
* 烟台需求户籍单元号
*/
private String registerUnitNo;
/**
* 烟台需求户籍房间号
*/
private String registerHouseNo;
/**
* 烟台需求户别对应字典表dict_type:yt_household_category
*/
private String householdCategory;
/**
* 烟台需求户号
*/
private String houseHoldId;
/**
* 居住信息备注
*/
@ -460,6 +585,11 @@ public class IcResiUserEntity extends BaseEpmetEntity {
*/
private String jtxxRemakes;
/**
* 烟台需求与户主关系60对应字典表dict_type:yt_Householder_relationship_type
*/
private String yt_yhzgx;
/**
* 用户状态0:正常;1:迁出;2:注销
*/

4
epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiTripReportSyncProcessor.java

@ -6,17 +6,15 @@ import com.epmet.service.DataSyncConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import static com.epmet.constant.EpidemicConstant.JOB_TYPE_TRIP_REPORT;
import static com.epmet.constant.EpidemicConstant.JOB_TYPE_VACCINE;
/**
* @Description 烟台行程上报数据同步处理器
* @Author zxc
* @Date 2022/11/22 14:08
*/
@Component
// @Component
@Slf4j
public class YanTaiTripReportSyncProcessor extends AbstractDataSyncJobProcessor {

37
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@ -304,6 +304,12 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
resultDTO.setWorkType(customerStaffDTO.getWorkType());
resultDTO.setIdCard(customerStaffDTO.getIdCard());
resultDTO.setCustomerId(customerStaffDTO.getCustomerId());
resultDTO.setCulture(customerStaffDTO.getCulture());
resultDTO.setDuty(customerStaffDTO.getDuty());
resultDTO.setPartyPosition(customerStaffDTO.getPartyPosition());
resultDTO.setViliagePosition(customerStaffDTO.getViliagePosition());
resultDTO.setRemark(customerStaffDTO.getRemark());
resultDTO.setAddress(customerStaffDTO.getAddress());
//获取角色列表
GovStaffRoleDTO govStaffRoleDTO = new GovStaffRoleDTO();
govStaffRoleDTO.setCustomerId(fromDTO.getCustomerId());
@ -370,6 +376,30 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
staffEntity.setWorkType(fromDTO.getWorkType());
staffEntity.setEnableFlag(CustomerStaffConstant.ENABLE);
staffEntity.setPassword(PasswordUtils.encode("12345678"));
if (StringUtils.isNotBlank(fromDTO.getRemark())){
staffEntity.setRemark(fromDTO.getRemark());
}
if (StringUtils.isNotBlank(fromDTO.getAddress())){
staffEntity.setAddress(fromDTO.getAddress());
}
if (StringUtils.isNotBlank(fromDTO.getPartyPosition())){
staffEntity.setPartyPosition(fromDTO.getPartyPosition());
}
if (StringUtils.isNotBlank(fromDTO.getViliagePosition())){
staffEntity.setViliagePosition(fromDTO.getViliagePosition());
}
if (StringUtils.isNotBlank(fromDTO.getDuty())){
staffEntity.setDuty(fromDTO.getDuty());
}
if (StringUtils.isNotBlank(fromDTO.getIdCard())){
staffEntity.setIdCard(fromDTO.getIdCard());
}
if (StringUtils.isNotBlank(fromDTO.getCulture())){
staffEntity.setCulture(fromDTO.getCulture());
}
baseDao.insert(staffEntity);
//工作人员角色关联表
@ -484,6 +514,13 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
staffEntity.setMobile(fromDTO.getMobile());
staffEntity.setGender(fromDTO.getGender());
staffEntity.setWorkType(fromDTO.getWorkType());
staffEntity.setIdCard(customerStaffDTO.getIdCard());
staffEntity.setCulture(customerStaffDTO.getCulture());
staffEntity.setDuty(customerStaffDTO.getDuty());
staffEntity.setPartyPosition(customerStaffDTO.getPartyPosition());
staffEntity.setViliagePosition(customerStaffDTO.getViliagePosition());
staffEntity.setRemark(customerStaffDTO.getRemark());
staffEntity.setAddress(customerStaffDTO.getAddress());
baseDao.updateById(staffEntity);
//清空权限关联

8
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@ -366,8 +366,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
if (regex == null) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "证件号解析错误", "证件号解析错误");
}
IdCardTypeEnum typeEnum = regex.getTypeEnum();
map.put("ID_CARD_TYPE", typeEnum.getType());
// IdCardTypeEnum typeEnum = regex.getTypeEnum();
// map.put("ID_CARD_TYPE", typeEnum.getType());
// 证件类型判断----end----
//新增主表数据
@ -729,8 +729,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
if (regex == null) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "证件号解析错误", "证件号解析错误");
}
IdCardTypeEnum typeEnum = regex.getTypeEnum();
map.put("ID_CARD_TYPE", typeEnum.getType());
// IdCardTypeEnum typeEnum = regex.getTypeEnum();
// map.put("ID_CARD_TYPE", typeEnum.getType());
// 证件类型判断----end----
}
baseDao.upTable("ic_resi_user", resiUserId, map);

Loading…
Cancel
Save