Merge remote-tracking branch 'remotes/origin/dev_ic_v2' into dev

epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java

@@ -6,9 +6,11 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.result.CorsConfigResultDTO;
 import com.epmet.feign.fallback.EpmetAdminOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
+import java.util.Map;
 
 @FeignClient(name = ServiceConstant.EPMET_ADMIN_SERVER, fallbackFactory = EpmetAdminOpenFeignClientFallbackFactory.class)
 //@FeignClient(name = ServiceConstant.EPMET_ADMIN_SERVER, fallbackFactory = EpmetAdminOpenFeignClientFallbackFactory.class, url = "localhost:8082")
@@ -72,4 +74,14 @@ public interface EpmetAdminOpenFeignClient {
      */
     @PostMapping("/sys/dict/data/relationship")
     Result<List<OptionResultDTO>> getRelationshipOption();
+
+    /**
+     * 字典数据查询通用接口
+     * @Param dictType
+     * @Return {@link Result<  Map < String, String>>}
+     * @Author zhaoqifeng
+     * @Date 2021/11/19 17:36
+     */
+    @PostMapping("/sys/dict/data/dictmap/{dictType}")
+    Result<Map<String, String>> dictMap(@PathVariable("dictType") String dictType);
 }

epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java

@@ -6,39 +6,44 @@ import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.result.CorsConfigResultDTO;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
-import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Map;
 
 //@Component
 public class EpmetAdminOpenFeignClientFallback implements EpmetAdminOpenFeignClient {
     @Override
     public Result<List<CorsConfigResultDTO>> list() {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "list", null);
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_ADMIN_SERVER, "list", null);
     }
 
     @Override
     public Result<List<OptionResultDTO>> getEducationOption() {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getEducationOption", null);
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_ADMIN_SERVER, "getEducationOption", null);
     }
 
     @Override
     public Result<List<OptionResultDTO>> getHouseOption() {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getHouseOption", null);
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_ADMIN_SERVER, "getHouseOption", null);
     }
 
     @Override
     public Result<List<OptionResultDTO>> getNationOption() {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getNationOption", null);
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_ADMIN_SERVER, "getNationOption", null);
     }
 
     @Override
     public Result<List<OptionResultDTO>> getNineSmallPlacesOption() {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getNineSmallPlacesOption", null);
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_ADMIN_SERVER, "getNineSmallPlacesOption", null);
     }
 
     @Override
     public Result<List<OptionResultDTO>> getRelationshipOption() {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getRelationshipOption", null);
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_ADMIN_SERVER, "getRelationshipOption", null);
+    }
+
+    @Override
+    public Result<Map<String, String>> dictMap(String dictType) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_ADMIN_SERVER, "dictMap", dictType);
     }
 }

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

@@ -150,4 +150,16 @@ public class SysDictDataController {
         return new Result<List<DictListResultDTO>>().ok(sysDictDataService.dictList(formDTO.getDictType()));
     }
 
+    /**
+     * 字典数据查询通用接口
+     * @Param dictType
+     * @Return {@link Result< Map< String, String>>}
+     * @Author zhaoqifeng
+     * @Date 2021/11/19 17:36
+     */
+    @PostMapping("dictmap/{dictType}")
+    public Result<Map<String, String>> dictMap(@PathVariable("dictType") String dictType) {
+        return new Result<Map<String, String>>().ok(sysDictDataService.dictMap(dictType));
+    }
+
 }

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

@@ -9,7 +9,6 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.dto.form.DictListFormDTO;
 import com.epmet.commons.tools.dto.result.DictListResultDTO;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
@@ -85,4 +84,7 @@ public interface SysDictDataService extends BaseService<SysDictDataEntity> {
      * @Author sun
      */
     List<DictListResultDTO> dictList(String dictType);
+
+
+    Map<String, String> dictMap(String dictType);
 }

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

@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.dto.form.DictListFormDTO;
 import com.epmet.commons.tools.dto.result.DictListResultDTO;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
@@ -212,4 +211,10 @@ public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysD
         return resultDTOList;
     }
 
+    @Override
+    public Map<String, String> dictMap(String dictType) {
+        List<DictListResultDTO> resultDTOList = baseDao.selectDictList(dictType);
+        return resultDTOList.stream().collect(Collectors.toMap(DictListResultDTO::getValue, DictListResultDTO::getLabel));
+    }
+
 }

epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.6__add_dict_data.sql

@@ -0,0 +1,29 @@
+-- 1、增加字典类型
+INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (8, 'user_demand_status', '居民需求状态', '待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished', 8, 1067246875800000001, '2021-11-18 16:29:58', 1067246875800000001, '2021-11-18 16:29:58');
+INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (9, 'user_demand_report_type', '居民需求上报类型', '社区帮办：community；楼长帮办：building_caption;党员帮办：party;自身上报：self_help', 9, 1067246875800000001, '2021-11-18 16:29:58', 1067246875800000001, '2021-11-18 16:29:58');
+INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (10, 'user_demand_service_type', '居民需求服务方类型', '服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；', 10, 1067246875800000001, '2021-11-18 16:29:58', 1067246875800000001, '2021-11-18 16:29:58');
+INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000006, 'scale', '人员规模', '', 6, 1067246875800000001, '2021-11-18 16:29:58', 1067246875800000001, '2021-11-18 16:29:58');
+INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000007, 'party_unit_type', '联建单位分类', '', 7, 1067246875800000001, '2021-11-18 16:29:58', 1067246875800000001, '2021-11-18 16:29:58');
+-- 2、增加字典数据
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000200, 1000000000000000007, '楼宇党建', '0', '', 0, 1067246875800000001, '2020-03-08 16:29:58', 1067246875800000001, '2020-03-08 16:29:58');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000201, 1000000000000000007, '两新组织', '1', '', 1, 1067246875800000001, '2020-03-08 16:29:58', 1067246875800000001, '2020-03-08 16:29:58');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000202, 1000000000000000007, '区域单位党建', '2', '', 2, 1067246875800000001, '2020-03-08 16:29:58', 1067246875800000001, '2020-03-08 16:29:58');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000203, 1000000000000000007, '机关直属部门', '3', '', 3, 1067246875800000001, '2020-03-08 16:29:58', 1067246875800000001, '2020-03-08 16:29:58');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000204, 1000000000000000007, '其他', '4', '', 4, 1067246875800000001, '2020-03-08 16:29:58', 1067246875800000001, '2020-03-08 16:29:58');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000205, 8, '待处理', 'pending', '', 1, 1, '2021-11-23 14:00:59', 1, '2021-11-23 14:00:59');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000206, 8, '已取消', 'canceled', '', 2, 1, '2021-11-23 14:00:59', 1, '2021-11-23 14:00:59');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000207, 8, '已派单', 'assigned', '', 3, 1, '2021-11-23 14:00:59', 1, '2021-11-23 14:00:59');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000208, 8, '已接单', 'have_order', '', 4, 1, '2021-11-23 14:00:59', 1, '2021-11-23 14:00:59');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000209, 8, '已完成', 'finished', '', 5, 1, '2021-11-23 14:00:59', 1, '2021-11-23 14:00:59');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000210, 9, '社区帮办', 'community', '', 1, 1, '2021-11-23 14:03:22', 1, '2021-11-23 14:03:22');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000211, 9, '楼长帮办', 'building_caption', '', 2, 1, '2021-11-23 14:03:22', 1, '2021-11-23 14:03:22');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000212, 9, '党员帮办', 'party', '', 3, 1, '2021-11-23 14:03:22', 1, '2021-11-23 14:03:22');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000213, 10, '志愿者', 'volunteer', '', 1, 1, '2021-11-23 14:04:42', 1, '2021-11-23 14:04:42');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000214, 10, '社会组织', 'social_org', '', 2, 1, '2021-11-23 14:04:42', 1, '2021-11-23 14:04:42');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000215, 10, '社区自组织', 'community_org', '', 3, 1, '2021-11-23 14:04:42', 1, '2021-11-23 14:04:42');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1000000000000000216, 10, '区域党建单位', 'party_unit', '', 4, 1, '2021-11-23 14:04:42', 1, '2021-11-23 14:04:42');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (2000000000000000000, 1000000000000000006, '10人以下', '0', '', 0, 1067246875800000001, '2021-11-18 16:29:58', 1067246875800000001, '2021-11-18 16:29:58');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (2000000000000000001, 1000000000000000006, '10-20人', '1', '', 1, 1067246875800000001, '2021-11-18 16:29:58', 1067246875800000001, '2021-11-18 16:29:58');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (2000000000000000002, 1000000000000000006, '21-40人', '2', '', 2, 1067246875800000001, '2021-11-18 16:29:58', 1067246875800000001, '2021-11-18 16:29:58');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (2000000000000000003, 1000000000000000006, '41-100人', '3', '', 3, 1067246875800000001, '2021-11-18 16:29:58', 1067246875800000001, '2021-11-18 16:29:58');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES (2000000000000000004, 1000000000000000006, '100人以上', '4', '', 4, 1067246875800000001, '2021-11-18 16:29:58', 1067246875800000001, '2021-11-18 16:29:58');

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java

@@ -70,4 +70,8 @@ public interface ConsomerGroupConstants {
      */
     String IC_WARN_STATS_EVENT_LISTENER_GROUP = "ic_warn_stats_event_listener_group";
 
+    /**
+     *  需求完成，如果服务方是区域化党建单位，重新计算这个单位的满意度
+     */
+    String CAL_PARTY_UNIT_SATISFACTION = "cal_party_unit_satisfaction";
 }

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java

@@ -53,4 +53,9 @@ public interface TopicConstants {
      * 项目
      */
     String IC_RESI_USER = "ic_resi_user";
+
+    /**
+     *  需求完成，如果服务方是区域化党建单位，重新计算这个单位的满意度
+     */
+    String CAL_PARTY_UNIT_SATISFACTION = "cal_party_unit_satisfaction";
 }

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/CalPartyUnitSatisfactionFormDTO.java

@@ -0,0 +1,19 @@
+package com.epmet.commons.rocketmq.messages;
+
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ *  需求完成，如果服务方是区域化党建单位，重新计算这个单位的满意度,或者直接计算整个客户
+ */
+@Data
+public class CalPartyUnitSatisfactionFormDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+    @NotBlank(message = "客户id不能为空",groups = AddUserInternalGroup.class)
+    private String customerId;
+    private String partyUnitId;
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/CustomerStaffInfoCacheResult.java

@@ -93,4 +93,20 @@ public class CustomerStaffInfoCacheResult implements Serializable {
      */
     private List<IdAndNameDTO> deptList;
 
+    /**
+     * 组织级别
+     */
+    private String level;
+
+    /**
+     * 中心位置经度
+     */
+    private String longitude;
+
+    /**
+     * 中心位置纬度
+     */
+    private String latitude;
+
+
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java

@@ -15,6 +15,8 @@ public class OptionResultDTO implements Serializable {
     private static final long serialVersionUID = 8618231166600518980L;
     private String label;
     private String value;
+    private String pValue;
     private String sysDictDataId;
     private List<OptionResultDTO> children;
+    private Boolean usableFlag;
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java

@@ -0,0 +1,58 @@
+package com.epmet.commons.tools.enums;
+
+/**
+ * @author Administrator
+ */
+public enum DictTypeEnum {
+    /**
+     * 环境变量枚举
+     */
+    UN_KNOWN("un_know", "暂不清楚", 0),
+    NINE_SMALL_PLACES("nine_small_places", "九小场所", 1),
+    EDUCATION("education", "文化程度", 2),
+    NATION("nation", "民族", 3),
+    RELATIONSHIP("relationship", "与户主关系", 4),
+    HOUSE("house", "住房性质", 5),
+    SCALE("scale", "人员规模", 6),
+    PARTY_UNIT_TYPE("party_unit_type", "联建单位分类", 7),
+    GENDER("gender", "性别", 8),
+    USER_DEMAND_STATUS("user_demand_status",	"居民需求状态",8),
+    USER_DEMAND_REPORT_TYPE("user_demand_report_type","居民需求上报类型",9),
+    USER_DEMAND_SERVICE_TYPE("user_demand_service_type","居民需求服务方类型",10)
+    ;
+
+    private final String code;
+    private final String name;
+    private final Integer sort;
+
+
+
+    DictTypeEnum(String code, String name, Integer sort) {
+        this.code = code;
+        this.name = name;
+        this.sort = sort;
+    }
+
+        public static DictTypeEnum getEnum(String code) {
+            DictTypeEnum[] values = DictTypeEnum.values();
+        for (DictTypeEnum value : values) {
+            if (value.getCode().equals(code)) {
+                return value;
+            }
+        }
+        return DictTypeEnum.UN_KNOWN;
+    }
+
+
+        public String getCode() {
+        return code;
+    }
+
+        public String getName() {
+        return name;
+    }
+
+        public Integer getSort(){
+        return sort;
+    }
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/PartyUnitTypeEnum.java

@@ -0,0 +1,59 @@
+package com.epmet.commons.tools.enums;
+
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+
+/**
+ * @author Administrator
+ */
+public enum PartyUnitTypeEnum {
+    //房屋类型，1楼房，2平房，3别墅
+    LOUYU("0", "楼宇党建"),
+    ZUZHI("1", "两新组织"),
+    DANWEI("2", "区域单位党建"),
+    JIGUAN("3", "机关直属部门"),
+    QITA("4", "其他");
+    private String code;
+    private String name;
+
+
+    PartyUnitTypeEnum(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public static String getName(String code) {
+        PartyUnitTypeEnum[] houseTypeEnums = values();
+        for (PartyUnitTypeEnum houseTypeEnum : houseTypeEnums) {
+            if (houseTypeEnum.getCode() == code) {
+                return houseTypeEnum.getName();
+            }
+        }
+        return EpmetErrorCode.SERVER_ERROR.getMsg();
+    }
+
+    public static String getCode(String name) {
+        PartyUnitTypeEnum[] houseTypeEnums = values();
+        for (PartyUnitTypeEnum houseTypeEnum : houseTypeEnums) {
+            if (houseTypeEnum.getName().equals(name)) {
+                return houseTypeEnum.getCode();
+            }
+        }
+        return null;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -85,6 +85,14 @@ public enum EpmetErrorCode {
 	BUILDING_NAME_EXITED(8215,"楼栋名称已存在"),
 	DOOR_NAME_EXITED(8216,"门牌号已存在"),
 	NEIGHBOOR_NAME_EXITED(8217,"小区名称已存在"),
+	DEMAND_NAME_EXITED(8218, "分类名称已存在"),
+	DEMAND_CAN_NOT_CANCEL(8219, "需求已完成，不可取消"),
+	DEMAND_CAN_NOT_ASSIGN(8220, "当前状态，不可指派"),
+	DEMAND_CAN_NOT_FINISH(8221, "当前状态，不能评价"),
+	DEMAND_FINISHED(8222,"需求已完成"),
+	DEMAND_CAN_NOT_UPDATE(8223,"当前状态，不可更新需求"),
+	DEMAND_NOT_EXITS(8224,"需求不存在"),
+	DEMAND_SERVICE_NOT_EXITS(8225,"服务记录不存在"),
 
 	REQUIRE_PERMISSION(8301, "您没有足够的操作权限"),
 	THIRD_PLAT_REQUEST_ERROR(8302, "请求第三方平台错误"),
@@ -137,6 +145,26 @@ public enum EpmetErrorCode {
 	PATROL_REPEATED_SUBMIT_ERROR(8521, "巡查已结束，请勿重复提交"),
 	PATROL_END_TIME_ERROR(8522, "巡查结束时间不能小于巡查开始时间"),
 	TIME_FORMAT_ERROR(8523, "时间格式错误"),
+	//社区党建
+	PARTY_UNIT_NAME_EXITED(8531, "单位名称已存在"),
+	// 社区自组织
+	COMMUNITY_SELF_ORGANIZATION_REPART_ERROR(8524, "社区自组织名称已存在"),
+
+	// 党群服务中心
+	PARTY_SERVICE_CENTER_ERROR(8525, "党群服务中心名称已存在"),
+	// 删除可预约事项存在预约记录时提示
+	MATTER_EXISTS_APPOINTMENT_ERROR(8526, "尚有未履行的预约存在，请确认后操作"),
+
+	// 预约某事项在某时间段存在记录时
+	APPOINTMENT_TIME_ERROR(8527, "该时间段已被预约，请选择其他时间段"),
+
+	APPOINTMENT_ERROR(8528, "%s尚有未履行的预约存在，请确认后操作"),
+
+	EXISTS_SAME_PHONE_ERROR(8529, "%s存在重复"),
+
+	COMMUNITY_SELF_ORGANIZATION_LIST_REPART_ERROR(8530, "%s社区自组织名称已存在"),
+	MATTER_NAME_EXISTS_APPOINTMENT_ERROR(8532, "存在重复预约事项"),
+
     // 该错误不会提示给前端，只是后端传输错误信息用。
     ACCESS_SQL_FILTER_MISSION_ARGS(8701, "缺少生成权限过滤SQL所需参数"),
     OPER_ADD_CUSTOMER_ROOT_AGENCY_ERROR(8702, "添加客户根级组织失败"),

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelPoiUtils.java

@@ -0,0 +1,276 @@
+package com.epmet.commons.tools.utils;
+
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+
+public class ExcelPoiUtils {
+    /**
+     * excel 导出
+     *
+     * @param list     数据列表
+     * @param fileName 导出时的excel名称
+     * @param response
+     */
+    public static void exportExcel(List<Map<String, Object>> list, String fileName, HttpServletResponse response) throws IOException {
+        defaultExport(list, fileName, response);
+    }
+
+    /**
+     * 默认的 excel 导出
+     *
+     * @param list     数据列表
+     * @param fileName 导出时的excel名称
+     * @param response
+     */
+    private static void defaultExport(List<Map<String, Object>> list, String fileName, HttpServletResponse response) throws IOException {
+        //把数据添加到excel表格中
+        Workbook workbook = ExcelExportUtil.exportExcel(list, ExcelType.HSSF);
+        downLoadExcel(fileName, response, workbook);
+    }
+
+    /**
+     * excel 导出
+     *
+     * @param list         数据列表
+     * @param pojoClass    pojo类型
+     * @param fileName     导出时的excel名称
+     * @param response
+     * @param exportParams 导出参数（标题、sheet名称、是否创建表头，表格类型）
+     */
+    private static void defaultExport(List<?> list, Class<?> pojoClass, String fileName, HttpServletResponse response, ExportParams exportParams) throws IOException {
+        //把数据添加到excel表格中
+        Workbook workbook = ExcelExportUtil.exportExcel(exportParams, pojoClass, list);
+        downLoadExcel(fileName, response, workbook);
+    }
+
+    /**
+     * excel 导出
+     *
+     * @param list         数据列表
+     * @param pojoClass    pojo类型
+     * @param fileName     导出时的excel名称
+     * @param exportParams 导出参数（标题、sheet名称、是否创建表头，表格类型）
+     * @param response
+     */
+    public static void exportExcel(List<?> list, Class<?> pojoClass, String fileName, ExportParams exportParams, HttpServletResponse response) throws IOException {
+        defaultExport(list, pojoClass, fileName, response, exportParams);
+    }
+
+    /**
+     * excel 导出
+     *
+     * @param list      数据列表
+     * @param title     表格内数据标题
+     * @param sheetName sheet名称
+     * @param pojoClass pojo类型
+     * @param fileName  导出时的excel名称
+     * @param response
+     */
+    public static void exportExcel(List<?> list, String title, String sheetName, Class<?> pojoClass, String fileName, HttpServletResponse response) throws IOException {
+        defaultExport(list, pojoClass, fileName, response, new ExportParams(title, sheetName, ExcelType.XSSF));
+    }
+
+
+
+    /**
+     * excel 导出
+     *
+     * @param list           数据列表
+     * @param title          表格内数据标题
+     * @param sheetName      sheet名称
+     * @param pojoClass      pojo类型
+     * @param fileName       导出时的excel名称
+     * @param isCreateHeader 是否创建表头
+     * @param response
+     */
+    public static void exportExcel(List<?> list, String title, String sheetName, Class<?> pojoClass, String fileName, boolean isCreateHeader, HttpServletResponse response) throws IOException {
+        ExportParams exportParams = new ExportParams(title, sheetName, ExcelType.XSSF);
+        exportParams.setCreateHeadRows(isCreateHeader);
+        defaultExport(list, pojoClass, fileName, response, exportParams);
+    }
+    /**
+     * 根据模板生成excel后导出
+     * @param templatePath  模板路径
+     * @param map 数据集合
+     * @param fileName 文件名
+     * @param response
+     * @throws IOException
+     */
+    public static void exportExcel(TemplateExportParams templatePath, Map<String, Object> map, String fileName, HttpServletResponse response) throws IOException {
+        Workbook workbook = ExcelExportUtil.exportExcel(templatePath, map);
+        downLoadExcel(fileName, response, workbook);
+    }
+
+
+    /**
+     * excel下载
+     *
+     * @param fileName 下载时的文件名称
+     * @param response
+     * @param workbook excel数据
+     */
+    private static void downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook) throws IOException {
+        try {
+            response.setCharacterEncoding("UTF-8");
+            response.setHeader("content-Type", "application/vnd.ms-excel");
+            response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName + ".xlsx", "UTF-8"));
+            workbook.write(response.getOutputStream());
+        } catch (Exception e) {
+            throw new IOException(e.getMessage());
+        }
+    }
+
+
+
+    /**
+     * excel 导入
+     *
+     * @param file      excel文件
+     * @param pojoClass pojo类型
+     * @param <T>
+     * @return
+     */
+    public static <T> List<T> importExcel(MultipartFile file, Class<T> pojoClass) throws IOException {
+        return importExcel(file, 1, 1, pojoClass);
+    }
+
+    /**
+     * excel 导入
+     *
+     * @param filePath   excel文件路径
+     * @param titleRows  表格内数据标题行
+     * @param headerRows 表头行
+     * @param pojoClass  pojo类型
+     * @param <T>
+     * @return
+     */
+    public static <T> List<T> importExcel(String filePath, Integer titleRows, Integer headerRows, Class<T> pojoClass) throws IOException {
+        if (StringUtils.isBlank(filePath)) {
+            return null;
+        }
+        ImportParams params = new ImportParams();
+        params.setTitleRows(titleRows);
+        params.setHeadRows(headerRows);
+        params.setNeedSave(true);
+        params.setSaveUrl("/tmp/excel/");
+        try {
+            return ExcelImportUtil.importExcel(new File(filePath), pojoClass, params);
+        } catch (NoSuchElementException e) {
+            throw new IOException("模板不能为空");
+        } catch (Exception e) {
+            throw new IOException(e.getMessage());
+        }
+    }
+
+
+    /**
+     * excel 导入
+     *
+     * @param file       上传的文件
+     * @param titleRows  表格内数据标题行
+     * @param headerRows 表头行
+     * @param pojoClass  pojo类型
+     * @param <T>
+     * @return
+     */
+    public static <T> List<T> importExcel(MultipartFile file, Integer titleRows, Integer headerRows, Class<T> pojoClass) throws IOException {
+        if (file == null) {
+            return null;
+        }
+        try {
+            return importExcel(file.getInputStream(), titleRows, headerRows, pojoClass);
+        } catch (Exception e) {
+            throw new IOException(e.getMessage());
+        }
+    }
+
+    /**
+     * excel 导入
+     *
+     * @param inputStream 文件输入流
+     * @param titleRows   表格内数据标题行
+     * @param headerRows  表头行
+     * @param pojoClass   pojo类型
+     * @param <T>
+     * @return
+     */
+    public static <T> List<T> importExcel(InputStream inputStream, Integer titleRows, Integer headerRows, Class<T> pojoClass) throws IOException {
+        if (inputStream == null) {
+            return null;
+        }
+        ImportParams params = new ImportParams();
+        params.setTitleRows(titleRows);
+        params.setHeadRows(headerRows);
+        params.setSaveUrl("/tmp/excel/");
+        params.setNeedSave(true);
+        try {
+            return ExcelImportUtil.importExcel(inputStream, pojoClass, params);
+        } catch (NoSuchElementException e) {
+            throw new IOException("excel文件不能为空");
+        } catch (Exception e) {
+            throw new IOException(e.getMessage());
+        }
+    }
+    /**
+     * excel 导入，有错误信息
+     *
+     * @param file      上传的文件
+     * @param pojoClass pojo类型
+     * @param <T>
+     * @return
+     */
+    public static <T> ExcelImportResult<T> importExcelMore(MultipartFile file,Integer titleRows, Integer headerRows, Class<T> pojoClass) throws IOException {
+        if (file == null) {
+            return null;
+        }
+        try {
+            return importExcelMore(file.getInputStream(), titleRows,  headerRows, pojoClass);
+        } catch (Exception e) {
+            throw new IOException(e.getMessage());
+        }
+    }
+
+    /**
+     * excel 导入
+     *
+     * @param inputStream 文件输入流
+     * @param pojoClass   pojo类型
+     * @param <T>
+     * @return
+     */
+    private static <T> ExcelImportResult<T> importExcelMore(InputStream inputStream,Integer titleRows, Integer headerRows, Class<T> pojoClass) throws IOException {
+        if (inputStream == null) {
+            return null;
+        }
+        ImportParams params = new ImportParams();
+        params.setTitleRows(titleRows);//表格内数据标题行
+        params.setHeadRows(headerRows);//表头行
+        params.setSaveUrl("/tmp/excel/");
+        params.setNeedSave(true);
+        params.setNeedVerify(true);
+        try {
+            return ExcelImportUtil.importExcelMore(inputStream, pojoClass, params);
+        } catch (NoSuchElementException e) {
+            throw new IOException("excel文件不能为空");
+        } catch (Exception e) {
+            throw new IOException(e.getMessage());
+        }
+    }
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java

@@ -121,7 +121,7 @@ public class ExcelUtils {
         out.flush();
         out.close();
     }
-    public static OutputStream getOutputStream(String fileName, HttpServletResponse response) throws Exception {
+    public static OutputStream getOutputStreamForExcel(String fileName, HttpServletResponse response) throws Exception {
         fileName = URLEncoder.encode(fileName, "UTF-8");
         response.setContentType("application/vnd.ms-excel");
         response.setCharacterEncoding("utf8");

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelVerifyInfo.java

@@ -0,0 +1,31 @@
+package com.epmet.commons.tools.utils;
+
+import cn.afterturn.easypoi.handler.inter.IExcelDataModel;
+import cn.afterturn.easypoi.handler.inter.IExcelModel;
+
+public class ExcelVerifyInfo implements IExcelModel, IExcelDataModel {
+
+    private String errorMsg;
+
+    private int rowNum;
+
+    @Override
+    public Integer getRowNum() {
+        return rowNum;
+    }
+
+    @Override
+    public void setRowNum(Integer rowNum) {
+        this.rowNum = rowNum;
+    }
+
+    @Override
+    public String getErrorMsg() {
+        return errorMsg;
+    }
+
+    @Override
+    public void setErrorMsg(String errorMsg) {
+        this.errorMsg = errorMsg;
+    }
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/CustomerStaffResultDTO.java

@@ -93,4 +93,24 @@ public class CustomerStaffResultDTO implements Serializable {
      */
     private String twoOrgName;
 
+    /**
+     * 【社区】名称0409
+     */
+    private String community;
+
+    /**
+     * 组织级别
+     */
+    private String level;
+
+    /**
+     * 中心位置经度
+     */
+    private String longitude;
+
+    /**
+     * 中心位置纬度
+     */
+    private String latitude;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java

@@ -142,4 +142,19 @@ public class CustomerAgencyDTO implements Serializable {
      * 社区
      */
     private String community;
+
+    /**
+     * 坐标
+     */
+    private String coordinates;
+
+    /**
+     * 中心位置经度
+     */
+    private String longitude;
+
+    /**
+     * 中心位置纬度
+     */
+    private String latitude;
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectTotalFormDTO.java

@@ -0,0 +1,35 @@
+package com.epmet.dataaggre.dto.govproject.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 赋能平台【项目处理分析】事件总数查询-接口入参
+ * @Auth sun
+ */
+@NoArgsConstructor
+@Data
+public class ProjectTotalFormDTO implements Serializable {
+    private static final long serialVersionUID = -8515172319313536407L;
+    //组织Id
+    @NotBlank(message = "组织ID不能为空", groups = {Total.class, Monthincr.class, Statuslist.class})
+    private String agencyId;
+    //日期yyyymmdd
+    @NotBlank(message = "组织ID不能为空", groups = {Total.class, Monthincr.class, Statuslist.class})
+    private String dateId;
+    //状态:待处理 pending，结案closed
+    @NotBlank(message = "项目状态不能为空", groups = {Statuslist.class})
+    private String status;
+
+    public interface Total extends CustomerClientShowGroup {
+    }
+    public interface Monthincr extends CustomerClientShowGroup {
+    }
+    public interface Statuslist extends CustomerClientShowGroup {
+    }
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectMonthIncrResultDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dataaggre.dto.govproject.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 赋能平台【项目处理分析】进12月新增项目折线图-接口返参
+ * @Auth sun
+ */
+@Data
+public class ProjectMonthIncrResultDTO implements Serializable {
+    private static final long serialVersionUID = 6188316867855643263L;
+
+    //横坐标值
+    private String value;
+    //横坐标
+    private Integer type;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectStatusListResultDTO.java

@@ -0,0 +1,28 @@
+package com.epmet.dataaggre.dto.govproject.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 赋能平台【项目处理分析】事件总数查询-接口返参
+ * @Auth sun
+ */
+@Data
+public class ProjectStatusListResultDTO implements Serializable {
+    private static final long serialVersionUID = 6188316867855643263L;
+
+    //组织Id
+    private String agencyId;
+    //项目Id
+    private String projectId;
+    //来源：议题issue  项目立项:agency 事件:resi_event
+    private Integer origin;
+    //状态:待处理 pending，结案closed
+    private Integer status;
+    //经度
+    private Integer longitude;
+    //纬度
+    private Integer dimension;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectTotalResultDTO.java

@@ -0,0 +1,34 @@
+package com.epmet.dataaggre.dto.govproject.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 赋能平台【项目处理分析】事件总数查询-接口返参
+ * @Auth sun
+ */
+@Data
+public class ProjectTotalResultDTO implements Serializable {
+    private static final long serialVersionUID = 6188316867855643263L;
+
+    //组织Id
+    private String agencyId;
+    //日期yyyymmdd
+    private String dateId;
+    //项目总数
+    private Integer projectTotal;
+    //较昨日数
+    private Integer dateIncr;
+    //较上月数
+    private Integer monthIncr;
+    //未结案项目数
+    private Integer pendingTotal;
+    //为结案项目占比 xx%
+    private String pendingRatio;
+    //已结案项目数
+    private Integer closedTotal;
+    //已结案项目占比
+    private String closedRatio;
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java

@@ -8,8 +8,11 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO;
 import com.epmet.dataaggre.dto.govproject.form.ProjectDistributionFormDTO;
+import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO;
 import com.epmet.dataaggre.dto.govproject.result.AllProjectResultDTO;
 import com.epmet.dataaggre.dto.govproject.result.ProjectDistributionResultDTO;
+import com.epmet.dataaggre.dto.govproject.result.ProjectMonthIncrResultDTO;
+import com.epmet.dataaggre.dto.govproject.result.ProjectTotalResultDTO;
 import com.epmet.dataaggre.service.govproject.GovProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -56,4 +59,35 @@ public class GovProjectController {
 		ValidatorUtils.validateEntity(formDTO);
 		return new Result<List<ProjectDistributionResultDTO>>().ok(govProjectService.queryProjectDistribution(formDTO));
 	}
+
+	/**
+	 * @Description 赋能平台【项目处理分析】事件总数查询
+	 * @author sun
+	 */
+	@PostMapping("projecttotal")
+	public Result<ProjectTotalResultDTO> projectTotal(@RequestBody ProjectTotalFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, ProjectTotalFormDTO.Total.class);
+		return new Result<ProjectTotalResultDTO>().ok(govProjectService.projectTotal(formDTO));
+	}
+
+	/**
+	 * @Description 赋能平台【项目处理分析】进12月新增项目折线图
+	 * @author sun
+	 */
+	@PostMapping("projectmonthincr")
+	public Result<List<ProjectMonthIncrResultDTO>> projectMonthIncr(@RequestBody ProjectTotalFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, ProjectTotalFormDTO.Monthincr.class);
+		return new Result<List<ProjectMonthIncrResultDTO>>().ok(govProjectService.projectMonthIncr(formDTO));
+	}
+
+	/**
+	 * @Description 赋能平台【项目处理分析】按状态查询项目列表
+	 * @author sun
+	 */
+	@PostMapping("projectstatuslist")
+	public Result<List<ProjectTotalResultDTO>> projectStatusList(@RequestBody ProjectTotalFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, ProjectTotalFormDTO.Statuslist.class);
+		return new Result<List<ProjectTotalResultDTO>>().ok(govProjectService.projectStatusList(formDTO));
+	}
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -602,6 +602,9 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         result.setAgencyId(agencyDTO.getId());
         result.setAgencyName(agencyDTO.getOrganizationName());
         result.setAgencyPIds(agencyDTO.getPids());
+        result.setLevel(agencyDTO.getLevel());
+        result.setLongitude(agencyDTO.getLongitude());
+        result.setLatitude(agencyDTO.getLatitude());
         StaffOrgRelationResultDTO fromOrgTypeDto = govOrgService.getStaffFromOrgType(staffId);
         String fromOrgType = OrgTypeEnum.AGENCY.getCode();
         if (fromOrgTypeDto != null){

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java

@@ -4,9 +4,8 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
 import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO;
 import com.epmet.dataaggre.dto.govproject.form.ProjectDistributionFormDTO;
-import com.epmet.dataaggre.dto.govproject.result.AllProjectResultDTO;
+import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO;
-import com.epmet.dataaggre.dto.govproject.result.ProjectDistributionResultDTO;
+import com.epmet.dataaggre.dto.govproject.result.*;
-import com.epmet.dataaggre.dto.govproject.result.ShiftProjectResultDTO;
 
 import java.util.List;
 
@@ -51,4 +50,22 @@ public interface GovProjectService {
 	 * @date 2021/8/3 15:27
 	 */
 	int countRedDot(String userId);
+
+	/**
+	 * @Description 赋能平台【项目处理分析】事件总数查询
+	 * @author sun
+	 */
+    ProjectTotalResultDTO projectTotal(ProjectTotalFormDTO formDTO);
+
+	/**
+	 * @Description 赋能平台【项目处理分析】进12月新增项目折线图
+	 * @author sun
+	 */
+	List<ProjectMonthIncrResultDTO> projectMonthIncr(ProjectTotalFormDTO formDTO);
+
+	/**
+	 * @Description 赋能平台【项目处理分析】按状态查询项目列表
+	 * @author sun
+	 */
+	List<ProjectTotalResultDTO> projectStatusList(ProjectTotalFormDTO formDTO);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java

@@ -14,10 +14,8 @@ import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
 import com.epmet.dataaggre.dto.govproject.ProjectDTO;
 import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO;
 import com.epmet.dataaggre.dto.govproject.form.ProjectDistributionFormDTO;
-import com.epmet.dataaggre.dto.govproject.result.AllProjectResultDTO;
+import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO;
-import com.epmet.dataaggre.dto.govproject.result.ProjectDistributionResultDTO;
+import com.epmet.dataaggre.dto.govproject.result.*;
-import com.epmet.dataaggre.dto.govproject.result.ProjectInfoDTO;
-import com.epmet.dataaggre.dto.govproject.result.ShiftProjectResultDTO;
 import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO;
 import com.epmet.dataaggre.service.govissue.GovIssueService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
@@ -247,4 +245,31 @@ public class GovProjectServiceImpl implements GovProjectService {
 		return projectDao.countRedDot(userId);
 	}
 
+	/**
+	 * @Description 赋能平台【项目处理分析】事件总数查询
+	 * @author sun
+	 */
+	@Override
+	public ProjectTotalResultDTO projectTotal(ProjectTotalFormDTO formDTO) {
+		return null;
+	}
+
+	/**
+	 * @Description 赋能平台【项目处理分析】进12月新增项目折线图
+	 * @author sun
+	 */
+	@Override
+	public List<ProjectMonthIncrResultDTO> projectMonthIncr(ProjectTotalFormDTO formDTO) {
+		return null;
+	}
+
+	/**
+	 * @Description 赋能平台【项目处理分析】按状态查询项目列表
+	 * @author sun
+	 */
+	@Override
+	public List<ProjectTotalResultDTO> projectStatusList(ProjectTotalFormDTO formDTO) {
+		return null;
+	}
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml

@@ -26,7 +26,23 @@
             ca.organization_name,
             ca.level,
             ca.area_code,
-            ca.parent_area_code
+            ca.parent_area_code,
+            ( CASE WHEN ca.longitude is null THEN
+                ( SELECT longitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE ca.longitude
+                END
+            ) longitude,
+            ( CASE WHEN ca.latitude is null THEN
+                ( SELECT latitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE ca.latitude
+                END
+            ) latitude
         FROM
             customer_staff_agency csa
         INNER JOIN customer_agency ca ON csa.agency_id = ca.id

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java

@@ -268,7 +268,7 @@ public class ScreenProjectController {
 
             //String template = this.getClass().getResource(templatePath).getPath();
             String fileName = "项目统计.xlsx";
-            excelWriter = EasyExcel.write(ExcelUtils.getOutputStream(fileName, response)).withTemplate(inputStream).build();
+            excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response)).withTemplate(inputStream).build();
             WriteSheet writeSheet = EasyExcel.writerSheet().build();
             excelWriter.fill(mapData, writeSheet);
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java

@@ -370,7 +370,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
             //dateId不为空，只计算当天存在评价记录的项目，更新项目对应的得分。
             screenProjectSettleService.updateProjectSatisfactionScore(customerId,dateId,null);
         }catch(Exception e){
-            log.error("群众不满得分更新失败");
+            log.error("群众不满得分更新失败,msg:{}", e);
         }
     }
 

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationDTO.java

@@ -0,0 +1,136 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 社区自组织表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+public class IcCommunitySelfOrganizationDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 组织ID
+     */
+	private String orgId;
+
+    /**
+     * 组织类型，agency：组织，grid：网格
+     */
+	private String orgType;
+
+    /**
+     * 组织ID的父级
+     */
+	private String pid;
+
+    /**
+     * org_id的所有上级
+     */
+	private String pids;
+
+    /**
+     * 组织名称
+     */
+	private String organizationName;
+
+    /**
+     * 组织人数
+     */
+	private Integer organizationPersonCount;
+
+    /**
+     * 负责人姓名
+     */
+	private String principalName;
+
+    /**
+     * 负责人电话
+     */
+	private String principalPhone;
+
+    /**
+     * 服务事项
+     */
+	private String serviceItem;
+
+    /**
+     * 社区自组织创建时间
+     */
+	private Date organizationCreatedTime;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 纬度
+     */
+	private String latitude;
+
+    /**
+     * 
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private String revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationPersonnelDTO.java

@@ -0,0 +1,91 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 社区自组织人员表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+public class IcCommunitySelfOrganizationPersonnelDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 社区自组织ID
+     */
+	private String orgId;
+
+    /**
+     * 人员姓名
+     */
+	private String personName;
+
+    /**
+     * 人员电话
+     */
+	private String personPhone;
+
+    /**
+     * 
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private String revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java

@@ -0,0 +1,156 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 联建活动
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-19
+ */
+@Data
+public class IcPartyActivityDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 组织ID
+     */
+	private String agencyId;
+
+    /**
+     * 组织的所有上级
+     */
+	private String pids;
+
+    /**
+     * 单位ID
+     */
+    @NotBlank(message = "单位不能为空",groups = AddGroup.class)
+	private String unitId;
+    private String unitName;
+    /**
+     * 服务事项
+     */
+    @NotBlank(message = "服务事项不能为空",groups = AddGroup.class)
+	private String serviceMatter;
+
+    /**
+     * 活动标题
+     */
+    @NotBlank(message = "活动标题不能为空",groups = AddGroup.class)
+	private String title;
+
+    /**
+     * 活动目标
+     */
+    @NotBlank(message = "活动目标不能为空",groups = AddGroup.class)
+	private String target;
+
+    /**
+     * 活动内容
+     */
+    @NotBlank(message = "活动内容不能为空",groups = AddGroup.class)
+	private String content;
+
+    /**
+     * 服务人数
+     */
+	private Integer peopleCount;
+
+    /**
+     * 活动时间
+     */
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date activityTime;
+
+    /**
+     * 活动地址
+     */
+    @NotBlank(message = "活动地址不能为空",groups = AddGroup.class)
+	private String address;
+
+    /**
+     * 活动地址经度
+     */
+    @NotBlank(message = "活动地址不能为空",groups = AddGroup.class)
+	private String longitude;
+
+    /**
+     * 活动地址纬度
+     */
+    @NotBlank(message = "活动地址不能为空",groups = AddGroup.class)
+	private String latitude;
+
+    /**
+     * 活动结果
+     */
+	private String result;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java

@@ -0,0 +1,153 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import com.epmet.commons.tools.validator.group.AddGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 联建单位
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-19
+ */
+@Data
+public class IcPartyUnitDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 组织ID
+     */
+	private String agencyId;
+
+    /**
+     * 
+     */
+	private String pids;
+
+    /**
+     * 单位名称
+     */
+    @NotBlank(message = "单位名称不能为空",groups = AddGroup.class)
+	private String unitName;
+
+    /**
+     * 分类 楼宇党建 两新组织 区域单位党建 机关直属部门 其他
+     */
+    @NotBlank(message = "分类不能为空",groups = AddGroup.class)
+	private String type;
+
+    /**
+     * 服务事项 多选逗号隔开
+     */
+	private String serviceMatter;
+
+    private List<String> serviceMatterList;
+
+    /**
+     * 联系人
+     */
+    @NotBlank(message = "联系人不能为空",groups = AddGroup.class)
+	private String contact;
+
+    /**
+     * 联系电话
+     */
+    @NotBlank(message = "联系电话不能为空",groups = AddGroup.class)
+	private String contactMobile;
+
+    /**
+     * 在职党员数
+     */
+	private Integer memberCount;
+
+    /**
+     * 地址
+     */
+	private String address;
+
+    /**
+     * 中心位置经度
+     */
+    @NotBlank(message = "经度不能为空",groups = AddGroup.class)
+	private String longitude;
+
+    /**
+     * 中心位置纬度
+     */
+    @NotBlank(message = "纬度不能为空",groups = AddGroup.class)
+	private String latitude;
+
+    /**
+     * 群众满意度
+     */
+	private String satisfaction;
+
+    /**
+     * 备注
+     */
+	private String remark;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java

@@ -0,0 +1,141 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 社会组织管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+public class IcSocietyOrgDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 组织Id
+     */
+	private String agencyId;
+
+    /**
+     * agency_id的所有上级
+     */
+	private String pids;
+
+    /**
+     * 社会组织名称
+     */
+	private String societyName;
+
+    /**
+     * 服务事项
+     */
+	private String serviceMatters;
+
+    /**
+     * 负责人
+     */
+	private String personInCharge;
+
+    /**
+     * 负责人电话
+     */
+	private String mobile;
+
+    /**
+     * 起始服务时间
+     */
+	private Date serviceStartTime;
+
+    /**
+     * 终止服务时间
+     */
+	private Date serviceEndTime;
+
+    /**
+     * 绑定管理员[组织下录入的工作人员]
+     */
+	private String adminStaffId;
+
+    /**
+     * 地址
+     */
+	private String address;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 维度
+     */
+	private String latitude;
+
+    /**
+     * 备注
+     */
+	private String remarks;
+
+    /**
+     * 删除标识：0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcUserDemandOperateLogDTO.java

@@ -0,0 +1,103 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 居民需求操作日志表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-19
+ */
+@Data
+public class IcUserDemandOperateLogDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 需求id
+     */
+	private String demandRecId;
+
+    /**
+     * 当前操作用户属于哪个端？工作端：staff；居民端：resi
+     */
+	private String userType;
+
+    /**
+     * 当前操作用户id
+     */
+	private String userId;
+
+    /**
+     * 创建需求：create;撤销需求：cancel;指派：assign;接单：take_order;完成：finish;
+     */
+	private String actionCode;
+
+    /**
+     * 操作时间
+     */
+	private Date operateTime;
+
+    /**
+     * 删除标识：0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcUserDemandRecDTO.java

@@ -0,0 +1,178 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 居民需求记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-19
+ */
+@Data
+public class IcUserDemandRecDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 网格id
+     */
+	private String gridId;
+
+    /**
+     * 组织id
+     */
+	private String agencyId;
+
+    /**
+     * 网格的所有上级id
+     */
+	private String gridPids;
+
+    /**
+     * 二级需求分类编码
+     */
+	private String categoryCode;
+
+    /**
+     * 父级需求分类编码
+     */
+	private String parentCode;
+
+    /**
+     * 需求内容1000字
+     */
+	private String content;
+
+    /**
+     * 社区帮办：community；楼长帮办：building_caption;党员帮办：party;自身上报：self_help
+     */
+	private String reportType;
+
+    /**
+     * 上报人姓名
+     */
+	private String reportUserName;
+
+    /**
+     * 上报人联系方式。自身上报时存储注册居民的手机号
+     */
+	private String reportUserMobile;
+
+    /**
+     * 自身上报时存储居民端用户id
+     */
+	private String reportUserId;
+
+    /**
+     * 上报时间
+     */
+	private Date reportTime;
+
+    /**
+     * 希望服务时间
+     */
+	private Date wantServiceTime;
+
+    /**
+     * 小程序用户自己上报：mini_resi；居民信息录入的居民：ic_resi_user
+     */
+	private String demandUserType;
+
+    /**
+     * 需求人：user.id或者ic_resi_user.id
+     */
+	private String demandUserId;
+
+    /**
+     * 需求人姓名
+     */
+	private String demandUserName;
+
+    /**
+     * 需求人联系电话
+     */
+	private String demandUserMobile;
+
+    /**
+     * 待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished
+     */
+	private String status;
+
+    /**
+     * 完成结果：已解决 resolved，未解决 unresolved
+
+     */
+	private String finishResult;
+
+    /**
+     * 取消时间
+     */
+	private Date cancelTime;
+
+    /**
+     * 1：已评价；0：未评价;评价后ic_user_satisfaction表有记录
+     */
+	private Boolean evaluateFlag;
+
+    /**
+     * 删除标识：0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcUserDemandSatisfactionDTO.java

@@ -0,0 +1,102 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 居民需求评价记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-19
+ */
+@Data
+public class IcUserDemandSatisfactionDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键，居民需求评价表
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 需求id
+     */
+	private String demandRecId;
+
+    /**
+     * 当前操作用户属于哪个端？工作端：staff；居民端：resi
+     */
+	private String userType;
+
+    /**
+     * 当前评价用户id，可以是小程序里用户id,也可以是工作端帮忙录入需求的人
+     */
+	private String userId;
+
+    /**
+     * 评价时间
+     */
+	private Date evaluateTime;
+
+    /**
+     * 得分可为半星
+     */
+	private BigDecimal score;
+
+    /**
+     * 删除标识：0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcUserDemandServiceDTO.java

@@ -0,0 +1,106 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 居民需求服务记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-19
+ */
+@Data
+public class IcUserDemandServiceDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 需求id
+     */
+	private String demandRecId;
+
+    /**
+     * 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
+     */
+	private String serviceType;
+
+    /**
+     * 志愿者：居民端爱心互助的志愿者userId；
+     */
+	private String serverId;
+
+    /**
+     * 实际服务开始时间
+     */
+	private Date serviceStartTime;
+
+    /**
+     * 实际服务结束时间
+     */
+	private Date serviceEndTime;
+
+    /**
+     * 完成情况
+     */
+	private String finishDesc;
+
+    /**
+     * 删除标识：0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddCommunitySelfOrganizationFormDTO.java

@@ -0,0 +1,73 @@
+package com.epmet.dto.form;
+
+import com.epmet.dto.IcCommunitySelfOrganizationPersonnelDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/18 5:32 下午
+ * @DESC
+ */
+@Data
+public class AddCommunitySelfOrganizationFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -4996925380900678065L;
+
+    public interface AddCommunitySelfOrganizationForm{}
+
+    /**
+     * 组织名称
+     */
+    @NotBlank(message = "organizationName不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    private String organizationName;
+
+    /**
+     * 组织人数
+     */
+    @NotNull(message = "organizationPersonCount不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    private Integer organizationPersonCount;
+
+    /**
+     * 负责人姓名
+     */
+    @NotBlank(message = "principalName不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    private String principalName;
+
+    /**
+     * 负责人电话
+     */
+    @NotBlank(message = "principalPhone不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    private String principalPhone;
+
+    /**
+     * 服务事项
+     */
+    @NotBlank(message = "serviceItem不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    private String serviceItem;
+
+    /**
+     * 社区自组织创建时间
+     */
+    private String organizationCreatedTime;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 社区自组织人员
+     */
+    private List<IcCommunitySelfOrganizationPersonnelDTO> organizationPersonnel;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java

@@ -0,0 +1,105 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.form;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * @Author sun
+ * @Description 新增社会组织
+ **/
+@Data
+public class AddSocietyOrgFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * 客户Id
+     */
+	private String customerId;
+    /**
+     * 组织Id
+     */
+	private String agencyId;
+    /**
+     * agency_id的所有上级
+     */
+	private String pids;
+    /**
+     * 社会组织名称
+     */
+    @NotBlank(message = "社会组织名称不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
+    @Length(max = 50, message = "社会组织名称不能超过50个字符",groups = {Add.class})
+	private String societyName;
+    /**
+     * 服务事项
+     */
+    @NotBlank(message = "服务事项不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
+    @Length(max = 1000, message = "服务事项不能超过1000个字符",groups = {Add.class})
+	private String serviceMatters;
+    /**
+     * 负责人
+     */
+    @NotBlank(message = "负责人名称不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
+    @Length(max = 20, message = "负责人名称不能超过20个字符",groups = {Add.class})
+	private String personInCharge;
+    /**
+     * 负责人电话
+     */
+    @NotBlank(message = "负责人电话不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
+    @Length(max = 11, message = "负责人电话不能超过11个字符",groups = {Add.class})
+	private String mobile;
+    /**
+     * 起始服务时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	private Date serviceStartTime;
+    /**
+     * 终止服务时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	private Date serviceEndTime;
+    /**
+     * 绑定管理员[组织下录入的工作人员]
+     */
+    @NotBlank(message = "绑定管理员名称不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
+	private String adminStaffId;
+    /**
+     * 地址
+     */
+	private String address;
+    /**
+     * 经度
+     */
+	private String longitude;
+    /**
+     * 维度
+     */
+	private String latitude;
+    //token中userId
+	private String staffId;
+
+    public interface Add {}
+
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommunitySelfOrganizationListFormDTO.java

@@ -0,0 +1,49 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/19 1:47 下午
+ * @DESC
+ */
+@Data
+public class CommunitySelfOrganizationListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 4202083250504143469L;
+
+    public interface CommunitySelfOrganizationListForm{}
+
+    /**
+     * 社区自组织名
+     */
+    private String organizationName;
+
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+
+    @NotNull(message = "pageNo不能为空",groups = CommunitySelfOrganizationListForm.class)
+    private Integer pageNo;
+
+    @NotNull(message = "pageSize不能为空",groups = CommunitySelfOrganizationListForm.class)
+    private Integer pageSize;
+
+    /**
+     * 是否分页，默认true分页
+     */
+    private Boolean isPage = true;
+
+    private String customerId;
+    private String agencyId;
+    private Integer ranking;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/DelCommunitySelfOrganizationFormDTO.java

@@ -0,0 +1,22 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/19 4:19 下午
+ * @DESC
+ */
+@Data
+public class DelCommunitySelfOrganizationFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 789228513283561471L;
+
+    public interface DelCommunitySelfOrganizationForm{}
+
+    @NotBlank(message = "orgId不能为空",groups = DelCommunitySelfOrganizationForm.class)
+    private String orgId;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditCommunitySelfOrganizationFormDTO.java

@@ -0,0 +1,81 @@
+package com.epmet.dto.form;
+
+import com.epmet.dto.IcCommunitySelfOrganizationPersonnelDTO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/18 5:32 下午
+ * @DESC
+ */
+@Data
+public class EditCommunitySelfOrganizationFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -4990925380900678065L;
+
+    public interface EditCommunitySelfOrganizationForm{}
+
+    /**
+     * 组织名称
+     */
+    @NotBlank(message = "organizationName不能为空",groups = EditCommunitySelfOrganizationForm.class)
+    private String organizationName;
+
+    /**
+     * 组织人数
+     */
+    @NotNull(message = "organizationPersonCount不能为空",groups = EditCommunitySelfOrganizationForm.class)
+    private Integer organizationPersonCount;
+
+    /**
+     * 负责人姓名
+     */
+    @NotBlank(message = "principalName不能为空",groups = EditCommunitySelfOrganizationForm.class)
+    private String principalName;
+
+    /**
+     * 负责人电话
+     */
+    @NotBlank(message = "principalPhone不能为空",groups = EditCommunitySelfOrganizationForm.class)
+    private String principalPhone;
+
+    /**
+     * 服务事项
+     */
+    @NotBlank(message = "serviceItem不能为空",groups = EditCommunitySelfOrganizationForm.class)
+    private String serviceItem;
+
+    /**
+     * 社区自组织创建时间
+     */
+    @NotNull(message = "organizationCreatedTime不能为空",groups = EditCommunitySelfOrganizationForm.class)
+    private String organizationCreatedTime;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 社区自组织ID
+     */
+    @NotBlank(message = "orgId不能为空",groups = EditCommunitySelfOrganizationForm.class)
+    private String orgId;
+
+    /**
+     * 社区自组织人员
+     */
+    private List<IcCommunitySelfOrganizationPersonnelDTO> organizationPersonnel;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java

@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.form;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * @Author sun
+ * @Description 修改、删除社会组织
+ **/
+@Data
+public class EditSocietyOrgFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 社会组织Id
+     */
+    @NotBlank(message = "社会组织Id不能为空", groups = { Edit.class, Del.class })
+	private String societyId;
+    /**
+     * 社会组织名称
+     */
+    @Length(max = 50, message = "社会组织名称不能超过50个字符",groups = {Edit.class})
+	private String societyName;
+    /**
+     * 服务事项
+     */
+    @Length(max = 1000, message = "服务事项不能超过1000个字符",groups = {Edit.class})
+	private String serviceMatters;
+    /**
+     * 负责人
+     */
+    @Length(max = 20, message = "负责人名称不能超过20个字符",groups = {Edit.class})
+	private String personInCharge;
+    /**
+     * 负责人电话
+     */
+    @Length(max = 11, message = "负责人电话不能超过11个字符",groups = {Edit.class})
+	private String mobile;
+    /**
+     * 起始服务时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	private Date serviceStartTime;
+    /**
+     * 终止服务时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	private Date serviceEndTime;
+    /**
+     * 绑定管理员[组织下录入的工作人员]
+     */
+	private String adminStaffId;
+    /**
+     * 地址
+     */
+	private String address;
+    /**
+     * 经度
+     */
+	private String longitude;
+    /**
+     * 维度
+     */
+	private String latitude;
+    //token中userId
+	private String staffId;
+
+    public interface Edit {}
+    public interface Del {}
+
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/GetListSocietyOrgFormDTO.java

@@ -0,0 +1,58 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import java.io.Serializable;
+
+
+/**
+ * @Author sun
+ * @Description 社会组织列表查询
+ **/
+@Data
+public class GetListSocietyOrgFormDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    //社会组织名称
+	private String societyName;
+    //负责人
+	private String personInCharge;
+    //负责人电话
+	private String mobile;
+    //起始服务时间
+	private String serviceStartTime;
+    //终止服务时间
+	private String serviceEndTime;
+    //页码
+    @Min(1)
+    private Integer pageNo = 1;
+    //每页多少条
+    private Integer pageSize = 20;
+    //是否分页(是:true 否:false)
+    private Boolean isPage = true;
+    //token中客户Id
+    private String customerId;
+    //token中userId
+    private String staffId;
+    //token中userId所属组织的pid
+    private String pids;
+
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/11/22 14:42
+ */
+@NoArgsConstructor
+@Data
+public class PartyActivityFormDTO implements Serializable {
+    private static final long serialVersionUID = -2510068555703677L;
+    private String agencyId;
+    private String unitId;
+    private String title;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+    private String serviceMatter;
+    private Integer pageNo;
+    private Integer pageSize;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitFormDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/11/19 16:19
+ */
+@NoArgsConstructor
+@Data
+public class PartyUnitFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1256798619648265622L;
+    private String customerId;
+    private String agencyId;
+    private String unitName;
+    private String serviceMatter;
+    private String type;
+    private String contact;
+    private String contactMobile;
+    private Integer pageNo;
+    private Integer pageSize;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/AddCategoryFormDTO.java

@@ -0,0 +1,31 @@
+package com.epmet.dto.form.demand;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+@Data
+public class AddCategoryFormDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+
+    @NotBlank(message = "客户id不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+
+    @NotBlank(message = "分类名称不能为空", groups = AddUserShowGroup.class)
+    @Length(max = 100, message = "分类名称最多输入100字", groups = AddUserShowGroup.class)
+    private String categoryName;
+
+    @NotBlank(message = "请先选择一级分类", groups = AddUserShowGroup.class)
+    private String parentCategoryCode;
+
+    @NotNull(message = "奖励积分不能为空", groups = AddUserShowGroup.class)
+    private Integer awardPoint;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/AddFirstCategoryFormDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.dto.form.demand;
+
+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;
+
+@Data
+public class AddFirstCategoryFormDTO implements Serializable {
+    private static final long serialVersionUID = -9011014064624688518L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+
+    @NotBlank(message = "客户id不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+
+    @NotBlank(message = "分类名称不能为空", groups = AddUserShowGroup.class)
+    @Length(max = 20, message = "一级分类名称最多输入20字", groups = AddUserShowGroup.class)
+    private String categoryName;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/AssignFormDTO.java

@@ -0,0 +1,31 @@
+package com.epmet.dto.form.demand;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+@Data
+public class AssignFormDTO implements Serializable {
+    private static final long serialVersionUID = -8844710824469349121L;
+
+    public interface AddUserInternalGroup {
+    }
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+    @NotBlank(message = "需求id不能为空", groups = AddUserInternalGroup.class)
+    private String demandRecId;
+    @NotBlank(message = "服务方类型不能为空", groups = AddUserShowGroup.class)
+    private String serviceType;
+    @NotBlank(message = "服务方不能为空", groups = AddUserShowGroup.class)
+    private String serverId;
+
+
+
+    @NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class)
+    private String userId;
+    @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandAddFromDTO.java

@@ -0,0 +1,120 @@
+package com.epmet.dto.form.demand;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class DemandAddFromDTO implements Serializable {
+
+    private static final long serialVersionUID = 1589287946950749226L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+    public interface UpdateInternalGroup {
+    }
+
+    @NotBlank(message = "需求id不能为空",groups = UpdateInternalGroup.class)
+    private String demandRecId;
+
+    private String customerId;
+    private String currentUserId;
+
+
+    /**
+     * 网格id
+     */
+    @NotBlank(message = "所属网格不能为空",groups = AddUserShowGroup.class)
+    private String gridId;
+
+    /**
+     * 组织id
+     */
+    private String agencyId;
+
+    /**
+     * 网格的所有上级id
+     */
+    private String gridPids;
+
+
+
+
+    /**
+     * 二级需求分类编码
+     */
+    @NotBlank(message = "需求类别不能为空",groups = AddUserShowGroup.class)
+    private String categoryCode;
+
+    /**
+     * 父级需求分类编码
+     */
+    @NotBlank(message = "需求类别不能为空",groups = AddUserShowGroup.class)
+    private String parentCode;
+
+    /**
+     * 需求内容1000字
+     */
+    @NotBlank(message = "需求内容不能为空",groups = AddUserShowGroup.class)
+    @Length(max = 1000,message = "需求内容至多输入1000字",groups = AddUserShowGroup.class)
+    private String content;
+
+    /**
+     * 社区帮办：community；楼长帮办：building_caption;党员帮办：party;自身上报：self_help
+     */
+    @NotBlank(message = "上报类型不能为空",groups = AddUserShowGroup.class)
+    private String reportType;
+
+    /**
+     * 上报人姓名
+     */
+    @NotBlank(message = "上报人不能为空",groups = AddUserShowGroup.class)
+    private String reportUserName;
+
+    /**
+     * 上报人联系方式。自身上报时存储注册居民的手机号
+     */
+    @NotBlank(message = "上报人联系方式不能为空",groups = AddUserShowGroup.class)
+    private String reportUserMobile;
+
+    /**
+     * 上报时间
+     */
+    @NotNull(message = "上报时间不能为空",groups = AddUserShowGroup.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reportTime;
+
+    /**
+     * 需求人：user.id或者ic_resi_user.id
+     */
+    @NotNull(message = "需求人不能为空",groups = AddUserShowGroup.class)
+    private String demandUserId;
+
+    /**
+     * 需求人姓名
+     */
+    @NotNull(message = "需求人不能为空",groups = AddUserShowGroup.class)
+    private String demandUserName;
+
+    /**
+     * 需求人联系电话
+     */
+    @NotNull(message = "需求人不能为空",groups = AddUserShowGroup.class)
+    private String demandUserMobile;
+
+    /**
+     * 希望服务时间
+     */
+    @NotNull(message = "服务时间不能为空",groups = AddUserShowGroup.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date wantServiceTime;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandDetailFormDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dto.form.demand;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+@Data
+public class DemandDetailFormDTO implements Serializable {
+    private static final long serialVersionUID = 514538389753713095L;
+    public interface AddUserInternalGroup {
+    }
+
+    @NotBlank(message = "demandRecId不能为空", groups = AddUserInternalGroup.class)
+    private String demandRecId;
+
+
+    @NotBlank(message = "tokenDto获取客户id不能为空", groups = IcResiUserDemandFromDTO.AddUserInternalGroup.class)
+    private String customerId;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandDictPageFormDTO.java

@@ -0,0 +1,17 @@
+package com.epmet.dto.form.demand;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+@Data
+public class DemandDictPageFormDTO extends PageFormDTO implements Serializable {
+    public interface AddUserInternalGroup {}
+
+    @NotBlank(message = "客户id不能为空",groups = AddUserInternalGroup.class)
+    private  String customerId;
+
+    private String firstCategoryCode;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandOptionFormDTO.java

@@ -0,0 +1,19 @@
+package com.epmet.dto.form.demand;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+@Data
+public class DemandOptionFormDTO implements Serializable {
+    private static final long serialVersionUID = -5335277881919236426L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    @NotBlank(message = "token获取客户id不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+    @NotBlank(message = "查询条件和查看居民详情:query;新增或修改居民信息：addorupdate", groups = AddUserInternalGroup.class)
+    private String purpose;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/DemandRecId.java

@@ -0,0 +1,10 @@
+package com.epmet.dto.form.demand;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class DemandRecId implements Serializable {
+    private String demandRecId;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/FinishStaffFromDTO.java

@@ -0,0 +1,48 @@
+package com.epmet.dto.form.demand;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class FinishStaffFromDTO implements Serializable {
+    private static final long serialVersionUID = 591380873862126679L;
+
+    public interface AddUserInternalGroup {
+    }
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+    @NotBlank(message = "需求id不能为空", groups = AddUserInternalGroup.class)
+    private String demandRecId;
+
+    @NotBlank(message = "服务id不能为空", groups = AddUserShowGroup.class)
+    private String serviceId;
+
+    @NotNull(message = "实际服务开始不能为空", groups = AddUserShowGroup.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date serviceStartTime;
+
+    @NotNull(message = "实际服务结束不能为空", groups = AddUserShowGroup.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date serviceEndTime;
+
+    @NotBlank(message = "完成结果不能为空", groups = AddUserShowGroup.class)
+    private String finishResult;
+    private String finishDesc;
+
+    @NotNull(message = "得分不能为空", groups = AddUserShowGroup.class)
+    private BigDecimal score;
+
+
+
+    @NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class)
+    private String userId;
+    @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/IcResiUserDemandFromDTO.java

@@ -0,0 +1,44 @@
+package com.epmet.dto.form.demand;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class IcResiUserDemandFromDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+
+
+    /**
+     * 居民信息录入的居民的id
+     */
+    @NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class)
+    private String userId;
+
+    /**
+     * icresiuser/persondata接口返参中有此值
+     */
+    private List<String> epmetUserIdList;
+
+    @NotNull(message = "pageNo不能为空", groups = AddUserInternalGroup.class)
+    private Integer pageNo;
+    @NotNull(message = "pageSize不能为空", groups = AddUserInternalGroup.class)
+    private Integer pageSize;
+
+    /**
+     * 研判分析界面，查看同类型的需求可以用此接口，只需传入分类编码
+     */
+    private String firstCategoryCode;
+
+    @NotBlank(message = "tokenDto获取客户id不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+
+    /**
+     * epmetUserIdList+userId
+     */
+    private List<String> userIds;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/ServiceQueryFormDTO.java

@@ -0,0 +1,42 @@
+package com.epmet.dto.form.demand;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+@Data
+public class ServiceQueryFormDTO implements Serializable {
+    private static final long serialVersionUID = -2738313255838176318L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    public interface SocietyOrgInternalGroup {
+    }
+
+    /**
+     * 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
+     */
+    @NotBlank(message = "服务方类型不能为空", groups = AddUserInternalGroup.class)
+    private String serviceType;
+
+    /**
+     * 名称检索
+     */
+    private String serviceName;
+
+    /**
+     * 列表查询条件：query_demand  需求指派：add_demand
+     */
+    @NotBlank(message = "新增需求：add_demand;列表查询：query_demand", groups = SocietyOrgInternalGroup.class)
+    private String queryPurpose;
+
+    // --------------------------------------------------------
+    // 以下参数从token中获取
+    @NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class)
+    private String staffId;
+    @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/StaffCancelFormDTO.java

@@ -0,0 +1,17 @@
+package com.epmet.dto.form.demand;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class StaffCancelFormDTO {
+    public interface AddUserInternalGroup {}
+    @NotBlank(message = "需求id不能为空",groups = AddUserInternalGroup.class)
+    private String demandRecId;
+
+    @NotBlank(message = "userId不能为空", groups =AddUserInternalGroup.class)
+    private String userId;
+    @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/StatusFormDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dto.form.demand;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+@Data
+public class StatusFormDTO implements Serializable {
+
+    public interface AddUserInternalGroup {
+    }
+
+    @NotBlank(message = "categoryId不能为空", groups = AddUserInternalGroup.class)
+    private String categoryId;
+
+    @NotNull(message = "usableFlag不能为空", groups = AddUserInternalGroup.class)
+    private Boolean usableFlag;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/SubCodeFormDTO.java

@@ -0,0 +1,17 @@
+package com.epmet.dto.form.demand;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+@Data
+public class SubCodeFormDTO implements Serializable {
+    public interface AddUserInternalGroup {}
+    @NotBlank(message = "客户id不能为空",groups = AddUserInternalGroup.class)
+    private  String customerId;
+    @NotBlank(message = "parentCategoryCode不能为空",groups = AddUserInternalGroup.class)
+    private  String parentCategoryCode;
+
+    private String categoryName;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UpdateFormDTO.java

@@ -0,0 +1,42 @@
+package com.epmet.dto.form.demand;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+@Data
+public class UpdateFormDTO implements Serializable {
+
+    public interface AddUserInternalGroup {
+    }
+
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+
+    public interface First extends CustomerClientShowGroup {
+    }
+
+    public interface Two extends CustomerClientShowGroup {
+    }
+    @NotBlank(message = "客户id不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+
+    @NotBlank(message = "categoryId不能为空", groups = AddUserInternalGroup.class)
+    private String categoryId;
+
+    @NotNull(message = "等级不能为空", groups = AddUserInternalGroup.class)
+    private Integer level;
+
+
+    @NotBlank(message = "分类名称不能为空", groups = AddUserShowGroup.class)
+    @Length(max = 100, message = "分类名称最多输入100字", groups = First.class)
+    @Length(max = 20,  message = "分类名称最多输入20字", groups = Two.class)
+    private String categoryName;
+
+    @NotNull(message = "奖励积分不能为空", groups = Two.class)
+    private Integer awardPoint;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandNameQueryFormDTO.java

@@ -13,7 +13,7 @@ public class UserDemandNameQueryFormDTO implements Serializable {
 
     public interface AddUserInternalGroup {}
 
-    @NotBlank(message = "客户idbu不能为空",groups =AddUserInternalGroup.class)
+    @NotBlank(message = "客户id不能为空",groups =AddUserInternalGroup.class)
     private String customerId;
 
     @NotEmpty(message = "分类编码不能为空",groups =AddUserInternalGroup.class)

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandPageFormDTO.java

@@ -0,0 +1,77 @@
+package com.epmet.dto.form.demand;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class UserDemandPageFormDTO extends PageFormDTO implements Serializable {
+
+    private String customerId;
+    private String currentStaffId;
+    private String gridPids;
+
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+
+
+    /**
+     * 分类的编码
+     */
+    private String categoryCode;
+
+    /**
+     * 分类的级别
+     */
+    private Integer level;
+
+
+
+    /**
+     * 需求人姓名
+     */
+    private String demandUserName;
+
+    /**
+     * 上报时间开始
+     */
+    private String reportStartTime;
+
+    /**
+     * 上报时间截止
+     */
+    private String reportEndTime;
+
+    /**
+     * 待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished
+     */
+    private String status;
+
+
+
+
+    /**
+     * 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
+     */
+    private String serviceType;
+
+    /**
+     * 服务方id
+     */
+    private String serverId;
+
+    /**
+     * 希望服务时间开始
+     */
+    private String wantServiceStartTime;
+
+    /**
+     * 希望截止
+     */
+    private String wantServiceEndTime;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java

@@ -0,0 +1,89 @@
+package com.epmet.dto.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.dto.IcCommunitySelfOrganizationPersonnelDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/19 1:47 下午
+ * @DESC
+ */
+@Data
+public class CommunitySelfOrganizationListDTO implements Serializable {
+
+    private static final long serialVersionUID = 3208034033470533749L;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 社区自组织人数
+     */
+    private Integer organizationPersonCount;
+
+    /**
+     * 社区自组织名字
+     */
+    private String organizationName;
+
+    /**
+     * 服务事项
+     */
+    private String serviceItem;
+
+    /**
+     * 负责人
+     */
+    private String principalName;
+
+    /**
+     * 负责人电话
+     */
+    private String principalPhone;
+
+    /**
+     * 自组织创办时间
+     */
+    private String organizationCreatedTime;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 社区自组织ID
+     */
+    private String orgId;
+
+    /**
+     * 社区自组织人员
+     */
+    private List<IcCommunitySelfOrganizationPersonnelDTO> organizationPersonnel;
+
+    public CommunitySelfOrganizationListDTO() {
+        this.sort = NumConstant.ZERO;
+        this.organizationPersonCount = NumConstant.ZERO;
+        this.organizationName = "";
+        this.serviceItem = "";
+        this.principalName = "";
+        this.principalPhone = "";
+        this.organizationCreatedTime = "";
+        this.longitude = "";
+        this.latitude = "";
+        this.orgId = "";
+        this.organizationPersonnel = new ArrayList<>();
+    }
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListResultDTO.java

@@ -0,0 +1,28 @@
+package com.epmet.dto.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/19 1:47 下午
+ * @DESC
+ */
+@Data
+public class CommunitySelfOrganizationListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3208034033470533749L;
+
+    private Integer total;
+
+    private List<CommunitySelfOrganizationListDTO> list;
+
+    public CommunitySelfOrganizationListResultDTO() {
+        this.total = NumConstant.ZERO;
+        this.list = new ArrayList<>();
+    }
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java

@@ -0,0 +1,73 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author sun
+ * @Description 社会组织列表查询
+ **/
+@Data
+public class GetListSocietyOrgResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    //集合总条数
+    private Integer total;
+    //社会组织信息
+    private List<SocietyOrgListResultDTO> list;
+
+    @Data
+    public class SocietyOrgList{
+        //所属组织Id
+        private String  agencyId;
+        //社会组织Id
+        private String societyId;
+        //社会组织名称
+        private String societyName;
+        //服务事项
+        private String serviceMatters;
+        //负责人姓名
+        private String personInCharge;
+        //负责人电话
+        private String mobile;
+        //起始服务时间
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+        private Date serviceStartTime;
+        //终止服务时间
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+        private Date serviceEndTime;
+        //绑定管理员[组织下Id录入的工作人员]
+        private String adminStaffId;
+        //绑定管理员[组织下录入的工作人员]姓名
+        private String adminStaffName;
+        //地址
+        private String address;
+        //经度
+        private String longitude;
+        //维度
+        private String latitude;
+    }
+
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java

@@ -0,0 +1,63 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author sun
+ * @Description 社会组织列表查询
+ **/
+@Data
+public class SocietyOrgListResultDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    //所属组织Id
+    private String  agencyId;
+    //所属组织名称
+    private String  agencyName;
+    //社会组织Id
+    private String societyId;
+    //社会组织名称
+    private String societyName;
+    //服务事项
+    private String serviceMatters;
+    //负责人姓名
+    private String personInCharge;
+    //负责人电话
+    private String mobile;
+    //起始服务时间
+    //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    //private Date serviceStartTime;
+    private String serviceStartTime;
+    //终止服务时间
+    private String serviceEndTime;
+    //绑定管理员[组织下Id录入的工作人员]
+    private String adminStaffId;
+    //绑定管理员[组织下录入的工作人员]姓名
+    private String adminStaffName = "";
+    //地址
+    private String address;
+    //经度
+    private String longitude;
+    //维度
+    private String latitude;
+
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandPageResDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.dto.result.demand;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class DemandPageResDTO implements Serializable {
+    private String customerId;
+    private String categoryId;
+    private String categoryCode;
+    private String parentCategoryCode;
+    private String categoryName;
+    private Integer level;
+    private Integer sort;
+    private BigDecimal awardPoint;
+    private Boolean usableFlag;
+    private List<DemandPageResDTO> children;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java

@@ -0,0 +1,117 @@
+package com.epmet.dto.result.demand;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+@Data
+public class DemandRecResultDTO implements Serializable {
+    private static final long serialVersionUID = 1140730681599839420L;
+
+    private String demandRecId;
+    //@JsonIgnore
+    private String gridId;
+    private String gridName;
+    private String agencyId;
+
+    //@JsonIgnore
+    private String categoryCode;
+    private String parentCode;
+    private String categoryName;
+    private String firstCategoryCode;
+    private String firstCategoryName;
+
+
+    //社区帮办：community；楼长帮办：building_caption;党员帮办：party;自身上报：self_help
+    private String reportType;
+    private String reportTypeName;
+
+    private String content;
+    private String reportUserName;
+    private String reportUserMobile;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date reportTime;
+    private String demandUserId;
+    private String demandUser;
+    private String demandUserName;
+    private String demandUserMobile;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date wantServiceTime;
+
+    /**
+     * 待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished
+     */
+    private String status;
+    private String statusName;
+
+    /**
+     * 完成结果：已解决 resolved，未解决 unresolved
+
+     */
+    private String finishResult;
+
+    /**
+     * 取消时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date cancelTime;
+
+    /**
+     * 1：已评价；0：未评价;评价后ic_user_satisfaction表有记录
+     */
+    private Boolean evaluateFlag;
+    /**
+     * 得分可为半星
+     */
+    private BigDecimal score;
+
+    /** 服务情况********************************************************************/
+    /** 服务情况********************************************************************/
+    /** 服务情况********************************************************************/
+    private String serviceId;
+    /**
+     * 志愿者的姓名
+     * 社会组织名
+     * 社区自组织的名字
+     * 区域党建单位名称
+     */
+    private String serviceName;
+    /**
+     * 尹作梅(志愿者)
+     * XXX(社会组织)
+     * XXX(社区自组织)
+     * XXX(区域化党建单位)
+     */
+    private String serviceShowName;
+    /**
+     * 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
+     */
+    private String serviceType;
+
+    /**
+     * 志愿者：居民端爱心互助的志愿者userId；
+     */
+    private String serverId;
+
+    /**
+     * 实际服务开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date serviceStartTime;
+
+    /**
+     * 实际服务结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date serviceEndTime;
+
+    /**
+     * 完成情况
+     */
+    private String finishDesc;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/FinishResultDTO.java

@@ -0,0 +1,15 @@
+package com.epmet.dto.result.demand;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 完成需求时，是否需要计算  区域化党建单位的满意度
+ *
+ */
+@Data
+public class FinishResultDTO implements Serializable {
+    private Boolean sendCalStatisfaction;
+    private String partyUnitId;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/IcResiUserReportDemandRes.java

@@ -0,0 +1,33 @@
+package com.epmet.dto.result.demand;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class IcResiUserReportDemandRes implements Serializable {
+    private static final long serialVersionUID = 7043350476644105434L;
+
+    private String demandRecId;
+
+    @JsonIgnore
+    private String categoryCode;
+
+    @JsonIgnore
+    private String parentCode;
+
+    private String categoryName;
+
+    private String content;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date wantServiceTime;
+
+    @JsonIgnore
+    private String status;
+
+    private String statusName;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/OptionDTO.java

@@ -0,0 +1,12 @@
+package com.epmet.dto.result.demand;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class OptionDTO implements Serializable {
+    private static final long serialVersionUID = -6722370308097497466L;
+    private String label;
+    private String value;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/ServiceStatDTO.java

@@ -0,0 +1,23 @@
+package com.epmet.dto.result.demand;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class ServiceStatDTO implements Serializable {
+    /**
+     * 服务方id
+     */
+    private String serverId;
+    /**
+     * 总分
+     */
+    private BigDecimal totalScore;
+    /**
+     * 服务的需求个数
+     */
+    private Integer demandCount;
+}

epmet-module/epmet-heart/epmet-heart-server/pom.xml

@@ -82,6 +82,18 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-admin-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--rocketmq-->
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-rocketmq</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -146,6 +158,10 @@
                 <!--测试钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.enable>true</rocketmq.enable>
+                <rocketmq.nameserver>192.168.1.140:9876;192.168.1.141:9876</rocketmq.nameserver>
             </properties>
         </profile>
         <profile>
@@ -189,6 +205,10 @@
                 <!--测试钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.enable>false</rocketmq.enable>
+                <rocketmq.nameserver>192.168.1.140:9876;192.168.1.141:9876</rocketmq.nameserver>
             </properties>
         </profile>
         <profile>
@@ -232,6 +252,10 @@
                 <!--测试钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.enable>true</rocketmq.enable>
+                <rocketmq.nameserver>192.168.10.161:9876</rocketmq.nameserver>
             </properties>
         </profile>
         <profile>
@@ -275,6 +299,10 @@
                 <!--生产钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c</dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1</dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.enable>true</rocketmq.enable>
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/IcCommunitySelfOrganizationConstant.java

@@ -0,0 +1,11 @@
+package com.epmet.constant;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/19 8:39 上午
+ * @DESC
+ */
+public interface IcCommunitySelfOrganizationConstant {
+
+    String ORG_TYPE_AGENCY = "agency";
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java

@@ -0,0 +1,53 @@
+package com.epmet.constant;
+
+public interface UserDemandConstant {
+
+
+    /**
+     * 小程序用户自己上报：mini_resi；居民信息录入的居民：ic_resi_user
+     */
+    String MINI_RESI = "mini_resi";
+    String IC_RESI_USER = "ic_resi_user";
+
+    /**
+     * 上报类型：社区帮办：community；楼长帮办：building_caption;党员帮办：party;自身上报：self_help
+     */
+    String COMMUNITY_REPORT="community";
+    String BUILDING_CAPTION_REPORT="building_caption";
+    String PARTY_REPORT="party";
+    String SELF_HELP_REPORT="self_help";
+    /**
+     * 待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished
+     */
+    String PENDING = "pending";
+    String CANCELED = "canceled";
+    String ASSIGNED = "assigned";
+    String HAVE_ORDER = "have_order";
+    String FINISHED = "finished";
+
+
+
+    /**
+     * 当前操作用户属于哪个端？工作端：staff；居民端：resi
+     */
+    String STAFF="staff";
+    String RESI="resi";
+
+
+    /**
+     * 创建需求：create;撤销需求：cancel;指派：assign;接单：take_order;完成：finish;；
+     * 更新需求：update
+     */
+    String CREATE="create";
+    String UPDATE="update";
+    String CANCEL="cancel";
+    String ASSIGN="assign";
+    String TAKE_ORDER="take_order";
+    String FINISH="finish";
+
+//    服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
+    String VOLUNTEER="volunteer";
+    String SOCIAL_ORG="social_org";
+    String COMMUNITY_ORG="community_org";
+    String PARTY_UNIT="party_unit";
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java

@@ -0,0 +1,213 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.IcCommunitySelfOrganizationDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.form.demand.ServiceQueryFormDTO;
+import com.epmet.dto.result.CommunitySelfOrganizationListResultDTO;
+import com.epmet.dto.result.demand.OptionDTO;
+import com.epmet.excel.ExportCommunitySelfOrganizationExcel;
+import com.epmet.excel.IcCommunitySelfOrganizationExcel;
+import com.epmet.service.IcCommunitySelfOrganizationService;
+import org.apache.commons.io.FilenameUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 社区自组织表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@RestController
+@RequestMapping("iccommunityselforganization")
+public class IcCommunitySelfOrganizationController {
+
+    @Autowired
+    private IcCommunitySelfOrganizationService icCommunitySelfOrganizationService;
+
+    @GetMapping("page")
+    public Result<PageData<IcCommunitySelfOrganizationDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcCommunitySelfOrganizationDTO> page = icCommunitySelfOrganizationService.page(params);
+        return new Result<PageData<IcCommunitySelfOrganizationDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IcCommunitySelfOrganizationDTO> get(@PathVariable("id") String id){
+        IcCommunitySelfOrganizationDTO data = icCommunitySelfOrganizationService.get(id);
+        return new Result<IcCommunitySelfOrganizationDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IcCommunitySelfOrganizationDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icCommunitySelfOrganizationService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IcCommunitySelfOrganizationDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        icCommunitySelfOrganizationService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icCommunitySelfOrganizationService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IcCommunitySelfOrganizationDTO> list = icCommunitySelfOrganizationService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IcCommunitySelfOrganizationExcel.class);
+    }
+
+    /**
+     * @Description  导出 社区自组织查询列表
+     * @param response
+     * @param tokenDto
+     * @param formDTO
+     * @author zxc
+     * @date 2021/11/24 10:59 上午
+     */
+    @PostMapping("exportcommunityselforganization")
+    public void exportCommunitySelfOrganization(HttpServletResponse response,@LoginUser TokenDto tokenDto,@RequestBody CommunitySelfOrganizationListFormDTO formDTO) throws Exception {
+        CommunitySelfOrganizationListResultDTO resultDTO = icCommunitySelfOrganizationService.communitySelfOrganizationList(tokenDto, formDTO);
+        ExcelUtils.exportExcelToTarget(response, null, resultDTO.getList(), ExportCommunitySelfOrganizationExcel.class);
+    }
+
+    /**
+     * @Description  导入
+     * @param tokenDto
+     * @param response
+     * @param file
+     * @author zxc
+     * @date 2021/11/25 9:03 上午
+     */
+    @PostMapping("importcommunityselforganization")
+    public Result importCommunitySelfOrganization(@LoginUser TokenDto tokenDto, HttpServletResponse response, @RequestPart("file") MultipartFile file) throws Exception {
+        if (file.isEmpty()) {
+            throw new RenException("请上传文件");
+        }
+
+        // 校验文件类型
+        String extension = FilenameUtils.getExtension(file.getOriginalFilename());
+        if (!"xls".equals(extension) && !"xlsx".equals(extension)) {
+            throw new RenException("文件类型不匹配");
+        }
+        icCommunitySelfOrganizationService.importCommunitySelfOrganization(tokenDto, response, file);
+        return new Result();
+    }
+
+    /**
+     * @Description  添加社区自组织
+     * @param tokenDto
+     * @param formDTO
+     * @author zxc
+     * @date 2021/11/19 8:33 上午
+     */
+    @NoRepeatSubmit
+    @PostMapping("addcommunityselforganization")
+    public Result addCommunitySelfOrganization(@LoginUser TokenDto tokenDto, @RequestBody AddCommunitySelfOrganizationFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, AddCommunitySelfOrganizationFormDTO.AddCommunitySelfOrganizationForm.class);
+        icCommunitySelfOrganizationService.addCommunitySelfOrganization(tokenDto, formDTO);
+        return new Result();
+    }
+
+    /**
+     * @Description  修改社区自组织
+     * @param tokenDto
+     * @param formDTO
+     * @author zxc
+     * @date 2021/11/19 10:12 上午
+     */
+    @NoRepeatSubmit
+    @PostMapping("editcommunityselforganization")
+    public Result editCommunitySelfOrganization(@LoginUser TokenDto tokenDto, @RequestBody EditCommunitySelfOrganizationFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, EditCommunitySelfOrganizationFormDTO.EditCommunitySelfOrganizationForm.class);
+        icCommunitySelfOrganizationService.editCommunitySelfOrganization(tokenDto, formDTO);
+        return new Result();
+    }
+
+    /**
+     * @Description  查询社区自组织列表
+     * @param tokenDto
+     * @param formDTO
+     * @author zxc
+     * @date 2021/11/19 1:59 下午
+     */
+    @PostMapping("communityselforganizationlist")
+    public Result<CommunitySelfOrganizationListResultDTO> communitySelfOrganizationList(@LoginUser TokenDto tokenDto,@RequestBody CommunitySelfOrganizationListFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, CommunitySelfOrganizationListFormDTO.CommunitySelfOrganizationListForm.class);
+        return new Result<CommunitySelfOrganizationListResultDTO>().ok(icCommunitySelfOrganizationService.communitySelfOrganizationList(tokenDto, formDTO));
+    }
+
+    /**
+     * @Description  社区自组织删除
+     * @param formDTO
+     * @author zxc
+     * @date 2021/11/19 4:22 下午
+     */
+    @PostMapping("delcommunityselforganization")
+    public Result delCommunitySelfOrganization(@RequestBody DelCommunitySelfOrganizationFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, DelCommunitySelfOrganizationFormDTO.DelCommunitySelfOrganizationForm.class);
+        icCommunitySelfOrganizationService.delCommunitySelfOrganization(formDTO);
+        return new Result();
+    }
+
+    /**
+     * 需求指派，选择社区自组织，调用此接口
+     * 返回需求所属社区下的 组织
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("servicelist")
+    public Result<List<OptionDTO>> queryServiceList(@LoginUser TokenDto tokenDto, @RequestBody ServiceQueryFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,ServiceQueryFormDTO.AddUserInternalGroup.class);
+        return new Result<List<OptionDTO>>().ok(icCommunitySelfOrganizationService.queryServiceList(formDTO));
+    }
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationPersonnelController.java

@@ -0,0 +1,94 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.IcCommunitySelfOrganizationPersonnelDTO;
+import com.epmet.excel.IcCommunitySelfOrganizationPersonnelExcel;
+import com.epmet.service.IcCommunitySelfOrganizationPersonnelService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 社区自组织人员表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@RestController
+@RequestMapping("iccommunityselforganizationpersonnel")
+public class IcCommunitySelfOrganizationPersonnelController {
+    
+    @Autowired
+    private IcCommunitySelfOrganizationPersonnelService icCommunitySelfOrganizationPersonnelService;
+
+    @GetMapping("page")
+    public Result<PageData<IcCommunitySelfOrganizationPersonnelDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcCommunitySelfOrganizationPersonnelDTO> page = icCommunitySelfOrganizationPersonnelService.page(params);
+        return new Result<PageData<IcCommunitySelfOrganizationPersonnelDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IcCommunitySelfOrganizationPersonnelDTO> get(@PathVariable("id") String id){
+        IcCommunitySelfOrganizationPersonnelDTO data = icCommunitySelfOrganizationPersonnelService.get(id);
+        return new Result<IcCommunitySelfOrganizationPersonnelDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IcCommunitySelfOrganizationPersonnelDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icCommunitySelfOrganizationPersonnelService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IcCommunitySelfOrganizationPersonnelDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        icCommunitySelfOrganizationPersonnelService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icCommunitySelfOrganizationPersonnelService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IcCommunitySelfOrganizationPersonnelDTO> list = icCommunitySelfOrganizationPersonnelService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IcCommunitySelfOrganizationPersonnelExcel.class);
+    }
+
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java

@@ -0,0 +1,120 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.IcPartyActivityDTO;
+import com.epmet.dto.form.PartyActivityFormDTO;
+import com.epmet.excel.IcPartyActivityExcel;
+import com.epmet.service.IcPartyActivityService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
+
+/**
+ * 联建活动
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-19
+ */
+@RestController
+@RequestMapping("icpartyactivity")
+public class IcPartyActivityController {
+    
+    @Autowired
+    private IcPartyActivityService icPartyActivityService;
+
+    @PostMapping("search")
+    public Result<PageData<IcPartyActivityDTO>> page(@RequestBody PartyActivityFormDTO formDTO){
+        PageData<IcPartyActivityDTO> page = icPartyActivityService.search(formDTO);
+        return new Result<PageData<IcPartyActivityDTO>>().ok(page);
+    }
+
+    @PostMapping("detail")
+    public Result<IcPartyActivityDTO> get(@RequestBody IcPartyActivityDTO dto){
+        IcPartyActivityDTO data = icPartyActivityService.get(dto.getId());
+        return new Result<IcPartyActivityDTO>().ok(data);
+    }
+
+    @PostMapping("save")
+    @NoRepeatSubmit
+    public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartyActivityDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icPartyActivityService.save(tokenDto, dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody IcPartyActivityDTO dto){
+        icPartyActivityService.delete(dto.getId());
+        return new Result();
+    }
+
+    @PostMapping("export")
+    public void export(@RequestBody PartyActivityFormDTO formDTO, HttpServletResponse response) throws Exception {
+        List<IcPartyActivityDTO> list = icPartyActivityService.list(formDTO);
+        List<IcPartyActivityExcel> excelList = new ArrayList<>();
+        AtomicInteger i = new AtomicInteger(1);
+        if (CollectionUtils.isNotEmpty(list)) {
+            excelList = list.stream().map(item -> {
+                IcPartyActivityExcel excel = new IcPartyActivityExcel();
+                excel.setIndex(i.getAndIncrement());
+                excel.setUnitName(item.getUnitName());
+                excel.setTitle(item.getTitle());
+                excel.setAddress(item.getAddress());
+                excel.setPeopleCount(item.getPeopleCount());
+                excel.setActivityTime(DateUtils.format(item.getActivityTime(), DateUtils.DATE_TIME_PATTERN));
+                return excel;
+            }).collect(Collectors.toList());
+        }
+        ExcelUtils.exportExcelToTarget(response, null, excelList, IcPartyActivityExcel.class);
+    }
+
+    /**
+     * 数据导入
+     * @Param tokenDto
+     * @Param response
+     * @Param file
+     * @Return {@link Result}
+     * @Author zhaoqifeng
+     * @Date 2021/11/30 14:42
+     */
+    @PostMapping("import")
+    public Result importData(@LoginUser TokenDto tokenDto, HttpServletResponse response, @RequestPart("file") MultipartFile file) throws IOException {
+        return icPartyActivityService.importData(tokenDto, response, file);
+    }
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java

@@ -0,0 +1,168 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+import com.epmet.commons.rocketmq.messages.CalPartyUnitSatisfactionFormDTO;
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.IcPartyUnitDTO;
+import com.epmet.dto.form.PartyUnitFormDTO;
+import com.epmet.dto.form.demand.ServiceQueryFormDTO;
+import com.epmet.dto.result.demand.OptionDTO;
+import com.epmet.excel.IcPartyUnitExcel;
+import com.epmet.service.IcPartyUnitService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
+
+/**
+ * 联建单位
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-19
+ */
+@RestController
+@RequestMapping("icpartyunit")
+public class IcPartyUnitController {
+    
+    @Autowired
+    private IcPartyUnitService icPartyUnitService;
+
+    @PostMapping("list")
+    public Result<PageData<IcPartyUnitDTO>> search(@LoginUser TokenDto tokenDto, @RequestBody PartyUnitFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        PageData<IcPartyUnitDTO> page = icPartyUnitService.search(formDTO);
+        return new Result<PageData<IcPartyUnitDTO>>().ok(page);
+    }
+
+    @PostMapping("detail")
+    public Result<IcPartyUnitDTO> get(@RequestBody IcPartyUnitDTO formDTO){
+        AssertUtils.isBlank(formDTO.getId(), "id");
+        IcPartyUnitDTO data = icPartyUnitService.get(formDTO.getId());
+        return new Result<IcPartyUnitDTO>().ok(data);
+    }
+
+    @PostMapping("save")
+    @NoRepeatSubmit
+    public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartyUnitDTO dto){
+        //效验数据
+        dto.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icPartyUnitService.save(tokenDto, dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody IcPartyUnitDTO dto){
+        //效验数据
+        AssertUtils.isBlank(dto.getId(), "id");
+        icPartyUnitService.delete(dto.getId());
+        return new Result();
+    }
+
+    @PostMapping("export")
+    public void export(@LoginUser TokenDto tokenDto, @RequestBody PartyUnitFormDTO formDTO, HttpServletResponse response) throws Exception {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        List<IcPartyUnitDTO> list = icPartyUnitService.list(formDTO);
+        List<IcPartyUnitExcel> excelList = new ArrayList<>();
+        AtomicInteger i = new AtomicInteger(1);
+        if (CollectionUtils.isNotEmpty(list)) {
+            excelList = list.stream().map(item -> {
+                IcPartyUnitExcel excel = new IcPartyUnitExcel();
+                excel.setIndex(i.getAndIncrement());
+                excel.setUnitName(item.getUnitName());
+                excel.setContact(item.getContact());
+                excel.setContactMobile(item.getContactMobile());
+                excel.setType(item.getType());
+                excel.setMemberCount(item.getMemberCount());
+                excel.setRemark(item.getRemark());
+                excel.setSatisfaction(item.getSatisfaction());
+                excel.setServiceMatter(String.join(String.valueOf((char) 10), item.getServiceMatterList()));
+                return excel;
+            }).collect(Collectors.toList());
+        }
+        ExcelUtils.exportExcelToTarget(response, null, excelList, IcPartyUnitExcel.class);
+    }
+
+    /**
+     * 需求指派，选择区域化党建单位，调用此接口
+     * 返回需求所属组织线上的数据
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("servicelist")
+    public Result<List<OptionDTO>> queryServiceList(@LoginUser TokenDto tokenDto, @RequestBody ServiceQueryFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,ServiceQueryFormDTO.AddUserInternalGroup.class);
+        return new Result<List<OptionDTO>>().ok(icPartyUnitService.queryServiceList(formDTO));
+    }
+
+    @PostMapping("option")
+    public Result<List<OptionDTO>> option(@RequestBody IcPartyUnitDTO dto){
+        AssertUtils.isBlank(dto.getAgencyId(), "agencyId");
+        return new Result<List<OptionDTO>>().ok(icPartyUnitService.option(dto));
+    }
+
+    /**
+     * 数据导入
+     * @Param tokenDto
+     * @Param response
+     * @Param file
+     * @Return {@link Result}
+     * @Author zhaoqifeng
+     * @Date 2021/11/30 14:42
+     */
+    @PostMapping("import")
+    public Result importData(@LoginUser TokenDto tokenDto, HttpServletResponse response, @RequestPart("file") MultipartFile file) throws IOException {
+        return icPartyUnitService.importData(tokenDto, response, file);
+    }
+
+
+    /**
+     * 计算区域化党建单位的群众满意度
+     *
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("cal-partyunit-satisfation")
+    public Result calPartyUnitSatisfation(@RequestBody CalPartyUnitSatisfactionFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,CalPartyUnitSatisfactionFormDTO.AddUserInternalGroup.class);
+        icPartyUnitService.calPartyUnitSatisfation(formDTO);
+        return new Result();
+    }
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcResiDemandDictController.java

@@ -18,23 +18,22 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.dto.form.PageFormDTO;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 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.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.dto.form.demand.*;
-import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.result.demand.DemandPageResDTO;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.result.demand.OptionDTO;
-import com.epmet.dto.IcResiDemandDictDTO;
-import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO;
 import com.epmet.service.IcResiDemandDictService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Map;
 
 
 /**
@@ -50,31 +49,73 @@ public class IcResiDemandDictController {
     @Autowired
     private IcResiDemandDictService icResiDemandDictService;
 
-    @GetMapping("page")
+    /**
-    public Result<PageData<IcResiDemandDictDTO>> page(@RequestParam Map<String, Object> params){
+     * 分页列表查询
-        PageData<IcResiDemandDictDTO> page = icResiDemandDictService.page(params);
+     *
-        return new Result<PageData<IcResiDemandDictDTO>>().ok(page);
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("pagelist")
+    public Result<PageData<DemandPageResDTO>> page(@RequestBody DemandDictPageFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,DemandDictPageFormDTO.AddUserInternalGroup.class, PageFormDTO.AddUserInternalGroup.class);
+        PageData<DemandPageResDTO> page = icResiDemandDictService.page(formDTO);
+        return new Result<PageData<DemandPageResDTO>>().ok(page);
     }
 
-    @GetMapping("{id}")
+    /**
-    public Result<IcResiDemandDictDTO> get(@PathVariable("id") String id){
+     * 添加一级分类
-        IcResiDemandDictDTO data = icResiDemandDictService.get(id);
+     * @param formDTO
-        return new Result<IcResiDemandDictDTO>().ok(data);
+     * @return
+     */
+    @PostMapping("addfirst")
+    public Result addFirstCategory(@RequestBody AddFirstCategoryFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,AddFirstCategoryFormDTO.AddUserShowGroup.class,AddFirstCategoryFormDTO.AddUserInternalGroup.class);
+        icResiDemandDictService.addFirstCategory(formDTO);
+        return new Result();
     }
 
-    @PostMapping
+    /**
-    public Result save(@RequestBody IcResiDemandDictDTO dto){
+     * 新增二级分类
-        //效验数据
+     * @param formDTO
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+     * @return
-        icResiDemandDictService.save(dto);
+     */
+    @PostMapping("addchild")
+    public Result addChild(@RequestBody AddCategoryFormDTO formDTO ){
+        ValidatorUtils.validateEntity(formDTO,AddCategoryFormDTO.AddUserShowGroup.class,AddCategoryFormDTO.AddUserInternalGroup.class);
+        icResiDemandDictService.addChild(formDTO);
         return new Result();
     }
 
-    @PutMapping
+    /**
-    public Result update(@RequestBody IcResiDemandDictDTO dto){
+     * 修改分类
+     *
+     *
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("update")
+    public Result update(@RequestBody UpdateFormDTO formDTO) {
         //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        ValidatorUtils.validateEntity(formDTO, UpdateFormDTO.AddUserInternalGroup.class, UpdateFormDTO.AddUserShowGroup.class);
-        icResiDemandDictService.update(dto);
+        if (NumConstant.ONE == formDTO.getLevel()) {
+            ValidatorUtils.validateEntity(formDTO, UpdateFormDTO.First.class);
+        } else if (NumConstant.TWO == formDTO.getLevel()) {
+            ValidatorUtils.validateEntity(formDTO, UpdateFormDTO.Two.class);
+        }
+        icResiDemandDictService.update(formDTO);
+        return new Result();
+    }
+
+    /**
+     * 启用或禁用
+     *
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("updatestatus")
+    public Result updateStatus(@RequestBody  StatusFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,StatusFormDTO.AddUserInternalGroup.class);
+        icResiDemandDictService.updateStatus(formDTO);
         return new Result();
     }
 
@@ -91,6 +132,19 @@ public class IcResiDemandDictController {
         return new Result<List<OptionResultDTO>>().ok(icResiDemandDictService.getDemandOptions(tokenDto.getCustomerId()));
     }
 
+    /**
+     * 服务措施管理界面，
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("option-service")
+    public Result<List<OptionResultDTO>> getDemandOptionsV2(@LoginUser TokenDto tokenDto,@RequestBody DemandOptionFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(formDTO,DemandOptionFormDTO.AddUserInternalGroup.class);
+        return new Result<List<OptionResultDTO>>().ok(icResiDemandDictService.getDemandOptionsV2(formDTO));
+    }
 
     /**
      * 居民信息列表需要展示分类名称，单独开出来这个接口，供user查询
@@ -102,4 +156,38 @@ public class IcResiDemandDictController {
         ValidatorUtils.validateEntity(formDTO,UserDemandNameQueryFormDTO.AddUserInternalGroup.class);
         return icResiDemandDictService.queryDemandNames(formDTO);
     }
+
+    /**
+     * 居民需求查询条件：一级分类列表 0
+     * 区域化党建单位：服务事项下拉框 1010
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("subcodelist")
+    public Result<List<OptionDTO>> querySubCodeList(@LoginUser TokenDto tokenDto, @RequestBody SubCodeFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(formDTO,SubCodeFormDTO.AddUserInternalGroup.class);
+        return new Result<List<OptionDTO>>().ok(icResiDemandDictService.querySubCodeList(formDTO));
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java

@@ -0,0 +1,172 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ExcelPoiUtils;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.AddSocietyOrgFormDTO;
+import com.epmet.dto.form.EditSocietyOrgFormDTO;
+import com.epmet.dto.form.GetListPlaceOrgFormDTO;
+import com.epmet.dto.form.GetListSocietyOrgFormDTO;
+import com.epmet.dto.form.demand.ServiceQueryFormDTO;
+import com.epmet.dto.result.GetListPlaceOrgResultDTO;
+import com.epmet.dto.result.GetListSocietyOrgResultDTO;
+import com.epmet.dto.result.demand.OptionDTO;
+import com.epmet.excel.IcSocietyOrgExcel;
+import com.epmet.service.IcSocietyOrgService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+/**
+ * 社会组织管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Slf4j
+@RestController
+@RequestMapping("societyorg")
+public class IcSocietyOrgController {
+
+    @Autowired
+    private IcSocietyOrgService societyOrgService;
+
+    /**
+     * @Author sun
+     * @Description 新增社会组织
+     **/
+    @PostMapping("add")
+    public Result add(@LoginUser TokenDto tokenDto, @RequestBody AddSocietyOrgFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, AddSocietyOrgFormDTO.Add.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
+        societyOrgService.add(formDTO);
+        return new Result();
+    }
+
+    /**
+     * @Author sun
+     * @Description 修改社会组织
+     **/
+    @PostMapping("edit")
+    public Result edit(@LoginUser TokenDto tokenDto, @RequestBody EditSocietyOrgFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, EditSocietyOrgFormDTO.Edit.class);
+        societyOrgService.edit(formDTO);
+        return new Result();
+    }
+
+    /**
+     * @Author sun
+     * @Description 删除社会组织
+     **/
+    @PostMapping("del")
+    public Result del(@LoginUser TokenDto tokenDto, @RequestBody EditSocietyOrgFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, EditSocietyOrgFormDTO.Del.class);
+        societyOrgService.del(formDTO.getSocietyId());
+        return new Result();
+    }
+
+    /**
+     * @Author sun
+     * @Description 社会组织列表查询
+     **/
+    @PostMapping("getlist")
+    public Result<GetListSocietyOrgResultDTO> getList(@LoginUser TokenDto tokenDto, @RequestBody GetListSocietyOrgFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
+        return new Result<GetListSocietyOrgResultDTO>().ok(societyOrgService.getList(formDTO));
+    }
+
+    /**
+     * 需求指派，选择社会组织，调用此接口
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("servicelist")
+    public Result<List<OptionDTO>> queryServiceList(@LoginUser TokenDto tokenDto,@RequestBody ServiceQueryFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,ServiceQueryFormDTO.AddUserInternalGroup.class,ServiceQueryFormDTO.SocietyOrgInternalGroup.class);
+        return new Result<List<OptionDTO>>().ok(societyOrgService.queryServiceList(formDTO));
+    }
+
+    /**
+     * @Author sun
+     * @Description 九小场所下组织列表导出
+     **/
+    @PostMapping("export")
+    public void export(@LoginUser TokenDto tokenDto, @RequestBody GetListSocietyOrgFormDTO formDTO, HttpServletResponse response) throws Exception {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
+        formDTO.setIsPage(false);
+        GetListSocietyOrgResultDTO list = societyOrgService.getList(formDTO);
+        ExcelUtils.exportExcelToTarget(response, null, list.getList(), IcSocietyOrgExcel.class);
+    }
+
+    /**
+     * @Author sun
+     * @Description 九小场所下组织列表导入
+     **/
+    @PostMapping("import")
+    public Result importExcel(@LoginUser TokenDto tokenDTO, @RequestParam("file") MultipartFile file) throws IOException, ParseException {
+
+        ExcelImportResult<IcSocietyOrgExcel> importResult = ExcelPoiUtils.importExcelMore(file, 0, 1, IcSocietyOrgExcel.class);
+        List<IcSocietyOrgExcel> failList = importResult.getFailList();
+
+        //存放错误数据行号
+        List<Integer> numList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(failList)) {
+            for (IcSocietyOrgExcel entity : failList) {
+                log.warn("第{}行,{}", entity.getRowNum(), entity.getErrorMsg());//打印失败的行 和失败的信息
+                numList.add(entity.getRowNum());
+            }
+            //return new Result().error(8001,failList.get(0).getErrorMsg());
+        }
+        List<IcSocietyOrgExcel> result = importResult.getList();
+
+        List<Integer> resultList = societyOrgService.importExcel(tokenDTO.getCustomerId(), result, tokenDTO.getUserId(), numList);
+        String str = String.format("共%s条，成功导入%s条。", numList.size() + result.size(), numList.size() + result.size() - resultList.size());
+        if (resultList.size() > NumConstant.ZERO) {
+            Collections.sort(resultList);
+            String subList = resultList.stream().map(String::valueOf).collect(Collectors.joining("、"));
+            log.warn(str + "第" + subList + "行未成功！");
+            return new Result().error(9999, str + "第" + subList + "行未成功！");
+        }
+        return new Result().ok(str);
+    }
+
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java

@@ -0,0 +1,231 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+import com.epmet.commons.rocketmq.messages.CalPartyUnitSatisfactionFormDTO;
+import com.epmet.commons.tools.annotation.LoginUser;
+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.constant.SystemMessageType;
+import com.epmet.constant.UserDemandConstant;
+import com.epmet.dto.form.SystemMsgFormDTO;
+import com.epmet.dto.form.demand.*;
+import com.epmet.dto.result.demand.DemandRecResultDTO;
+import com.epmet.dto.result.demand.FinishResultDTO;
+import com.epmet.dto.result.demand.IcResiUserReportDemandRes;
+import com.epmet.dto.result.demand.OptionDTO;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
+import com.epmet.service.*;
+import lombok.extern.slf4j.Slf4j;
+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;
+
+import java.util.List;
+
+
+/**
+ * 居民需求记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-19
+ */
+@Slf4j
+@RestController
+@RequestMapping("userdemand")
+public class IcUserDemandRecController {
+    
+    @Autowired
+    private IcUserDemandRecService icUserDemandRecService;
+    @Autowired
+    private VolunteerInfoService volunteerInfoService;
+    @Autowired
+    private IcSocietyOrgService societyOrgService;
+    @Autowired
+    private IcCommunitySelfOrganizationService icCommunitySelfOrganizationService;
+    @Autowired
+    private IcPartyUnitService icPartyUnitService;
+    @Autowired
+    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+
+    /**
+     * 根据服务方类型查询  下拉框
+     * 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("servicelist")
+    public Result<List<OptionDTO>> queryServiceList(@LoginUser TokenDto tokenDto, @RequestBody ServiceQueryFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO, ServiceQueryFormDTO.AddUserInternalGroup.class);
+        if (UserDemandConstant.VOLUNTEER.equals(formDTO.getServiceType())) {
+            return new Result<List<OptionDTO>>().ok(volunteerInfoService.queryListVolunteer(tokenDto.getCustomerId(), formDTO.getServiceName()));
+        } else if (UserDemandConstant.SOCIAL_ORG.equals(formDTO.getServiceType())) {
+            ValidatorUtils.validateEntity(formDTO, ServiceQueryFormDTO.AddUserInternalGroup.class, ServiceQueryFormDTO.SocietyOrgInternalGroup.class);
+            return new Result<List<OptionDTO>>().ok(societyOrgService.queryServiceList(formDTO));
+        } else if (UserDemandConstant.COMMUNITY_ORG.equals(formDTO.getServiceType())) {
+            return new Result<List<OptionDTO>>().ok(icCommunitySelfOrganizationService.queryServiceList(formDTO));
+        } else if (UserDemandConstant.PARTY_UNIT.equals(formDTO.getServiceType())) {
+            return new Result<List<OptionDTO>>().ok(icPartyUnitService.queryServiceList(formDTO));
+        }
+        return new Result<>();
+    }
+
+    /**
+     * 新增需求
+     *
+     * @param tokenDto
+     * @param fromDTO
+     * @return
+     */
+    @PostMapping("add")
+    public Result<DemandRecId> add(@LoginUser TokenDto tokenDto, @RequestBody  DemandAddFromDTO fromDTO){
+        fromDTO.setCustomerId(tokenDto.getCustomerId());
+        fromDTO.setCurrentUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(fromDTO,DemandAddFromDTO.AddUserShowGroup.class);
+        return new Result<DemandRecId>().ok(icUserDemandRecService.add(fromDTO));
+    }
+
+    /**
+     * 更新需求
+     * 只有待处理的才可以编辑
+     *
+     * @param tokenDto
+     * @param fromDTO
+     * @return
+     */
+    @PostMapping("update")
+    public Result<DemandRecId> update(@LoginUser TokenDto tokenDto, @RequestBody  DemandAddFromDTO fromDTO){
+        fromDTO.setCustomerId(tokenDto.getCustomerId());
+        fromDTO.setCurrentUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(fromDTO,DemandAddFromDTO.UpdateInternalGroup.class,DemandAddFromDTO.AddUserShowGroup.class);
+        return new Result<DemandRecId>().ok(icUserDemandRecService.update(fromDTO));
+    }
+
+    /**
+     * 列表查询 分页
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("pagelist")
+    public Result<PageData<DemandRecResultDTO>> pageList(@LoginUser TokenDto tokenDto, @RequestBody UserDemandPageFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setCurrentStaffId(tokenDto.getUserId());
+        return new Result<PageData<DemandRecResultDTO>>().ok(icUserDemandRecService.pageList(formDTO));
+    }
+
+
+    /**
+     * 取消，未完成之前都可以取消
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("cancel")
+    public Result cancel(@LoginUser TokenDto tokenDto,@RequestBody StaffCancelFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,StaffCancelFormDTO.AddUserInternalGroup.class);
+        icUserDemandRecService.cancel(formDTO);
+        return new Result();
+    }
+
+
+    /**
+     * 指派
+     * 待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished
+     * 待处理+已派单才可以指派
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("assign")
+    public Result assign(@LoginUser TokenDto tokenDto,@RequestBody AssignFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,AssignFormDTO.AddUserShowGroup.class,AssignFormDTO.AddUserInternalGroup.class);
+        icUserDemandRecService.assign(formDTO);
+        return new Result();
+    }
+
+    /**
+     * 完成并评价
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("finish")
+    public Result finish(@LoginUser TokenDto tokenDto,@RequestBody FinishStaffFromDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,FinishStaffFromDTO.AddUserShowGroup.class,FinishStaffFromDTO.AddUserInternalGroup.class);
+        FinishResultDTO finishResultDTO=icUserDemandRecService.finish(formDTO);
+        if(finishResultDTO.getSendCalStatisfaction()){
+            CalPartyUnitSatisfactionFormDTO mqMsg = new CalPartyUnitSatisfactionFormDTO();
+            mqMsg.setCustomerId(formDTO.getCustomerId());
+            mqMsg.setPartyUnitId(finishResultDTO.getPartyUnitId());
+            SystemMsgFormDTO form = new SystemMsgFormDTO();
+            form.setMessageType(SystemMessageType.CAL_PARTY_UNIT_SATISFACTION);
+            form.setContent(mqMsg);
+            epmetMessageOpenFeignClient.sendSystemMsgByMQ(form);
+        }
+        return new Result();
+    }
+
+
+    /**
+     * 数据分析-个人档案，居民需求列表table
+     *
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("mydemand")
+    public Result<PageData<IcResiUserReportDemandRes>> queryMyDemand(@LoginUser TokenDto tokenDto,@RequestBody IcResiUserDemandFromDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(formDTO,IcResiUserDemandFromDTO.AddUserInternalGroup.class);
+        return new Result<PageData<IcResiUserReportDemandRes>>().ok(icUserDemandRecService.queryMyDemand(formDTO));
+    }
+
+    /**
+     * 数据分析-个人档案、居民需求列表-查看需求详情
+     *
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("demandDetail")
+    public Result<DemandRecResultDTO> queryDemandDetail(@LoginUser TokenDto tokenDto, @RequestBody DemandDetailFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(formDTO,DemandDetailFormDTO.AddUserInternalGroup.class);
+        return new Result<DemandRecResultDTO>().ok(icUserDemandRecService.queryDemandDetail(formDTO));
+    }
+
+
+
+
+
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java

@@ -23,8 +23,10 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.VolunteerInfoDTO;
 import com.epmet.dto.form.CommonCustomerFormDTO;
+import com.epmet.dto.form.demand.ServiceQueryFormDTO;
 import com.epmet.dto.form.resi.ResiSendSmsCodeFormDTO;
 import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO;
+import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.dto.result.resi.ResiVolunteerInfoResultDTO;
 import com.epmet.service.VolunteerInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -112,4 +114,15 @@ public class ResiVolunteerController {
     public Result<VolunteerInfoDTO> queryUserVolunteerInfo(@PathVariable("userId")String userId){
         return new Result<VolunteerInfoDTO>().ok(volunteerInfoService.queryUserVolunteerInfo(userId));
     }
+
+    /**
+     * 需求指派时，服务对象选择志愿者，调用此接口查询当前客户下所有的志愿者信息：姓名（手机号）
+     *
+     * @param tokenDto
+     * @return
+     */
+    @PostMapping("listprofile")
+    public Result<List<OptionDTO>> queryListVolunteer(@LoginUser TokenDto tokenDto,@RequestBody ServiceQueryFormDTO formDTO){
+        return new Result<List<OptionDTO>>().ok(volunteerInfoService.queryListVolunteer(tokenDto.getCustomerId(),formDTO.getServiceName()));
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcCommunitySelfOrganizationDao.java

@@ -0,0 +1,67 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.CommunitySelfOrganizationListFormDTO;
+import com.epmet.dto.result.CommunitySelfOrganizationListDTO;
+import com.epmet.dto.result.demand.OptionDTO;
+import com.epmet.entity.IcCommunitySelfOrganizationEntity;
+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 2021-11-18
+ */
+@Mapper
+public interface IcCommunitySelfOrganizationDao extends BaseDao<IcCommunitySelfOrganizationEntity> {
+
+    /**
+     * @Description 自组织修改
+     * @param formDTO
+     * @author zxc
+     * @date 2021/11/19 2:04 下午
+     */
+    void updateCommunitySelfOrganization(IcCommunitySelfOrganizationEntity formDTO);
+
+    /**
+     * @Description  查询社区自组织列表
+     * @param formDTO
+     * @author zxc
+     * @date 2021/11/19 2:05 下午
+     */
+    List<CommunitySelfOrganizationListDTO> selectCommunitySelfOrganizationList(CommunitySelfOrganizationListFormDTO formDTO);
+
+    List<OptionDTO> selectListByAgencyId(@Param("customerId") String customerId,
+                                         @Param("agencyIds") List<String> agencyIds,
+                                         @Param("orgName") String orgName);
+
+    /**
+     * @Description  根据名字查询存在的自组织
+     * @param names
+     * @author zxc
+     * @date 2021/11/25 9:07 上午
+     */
+    List<String> selectOrgByOrgName(@Param("names")List<String> names, @Param("customerId") String customerId);
+
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcCommunitySelfOrganizationPersonnelDao.java

@@ -0,0 +1,42 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcCommunitySelfOrganizationPersonnelEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 社区自组织人员表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Mapper
+public interface IcCommunitySelfOrganizationPersonnelDao extends BaseDao<IcCommunitySelfOrganizationPersonnelEntity> {
+
+    /**
+     * @Description  根据社区自组织ID删除
+     * @param orgId
+     * @author zxc
+     * @date 2021/11/19 11:19 上午
+     */
+    void deleteByOrgId(@Param("orgId")String orgId);
+
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcPartyActivityEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 联建活动
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-19
+ */
+@Mapper
+public interface IcPartyActivityDao extends BaseDao<IcPartyActivityEntity> {
+	
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java

@@ -0,0 +1,49 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.demand.OptionDTO;
+import com.epmet.entity.IcPartyUnitEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 联建单位
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-19
+ */
+@Mapper
+public interface IcPartyUnitDao extends BaseDao<IcPartyUnitEntity> {
+
+    /**
+     * 需求指派，选择区域化党建单位，调用此接口
+     * @param agencyIds
+     * @param unitName
+     * @return
+     */
+    List<OptionDTO> selectListByAgencyId(@Param("agencyIds") List<String> agencyIds,
+                                         @Param("unitName") String unitName,
+                                         @Param("customerId")String customerId);
+
+    int updateSatisfaction(@Param("partyUnitId") String serverId, @Param("satisfaction") BigDecimal satisfaction);
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcResiDemandDictDao.java

@@ -19,6 +19,8 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
+import com.epmet.dto.result.demand.DemandPageResDTO;
+import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcResiDemandDictEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -34,8 +36,34 @@ import java.util.Set;
  */
 @Mapper
 public interface IcResiDemandDictDao extends BaseDao<IcResiDemandDictEntity> {
-    List<OptionResultDTO> selectDemandOptions(@Param("customerId") String customerId);
+    List<OptionResultDTO> selectDemandOptions(@Param("customerId") String customerId,@Param("usableFlagFormValue") String usableFlagFormValue);
-    List<OptionResultDTO> selectChildDemands(@Param("customerId")String customerId, @Param("parentCode") String parentCode);
+    List<OptionResultDTO> selectChildDemands(@Param("customerId")String customerId, @Param("parentCode") String parentCode,@Param("usableFlagFormValue") String usableFlagFormValue);
 
     String selectCategoryNames(@Param("customerId") String customerId,@Param("codeSet") Set<String> codeSet);
+
+    List<OptionDTO> selectByPCode(@Param("pcode") String pcode,
+                                  @Param("customerId") String customerId,
+                                  @Param("categoryName")String categoryName);
+
+    List<DemandPageResDTO> pageSelect(@Param("customerId") String customerId, @Param("firstCategoryCode")String firstCategoryCode);
+
+    List<DemandPageResDTO> selectChild(@Param("customerId") String customerId, @Param("parentCode")String parentCode);
+
+    int selectCountName(@Param("customerId") String customerId,
+                        @Param("categoryName")String categoryName,
+                        @Param("level")int level,
+                        @Param("parentCode")String parentCode,
+                        @Param("id")String id);
+
+    Integer selectMaxCategoryCode(@Param("customerId") String customerId,
+                                  @Param("level") Integer level,
+                                  @Param("parentCode") String parentCode);
+
+    Integer selectMaxSort(@Param("customerId") String customerId,
+                          @Param("level") int level,
+                          @Param("parentCode") String parentCode);
+
+    List<IcResiDemandDictEntity> selectSecondCodes(@Param("customerId") String customerId, @Param("cateogryCodes") List<String> categoryCodes);
+
+    String selectNameByCode(@Param("customerId")String customerId, @Param("categoryCode") String categoryCode);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcSocietyOrgDao.java

@@ -0,0 +1,63 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.IcSocietyOrgDTO;
+import com.epmet.dto.form.GetListSocietyOrgFormDTO;
+import com.epmet.dto.result.GetListSocietyOrgResultDTO;
+import com.epmet.dto.result.SocietyOrgListResultDTO;
+import com.epmet.dto.result.demand.OptionDTO;
+import com.epmet.entity.IcSocietyOrgEntity;
+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 2021-11-18
+ */
+@Mapper
+public interface IcSocietyOrgDao extends BaseDao<IcSocietyOrgEntity> {
+
+    /**
+     * @Author sun
+     * @Description 社会组织列表查询
+     **/
+    List<SocietyOrgListResultDTO> getList(GetListSocietyOrgFormDTO formDTO);
+
+    /**
+     * 需求指派，选择社会组织，调用此接口
+     *
+     * @param agencyIds
+     * @return
+     */
+    List<OptionDTO> selectListByAgencyId(@Param("agencyIds")List<String> agencyIds,
+                                         @Param("societyName")String societyName,
+                                         @Param("customerId")String customerId,
+                                         @Param("queryPurpose")String queryPurpose);
+
+    /**
+     * @Author sun
+     * @Description 查询当前组织下的社会组织数据
+     **/
+    List<IcSocietyOrgDTO> getByAgencyId(@Param("agencyId") String agencyId);
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandOperateLogDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcUserDemandOperateLogEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 居民需求操作日志表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-19
+ */
+@Mapper
+public interface IcUserDemandOperateLogDao extends BaseDao<IcUserDemandOperateLogEntity> {
+	
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java

@@ -0,0 +1,62 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.demand.IcResiUserDemandFromDTO;
+import com.epmet.dto.form.demand.UserDemandPageFormDTO;
+import com.epmet.dto.result.demand.DemandRecResultDTO;
+import com.epmet.dto.result.demand.IcResiUserReportDemandRes;
+import com.epmet.dto.result.demand.ServiceStatDTO;
+import com.epmet.entity.IcUserDemandRecEntity;
+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 2021-11-19
+ */
+@Mapper
+public interface IcUserDemandRecDao extends BaseDao<IcUserDemandRecEntity> {
+
+
+    List<DemandRecResultDTO> pageSelect(UserDemandPageFormDTO formDTO);
+
+    /**
+     * 数据分析-个人档案，居民需求列表table
+     *
+     * @param formDTO
+     * @return
+     */
+    List<IcResiUserReportDemandRes> selectUserDemand(IcResiUserDemandFromDTO formDTO);
+
+    /**
+     * 数据分析-个人档案，居民需求详情
+     *
+     * @param customerId
+     * @param demandRecId
+     * @return
+     */
+    DemandRecResultDTO selectDemandRecDetail(@Param("customerId") String customerId, @Param("demandRecId") String demandRecId);
+
+    List<ServiceStatDTO> selectGroupByPartyUnit(@Param("customerId") String customerId, @Param("partyUnitId") String partyUnitId);
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandSatisfactionDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcUserDemandSatisfactionEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 居民需求评价记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-19
+ */
+@Mapper
+public interface IcUserDemandSatisfactionDao extends BaseDao<IcUserDemandSatisfactionEntity> {
+	
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandServiceDao.java

@@ -0,0 +1,34 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcUserDemandServiceEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 居民需求服务记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-19
+ */
+@Mapper
+public interface IcUserDemandServiceDao extends BaseDao<IcUserDemandServiceEntity> {
+
+    IcUserDemandServiceEntity selectByRecId(String demandRecId);
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationEntity.java

@@ -0,0 +1,109 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 社区自组织表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_community_self_organization")
+public class IcCommunitySelfOrganizationEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 组织ID
+     */
+	private String orgId;
+
+    /**
+     * 组织类型，agency：组织，grid：网格
+     */
+	private String orgType;
+
+    /**
+     * 组织ID的父级
+     */
+	private String pid;
+
+    /**
+     * org_id的所有上级
+     */
+	private String pids;
+
+    /**
+     * 组织名称
+     */
+	private String organizationName;
+
+    /**
+     * 组织人数
+     */
+	private Integer organizationPersonCount;
+
+    /**
+     * 负责人姓名
+     */
+	private String principalName;
+
+    /**
+     * 负责人电话
+     */
+	private String principalPhone;
+
+    /**
+     * 服务事项
+     */
+	private String serviceItem;
+
+    /**
+     * 社区自组织创建时间
+     */
+    private Date organizationCreatedTime;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 纬度
+     */
+	private String latitude;
+
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationPersonnelEntity.java

@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 社区自组织人员表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_community_self_organization_personnel")
+public class IcCommunitySelfOrganizationPersonnelEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 社区自组织ID
+     */
+	private String orgId;
+
+    /**
+     * 人员姓名
+     */
+	private String personName;
+
+    /**
+     * 人员电话
+     */
+	private String personPhone;
+
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java

@@ -0,0 +1,111 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 联建活动
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-19
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_party_activity")
+public class IcPartyActivityEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 组织ID
+     */
+	private String agencyId;
+
+    /**
+     * 组织的所有上级
+     */
+	private String pids;
+
+    /**
+     * 单位ID
+     */
+	private String unitId;
+
+    /**
+     * 服务事项
+     */
+	private String serviceMatter;
+
+    /**
+     * 活动标题
+     */
+	private String title;
+
+    /**
+     * 活动目标
+     */
+	private String target;
+
+    /**
+     * 活动内容
+     */
+	private String content;
+
+    /**
+     * 服务人数
+     */
+	private Integer peopleCount;
+
+    /**
+     * 活动时间
+     */
+	private Date activityTime;
+
+    /**
+     * 活动地址
+     */
+	private String address;
+
+    /**
+     * 活动地址经度
+     */
+	private String longitude;
+
+    /**
+     * 活动地址纬度
+     */
+	private String latitude;
+
+    /**
+     * 活动结果
+     */
+	private String result;
+
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyUnitEntity.java

@@ -0,0 +1,111 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 联建单位
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-19
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_party_unit")
+public class IcPartyUnitEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 组织ID
+     */
+	private String agencyId;
+
+    /**
+     * 
+     */
+	private String pids;
+
+    /**
+     * 单位名称
+     */
+	private String unitName;
+
+    /**
+     * 分类 楼宇党建 两新组织 区域单位党建 机关直属部门 其他
+     */
+	private String type;
+
+    /**
+     * 服务事项 多选逗号隔开
+     */
+	private String serviceMatter;
+
+    /**
+     * 联系人
+     */
+	private String contact;
+
+    /**
+     * 联系电话
+     */
+	private String contactMobile;
+
+    /**
+     * 在职党员数
+     */
+	private Integer memberCount;
+
+    /**
+     * 地址
+     */
+	private String address;
+
+    /**
+     * 中心位置经度
+     */
+	private String longitude;
+
+    /**
+     * 中心位置纬度
+     */
+	private String latitude;
+
+    /**
+     * 群众满意度
+     */
+	private String satisfaction;
+
+    /**
+     * 备注
+     */
+	private String remark;
+
+}