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

Compare commits

base: jiangyq:6d1663f282c1e331eb1fb5cb85bb6c14f0919dae
Branches Tags
jiangyq:dev_xd
jiangyq:main
..
compare: jiangyq:c50517a26c49189a300364c909a519d26eee1485
Branches Tags
jiangyq:dev_xd
jiangyq:main

No commits in common. "6d1663f282c1e331eb1fb5cb85bb6c14f0919dae" and "c50517a26c49189a300364c909a519d26eee1485" have entirely different histories.
6d1663f282 ... c50517a26c

5 changed files with 10 additions and 38 deletions
Show Stats Expand all files Collapse all files

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

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

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

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

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

@ -250,22 +250,10 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept
} }
proProjectInfoSubdepts.setComId(info.getComId()); proProjectInfoSubdepts.setComId(info.getComId());
if(Objects.equals(proProjectInfoSubdepts.getSubDeptType(), SubDeptsEnums.ZYFB.getCode()) || Objects.equals(proProjectInfoSubdepts.getSubDeptType(),SubDeptsEnums.LWFB.getCode())){ 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());
ProProjectInfoSubdeptsUsers usersQuery = new ProProjectInfoSubdeptsUsers(); if(Objects.nonNull(map) && Convert.toInt(map.get("total"),0)>0){
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("手机号码已存在"); throw new ServiceException("手机号码已存在");
} }
}
// 单位委托人信息 // 单位委托人信息
if(StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderName()) && StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderCode()) && StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderPhone())){ if(StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderName()) && StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderCode()) && StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderPhone())){
SysUser sysUser = new SysUser(); SysUser sysUser = new SysUser();

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

@ -349,22 +349,10 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
if(Objects.isNull(parUsers)){ if(Objects.isNull(parUsers)){
throw new ServiceException("用户信息异常...请重新扫码"); throw new ServiceException("用户信息异常...请重新扫码");
} }
Map<String, Object> map = proProjectInfoSubdeptsUsersMapper.findProUserPhone(parUsers.getProjectId(),proProjectInfoSubdeptsUsers.getUserPhone());
// 查询数据是否已申请 if(Objects.nonNull(map) && Convert.toInt(map.get("total"),0)>0){
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("手机号码已存在"); throw new ServiceException("手机号码已存在");
} }
}
proProjectInfoSubdeptsUsers.setComId(parUsers.getComId()); proProjectInfoSubdeptsUsers.setComId(parUsers.getComId());
proProjectInfoSubdeptsUsers.setProjectId(parUsers.getProjectId()); proProjectInfoSubdeptsUsers.setProjectId(parUsers.getProjectId());
proProjectInfoSubdeptsUsers.setSubDeptId(parUsers.getSubDeptId()); proProjectInfoSubdeptsUsers.setSubDeptId(parUsers.getSubDeptId());

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

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