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

提交代码

dev_xd
姜玉琦 2025-02-22 19:04:51 +08:00
parent 76d3f1513b
commit cb04fa4bca
4 changed files with 293 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,17 +135,20 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
proProjectInfoSubdeptsUsers.setSubStep(2L);
proProjectInfoSubdeptsUsers.setApproveStatus(ApproveStatus.passed.getCode());
// 参建单位信息
ProProjectInfoSubdepts subDepts = proProjectInfoSubdeptsMapper.selectProProjectInfoSubdeptsById(proProjectInfoSubdeptsUsers.getSubDeptId());
proProjectInfoSubdeptsUsers.setSubDeptType(subDepts.getSubDeptType());
SysUser sysUser = new SysUser();
sysUser.setComId(proProjectInfoSubdeptsUsers.getComId());
sysUser.setDeptId(proProjectInfoSubdeptsUsers.getProjectId());
sysUser.setComId(subDepts.getComId());
sysUser.setDeptId(subDepts.getProjectId());
sysUser.setUserName(proProjectInfoSubdeptsUsers.getUserPhone());
sysUser.setNickName(proProjectInfoSubdeptsUsers.getUserName());
sysUser.setPhonenumber(proProjectInfoSubdeptsUsers.getUserPhone());
sysUser.setUpdateBy(SecurityUtils.getUsername());
sysUser.setUpdateTime(DateUtils.getNowDate());
sysUser.setComId(proProjectInfoSubdeptsUsers.getComId());
sysUser.setDeptId(proProjectInfoSubdeptsUsers.getProjectId());
sysUser.setUserInfos(proProjectInfoSubdeptsUsers.getUserInfos());
String subDeptType = proProjectInfoSubdeptsUsers.getSubDeptType();
// 判断单位类型
if(Objects.nonNull(subDeptType)){
@ -166,6 +169,12 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
}else if(Objects.equals(proProjectInfoSubdeptsUsers.getCraftPost(), CraftPostEnums.XMJL.getCode())){
sysUser.setUserType(UserTypeEnums.FBXMJL.getCode());
proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.XMJL.getCode());
}else if(Objects.equals(proProjectInfoSubdeptsUsers.getCraftPost(), CraftPostEnums.AQZY.getCode())){
sysUser.setUserType(UserTypeEnums.FBAQRY.getCode());
proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.AQRY.getCode());
}else if(Objects.equals(proProjectInfoSubdeptsUsers.getCraftPost(), CraftPostEnums.CLZY.getCode())){
sysUser.setUserType(UserTypeEnums.FBXMJL.getCode());
proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.CLRY.getCode());
}else{
sysUser.setUserType(UserTypeEnums.FBLWRY.getCode());
proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.LWGR.getCode());
@ -192,14 +201,12 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
}
sysUser.setActiveProjectId(proProjectInfoSubdeptsUsers.getProjectId());
sysUser.setWorkType(proProjectInfoSubdeptsUsers.getWorkType());
R<Long> obj= remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER);
Long userId= obj.getData();
Long userId= remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER).getData();
proProjectInfoSubdeptsUsers.setUserId(userId);
int res = proProjectInfoSubdeptsUsersMapper.insertProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers);
uniService.syncUniUser(proProjectInfoSubdeptsUsers);
if(res>0 && (Objects.equals(SubDeptsEnums.ZYFB.getCode(),subDeptType) || Objects.equals(SubDeptsEnums.LWFB.getCode(),subDeptType)) && Objects.nonNull(proProjectInfoSubdeptsUsers.getUserPost())){
String userPost = proProjectInfoSubdeptsUsers.getUserPost();
if(res>0 && (Objects.equals(UserPostEnums.WTDL.getCode(),userPost) || Objects.equals(UserPostEnums.XMJL.getCode(),userPost) || Objects.equals(UserPostEnums.BZZ.getCode(),userPost))){
// 生成二维码
try {
String accessToken = wxMaService.getAccessToken();
@ -208,7 +215,10 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
String profilePath = ProfileConfig.profile+"/"+filePath;
log.info("accessToken...{}",accessToken);
// 生成二维码
if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(), UserPostEnums.XMJL.getCode())){
if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(), UserPostEnums.WTDL.getCode())){
File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=2&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(),280);
FileUtil.copyFile(file,new File(savePath));
}else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(), UserPostEnums.XMJL.getCode())){
File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=3&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(),280);
FileUtil.copyFile(file,new File(savePath));
}else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(), UserPostEnums.BZZ.getCode())){
@ -477,21 +487,112 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
@Override
public int updateProProjectInfoSubdeptsUsers(ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers)
{
// 参建单位信息
ProProjectInfoSubdepts subDepts = proProjectInfoSubdeptsMapper.selectProProjectInfoSubdeptsById(proProjectInfoSubdeptsUsers.getSubDeptId());
proProjectInfoSubdeptsUsers.setSubDeptType(subDepts.getSubDeptType());
SysUser sysUser = new SysUser();
sysUser.setComId(subDepts.getComId());
sysUser.setDeptId(subDepts.getProjectId());
sysUser.setUserName(proProjectInfoSubdeptsUsers.getUserPhone());
sysUser.setNickName(proProjectInfoSubdeptsUsers.getUserName());
sysUser.setPhonenumber(proProjectInfoSubdeptsUsers.getUserPhone());
sysUser.setUpdateBy(SecurityUtils.getUsername());
sysUser.setUpdateTime(DateUtils.getNowDate());
sysUser.setUserInfos(proProjectInfoSubdeptsUsers.getUserInfos());
String subDeptType = proProjectInfoSubdeptsUsers.getSubDeptType();
// 判断单位类型
if(Objects.nonNull(subDeptType)){
if(Objects.equals(SubDeptsEnums.JSDW.getCode(),subDeptType)){
sysUser.setUserType(UserTypeEnums.JSDWRY.getCode());
proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.JSDWGL.getCode());
}else if(Objects.equals(SubDeptsEnums.JLDW.getCode(),subDeptType)){
sysUser.setUserType(UserTypeEnums.JLDWRY.getCode());
proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.JLDWGL.getCode());
}else if(Objects.equals(SubDeptsEnums.SGDW.getCode(),subDeptType)){
sysUser.setUserType(UserTypeEnums.SGDWRY.getCode());
proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.SGDWGL.getCode());
}else if(Objects.equals(SubDeptsEnums.ZYFB.getCode(),subDeptType) || Objects.equals(SubDeptsEnums.LWFB.getCode(),subDeptType)){
//判断工种岗位设置用户岗位...PC需要单独设置
if(Objects.equals(proProjectInfoSubdeptsUsers.getCraftPost(), CraftPostEnums.WTDL.getCode())){
sysUser.setUserType(UserTypeEnums.FBWTDL.getCode());
proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.WTDL.getCode());
}else if(Objects.equals(proProjectInfoSubdeptsUsers.getCraftPost(), CraftPostEnums.XMJL.getCode())){
sysUser.setUserType(UserTypeEnums.FBXMJL.getCode());
proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.XMJL.getCode());
}else if(Objects.equals(proProjectInfoSubdeptsUsers.getCraftPost(), CraftPostEnums.AQZY.getCode())){
sysUser.setUserType(UserTypeEnums.FBAQRY.getCode());
proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.AQRY.getCode());
}else if(Objects.equals(proProjectInfoSubdeptsUsers.getCraftPost(), CraftPostEnums.CLZY.getCode())){
sysUser.setUserType(UserTypeEnums.FBXMJL.getCode());
proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.CLRY.getCode());
}else{
sysUser.setUserType(UserTypeEnums.FBLWRY.getCode());
proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.LWGR.getCode());
}
}else if(Objects.equals(SubDeptsEnums.CLFB.getCode(),subDeptType)){
sysUser.setUserType(UserTypeEnums.CLFBRY.getCode());
proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.CLFBGL.getCode());
}else if(Objects.equals(SubDeptsEnums.HQFB.getCode(),subDeptType)){
sysUser.setUserType(UserTypeEnums.HQFBRY.getCode());
proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.HQFBGL.getCode());
}else if(Objects.equals(SubDeptsEnums.TSSB.getCode(),subDeptType)){
sysUser.setUserType(UserTypeEnums.TSSBRY.getCode());
proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.TSSBGL.getCode());
}else if(Objects.equals(SubDeptsEnums.KTDW.getCode(),subDeptType)){
sysUser.setUserType(UserTypeEnums.KTDWRY.getCode());
proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.KTDWGL.getCode());
}else if(Objects.equals(SubDeptsEnums.SJDW.getCode(),subDeptType)){
sysUser.setUserType(UserTypeEnums.SJDWRY.getCode());
proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.SJDWGL.getCode());
}else if(Objects.equals(SubDeptsEnums.QTDW.getCode(),subDeptType)){
sysUser.setUserType(UserTypeEnums.OTHERS.getCode());
proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.QTDWGL.getCode());
}
}
sysUser.setActiveProjectId(proProjectInfoSubdeptsUsers.getProjectId());
remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER).getData();
ProProjectInfoSubdeptsUsers old = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersById(proProjectInfoSubdeptsUsers.getId());
proProjectInfoSubdeptsUsers.setUpdateBy(SecurityUtils.getUsername());
proProjectInfoSubdeptsUsers.setUpdateTime(DateUtils.getNowDate());
proProjectInfoSubdeptsUsers.setAdmitGuid(old.getAdmitGuid());
proProjectInfoSubdeptsUsers.setFaceGuid(old.getFaceGuid());
proProjectInfoSubdeptsUsers.setUserId(old.getUserId());
uniService.syncUniUser(proProjectInfoSubdeptsUsers);
if(!Objects.equals(old.getUserPost(),proProjectInfoSubdeptsUsers.getUserPost())){
String userPost = proProjectInfoSubdeptsUsers.getUserPost();
if(Objects.equals(UserPostEnums.WTDL.getCode(),userPost) || Objects.equals(UserPostEnums.XMJL.getCode(),userPost) || Objects.equals(UserPostEnums.BZZ.getCode(),userPost)){
// 生成二维码
try {
String accessToken = wxMaService.getAccessToken();
String filePath = DateUtils.datePath()+"/"+System.currentTimeMillis()+".png";
String savePath = ProfileConfig.profilePath+"/"+filePath;
String profilePath = ProfileConfig.profile+"/"+filePath;
log.info("accessToken...{}",accessToken);
// 生成二维码
if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(), UserPostEnums.WTDL.getCode())){
File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=2&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(),280);
FileUtil.copyFile(file,new File(savePath));
}else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(), UserPostEnums.XMJL.getCode())){
File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=3&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(),280);
FileUtil.copyFile(file,new File(savePath));
}else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(), UserPostEnums.BZZ.getCode())){
File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=4&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(),280);
FileUtil.copyFile(file,new File(savePath));
}
proProjectInfoSubdeptsUsers.setQrCode(profilePath);
return proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers);
}catch (Exception e){
log.error(e.getMessage());
}
}
}
return proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers);
}

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

@ -191,6 +191,9 @@ Page({
"id": "4",
"text": "劳务人员"
});
this.setData({
"form.craftType": '1'
});
}
this.setData({
title,
@ -1620,9 +1623,14 @@ if (this.data.userPost == "1") {
if (_form.proProjectInfoSubdeptsUsers && _form.proProjectInfoSubdeptsUsers.userInfos) {
_form.proProjectInfoSubdeptsUsers.userInfos = JSON.stringify(_form.proProjectInfoSubdeptsUsers.userInfos);
}
wx.showLoading({mask: true,title: '正在处理'});
wx.showLoading({
mask: true,
title: '正在处理'
});
registerSubDepts(_form).then(res => {
wx.hideLoading({success: (r) => {}});
wx.hideLoading({
success: (r) => {}
});
if (res.code == 200) {
this.setData({
"form.id": res.data.id,
@ -1823,9 +1831,14 @@ if (this.data.userPost == "1") {
userInfos.cardImgPos = _form.cardImgPos;
userInfos.cardImgInv = _form.cardImgInv;
_form.userInfos = JSON.stringify(userInfos);
wx.showLoading({mask: true,title: '正在处理'});
wx.showLoading({
mask: true,
title: '正在处理'
});
registerSubDeptsUsers(_form).then(res => {
wx.hideLoading({success: (res) => {}});
wx.hideLoading({
success: (res) => {}
});
if (res.code == 200) {
this.setData({
"form.id": res.data.id,
@ -2033,7 +2046,9 @@ if (this.data.userPost == "1") {
* 立即登录
*/
wxSignLogin() {
wxNumberLogin({'username':this.data.userPhoneNumber}).then(res =>{
wxNumberLogin({
'username': this.data.userPhoneNumber
}).then(res => {
setToken(res.data.access_token);
this.getUserInfoByCache();
})

6
yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue
View File

@ -128,11 +128,11 @@
<el-button v-if="scope.row.subDeptType != '4' && scope.row.subDeptType != '5'" link disabled> - </el-button>
</template>
</el-table-column>
<el-table-column label="人员岗位" align="center" prop="craftPost">
<!-- <el-table-column label="人员岗位" align="center" prop="craftPost">
<template #default="scope">
{{ getWorkType(scope.row.workType) }}
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="状态" align="center" prop="useStatus">
<template #default="scope">
<span v-if="scope.row.useStatus == 0" style="color: green;">在场</span>
@ -385,7 +385,7 @@ const data = reactive({
userWorkType: null,
workType: null,
activeTags:"finished",
searchValue:"pt1"
searchValue:"active1"
},
rules: {
subDeptId: [{ required: true, trigger: ['blur', 'change'], message: "请选择所属单位" }],

2
yanzhu-ui-vue3/src/views/system/user/index.vue
View File

@ -150,7 +150,7 @@
<el-form-item label="用户类型" prop="userType">
<el-select v-model="form.userType" placeholder="请选择用户类型" style="width: 100%"
@change="doRoleChange">
<el-option v-for="dict in sys_user_type" :key="dict.value" :label="dict.label"
<el-option v-for="dict in sys_user_type" v-show="dict.value != '99'" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>