huanghongfa
2021-07-08 709804b9db1eb901e357928a0830b3c65509da69
修改bug
2个文件已修改
15 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/IdDTO.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/IdDTO.java
@@ -2,6 +2,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
@@ -10,17 +11,14 @@
 * @date 2021/6/28 16:30
 */
@ApiModel("id参数")
@Data
public class IdDTO {
    @NotNull(message = "id不能为空")
    @ApiModelProperty("id")
    private String id;
    public String getId() {
        return id;
    }
    @ApiModelProperty("网格id")
    private Long gridId;
    public void setId(String id) {
        this.id = id;
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
@@ -264,7 +264,7 @@
            if(StringUtils.isEmpty(idstr)){
                continue;
            }
            String error = addVisitingTask(Long.valueOf(idstr),communityId,userId);
            String error = addVisitingTask(Long.valueOf(idstr),idDTO.getGridId(),userId);
            if(!StringUtils.isEmpty(error)){
                rt.append(error);
            }
@@ -281,7 +281,7 @@
        return page.getRecords();
    }
    private String addVisitingTask(Long id, Long communityId,Long userId) throws Exception{
    private String addVisitingTask(Long id, Long gridId,Long userId) throws Exception{
        Map<String,Object> map = eventVisitingTasksMapper.findPopulationById(id);
        if(CollectionUtils.isEmpty(map)){
@@ -293,6 +293,7 @@
            return "被访问人["+map.get("name")+"]只能同时存在一条待走访任务;";
        }
        EventVisitingTasksDO visitingTasksDO = new EventVisitingTasksDO();
        visitingTasksDO.setGridId(gridId);
//        visitingTasksDO.setGridMemberStreet(Long.valueOf(gridMap.get("street_id").toString()));
//        visitingTasksDO.setGridMemberCommunity(communityId);
//        visitingTasksDO.setGridMember(Long.valueOf(gridMap.get("user_id").toString()));