diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/SurProjectAttendanceGroup.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/SurProjectAttendanceGroup.java index eb66f81e..596e769f 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/SurProjectAttendanceGroup.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/SurProjectAttendanceGroup.java @@ -69,7 +69,7 @@ public class SurProjectAttendanceGroup extends JhBaseEntity /** 队伍Id */ @Excel(name = "队伍Id") - private Long teamId; + private String teamId; /** 队伍名称 */ @Excel(name = "队伍名称") @@ -172,7 +172,7 @@ public class SurProjectAttendanceGroup extends JhBaseEntity g.name=json.getString("name"); g.leaderName=json.getString("leaderName"); g.leaderPhone=json.getString("leaderPhone"); - g.teamId=json.getLongValue("teamId",0); + g.teamId=json.getString("teamId"); g.teamName=json.getString("teamName"); g.type=json.getLongValue("type",0); g.leaderId=json.getLongValue("leaderId",0); @@ -294,12 +294,12 @@ public class SurProjectAttendanceGroup extends JhBaseEntity { return leaderPhone; } - public void setTeamId(Long teamId) + public void setTeamId(String teamId) { this.teamId = teamId; } - public Long getTeamId() + public String getTeamId() { return teamId; } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/SurProjectAttendanceUserMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/SurProjectAttendanceUserMapper.xml index b5cbfad1..1f0d1acd 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/SurProjectAttendanceUserMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/SurProjectAttendanceUserMapper.xml @@ -289,7 +289,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select u.companyId,u.companyName,u.`name`,u.recentPhoto,u.gender,u.birthDate,u.ethnic,u.nativePlace,u.phone, u.workTypeName,u.specWorkType,u.groupName,g.companyTypeId,u.workTypeCode from sur_project_attendance_user u - left join sur_project_attendance_group g on u.groupId=g.teamId and g.cfgid = u.cfgid + left join sur_project_attendance_group g on u.groupId=g.serverid and g.cfgid = u.cfgid where u.cfgid=#{cfgid} and u.workerId=#{workerId} @@ -297,7 +297,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select u.companyId,g.companyName,u.`name`,u.recentPhoto,u.gender,u.birthDate,u.ethnic,u.nativePlace,u.phone, u.workTypeName,u.specWorkType,u.groupName,g.companyTypeId,u.workTypeCode from sur_project_attendance_user u - left join sur_project_attendance_group g on u.groupId=g.teamId and g.cfgid = u.cfgid + left join sur_project_attendance_group g on u.groupId=g.serverid and g.cfgid = u.cfgid where u.cfgid=#{cfgid} and u.workerId=#{workerId} ORDER BY u.id desc LIMIT 1 diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/WxMenuConfigMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/WxMenuConfigMapper.xml index 2e3e93ce..89eb7a3e 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/WxMenuConfigMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/WxMenuConfigMapper.xml @@ -140,7 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join wx_menu_config_role smcr on smcr.smcid = smc.id left join sys_user_role ur on ur.role_id = smcr.role_id where smc.del_flag = 0 - and (ur.user_id = #{currentUserId} or smc.menu_identi='GRQMPZ') + and ur.user_id = #{currentUserId} and smc.project_id = #{activeProjectId} and smc.menu_type = #{menuType} order by smc.menu_sort asc diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/LabourApiController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/LabourApiController.java index 9bd95f68..de6cbd9b 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/LabourApiController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/LabourApiController.java @@ -156,6 +156,7 @@ public class LabourApiController extends BaseController { surProjectAttendanceGroup.setCompanyTypeId(req.getCompanyTypeId()); surProjectAttendanceGroup.setName(req.getName()); surProjectAttendanceGroup.setLeaderName(req.getLeaderName()); + surProjectAttendanceGroup.setLeaderPhone(req.getLeaderPhone()); surProjectAttendanceGroup.setType(req.getType()); surProjectAttendanceGroup.setEnterDate(req.getEnterDate()); @@ -173,6 +174,7 @@ public class LabourApiController extends BaseController { surProjectAttendanceGroup.setCompanyCode(req.getCompanyCode()); surProjectAttendanceGroup.setCompanyName(req.getCompanyName()); surProjectAttendanceGroup.setCompanyTypeId(req.getCompanyTypeId()); + surProjectAttendanceGroup.setTeamId(req.getServerid()); surProjectAttendanceGroup.setName(req.getName()); surProjectAttendanceGroup.setLeaderName(req.getLeaderName()); surProjectAttendanceGroup.setLeaderPhone(req.getLeaderPhone()); diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/vo/LabourUserReqVo.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/vo/LabourUserReqVo.java index 6d23f482..28e63e40 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/vo/LabourUserReqVo.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/vo/LabourUserReqVo.java @@ -71,8 +71,7 @@ public class LabourUserReqVo { @NotNull(message = "进场日期不能为空") private String enterDate; - /** 进场日期 */ - @NotNull(message = "进场日期不能为空") + /** 离场日期 */ private String exitDate; /** 分包商id */ diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WXPublicController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WXPublicController.java index a2657a58..c4cdf522 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WXPublicController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WXPublicController.java @@ -8,6 +8,7 @@ import com.yanzhu.common.security.utils.SecurityUtils; import com.yanzhu.manage.domain.WxMenuConfig; import com.yanzhu.manage.service.IWxMenuConfigService; import com.yanzhu.system.api.domain.SysUser; +import com.yanzhu.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -40,9 +41,9 @@ public class WXPublicController extends BaseController { */ @GetMapping("/v1/findUserMenuList/{proId}") public AjaxResult findUserMenuList(@PathVariable("proId") Long proId, String menuType){ + LoginUser loginUser = SecurityUtils.getLoginUser(); //设置缓存 - SysUser sysUser = SecurityUtils.getLoginUser().getSysUser(); - String key="wxPublic_findUserMenuList-"+sysUser.getUserId()+"-"+proId+"-"+menuType; + String key="wxPublic_findUserMenuList-"+loginUser.getUserid()+"-"+proId+"-"+menuType; Object obj=redisService.getCacheObject(key); if(obj!=null){ return success(obj); @@ -50,7 +51,13 @@ public class WXPublicController extends BaseController { WxMenuConfig query = new WxMenuConfig(); query.setActiveProjectId(proId); query.setMenuType(menuType); - query.setCurrentUserId(sysUser.getUserId()); + System.out.println("findUserMenuList..."); + if(!SecurityUtils.isAdmin(loginUser.getUserid()) && !SecurityUtils.isGSAdmin()){ + query.setCurrentUserId(loginUser.getUserid()); + System.out.println("findUserMenuList...111"); + }else{ + System.out.println("findUserMenuList...222"); + } List list = wxMenuConfigService.findUserMenuList(query); redisService.setCacheObject(key, list, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES); return success(list); diff --git a/yanzhu-ui-app/miniprogram/config.js b/yanzhu-ui-app/miniprogram/config.js index e3b3ac1e..071cc4f1 100644 --- a/yanzhu-ui-app/miniprogram/config.js +++ b/yanzhu-ui-app/miniprogram/config.js @@ -2,11 +2,11 @@ module.exports = { timeout: 60000, appId: "wx007a8fd50dc185b2", - //baseUrl: "https://xiangguan.sxyanzhu.com/wechat", - baseUrl: "https://jaszpt.crfeb.com.cn/wechat", + baseUrl: "https://xiangguan.sxyanzhu.com/wechat", + //baseUrl: "https://jaszpt.crfeb.com.cn/wechat", //baseUrl: "http://127.0.0.1:8080", - //baseImgUrl: "https://xiangguan.sxyanzhu.com", - baseImgUrl: "https://jaszpt.crfeb.com.cn", + baseImgUrl: "https://xiangguan.sxyanzhu.com", + //baseImgUrl: "https://jaszpt.crfeb.com.cn", //baseImgUrl: 'http://127.0.0.1:9300', noSecuritys: [ "/code", diff --git a/yanzhu-ui-app/miniprogram/project.config.json b/yanzhu-ui-app/miniprogram/project.config.json index ef43a27d..bed0f59f 100644 --- a/yanzhu-ui-app/miniprogram/project.config.json +++ b/yanzhu-ui-app/miniprogram/project.config.json @@ -1,43 +1,43 @@ { - "appid": "wx007a8fd50dc185b2", - "compileType": "miniprogram", - "libVersion": "3.8.9", - "packOptions": { - "ignore": [], - "include": [] - }, - "setting": { - "coverView": true, - "es6": true, - "postcss": true, - "minified": true, - "enhance": true, - "showShadowRootInWxmlPanel": true, - "packNpmRelationList": [], - "babelSetting": { - "ignore": [], - "disablePlugins": [], - "outputPath": "" + "appid": "wx46466c7828eede2b", + "compileType": "miniprogram", + "libVersion": "3.8.9", + "packOptions": { + "ignore": [], + "include": [] }, - "ignoreDevUnusedFiles": false, - "ignoreUploadUnusedFiles": false, - "condition": false, - "compileWorklet": false, - "uglifyFileName": false, - "uploadWithSourceMap": true, - "packNpmManually": false, - "minifyWXSS": true, - "minifyWXML": true, - "localPlugins": false, - "disableUseStrict": false, - "useCompilerPlugins": false, - "swc": false, - "disableSWC": true - }, - "condition": {}, - "editorSetting": { - "tabIndent": "auto", - "tabSize": 4 - }, - "simulatorPluginLibVersion": {} + "setting": { + "coverView": true, + "es6": true, + "postcss": true, + "minified": true, + "enhance": true, + "showShadowRootInWxmlPanel": true, + "packNpmRelationList": [], + "babelSetting": { + "ignore": [], + "disablePlugins": [], + "outputPath": "" + }, + "ignoreDevUnusedFiles": false, + "ignoreUploadUnusedFiles": false, + "condition": false, + "compileWorklet": false, + "uglifyFileName": false, + "uploadWithSourceMap": true, + "packNpmManually": false, + "minifyWXSS": true, + "minifyWXML": true, + "localPlugins": false, + "disableUseStrict": false, + "useCompilerPlugins": false, + "swc": false, + "disableSWC": true + }, + "condition": {}, + "editorSetting": { + "tabIndent": "auto", + "tabSize": 4 + }, + "simulatorPluginLibVersion": {} } \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/project.private.config.json b/yanzhu-ui-app/miniprogram/project.private.config.json index 25b6fca5..2dfbb47b 100644 --- a/yanzhu-ui-app/miniprogram/project.private.config.json +++ b/yanzhu-ui-app/miniprogram/project.private.config.json @@ -1,24 +1,24 @@ { - "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", - "projectname": "miniprogram", - "setting": { - "compileHotReLoad": true, - "urlCheck": false, - "coverView": true, - "lazyloadPlaceholderEnable": false, - "skylineRenderEnable": false, - "preloadBackgroundData": false, - "autoAudits": false, - "useApiHook": true, - "useApiHostProcess": true, - "showShadowRootInWxmlPanel": true, - "useStaticServer": false, - "useLanDebug": false, - "showES6CompileOption": false, - "checkInvalidKey": true, - "ignoreDevUnusedFiles": true, - "bigPackageSizeSupport": false - }, - "condition": {}, - "libVersion": "3.8.9" + "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", + "projectname": "miniprogram", + "setting": { + "compileHotReLoad": true, + "urlCheck": false, + "coverView": true, + "lazyloadPlaceholderEnable": false, + "skylineRenderEnable": false, + "preloadBackgroundData": false, + "autoAudits": false, + "useApiHook": true, + "useApiHostProcess": true, + "showShadowRootInWxmlPanel": true, + "useStaticServer": false, + "useLanDebug": false, + "showES6CompileOption": false, + "checkInvalidKey": true, + "ignoreDevUnusedFiles": true, + "bigPackageSizeSupport": false + }, + "condition": {}, + "libVersion": "3.8.9" } \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/views/device/pitDevice/index.vue b/yanzhu-ui-vue3/src/views/device/pitDevice/index.vue index 3ec471ad..a67645b6 100644 --- a/yanzhu-ui-vue3/src/views/device/pitDevice/index.vue +++ b/yanzhu-ui-vue3/src/views/device/pitDevice/index.vue @@ -14,7 +14,6 @@ - @@ -26,7 +25,6 @@ - 搜索 重置 diff --git a/yanzhu-ui-vue3/vite.config.js b/yanzhu-ui-vue3/vite.config.js index 542f0128..61a7446e 100644 --- a/yanzhu-ui-vue3/vite.config.js +++ b/yanzhu-ui-vue3/vite.config.js @@ -39,8 +39,8 @@ export default defineConfig(({ mode, command }) => { }, // https://cn.vitejs.dev/config/#server-proxy "/dev-api": { - target: "http://localhost:8080", - //target: "http://62.234.3.186", + //target: "http://localhost:8080", + target: "http://62.234.3.186", changeOrigin: true, rewrite: (p) => p.replace(/^\/dev-api/, ""), },