Commit 878a903b authored by 刘林's avatar 刘林

Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

parents dc3e31a1 d9d87814
......@@ -28,15 +28,15 @@ public class BaseController {
@Autowired
protected HttpServletRequest request;
/**
* 企业
*/
public static final String COMPANY_TYPE_COMPANY = "company";
/**
* 监管/行政审批局
*/
public static final String COMPANY_TYPE_SUPERVISION = "supervision";
/**
* 企业
*/
public static final String COMPANY_TYPE_COMPANY = "company";
/**
......
......@@ -2134,12 +2134,21 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
if(!StringUtils.isEmpty(jgUseRegistration.getProjectContraptionId())){
LambdaQueryWrapper<IdxBizJgProjectContraption> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(BaseEntity::getSequenceNbr, jgUseRegistration.getProjectContraptionId());
queryWrapper.select(IdxBizJgProjectContraption::getEquListName,IdxBizJgProjectContraption::getEquCategoryName,IdxBizJgProjectContraption::getEquDefineName,BaseEntity::getSequenceNbr);
queryWrapper.select(IdxBizJgProjectContraption::getEquListName,
IdxBizJgProjectContraption::getEquCategoryName,
IdxBizJgProjectContraption::getEquDefineName,
BaseEntity::getSequenceNbr,
IdxBizJgProjectContraption::getEquList,
IdxBizJgProjectContraption::getEquCategory,
IdxBizJgProjectContraption::getEquDefine);
IdxBizJgProjectContraption projectContraption = jgProjectContraptionService.getBaseMapper().selectOne(queryWrapper);
if(projectContraption != null){
detail.put("equListName", projectContraption.getEquListName());
detail.put("equCategoryName", projectContraption.getEquCategoryName());
detail.put("equDefineName", projectContraption.getEquDefineName());
detail.putIfAbsent("EQU_LIST_CODE", projectContraption.getEquList());
detail.putIfAbsent("EQU_CATEGORY_CODE", projectContraption.getEquCategory());
detail.putIfAbsent("EQU_DEFINE_CODE", projectContraption.getEquDefine());
}
}
}
......
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