diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index e5eaf7717..77fd10153 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1208,4 +1208,8 @@ MODIFY COLUMN `work_progress_en` text CHARACTER SET utf8mb4 COLLATE utf8mb4_gene --参数收集清单 添加英文 UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Control Component' WHERE `id` = '84fec4a260dc646dc570cbf7cb581dab'; UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Component Value' WHERE `id` = '5d468613746f413a53fa0b485089839b'; -UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Validate Component' WHERE `id` = '608274a6a6dfed0e183093d9ea357436'; \ No newline at end of file +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Validate Component' WHERE `id` = '608274a6a6dfed0e183093d9ea357436'; + +--平台件项目库数据标识 +ALTER TABLE `laws_weilai`.`project_library_base` +ADD COLUMN `platform` varchar(255) NULL COMMENT '平台件项目库数据（platform=YES）' AFTER `brand`; 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/controller/PlatformProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLibraryBaseController.java index 0752c1b6a..9307bbfe8 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 @@ -8,7 +8,7 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.vo.DictModel; import com.jero.modules.project.entity.ProjectLibraryBase; -import com.jero.modules.platform.service.IPlatformIProjectLibraryBaseService; +import com.jero.modules.platform.service.IPlatformProjectLibraryBaseService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -44,9 +44,9 @@ import java.util.Map; @RestController @RequestMapping("/platform/projectLibraryBase") @Slf4j -public class PlatformProjectLibraryBaseController extends JeroController { +public class PlatformProjectLibraryBaseController extends JeroController { @Autowired - private IPlatformIProjectLibraryBaseService projectPlatformService; + private IPlatformProjectLibraryBaseService 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/controller/platformProjectNameInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/platformProjectNameInfoEOController.java index 5436884d1..b857754e3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/platformProjectNameInfoEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/platformProjectNameInfoEOController.java @@ -7,6 +7,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.platform.service.IPlatformProjectNameInfoEOService; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectNameInfoEO; import com.jero.modules.project.service.IProjectNameInfoEOService; @@ -44,7 +45,7 @@ import java.util.List; @Slf4j public class platformProjectNameInfoEOController extends JeroController { @Autowired - private IProjectNameInfoEOService projectNameInfoEOService; + private IPlatformProjectNameInfoEOService platformProjectNameInfoEOService; /** * 分页列表查询 @@ -64,7 +65,7 @@ public class platformProjectNameInfoEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(projectNameInfoEO, req.getParameterMap()); Page page = new Page(pageNo, pageSize); - IPage pageList = projectNameInfoEOService.page(page, queryWrapper); + IPage pageList = platformProjectNameInfoEOService.page(page, queryWrapper); return Result.OK(pageList); } @@ -77,7 +78,7 @@ public class platformProjectNameInfoEOController extends JeroController> queryList() { - List list = projectNameInfoEOService.queryList(); + List list = platformProjectNameInfoEOService.queryList(); return Result.OK(list); } /** @@ -89,7 +90,7 @@ public class platformProjectNameInfoEOController extends JeroController> queryProjectNameList(String cut) { - List list = projectNameInfoEOService.queryProjectNameList(cut); + List list = platformProjectNameInfoEOService.queryProjectNameList(cut); return Result.OK(list); } @@ -103,7 +104,7 @@ public class platformProjectNameInfoEOController extends JeroController add(@Validated @RequestBody ProjectNameInfoEO projectNameInfoEO) { - projectNameInfoEOService.add(projectNameInfoEO); + platformProjectNameInfoEOService.add(projectNameInfoEO); return Result.OK("添加成功！"); } @@ -117,7 +118,7 @@ public class platformProjectNameInfoEOController extends JeroController edit(@Validated @RequestBody ProjectNameInfoEO projectNameInfoEO) { - projectNameInfoEOService.editById(projectNameInfoEO); + platformProjectNameInfoEOService.editById(projectNameInfoEO); return Result.OK("编辑成功!"); } @@ -131,7 +132,7 @@ public class platformProjectNameInfoEOController extends JeroController delete(@RequestParam(name="id",required=true) String id) { - projectNameInfoEOService.deleteById(id); + platformProjectNameInfoEOService.deleteById(id); return Result.OK("删除成功!"); } @@ -145,7 +146,7 @@ public class platformProjectNameInfoEOController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.projectNameInfoEOService.deleteByIds(Arrays.asList(ids.split(","))); + this.platformProjectNameInfoEOService.deleteByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } @@ -159,7 +160,7 @@ public class platformProjectNameInfoEOController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { - ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOService.queryById(id); + ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOService.queryById(id); if(projectNameInfoEO==null) { return Result.error("未找到对应数据"); } @@ -198,6 +199,6 @@ public class platformProjectNameInfoEOController extends JeroController { +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/IPlatformIProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectLibraryBaseService.java similarity index 97% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformIProjectLibraryBaseService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectLibraryBaseService.java index 76b51e0d9..5b067b8be 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformIProjectLibraryBaseService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectLibraryBaseService.java @@ -20,7 +20,7 @@ import java.util.Map; * @Date: 2022-04-11 * @Version: V1.0 */ -public interface IPlatformIProjectLibraryBaseService extends IService { +public interface IPlatformProjectLibraryBaseService extends IService { /** * 保存 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java index 775043f28..3ddd759b8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java @@ -20,7 +20,6 @@ import com.jero.common.system.vo.LoginUser; import com.jero.common.util.DateUtils; import com.jero.common.util.oss.CosBootUtil; import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO; -import com.jero.modules.authDummy.service.IAuthDummyInventoryBaseEOService; import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; @@ -31,6 +30,11 @@ import com.jero.modules.feishu.enums.TemplateInfoEnum2; import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; +import com.jero.modules.platform.mapper.PlatformProjectCertificationInventoryEOMapper; +import com.jero.modules.platform.mapper.PlatformProjectLibraryBaseMapper; +import com.jero.modules.platform.service.IPlatformProjectCertificationInventoryEOService; +import com.jero.modules.platform.service.IPlatformProjectLawsInventoryEOService; +import com.jero.modules.platform.service.IPlatformProjectLibraryBaseService; import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEO; import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOEn; import com.jero.modules.project.entity.ProjectCertificationInventoryEO; @@ -54,16 +58,11 @@ import com.jero.modules.project.enums.ReviewResultEnum; 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.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper; import com.jero.modules.project.service.IProjectCertificationInventoryLogEOService; -import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.project.service.IProjectLibraryRoleRelEOService; import com.jero.modules.project.service.IProjectRelatedPersonnelService; import com.jero.modules.project.service.IProjectUserPermissionService; -import com.jero.modules.platform.mapper.PlatformProjectCertificationInventoryEOMapper; -import com.jero.modules.platform.service.IPlatformProjectCertificationInventoryEOService; -import com.jero.modules.platform.service.IPlatformProjectLawsInventoryEOService; import com.jero.modules.split.common.FileUnZip; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysDictItem; @@ -73,7 +72,6 @@ import com.jero.modules.system.enums.ProjectRoleEnum; import com.jero.modules.system.enums.SysCategoryValueTypeEnum; import com.jero.modules.system.mapper.SysCategoryMapper; 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.ISysCategoryService; import com.jero.modules.system.service.ISysDictItemService; @@ -168,7 +166,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI @Autowired private SysDictItemServiceImpl sysDictItemServiceImpl; @Autowired - private IProjectLibraryBaseService projectLibraryBaseService; + private IPlatformProjectLibraryBaseService platformProjectLibraryBaseService; @Autowired private IProcessInfoEOService processInfoEOService; @Autowired @@ -182,8 +180,6 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI @Autowired private IFeishuService feishuService; @Autowired - private IAuthDummyInventoryBaseEOService authDummyInventoryBaseEOService; - @Autowired private IAuthDummyInventoryInfoEOService authDummyInventoryInfoEOService; @Autowired private IProjectCertificationInventoryLogEOService projectCertificationInventoryLogEOService; @@ -200,7 +196,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI private IPlatformProjectLawsInventoryEOService platformProjectLawsInventoryEOService; @Autowired - private ProjectLibraryBaseMapper projectLibraryBaseMapper; + private PlatformProjectLibraryBaseMapper platformProjectLibraryBaseMapper; @Value(value = "${jero.backUrl}") @@ -222,8 +218,6 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI @Autowired private IOSSFileService iOSSFileService; @Autowired - private SysUserMapper sysUserMapper; - @Autowired private IProjectLibraryRoleRelEOService projectLibraryRoleRelEOService; @Autowired private IProcessHistoryEOService processHistoryEOService; @@ -360,7 +354,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI //获取当前项目库id的studio工程师和认证工程师 List studionList = new ArrayList<>(); List certificationEngineerList = new ArrayList<>(); - List projectLibraryBases = projectLibraryBaseService.queryById(projectId, cut); + List projectLibraryBases = platformProjectLibraryBaseService.queryById(projectId, cut); for(ProjectLibraryBase projectLibraryBase : projectLibraryBases){ studionList.add(projectLibraryBase.getStudioEngineer()); @@ -460,7 +454,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI }).collect(Collectors.toList()); if(CollectionUtils.isNotEmpty(oldPciEos)){ - ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId()); + ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId()); if(ObjectUtils.isNotEmpty(projectLibraryBase)){ int role = checkUserRole(oldPciEos.get(0).getProjectLibraryId(),currentUser.getId()); for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) { @@ -518,7 +512,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI }).collect(Collectors.toList()); if(CollectionUtils.isNotEmpty(oldPciEos)){ - ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId()); + ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId()); if(ObjectUtils.isNotEmpty(projectLibraryBase)){ int role = checkUserRole(oldPciEos.get(0).getProjectLibraryId(),currentUser.getId()); for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) { @@ -773,7 +767,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI }).collect(Collectors.toList()); if(CollectionUtils.isNotEmpty(oldPciEos)){ - ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId()); + ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId()); if(ObjectUtils.isNotEmpty(projectLibraryBase)){ // 同步更新待办中心-流程明细截止日期 this.syncProcessInfoDetailEndTime(newEndTime, oldPciEos); @@ -1023,7 +1017,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI // }).collect(Collectors.toList()); // // if (CollectionUtils.isNotEmpty(pciEoListTemp)) { -// ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(pciEoListTemp.get(0).getProjectLibraryId()); +// ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(pciEoListTemp.get(0).getProjectLibraryId()); // if(ObjectUtils.isNotEmpty(projectLibraryBase)){ // List userIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); // List userInfoList = this.sysUserService.querySysUserListByIdList(userIdList); @@ -1094,7 +1088,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI String contentEn){ LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectCertificationInventoryEOS.get(0).getProjectLibraryId()); + ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectCertificationInventoryEOS.get(0).getProjectLibraryId()); if(ObjectUtils.isNotEmpty(projectLibraryBase)){ String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 @@ -1555,7 +1549,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI } // 获取项目信息，获取认证工程师，给认证工程师分配待办任务 - ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId); if(ObjectUtils.isNotEmpty(projectLibraryBase)){ String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 @@ -1701,7 +1695,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI 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(); @@ -2216,7 +2210,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI } String projectLibraryId = json.getString("projectLibraryId"); - ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId); if(ObjectUtils.isEmpty(projectLibraryBase)){ throw new JeroBootException("无法获取项目库信息，项目库id为：" + projectLibraryId + " 请联系管理员！"); } @@ -3546,7 +3540,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI String operatorType = json.getString("operatorType"); String projectLibraryId = json.getString("projectLibraryId"); - ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId); if(ObjectUtils.isEmpty(projectLibraryBase)){ throw new JeroBootException("无法获取项目库信息，项目库id为：" + projectLibraryId + " 请联系管理员！"); } @@ -3689,7 +3683,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI String transferUserId = json.getString("transferUserId"); SysUser transferUserInfo = this.sysUserService.getById(transferUserId); - ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId); if(ObjectUtils.isEmpty(projectLibraryBase)){ throw new JeroBootException("无法获取项目库信息，项目库id为：" + projectLibraryId + " 请联系管理员！"); } @@ -3832,7 +3826,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI } String projectLibraryId = json.getString("projectLibraryId"); - ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId); String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 if(ObjectUtils.isEmpty(projectLibraryBase)){ @@ -5813,7 +5807,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI if(CollectionUtils.isNotEmpty(pciList)){ LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String projectLibraryId = pciList.get(0).getProjectLibraryId(); - ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId); if(ObjectUtils.isNotEmpty(projectLibraryBase)){ List studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(Arrays.asList(projectLibraryBase.getStudioEngineer().split(","))); @@ -6830,7 +6824,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI QueryWrapper 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(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue()); if(result == -1){ 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 { 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..ccba9111b 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.IPlatformProjectLibraryBaseService; +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; @@ -128,12 +122,9 @@ import java.util.stream.Collectors; * @Version: V1.0 */ @Service -public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl implements IPlatformIProjectLibraryBaseService { +public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl implements IPlatformProjectLibraryBaseService { @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..7da3631ee 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 @@ -3,16 +3,14 @@ package com.jero.modules.platform.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.system.vo.DictModel; +import com.jero.modules.platform.mapper.PlatformProjectNameInfoEOMapper; +import com.jero.modules.platform.service.IPlatformProjectNameInfoEOService; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectNameInfoEO; import com.jero.modules.project.entity.ProjectYearNameInfoEO; 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.service.IPlatformProjectNameInfoEOService; -import com.jero.modules.space.service.SpaceServiceImpl; import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.util.StringUtils; @@ -30,13 +28,7 @@ import java.util.List; * @Version: V1.0 */ @Service -public class PlatformProjectNameInfoEOServiceImpl extends ServiceImpl implements IPlatformProjectNameInfoEOService { - @Autowired - private ProjectNameInfoEOMapper projectNameInfoEOMapper; - - @Autowired - private SpaceServiceImpl spaceService; - +public class PlatformProjectNameInfoEOServiceImpl extends ServiceImpl implements IPlatformProjectNameInfoEOService { @Autowired private ProjectYearNameInfoEOServiceImpl projectYearNameInfoEOService; @Autowired