Commit 645aa5be authored by wanglong's avatar wanglong

修改分页查询项目质量监检信息查找逻辑

parent 68226914
...@@ -28,6 +28,7 @@ public class XJConstant { ...@@ -28,6 +28,7 @@ public class XJConstant {
public static final int ORG_CODE=18; public static final int ORG_CODE=18;
public static final int ORG_CODE_USER=12; public static final int ORG_CODE_USER=12;
public static final int CODE_USER_SUM = 6; public static final int CODE_USER_SUM = 6;
public static final String 监检="WzNVBO";
/** 企业用户注册前缀 */ /** 企业用户注册前缀 */
public static final String UGP_USER_TEL = "ugp_tel_"; public static final String UGP_USER_TEL = "ugp_tel_";
......
...@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto; ...@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr; import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl; import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
import com.yeejoin.amos.boot.module.ugp.api.Enum.StageEnum; import com.yeejoin.amos.boot.module.ugp.api.Enum.StageEnum;
import com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant;
import com.yeejoin.amos.boot.module.ugp.api.dto.PercentOfPassDto; import com.yeejoin.amos.boot.module.ugp.api.dto.PercentOfPassDto;
import com.yeejoin.amos.boot.module.ugp.api.dto.WeldDto; import com.yeejoin.amos.boot.module.ugp.api.dto.WeldDto;
import com.yeejoin.amos.boot.module.ugp.api.entity.Project; import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
...@@ -58,7 +59,7 @@ public class InstallationQualityImpl extends BaseService<PercentOfPassDto, Quali ...@@ -58,7 +59,7 @@ public class InstallationQualityImpl extends BaseService<PercentOfPassDto, Quali
ProjectResourceServiceImpl projectResourceService; ProjectResourceServiceImpl projectResourceService;
static final String 监检="WzNVBO";
//分页查询项目质量监检信息 //分页查询项目质量监检信息
...@@ -71,7 +72,7 @@ public class InstallationQualityImpl extends BaseService<PercentOfPassDto, Quali ...@@ -71,7 +72,7 @@ public class InstallationQualityImpl extends BaseService<PercentOfPassDto, Quali
Set<String> projectIds = new HashSet<>(); Set<String> projectIds = new HashSet<>();
Long companySequenceNbr = orgService.getReginParams().getBusinessInfo().getCompanySequenceNbr(); Long companySequenceNbr = orgService.getReginParams().getBusinessInfo().getCompanySequenceNbr();
OrgUsr orgUsrById = orgService.getOrgUsrById(String.valueOf(companySequenceNbr)); OrgUsr orgUsrById = orgService.getOrgUsrById(String.valueOf(companySequenceNbr));
if (Pattern.matches(orgUsrById.getBizOrgCode(),监检)){ if (orgUsrById.getBizOrgCode().contains(XJConstant.监检)){
List<Project> projects = projectMapper.selectList(null); List<Project> projects = projectMapper.selectList(null);
for (Project i:projects){ for (Project i:projects){
projectIds.add(String.valueOf(i.getSequenceNbr())); projectIds.add(String.valueOf(i.getSequenceNbr()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment