|
@ -21,14 +21,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; |
|
|
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; |
|
|
import com.elink.esua.epdc.commons.mybatis.utils.DeptEntityUtils; |
|
|
import com.elink.esua.epdc.commons.mybatis.utils.DeptEntityUtils; |
|
|
|
|
|
import com.elink.esua.epdc.commons.tools.constant.FieldConstant; |
|
|
import com.elink.esua.epdc.commons.tools.exception.RenException; |
|
|
import com.elink.esua.epdc.commons.tools.exception.RenException; |
|
|
import com.elink.esua.epdc.commons.tools.page.PageData; |
|
|
import com.elink.esua.epdc.commons.tools.page.PageData; |
|
|
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; |
|
|
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; |
|
|
import com.elink.esua.epdc.commons.tools.constant.FieldConstant; |
|
|
|
|
|
import com.elink.esua.epdc.commons.tools.utils.Result; |
|
|
import com.elink.esua.epdc.commons.tools.utils.Result; |
|
|
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; |
|
|
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; |
|
|
import com.elink.esua.epdc.dto.constant.GroupConstant; |
|
|
import com.elink.esua.epdc.dto.constant.GroupConstant; |
|
|
import com.elink.esua.epdc.dto.enums.GroupStateEnum; |
|
|
import com.elink.esua.epdc.dto.enums.GroupStateEnum; |
|
|
|
|
|
import com.elink.esua.epdc.dto.project.PropertyProjectDTO; |
|
|
import com.elink.esua.epdc.dto.project.form.ProjectDetailFormDTO; |
|
|
import com.elink.esua.epdc.dto.project.form.ProjectDetailFormDTO; |
|
|
import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO; |
|
|
import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO; |
|
|
import com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO; |
|
|
import com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO; |
|
@ -37,7 +38,6 @@ import com.elink.esua.epdc.modules.feign.AdminFeignClient; |
|
|
import com.elink.esua.epdc.modules.group.dao.GroupDao; |
|
|
import com.elink.esua.epdc.modules.group.dao.GroupDao; |
|
|
import com.elink.esua.epdc.modules.group.entity.GroupEntity; |
|
|
import com.elink.esua.epdc.modules.group.entity.GroupEntity; |
|
|
import com.elink.esua.epdc.modules.project.dao.PropertyProjectDao; |
|
|
import com.elink.esua.epdc.modules.project.dao.PropertyProjectDao; |
|
|
import com.elink.esua.epdc.dto.project.PropertyProjectDTO; |
|
|
|
|
|
import com.elink.esua.epdc.modules.project.entity.PropertyProjectEntity; |
|
|
import com.elink.esua.epdc.modules.project.entity.PropertyProjectEntity; |
|
|
import com.elink.esua.epdc.modules.project.service.PropertyProjectService; |
|
|
import com.elink.esua.epdc.modules.project.service.PropertyProjectService; |
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
import org.apache.commons.lang3.StringUtils; |
|
|