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

提交代码

dev_xd
姜玉琦 2025-03-05 23:45:37 +08:00
parent f3735dbced
commit 0b340003f3
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
package com.yanzhu.manage.service.impl; package com.yanzhu.manage.service.impl;
import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.api.WxMaService;
import com.alibaba.fastjson.JSON;
import com.yanzhu.common.core.constant.SecurityConstants; import com.yanzhu.common.core.constant.SecurityConstants;
import com.yanzhu.common.core.enums.*; import com.yanzhu.common.core.enums.*;
import com.yanzhu.common.core.exception.ServiceException; import com.yanzhu.common.core.exception.ServiceException;
@ -394,7 +395,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
proSubdeptsGroup.setSubDeptName(proProjectInfoSubdeptsUsers.getSubDeptName()); proSubdeptsGroup.setSubDeptName(proProjectInfoSubdeptsUsers.getSubDeptName());
proSubdeptsGroup.setSubDeptType(proProjectInfoSubdeptsUsers.getSubDeptType()); proSubdeptsGroup.setSubDeptType(proProjectInfoSubdeptsUsers.getSubDeptType());
int count = proSubdeptsGroupList.size()+1; int count = proSubdeptsGroupList.size()+1;
String pre = Objects.equals(proProjectInfoSubdeptsUsers.getCraftType(), CraftTypeEnums.PYGZ.getCode())?"普通":"特殊"; String pre = "普通";
String craftPostName = DictUtils.getDictLabel("pro_craft_post",proProjectInfoSubdeptsUsers.getCraftPost()); String craftPostName = DictUtils.getDictLabel("pro_craft_post",proProjectInfoSubdeptsUsers.getCraftPost());
proSubdeptsGroup.setGroupName(pre+craftPostName+"班组"+count); proSubdeptsGroup.setGroupName(pre+craftPostName+"班组"+count);
proSubdeptsGroup.setCraftType(proProjectInfoSubdeptsUsers.getCraftType()); proSubdeptsGroup.setCraftType(proProjectInfoSubdeptsUsers.getCraftType());
@ -472,9 +473,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
sysUser.setUpdateBy(SecurityUtils.getUsername()); sysUser.setUpdateBy(SecurityUtils.getUsername());
sysUser.setUpdateTime(DateUtils.getNowDate()); sysUser.setUpdateTime(DateUtils.getNowDate());
sysUser.setRemark(proProjectInfoSubdeptsUsers.getSubDeptName()); sysUser.setRemark(proProjectInfoSubdeptsUsers.getSubDeptName());
log.info("insertProProjectInfoSubdeptsUsersWX==>{}",sysUser.getUserName());
Long userId = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER).getData(); Long userId = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER).getData();
log.info("insertProProjectInfoSubdeptsUsersWX==>{}",userId);
proProjectInfoSubdeptsUsers.setUserId(userId); proProjectInfoSubdeptsUsers.setUserId(userId);
proProjectInfoSubdeptsUsersMapper.insertProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); proProjectInfoSubdeptsUsersMapper.insertProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers);
return proProjectInfoSubdeptsUsers; return proProjectInfoSubdeptsUsers;
@ -615,7 +614,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
proProjectInfoSubdeptsMapper.updatePhone(entity.getUserPhone(),proProjectInfoSubdeptsUsers.getUserPhone()); proProjectInfoSubdeptsMapper.updatePhone(entity.getUserPhone(),proProjectInfoSubdeptsUsers.getUserPhone());
proProjectInfoSubdeptsGroupMapper.updatePhone(entity.getUserPhone(),proProjectInfoSubdeptsUsers.getUserPhone()); proProjectInfoSubdeptsGroupMapper.updatePhone(entity.getUserPhone(),proProjectInfoSubdeptsUsers.getUserPhone());
proProjectInfoSubdeptsUsersMapper.updatePhone(entity.getUserPhone(),proProjectInfoSubdeptsUsers.getUserPhone()); proProjectInfoSubdeptsUsersMapper.updatePhone(entity.getUserPhone(),proProjectInfoSubdeptsUsers.getUserPhone());
proProjectInfoSubdeptsUsersMapper.updatePhone(entity.getUserPhone(),proProjectInfoSubdeptsUsers.getUserPhone()); proProjectInfoSubdeptsUsersMapper.updateUserPhone(entity.getUserPhone(),proProjectInfoSubdeptsUsers.getUserPhone());
} }
/**updateUserPhone /**updateUserPhone
@ -628,7 +627,6 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
@Transactional @Transactional
public ProProjectInfoSubdeptsUsers updateProProjectInfoSubdeptsUsersWX(ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers) public ProProjectInfoSubdeptsUsers updateProProjectInfoSubdeptsUsersWX(ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers)
{ {
log.info("updateProProjectInfoSubdeptsUsersWX==>");
ProProjectInfoSubdeptsUsers parUsers = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersById(proProjectInfoSubdeptsUsers.getParId()); ProProjectInfoSubdeptsUsers parUsers = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersById(proProjectInfoSubdeptsUsers.getParId());
if(Objects.isNull(parUsers)){ if(Objects.isNull(parUsers)){
throw new ServiceException("用户信息异常...请重新扫码"); throw new ServiceException("用户信息异常...请重新扫码");

8
yanzhu-ui-app/miniprogram/config.js
View File

@ -2,10 +2,10 @@
module.exports = { module.exports = {
timeout: 60000, timeout: 60000,
appId: "wx46466c7828eede2b", appId: "wx46466c7828eede2b",
//baseUrl: 'https://xiangguan.sxyanzhu.com', baseUrl: 'https://xiangguan.sxyanzhu.com',
baseUrl: 'http://127.0.0.1:8080', //baseUrl: 'http://127.0.0.1:8080',
//baseImgUrl: 'https://xiangguan.sxyanzhu.com', baseImgUrl: 'https://xiangguan.sxyanzhu.com',
//baseImgUrl: 'https:xiangguan.sxyanzhu.com/file', //baseImgUrl: 'https:xiangguan.sxyanzhu.com/file',
baseImgUrl: 'http://127.0.0.1:9300', //baseImgUrl: 'http://127.0.0.1:9300',
noSecuritys:['/code','/auth/wxLogin','/auth/getMaOpenId','/auth/getMaPhoneNumber','/auth/maLogin'] noSecuritys:['/code','/auth/wxLogin','/auth/getMaOpenId','/auth/getMaPhoneNumber','/auth/maLogin']
}; };