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

提交代码

dev_xd
姜玉琦 2025-09-28 15:19:29 +08:00
parent 1996c60781
commit a931198604
7 changed files with 20 additions and 14 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 */
@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;
}

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,
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}
</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,
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
</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 sys_user_role ur on ur.role_id = smcr.role_id
where smc.del_flag = 0
and ur.user_id = #{currentUserId}
<if test="currentUserId != null"> and ur.user_id = #{currentUserId}</if>
<if test="activeProjectId != null"> and smc.project_id = #{activeProjectId}</if>
<if test="menuType != null and menuType != ''"> and smc.menu_type = #{menuType}</if>
order by smc.menu_sort asc

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

@ -159,6 +159,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());
@ -176,6 +177,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());

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 = "进场日期不能为空")
private String enterDate;
/** 进场日期 */
@NotNull(message = "进场日期不能为空")
/** 离场日期 */
private String exitDate;
/** 分包商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.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<WxMenuConfig> list = wxMenuConfigService.findUserMenuList(query);
redisService.setCacheObject(key, list, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
return success(list);

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

@ -14,7 +14,6 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="设备名称" prop="devCode">
<el-input v-model="queryParams.name" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
@ -26,7 +25,6 @@
<el-form-item label="设备型号" prop="cfgId">
<el-input v-model="queryParams.devTypeName" placeholder="请输入设备型号" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
<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>