From bd8d3572999425d0384cee4d33373e4479646d78 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 13 Sep 2023 14:11:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6--=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PlatformProjectLibraryBaseController.java | 44 +++---- ...a => PlatformProjectNameInfoEOMapper.java} | 2 +- .../xml/PlatformProjectNameInfoEOMapper.xml | 2 +- ...PlatformProjectLibraryBaseServiceImpl.java | 123 ++++++++---------- .../PlatformProjectNameInfoEOServiceImpl.java | 4 +- 5 files changed, 79 insertions(+), 96 deletions(-) rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/{PlatpromProjectNameInfoEOMapper.java => PlatformProjectNameInfoEOMapper.java} (91%) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLibraryBaseController.java index 0752c1b6a..42453f1de 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLibraryBaseController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLibraryBaseController.java @@ -46,7 +46,7 @@ import java.util.Map; @Slf4j public class PlatformProjectLibraryBaseController extends JeroController { @Autowired - private IPlatformIProjectLibraryBaseService projectPlatformService; + private IPlatformIProjectLibraryBaseService platformIProjectLibraryBaseService; /** * 分页列表查询 @@ -57,8 +57,8 @@ public class PlatformProjectLibraryBaseController extends JeroController queryPageList(@RequestBody Map params) { - List pageList= projectPlatformService.queryPageList(params); - Page pages = projectPlatformService.getPages(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()), pageList); + List pageList= platformIProjectLibraryBaseService.queryPageList(params); + Page pages = platformIProjectLibraryBaseService.getPages(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()), pageList); return Result.OK(params.get("cut").toString(),pages); } @@ -71,7 +71,7 @@ public class PlatformProjectLibraryBaseController extends JeroController> queryList(ProjectLibraryBase projectLibraryBase) { - List list = projectPlatformService.getList(projectLibraryBase); + List list = platformIProjectLibraryBaseService.getList(projectLibraryBase); return Result.OK(list); } @@ -86,7 +86,7 @@ public class PlatformProjectLibraryBaseController extends JeroController add(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) throws ParseException { - projectPlatformService.add(projectLibraryBase); + platformIProjectLibraryBaseService.add(projectLibraryBase); return Result.OK("添加成功！"); } /** @@ -100,7 +100,7 @@ public class PlatformProjectLibraryBaseController extends JeroController addChild(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) throws ParseException { - projectPlatformService.addChild(projectLibraryBase); + platformIProjectLibraryBaseService.addChild(projectLibraryBase); return Result.OK("添加成功！"); } @@ -115,7 +115,7 @@ public class PlatformProjectLibraryBaseController extends JeroController edit(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) { - projectPlatformService.editById(projectLibraryBase); + platformIProjectLibraryBaseService.editById(projectLibraryBase); return Result.OK("编辑成功!"); } @@ -131,7 +131,7 @@ public class PlatformProjectLibraryBaseController extends JeroController delete(@RequestParam(name="id",required=true) String id, @RequestParam(name="cut",required=true) String cut) { - projectPlatformService.deleteById(id,cut); + platformIProjectLibraryBaseService.deleteById(id,cut); return Result.OK("删除成功!"); } @@ -147,7 +147,7 @@ public class PlatformProjectLibraryBaseController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids, @RequestParam(name="cut",required=true) String cut) { - this.projectPlatformService.deleteByIds(Arrays.asList(ids.split(",")),cut); + this.platformIProjectLibraryBaseService.deleteByIds(Arrays.asList(ids.split(",")),cut); return Result.OK("批量删除成功!"); } @@ -163,7 +163,7 @@ public class PlatformProjectLibraryBaseController extends JeroController queryById(@RequestParam(name="id",required=true) String id, @RequestParam(name="cut",required=true) String cut) { - List data = projectPlatformService.queryById(id,cut); + List data = platformIProjectLibraryBaseService.queryById(id,cut); if(data==null) { return Result.error("未找到对应数据"); } @@ -203,7 +203,7 @@ public class PlatformProjectLibraryBaseController extends JeroController getProjectDetailsStatistics(@RequestParam(name="id",required=true) String id, @RequestParam(name="cut",required=true) String cut) { - Map data = projectPlatformService.getProjectDetailsStatistics(id); + Map data = platformIProjectLibraryBaseService.getProjectDetailsStatistics(id); return Result.OK(cut,data); } @@ -215,7 +215,7 @@ public class PlatformProjectLibraryBaseController extends JeroController getProjectDetailsStatisticsGroupByTerritory(@RequestParam Map params) { - Map data = projectPlatformService.getProjectDetailsStatisticsGroupByTerritory(params); + Map data = platformIProjectLibraryBaseService.getProjectDetailsStatisticsGroupByTerritory(params); return Result.OK((String)params.get("cut"),data); } @@ -227,7 +227,7 @@ public class PlatformProjectLibraryBaseController extends JeroController params) { - projectPlatformService.exportProjectDetailsStatisticsGroupByTerritoryXls(response,request, params); + platformIProjectLibraryBaseService.exportProjectDetailsStatisticsGroupByTerritoryXls(response,request, params); } @@ -241,7 +241,7 @@ public class PlatformProjectLibraryBaseController extends JeroController top(String id,String flag) { - projectPlatformService.top(id,flag); + platformIProjectLibraryBaseService.top(id,flag); return Result.OK("编辑成功!"); } @@ -254,7 +254,7 @@ public class PlatformProjectLibraryBaseController extends JeroController getVersionsInfo(String id) { - List versionsInfoList = projectPlatformService.getVersionsInfo(id); + List versionsInfoList = platformIProjectLibraryBaseService.getVersionsInfo(id); return Result.OK(versionsInfoList); } @@ -266,8 +266,8 @@ public class PlatformProjectLibraryBaseController extends JeroController versionStatistics(@RequestBody Map params) { - List projectLibraryBasesList = projectPlatformService.versionStatistics(String.valueOf(params.get("id"))); - Page pages = projectPlatformService.getPages(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()), projectLibraryBasesList); + List projectLibraryBasesList = platformIProjectLibraryBaseService.versionStatistics(String.valueOf(params.get("id"))); + Page pages = platformIProjectLibraryBaseService.getPages(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()), projectLibraryBasesList); return Result.OK(pages); } @@ -275,7 +275,7 @@ public class PlatformProjectLibraryBaseController extends JeroController getProjectInfo(){ - JSONArray resList = projectPlatformService.getProjectInfo(); + JSONArray resList = platformIProjectLibraryBaseService.getProjectInfo(); return Result.OK(resList); } @@ -283,21 +283,21 @@ public class PlatformProjectLibraryBaseController extends JeroController getProjectProgressInfo(){ - JSONArray resList = this.projectPlatformService.getProjectProgressInfo(); + JSONArray resList = this.platformIProjectLibraryBaseService.getProjectProgressInfo(); return Result.OK(resList); } // 导出项目进度统计(状态导出) @RequestMapping(value = "/exportProjectProgressStatisticsXls") public void exportProjectProgressStatisticsXls(HttpServletResponse response,HttpServletRequest request, @RequestParam Map params) { - this.projectPlatformService.exportProjectProgressStatisticsXls(response,request, params); + this.platformIProjectLibraryBaseService.exportProjectProgressStatisticsXls(response,request, params); } @AutoLog(value = "获取用户在该项目中所有的责任领域") @ApiOperation(value="获取用户在该项目中所有的责任领域", notes="获取用户在该项目中所有的责任领域") @GetMapping(value = "/getUserAllDutyTerritoryList") public Result> getUserAllDutyTerritoryList(@RequestParam Map params){ - List resList = this.projectPlatformService.getUserAllDutyTerritoryList(params); + List resList = this.platformIProjectLibraryBaseService.getUserAllDutyTerritoryList(params); return Result.OK(resList); } @@ -305,6 +305,6 @@ public class PlatformProjectLibraryBaseController extends JeroController overallReplacementUser(@RequestBody JSONObject json){ - return this.projectPlatformService.overallReplacementUser(json); + return this.platformIProjectLibraryBaseService.overallReplacementUser(json); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatpromProjectNameInfoEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatformProjectNameInfoEOMapper.java similarity index 91% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatpromProjectNameInfoEOMapper.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatformProjectNameInfoEOMapper.java index 34b3274bf..3e0b0008b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatpromProjectNameInfoEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatformProjectNameInfoEOMapper.java @@ -12,7 +12,7 @@ import java.util.List; * @Date: 2022-04-18 * @Version: V1.0 */ -public interface PlatpromProjectNameInfoEOMapper extends BaseMapper { +public interface PlatformProjectNameInfoEOMapper extends BaseMapper { @Select("select pni.id,pni.project_name,pyni.id as year_id,pyni.year_name,pni.vehicle_platform,pni.digital_platform\n" + "from project_name_info as pni\n" + "left join project_year_name_info as pyni on pni.id=pyni.project_name_id;") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectNameInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectNameInfoEOMapper.xml index 6c40aa4a0..7063f6552 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectNameInfoEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectNameInfoEOMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java index 89b26b5ba..27329d286 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java @@ -23,6 +23,10 @@ import com.jero.modules.dummy.enums.OrderEnum; import com.jero.modules.enums.DictCodeEnum; import com.jero.modules.feishu.enums.TemplateInfoEnum2; import com.jero.modules.ota.service.impl.OtaManageApplyEOServiceImpl; +import com.jero.modules.platform.mapper.PlatformProjectLawsInventoryEOMapper; +import com.jero.modules.platform.mapper.PlatformProjectLibraryBaseMapper; +import com.jero.modules.platform.service.IPlatformIProjectLibraryBaseService; +import com.jero.modules.platform.service.IPlatformProjectCertificationInventoryEOService; import com.jero.modules.project.entity.ProjectCertificationInventoryEO; import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.project.entity.ProjectLawsInventoryLogEO; @@ -47,29 +51,19 @@ import com.jero.modules.project.enums.RoleRelModelTypeEnum; import com.jero.modules.project.enums.TaskAffirmStatusEnum; import com.jero.modules.project.enums.TaskStatusEnum; import com.jero.modules.project.enums.TopEnum; -import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper; -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.ProjectTaskInventoryEOMapper; import com.jero.modules.project.mapper.ProjectUserPermissionMapper; -import com.jero.modules.project.service.IConditionAssessmentEOService; -import com.jero.modules.project.service.IProjectCertificationInventoryEOService; import com.jero.modules.project.service.IProjectLibraryRoleRelEOService; import com.jero.modules.project.service.IProjectLibraryStatisticsService; import com.jero.modules.project.service.IProjectUserPermissionService; -import com.jero.modules.project.service.impl.ProjectLawsInventoryEOServiceImpl; import com.jero.modules.project.service.impl.ProjectLawsInventoryLogEOServiceImpl; -import com.jero.modules.project.service.impl.ProjectNameInfoEOServiceImpl; import com.jero.modules.project.service.impl.ProjectRelatedPersonnelServiceImpl; import com.jero.modules.project.service.impl.ProjectTaskPlanningServiceImpl; import com.jero.modules.project.vo.TimeNodeVO; -import com.jero.modules.platform.mapper.PlatformProjectLibraryBaseMapper; -import com.jero.modules.platform.service.IPlatformIProjectLibraryBaseService; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.enums.DicCodeEnum; -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.IProjectUserBrandService; @@ -130,10 +124,7 @@ import java.util.stream.Collectors; @Service public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl implements IPlatformIProjectLibraryBaseService { @Autowired - private ProjectLibraryBaseMapper projectLibraryBaseMapper; - - @Autowired - private SysDictItemMapper sysDictItemMapper; + private PlatformProjectLibraryBaseMapper platformProjectLibraryBaseMapper; @Autowired private SysUserMapper sysUserMapper; @@ -144,27 +135,19 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl 0) { if(CutEnum.CN.getValue().equals(projectLibraryBase.getCut())) { throw new JeroBootException("已存在车型名称,年款号,目标市场均同的数据"); @@ -620,7 +603,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("project_library_id", projectLibraryBase.getId()); - List list = projectLawsInventoryEOService.list(queryWrapper); + List list = platformProjectLawsInventoryEOService.list(queryWrapper); if (ObjectUtils.isNotEmpty(list)) { for (ProjectLawsInventoryEO lawsInventoryEO : list) { boolean boo = false; @@ -734,11 +717,11 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl certificationInventoryEOQueryWrapper = new QueryWrapper<>(); certificationInventoryEOQueryWrapper.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId, newPlbEO.getId()); certificationInventoryEOQueryWrapper.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList); - List projectCertificationInventoryEOList = this.projectCertificationInventoryEOService.list(certificationInventoryEOQueryWrapper); + List projectCertificationInventoryEOList = this.platformProjectCertificationInventoryEOService.list(certificationInventoryEOQueryWrapper); if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOList)){ - this.projectCertificationInventoryEOService.certificationInventoryEOListSortByEndTimeAsc(projectCertificationInventoryEOList); + this.platformProjectCertificationInventoryEOService.certificationInventoryEOListSortByEndTimeAsc(projectCertificationInventoryEOList); List userInfoList = this.sysUserService.querySysUserListByIdList(oldCertificationEngineerIdList); - this.projectCertificationInventoryEOService.sendMessageByTemplateId( + this.platformProjectCertificationInventoryEOService.sendMessageByTemplateId( projectCertificationInventoryEOList, TemplateInfoEnum2.CERTIFICATION_MESSAGE13.getValue(), oldCertificationEngineerIdList, @@ -760,7 +743,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); QueryWrapper pciQueryWrap = new QueryWrapper<>(); pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId, projectLibraryBase.getId()); - List pciEOList = this.projectCertificationInventoryEOService.list(pciQueryWrap); + List pciEOList = this.platformProjectCertificationInventoryEOService.list(pciQueryWrap); if(CollectionUtils.isNotEmpty(pciEOList)){ // 清单待校核的数据 @@ -786,7 +769,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl pidEoList = this.processInfoDetailEOService.list(pidQueryWrap); // 获取截止日期最早的一天。 - this.projectCertificationInventoryEOService.certificationInventoryEOListSortByEndTimeAsc(pciToBeReviewEDList); + this.platformProjectCertificationInventoryEOService.certificationInventoryEOListSortByEndTimeAsc(pciToBeReviewEDList); Date endTime = pciToBeReviewEDList.get(0).getEndTime(); if(CollectionUtils.isNotEmpty(pidEoList)){ endTime = pidEoList.get(0).getEndTime(); @@ -895,7 +878,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl lawsInventoryEOQueryWrapper = new QueryWrapper<>(); lawsInventoryEOQueryWrapper.eq("project_library_id ",id); - projectLawsInventoryEOService.remove(lawsInventoryEOQueryWrapper); + platformProjectLawsInventoryEOService.remove(lawsInventoryEOQueryWrapper); //关联删除-法规清单log QueryWrapper logEOQueryWrapper = new QueryWrapper<>(); @@ -927,7 +910,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl lawsInventoryQueryWrapper = new QueryWrapper<>(); lawsInventoryQueryWrapper.eq("project_library_id",id); - List lawsInventoryRecords = projectLawsInventoryEOMapper.selectList(lawsInventoryQueryWrapper); + List lawsInventoryRecords = platformProjectLawsInventoryEOMapper.selectList(lawsInventoryQueryWrapper); for(ProjectLawsInventoryEO projectLawsInventoryEO : lawsInventoryRecords){ String inventoryAffirmStatus = projectLawsInventoryEO.getInventoryAffirmStatus();//清单确认状态 //清单确认状态(未发起、接受、拒绝） @@ -1000,7 +983,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl queryById(String id,String cut) { - List records = projectLibraryBaseMapper.queryById(id); + List records = platformProjectLibraryBaseMapper.queryById(id); disposeData(records,"",false); //目标市场数据字典 List targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); @@ -1040,7 +1023,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl getList(ProjectLibraryBase projectLibraryBase) { - List list = projectLibraryBaseMapper.getList(projectLibraryBase); + List list = platformProjectLibraryBaseMapper.getList(projectLibraryBase); return list; } @@ -1071,7 +1054,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl result = projectLibraryBaseMapper.queryPageList(params); + List result = platformProjectLibraryBaseMapper.queryPageList(params); disposeData(result,"",false); //目标市场 List targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); @@ -1128,7 +1111,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl projectLibraryBaseListParent = projectLibraryBaseMapper.queryMaimList(); + List projectLibraryBaseListParent = platformProjectLibraryBaseMapper.queryMaimList(); disposeData(projectLibraryBaseListParent,"",false); for(ProjectLibraryBase projectLibraryBase: projectLibraryBaseListParent){ //目标市场 @@ -1361,7 +1344,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl queryPageList(Map params) { -// List result = projectLibraryBaseMapper.queryPageList(params); +// List result = platformProjectLibraryBaseMapper.queryPageList(params); // disposeData(result,"",false); // //目标市场 // List targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); @@ -1486,7 +1469,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl result = projectLibraryBaseMapper.queryPageList(page, params); +// IPage result = platformProjectLibraryBaseMapper.queryPageList(page, params); // List records = result.getRecords(); // disposeData(records,"",false); // for(ProjectLibraryBase projectLibraryBase: records){ @@ -1585,18 +1568,18 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl rzTaskToConfirmMap = new HashMap<>(); //清单确认统计 - /*List> listingToConfirmMapList = this.projectLawsInventoryEOMapper.getlistingToConfirmStatistics(id); + /*List> listingToConfirmMapList = this.platformProjectLawsInventoryEOMapper.getlistingToConfirmStatistics(id); listingToConfirmMap.put("listingToConfirmMapList",listingToConfirmMapList); result.put("listingToConfirmMap",listingToConfirmMap);*/ QueryWrapper lawsInventoryEOQueryWrapper = new QueryWrapper<>(); lawsInventoryEOQueryWrapper.lambda().in(ProjectLawsInventoryEO::getProjectLibraryId,Arrays.asList(id.split(","))); - List projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper); + List projectLawsInventoryEOList = platformProjectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper); if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ List projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList()); //任务确认统计 - List> taskToConfirmMapList = this.projectLawsInventoryEOService.getTaskToConfirmStatistics(projectLawsInventoryEOList); + List> taskToConfirmMapList = this.platformProjectLawsInventoryEOService.getTaskToConfirmStatistics(projectLawsInventoryEOList); int taskAffirmStatusCount = 0; if(CollectionUtils.isNotEmpty(taskToConfirmMapList)){ //taskAffirmStatusCount @@ -1635,7 +1618,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl> designComplianceMapList = this.projectLawsInventoryEOService.getDesignComplianceStatistice(projectLawsInventoryEOList); + List> designComplianceMapList = this.platformProjectLawsInventoryEOService.getDesignComplianceStatistice(projectLawsInventoryEOList); int designFlowTaskStatusCount = 0; if(CollectionUtils.isNotEmpty(designComplianceMapList)){ for (Map designCompliance : designComplianceMapList) { @@ -1647,7 +1630,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl> verifyComplianceMapList = this.projectLawsInventoryEOService.getVerifyComplianceStatistice(projectLawsInventoryEOList); + List> verifyComplianceMapList = this.platformProjectLawsInventoryEOService.getVerifyComplianceStatistice(projectLawsInventoryEOList); int verifyFlowTaskStatusCount = 0; if(CollectionUtils.isNotEmpty(verifyComplianceMapList)){ for (Map verifyCompliance : verifyComplianceMapList) { @@ -1691,7 +1674,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl pciQueryWrap = new QueryWrapper<>(); pciQueryWrap.lambda().in(ProjectCertificationInventoryEO::getProjectLibraryId,Arrays.asList(id.split(","))); - List pciEoList = this.projectCertificationInventoryEOService.list(pciQueryWrap).stream().filter(pciEo -> { + List pciEoList = this.platformProjectCertificationInventoryEOService.list(pciQueryWrap).stream().filter(pciEo -> { boolean flag = false; if (!StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.UNINVOLVED.getValue())) { flag = true; @@ -1700,7 +1683,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl> rzTaskToConfirmMapList = this.projectCertificationInventoryEOService.getTaskToConfirmStatistics(pciEoList); + List> rzTaskToConfirmMapList = this.platformProjectCertificationInventoryEOService.getTaskToConfirmStatistics(pciEoList); int taskAffirmStatusCount = 0; if(CollectionUtils.isNotEmpty(rzTaskToConfirmMapList)){ for (Map rzTaskToConfirm : rzTaskToConfirmMapList) { @@ -1712,7 +1695,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl> prehomoMapList = this.projectCertificationInventoryEOService.getPrehomoStatistice(pciEoList); + List> prehomoMapList = this.platformProjectCertificationInventoryEOService.getPrehomoStatistice(pciEoList); int preHomoCount = 0; if (CollectionUtils.isNotEmpty(prehomoMapList)) { for (Map prehomo : prehomoMapList) { @@ -1724,9 +1707,9 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl> allMapList = this.projectCertificationInventoryEOService.getAllCertificationProgressStatistics(pciEoList); - List> carMapList = this.projectCertificationInventoryEOService.getCarCertificationProgressStatistics(pciEoList); - List> partMapList = this.projectCertificationInventoryEOService.getPartCertificationProgressStatistics(pciEoList); + List> allMapList = this.platformProjectCertificationInventoryEOService.getAllCertificationProgressStatistics(pciEoList); + List> carMapList = this.platformProjectCertificationInventoryEOService.getCarCertificationProgressStatistics(pciEoList); + List> partMapList = this.platformProjectCertificationInventoryEOService.getPartCertificationProgressStatistics(pciEoList); certificationProgressMap.put("allMapList",allMapList);// 全部 certificationProgressMap.put("carMapList",carMapList);// 整车 certificationProgressMap.put("partMapList",partMapList);// 零部件 @@ -1777,12 +1760,12 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl certificationProgressMap = new HashMap<>(); // // //清单确认统计 -// List> listingToConfirmMapList = this.projectLawsInventoryEOMapper.getlistingToConfirmStatistics(id); +// List> listingToConfirmMapList = this.platformProjectLawsInventoryEOMapper.getlistingToConfirmStatistics(id); // listingToConfirmMap.put("listingToConfirmMapList",listingToConfirmMapList); // result.put("listingToConfirmMap",listingToConfirmMap); // // //任务确认统计 -// List> taskToConfirmMapList = this.projectLawsInventoryEOMapper.getTaskToConfirmStatistics(id); +// List> taskToConfirmMapList = this.platformProjectLawsInventoryEOMapper.getTaskToConfirmStatistics(id); // taskToConfirmMap.put("taskToConfirmMapList",taskToConfirmMapList); // result.put("taskToConfirmMap",taskToConfirmMap); // @@ -1790,7 +1773,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper); +// List projectLawsInventoryEOList = platformProjectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper); // if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ // List projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList()); // @@ -1887,7 +1870,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl lawsInventoryEOQueryWrapper = new QueryWrapper<>(); lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); - List projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper); + List projectLawsInventoryEOList = platformProjectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper); List sysDictItems = new ArrayList<>(); // 法规清单所有的责任领域 @@ -1989,13 +1972,13 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl> listingToConfirmList = this.projectLawsInventoryEOMapper.getListingToConfirmStatisticsGroupByTerritory(projectLibraryId,inventoryAffirmStatus); +// List> listingToConfirmList = this.platformProjectLawsInventoryEOMapper.getListingToConfirmStatisticsGroupByTerritory(projectLibraryId,inventoryAffirmStatus); // disposeData(listingToConfirmList,cut); // result.put("dataList",listingToConfirmList); // }else if(StringUtils.equals(OperatorTypeEnum.QUERY_TASK_TO_CONFIRM_STATISTICS.getValue(),operatorType)){ // //任务确认 状态 // String taskAffirmStatus = (String) params.get("taskAffirmStatus"); -// List> taskToConfirmList = this.projectLawsInventoryEOMapper.getTaskToConfirmStatisticsGroupByTerritory(projectLibraryId,taskAffirmStatus); +// List> taskToConfirmList = this.platformProjectLawsInventoryEOMapper.getTaskToConfirmStatisticsGroupByTerritory(projectLibraryId,taskAffirmStatus); // disposeData(taskToConfirmList,cut); // result.put("dataList",taskToConfirmList); // }else if(StringUtils.equals(OperatorTypeEnum.QUERY_DESIGN_STATISTICS.getValue(),operatorType)){ @@ -2053,7 +2036,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl pciEoMap = new HashMap<>(); QueryWrapper pciQueryWrap = new QueryWrapper<>(); pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId); - List projectCertificationInventoryEOList = this.projectCertificationInventoryEOService.list(pciQueryWrap); + List projectCertificationInventoryEOList = this.platformProjectCertificationInventoryEOService.list(pciQueryWrap); String pciDutyTerritoryStr = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getDutyTerritory).collect(Collectors.joining(",")); if (StringUtils.isNotEmpty(pciDutyTerritoryStr)) { List pciDutyTerritoryList = Arrays.asList(pciDutyTerritoryStr.split(",")).stream().distinct().collect(Collectors.toList()); @@ -2467,7 +2450,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl records = this.projectLibraryBaseMapper.queryById(projectLibraryId); + List records = this.platformProjectLibraryBaseMapper.queryById(projectLibraryId); if(CollectionUtils.isNotEmpty(records)){ List studioEngineerUserIdList = records.stream().map(ProjectLibraryBase::getStudioEngineer).distinct().collect(Collectors.toList()); List studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(studioEngineerUserIdList); @@ -2645,11 +2628,11 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl pliSdiList = this.projectLawsInventoryEOService.getUserDutyTerritoryList(params); + List pliSdiList = this.platformProjectLawsInventoryEOService.getUserDutyTerritoryList(params); if(CollectionUtils.isNotEmpty(pliSdiList)){ userAllDutyTerritorySdiList.addAll(pliSdiList); } - List pciSdiList = this.projectCertificationInventoryEOService.getUserDutyTerritoryList(params); + List pciSdiList = this.platformProjectCertificationInventoryEOService.getUserDutyTerritoryList(params); if(CollectionUtils.isNotEmpty(pciSdiList)){ userAllDutyTerritorySdiList.addAll(pciSdiList); } @@ -2682,8 +2665,8 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl overallReplacementUser(JSONObject json) { this.projectRelatedPersonnelService.replacementUser(json); - this.projectLawsInventoryEOService.replacementUser(json); - this.projectCertificationInventoryEOService.replacementUser(json); + this.platformProjectLawsInventoryEOService.replacementUser(json); + this.platformProjectCertificationInventoryEOService.replacementUser(json); String projectLibraryId = json.getString("projectLibraryId"); ProjectLibraryBase projectLibraryBase = this.selectById(projectLibraryId); json.put("parentId",projectLibraryBase.getParentId()); @@ -2752,7 +2735,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl pliQueryWrap = new QueryWrapper<>(); pliQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); - List pliEOList = this.projectLawsInventoryEOMapper.selectList(pliQueryWrap); + List pliEOList = this.platformProjectLawsInventoryEOMapper.selectList(pliQueryWrap); List sysDictItems = new ArrayList<>(); String pliDutyTerritoryStr = pliEOList.stream().map(ProjectLawsInventoryEO::getDutyTerritory).collect(Collectors.joining(",")); if (StringUtils.isNotEmpty(pliDutyTerritoryStr)) { @@ -2926,7 +2909,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl pciQueryWrap = new QueryWrapper<>(); pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId); - List projectCertificationInventoryEOList = this.projectCertificationInventoryEOService.list(pciQueryWrap).stream().filter(pciEo -> { + List projectCertificationInventoryEOList = this.platformProjectCertificationInventoryEOService.list(pciQueryWrap).stream().filter(pciEo -> { boolean flag = false; if (!StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.UNINVOLVED.getValue())) { flag = true; @@ -3274,11 +3257,11 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl pliQueryWrap = new QueryWrapper<>(); pliQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectId); - List pliEoList = this.projectLawsInventoryEOService.list(pliQueryWrap); + List pliEoList = this.platformProjectLawsInventoryEOService.list(pliQueryWrap); QueryWrapper pciQueryWrap = new QueryWrapper<>(); pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectId); - List pciEoList = this.projectCertificationInventoryEOService.list(pciQueryWrap); + List pciEoList = this.platformProjectCertificationInventoryEOService.list(pciQueryWrap); QueryWrapper pmQueryWrap = new QueryWrapper<>(); pmQueryWrap.lambda().eq(ParamsManifestEO::getProjectId,projectId); @@ -3351,11 +3334,11 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl pliQueryWrap = new QueryWrapper<>(); pliQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectId); - List pliEoList = this.projectLawsInventoryEOService.list(pliQueryWrap); + List pliEoList = this.platformProjectLawsInventoryEOService.list(pliQueryWrap); QueryWrapper pciQueryWrap = new QueryWrapper<>(); pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectId); - List pciEoList = this.projectCertificationInventoryEOService.list(pciQueryWrap); + List pciEoList = this.platformProjectCertificationInventoryEOService.list(pciQueryWrap); QueryWrapper pmQueryWrap = new QueryWrapper<>(); pmQueryWrap.lambda().eq(ParamsManifestEO::getProjectId,projectId); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectNameInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectNameInfoEOServiceImpl.java index ad7302c15..d6f134d81 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectNameInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectNameInfoEOServiceImpl.java @@ -10,7 +10,7 @@ import com.jero.modules.project.mapper.ProblemManagementEOMapper; import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; import com.jero.modules.project.service.impl.ProblemManagementEOServiceImpl; import com.jero.modules.project.service.impl.ProjectYearNameInfoEOServiceImpl; -import com.jero.modules.platform.mapper.PlatpromProjectNameInfoEOMapper; +import com.jero.modules.platform.mapper.PlatformProjectNameInfoEOMapper; import com.jero.modules.platform.service.IPlatformProjectNameInfoEOService; import com.jero.modules.space.service.SpaceServiceImpl; import com.jero.modules.system.enums.DicCodeEnum; @@ -30,7 +30,7 @@ import java.util.List; * @Version: V1.0 */ @Service -public class PlatformProjectNameInfoEOServiceImpl extends ServiceImpl implements IPlatformProjectNameInfoEOService { +public class PlatformProjectNameInfoEOServiceImpl extends ServiceImpl implements IPlatformProjectNameInfoEOService { @Autowired private ProjectNameInfoEOMapper projectNameInfoEOMapper;