jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xd
姜玉琦 2025-04-13 22:39:54 +08:00
parent 7c736b0fd5
commit c979a4cd92
5 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yanzhu-bigscreen/src/views/safety/powerIot.vue
View File

@ -138,7 +138,7 @@
</el-select>
</div>
<div class="hj-moment-state">
<div class="state-tag hj-moment-green" v-if="powerRun.onlineStatus=='0'">在线</div>
<div class="state-tag hj-moment-green" v-if="powerRun.onlineStatus=='1'">在线</div>
<div class="state-tag hj-moment-orange" v-else>离线</div>
</div>
</div>

3
yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/IsDelEnums.java
View File

@ -8,7 +8,8 @@ package com.yanzhu.common.core.enums;
public enum IsDelEnums {
NO(0L, "0","有效"),
YES(1L, "1", "删除");
YES(1L, "1", "无效"),
DEL(2L, "2", "删除");
private final Long code;
private final String codeStr;

18
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java
View File

@ -250,10 +250,22 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept
}
proProjectInfoSubdepts.setComId(info.getComId());
if(Objects.equals(proProjectInfoSubdepts.getSubDeptType(), SubDeptsEnums.ZYFB.getCode()) || Objects.equals(proProjectInfoSubdepts.getSubDeptType(),SubDeptsEnums.LWFB.getCode())){
Map<String, Object> map = proProjectInfoSubdeptsUsersMapper.findProUserPhone(info.getId(),proProjectInfoSubdepts.getSubDeptLeaderPhone());
if(Objects.nonNull(map) && Convert.toInt(map.get("total"),0)>0){
throw new ServiceException("手机号码已存在");
// 查询用户是否已申请
ProProjectInfoSubdeptsUsers usersQuery = new ProProjectInfoSubdeptsUsers();
usersQuery.setProjectId(info.getId());
usersQuery.setUserPhone(proProjectInfoSubdepts.getSubDeptLeaderPhone());
List<ProProjectInfoSubdeptsUsers> users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(usersQuery);
if(users.size()>0){
ProProjectInfoSubdeptsUsers oldUserData = users.get(0);
if(oldUserData.getApproveStatus()==ApproveStatus.refuse.getCode()){
// 删除用户冗余数据...
oldUserData.setIsDel(IsDelEnums.DEL.getCode());
proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(oldUserData);
}else{
throw new ServiceException("手机号码已存在");
}
}
// 单位委托人信息
if(StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderName()) && StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderCode()) && StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderPhone())){
SysUser sysUser = new SysUser();

18
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java
View File

@ -349,9 +349,21 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
if(Objects.isNull(parUsers)){
throw new ServiceException("用户信息异常...请重新扫码");
}
Map<String, Object> map = proProjectInfoSubdeptsUsersMapper.findProUserPhone(parUsers.getProjectId(),proProjectInfoSubdeptsUsers.getUserPhone());
if(Objects.nonNull(map) && Convert.toInt(map.get("total"),0)>0){
throw new ServiceException("手机号码已存在");
// 查询数据是否已申请
ProProjectInfoSubdeptsUsers usersQuery = new ProProjectInfoSubdeptsUsers();
usersQuery.setProjectId(parUsers.getProjectId());
usersQuery.setUserPhone(proProjectInfoSubdeptsUsers.getUserPhone());
List<ProProjectInfoSubdeptsUsers> users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(usersQuery);
if(users.size()>0){
ProProjectInfoSubdeptsUsers oldUserData = users.get(0);
if(oldUserData.getApproveStatus()==ApproveStatus.refuse.getCode()){
// 删除用户冗余数据...
oldUserData.setIsDel(IsDelEnums.DEL.getCode());
proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(oldUserData);
}else{
throw new ServiceException("手机号码已存在");
}
}
proProjectInfoSubdeptsUsers.setComId(parUsers.getComId());
proProjectInfoSubdeptsUsers.setProjectId(parUsers.getProjectId());

7
yanzhu-ui-app/miniprogram/pages/project_qr/index.js
View File

@ -2065,12 +2065,15 @@ Page({
craftPost: null,
leaderDegreeGrade: null,
userInfos: {},
degreeGrade: null
degreeGrade: null,
userPhone: this.data.userPhoneNumber,
subDeptLeaderPhone: this.data.userPhoneNumber
};
let _subDeptNameTemp = this.data.form.subDeptName;
this.setData({
form:_form,
active: 0,
"parForm.subDeptName": this.data.form.subDeptName,
"parForm.subDeptName": _subDeptNameTemp
});
},