Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-05-20 e7bc156f901b06e5af54cfe86fe53e7491af7b7f

 screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationQueryVO.java

@@ -2,8 +2,10 @@

import com.fasterxml.jackson.annotation.JsonInclude;
import com.moral.api.entity.Organization;
import com.moral.api.entity.User;
import com.moral.api.pojo.dto.organization.OrganizationDTO;
import com.moral.api.pojo.dto.organization.OrganizationQueryDTO;
import com.moral.api.pojo.vo.user.UserVO;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.DateUtils;
import lombok.Data;
@@ -38,7 +40,7 @@
        if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode())
            return null;
        OrganizationQueryVO vo = new OrganizationQueryVO();
        long page = dto.getPage();
        long pages = dto.getPages();
        long total = dto.getTotal();
        long current = dto.getCurrent();
        long size = dto.getSize();
@@ -51,7 +53,7 @@

        vo.setCurrent(current);
        vo.setOrganizations(organizationVOS);
        vo.setPages(page);
        vo.setPages(pages);
        vo.setSize(size);
        vo.setTotal(total);
        return vo;
@@ -68,12 +70,12 @@
        OrganizationVO vo = new OrganizationVO();
        Organization organization = dto.getOrganization();
        Organization parentOrganization = dto.getParentOrganization();
        User adminUser = dto.getAdminUser();
        Date createTime = organization.getCreateTime();
        Date expireTime = organization.getExpireTime();
        String createTimeStr = DateUtils.dateToDateString(createTime, "yyyy-MM-dd");
        String exipreTimeStr = DateUtils.dateToDateString(expireTime, "yyyy-MM-dd");


        //封装组织信息
        vo.setId(organization.getId());
        vo.setName(organization.getName());
        if (!ObjectUtils.isEmpty(parentOrganization))
@@ -84,12 +86,32 @@
        vo.setAddress(organization.getAddress());
        vo.setCreateTime(createTimeStr);
        vo.setExpireTime(exipreTimeStr);
        vo.setAdminUserId(organization.getAdminUserId());
        vo.setProvinceCode(organization.getProvinceCode());
        vo.setCityCode(organization.getCityCode());
        vo.setAreaCode(organization.getAreaCode());
        vo.setProvinceCityAreaName(organization.getProvinceName()+"/"+organization.getCityName()+"/"+organization.getAreaName());
        vo.setProvinceCityAreaName(organization.getProvinceName() + "/" + organization.getCityName() + "/" + organization.getAreaName());
        vo.setLocationLevelCode(organization.getLocationLevelCode());
        vo.setLocationLevelName(organization.getLocationLevelName());
        //封装组织admin账号信息
        if (!ObjectUtils.isEmpty(adminUser)) {
            UserVO adminUserVO = new UserVO();
            String adminUserCreateTimeStr = DateUtils.dateToDateString(adminUser.getCreateTime(), "yyyy-MM-dd");
            String adminUserExpireTimeStr = DateUtils.dateToDateString(adminUser.getExpireTime(), "yyyy-MM-dd");
            adminUserVO.setId(adminUser.getId());
            adminUserVO.setMobile(adminUser.getMobile());
            adminUserVO.setEmail(adminUser.getEmail());
            adminUserVO.setWechat(adminUser.getWechat());
            adminUserVO.setAccount(adminUser.getAccount());
            adminUserVO.setExpireTime(adminUserExpireTimeStr);
            adminUserVO.setCreateTime(adminUserCreateTimeStr);
            adminUserVO.setUserName(adminUser.getUserName());
            adminUserVO.setOrganizationName(organization.getName());
            vo.setAdminUserAccount(adminUser.getAccount());
            vo.setAdminUser(adminUserVO);
        }else{
            vo.setAdminUser(new UserVO());
        }
        return vo;
    }
}