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

Merge remote-tracking branch 'origin/dev_xd' into dev_xd

dev_xd
lj7788@126.com 2025-09-28 17:34:34 +08:00
parent 5f7273b6e2 47887ae5ce
commit 2b6a50da17
11 changed files with 88 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/SurProjectAttendanceGroup.java
View File

@ -69,7 +69,7 @@ public class SurProjectAttendanceGroup extends JhBaseEntity
/** 队伍Id */ /** 队伍Id */
@Excel(name = "队伍Id") @Excel(name = "队伍Id")
private Long teamId; private String teamId;
/** 队伍名称 */ /** 队伍名称 */
@Excel(name = "队伍名称") @Excel(name = "队伍名称")
@ -172,7 +172,7 @@ public class SurProjectAttendanceGroup extends JhBaseEntity
g.name=json.getString("name"); g.name=json.getString("name");
g.leaderName=json.getString("leaderName"); g.leaderName=json.getString("leaderName");
g.leaderPhone=json.getString("leaderPhone"); g.leaderPhone=json.getString("leaderPhone");
g.teamId=json.getLongValue("teamId",0); g.teamId=json.getString("teamId");
g.teamName=json.getString("teamName"); g.teamName=json.getString("teamName");
g.type=json.getLongValue("type",0); g.type=json.getLongValue("type",0);
g.leaderId=json.getLongValue("leaderId",0); g.leaderId=json.getLongValue("leaderId",0);
@ -294,12 +294,12 @@ public class SurProjectAttendanceGroup extends JhBaseEntity
{ {
return leaderPhone; return leaderPhone;
} }
public void setTeamId(Long teamId) public void setTeamId(String teamId)
{ {
this.teamId = teamId; this.teamId = teamId;
} }
public Long getTeamId() public String getTeamId()
{ {
return teamId; return teamId;
} }

4
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/SurProjectAttendanceUserMapper.xml
View File

@ -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, 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 u.workTypeName,u.specWorkType,u.groupName,g.companyTypeId,u.workTypeCode
from sur_project_attendance_user u 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} where u.cfgid=#{cfgid} and u.workerId=#{workerId}
</select> </select>
@ -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, 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 u.workTypeName,u.specWorkType,u.groupName,g.companyTypeId,u.workTypeCode
from sur_project_attendance_user u 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 where u.cfgid=#{cfgid} and u.workerId=#{workerId} ORDER BY u.id desc LIMIT 1
</select> </select>

2
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/WxMenuConfigMapper.xml
View File

@ -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 wx_menu_config_role smcr on smcr.smcid = smc.id
left join sys_user_role ur on ur.role_id = smcr.role_id left join sys_user_role ur on ur.role_id = smcr.role_id
where smc.del_flag = 0 where smc.del_flag = 0
and (ur.user_id = #{currentUserId} or smc.menu_identi='GRQMPZ') <if test="currentUserId != null"> and ur.user_id = #{currentUserId}</if>
<if test="activeProjectId != null"> and smc.project_id = #{activeProjectId}</if> <if test="activeProjectId != null"> and smc.project_id = #{activeProjectId}</if>
<if test="menuType != null and menuType != ''"> and smc.menu_type = #{menuType}</if> <if test="menuType != null and menuType != ''"> and smc.menu_type = #{menuType}</if>
order by smc.menu_sort asc order by smc.menu_sort asc

2
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/LabourApiController.java
View File

@ -156,6 +156,7 @@ public class LabourApiController extends BaseController {
surProjectAttendanceGroup.setCompanyTypeId(req.getCompanyTypeId()); surProjectAttendanceGroup.setCompanyTypeId(req.getCompanyTypeId());
surProjectAttendanceGroup.setName(req.getName()); surProjectAttendanceGroup.setName(req.getName());
surProjectAttendanceGroup.setLeaderName(req.getLeaderName()); surProjectAttendanceGroup.setLeaderName(req.getLeaderName());
surProjectAttendanceGroup.setLeaderPhone(req.getLeaderPhone()); surProjectAttendanceGroup.setLeaderPhone(req.getLeaderPhone());
surProjectAttendanceGroup.setType(req.getType()); surProjectAttendanceGroup.setType(req.getType());
surProjectAttendanceGroup.setEnterDate(req.getEnterDate()); surProjectAttendanceGroup.setEnterDate(req.getEnterDate());
@ -173,6 +174,7 @@ public class LabourApiController extends BaseController {
surProjectAttendanceGroup.setCompanyCode(req.getCompanyCode()); surProjectAttendanceGroup.setCompanyCode(req.getCompanyCode());
surProjectAttendanceGroup.setCompanyName(req.getCompanyName()); surProjectAttendanceGroup.setCompanyName(req.getCompanyName());
surProjectAttendanceGroup.setCompanyTypeId(req.getCompanyTypeId()); surProjectAttendanceGroup.setCompanyTypeId(req.getCompanyTypeId());
surProjectAttendanceGroup.setTeamId(req.getServerid());
surProjectAttendanceGroup.setName(req.getName()); surProjectAttendanceGroup.setName(req.getName());
surProjectAttendanceGroup.setLeaderName(req.getLeaderName()); surProjectAttendanceGroup.setLeaderName(req.getLeaderName());
surProjectAttendanceGroup.setLeaderPhone(req.getLeaderPhone()); surProjectAttendanceGroup.setLeaderPhone(req.getLeaderPhone());

3
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/vo/LabourUserReqVo.java
View File

@ -71,8 +71,7 @@ public class LabourUserReqVo {
@NotNull(message = "进场日期不能为空") @NotNull(message = "进场日期不能为空")
private String enterDate; private String enterDate;
/** 进场日期 */ /** 离场日期 */
@NotNull(message = "进场日期不能为空")
private String exitDate; private String exitDate;
/** 分包商id */ /** 分包商id */

13
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WXPublicController.java
View File

@ -8,6 +8,7 @@ import com.yanzhu.common.security.utils.SecurityUtils;
import com.yanzhu.manage.domain.WxMenuConfig; import com.yanzhu.manage.domain.WxMenuConfig;
import com.yanzhu.manage.service.IWxMenuConfigService; import com.yanzhu.manage.service.IWxMenuConfigService;
import com.yanzhu.system.api.domain.SysUser; import com.yanzhu.system.api.domain.SysUser;
import com.yanzhu.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
@ -40,9 +41,9 @@ public class WXPublicController extends BaseController {
*/ */
@GetMapping("/v1/findUserMenuList/{proId}") @GetMapping("/v1/findUserMenuList/{proId}")
public AjaxResult findUserMenuList(@PathVariable("proId") Long proId, String menuType){ public AjaxResult findUserMenuList(@PathVariable("proId") Long proId, String menuType){
LoginUser loginUser = SecurityUtils.getLoginUser();
//设置缓存 //设置缓存
SysUser sysUser = SecurityUtils.getLoginUser().getSysUser(); String key="wxPublic_findUserMenuList-"+loginUser.getUserid()+"-"+proId+"-"+menuType;
String key="wxPublic_findUserMenuList-"+sysUser.getUserId()+"-"+proId+"-"+menuType;
Object obj=redisService.getCacheObject(key); Object obj=redisService.getCacheObject(key);
if(obj!=null){ if(obj!=null){
return success(obj); return success(obj);
@ -50,7 +51,13 @@ public class WXPublicController extends BaseController {
WxMenuConfig query = new WxMenuConfig(); WxMenuConfig query = new WxMenuConfig();
query.setActiveProjectId(proId); query.setActiveProjectId(proId);
query.setMenuType(menuType); 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<WxMenuConfig> list = wxMenuConfigService.findUserMenuList(query); List<WxMenuConfig> list = wxMenuConfigService.findUserMenuList(query);
redisService.setCacheObject(key, list, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES); redisService.setCacheObject(key, list, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
return success(list); return success(list);

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

@ -2,11 +2,11 @@
module.exports = { module.exports = {
timeout: 60000, timeout: 60000,
appId: "wx007a8fd50dc185b2", appId: "wx007a8fd50dc185b2",
//baseUrl: "https://xiangguan.sxyanzhu.com/wechat", baseUrl: "https://xiangguan.sxyanzhu.com/wechat",
baseUrl: "https://jaszpt.crfeb.com.cn/wechat", //baseUrl: "https://jaszpt.crfeb.com.cn/wechat",
//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://jaszpt.crfeb.com.cn", //baseImgUrl: "https://jaszpt.crfeb.com.cn",
//baseImgUrl: 'http://127.0.0.1:9300', //baseImgUrl: 'http://127.0.0.1:9300',
noSecuritys: [ noSecuritys: [
"/code", "/code",

80
yanzhu-ui-app/miniprogram/project.config.json
View File

@ -1,43 +1,43 @@
{ {
"appid": "wx007a8fd50dc185b2", "appid": "wx46466c7828eede2b",
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "3.8.9", "libVersion": "3.8.9",
"packOptions": { "packOptions": {
"ignore": [], "ignore": [],
"include": [] "include": []
},
"setting": {
"coverView": true,
"es6": true,
"postcss": true,
"minified": true,
"enhance": true,
"showShadowRootInWxmlPanel": true,
"packNpmRelationList": [],
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
}, },
"ignoreDevUnusedFiles": false, "setting": {
"ignoreUploadUnusedFiles": false, "coverView": true,
"condition": false, "es6": true,
"compileWorklet": false, "postcss": true,
"uglifyFileName": false, "minified": true,
"uploadWithSourceMap": true, "enhance": true,
"packNpmManually": false, "showShadowRootInWxmlPanel": true,
"minifyWXSS": true, "packNpmRelationList": [],
"minifyWXML": true, "babelSetting": {
"localPlugins": false, "ignore": [],
"disableUseStrict": false, "disablePlugins": [],
"useCompilerPlugins": false, "outputPath": ""
"swc": false, },
"disableSWC": true "ignoreDevUnusedFiles": false,
}, "ignoreUploadUnusedFiles": false,
"condition": {}, "condition": false,
"editorSetting": { "compileWorklet": false,
"tabIndent": "auto", "uglifyFileName": false,
"tabSize": 4 "uploadWithSourceMap": true,
}, "packNpmManually": false,
"simulatorPluginLibVersion": {} "minifyWXSS": true,
"minifyWXML": true,
"localPlugins": false,
"disableUseStrict": false,
"useCompilerPlugins": false,
"swc": false,
"disableSWC": true
},
"condition": {},
"editorSetting": {
"tabIndent": "auto",
"tabSize": 4
},
"simulatorPluginLibVersion": {}
} }

44
yanzhu-ui-app/miniprogram/project.private.config.json
View File

@ -1,24 +1,24 @@
{ {
"description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
"projectname": "miniprogram", "projectname": "miniprogram",
"setting": { "setting": {
"compileHotReLoad": true, "compileHotReLoad": true,
"urlCheck": false, "urlCheck": false,
"coverView": true, "coverView": true,
"lazyloadPlaceholderEnable": false, "lazyloadPlaceholderEnable": false,
"skylineRenderEnable": false, "skylineRenderEnable": false,
"preloadBackgroundData": false, "preloadBackgroundData": false,
"autoAudits": false, "autoAudits": false,
"useApiHook": true, "useApiHook": true,
"useApiHostProcess": true, "useApiHostProcess": true,
"showShadowRootInWxmlPanel": true, "showShadowRootInWxmlPanel": true,
"useStaticServer": false, "useStaticServer": false,
"useLanDebug": false, "useLanDebug": false,
"showES6CompileOption": false, "showES6CompileOption": false,
"checkInvalidKey": true, "checkInvalidKey": true,
"ignoreDevUnusedFiles": true, "ignoreDevUnusedFiles": true,
"bigPackageSizeSupport": false "bigPackageSizeSupport": false
}, },
"condition": {}, "condition": {},
"libVersion": "3.8.9" "libVersion": "3.8.9"
} }

2
yanzhu-ui-vue3/src/views/device/pitDevice/index.vue
View File

@ -14,7 +14,6 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="设备名称" prop="devCode"> <el-form-item label="设备名称" prop="devCode">
<el-input v-model="queryParams.name" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.name" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
@ -26,7 +25,6 @@
<el-form-item label="设备型号" prop="cfgId"> <el-form-item label="设备型号" prop="cfgId">
<el-input v-model="queryParams.devTypeName" placeholder="请输入设备型号" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.devTypeName" placeholder="请输入设备型号" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

4
yanzhu-ui-vue3/vite.config.js
View File

@ -39,8 +39,8 @@ export default defineConfig(({ mode, command }) => {
}, },
// https://cn.vitejs.dev/config/#server-proxy // https://cn.vitejs.dev/config/#server-proxy
"/dev-api": { "/dev-api": {
target: "http://localhost:8080", //target: "http://localhost:8080",
//target: "http://62.234.3.186", target: "http://62.234.3.186",
changeOrigin: true, changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, ""), rewrite: (p) => p.replace(/^\/dev-api/, ""),
}, },