提交代码

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java

@@ -19,7 +19,6 @@ import com.yanzhu.manage.mapper.ProProjectInfoDeptsMapper;
 import com.yanzhu.manage.mapper.ProProjectInfoMapper;
 import com.yanzhu.manage.mapper.ProProjectInfoSettingMapper;
 import com.yanzhu.manage.service.IProProjectInfoService;
-import com.yanzhu.manage.utils.WxQrCodeUtils;
 import com.yanzhu.manage.utils.pdf.FileUtil;
 import com.yanzhu.system.api.RemoteDeptService;
 import com.yanzhu.system.api.domain.SysDept;

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java

@@ -110,6 +110,8 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu
         // 班组组长信息
         if(res>0 && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderName()) && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderCode()) && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderPhone())){
             SysUser sysUser = new SysUser();
+            sysUser.setComId(info.getComId());
+            sysUser.setDeptId(info.getId());
             sysUser.setUserName(proProjectInfoSubdeptsGroup.getGroupLeaderPhone());
             sysUser.setNickName(proProjectInfoSubdeptsGroup.getGroupLeaderName());
             sysUser.setPhonenumber(proProjectInfoSubdeptsGroup.getGroupLeaderPhone());
@@ -195,6 +197,8 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu
         // 班组组长信息
         if(res>0 && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderName()) && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderCode()) && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderPhone())){
             SysUser sysUser = new SysUser();
+            sysUser.setComId(proProjectInfoSubdeptsGroup.getComId());
+            sysUser.setDeptId(proProjectInfoSubdeptsGroup.getId());
             sysUser.setUserName(proProjectInfoSubdeptsGroup.getGroupLeaderPhone());
             sysUser.setNickName(proProjectInfoSubdeptsGroup.getGroupLeaderName());
             sysUser.setPhonenumber(proProjectInfoSubdeptsGroup.getGroupLeaderPhone());
@@ -375,6 +379,8 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu
                 // 修改用户角色信息
                 try {
                     SysUser sysUser = new SysUser();
+                    sysUser.setComId(proProjectInfoSubdeptsUsers.getComId());
+                    sysUser.setDeptId(proProjectInfoSubdeptsUsers.getProjectId());
                     sysUser.setUserName(entiry.getGroupLeaderPhone());
                     sysUser.setUserType(UserTypeEnums.FBBZZZ.getCode());
                     sysUser.setNickName(entiry.getGroupLeaderName());

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

@@ -111,6 +111,8 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept
             // 单位委托人信息
             if(StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderName()) && StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderCode()) && StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderPhone())){
                 SysUser sysUser = new SysUser();
+                sysUser.setComId(info.getComId());
+                sysUser.setDeptId(info.getId());
                 sysUser.setUserName(proProjectInfoSubdepts.getSubDeptLeaderPhone());
                 sysUser.setNickName(proProjectInfoSubdepts.getSubDeptLeaderName());
                 sysUser.setPhonenumber(proProjectInfoSubdepts.getSubDeptLeaderPhone());
@@ -224,6 +226,8 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept
             // 单位委托人信息
             if(StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderName()) && StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderCode()) && StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderPhone())){
                 SysUser sysUser = new SysUser();
+                sysUser.setComId(info.getComId());
+                sysUser.setDeptId(info.getId());
                 sysUser.setUserName(proProjectInfoSubdepts.getSubDeptLeaderPhone());
                 sysUser.setNickName(proProjectInfoSubdepts.getSubDeptLeaderName());
                 sysUser.setUserType(UserTypeEnums.FBWTDL.getCode());

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

@@ -132,6 +132,8 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
         proProjectInfoSubdeptsUsers.setApproveStatus(ApproveStatus.passed.getCode());
 
         SysUser sysUser = new SysUser();
+        sysUser.setComId(proProjectInfoSubdeptsUsers.getComId());
+        sysUser.setDeptId(proProjectInfoSubdeptsUsers.getProjectId());
         sysUser.setUserName(proProjectInfoSubdeptsUsers.getUserPhone());
         sysUser.setNickName(proProjectInfoSubdeptsUsers.getUserName());
         sysUser.setPhonenumber(proProjectInfoSubdeptsUsers.getUserPhone());
@@ -368,6 +370,8 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
             }
         }
 
+        sysUser.setComId(proProjectInfoSubdeptsUsers.getComId());
+        sysUser.setDeptId(proProjectInfoSubdeptsUsers.getProjectId());
         sysUser.setUserName(proProjectInfoSubdeptsUsers.getUserPhone());
         sysUser.setNickName(proProjectInfoSubdeptsUsers.getUserName());
         sysUser.setPhonenumber(proProjectInfoSubdeptsUsers.getUserPhone());
@@ -530,6 +534,9 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
                 sysUser.setUserType(UserTypeEnums.FBLWRY.getCode());
             }
         }
+
+        sysUser.setComId(proProjectInfoSubdeptsUsers.getComId());
+        sysUser.setDeptId(proProjectInfoSubdeptsUsers.getProjectId());
         sysUser.setUserName(proProjectInfoSubdeptsUsers.getUserPhone());
         sysUser.setNickName(proProjectInfoSubdeptsUsers.getUserName());
         sysUser.setPhonenumber(proProjectInfoSubdeptsUsers.getUserPhone());

yanzhu-ui-app/miniprogram/config.js

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

yanzhu-ui-app/miniprogram/pages/project_info/index.js

@@ -472,7 +472,7 @@ Page({
      */
     getProjectDepts: function (proId) {
         findProjectDepts(proId).then(res => {
-            that.setData({
+            this.setData({
                 projectDeptsList: res.data
             })
         });

yanzhu-ui-app/miniprogram/pages/project_more/index.js

@@ -4,6 +4,9 @@ import {
 import {
   findUserMenuList
 } from '../../api/publics'
+import {
+  findProSubDeptsUserByParams
+} from '../../api/project'
 import {
   findMyTask
 } from '../../api/flowable'

yanzhu-ui-app/miniprogram/pages/sign_mags/index.wxss

@@ -248,4 +248,25 @@
 .qrcode image{
 	width: 100px;
 	height: 100px;
-}
+}
+
+.sign_div{
+	padding: 20rpx 0;
+	height: 170rpx;
+  }
+  .sign_div_min{
+   padding: 20rpx;
+   height: 150rpx;
+   background:#f4f4f4;
+   border-radius: 15rpx;
+   line-height: 150rpx;
+   color: #aaa;
+  }
+
+  .qm_img{
+	height: 300rpx;
+	width: 150rpx;
+	position: relative;
+	top: -75rpx;
+	transform: rotate(270deg); 
+  }

yanzhu-ui-app/miniprogram/project.private.config.json

@@ -11,7 +11,7 @@
                 {
                     "name": "pages/project_qr/index",
                     "pathName": "pages/project_qr/index",
-                    "query": "QRPID=116&SIGID=2&PARID=10",
+                    "query": "QRPID=116&SIGID=1",
                     "launchMode": "default",
                     "scene": null
                 },