From f2912f0661eee1827a285ec6026191cf4f91657a Mon Sep 17 00:00:00 2001 From: zt Date: Thu, 25 Sep 2025 18:38:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/SubConstructionUserAppController.java | 14 ++++++++++++-- .../app/SubContractorAppController.java | 15 +++++++++++++++ .../SubConstructionUserAppVo.java | 3 +++ .../impl/SubConstructionUserServiceImpl.java | 8 +++++--- .../app/BusAttendanceAppController.java | 2 +- .../system/service/impl/SysUserServiceImpl.java | 12 +++++++----- .../controller/app/FlowAppController.java | 4 +++- 7 files changed, 46 insertions(+), 12 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/app/SubConstructionUserAppController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/app/SubConstructionUserAppController.java index 94047429..608437be 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/app/SubConstructionUserAppController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/app/SubConstructionUserAppController.java @@ -11,6 +11,7 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.contractor.domain.SubConstructionUser; +import org.dromara.contractor.domain.dto.constructionuser.AllocateDto; import org.dromara.contractor.domain.dto.constructionuser.SubConstructionUserAuthenticationReq; import org.dromara.contractor.domain.dto.constructionuser.SubConstructionUserQueryReq; import org.dromara.contractor.domain.vo.constructionuser.SubConstructionUserAppVo; @@ -148,12 +149,21 @@ public class SubConstructionUserAppController { } /** - * 添加项目班组 + * 添加项目班组(有项目的) */ @RepeatSubmit() @PostMapping("/addTeam") - public R add(@Validated(AddGroup.class) @RequestBody BusProjectTeamMemberCreateReq req) { + public R add(@RequestBody BusProjectTeamMemberCreateReq req) { return R.ok(busProjectTeamMemberService.insertByBo(req)); } + /** + * 添加项目班组(无项目的) + */ + @RepeatSubmit() + @PutMapping("/allocate") + public R allocate(@Validated @RequestBody AllocateDto req) { + return R.ok(constructionUserService.allocate(req)); + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/app/SubContractorAppController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/app/SubContractorAppController.java index bea3ea65..95cf2f80 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/app/SubContractorAppController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/app/SubContractorAppController.java @@ -1,10 +1,14 @@ package org.dromara.contractor.controller.app; +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.Resource; import jakarta.validation.constraints.NotNull; import org.dromara.common.core.domain.R; import org.dromara.common.web.core.BaseController; +import org.dromara.contractor.domain.SubContractor; import org.dromara.contractor.domain.vo.contractor.SubContractorManagerVo; +import org.dromara.contractor.domain.vo.contractor.SubContractorVo; import org.dromara.contractor.domain.vo.contractor.SubManagerVo; import org.dromara.contractor.service.ISubContractorService; import org.springframework.validation.annotation.Validated; @@ -46,4 +50,15 @@ public class SubContractorAppController extends BaseController { @PathVariable Long id) { return R.ok(contractorService.queryManagerListById(id)); } + + /** + * 根据项目id查询分包方管理人员信息列表 + */ + @GetMapping("/list/{projectId}") + public R> list(@NotNull(message = "项目id不能为空") + @PathVariable Long projectId) { + List list = contractorService.list(Wrappers.lambdaQuery(SubContractor.class) + .eq(SubContractor::getProjectId, projectId)); + return R.ok(BeanUtil.copyToList(list, SubContractorVo.class)); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserAppVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserAppVo.java index b0195286..f9f7457c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserAppVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserAppVo.java @@ -82,4 +82,7 @@ public class SubConstructionUserAppVo implements Serializable { * 用户性别（0男 1女 2未知） */ private String sex; + + + private String sfzSite; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java index 814f07ad..8fa385e1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java @@ -1467,9 +1467,11 @@ public class SubConstructionUserServiceImpl extends ServiceImpl wrapper.isNull(SubConstructionUser::getProjectId) - .or().eq(SubConstructionUser::getProjectId, req.getProjectId()) - ); + if(req.getProjectId() == null){ + lqw.isNull(SubConstructionUser::getProjectId); + }else{ + lqw.eq(SubConstructionUser::getProjectId, req.getProjectId()); + } Page result = this.page(pageQuery.build(), lqw); ArrayList list = new ArrayList<>(); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/app/BusAttendanceAppController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/app/BusAttendanceAppController.java index 4f5c5b24..4bf0679c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/app/BusAttendanceAppController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/app/BusAttendanceAppController.java @@ -195,7 +195,7 @@ public class BusAttendanceAppController extends BaseController { if (firstDate.isAfter(LocalDate.now())) { daysCountVo.setEntryDays(0); // 防止未来日期导致负数 } else { - long daysDifference = ChronoUnit.DAYS.between(firstDate, LocalDate.now()); + long daysDifference = ChronoUnit.DAYS.between(firstDate, LocalDate.now())+1; daysCountVo.setEntryDays((int) daysDifference); } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java index a0acc5e9..deedec49 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java @@ -830,11 +830,13 @@ public class SysUserServiceImpl implements ISysUserService, UserService { @Transactional(rollbackFor = Exception.class) public Boolean updateAppUserType(Long userId, String appUserType) { //直接添加权限 app用户类型 0-施工人员 1-管理人员 2-分包人员 - if("1".equals(appUserType)){ - - } - - +// if("1".equals(appUserType)){ +// //清空app角色 +// userRoleMapper.delete(new LambdaQueryWrapper() +// .eq(SysUserRole::getUserId, userId)); +// //添加管理人员角色 +// +// } return baseMapper.update(null, new LambdaUpdateWrapper() .set(SysUser::getAppUserType, appUserType) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/app/FlowAppController.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/app/FlowAppController.java index b19721fa..64aca7d4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/app/FlowAppController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/app/FlowAppController.java @@ -51,7 +51,7 @@ public class FlowAppController { Map map = list.stream().collect(Collectors.toMap(FlowHisTaskVo::getNodeCode, vo -> vo)); - String instanceId = (String) stringObjectMap.get("instanceId"); + Long instanceId = (Long) stringObjectMap.get("instanceId"); String defJsonStr = ((Instance) FlowEngine.insService().getById(instanceId)).getDefJson(); DefJson defJson = (DefJson)FlowEngine.jsonConvert.strToBean(defJsonStr, DefJson.class); ChartExtService chartExtService = (ChartExtService) FrameInvoker.getBean(ChartExtService.class); @@ -90,6 +90,8 @@ public class FlowAppController { appVo.setAuditName(auditName); } } + + appVoList.add(appVo); } return R.ok(appVoList);