小程序机构未搭建完成前不允许修改机构信息
This commit is contained in:
parent
481ced58bb
commit
e784e427c4
|
|
@ -374,4 +374,9 @@ public class OrgAllInfoApiEntity implements Serializable {
|
||||||
*/
|
*/
|
||||||
private java.lang.String passwordText;
|
private java.lang.String passwordText;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 平台是否搭建完成 Y完成 N未完成
|
||||||
|
*/
|
||||||
|
private String platformBuildComplete;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -191,6 +191,8 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<OrgAllInfoApiEntity> queryOrgHomePageList(String openId) {
|
public List<OrgAllInfoApiEntity> queryOrgHomePageList(String openId) {
|
||||||
|
//只有入驻审批通过后的才会进sys_depart 刚审核完成直到走完搭建流程 sys_depart的status都是0 运维走完搭建流程 最后一步(反馈)后 status才会变成1
|
||||||
|
|
||||||
//已经申请通过的机构 查这个表是因为需要最新的机构数据 apply的数据可能是变更中的数据
|
//已经申请通过的机构 查这个表是因为需要最新的机构数据 apply的数据可能是变更中的数据
|
||||||
SysDepartEntity queryParams = new SysDepartEntity();
|
SysDepartEntity queryParams = new SysDepartEntity();
|
||||||
queryParams.setOpenId(openId);
|
queryParams.setOpenId(openId);
|
||||||
|
|
@ -198,6 +200,11 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
|
||||||
if (!CollectionUtils.isEmpty(orgApplyInfoApiEntities)) {
|
if (!CollectionUtils.isEmpty(orgApplyInfoApiEntities)) {
|
||||||
orgApplyInfoApiEntities.stream().forEach(item -> {
|
orgApplyInfoApiEntities.stream().forEach(item -> {
|
||||||
item.setPkId(item.getId());
|
item.setPkId(item.getId());
|
||||||
|
if ("0".equals(item.getStatus())) {
|
||||||
|
item.setPlatformBuildComplete("N");
|
||||||
|
} else {
|
||||||
|
item.setPlatformBuildComplete("Y");
|
||||||
|
}
|
||||||
item.setStatus("2");
|
item.setStatus("2");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -209,6 +216,9 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
|
||||||
qw.in("status", "1,3".split(","));
|
qw.in("status", "1,3".split(","));
|
||||||
qw.orderByDesc("create_time");
|
qw.orderByDesc("create_time");
|
||||||
List<OrgAllInfoApiEntity> applyList = BeanUtil.copyToList(baseMapper.selectList(qw), OrgAllInfoApiEntity.class);
|
List<OrgAllInfoApiEntity> applyList = BeanUtil.copyToList(baseMapper.selectList(qw), OrgAllInfoApiEntity.class);
|
||||||
|
applyList.stream().forEach(item -> {
|
||||||
|
item.setPlatformBuildComplete("N");
|
||||||
|
});
|
||||||
orgApplyInfoApiEntities.addAll(applyList);
|
orgApplyInfoApiEntities.addAll(applyList);
|
||||||
|
|
||||||
for (OrgAllInfoApiEntity par : orgApplyInfoApiEntities) {
|
for (OrgAllInfoApiEntity par : orgApplyInfoApiEntities) {
|
||||||
|
|
|
||||||
|
|
@ -1018,8 +1018,10 @@ public class LoginController {
|
||||||
System.out.println("openId = " + openId);
|
System.out.println("openId = " + openId);
|
||||||
queryWrapper.eq("open_id", openId);
|
queryWrapper.eq("open_id", openId);
|
||||||
AdvisoryInfo nuBizAdvisoryInfo = nuBizAdvisoryInfoService.getOne(queryWrapper);
|
AdvisoryInfo nuBizAdvisoryInfo = nuBizAdvisoryInfoService.getOne(queryWrapper);
|
||||||
nuBizAdvisoryInfo.setTel(phone);
|
AdvisoryInfo updateDate = new AdvisoryInfo();
|
||||||
nuBizAdvisoryInfoService.updateById(nuBizAdvisoryInfo);
|
updateDate.setId(nuBizAdvisoryInfo.getId());
|
||||||
|
updateDate.setTel(phone);
|
||||||
|
nuBizAdvisoryInfoService.updateById(updateDate);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue