代码提交

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/ProjectController.java

@@ -825,6 +825,8 @@ public class ProjectController extends BaseController {
 		String s = "";
 		if(split.length != 0) {
 			s =split[0]+"Km";
+		} else {
+			s = "0Km";
 		}
 
 		jsonObject.put("number",count);

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectServiceImpl.java

@@ -27,6 +27,7 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
+import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -559,6 +560,16 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
     public List<ProjectDto> getPage(List<ProjectDto> projects){
        ArrayList<ProjectDto> list = Lists.newArrayList();
        for(ProjectDto projectDto:projects){
+           if(OrgEnum.安装单位.getKey().equals(orgService.getReginParams().getBusinessInfo().getCompanyType())){
+               if(projectDto.getStatus().contains("/")) {
+                   projectDto.setStatus(StringUtils.substringAfter(projectDto.getStatus(), "/"));
+               }
+
+           } else if(OrgEnum.设计单位.getKey().equals(orgService.getReginParams().getBusinessInfo().getCompanyType())){
+               if(projectDto.getStatus().contains("/")) {
+                   projectDto.setStatus(StringUtils.substringBefore(projectDto.getStatus(), "/"));
+               }
+           }
            if (ProjectInitiationEnum.监检员分配.getName().equals(projectDto.getStatus())) {
                if (!ValidationUtil.isEmpty(projectDto.getContext()) && JSONObject.parseObject(projectDto.getContext()).containsKey("insDepId")) {
                    String insDepId = JSONObject.parseObject(projectDto.getContext()).getString("insDepId");