Merge #110 into master from cc_2026_0422_feat_miniMap
三方接口 * cc_2026_0422_feat_miniMap: (5 commits squashed) - feat: 添加机会点考察记录及相关请求和响应类 - feat: 更新考察记录响应类,添加机会点信息及图片信息结构 - feat:验签对于List的特殊处理 - feat: 添加qualified字段到OpportunityInfoResponse以表示考察合格状态 - Merge branch 'master' into cc_2026_0422_feat_miniMap Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com> Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/110
This commit is contained in:
@@ -0,0 +1,40 @@
|
||||
|
||||
package com.cool.store.request.oppty;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.util.List;
|
||||
|
||||
/** * 添加机会点考察记录 */
|
||||
@Data
|
||||
public class AddInspectionRecordRequest {
|
||||
|
||||
@ApiModelProperty("机会点编号")
|
||||
@NotBlank
|
||||
private String code;
|
||||
|
||||
@ApiModelProperty("考察人姓名")
|
||||
@NotBlank
|
||||
private String name;
|
||||
|
||||
@ApiModelProperty("考察人手机号")
|
||||
@NotBlank
|
||||
private String mobile;
|
||||
|
||||
@ApiModelProperty("考察时间,格式:yyyy-MM-dd HH:mm:ss")
|
||||
@NotBlank
|
||||
private String inspectionTime;
|
||||
|
||||
@ApiModelProperty("是否合格,兼容 1/2 或 true/false")
|
||||
@NotNull
|
||||
private Object qualified;
|
||||
|
||||
@ApiModelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
@ApiModelProperty("考察图片,兼容对象数组或字符串URL数组")
|
||||
private List<Object> images;
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package com.cool.store.request.oppty;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
/**
|
||||
* 查询机会点考察记录列表
|
||||
*/
|
||||
@Data
|
||||
public class ListInspectionRecordRequest {
|
||||
|
||||
@ApiModelProperty("机会点编号")
|
||||
@NotBlank
|
||||
private String code;
|
||||
|
||||
@ApiModelProperty("考察人手机号")
|
||||
private String mobile;
|
||||
|
||||
@ApiModelProperty("是否合格,兼容 1/2 或 true/false")
|
||||
private Object qualified;
|
||||
|
||||
@ApiModelProperty("页码,默认1")
|
||||
private Integer pageNum;
|
||||
|
||||
@ApiModelProperty("每页条数,默认20,最大50")
|
||||
private Integer pageSize;
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package com.cool.store.request.oppty;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
/**
|
||||
* 设置机会点调整后坐标
|
||||
*/
|
||||
@Data
|
||||
public class SaveAdjustLocationRequest {
|
||||
|
||||
@ApiModelProperty("机会点编号")
|
||||
@NotBlank
|
||||
private String code;
|
||||
|
||||
@ApiModelProperty("调整后坐标 GEOHASH")
|
||||
@NotBlank
|
||||
private String location;
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.cool.store.response.oppty;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 机会点考察记录分页响应
|
||||
*/
|
||||
@Data
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public class InspectionRecordPageResponse {
|
||||
|
||||
private PageResponse page;
|
||||
private List<InspectionRecordResponse> pageData;
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
package com.cool.store.response.oppty;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 机会点考察记录
|
||||
*/
|
||||
@Data
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public class InspectionRecordResponse {
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
private Long iid;
|
||||
/**
|
||||
* 机会点ID
|
||||
*/
|
||||
private Long oid;
|
||||
/**
|
||||
* 机会点编号
|
||||
*/
|
||||
private String code;
|
||||
/**
|
||||
* 机会点名称
|
||||
*/
|
||||
private String opptyName;
|
||||
/**
|
||||
* 考察人姓名
|
||||
*/
|
||||
private String name;
|
||||
/**
|
||||
* 考察人手机号
|
||||
*/
|
||||
private String mobile;
|
||||
/**
|
||||
* 考察时间,格式为 `yyyy-MM-dd HH:mm:ss`
|
||||
*/
|
||||
private String inspectionTime;
|
||||
/**
|
||||
* 是否合格:`1` 合格,`2` 不合格
|
||||
*/
|
||||
private Integer qualified;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 保持兼容,先用通用结构承接第三方返回
|
||||
* 每项通常包含 path/url
|
||||
*/
|
||||
private List<ImageInfo> images;
|
||||
|
||||
@Data
|
||||
public static class ImageInfo {
|
||||
private String path;
|
||||
private String url;
|
||||
}
|
||||
}
|
||||
@@ -34,4 +34,6 @@ public class OpportunityInfoResponse {
|
||||
private Integer berthNum;
|
||||
@ApiModelProperty("关注人用户信息 ,如有")
|
||||
private List<UserResponse> atUsers;
|
||||
@ApiModelProperty("是否合格,1:合格,2:不合格,0|null:未考察")
|
||||
private Integer qualified;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user