jianjun
4 years ago
360 changed files with 8765 additions and 1216 deletions
@ -0,0 +1,10 @@ |
|||
INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000012', 'grid_type', '网格类型', '', 12, 0, 0, '', '2021-12-23 18:23:27', '', '2021-12-23 18:23:27'); |
|||
|
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000300', 1000000000000000012, '党政机关', '0', '0', '', 0, 0, 0, '', '2021-12-23 18:39:18', '', '2021-12-23 18:39:18'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000301', 1000000000000000012, '企业', '1', '0', '', 0, 0, 0, '', '2021-12-23 18:39:18', '', '2021-12-23 18:39:18'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000302', 1000000000000000012, '园区', '2', '0', '', 4, 0, 0, '', '2021-12-23 18:39:18', '', '2021-12-23 18:39:18'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000303', 1000000000000000012, '商圈', '3', '0', '', 4, 0, 0, '', '2021-12-23 18:39:18', '', '2021-12-23 18:39:18'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000304', 1000000000000000012, '市场', '4', '0', '', 4, 0, 0, '', '2021-12-23 18:39:18', '', '2021-12-23 18:39:18'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000305', 1000000000000000012, '景区', '5', '0', '', 4, 0, 0, '', '2021-12-23 18:39:18', '', '2021-12-23 18:39:18'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000306', 1000000000000000012, '医院', '6', '0', '', 4, 0, 0, '', '2021-12-23 18:39:18', '', '2021-12-23 18:39:18'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000307', 1000000000000000012, '学校', '7', '0', '', 4, 0, 0, '', '2021-12-23 18:39:18', '', '2021-12-23 18:39:18'); |
|||
@ -1,19 +0,0 @@ |
|||
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; |
|||
} |
|||
@ -0,0 +1,28 @@ |
|||
package com.epmet.commons.rocketmq.messages; |
|||
|
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 需求完成，如果服务方是区域化党建单位，重新计算这个单位的满意度,或者直接计算整个客户 |
|||
*/ |
|||
@Data |
|||
public class ServerSatisfactionCalFormDTO implements Serializable { |
|||
public interface AddUserInternalGroup { |
|||
} |
|||
@NotBlank(message = "客户id不能为空",groups = AddUserInternalGroup.class) |
|||
private String customerId; |
|||
/** |
|||
* 服务方id：可以值区域化党建单位id |
|||
* 后面也可以是社会组织、社区自组织id... |
|||
*/ |
|||
private String serverId; |
|||
/** |
|||
* 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit； |
|||
*/ |
|||
@NotBlank(message = "serviceType不能为空",groups = AddUserInternalGroup.class) |
|||
private String serviceType; |
|||
} |
|||
@ -0,0 +1,19 @@ |
|||
package com.epmet.dto.form.heart; |
|||
|
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author wangxianzhang |
|||
* @Date 2021/12/22 3:12 下午 |
|||
* @Version 1.0 |
|||
*/ |
|||
@Data |
|||
public class VolunteerDemandServiceFormDTO { |
|||
|
|||
/** |
|||
* 组织ID |
|||
*/ |
|||
private String agencyId; |
|||
|
|||
} |
|||
@ -0,0 +1,14 @@ |
|||
-- 发布前执行 |
|||
alter table fact_volunteer_service_daily add column GRID_ID varchar(64) not null comment '网格ID' after CUSTOMER_ID; |
|||
alter table fact_volunteer_service_daily add column PID varchar(64) default '' comment 'pid网格父级ID' after RESI_SERVICE_TOTAL; |
|||
alter table fact_volunteer_service_daily add column PIDS varchar(255) default '' comment 'pid网格父级ID路径，包含PID' after PID; |
|||
|
|||
-- 发布后执行 |
|||
|
|||
delete from fact_volunteer_service_daily; |
|||
|
|||
alter table fact_volunteer_service_daily drop key uni_vsd; |
|||
|
|||
alter table fact_volunteer_service_daily |
|||
add constraint uni_vsd |
|||
unique (GRID_ID, DATE_ID, DEL_FLAG); |
|||
@ -0,0 +1,20 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
|
|||
/** |
|||
* 自动评价参数 |
|||
*/ |
|||
@Data |
|||
public class AutoEvaluateDemandFormDTO implements Serializable { |
|||
private String customerId; |
|||
private Integer exceedValue; |
|||
/** |
|||
* day |
|||
* minute |
|||
*/ |
|||
private String type; |
|||
} |
|||
@ -0,0 +1,47 @@ |
|||
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; |
|||
import java.math.BigDecimal; |
|||
|
|||
/** |
|||
* 居民端-需求-服务评价入参 |
|||
*/ |
|||
@Data |
|||
public class EvaluateDemandFormDTO implements Serializable { |
|||
public interface AddUserInternalGroup { |
|||
} |
|||
public interface ShowGroup extends CustomerClientShowGroup { |
|||
} |
|||
|
|||
|
|||
@NotBlank(message = "需求id不能为空", groups = AddUserInternalGroup.class) |
|||
private String demandRecId; |
|||
|
|||
@NotBlank(message = "服务id不能为空", groups = AddUserInternalGroup.class) |
|||
private String serviceId; |
|||
|
|||
@NotBlank(message = "完成结果不能为空", groups = ShowGroup.class) |
|||
private String finishResult; |
|||
|
|||
@Length(max = 1000,message = "最多输入1000字",groups = {ShowGroup.class}) |
|||
private String finishDesc; |
|||
|
|||
@NotNull(message = "得分不能为空", groups = ShowGroup.class) |
|||
private BigDecimal score; |
|||
|
|||
|
|||
|
|||
@NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class) |
|||
private String userId; |
|||
@NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class) |
|||
private String customerId; |
|||
// 政府端:gov、居民端:resi、运营端:oper
|
|||
@NotBlank(message = "app不能为空", groups = AddUserInternalGroup.class) |
|||
private String app; |
|||
} |
|||
@ -0,0 +1,34 @@ |
|||
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 ListHallFormDTO extends PageFormDTO implements Serializable { |
|||
public interface AddUserInternalGroup {} |
|||
|
|||
/** |
|||
* 当前所在网格id |
|||
*/ |
|||
@NotBlank(message = "gridId不能为空", groups = AddUserInternalGroup.class) |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 未处理：unprocessed；处理中：processing；已完成：finished |
|||
*/ |
|||
@NotBlank(message = "type不能为空，未处理：unprocessed；处理中：processing；已完成：finished", groups = AddUserInternalGroup.class) |
|||
private String type; |
|||
|
|||
// 以下入参从token中获取
|
|||
@NotBlank(message = "tokenDto获取userId不能为空", groups = AddUserInternalGroup.class) |
|||
private String currentUserId; |
|||
@NotBlank(message = "tokenDto获取customerId不能为空", groups = AddUserInternalGroup.class) |
|||
private String customerId; |
|||
} |
|||
@ -0,0 +1,112 @@ |
|||
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 ReportDemandFormDTO implements Serializable { |
|||
private static final long serialVersionUID = -2931148629441558468L; |
|||
|
|||
public interface Add extends CustomerClientShowGroup { |
|||
} |
|||
|
|||
public interface AddInternalGroup { |
|||
} |
|||
|
|||
public interface Update extends CustomerClientShowGroup { |
|||
} |
|||
|
|||
public interface UpdateInternalGroup { |
|||
} |
|||
|
|||
@NotBlank(message = "需求id不能为空",groups = UpdateInternalGroup.class) |
|||
private String demandRecId; |
|||
|
|||
@NotBlank(message = "customerId不能为空", groups = {AddInternalGroup.class, UpdateInternalGroup.class}) |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 网格id |
|||
*/ |
|||
@NotBlank(message = "所属网格不能为空",groups = {AddInternalGroup.class}) |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 需求内容1000字 |
|||
*/ |
|||
@NotBlank(message = "需求内容不能为空", groups = {Add.class, Update.class}) |
|||
@Length(max = 1000, message = "需求内容至多输入1000字", groups = {Add.class, Update.class}) |
|||
private String content; |
|||
|
|||
/** |
|||
* 二级需求分类编码 |
|||
*/ |
|||
@NotBlank(message = "需求类别不能为空",groups = Add.class) |
|||
private String categoryCode; |
|||
|
|||
/** |
|||
* 父级需求分类编码 |
|||
*/ |
|||
@NotBlank(message = "父级分类不能为空",groups = Add.class) |
|||
private String parentCode; |
|||
|
|||
|
|||
/** |
|||
* 希望服务时间 |
|||
*/ |
|||
@NotNull(message = "服务时间不能为空",groups = {Add.class, Update.class}) |
|||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
private Date wantServiceTime; |
|||
|
|||
/** |
|||
* 需求人：user.id或者ic_resi_user.id |
|||
*/ |
|||
@NotBlank(message = "需求人不能为空",groups ={AddInternalGroup.class, UpdateInternalGroup.class}) |
|||
private String demandUserId; |
|||
|
|||
/** |
|||
* 需求人联系姓名 |
|||
*/ |
|||
@NotBlank(message = "联系人不能为空",groups = {Add.class, Update.class}) |
|||
private String demandUserName; |
|||
|
|||
/** |
|||
* 需求人联系电话 |
|||
*/ |
|||
@NotBlank(message = "联系电话不能为空",groups = {Add.class, Update.class}) |
|||
private String demandUserMobile; |
|||
|
|||
/** |
|||
* 服务地点，工作端指派默认居民居住房屋地址，居民端地图选择 |
|||
*/ |
|||
@NotBlank(message = "服务地点不能为空",groups = {Add.class, Update.class}) |
|||
private String serviceLocation; |
|||
|
|||
/** |
|||
* 门牌号详细地址 |
|||
*/ |
|||
@Length(max = 200, message = "门牌号至多输入200字", groups = {Add.class, Update.class}) |
|||
private String locationDetail; |
|||
|
|||
/** |
|||
* 经度,需求人是ic的居民时，取所住楼栋的中心点位 |
|||
*/ |
|||
private String longitude; |
|||
|
|||
/** |
|||
* 纬度,需求人是ic的居民时，取所住楼栋的中心点位 |
|||
*/ |
|||
private String latitude; |
|||
|
|||
} |
|||
@ -0,0 +1,56 @@ |
|||
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 ResiClientMyDemandFormDTO extends PageFormDTO implements Serializable { |
|||
/*List<String> userIds=new ArrayList<>(); |
|||
userIds.add(formDTO.getIcResiUserId()); |
|||
if(CollectionUtils.isNotEmpty(formDTO.getEpmetUserIdList())){ |
|||
userIds.addAll(formDTO.getEpmetUserIdList()); |
|||
} |
|||
formDTO.setUserIds(userIds); |
|||
//2、小程序内自己上报+赋能平台待录入的
|
|||
PageInfo<IcResiUserReportDemandRes> pageInfo = PageHelper.startPage(formDTO.getPageNo(), |
|||
formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectUserDemand(formDTO)); |
|||
List<IcResiUserReportDemandRes> list = pageInfo.getList(); |
|||
if (CollectionUtils.isNotEmpty(list)) { |
|||
// 1、状态字典
|
|||
Result<Map<String, String>> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_STATUS.getCode()); |
|||
Map<String, String> statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); |
|||
//2、查询分类名称
|
|||
List<String> categoryCodes = list.stream().map(IcResiUserReportDemandRes::getCategoryCode).collect(Collectors.toList()); |
|||
List<IcResiDemandDictEntity> dictList = demandDictService.listByCodes(formDTO.getCustomerId(), categoryCodes); |
|||
Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcResiDemandDictEntity::getCategoryCode, IcResiDemandDictEntity::getCategoryName)); |
|||
|
|||
for (IcResiUserReportDemandRes resDto : list) { |
|||
resDto.setStatusName(statusMap.containsKey(resDto.getStatus()) ? statusMap.get(resDto.getStatus()) : StrConstant.EPMETY_STR); |
|||
if (null != dictMap && dictMap.containsKey(resDto.getCategoryCode())) { |
|||
resDto.setCategoryName(dictMap.get(resDto.getCategoryCode())); |
|||
} |
|||
resDto.setFirstCategoryName(demandDictService.getCategoryName(formDTO.getCustomerId(),resDto.getFirstCategoryCode())); |
|||
} |
|||
}*/ |
|||
public interface AddUserInternalGroup {} |
|||
@NotBlank(message = "gridId不能为空",groups = AddUserInternalGroup.class) |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 待处理：unprocessed；处理中：processing；已完成：finished；已取消：canceled |
|||
*/ |
|||
@NotBlank(message = "type不能为空,待处理：unprocessed；处理中：processing；已完成：finished；已取消：canceled",groups = AddUserInternalGroup.class) |
|||
private String type; |
|||
|
|||
@NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class) |
|||
private String userId; |
|||
|
|||
@NotBlank(message = "customerId不能为空",groups = AddUserInternalGroup.class) |
|||
private String customerId; |
|||
} |
|||
@ -0,0 +1,21 @@ |
|||
package com.epmet.dto.form.demand; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 需求大厅-我要接单 |
|||
*/ |
|||
@Data |
|||
public class TakeOrderFormDTO implements Serializable { |
|||
private static final long serialVersionUID = -2030750128789890382L; |
|||
public interface AddUserInternalGroup { |
|||
} |
|||
@NotBlank(message = "demandRecId不能为空", groups = AddUserInternalGroup.class) |
|||
private String demandRecId; |
|||
|
|||
@NotBlank(message = "tokenDto获取userId不能为空", groups = AddUserInternalGroup.class) |
|||
private String userId; |
|||
} |
|||
@ -0,0 +1,23 @@ |
|||
package com.epmet.dto.form.demand; |
|||
|
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 当前用户与需求消息的关系 |
|||
*/ |
|||
@Data |
|||
public class UserDemandRelFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 948510931204329428L; |
|||
|
|||
public interface AddInternalGroup { |
|||
} |
|||
@NotBlank(message = "需求id不能为空",groups = AddInternalGroup.class) |
|||
private String demandRecId; |
|||
|
|||
@NotBlank(message = "userId不能为空",groups = AddInternalGroup.class) |
|||
private String userId; |
|||
} |
|||
@ -0,0 +1,23 @@ |
|||
package com.epmet.dto.result.demand; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonIgnore; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
|
|||
/** |
|||
* 1、居民端-我有需求，分类列表发布餐（可用） |
|||
* 2、居民端-我有需求，最近预约返参 |
|||
*/ |
|||
@Data |
|||
public class DemandCategoryResDTO implements Serializable { |
|||
private String categoryId; |
|||
private String categoryCode; |
|||
private String parentCode; |
|||
private String categoryName; |
|||
@JsonIgnore |
|||
private String customerId; |
|||
private List<DemandCategoryResDTO> children; |
|||
} |
|||
@ -0,0 +1,121 @@ |
|||
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.math.BigDecimal; |
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* 需求大厅-需求详情 |
|||
* 我的需求-需求详情 todo |
|||
*/ |
|||
@Data |
|||
public class DemandDetailResDTO implements Serializable { |
|||
|
|||
private String demandRecId; |
|||
@JsonIgnore |
|||
private String categoryCode; |
|||
@JsonIgnore |
|||
private String parentCode; |
|||
/** |
|||
* 二级分类名称 |
|||
*/ |
|||
private String categoryName; |
|||
|
|||
/** |
|||
* 奖励积分 |
|||
*/ |
|||
private Integer awardPoint; |
|||
|
|||
/** |
|||
* 需求内容 |
|||
*/ |
|||
private String content; |
|||
|
|||
/** |
|||
* 服务要求-服务时间：yyyy-MM-dd HH:mm |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
private Date wantServiceTime; |
|||
|
|||
/** |
|||
* 服务要求-联系人（需求人）名称 |
|||
*/ |
|||
private String demandUserName; |
|||
|
|||
/** |
|||
* 服务要求-联系人（需求人）电话 |
|||
*/ |
|||
private String demandUserMobile; |
|||
|
|||
/** |
|||
* 服务地点 |
|||
*/ |
|||
private String serviceAddress; |
|||
|
|||
// 服务地点，工作端指派默认居民居住房屋地址，居民端地图选择
|
|||
private String serviceLocation; |
|||
// 门牌号详细地址
|
|||
private String locationDetail; |
|||
// 经度,需求人是ic的居民时，取所住楼栋的中心点位
|
|||
private String longitude; |
|||
// 纬度,需求人是ic的居民时，取所住楼栋的中心点位
|
|||
private String latitude; |
|||
|
|||
|
|||
|
|||
/** |
|||
* 实际服务开始时间 |
|||
*/ |
|||
@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 BigDecimal score; |
|||
|
|||
/** |
|||
* 完成结果：已解决 resolved，未解决 unresolved |
|||
|
|||
*/ |
|||
private String finishResult; |
|||
|
|||
/** |
|||
* 完成情况 |
|||
*/ |
|||
private String finishDesc; |
|||
|
|||
/** |
|||
* 待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished |
|||
*/ |
|||
private String status; |
|||
|
|||
/** |
|||
* 1：已评价；0：未评价;评价后ic_user_satisfaction表有记录 |
|||
*/ |
|||
private Boolean evaluateFlag; |
|||
|
|||
/** |
|||
* 服务记录主键 |
|||
*/ |
|||
private String serviceId; |
|||
@JsonIgnore |
|||
private String serverId; |
|||
// 以下几个返参在我的需求详情中返回：
|
|||
private String serviceType; |
|||
private String serviceUserName; |
|||
private String serviceUserMobile; |
|||
private String serviceUnitName; |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
private Date cancelTime; |
|||
} |
|||
@ -0,0 +1,79 @@ |
|||
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.math.BigDecimal; |
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* 居民端-需求大厅（未处理、处理中、已完成）返参DTO |
|||
* 返参DTO |
|||
*/ |
|||
@Data |
|||
public class DemandHallResultDTO implements Serializable { |
|||
/** |
|||
* 需求id |
|||
*/ |
|||
private String demandRecId; |
|||
|
|||
/** |
|||
* 分类编码 |
|||
*/ |
|||
@JsonIgnore |
|||
private String categoryCode; |
|||
|
|||
/** |
|||
* 父级分类编码 |
|||
*/ |
|||
@JsonIgnore |
|||
private String parentCode; |
|||
|
|||
/** |
|||
* 服务事项，实际就是需求分类二级分类名字 |
|||
*/ |
|||
private String categoryName; |
|||
|
|||
/** |
|||
* 服务时间，yyyy-MM-dd HH:mm |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") |
|||
private Date wantServiceTime; |
|||
|
|||
/** |
|||
* 服务地点 |
|||
*/ |
|||
private String serviceAddress; |
|||
|
|||
/** |
|||
* 奖励积分 |
|||
*/ |
|||
private Integer awardPoint; |
|||
|
|||
/** |
|||
* 需求人名字 |
|||
*/ |
|||
private String demandUserName; |
|||
|
|||
/** |
|||
* 需求人联系电话 |
|||
*/ |
|||
private String demandUserMobile; |
|||
|
|||
/** |
|||
* 得分可为半星 |
|||
*/ |
|||
private BigDecimal score; |
|||
|
|||
/** |
|||
* 待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished |
|||
*/ |
|||
private String status; |
|||
|
|||
/** |
|||
* 1：已评价；0：未评价;评价后ic_user_satisfaction表有记录 |
|||
*/ |
|||
private Boolean evaluateFlag; |
|||
} |
|||
@ -0,0 +1,74 @@ |
|||
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.math.BigDecimal; |
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* 居民端-我的需求列表入参 |
|||
*/ |
|||
@Data |
|||
public class ResiClientMyDemandResDTO implements Serializable { |
|||
private String demandRecId; |
|||
@JsonIgnore |
|||
private String categoryCode; |
|||
@JsonIgnore |
|||
private String parentCode; |
|||
/** |
|||
* 二级分类名称 |
|||
*/ |
|||
private String categoryName; |
|||
|
|||
/** |
|||
* 服务要求-服务时间：yyyy-MM-dd HH:mm |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
private Date wantServiceTime; |
|||
|
|||
/** |
|||
* 服务地点 |
|||
*/ |
|||
private String serviceAddress; |
|||
/** |
|||
* 根据服务方类型找名字 |
|||
*/ |
|||
//服务方类型：服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
|
|||
@JsonIgnore |
|||
private String serviceType; |
|||
@JsonIgnore |
|||
private String serverId; |
|||
|
|||
/** |
|||
* 服务方负责人姓名，如果是志愿者返回志愿者的姓名 |
|||
*/ |
|||
private String serviceUserName; |
|||
/** |
|||
* 服务方负责人联系电话，如果是志愿者返回志愿者的注册手机号 |
|||
*/ |
|||
private String serviceUserMobile; |
|||
/** |
|||
* 社会组织名 |
|||
* 社区自组织名 |
|||
* 区域党建单位名 |
|||
*/ |
|||
private String serviceUnitName; |
|||
/** |
|||
* 1：已评价；0：未评价;评价后ic_user_satisfaction表有记录 |
|||
*/ |
|||
private Boolean evaluateFlag; |
|||
/** |
|||
* 得分可为半星 |
|||
*/ |
|||
private BigDecimal score; |
|||
/** |
|||
* 待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished |
|||
*/ |
|||
private String status; |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
private Date cancelTime; |
|||
} |
|||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue