diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLawsInventoryEOController.java index b481d4c60..1b4ce37e9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLawsInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLawsInventoryEOController.java @@ -58,7 +58,7 @@ import java.util.Map; @Slf4j public class PlatformProjectLawsInventoryEOController extends JeroController { @Autowired - private IPlatformProjectLawsInventoryEOService projectLawsInventoryEOService; + private IPlatformProjectLawsInventoryEOService platformProjectLawsInventoryEOService; @Autowired private IBussDocumentLibraryEOService bussDocumentLibraryEOService; @Autowired @@ -80,7 +80,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController pageList = this.projectLawsInventoryEOService.queryPage(projectLawsInventoryEO,pageNo,pageSize,req); + IPage pageList = this.platformProjectLawsInventoryEOService.queryPage(projectLawsInventoryEO,pageNo,pageSize,req); return Result.OK(pageList); } @@ -94,7 +94,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController> queryList(ProjectLawsInventoryEO projectLawsInventoryEO,HttpServletRequest req) { - List list = projectLawsInventoryEOService.queryList(projectLawsInventoryEO,req); + List list = platformProjectLawsInventoryEOService.queryList(projectLawsInventoryEO,req); return Result.OK(projectLawsInventoryEO.getCut(),list); } @@ -108,7 +108,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController add(@Validated @RequestBody ProjectLawsInventoryEO projectLawsInventoryEO) { - projectLawsInventoryEOService.add(projectLawsInventoryEO); + platformProjectLawsInventoryEOService.add(projectLawsInventoryEO); return Result.OK("添加成功!"); } @@ -122,7 +122,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController edit(@Validated @RequestBody ProjectLawsInventoryEO projectLawsInventoryEO) { - projectLawsInventoryEOService.editById(projectLawsInventoryEO); + platformProjectLawsInventoryEOService.editById(projectLawsInventoryEO); return Result.OK("编辑成功!"); } @@ -138,7 +138,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController delete(@RequestParam(name="id",required=true) String id, @RequestParam(name="projectLibraryId",required=true) String projectLibraryId, @RequestParam(name="cut",required=true) String cut) { - projectLawsInventoryEOService.deleteById(id,projectLibraryId,cut); + platformProjectLawsInventoryEOService.deleteById(id,projectLibraryId,cut); return Result.OK("删除成功!"); } @@ -155,7 +155,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { - ProjectLawsInventoryEO projectLawsInventoryEO = projectLawsInventoryEOService.queryById(id); + ProjectLawsInventoryEO projectLawsInventoryEO = platformProjectLawsInventoryEOService.queryById(id); if(projectLawsInventoryEO==null) { return Result.error("未找到对应数据"); } @@ -208,7 +208,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController updateStatusBatch(@RequestBody JSONObject json) { - return this.projectLawsInventoryEOService.updateStatusBatch(json); + return this.platformProjectLawsInventoryEOService.updateStatusBatch(json); } /** @@ -220,7 +220,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController matchRelevantPeople(@RequestBody Map params){ - return this.projectLawsInventoryEOService.matchRelevantPeople(params); + return this.platformProjectLawsInventoryEOService.matchRelevantPeople(params); } /** @@ -232,7 +232,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController processCall(@RequestBody JSONObject jsonObject){ - return this.projectLawsInventoryEOService.processCall(jsonObject); + return this.platformProjectLawsInventoryEOService.processCall(jsonObject); } /** @@ -244,7 +244,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController queryProjectLawsInventoryInfoById(@RequestParam Map params) { - List result = projectLawsInventoryEOService.queryProjectLawsInventoryInfoById(params); + List result = platformProjectLawsInventoryEOService.queryProjectLawsInventoryInfoById(params); return Result.OK((String) params.get("cut"),result); } @@ -272,7 +272,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController setBatch(@RequestBody ProjectLawsInventoryEO projectLawsInventoryEO) { String cut = projectLawsInventoryEO.getCut(); try { - projectLawsInventoryEOService.setBatch(projectLawsInventoryEO); + platformProjectLawsInventoryEOService.setBatch(projectLawsInventoryEO); } catch (Exception e) { e.printStackTrace(); log.error("批量设置失败:" + e.getMessage()); @@ -345,7 +345,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController importData(@RequestParam(value = "file", required = false) MultipartFile file, ProjectLawsInventoryEO projectLawsInventoryEO) { - projectLawsInventoryEOService.importData(file,projectLawsInventoryEO); + platformProjectLawsInventoryEOService.importData(file,projectLawsInventoryEO); return Result.OK("导入成功"); } @@ -380,14 +380,14 @@ public class PlatformProjectLawsInventoryEOController extends JeroController change(@RequestBody JSONObject params) { - return this.projectLawsInventoryEOService.change(params); + return this.platformProjectLawsInventoryEOService.change(params); } @AutoLog(value = "下载pdf报告") @ApiOperation(value="下载pdf报告", notes="下载pdf报告") @GetMapping(value = "/downloadReport") public void downloadReport(@RequestParam Map params, HttpServletRequest req, HttpServletResponse resp) throws DocumentException { - this.projectLawsInventoryEOService.downloadReport(params,req,resp); + this.platformProjectLawsInventoryEOService.downloadReport(params,req,resp); } /** @@ -429,14 +429,14 @@ public class PlatformProjectLawsInventoryEOController extends JeroController params, HttpServletRequest req, HttpServletResponse resp) throws DocumentException { - this.projectLawsInventoryEOService.downloadDocxReport(params,req,resp); + this.platformProjectLawsInventoryEOService.downloadDocxReport(params,req,resp); } @AutoLog(value = "催办") @ApiOperation(value="催办", notes="催办") @PostMapping(value = "/expediting") public Result expediting(@RequestBody JSONObject json) { - return this.projectLawsInventoryEOService.expediting(json); + return this.platformProjectLawsInventoryEOService.expediting(json); } /** @@ -447,7 +447,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController> getRoleByUserId(String projectLibraryId,String cut) { Result> result = new Result<>(); - List list = projectLawsInventoryEOService.getRoleByUserId(projectLibraryId,cut); + List list = platformProjectLawsInventoryEOService.getRoleByUserId(projectLibraryId,cut); if(list==null||list.size()<=0) { result.error500("未找到角色信息"); }else { @@ -462,7 +462,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController taskUrg(@RequestBody ProjectTaskUrgVo projectTaskUrgVo) { - return this.projectLawsInventoryEOService.taskUrg(projectTaskUrgVo); + return this.platformProjectLawsInventoryEOService.taskUrg(projectTaskUrgVo); } @@ -470,35 +470,35 @@ public class PlatformProjectLawsInventoryEOController extends JeroController updateFlowInfoByProjectLibraryIds(@RequestParam("projectLibraryIds") String projectLibraryIds){ - return this.projectLawsInventoryEOService.updateFlowInfoByProjectLibraryIds(projectLibraryIds); + return this.platformProjectLawsInventoryEOService.updateFlowInfoByProjectLibraryIds(projectLibraryIds); } @AutoLog(value = "项目库-法规清单表-studio发布") @ApiOperation(value="项目库-法规清单表-studio发布", notes="项目库-法规清单表-studio发布") @PostMapping(value = "/studioPublish") public Result studioPublish(@RequestBody JSONObject json) { - return this.projectLawsInventoryEOService.studioPublish(json); + return this.platformProjectLawsInventoryEOService.studioPublish(json); } @AutoLog(value = "项目库-法规清单表-studio撤回") @ApiOperation(value="项目库-法规清单表-studio撤回", notes="项目库-法规清单表-studio撤回") @PostMapping(value = "/studioWithdrew") public Result studioWithdrew(@RequestBody JSONObject json) { - return this.projectLawsInventoryEOService.studioWithdrew(json); + return this.platformProjectLawsInventoryEOService.studioWithdrew(json); } @AutoLog(value = "项目库-法规清单表-法规工程师退回") @ApiOperation(value="项目库-法规清单表-法规工程师退回", notes="项目库-法规清单表-法规工程师退回") @PostMapping(value = "/regulationOwnerReturned") public Result regulationOwnerReturned(@RequestBody JSONObject json) { - return this.projectLawsInventoryEOService.regulationOwnerReturned(json); + return this.platformProjectLawsInventoryEOService.regulationOwnerReturned(json); } @AutoLog(value = "流程重置-迁移法规清单流程历史数据专用") @ApiOperation(value="流程重置-迁移法规清单流程历史数据专用", notes="流程重置-迁移法规清单流程历史数据专用") @PostMapping(value = "/resetFlowTemp") public Result resetFlowTemp(@RequestBody JSONObject params) { - return this.projectLawsInventoryEOService.resetFlowTemp(params); + return this.platformProjectLawsInventoryEOService.resetFlowTemp(params); } /** @@ -510,21 +510,21 @@ public class PlatformProjectLawsInventoryEOController extends JeroController updateFlowStatusBatch(@RequestBody JSONObject json) { - return this.projectLawsInventoryEOService.updateFlowStatusBatch(json); + return this.platformProjectLawsInventoryEOService.updateFlowStatusBatch(json); } @AutoLog(value = "项目库-法规清单表-引用交付物") @ApiOperation(value="项目库-法规清单表-引用交付物", notes="项目库-法规清单表-引用交付物") @PostMapping(value = "/citeDeliverable") public Result citeDeliverable(@RequestBody JSONObject json) { - return this.projectLawsInventoryEOService.citeDeliverable(json); + return this.platformProjectLawsInventoryEOService.citeDeliverable(json); } @AutoLog(value = "项目库-法规清单表-强制转办") @ApiOperation(value="项目库-法规清单表-强制转办", notes="项目库-法规清单表-强制转办") @PostMapping(value = "/compulsoryTransfer") public Result compulsoryTransfer(@RequestBody JSONObject json) { - return this.projectLawsInventoryEOService.compulsoryTransfer(json); + return this.platformProjectLawsInventoryEOService.compulsoryTransfer(json); } /** @@ -536,7 +536,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController queryDutyPersonByProjectId(@RequestParam Map params){ - Map>> res = this.projectLawsInventoryEOService.queryDutyPersonByProjectId(params); + Map>> res = this.platformProjectLawsInventoryEOService.queryDutyPersonByProjectId(params); return Result.OK(res); } @@ -548,7 +548,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController queryNotComplianList(@RequestParam Map params) { - List> result = this.projectLawsInventoryEOService.queryNotComplianList(params); + List> result = this.platformProjectLawsInventoryEOService.queryNotComplianList(params); Page pages = PageUtil.getPages(Integer.parseInt((String) params.get("pageNo")), Integer.parseInt((String) params.get("pageSize")), result); return Result.OK(pages); } @@ -564,13 +564,13 @@ public class PlatformProjectLawsInventoryEOController extends JeroController params) { - this.projectLawsInventoryEOService.exportNotComplianList(response,request, params); + this.platformProjectLawsInventoryEOService.exportNotComplianList(response,request, params); } @AutoLog(value = "项目库-法规清单表-定版校验") @ApiOperation(value="项目库-法规清单表-定版校验", notes="项目库-法规清单表-定版校验") @GetMapping(value = "/finalizationVerify") public Result finalizationVerify(@RequestParam Map params){ - return this.projectLawsInventoryEOService.finalizationVerify(params); + return this.platformProjectLawsInventoryEOService.finalizationVerify(params); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java index 06edf9d70..73e87b67e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java @@ -55,6 +55,10 @@ import com.jero.modules.feishu.vo.FeishuMsgVo; import com.jero.modules.message.websocket.WebSocket; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; +import com.jero.modules.platform.mapper.PlatformProjectLawsInventoryEOMapper; +import com.jero.modules.platform.mapper.PlatformProjectLibraryBaseMapper; +import com.jero.modules.platform.mapper.PlatformProjectNameInfoEOMapper; +import com.jero.modules.platform.service.IPlatformProjectLawsInventoryEOService; import com.jero.modules.project.entity.ConditionAssessmentEO; import com.jero.modules.project.entity.ProblemManagementEO; import com.jero.modules.project.entity.ProjectLawsInventoryEO; @@ -88,30 +92,22 @@ import com.jero.modules.project.enums.RequestSourceEnum; import com.jero.modules.project.enums.TaskAffirmStatusEnum; import com.jero.modules.project.enums.TaskStatusEnum; import com.jero.modules.project.mapper.ProblemManagementEOMapper; -import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; -import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper; import com.jero.modules.project.mapper.ProjectYearNameInfoEOMapper; import com.jero.modules.project.service.IConditionAssessmentEOService; -import com.jero.modules.project.service.IFeedbackHistoryService; import com.jero.modules.project.service.IProjectLawsInventoryRejectCauseEOService; -import com.jero.modules.project.service.IProjectLibraryRoleRelEOService; import com.jero.modules.project.service.IProjectRelatedPersonnelService; import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService; import com.jero.modules.project.service.IProjectTaskInventoryEOService; -import com.jero.modules.project.service.IProjectTaskInventoryFeedbackEOService; import com.jero.modules.project.service.IProjectUserPermissionService; import com.jero.modules.project.service.editImpl.ProjectLawsInventoryEOEditServiceImpl; import com.jero.modules.project.service.impl.ProblemManagementEOServiceImpl; import com.jero.modules.project.service.impl.ProjectLawsInventoryLogEOServiceImpl; -import com.jero.modules.project.service.impl.ProjectLibraryBaseServiceImpl; import com.jero.modules.project.service.impl.ProjectRelatedPersonnelServiceImpl; import com.jero.modules.project.util.WordUtil; import com.jero.modules.project.vo.NcrTrackVO; import com.jero.modules.project.vo.ProblemManagementVO; import com.jero.modules.project.vo.ProjectTaskUrgVo; -import com.jero.modules.platform.mapper.PlatformProjectLawsInventoryEOMapper; -import com.jero.modules.platform.service.IPlatformProjectLawsInventoryEOService; import com.jero.modules.split.common.FileUnZip; import com.jero.modules.system.entity.SysAnnouncement; import com.jero.modules.system.entity.SysCategory; @@ -120,12 +116,10 @@ import com.jero.modules.system.entity.SysRole; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.mapper.SysCategoryMapper; -import com.jero.modules.system.mapper.SysDictItemMapper; import com.jero.modules.system.mapper.SysRoleMapper; import com.jero.modules.system.mapper.SysUserMapper; import com.jero.modules.system.service.IProjectUserDutyTerritoryService; import com.jero.modules.system.service.ISysAnnouncementService; -import com.jero.modules.system.service.ISysDictItemService; import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; @@ -141,7 +135,6 @@ import com.jero.modules.todoCenter.service.IProcessInfoEOService; import com.jero.modules.wkflow.entity.ProcessHistoryEO; import com.jero.modules.wkflow.enums.DesignComplianceNodeEnum; import com.jero.modules.wkflow.enums.FlowTypeEnum; -import com.jero.modules.wkflow.feginClient.impl.TaskFeignClientImpl; import com.jero.modules.wkflow.feginClient.impl.WorkFlowFeignClientImpl; import com.jero.modules.wkflow.service.IProcessHistoryEOService; import com.jero.modules.wkflow.service.impl.ProcessHistoryEOServiceImpl; @@ -240,7 +233,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl() + ProjectLibraryBase projectLibraryBase = platformProjectLibraryBaseMapper.selectOne(new QueryWrapper() .lambda().eq(ProjectLibraryBase::getId, projectLibraryId)); // studio信息 @@ -1947,7 +1924,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl projectNameInfoEOQueryWrapper = new QueryWrapper<>(); projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId()); - ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); + ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); QueryWrapper projectYearInfoEOQueryWrapper = new QueryWrapper<>(); projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId, projectLibraryBase.getYearNameId()); @@ -2530,7 +2507,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.in(ProjectLibraryBase::getId, projectLibraryId); - List projectLibraryBases = projectLibraryBaseMapper.selectList(wrapper); + List projectLibraryBases = platformProjectLibraryBaseMapper.selectList(wrapper); String studioEngineer = ""; if (projectLibraryBases.size() != 0) { studioEngineer = projectLibraryBases.get(0).getStudioEngineer(); @@ -2930,7 +2907,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl() + ProjectLibraryBase projectLibraryBase = platformProjectLibraryBaseMapper.selectOne(new QueryWrapper() .lambda().eq(ProjectLibraryBase::getId, projectLibraryId)); ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectOne( @@ -3067,7 +3044,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl projectNameInfoEOQueryWrapper = new QueryWrapper<>(); projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId()); - ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); + ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); QueryWrapper projectYearInfoEOQueryWrapper = new QueryWrapper<>(); projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId, projectLibraryBase.getYearNameId()); @@ -3091,7 +3068,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl libraryBaseQueryWrapper = new QueryWrapper<>(); libraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId, projectLawsInventoryEO.getProjectLibraryId()); - ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(libraryBaseQueryWrapper); + ProjectLibraryBase projectLibraryBase = platformProjectLibraryBaseMapper.selectOne(libraryBaseQueryWrapper); params.put("projectLibraryBase", projectLibraryBase); QueryWrapper projectNameQueryWrapper = new QueryWrapper<>(); projectNameQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId()); - ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameQueryWrapper); + ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOMapper.selectOne(projectNameQueryWrapper); params.put("projectNameInfoEO", projectNameInfoEO); //设置ProgramInformation内容 @@ -7606,12 +7583,12 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl libraryBaseQueryWrapper = new QueryWrapper<>(); libraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId, projectLawsInventoryEO.getProjectLibraryId()); - ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(libraryBaseQueryWrapper); + ProjectLibraryBase projectLibraryBase = platformProjectLibraryBaseMapper.selectOne(libraryBaseQueryWrapper); params.put("projectLibraryBase", projectLibraryBase); QueryWrapper projectNameQueryWrapper = new QueryWrapper<>(); projectNameQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId()); - ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameQueryWrapper); + ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOMapper.selectOne(projectNameQueryWrapper); params.put("projectNameInfoEO", projectNameInfoEO); @@ -8008,7 +7985,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl libraryBaseQueryWrapper = new QueryWrapper<>(); libraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId,projectLibraryId); - ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseMapper.selectOne(libraryBaseQueryWrapper); + ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseMapper.selectOne(libraryBaseQueryWrapper); SysUser studioUserInfo = this.sysUserMapper.selectOne( new QueryWrapper().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer()) @@ -8039,7 +8016,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl projectNameInfoEOQueryWrapper = new QueryWrapper<>(); projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId()); - ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); + ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); QueryWrapper projectYearInfoEOQueryWrapper = new QueryWrapper<>(); projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId()); @@ -8133,7 +8110,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl projectNameInfoEOQueryWrapper = new QueryWrapper<>(); projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId()); - ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); + ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); QueryWrapper projectYearInfoEOQueryWrapper = new QueryWrapper<>(); projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId()); @@ -8253,7 +8230,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl sysRoles = new LinkedList<>(); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); //项目详情中取R&H Studio和认证工程师 - List projectLibraryBases = projectLibraryBaseService.queryById(projectLibraryId, null); + List projectLibraryBases = platformProjectLibraryBaseService.queryById(projectLibraryId, null); String certificationEngineerName = ""; if (projectLibraryBases.size() != 0) { certificationEngineerName = projectLibraryBases.get(0).getCertificationEngineerName(); @@ -9189,12 +9166,12 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl() + ProjectLibraryBase projectLibraryBase = platformProjectLibraryBaseMapper.selectOne(new QueryWrapper() .lambda().eq(ProjectLibraryBase::getId, projectLawsInventoryEO.getProjectLibraryId())); QueryWrapper projectNameInfoEOQueryWrapper = new QueryWrapper<>(); projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId()); - ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); + ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); QueryWrapper projectYearInfoEOQueryWrapper = new QueryWrapper<>(); projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId, projectLibraryBase.getYearNameId()); @@ -9421,7 +9398,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl result = new HashMap<>(); @@ -12011,7 +11988,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLibraryBaseQueryWrapper = new QueryWrapper<>(); projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId, projectLibraryId); projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getStudioEngineer, currentUserId); - Integer projectLibrayBaseCount = projectLibraryBaseMapper.selectCount(projectLibraryBaseQueryWrapper); + Integer projectLibrayBaseCount = platformProjectLibraryBaseMapper.selectCount(projectLibraryBaseQueryWrapper); if (projectLibrayBaseCount > 0) { result = Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue()); } else {