WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_20230912_Platform' into dev_20230912_Platform

Browse Source
This commit is contained in:
zyx.net
2023-09-13 14:53:03 +08:00
parent 5edd41fdaf bfa4fd8aa2
commit 85e37b756e
11 changed files with 196 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/db/蔚来标准sql/dev_third_record.sql
+5 -1
View File
@@ -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` = '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` = 'Component Value' WHERE `id` = '5d468613746f413a53fa0b485089839b';
UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Validate Component' WHERE `id` = '608274a6a6dfed0e183093d9ea357436'; 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`;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLawsInventoryEOController.java
+35 -35
View File
@@ -58,7 +58,7 @@ import java.util.Map;
@Slf4j @Slf4j
public class PlatformProjectLawsInventoryEOController extends JeroController<ProjectLawsInventoryEO, IProjectLawsInventoryEOService> { public class PlatformProjectLawsInventoryEOController extends JeroController<ProjectLawsInventoryEO, IProjectLawsInventoryEOService> {
@Autowired @Autowired
private IPlatformProjectLawsInventoryEOService projectLawsInventoryEOService; private IPlatformProjectLawsInventoryEOService platformProjectLawsInventoryEOService;
@Autowired @Autowired
private IBussDocumentLibraryEOService bussDocumentLibraryEOService; private IBussDocumentLibraryEOService bussDocumentLibraryEOService;
@Autowired @Autowired
@@ -80,7 +80,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
IPage<ProjectLawsInventoryEO> pageList = this.projectLawsInventoryEOService.queryPage(projectLawsInventoryEO,pageNo,pageSize,req); IPage<ProjectLawsInventoryEO> pageList = this.platformProjectLawsInventoryEOService.queryPage(projectLawsInventoryEO,pageNo,pageSize,req);
return Result.OK(pageList); return Result.OK(pageList);
} }
@@ -94,7 +94,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
@GetMapping(value = "/list") @GetMapping(value = "/list")
@RequiresPermissions("projectLawsInventory:list") @RequiresPermissions("projectLawsInventory:list")
public Result<List<ProjectLawsInventoryEO>> queryList(ProjectLawsInventoryEO projectLawsInventoryEO,HttpServletRequest req) { public Result<List<ProjectLawsInventoryEO>> queryList(ProjectLawsInventoryEO projectLawsInventoryEO,HttpServletRequest req) {
List<ProjectLawsInventoryEO> list = projectLawsInventoryEOService.queryList(projectLawsInventoryEO,req); List<ProjectLawsInventoryEO> list = platformProjectLawsInventoryEOService.queryList(projectLawsInventoryEO,req);
return Result.OK(projectLawsInventoryEO.getCut(),list); return Result.OK(projectLawsInventoryEO.getCut(),list);
} }
@@ -108,7 +108,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
@ApiOperation(value="项目库-法规清单表-添加", notes="项目库-法规清单表-添加") @ApiOperation(value="项目库-法规清单表-添加", notes="项目库-法规清单表-添加")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<?> add(@Validated @RequestBody ProjectLawsInventoryEO projectLawsInventoryEO) { public Result<?> add(@Validated @RequestBody ProjectLawsInventoryEO projectLawsInventoryEO) {
projectLawsInventoryEOService.add(projectLawsInventoryEO); platformProjectLawsInventoryEOService.add(projectLawsInventoryEO);
return Result.OK("添加成功！"); return Result.OK("添加成功！");
} }
@@ -122,7 +122,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
@ApiOperation(value="项目库-法规清单表-编辑", notes="项目库-法规清单表-编辑") @ApiOperation(value="项目库-法规清单表-编辑", notes="项目库-法规清单表-编辑")
@PutMapping(value = "/edit") @PutMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody ProjectLawsInventoryEO projectLawsInventoryEO) { public Result<?> edit(@Validated @RequestBody ProjectLawsInventoryEO projectLawsInventoryEO) {
projectLawsInventoryEOService.editById(projectLawsInventoryEO); platformProjectLawsInventoryEOService.editById(projectLawsInventoryEO);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }
@@ -138,7 +138,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
public Result<?> delete(@RequestParam(name="id",required=true) String id, public Result<?> delete(@RequestParam(name="id",required=true) String id,
@RequestParam(name="projectLibraryId",required=true) String projectLibraryId, @RequestParam(name="projectLibraryId",required=true) String projectLibraryId,
@RequestParam(name="cut",required=true) String cut) { @RequestParam(name="cut",required=true) String cut) {
projectLawsInventoryEOService.deleteById(id,projectLibraryId,cut); platformProjectLawsInventoryEOService.deleteById(id,projectLibraryId,cut);
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }
@@ -155,7 +155,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
String ids = json.getString("ids"); String ids = json.getString("ids");
String projectLibraryId = json.getString("projectLibraryId"); String projectLibraryId = json.getString("projectLibraryId");
String cut = json.getString("cut"); String cut = json.getString("cut");
this.projectLawsInventoryEOService.deleteByIds(Arrays.asList(ids.split(",")),projectLibraryId,cut); this.platformProjectLawsInventoryEOService.deleteByIds(Arrays.asList(ids.split(",")),projectLibraryId,cut);
return Result.OK("批量删除成功!"); return Result.OK("批量删除成功!");
} }
@@ -169,7 +169,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
@ApiOperation(value="项目库-法规清单表-通过id查询", notes="项目库-法规清单表-通过id查询") @ApiOperation(value="项目库-法规清单表-通过id查询", notes="项目库-法规清单表-通过id查询")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) { public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
ProjectLawsInventoryEO projectLawsInventoryEO = projectLawsInventoryEOService.queryById(id); ProjectLawsInventoryEO projectLawsInventoryEO = platformProjectLawsInventoryEOService.queryById(id);
if(projectLawsInventoryEO==null) { if(projectLawsInventoryEO==null) {
return Result.error("未找到对应数据"); return Result.error("未找到对应数据");
} }
@@ -208,7 +208,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
@ApiOperation(value="项目库-法规清单表-批量更新状态", notes="项目库-法规清单表-批量更新状态") @ApiOperation(value="项目库-法规清单表-批量更新状态", notes="项目库-法规清单表-批量更新状态")
@PostMapping(value = "/updateStatusBatch") @PostMapping(value = "/updateStatusBatch")
public Result<?> updateStatusBatch(@RequestBody JSONObject json) { public Result<?> updateStatusBatch(@RequestBody JSONObject json) {
return this.projectLawsInventoryEOService.updateStatusBatch(json); return this.platformProjectLawsInventoryEOService.updateStatusBatch(json);
} }
/** /**
@@ -220,7 +220,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
@ApiOperation(value="项目库-法规清单表-匹配相关人员", notes="项目库-法规清单表-匹配相关人员") @ApiOperation(value="项目库-法规清单表-匹配相关人员", notes="项目库-法规清单表-匹配相关人员")
@PostMapping(value = "/matchRelevantPeople") @PostMapping(value = "/matchRelevantPeople")
public Result<?> matchRelevantPeople(@RequestBody Map<String,Object> params){ public Result<?> matchRelevantPeople(@RequestBody Map<String,Object> params){
return this.projectLawsInventoryEOService.matchRelevantPeople(params); return this.platformProjectLawsInventoryEOService.matchRelevantPeople(params);
} }
/** /**
@@ -232,7 +232,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
@ApiOperation(value="项目库-法规清单表-流程调用", notes="项目库-法规清单表-流程调用") @ApiOperation(value="项目库-法规清单表-流程调用", notes="项目库-法规清单表-流程调用")
@PostMapping(value = "/processCall") @PostMapping(value = "/processCall")
public Result<?> processCall(@RequestBody JSONObject jsonObject){ public Result<?> processCall(@RequestBody JSONObject jsonObject){
return this.projectLawsInventoryEOService.processCall(jsonObject); return this.platformProjectLawsInventoryEOService.processCall(jsonObject);
} }
/** /**
@@ -244,7 +244,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
@ApiOperation(value="项目库-法规清单表-通过id与操作类型查询", notes="项目库-法规清单表-通过id与操作类型查询") @ApiOperation(value="项目库-法规清单表-通过id与操作类型查询", notes="项目库-法规清单表-通过id与操作类型查询")
@GetMapping(value = "/queryProjectLawsInventoryInfoById") @GetMapping(value = "/queryProjectLawsInventoryInfoById")
public Result<?> queryProjectLawsInventoryInfoById(@RequestParam Map<String,Object> params) { public Result<?> queryProjectLawsInventoryInfoById(@RequestParam Map<String,Object> params) {
List<ProjectLawsInventoryEO> result = projectLawsInventoryEOService.queryProjectLawsInventoryInfoById(params); List<ProjectLawsInventoryEO> result = platformProjectLawsInventoryEOService.queryProjectLawsInventoryInfoById(params);
return Result.OK((String) params.get("cut"),result); return Result.OK((String) params.get("cut"),result);
} }
@@ -272,7 +272,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
@RequestParam(name="cut",required=true) String cut, @RequestParam(name="cut",required=true) String cut,
@RequestParam(name="operateType",required=true) String operateType) { @RequestParam(name="operateType",required=true) String operateType) {
try { try {
projectLawsInventoryEOService.copyInfoByIds(ids,operateType); platformProjectLawsInventoryEOService.copyInfoByIds(ids,operateType);
} catch (Exception e) { } catch (Exception e) {
if(CutEnum.CN.getValue().equals(cut)){ if(CutEnum.CN.getValue().equals(cut)){
return Result.error("复制失败"); return Result.error("复制失败");
@@ -300,7 +300,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
public Result<?> setBatch(@RequestBody ProjectLawsInventoryEO projectLawsInventoryEO) { public Result<?> setBatch(@RequestBody ProjectLawsInventoryEO projectLawsInventoryEO) {
String cut = projectLawsInventoryEO.getCut(); String cut = projectLawsInventoryEO.getCut();
try { try {
projectLawsInventoryEOService.setBatch(projectLawsInventoryEO); platformProjectLawsInventoryEOService.setBatch(projectLawsInventoryEO);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
log.error("批量设置失败：" + e.getMessage()); log.error("批量设置失败：" + e.getMessage());
@@ -345,7 +345,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
@ApiOperation(value = "模板下载") @ApiOperation(value = "模板下载")
@GetMapping(value = "/exportTemplate") @GetMapping(value = "/exportTemplate")
public void exportTemplate(ProjectLawsInventoryEO projectLawsInventoryEO, HttpServletResponse response, HttpServletRequest request) throws Exception { public void exportTemplate(ProjectLawsInventoryEO projectLawsInventoryEO, HttpServletResponse response, HttpServletRequest request) throws Exception {
projectLawsInventoryEOService.exportTemplate(projectLawsInventoryEO,response,request); platformProjectLawsInventoryEOService.exportTemplate(projectLawsInventoryEO,response,request);
} }
/** /**
@@ -358,7 +358,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
public void exportData(HttpServletResponse response, public void exportData(HttpServletResponse response,
HttpServletRequest request, HttpServletRequest request,
ProjectLawsInventoryEO projectLawsInventoryEO) { ProjectLawsInventoryEO projectLawsInventoryEO) {
projectLawsInventoryEOService.exportData(response,request, projectLawsInventoryEO); platformProjectLawsInventoryEOService.exportData(response,request, projectLawsInventoryEO);
} }
/** /**
@@ -371,7 +371,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
@RequestMapping(value = "/importData", method = RequestMethod.POST) @RequestMapping(value = "/importData", method = RequestMethod.POST)
public Result<?> importData(@RequestParam(value = "file", required = false) MultipartFile file, public Result<?> importData(@RequestParam(value = "file", required = false) MultipartFile file,
ProjectLawsInventoryEO projectLawsInventoryEO) { ProjectLawsInventoryEO projectLawsInventoryEO) {
projectLawsInventoryEOService.importData(file,projectLawsInventoryEO); platformProjectLawsInventoryEOService.importData(file,projectLawsInventoryEO);
return Result.OK("导入成功"); return Result.OK("导入成功");
} }
@@ -380,14 +380,14 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
@ApiOperation(value="变更", notes="变更") @ApiOperation(value="变更", notes="变更")
@PostMapping(value = "/change") @PostMapping(value = "/change")
public Result<?> change(@RequestBody JSONObject params) { public Result<?> change(@RequestBody JSONObject params) {
return this.projectLawsInventoryEOService.change(params); return this.platformProjectLawsInventoryEOService.change(params);
} }
@AutoLog(value = "下载pdf报告") @AutoLog(value = "下载pdf报告")
@ApiOperation(value="下载pdf报告", notes="下载pdf报告") @ApiOperation(value="下载pdf报告", notes="下载pdf报告")
@GetMapping(value = "/downloadReport") @GetMapping(value = "/downloadReport")
public void downloadReport(@RequestParam Map<String,Object> params, HttpServletRequest req, HttpServletResponse resp) throws DocumentException { public void downloadReport(@RequestParam Map<String,Object> 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<Pro
@ApiOperation(value="下载docx报告", notes="下载docx报告") @ApiOperation(value="下载docx报告", notes="下载docx报告")
@GetMapping(value = "/downloadDocxReport") @GetMapping(value = "/downloadDocxReport")
public void downloadDocxReport(@RequestParam Map<String,Object> params, HttpServletRequest req, HttpServletResponse resp) throws DocumentException { public void downloadDocxReport(@RequestParam Map<String,Object> params, HttpServletRequest req, HttpServletResponse resp) throws DocumentException {
this.projectLawsInventoryEOService.downloadDocxReport(params,req,resp); this.platformProjectLawsInventoryEOService.downloadDocxReport(params,req,resp);
} }
@AutoLog(value = "催办") @AutoLog(value = "催办")
@ApiOperation(value="催办", notes="催办") @ApiOperation(value="催办", notes="催办")
@PostMapping(value = "/expediting") @PostMapping(value = "/expediting")
public Result<?> expediting(@RequestBody JSONObject json) { 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<Pro
@RequestMapping(value = "/getRoleByUserId", method = RequestMethod.GET) @RequestMapping(value = "/getRoleByUserId", method = RequestMethod.GET)
public Result<List<SysRole>> getRoleByUserId(String projectLibraryId,String cut) { public Result<List<SysRole>> getRoleByUserId(String projectLibraryId,String cut) {
Result<List<SysRole>> result = new Result<>(); Result<List<SysRole>> result = new Result<>();
List<SysRole> list = projectLawsInventoryEOService.getRoleByUserId(projectLibraryId,cut); List<SysRole> list = platformProjectLawsInventoryEOService.getRoleByUserId(projectLibraryId,cut);
if(list==null||list.size()<=0) { if(list==null||list.size()<=0) {
result.error500("未找到角色信息"); result.error500("未找到角色信息");
}else { }else {
@@ -462,7 +462,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
@ApiOperation(value="任务清单催办", notes="任务清单催办") @ApiOperation(value="任务清单催办", notes="任务清单催办")
@PostMapping(value = "/taskUrg") @PostMapping(value = "/taskUrg")
public Result<?> taskUrg(@RequestBody ProjectTaskUrgVo projectTaskUrgVo) { public Result<?> taskUrg(@RequestBody ProjectTaskUrgVo projectTaskUrgVo) {
return this.projectLawsInventoryEOService.taskUrg(projectTaskUrgVo); return this.platformProjectLawsInventoryEOService.taskUrg(projectTaskUrgVo);
} }
@@ -470,35 +470,35 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
@ApiOperation(value="项目库-法规清单表-根据项目库id更新符合性流程发起人、责任人接口", notes="项目库-法规清单表-根据项目库id更新符合性流程发起人、责任人接口") @ApiOperation(value="项目库-法规清单表-根据项目库id更新符合性流程发起人、责任人接口", notes="项目库-法规清单表-根据项目库id更新符合性流程发起人、责任人接口")
@GetMapping(value = "/updateFlowInfoByProjectLibraryIds") @GetMapping(value = "/updateFlowInfoByProjectLibraryIds")
public Result<?> updateFlowInfoByProjectLibraryIds(@RequestParam("projectLibraryIds") String projectLibraryIds){ public Result<?> updateFlowInfoByProjectLibraryIds(@RequestParam("projectLibraryIds") String projectLibraryIds){
return this.projectLawsInventoryEOService.updateFlowInfoByProjectLibraryIds(projectLibraryIds); return this.platformProjectLawsInventoryEOService.updateFlowInfoByProjectLibraryIds(projectLibraryIds);
} }
@AutoLog(value = "项目库-法规清单表-studio发布") @AutoLog(value = "项目库-法规清单表-studio发布")
@ApiOperation(value="项目库-法规清单表-studio发布", notes="项目库-法规清单表-studio发布") @ApiOperation(value="项目库-法规清单表-studio发布", notes="项目库-法规清单表-studio发布")
@PostMapping(value = "/studioPublish") @PostMapping(value = "/studioPublish")
public Result<?> studioPublish(@RequestBody JSONObject json) { public Result<?> studioPublish(@RequestBody JSONObject json) {
return this.projectLawsInventoryEOService.studioPublish(json); return this.platformProjectLawsInventoryEOService.studioPublish(json);
} }
@AutoLog(value = "项目库-法规清单表-studio撤回") @AutoLog(value = "项目库-法规清单表-studio撤回")
@ApiOperation(value="项目库-法规清单表-studio撤回", notes="项目库-法规清单表-studio撤回") @ApiOperation(value="项目库-法规清单表-studio撤回", notes="项目库-法规清单表-studio撤回")
@PostMapping(value = "/studioWithdrew") @PostMapping(value = "/studioWithdrew")
public Result<?> studioWithdrew(@RequestBody JSONObject json) { public Result<?> studioWithdrew(@RequestBody JSONObject json) {
return this.projectLawsInventoryEOService.studioWithdrew(json); return this.platformProjectLawsInventoryEOService.studioWithdrew(json);
} }
@AutoLog(value = "项目库-法规清单表-法规工程师退回") @AutoLog(value = "项目库-法规清单表-法规工程师退回")
@ApiOperation(value="项目库-法规清单表-法规工程师退回", notes="项目库-法规清单表-法规工程师退回") @ApiOperation(value="项目库-法规清单表-法规工程师退回", notes="项目库-法规清单表-法规工程师退回")
@PostMapping(value = "/regulationOwnerReturned") @PostMapping(value = "/regulationOwnerReturned")
public Result<?> regulationOwnerReturned(@RequestBody JSONObject json) { public Result<?> regulationOwnerReturned(@RequestBody JSONObject json) {
return this.projectLawsInventoryEOService.regulationOwnerReturned(json); return this.platformProjectLawsInventoryEOService.regulationOwnerReturned(json);
} }
@AutoLog(value = "流程重置-迁移法规清单流程历史数据专用") @AutoLog(value = "流程重置-迁移法规清单流程历史数据专用")
@ApiOperation(value="流程重置-迁移法规清单流程历史数据专用", notes="流程重置-迁移法规清单流程历史数据专用") @ApiOperation(value="流程重置-迁移法规清单流程历史数据专用", notes="流程重置-迁移法规清单流程历史数据专用")
@PostMapping(value = "/resetFlowTemp") @PostMapping(value = "/resetFlowTemp")
public Result<?> resetFlowTemp(@RequestBody JSONObject params) { 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<Pro
@ApiOperation(value="项目库-法规清单表-批量更新流程状态", notes="项目库-法规清单表-批量更新流程状态") @ApiOperation(value="项目库-法规清单表-批量更新流程状态", notes="项目库-法规清单表-批量更新流程状态")
@PostMapping(value = "/updateFlowStatusBatch") @PostMapping(value = "/updateFlowStatusBatch")
public Result<?> updateFlowStatusBatch(@RequestBody JSONObject json) { public Result<?> updateFlowStatusBatch(@RequestBody JSONObject json) {
return this.projectLawsInventoryEOService.updateFlowStatusBatch(json); return this.platformProjectLawsInventoryEOService.updateFlowStatusBatch(json);
} }
@AutoLog(value = "项目库-法规清单表-引用交付物") @AutoLog(value = "项目库-法规清单表-引用交付物")
@ApiOperation(value="项目库-法规清单表-引用交付物", notes="项目库-法规清单表-引用交付物") @ApiOperation(value="项目库-法规清单表-引用交付物", notes="项目库-法规清单表-引用交付物")
@PostMapping(value = "/citeDeliverable") @PostMapping(value = "/citeDeliverable")
public Result<?> citeDeliverable(@RequestBody JSONObject json) { public Result<?> citeDeliverable(@RequestBody JSONObject json) {
return this.projectLawsInventoryEOService.citeDeliverable(json); return this.platformProjectLawsInventoryEOService.citeDeliverable(json);
} }
@AutoLog(value = "项目库-法规清单表-强制转办") @AutoLog(value = "项目库-法规清单表-强制转办")
@ApiOperation(value="项目库-法规清单表-强制转办", notes="项目库-法规清单表-强制转办") @ApiOperation(value="项目库-法规清单表-强制转办", notes="项目库-法规清单表-强制转办")
@PostMapping(value = "/compulsoryTransfer") @PostMapping(value = "/compulsoryTransfer")
public Result<?> compulsoryTransfer(@RequestBody JSONObject json) { 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<Pro
@ApiOperation(value="项目库-法规清单表-通过projectId查询责任人", notes="项目库-法规清单表-通过projectId查询责任人") @ApiOperation(value="项目库-法规清单表-通过projectId查询责任人", notes="项目库-法规清单表-通过projectId查询责任人")
@GetMapping(value = "/queryDutyPersonByProjectId") @GetMapping(value = "/queryDutyPersonByProjectId")
public Result<?> queryDutyPersonByProjectId(@RequestParam Map<String,Object> params){ public Result<?> queryDutyPersonByProjectId(@RequestParam Map<String,Object> params){
Map<String, List<Map<String, Object>>> res = this.projectLawsInventoryEOService.queryDutyPersonByProjectId(params); Map<String, List<Map<String, Object>>> res = this.platformProjectLawsInventoryEOService.queryDutyPersonByProjectId(params);
return Result.OK(res); return Result.OK(res);
} }
@@ -548,7 +548,7 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
@ApiOperation(value="项目库-法规清单表-查询不符合项列表", notes="项目库-法规清单表-查询不符合项列表") @ApiOperation(value="项目库-法规清单表-查询不符合项列表", notes="项目库-法规清单表-查询不符合项列表")
@GetMapping(value = "/queryNotComplianList") @GetMapping(value = "/queryNotComplianList")
public Result<?> queryNotComplianList(@RequestParam Map<String,Object> params) { public Result<?> queryNotComplianList(@RequestParam Map<String,Object> params) {
List<Map<String,Object>> result = this.projectLawsInventoryEOService.queryNotComplianList(params); List<Map<String,Object>> result = this.platformProjectLawsInventoryEOService.queryNotComplianList(params);
Page pages = PageUtil.getPages(Integer.parseInt((String) params.get("pageNo")), Integer.parseInt((String) params.get("pageSize")), result); Page pages = PageUtil.getPages(Integer.parseInt((String) params.get("pageNo")), Integer.parseInt((String) params.get("pageSize")), result);
return Result.OK(pages); return Result.OK(pages);
} }
@@ -564,13 +564,13 @@ public class PlatformProjectLawsInventoryEOController extends JeroController<Pro
public void exportNotComplianList(HttpServletResponse response, public void exportNotComplianList(HttpServletResponse response,
HttpServletRequest request, HttpServletRequest request,
@RequestBody Map<String,Object> params) { @RequestBody Map<String,Object> params) {
this.projectLawsInventoryEOService.exportNotComplianList(response,request, params); this.platformProjectLawsInventoryEOService.exportNotComplianList(response,request, params);
} }
@AutoLog(value = "项目库-法规清单表-定版校验") @AutoLog(value = "项目库-法规清单表-定版校验")
@ApiOperation(value="项目库-法规清单表-定版校验", notes="项目库-法规清单表-定版校验") @ApiOperation(value="项目库-法规清单表-定版校验", notes="项目库-法规清单表-定版校验")
@GetMapping(value = "/finalizationVerify") @GetMapping(value = "/finalizationVerify")
public Result<?> finalizationVerify(@RequestParam Map<String,Object> params){ public Result<?> finalizationVerify(@RequestParam Map<String,Object> params){
return this.projectLawsInventoryEOService.finalizationVerify(params); return this.platformProjectLawsInventoryEOService.finalizationVerify(params);
} }
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLibraryBaseController.java
+24 -24
View File
@@ -8,7 +8,7 @@ import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.DictModel;
import com.jero.modules.project.entity.ProjectLibraryBase; 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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -44,9 +44,9 @@ import java.util.Map;
@RestController @RestController
@RequestMapping("/platform/projectLibraryBase") @RequestMapping("/platform/projectLibraryBase")
@Slf4j @Slf4j
public class PlatformProjectLibraryBaseController extends JeroController<ProjectLibraryBase, IPlatformIProjectLibraryBaseService> { public class PlatformProjectLibraryBaseController extends JeroController<ProjectLibraryBase, IPlatformProjectLibraryBaseService> {
@Autowired @Autowired
private IPlatformIProjectLibraryBaseService projectPlatformService; private IPlatformProjectLibraryBaseService platformIProjectLibraryBaseService;
/** /**
* 分页列表查询 * 分页列表查询
@@ -57,8 +57,8 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
@ApiOperation(value="项目库基础表-分页列表查询", notes="项目库基础表-分页列表查询") @ApiOperation(value="项目库基础表-分页列表查询", notes="项目库基础表-分页列表查询")
@PostMapping(value = "/page") @PostMapping(value = "/page")
public Result<?> queryPageList(@RequestBody Map<String,Object> params) { public Result<?> queryPageList(@RequestBody Map<String,Object> params) {
List<ProjectLibraryBase> pageList= projectPlatformService.queryPageList(params); List<ProjectLibraryBase> pageList= platformIProjectLibraryBaseService.queryPageList(params);
Page pages = projectPlatformService.getPages(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()), pageList); 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); return Result.OK(params.get("cut").toString(),pages);
} }
@@ -71,7 +71,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
@ApiOperation(value="项目库基础表-列表查询", notes="项目库基础表-列表查询") @ApiOperation(value="项目库基础表-列表查询", notes="项目库基础表-列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<List<ProjectLibraryBase>> queryList(ProjectLibraryBase projectLibraryBase) { public Result<List<ProjectLibraryBase>> queryList(ProjectLibraryBase projectLibraryBase) {
List<ProjectLibraryBase> list = projectPlatformService.getList(projectLibraryBase); List<ProjectLibraryBase> list = platformIProjectLibraryBaseService.getList(projectLibraryBase);
return Result.OK(list); return Result.OK(list);
} }
@@ -86,7 +86,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
@RequiresPermissions("projectLibraryBase:add") @RequiresPermissions("projectLibraryBase:add")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<?> add(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) throws ParseException { public Result<?> add(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) throws ParseException {
projectPlatformService.add(projectLibraryBase); platformIProjectLibraryBaseService.add(projectLibraryBase);
return Result.OK("添加成功！"); return Result.OK("添加成功！");
} }
/** /**
@@ -100,7 +100,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
@RequiresPermissions("projectLibraryBase:add") @RequiresPermissions("projectLibraryBase:add")
@PostMapping(value = "/addChild") @PostMapping(value = "/addChild")
public Result<?> addChild(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) throws ParseException { public Result<?> addChild(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) throws ParseException {
projectPlatformService.addChild(projectLibraryBase); platformIProjectLibraryBaseService.addChild(projectLibraryBase);
return Result.OK("添加成功！"); return Result.OK("添加成功！");
} }
@@ -115,7 +115,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
@RequiresPermissions("projectLibraryBase:edit") @RequiresPermissions("projectLibraryBase:edit")
@PutMapping(value = "/edit") @PutMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) { public Result<?> edit(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) {
projectPlatformService.editById(projectLibraryBase); platformIProjectLibraryBaseService.editById(projectLibraryBase);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }
@@ -131,7 +131,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id, public Result<?> delete(@RequestParam(name="id",required=true) String id,
@RequestParam(name="cut",required=true) String cut) { @RequestParam(name="cut",required=true) String cut) {
projectPlatformService.deleteById(id,cut); platformIProjectLibraryBaseService.deleteById(id,cut);
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }
@@ -147,7 +147,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
@DeleteMapping(value = "/deleteBatch") @DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids, public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids,
@RequestParam(name="cut",required=true) String cut) { @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("批量删除成功!"); return Result.OK("批量删除成功!");
} }
@@ -163,7 +163,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id, public Result<?> queryById(@RequestParam(name="id",required=true) String id,
@RequestParam(name="cut",required=true) String cut) { @RequestParam(name="cut",required=true) String cut) {
List<ProjectLibraryBase> data = projectPlatformService.queryById(id,cut); List<ProjectLibraryBase> data = platformIProjectLibraryBaseService.queryById(id,cut);
if(data==null) { if(data==null) {
return Result.error("未找到对应数据"); return Result.error("未找到对应数据");
} }
@@ -203,7 +203,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
@GetMapping(value = "/getProjectDetailsStatistics") @GetMapping(value = "/getProjectDetailsStatistics")
public Result<?> getProjectDetailsStatistics(@RequestParam(name="id",required=true) String id, public Result<?> getProjectDetailsStatistics(@RequestParam(name="id",required=true) String id,
@RequestParam(name="cut",required=true) String cut) { @RequestParam(name="cut",required=true) String cut) {
Map<String,Object> data = projectPlatformService.getProjectDetailsStatistics(id); Map<String,Object> data = platformIProjectLibraryBaseService.getProjectDetailsStatistics(id);
return Result.OK(cut,data); return Result.OK(cut,data);
} }
@@ -215,7 +215,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
@ApiOperation(value="项目详情-统计接口-根据领域分组", notes="项目详情-统计接口-根据领域分组") @ApiOperation(value="项目详情-统计接口-根据领域分组", notes="项目详情-统计接口-根据领域分组")
@GetMapping(value = "/getProjectDetailsStatisticsGroupByTerritory") @GetMapping(value = "/getProjectDetailsStatisticsGroupByTerritory")
public Result<?> getProjectDetailsStatisticsGroupByTerritory(@RequestParam Map<String,Object> params) { public Result<?> getProjectDetailsStatisticsGroupByTerritory(@RequestParam Map<String,Object> params) {
Map<String,Object> data = projectPlatformService.getProjectDetailsStatisticsGroupByTerritory(params); Map<String,Object> data = platformIProjectLibraryBaseService.getProjectDetailsStatisticsGroupByTerritory(params);
return Result.OK((String)params.get("cut"),data); return Result.OK((String)params.get("cut"),data);
} }
@@ -227,7 +227,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
*/ */
@RequestMapping(value = "/exportProjectDetailsStatisticsGroupByTerritoryXls") @RequestMapping(value = "/exportProjectDetailsStatisticsGroupByTerritoryXls")
public void exportProjectDetailsStatisticsGroupByTerritoryXls(HttpServletResponse response,HttpServletRequest request, @RequestParam Map<String,Object> params) { public void exportProjectDetailsStatisticsGroupByTerritoryXls(HttpServletResponse response,HttpServletRequest request, @RequestParam Map<String,Object> params) {
projectPlatformService.exportProjectDetailsStatisticsGroupByTerritoryXls(response,request, params); platformIProjectLibraryBaseService.exportProjectDetailsStatisticsGroupByTerritoryXls(response,request, params);
} }
@@ -241,7 +241,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
@ApiOperation(value="项目置顶,取消置顶(只置顶主项目)", notes="项目置顶,取消置顶(只置顶主项目)") @ApiOperation(value="项目置顶,取消置顶(只置顶主项目)", notes="项目置顶,取消置顶(只置顶主项目)")
@GetMapping(value = "/top") @GetMapping(value = "/top")
public Result<?> top(String id,String flag) { public Result<?> top(String id,String flag) {
projectPlatformService.top(id,flag); platformIProjectLibraryBaseService.top(id,flag);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }
@@ -254,7 +254,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
@ApiOperation(value="获取项目所有的版本(主版本和子版本的集合)", notes="获取项目所有的版本(主版本和子版本的集合)") @ApiOperation(value="获取项目所有的版本(主版本和子版本的集合)", notes="获取项目所有的版本(主版本和子版本的集合)")
@GetMapping(value = "/getVersionsInfo") @GetMapping(value = "/getVersionsInfo")
public Result<?> getVersionsInfo(String id) { public Result<?> getVersionsInfo(String id) {
List<String> versionsInfoList = projectPlatformService.getVersionsInfo(id); List<String> versionsInfoList = platformIProjectLibraryBaseService.getVersionsInfo(id);
return Result.OK(versionsInfoList); return Result.OK(versionsInfoList);
} }
@@ -266,8 +266,8 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
@ApiOperation(value="版本统计)", notes="版本统计") @ApiOperation(value="版本统计)", notes="版本统计")
@PostMapping(value = "/versionStatistics") @PostMapping(value = "/versionStatistics")
public Result<?> versionStatistics(@RequestBody Map<String,Object> params) { public Result<?> versionStatistics(@RequestBody Map<String,Object> params) {
List<ProjectLibraryBase> projectLibraryBasesList = projectPlatformService.versionStatistics(String.valueOf(params.get("id"))); List<ProjectLibraryBase> projectLibraryBasesList = platformIProjectLibraryBaseService.versionStatistics(String.valueOf(params.get("id")));
Page pages = projectPlatformService.getPages(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()), projectLibraryBasesList); Page pages = platformIProjectLibraryBaseService.getPages(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()), projectLibraryBasesList);
return Result.OK(pages); return Result.OK(pages);
} }
@@ -275,7 +275,7 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
@ApiOperation(value="对接火山引擎接口-获取项目统计信息1", notes="对接火山引擎接口-获取项目统计信息1") @ApiOperation(value="对接火山引擎接口-获取项目统计信息1", notes="对接火山引擎接口-获取项目统计信息1")
@PostMapping(value = "/getProjectInfo") @PostMapping(value = "/getProjectInfo")
public Result<?> getProjectInfo(){ public Result<?> getProjectInfo(){
JSONArray resList = projectPlatformService.getProjectInfo(); JSONArray resList = platformIProjectLibraryBaseService.getProjectInfo();
return Result.OK(resList); return Result.OK(resList);
} }
@@ -283,21 +283,21 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
@ApiOperation(value="对接火山引擎接口-获取项目统计信息2", notes="对接火山引擎接口-获取项目统计信息2") @ApiOperation(value="对接火山引擎接口-获取项目统计信息2", notes="对接火山引擎接口-获取项目统计信息2")
@PostMapping(value = "/getProjectProgressInfo") @PostMapping(value = "/getProjectProgressInfo")
public Result<?> getProjectProgressInfo(){ public Result<?> getProjectProgressInfo(){
JSONArray resList = this.projectPlatformService.getProjectProgressInfo(); JSONArray resList = this.platformIProjectLibraryBaseService.getProjectProgressInfo();
return Result.OK(resList); return Result.OK(resList);
} }
// 导出项目进度统计(状态导出) // 导出项目进度统计(状态导出)
@RequestMapping(value = "/exportProjectProgressStatisticsXls") @RequestMapping(value = "/exportProjectProgressStatisticsXls")
public void exportProjectProgressStatisticsXls(HttpServletResponse response,HttpServletRequest request, @RequestParam Map<String,Object> params) { public void exportProjectProgressStatisticsXls(HttpServletResponse response,HttpServletRequest request, @RequestParam Map<String,Object> params) {
this.projectPlatformService.exportProjectProgressStatisticsXls(response,request, params); this.platformIProjectLibraryBaseService.exportProjectProgressStatisticsXls(response,request, params);
} }
@AutoLog(value = "获取用户在该项目中所有的责任领域") @AutoLog(value = "获取用户在该项目中所有的责任领域")
@ApiOperation(value="获取用户在该项目中所有的责任领域", notes="获取用户在该项目中所有的责任领域") @ApiOperation(value="获取用户在该项目中所有的责任领域", notes="获取用户在该项目中所有的责任领域")
@GetMapping(value = "/getUserAllDutyTerritoryList") @GetMapping(value = "/getUserAllDutyTerritoryList")
public Result<List<DictModel>> getUserAllDutyTerritoryList(@RequestParam Map<String,Object> params){ public Result<List<DictModel>> getUserAllDutyTerritoryList(@RequestParam Map<String,Object> params){
List<DictModel> resList = this.projectPlatformService.getUserAllDutyTerritoryList(params); List<DictModel> resList = this.platformIProjectLibraryBaseService.getUserAllDutyTerritoryList(params);
return Result.OK(resList); return Result.OK(resList);
} }
@@ -305,6 +305,6 @@ public class PlatformProjectLibraryBaseController extends JeroController<Project
@ApiOperation(value="全局替换用户", notes="全局替换用户") @ApiOperation(value="全局替换用户", notes="全局替换用户")
@PostMapping(value = "/overallReplacementUser") @PostMapping(value = "/overallReplacementUser")
public Result<?> overallReplacementUser(@RequestBody JSONObject json){ public Result<?> overallReplacementUser(@RequestBody JSONObject json){
return this.projectPlatformService.overallReplacementUser(json); return this.platformIProjectLibraryBaseService.overallReplacementUser(json);
} }
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/platformProjectNameInfoEOController.java
+11 -10
View File
@@ -7,6 +7,7 @@ import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator; 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.ProjectLibraryBase;
import com.jero.modules.project.entity.ProjectNameInfoEO; import com.jero.modules.project.entity.ProjectNameInfoEO;
import com.jero.modules.project.service.IProjectNameInfoEOService; import com.jero.modules.project.service.IProjectNameInfoEOService;
@@ -44,7 +45,7 @@ import java.util.List;
@Slf4j @Slf4j
public class platformProjectNameInfoEOController extends JeroController<ProjectNameInfoEO, IProjectNameInfoEOService> { public class platformProjectNameInfoEOController extends JeroController<ProjectNameInfoEO, IProjectNameInfoEOService> {
@Autowired @Autowired
private IProjectNameInfoEOService projectNameInfoEOService; private IPlatformProjectNameInfoEOService platformProjectNameInfoEOService;
/** /**
* 分页列表查询 * 分页列表查询
@@ -64,7 +65,7 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<ProjectNameInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(projectNameInfoEO, req.getParameterMap()); QueryWrapper<ProjectNameInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(projectNameInfoEO, req.getParameterMap());
Page<ProjectNameInfoEO> page = new Page<ProjectNameInfoEO>(pageNo, pageSize); Page<ProjectNameInfoEO> page = new Page<ProjectNameInfoEO>(pageNo, pageSize);
IPage<ProjectNameInfoEO> pageList = projectNameInfoEOService.page(page, queryWrapper); IPage<ProjectNameInfoEO> pageList = platformProjectNameInfoEOService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);
} }
@@ -77,7 +78,7 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
@ApiOperation(value="项目名信息表-列表查询", notes="项目名信息表-列表查询") @ApiOperation(value="项目名信息表-列表查询", notes="项目名信息表-列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<List<ProjectNameInfoEO>> queryList() { public Result<List<ProjectNameInfoEO>> queryList() {
List<ProjectNameInfoEO> list = projectNameInfoEOService.queryList(); List<ProjectNameInfoEO> list = platformProjectNameInfoEOService.queryList();
return Result.OK(list); return Result.OK(list);
} }
/** /**
@@ -89,7 +90,7 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
@ApiOperation(value="返回项目全拼", notes="返回项目全拼") @ApiOperation(value="返回项目全拼", notes="返回项目全拼")
@GetMapping(value = "/queryProjectNameList") @GetMapping(value = "/queryProjectNameList")
public Result<List<ProjectLibraryBase>> queryProjectNameList(String cut) { public Result<List<ProjectLibraryBase>> queryProjectNameList(String cut) {
List<ProjectLibraryBase> list = projectNameInfoEOService.queryProjectNameList(cut); List<ProjectLibraryBase> list = platformProjectNameInfoEOService.queryProjectNameList(cut);
return Result.OK(list); return Result.OK(list);
} }
@@ -103,7 +104,7 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
@ApiOperation(value="项目名信息表-添加", notes="项目名信息表-添加") @ApiOperation(value="项目名信息表-添加", notes="项目名信息表-添加")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<?> add(@Validated @RequestBody ProjectNameInfoEO projectNameInfoEO) { public Result<?> add(@Validated @RequestBody ProjectNameInfoEO projectNameInfoEO) {
projectNameInfoEOService.add(projectNameInfoEO); platformProjectNameInfoEOService.add(projectNameInfoEO);
return Result.OK("添加成功！"); return Result.OK("添加成功！");
} }
@@ -117,7 +118,7 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
@ApiOperation(value="项目名信息表-编辑", notes="项目名信息表-编辑") @ApiOperation(value="项目名信息表-编辑", notes="项目名信息表-编辑")
@PutMapping(value = "/edit") @PutMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody ProjectNameInfoEO projectNameInfoEO) { public Result<?> edit(@Validated @RequestBody ProjectNameInfoEO projectNameInfoEO) {
projectNameInfoEOService.editById(projectNameInfoEO); platformProjectNameInfoEOService.editById(projectNameInfoEO);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }
@@ -131,7 +132,7 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
@ApiOperation(value="项目名信息表-通过id删除", notes="项目名信息表-通过id删除") @ApiOperation(value="项目名信息表-通过id删除", notes="项目名信息表-通过id删除")
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) { public Result<?> delete(@RequestParam(name="id",required=true) String id) {
projectNameInfoEOService.deleteById(id); platformProjectNameInfoEOService.deleteById(id);
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }
@@ -145,7 +146,7 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
@ApiOperation(value="项目名信息表-批量删除", notes="项目名信息表-批量删除") @ApiOperation(value="项目名信息表-批量删除", notes="项目名信息表-批量删除")
@DeleteMapping(value = "/deleteBatch") @DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) { public Result<?> 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("批量删除成功!"); return Result.OK("批量删除成功!");
} }
@@ -159,7 +160,7 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
@ApiOperation(value="项目名信息表-通过id查询", notes="项目名信息表-通过id查询") @ApiOperation(value="项目名信息表-通过id查询", notes="项目名信息表-通过id查询")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) { public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOService.queryById(id); ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOService.queryById(id);
if(projectNameInfoEO==null) { if(projectNameInfoEO==null) {
return Result.error("未找到对应数据"); return Result.error("未找到对应数据");
} }
@@ -198,6 +199,6 @@ public class platformProjectNameInfoEOController extends JeroController<ProjectN
// @ApiOperation(value="项目名信息表-space", notes="项目名信息表-space") // @ApiOperation(value="项目名信息表-space", notes="项目名信息表-space")
// @RequestMapping(value = "/getSpaceInfo", method = RequestMethod.POST) // @RequestMapping(value = "/getSpaceInfo", method = RequestMethod.POST)
// public void getSpaceInfo(@RequestParam(name="cut",required=true) String cut) { // public void getSpaceInfo(@RequestParam(name="cut",required=true) String cut) {
// projectNameInfoEOService.getSpaceInfo(cut); // platformProjectNameInfoEOService.getSpaceInfo(cut);
// } // }
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatpromProjectNameInfoEOMapper.java → jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatformProjectNameInfoEOMapper.java
+1 -1
View File
@@ -12,7 +12,7 @@ import java.util.List;
* @Date: 2022-04-18 * @Date: 2022-04-18
* @Version: V1.0 * @Version: V1.0
*/ */
public interface PlatpromProjectNameInfoEOMapper extends BaseMapper<ProjectNameInfoEO> { public interface PlatformProjectNameInfoEOMapper extends BaseMapper<ProjectNameInfoEO> {
@Select("select pni.id,pni.project_name,pyni.id as year_id,pyni.year_name,pni.vehicle_platform,pni.digital_platform\n" + @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" + "from project_name_info as pni\n" +
"left join project_year_name_info as pyni on pni.id=pyni.project_name_id;") "left join project_year_name_info as pyni on pni.id=pyni.project_name_id;")
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectNameInfoEOMapper.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.platform.mapper.PlatpromProjectNameInfoEOMapper"> <mapper namespace="com.jero.modules.platform.mapper.PlatformProjectNameInfoEOMapper">
<resultMap id="ProjectNameInfoEOResultMap" type="com.jero.modules.project.entity.ProjectNameInfoEO"> <resultMap id="ProjectNameInfoEOResultMap" type="com.jero.modules.project.entity.ProjectNameInfoEO">
<id column="id" property="id" /> <id column="id" property="id" />
<result column="create_by" property="createBy" /> <result column="create_by" property="createBy" />
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformIProjectLibraryBaseService.java → jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectLibraryBaseService.java
+1 -1
View File
@@ -20,7 +20,7 @@ import java.util.Map;
* @Date: 2022-04-11 * @Date: 2022-04-11
* @Version: V1.0 * @Version: V1.0
*/ */
public interface IPlatformIProjectLibraryBaseService extends IService<ProjectLibraryBase> { public interface IPlatformProjectLibraryBaseService extends IService<ProjectLibraryBase> {
/** /**
* 保存 * 保存
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+21 -27
View File
@@ -20,7 +20,6 @@ import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.DateUtils; import com.jero.common.util.DateUtils;
import com.jero.common.util.oss.CosBootUtil; import com.jero.common.util.oss.CosBootUtil;
import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO; 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.authDummy.service.IAuthDummyInventoryInfoEOService;
import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.entity.BussDocumentLibraryEO;
import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; 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.feishu.service.IFeishuService;
import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService; 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.ProjectCertificationInventoryDutyEnginnerEO;
import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOEn; import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOEn;
import com.jero.modules.project.entity.ProjectCertificationInventoryEO; 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.RoleRelModelTypeEnum;
import com.jero.modules.project.enums.TaskAffirmStatusEnum; import com.jero.modules.project.enums.TaskAffirmStatusEnum;
import com.jero.modules.project.enums.TaskStatusEnum; 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.mapper.ProjectRelatedPersonnelMapper;
import com.jero.modules.project.service.IProjectCertificationInventoryLogEOService; 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.IProjectLibraryRoleRelEOService;
import com.jero.modules.project.service.IProjectRelatedPersonnelService; import com.jero.modules.project.service.IProjectRelatedPersonnelService;
import com.jero.modules.project.service.IProjectUserPermissionService; 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.split.common.FileUnZip;
import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysCategory;
import com.jero.modules.system.entity.SysDictItem; 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.enums.SysCategoryValueTypeEnum;
import com.jero.modules.system.mapper.SysCategoryMapper; import com.jero.modules.system.mapper.SysCategoryMapper;
import com.jero.modules.system.mapper.SysRoleMapper; 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.IProjectUserDutyTerritoryService;
import com.jero.modules.system.service.ISysCategoryService; import com.jero.modules.system.service.ISysCategoryService;
import com.jero.modules.system.service.ISysDictItemService; import com.jero.modules.system.service.ISysDictItemService;
@@ -168,7 +166,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
@Autowired @Autowired
private SysDictItemServiceImpl sysDictItemServiceImpl; private SysDictItemServiceImpl sysDictItemServiceImpl;
@Autowired @Autowired
private IProjectLibraryBaseService projectLibraryBaseService; private IPlatformProjectLibraryBaseService platformProjectLibraryBaseService;
@Autowired @Autowired
private IProcessInfoEOService processInfoEOService; private IProcessInfoEOService processInfoEOService;
@Autowired @Autowired
@@ -182,8 +180,6 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
@Autowired @Autowired
private IFeishuService feishuService; private IFeishuService feishuService;
@Autowired @Autowired
private IAuthDummyInventoryBaseEOService authDummyInventoryBaseEOService;
@Autowired
private IAuthDummyInventoryInfoEOService authDummyInventoryInfoEOService; private IAuthDummyInventoryInfoEOService authDummyInventoryInfoEOService;
@Autowired @Autowired
private IProjectCertificationInventoryLogEOService projectCertificationInventoryLogEOService; private IProjectCertificationInventoryLogEOService projectCertificationInventoryLogEOService;
@@ -200,7 +196,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
private IPlatformProjectLawsInventoryEOService platformProjectLawsInventoryEOService; private IPlatformProjectLawsInventoryEOService platformProjectLawsInventoryEOService;
@Autowired @Autowired
private ProjectLibraryBaseMapper projectLibraryBaseMapper; private PlatformProjectLibraryBaseMapper platformProjectLibraryBaseMapper;
@Value(value = "${jero.backUrl}") @Value(value = "${jero.backUrl}")
@@ -222,8 +218,6 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
@Autowired @Autowired
private IOSSFileService iOSSFileService; private IOSSFileService iOSSFileService;
@Autowired @Autowired
private SysUserMapper sysUserMapper;
@Autowired
private IProjectLibraryRoleRelEOService projectLibraryRoleRelEOService; private IProjectLibraryRoleRelEOService projectLibraryRoleRelEOService;
@Autowired @Autowired
private IProcessHistoryEOService processHistoryEOService; private IProcessHistoryEOService processHistoryEOService;
@@ -360,7 +354,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
//获取当前项目库id的studio工程师和认证工程师 //获取当前项目库id的studio工程师和认证工程师
List<String> studionList = new ArrayList<>(); List<String> studionList = new ArrayList<>();
List<String> certificationEngineerList = new ArrayList<>(); List<String> certificationEngineerList = new ArrayList<>();
List<ProjectLibraryBase> projectLibraryBases = projectLibraryBaseService.queryById(projectId, cut); List<ProjectLibraryBase> projectLibraryBases = platformProjectLibraryBaseService.queryById(projectId, cut);
for(ProjectLibraryBase projectLibraryBase : projectLibraryBases){ for(ProjectLibraryBase projectLibraryBase : projectLibraryBases){
studionList.add(projectLibraryBase.getStudioEngineer()); studionList.add(projectLibraryBase.getStudioEngineer());
@@ -460,7 +454,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
}).collect(Collectors.toList()); }).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(oldPciEos)){ 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)){ if(ObjectUtils.isNotEmpty(projectLibraryBase)){
int role = checkUserRole(oldPciEos.get(0).getProjectLibraryId(),currentUser.getId()); int role = checkUserRole(oldPciEos.get(0).getProjectLibraryId(),currentUser.getId());
for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) { for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) {
@@ -518,7 +512,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
}).collect(Collectors.toList()); }).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(oldPciEos)){ 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)){ if(ObjectUtils.isNotEmpty(projectLibraryBase)){
int role = checkUserRole(oldPciEos.get(0).getProjectLibraryId(),currentUser.getId()); int role = checkUserRole(oldPciEos.get(0).getProjectLibraryId(),currentUser.getId());
for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) { for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) {
@@ -773,7 +767,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
}).collect(Collectors.toList()); }).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(oldPciEos)){ 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)){ if(ObjectUtils.isNotEmpty(projectLibraryBase)){
// 同步更新待办中心-流程明细截止日期 // 同步更新待办中心-流程明细截止日期
this.syncProcessInfoDetailEndTime(newEndTime, oldPciEos); this.syncProcessInfoDetailEndTime(newEndTime, oldPciEos);
@@ -1023,7 +1017,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
// }).collect(Collectors.toList()); // }).collect(Collectors.toList());
// //
// if (CollectionUtils.isNotEmpty(pciEoListTemp)) { // 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)){ // if(ObjectUtils.isNotEmpty(projectLibraryBase)){
// List<String> userIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); // List<String> userIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
// List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList); // List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
@@ -1094,7 +1088,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
String contentEn){ String contentEn){
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); 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)){ if(ObjectUtils.isNotEmpty(projectLibraryBase)){
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 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)){ if(ObjectUtils.isNotEmpty(projectLibraryBase)){
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -1701,7 +1695,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//项目详情中取R&H Studio和认证工程师 //项目详情中取R&H Studio和认证工程师
List<ProjectLibraryBase> projectLibraryBases = projectLibraryBaseService.queryById(projectLibraryId,null); List<ProjectLibraryBase> projectLibraryBases = platformProjectLibraryBaseService.queryById(projectLibraryId,null);
String certificationEngineerName = ""; String certificationEngineerName = "";
if(projectLibraryBases.size() != 0){ if(projectLibraryBases.size() != 0){
certificationEngineerName = projectLibraryBases.get(0).getCertificationEngineerName(); certificationEngineerName = projectLibraryBases.get(0).getCertificationEngineerName();
@@ -2216,7 +2210,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
} }
String projectLibraryId = json.getString("projectLibraryId"); String projectLibraryId = json.getString("projectLibraryId");
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
if(ObjectUtils.isEmpty(projectLibraryBase)){ if(ObjectUtils.isEmpty(projectLibraryBase)){
throw new JeroBootException("无法获取项目库信息，项目库id为：" + projectLibraryId + " 请联系管理员！"); throw new JeroBootException("无法获取项目库信息，项目库id为：" + projectLibraryId + " 请联系管理员！");
} }
@@ -3546,7 +3540,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
String operatorType = json.getString("operatorType"); String operatorType = json.getString("operatorType");
String projectLibraryId = json.getString("projectLibraryId"); String projectLibraryId = json.getString("projectLibraryId");
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
if(ObjectUtils.isEmpty(projectLibraryBase)){ if(ObjectUtils.isEmpty(projectLibraryBase)){
throw new JeroBootException("无法获取项目库信息，项目库id为：" + projectLibraryId + " 请联系管理员！"); throw new JeroBootException("无法获取项目库信息，项目库id为：" + projectLibraryId + " 请联系管理员！");
} }
@@ -3689,7 +3683,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
String transferUserId = json.getString("transferUserId"); String transferUserId = json.getString("transferUserId");
SysUser transferUserInfo = this.sysUserService.getById(transferUserId); SysUser transferUserInfo = this.sysUserService.getById(transferUserId);
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
if(ObjectUtils.isEmpty(projectLibraryBase)){ if(ObjectUtils.isEmpty(projectLibraryBase)){
throw new JeroBootException("无法获取项目库信息，项目库id为：" + projectLibraryId + " 请联系管理员！"); throw new JeroBootException("无法获取项目库信息，项目库id为：" + projectLibraryId + " 请联系管理员！");
} }
@@ -3832,7 +3826,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
} }
String projectLibraryId = json.getString("projectLibraryId"); String projectLibraryId = json.getString("projectLibraryId");
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
if(ObjectUtils.isEmpty(projectLibraryBase)){ if(ObjectUtils.isEmpty(projectLibraryBase)){
@@ -5813,7 +5807,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
if(CollectionUtils.isNotEmpty(pciList)){ if(CollectionUtils.isNotEmpty(pciList)){
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String projectLibraryId = pciList.get(0).getProjectLibraryId(); String projectLibraryId = pciList.get(0).getProjectLibraryId();
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
if(ObjectUtils.isNotEmpty(projectLibraryBase)){ if(ObjectUtils.isNotEmpty(projectLibraryBase)){
List<SysUser> studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(Arrays.asList(projectLibraryBase.getStudioEngineer().split(","))); List<SysUser> studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(Arrays.asList(projectLibraryBase.getStudioEngineer().split(",")));
@@ -6830,7 +6824,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
QueryWrapper<ProjectLibraryBase> projectLibraryBaseQueryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectLibraryBase> projectLibraryBaseQueryWrapper = new QueryWrapper<>();
projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId, projectLibraryId); projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId, projectLibraryId);
projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getStudioEngineer, currentUserId); projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getStudioEngineer, currentUserId);
Integer projectLibrayBaseCount = projectLibraryBaseMapper.selectCount(projectLibraryBaseQueryWrapper); Integer projectLibrayBaseCount = platformProjectLibraryBaseMapper.selectCount(projectLibraryBaseQueryWrapper);
if (projectLibrayBaseCount > 0) { if (projectLibrayBaseCount > 0) {
result = Integer.parseInt(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue()); result = Integer.parseInt(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue());
if(result == -1){ if(result == -1){
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+40 -63
View File
@@ -55,6 +55,10 @@ import com.jero.modules.feishu.vo.FeishuMsgVo;
import com.jero.modules.message.websocket.WebSocket; import com.jero.modules.message.websocket.WebSocket;
import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService; 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.ConditionAssessmentEO;
import com.jero.modules.project.entity.ProblemManagementEO; import com.jero.modules.project.entity.ProblemManagementEO;
import com.jero.modules.project.entity.ProjectLawsInventoryEO; 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.TaskAffirmStatusEnum;
import com.jero.modules.project.enums.TaskStatusEnum; import com.jero.modules.project.enums.TaskStatusEnum;
import com.jero.modules.project.mapper.ProblemManagementEOMapper; 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.ProjectRelatedPersonnelMapper;
import com.jero.modules.project.mapper.ProjectYearNameInfoEOMapper; import com.jero.modules.project.mapper.ProjectYearNameInfoEOMapper;
import com.jero.modules.project.service.IConditionAssessmentEOService; 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.IProjectLawsInventoryRejectCauseEOService;
import com.jero.modules.project.service.IProjectLibraryRoleRelEOService;
import com.jero.modules.project.service.IProjectRelatedPersonnelService; import com.jero.modules.project.service.IProjectRelatedPersonnelService;
import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService; import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService;
import com.jero.modules.project.service.IProjectTaskInventoryEOService; 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.IProjectUserPermissionService;
import com.jero.modules.project.service.editImpl.ProjectLawsInventoryEOEditServiceImpl; import com.jero.modules.project.service.editImpl.ProjectLawsInventoryEOEditServiceImpl;
import com.jero.modules.project.service.impl.ProblemManagementEOServiceImpl; import com.jero.modules.project.service.impl.ProblemManagementEOServiceImpl;
import com.jero.modules.project.service.impl.ProjectLawsInventoryLogEOServiceImpl; 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.service.impl.ProjectRelatedPersonnelServiceImpl;
import com.jero.modules.project.util.WordUtil; import com.jero.modules.project.util.WordUtil;
import com.jero.modules.project.vo.NcrTrackVO; import com.jero.modules.project.vo.NcrTrackVO;
import com.jero.modules.project.vo.ProblemManagementVO; import com.jero.modules.project.vo.ProblemManagementVO;
import com.jero.modules.project.vo.ProjectTaskUrgVo; 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.split.common.FileUnZip;
import com.jero.modules.system.entity.SysAnnouncement; import com.jero.modules.system.entity.SysAnnouncement;
import com.jero.modules.system.entity.SysCategory; 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.entity.SysUser;
import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.enums.DicCodeEnum;
import com.jero.modules.system.mapper.SysCategoryMapper; 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.SysRoleMapper;
import com.jero.modules.system.mapper.SysUserMapper; import com.jero.modules.system.mapper.SysUserMapper;
import com.jero.modules.system.service.IProjectUserDutyTerritoryService; import com.jero.modules.system.service.IProjectUserDutyTerritoryService;
import com.jero.modules.system.service.ISysAnnouncementService; 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.ISysDictService;
import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.ISysUserService;
import com.jero.modules.system.service.impl.SysCategoryServiceImpl; 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.entity.ProcessHistoryEO;
import com.jero.modules.wkflow.enums.DesignComplianceNodeEnum; import com.jero.modules.wkflow.enums.DesignComplianceNodeEnum;
import com.jero.modules.wkflow.enums.FlowTypeEnum; 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.feginClient.impl.WorkFlowFeignClientImpl;
import com.jero.modules.wkflow.service.IProcessHistoryEOService; import com.jero.modules.wkflow.service.IProcessHistoryEOService;
import com.jero.modules.wkflow.service.impl.ProcessHistoryEOServiceImpl; import com.jero.modules.wkflow.service.impl.ProcessHistoryEOServiceImpl;
@@ -240,7 +233,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
private static DecimalFormat df = new DecimalFormat("#.00"); private static DecimalFormat df = new DecimalFormat("#.00");
private static String percentSign = "%"; private static String percentSign = "%";
@Autowired @Autowired
private ProjectLibraryBaseMapper projectLibraryBaseMapper; private PlatformProjectLibraryBaseMapper platformProjectLibraryBaseMapper;
@Autowired @Autowired
private SysUserMapper sysUserMapper; private SysUserMapper sysUserMapper;
@@ -267,7 +260,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
private ProjectRelatedPersonnelMapper projectRelatedPersonnelMapper; private ProjectRelatedPersonnelMapper projectRelatedPersonnelMapper;
@Autowired @Autowired
private ProjectNameInfoEOMapper projectNameInfoEOMapper; private PlatformProjectNameInfoEOMapper platformProjectNameInfoEOMapper;
@Autowired @Autowired
private ProjectYearNameInfoEOMapper projectYearNameInfoEOMapper; private ProjectYearNameInfoEOMapper projectYearNameInfoEOMapper;
@@ -278,12 +271,6 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
@Autowired @Autowired
private IProjectTaskInventoryDetailEOService projectTaskInventoryDetailEOService; private IProjectTaskInventoryDetailEOService projectTaskInventoryDetailEOService;
@Autowired
private IProjectTaskInventoryFeedbackEOService projectTaskInventoryFeedbackEOService;
@Autowired
private IFeedbackHistoryService feedbackHistoryService;
@Autowired @Autowired
private IDummyInventoryInfoEOService dummyInventoryInfoEOService; private IDummyInventoryInfoEOService dummyInventoryInfoEOService;
@Value(value = "${jero.path.upload}") @Value(value = "${jero.path.upload}")
@@ -310,9 +297,6 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
@Autowired @Autowired
private DummyInventoryBaseEOServiceImpl dummyInventoryBaseEOService; private DummyInventoryBaseEOServiceImpl dummyInventoryBaseEOService;
@Autowired
private SysDictItemMapper sysDictItemMapper;
@Autowired @Autowired
private IProcessHistoryEOService processHistoryEOService; private IProcessHistoryEOService processHistoryEOService;
@@ -324,15 +308,12 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
@Autowired @Autowired
SysCategoryMapper sysCategoryMapper; SysCategoryMapper sysCategoryMapper;
@Autowired
private TaskFeignClientImpl taskFeignClient;
@Autowired @Autowired
SysRoleMapper sysRoleMapper; SysRoleMapper sysRoleMapper;
@Autowired @Autowired
ProjectLibraryBaseServiceImpl projectLibraryBaseService; private PlatformProjectLibraryBaseServiceImpl platformProjectLibraryBaseService;
@Autowired @Autowired
ProjectRelatedPersonnelServiceImpl projectRelatedPersonnelService; private ProjectRelatedPersonnelServiceImpl projectRelatedPersonnelService;
@Autowired @Autowired
private IProjectLawsInventoryRejectCauseEOService projectLawsInventoryRejectCauseEOService; private IProjectLawsInventoryRejectCauseEOService projectLawsInventoryRejectCauseEOService;
@@ -353,10 +334,6 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
@Autowired @Autowired
private IProjectUserDutyTerritoryService projectUserDutyTerritoryService; private IProjectUserDutyTerritoryService projectUserDutyTerritoryService;
@Autowired
private ISysDictItemService sysDictItemService;
@Autowired
private IProjectLibraryRoleRelEOService projectLibraryRoleRelEOService;
@Autowired @Autowired
private ProjectLawsInventoryEOEditServiceImpl editService; private ProjectLawsInventoryEOEditServiceImpl editService;
@Autowired @Autowired
@@ -1937,7 +1914,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
} }
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
try { try {
ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(new QueryWrapper<ProjectLibraryBase>() ProjectLibraryBase projectLibraryBase = platformProjectLibraryBaseMapper.selectOne(new QueryWrapper<ProjectLibraryBase>()
.lambda().eq(ProjectLibraryBase::getId, projectLibraryId)); .lambda().eq(ProjectLibraryBase::getId, projectLibraryId));
// studio信息 // studio信息
@@ -1947,7 +1924,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
QueryWrapper<ProjectNameInfoEO> projectNameInfoEOQueryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectNameInfoEO> projectNameInfoEOQueryWrapper = new QueryWrapper<>();
projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId()); projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId());
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId, projectLibraryBase.getYearNameId()); projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId, projectLibraryBase.getYearNameId());
@@ -2530,7 +2507,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
//项目库信息(获取studio) //项目库信息(获取studio)
LambdaQueryWrapper<ProjectLibraryBase> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProjectLibraryBase> wrapper = new LambdaQueryWrapper<>();
wrapper.in(ProjectLibraryBase::getId, projectLibraryId); wrapper.in(ProjectLibraryBase::getId, projectLibraryId);
List<ProjectLibraryBase> projectLibraryBases = projectLibraryBaseMapper.selectList(wrapper); List<ProjectLibraryBase> projectLibraryBases = platformProjectLibraryBaseMapper.selectList(wrapper);
String studioEngineer = ""; String studioEngineer = "";
if (projectLibraryBases.size() != 0) { if (projectLibraryBases.size() != 0) {
studioEngineer = projectLibraryBases.get(0).getStudioEngineer(); studioEngineer = projectLibraryBases.get(0).getStudioEngineer();
@@ -2930,7 +2907,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
String templateId = jsonObject.getString("templateId"); String templateId = jsonObject.getString("templateId");
String projectLibraryId = (String) prarams.get("projectLibraryId"); String projectLibraryId = (String) prarams.get("projectLibraryId");
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
if (ObjectUtils.isNotEmpty(projectLibraryBase)) { if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -3054,7 +3031,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
String projectLibraryId = jsonObject.getString("projectLibraryId"); //项目库id String projectLibraryId = jsonObject.getString("projectLibraryId"); //项目库id
String engineeringInterfacePerson = jsonObject.getString("engineeringInterfacePerson"); //工程接口人id String engineeringInterfacePerson = jsonObject.getString("engineeringInterfacePerson"); //工程接口人id
ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(new QueryWrapper<ProjectLibraryBase>() ProjectLibraryBase projectLibraryBase = platformProjectLibraryBaseMapper.selectOne(new QueryWrapper<ProjectLibraryBase>()
.lambda().eq(ProjectLibraryBase::getId, projectLibraryId)); .lambda().eq(ProjectLibraryBase::getId, projectLibraryId));
ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectOne( ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectOne(
@@ -3067,7 +3044,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
QueryWrapper<ProjectNameInfoEO> projectNameInfoEOQueryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectNameInfoEO> projectNameInfoEOQueryWrapper = new QueryWrapper<>();
projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId()); projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId());
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId, projectLibraryBase.getYearNameId()); projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId, projectLibraryBase.getYearNameId());
@@ -3091,7 +3068,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
String enContentLower = "";//英文下部分 String enContentLower = "";//英文下部分
String color = "";//颜色 String color = "";//颜色
ProjectLibraryBase LibraryBase = projectLibraryBaseService.queryById(projectLibraryId, CutEnum.EN.getValue()).get(0); ProjectLibraryBase LibraryBase = platformProjectLibraryBaseService.queryById(projectLibraryId, CutEnum.EN.getValue()).get(0);
String PRN = LibraryBase.getProjectName();//项目名称 String PRN = LibraryBase.getProjectName();//项目名称
String LAW_CN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle();//法规 String LAW_CN = projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle();//法规
BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(projectLawsInventoryEO.getStandId()); BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(projectLawsInventoryEO.getStandId());
@@ -5021,7 +4998,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
paramsMsg.put("userIdList", userIdList); paramsMsg.put("userIdList", userIdList);
paramsMsg.put("serialNumbers", serialNumbers); paramsMsg.put("serialNumbers", serialNumbers);
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
if (ObjectUtils.isNotEmpty(projectLibraryBase)) { if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -7120,12 +7097,12 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
QueryWrapper<ProjectLibraryBase> libraryBaseQueryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectLibraryBase> libraryBaseQueryWrapper = new QueryWrapper<>();
libraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId, projectLawsInventoryEO.getProjectLibraryId()); libraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId, projectLawsInventoryEO.getProjectLibraryId());
ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(libraryBaseQueryWrapper); ProjectLibraryBase projectLibraryBase = platformProjectLibraryBaseMapper.selectOne(libraryBaseQueryWrapper);
params.put("projectLibraryBase", projectLibraryBase); params.put("projectLibraryBase", projectLibraryBase);
QueryWrapper<ProjectNameInfoEO> projectNameQueryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectNameInfoEO> projectNameQueryWrapper = new QueryWrapper<>();
projectNameQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId()); projectNameQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId());
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameQueryWrapper); ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOMapper.selectOne(projectNameQueryWrapper);
params.put("projectNameInfoEO", projectNameInfoEO); params.put("projectNameInfoEO", projectNameInfoEO);
//设置ProgramInformation内容 //设置ProgramInformation内容
@@ -7606,12 +7583,12 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
QueryWrapper<ProjectLibraryBase> libraryBaseQueryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectLibraryBase> libraryBaseQueryWrapper = new QueryWrapper<>();
libraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId, projectLawsInventoryEO.getProjectLibraryId()); libraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId, projectLawsInventoryEO.getProjectLibraryId());
ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(libraryBaseQueryWrapper); ProjectLibraryBase projectLibraryBase = platformProjectLibraryBaseMapper.selectOne(libraryBaseQueryWrapper);
params.put("projectLibraryBase", projectLibraryBase); params.put("projectLibraryBase", projectLibraryBase);
QueryWrapper<ProjectNameInfoEO> projectNameQueryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectNameInfoEO> projectNameQueryWrapper = new QueryWrapper<>();
projectNameQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId()); projectNameQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId());
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameQueryWrapper); ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOMapper.selectOne(projectNameQueryWrapper);
params.put("projectNameInfoEO", projectNameInfoEO); params.put("projectNameInfoEO", projectNameInfoEO);
@@ -8008,7 +7985,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
QueryWrapper<ProjectLibraryBase> libraryBaseQueryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectLibraryBase> libraryBaseQueryWrapper = new QueryWrapper<>();
libraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId,projectLibraryId); libraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId,projectLibraryId);
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseMapper.selectOne(libraryBaseQueryWrapper); ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseMapper.selectOne(libraryBaseQueryWrapper);
SysUser studioUserInfo = this.sysUserMapper.selectOne( SysUser studioUserInfo = this.sysUserMapper.selectOne(
new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer()) new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer())
@@ -8039,7 +8016,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
QueryWrapper<ProjectNameInfoEO> projectNameInfoEOQueryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectNameInfoEO> projectNameInfoEOQueryWrapper = new QueryWrapper<>();
projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId()); projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId());
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId()); projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId());
@@ -8133,7 +8110,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
QueryWrapper<ProjectNameInfoEO> projectNameInfoEOQueryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectNameInfoEO> projectNameInfoEOQueryWrapper = new QueryWrapper<>();
projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId()); projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId());
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId()); projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId());
@@ -8253,7 +8230,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
params.put("userIdList", userIdList); params.put("userIdList", userIdList);
params.put("serialNumbers", serialNumbers); params.put("serialNumbers", serialNumbers);
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
if (ObjectUtils.isNotEmpty(projectLibraryBase)) { if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -8321,7 +8298,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
params.put("flowTypeCn","验证符合性流程"); params.put("flowTypeCn","验证符合性流程");
params.put("flowTypeEn","Validation Compliance Process"); params.put("flowTypeEn","Validation Compliance Process");
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
if (ObjectUtils.isNotEmpty(projectLibraryBase)) { if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -8388,7 +8365,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
params.put("userIdList", userIdList); params.put("userIdList", userIdList);
params.put("serialNumbers", serialNumbers); params.put("serialNumbers", serialNumbers);
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
if (ObjectUtils.isNotEmpty(projectLibraryBase)) { if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -8454,7 +8431,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
params.put("userIdList", userIdList); params.put("userIdList", userIdList);
params.put("serialNumbers", serialNumbers); params.put("serialNumbers", serialNumbers);
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
if (ObjectUtils.isNotEmpty(projectLibraryBase)) { if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -8513,7 +8490,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
params.put("userIdList", userIdList); params.put("userIdList", userIdList);
params.put("serialNumbers", serialNumbers); params.put("serialNumbers", serialNumbers);
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
if (ObjectUtils.isNotEmpty(projectLibraryBase)) { if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -8581,7 +8558,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
params.put("flowTypeCn","设计符合性流程"); params.put("flowTypeCn","设计符合性流程");
params.put("flowTypeEn","Design Compliance Process"); params.put("flowTypeEn","Design Compliance Process");
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
if (ObjectUtils.isNotEmpty(projectLibraryBase)) { if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -8648,7 +8625,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
params.put("userIdList", userIdList); params.put("userIdList", userIdList);
params.put("serialNumbers", serialNumbers); params.put("serialNumbers", serialNumbers);
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
if (ObjectUtils.isNotEmpty(projectLibraryBase)) { if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -8714,7 +8691,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
params.put("userIdList", userIdList); params.put("userIdList", userIdList);
params.put("serialNumbers", serialNumbers); params.put("serialNumbers", serialNumbers);
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
if (ObjectUtils.isNotEmpty(projectLibraryBase)) { if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -8737,7 +8714,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
List<SysRole> sysRoles = new LinkedList<>(); List<SysRole> sysRoles = new LinkedList<>();
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//项目详情中取R&H Studio和认证工程师 //项目详情中取R&H Studio和认证工程师
List<ProjectLibraryBase> projectLibraryBases = projectLibraryBaseService.queryById(projectLibraryId, null); List<ProjectLibraryBase> projectLibraryBases = platformProjectLibraryBaseService.queryById(projectLibraryId, null);
String certificationEngineerName = ""; String certificationEngineerName = "";
if (projectLibraryBases.size() != 0) { if (projectLibraryBases.size() != 0) {
certificationEngineerName = projectLibraryBases.get(0).getCertificationEngineerName(); certificationEngineerName = projectLibraryBases.get(0).getCertificationEngineerName();
@@ -9189,12 +9166,12 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
} }
} }
ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(new QueryWrapper<ProjectLibraryBase>() ProjectLibraryBase projectLibraryBase = platformProjectLibraryBaseMapper.selectOne(new QueryWrapper<ProjectLibraryBase>()
.lambda().eq(ProjectLibraryBase::getId, projectLawsInventoryEO.getProjectLibraryId())); .lambda().eq(ProjectLibraryBase::getId, projectLawsInventoryEO.getProjectLibraryId()));
QueryWrapper<ProjectNameInfoEO> projectNameInfoEOQueryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectNameInfoEO> projectNameInfoEOQueryWrapper = new QueryWrapper<>();
projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId()); projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId());
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId, projectLibraryBase.getYearNameId()); projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId, projectLibraryBase.getYearNameId());
@@ -9421,7 +9398,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
params.put("endTime", inventoryAffirmDueDate); params.put("endTime", inventoryAffirmDueDate);
params.put("userIdList", userIdList); params.put("userIdList", userIdList);
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
if (ObjectUtils.isNotEmpty(projectLibraryBase)) { if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -9513,7 +9490,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
params.put("userIdList", userIdList); params.put("userIdList", userIdList);
params.put("serialNumbers", serialNumbers); params.put("serialNumbers", serialNumbers);
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
if (ObjectUtils.isNotEmpty(projectLibraryBase)) { if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -9536,7 +9513,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
String cut = json.getString("cut"); String cut = json.getString("cut");
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
if (ObjectUtils.isNotEmpty(projectLibraryBase)) { if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -9658,7 +9635,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
String hrefFeishu_CN_P = (String) params.get("hrefFeishu_CN_P"); String hrefFeishu_CN_P = (String) params.get("hrefFeishu_CN_P");
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
if (ObjectUtils.isNotEmpty(projectLibraryBase)) { if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
@@ -9734,7 +9711,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
String projectNameCn = (String) todoCenterParams.get("projectNameCn"); String projectNameCn = (String) todoCenterParams.get("projectNameCn");
String projectNameEn = (String) todoCenterParams.get("projectNameEn"); String projectNameEn = (String) todoCenterParams.get("projectNameEn");
// ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.getBaseMapper().selectProjectName(projectLibraryId); // ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.getBaseMapper().selectProjectName(projectLibraryId);
// String projectNameCn = projectLibraryBase.getProjectName(); // String projectNameCn = projectLibraryBase.getProjectName();
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
@@ -12011,7 +11988,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
QueryWrapper<ProjectLibraryBase> projectLibraryBaseQueryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectLibraryBase> projectLibraryBaseQueryWrapper = new QueryWrapper<>();
projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId, projectLibraryId); projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId, projectLibraryId);
projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getStudioEngineer, currentUserId); projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getStudioEngineer, currentUserId);
Integer projectLibrayBaseCount = projectLibraryBaseMapper.selectCount(projectLibraryBaseQueryWrapper); Integer projectLibrayBaseCount = platformProjectLibraryBaseMapper.selectCount(projectLibraryBaseQueryWrapper);
if (projectLibrayBaseCount > 0) { if (projectLibrayBaseCount > 0) {
result = Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue()); result = Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue());
} else { } else {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+54 -71
View File
@@ -23,6 +23,10 @@ import com.jero.modules.dummy.enums.OrderEnum;
import com.jero.modules.enums.DictCodeEnum; import com.jero.modules.enums.DictCodeEnum;
import com.jero.modules.feishu.enums.TemplateInfoEnum2; import com.jero.modules.feishu.enums.TemplateInfoEnum2;
import com.jero.modules.ota.service.impl.OtaManageApplyEOServiceImpl; 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.ProjectCertificationInventoryEO;
import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.project.entity.ProjectLawsInventoryEO;
import com.jero.modules.project.entity.ProjectLawsInventoryLogEO; 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.TaskAffirmStatusEnum;
import com.jero.modules.project.enums.TaskStatusEnum; import com.jero.modules.project.enums.TaskStatusEnum;
import com.jero.modules.project.enums.TopEnum; 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.ProjectRelatedPersonnelMapper;
import com.jero.modules.project.mapper.ProjectTaskInventoryEOMapper; import com.jero.modules.project.mapper.ProjectTaskInventoryEOMapper;
import com.jero.modules.project.mapper.ProjectUserPermissionMapper; 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.IProjectLibraryRoleRelEOService;
import com.jero.modules.project.service.IProjectLibraryStatisticsService; import com.jero.modules.project.service.IProjectLibraryStatisticsService;
import com.jero.modules.project.service.IProjectUserPermissionService; 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.ProjectLawsInventoryLogEOServiceImpl;
import com.jero.modules.project.service.impl.ProjectNameInfoEOServiceImpl;
import com.jero.modules.project.service.impl.ProjectRelatedPersonnelServiceImpl; import com.jero.modules.project.service.impl.ProjectRelatedPersonnelServiceImpl;
import com.jero.modules.project.service.impl.ProjectTaskPlanningServiceImpl; import com.jero.modules.project.service.impl.ProjectTaskPlanningServiceImpl;
import com.jero.modules.project.vo.TimeNodeVO; 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.SysDictItem;
import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.enums.DicCodeEnum; 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.SysRoleMapper;
import com.jero.modules.system.mapper.SysUserMapper; import com.jero.modules.system.mapper.SysUserMapper;
import com.jero.modules.system.service.IProjectUserBrandService; import com.jero.modules.system.service.IProjectUserBrandService;
@@ -128,12 +122,9 @@ import java.util.stream.Collectors;
* @Version: V1.0 * @Version: V1.0
*/ */
@Service @Service
public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformProjectLibraryBaseMapper, ProjectLibraryBase> implements IPlatformIProjectLibraryBaseService { public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformProjectLibraryBaseMapper, ProjectLibraryBase> implements IPlatformProjectLibraryBaseService {
@Autowired @Autowired
private ProjectLibraryBaseMapper projectLibraryBaseMapper; private PlatformProjectLibraryBaseMapper platformProjectLibraryBaseMapper;
@Autowired
private SysDictItemMapper sysDictItemMapper;
@Autowired @Autowired
private SysUserMapper sysUserMapper; private SysUserMapper sysUserMapper;
@@ -144,27 +135,19 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
private ProjectTaskPlanningServiceImpl projectTaskPlanningService; private ProjectTaskPlanningServiceImpl projectTaskPlanningService;
@Autowired @Autowired
private ProjectLawsInventoryEOMapper projectLawsInventoryEOMapper; private PlatformProjectLawsInventoryEOMapper platformProjectLawsInventoryEOMapper;
@Autowired @Autowired
private ProjectTaskInventoryEOMapper projectTaskInventoryEOMapper; private ProjectTaskInventoryEOMapper projectTaskInventoryEOMapper;
@Autowired
private IConditionAssessmentEOService conditionAssessmentEOService;
@Autowired @Autowired
private SysDictItemServiceImpl sysDictItemServiceImpl; private SysDictItemServiceImpl sysDictItemServiceImpl;
@Autowired
private ProjectNameInfoEOMapper projectNameInfoEOMapper;
@Autowired
private ProjectNameInfoEOServiceImpl projectNameInfoEOService;
@Autowired @Autowired
private IProjectLibraryRoleRelEOService projectLibraryRoleRelEOService; private IProjectLibraryRoleRelEOService projectLibraryRoleRelEOService;
@Autowired @Autowired
private ProjectLawsInventoryEOServiceImpl projectLawsInventoryEOService; private PlatformProjectLawsInventoryEOServiceImpl platformProjectLawsInventoryEOService;
@Autowired @Autowired
private ProjectLawsInventoryLogEOServiceImpl projectLawsInventoryLogEOService; private ProjectLawsInventoryLogEOServiceImpl projectLawsInventoryLogEOService;
@@ -197,7 +180,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
private ITopProjectEOService iTopProjectEOService; private ITopProjectEOService iTopProjectEOService;
@Autowired @Autowired
private IProjectCertificationInventoryEOService projectCertificationInventoryEOService; private IPlatformProjectCertificationInventoryEOService platformProjectCertificationInventoryEOService;
@Autowired @Autowired
private IProcessInfoDetailEOService processInfoDetailEOService; private IProcessInfoDetailEOService processInfoDetailEOService;
@@ -450,7 +433,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
if(StringUtils.isNotBlank(projectLibraryBase.getId())){ if(StringUtils.isNotBlank(projectLibraryBase.getId())){
queryWrapper.ne("id",projectLibraryBase.getId()); queryWrapper.ne("id",projectLibraryBase.getId());
} }
Integer count = projectLibraryBaseMapper.selectCount(queryWrapper); Integer count = platformProjectLibraryBaseMapper.selectCount(queryWrapper);
if (count > 0) { if (count > 0) {
if(CutEnum.CN.getValue().equals(projectLibraryBase.getCut())) { if(CutEnum.CN.getValue().equals(projectLibraryBase.getCut())) {
throw new JeroBootException("已存在车型名称,年款号,目标市场均同的数据"); throw new JeroBootException("已存在车型名称,年款号,目标市场均同的数据");
@@ -620,7 +603,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("project_library_id", projectLibraryBase.getId()); queryWrapper.eq("project_library_id", projectLibraryBase.getId());
List<ProjectLawsInventoryEO> list = projectLawsInventoryEOService.list(queryWrapper); List<ProjectLawsInventoryEO> list = platformProjectLawsInventoryEOService.list(queryWrapper);
if (ObjectUtils.isNotEmpty(list)) { if (ObjectUtils.isNotEmpty(list)) {
for (ProjectLawsInventoryEO lawsInventoryEO : list) { for (ProjectLawsInventoryEO lawsInventoryEO : list) {
boolean boo = false; boolean boo = false;
@@ -734,11 +717,11 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
QueryWrapper<ProjectCertificationInventoryEO> certificationInventoryEOQueryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectCertificationInventoryEO> certificationInventoryEOQueryWrapper = new QueryWrapper<>();
certificationInventoryEOQueryWrapper.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId, newPlbEO.getId()); certificationInventoryEOQueryWrapper.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId, newPlbEO.getId());
certificationInventoryEOQueryWrapper.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList); certificationInventoryEOQueryWrapper.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList);
List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.projectCertificationInventoryEOService.list(certificationInventoryEOQueryWrapper); List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.platformProjectCertificationInventoryEOService.list(certificationInventoryEOQueryWrapper);
if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOList)){ if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOList)){
this.projectCertificationInventoryEOService.certificationInventoryEOListSortByEndTimeAsc(projectCertificationInventoryEOList); this.platformProjectCertificationInventoryEOService.certificationInventoryEOListSortByEndTimeAsc(projectCertificationInventoryEOList);
List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(oldCertificationEngineerIdList); List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(oldCertificationEngineerIdList);
this.projectCertificationInventoryEOService.sendMessageByTemplateId( this.platformProjectCertificationInventoryEOService.sendMessageByTemplateId(
projectCertificationInventoryEOList, projectCertificationInventoryEOList,
TemplateInfoEnum2.CERTIFICATION_MESSAGE13.getValue(), TemplateInfoEnum2.CERTIFICATION_MESSAGE13.getValue(),
oldCertificationEngineerIdList, oldCertificationEngineerIdList,
@@ -760,7 +743,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
List<String> certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); List<String> certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>(); QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId, projectLibraryBase.getId()); pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId, projectLibraryBase.getId());
List<ProjectCertificationInventoryEO> pciEOList = this.projectCertificationInventoryEOService.list(pciQueryWrap); List<ProjectCertificationInventoryEO> pciEOList = this.platformProjectCertificationInventoryEOService.list(pciQueryWrap);
if(CollectionUtils.isNotEmpty(pciEOList)){ if(CollectionUtils.isNotEmpty(pciEOList)){
// 清单待校核的数据 // 清单待校核的数据
@@ -786,7 +769,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
} }
// 获取责任确认截止时间 最早的时间 // 获取责任确认截止时间 最早的时间
this.projectCertificationInventoryEOService.certificationInventoryEOListSortByTaskConfirmEndTimeAsc(pciToBeCheckedList); this.platformProjectCertificationInventoryEOService.certificationInventoryEOListSortByTaskConfirmEndTimeAsc(pciToBeCheckedList);
Date endTime = pciToBeCheckedList.get(0).getInventoryVerifyEndTime(); Date endTime = pciToBeCheckedList.get(0).getInventoryVerifyEndTime();
if(ObjectUtils.isEmpty(endTime)){ if(ObjectUtils.isEmpty(endTime)){
endTime = pidEoList.get(0).getEndTime(); endTime = pidEoList.get(0).getEndTime();
@@ -828,7 +811,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
List<ProcessInfoDetailEO> pidEoList = this.processInfoDetailEOService.list(pidQueryWrap); List<ProcessInfoDetailEO> pidEoList = this.processInfoDetailEOService.list(pidQueryWrap);
// 获取截止日期最早的一天。 // 获取截止日期最早的一天。
this.projectCertificationInventoryEOService.certificationInventoryEOListSortByEndTimeAsc(pciToBeReviewEDList); this.platformProjectCertificationInventoryEOService.certificationInventoryEOListSortByEndTimeAsc(pciToBeReviewEDList);
Date endTime = pciToBeReviewEDList.get(0).getEndTime(); Date endTime = pciToBeReviewEDList.get(0).getEndTime();
if(CollectionUtils.isNotEmpty(pidEoList)){ if(CollectionUtils.isNotEmpty(pidEoList)){
endTime = pidEoList.get(0).getEndTime(); endTime = pidEoList.get(0).getEndTime();
@@ -895,7 +878,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
//关联删除-法规清单 //关联删除-法规清单
QueryWrapper<ProjectLawsInventoryEO> lawsInventoryEOQueryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectLawsInventoryEO> lawsInventoryEOQueryWrapper = new QueryWrapper<>();
lawsInventoryEOQueryWrapper.eq("project_library_id ",id); lawsInventoryEOQueryWrapper.eq("project_library_id ",id);
projectLawsInventoryEOService.remove(lawsInventoryEOQueryWrapper); platformProjectLawsInventoryEOService.remove(lawsInventoryEOQueryWrapper);
//关联删除-法规清单log //关联删除-法规清单log
QueryWrapper<ProjectLawsInventoryLogEO> logEOQueryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectLawsInventoryLogEO> logEOQueryWrapper = new QueryWrapper<>();
@@ -927,7 +910,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
} }
QueryWrapper<ProjectLawsInventoryEO> lawsInventoryQueryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectLawsInventoryEO> lawsInventoryQueryWrapper = new QueryWrapper<>();
lawsInventoryQueryWrapper.eq("project_library_id",id); lawsInventoryQueryWrapper.eq("project_library_id",id);
List<ProjectLawsInventoryEO> lawsInventoryRecords = projectLawsInventoryEOMapper.selectList(lawsInventoryQueryWrapper); List<ProjectLawsInventoryEO> lawsInventoryRecords = platformProjectLawsInventoryEOMapper.selectList(lawsInventoryQueryWrapper);
for(ProjectLawsInventoryEO projectLawsInventoryEO : lawsInventoryRecords){ for(ProjectLawsInventoryEO projectLawsInventoryEO : lawsInventoryRecords){
String inventoryAffirmStatus = projectLawsInventoryEO.getInventoryAffirmStatus();//清单确认状态 String inventoryAffirmStatus = projectLawsInventoryEO.getInventoryAffirmStatus();//清单确认状态
//清单确认状态(未发起、接受、拒绝） //清单确认状态(未发起、接受、拒绝）
@@ -1000,7 +983,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
*/ */
@Override @Override
public List<ProjectLibraryBase> queryById(String id,String cut) { public List<ProjectLibraryBase> queryById(String id,String cut) {
List<ProjectLibraryBase> records = projectLibraryBaseMapper.queryById(id); List<ProjectLibraryBase> records = platformProjectLibraryBaseMapper.queryById(id);
disposeData(records,"",false); disposeData(records,"",false);
//目标市场数据字典 //目标市场数据字典
List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
@@ -1040,7 +1023,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
*/ */
@Override @Override
public List<ProjectLibraryBase> getList(ProjectLibraryBase projectLibraryBase) { public List<ProjectLibraryBase> getList(ProjectLibraryBase projectLibraryBase) {
List<ProjectLibraryBase> list = projectLibraryBaseMapper.getList(projectLibraryBase); List<ProjectLibraryBase> list = platformProjectLibraryBaseMapper.getList(projectLibraryBase);
return list; return list;
} }
@@ -1071,7 +1054,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
} }
} }
List<ProjectLibraryBase> result = projectLibraryBaseMapper.queryPageList(params); List<ProjectLibraryBase> result = platformProjectLibraryBaseMapper.queryPageList(params);
disposeData(result,"",false); disposeData(result,"",false);
//目标市场 //目标市场
List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
@@ -1128,7 +1111,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
} }
//所有主项目 //所有主项目
List<ProjectLibraryBase> projectLibraryBaseListParent = projectLibraryBaseMapper.queryMaimList(); List<ProjectLibraryBase> projectLibraryBaseListParent = platformProjectLibraryBaseMapper.queryMaimList();
disposeData(projectLibraryBaseListParent,"",false); disposeData(projectLibraryBaseListParent,"",false);
for(ProjectLibraryBase projectLibraryBase: projectLibraryBaseListParent){ for(ProjectLibraryBase projectLibraryBase: projectLibraryBaseListParent){
//目标市场 //目标市场
@@ -1361,7 +1344,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
// */ // */
// @Override // @Override
// public List<ProjectLibraryBase> queryPageList(Map<String,Object> params) { // public List<ProjectLibraryBase> queryPageList(Map<String,Object> params) {
// List<ProjectLibraryBase> result = projectLibraryBaseMapper.queryPageList(params); // List<ProjectLibraryBase> result = platformProjectLibraryBaseMapper.queryPageList(params);
// disposeData(result,"",false); // disposeData(result,"",false);
// //目标市场 // //目标市场
// List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); // List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
@@ -1486,7 +1469,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
// Integer pageNo = Integer.parseInt(params.get("pageNo").toString()); // Integer pageNo = Integer.parseInt(params.get("pageNo").toString());
// Integer pageSize = Integer.parseInt(params.get("pageSize").toString()); // Integer pageSize = Integer.parseInt(params.get("pageSize").toString());
// IPage page = new Page(pageNo, pageSize); // IPage page = new Page(pageNo, pageSize);
// IPage<ProjectLibraryBase> result = projectLibraryBaseMapper.queryPageList(page, params); // IPage<ProjectLibraryBase> result = platformProjectLibraryBaseMapper.queryPageList(page, params);
// List<ProjectLibraryBase> records = result.getRecords(); // List<ProjectLibraryBase> records = result.getRecords();
// disposeData(records,"",false); // disposeData(records,"",false);
// for(ProjectLibraryBase projectLibraryBase: records){ // for(ProjectLibraryBase projectLibraryBase: records){
@@ -1585,18 +1568,18 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
Map<String,Object> rzTaskToConfirmMap = new HashMap<>(); Map<String,Object> rzTaskToConfirmMap = new HashMap<>();
//清单确认统计 //清单确认统计
/*List<Map<String,Object>> listingToConfirmMapList = this.projectLawsInventoryEOMapper.getlistingToConfirmStatistics(id); /*List<Map<String,Object>> listingToConfirmMapList = this.platformProjectLawsInventoryEOMapper.getlistingToConfirmStatistics(id);
listingToConfirmMap.put("listingToConfirmMapList",listingToConfirmMapList); listingToConfirmMap.put("listingToConfirmMapList",listingToConfirmMapList);
result.put("listingToConfirmMap",listingToConfirmMap);*/ result.put("listingToConfirmMap",listingToConfirmMap);*/
QueryWrapper<ProjectLawsInventoryEO> lawsInventoryEOQueryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectLawsInventoryEO> lawsInventoryEOQueryWrapper = new QueryWrapper<>();
lawsInventoryEOQueryWrapper.lambda().in(ProjectLawsInventoryEO::getProjectLibraryId,Arrays.asList(id.split(","))); lawsInventoryEOQueryWrapper.lambda().in(ProjectLawsInventoryEO::getProjectLibraryId,Arrays.asList(id.split(",")));
List<ProjectLawsInventoryEO> projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper); List<ProjectLawsInventoryEO> projectLawsInventoryEOList = platformProjectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper);
if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
List<String> projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList()); List<String> projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList());
//任务确认统计 //任务确认统计
List<Map<String,Object>> taskToConfirmMapList = this.projectLawsInventoryEOService.getTaskToConfirmStatistics(projectLawsInventoryEOList); List<Map<String,Object>> taskToConfirmMapList = this.platformProjectLawsInventoryEOService.getTaskToConfirmStatistics(projectLawsInventoryEOList);
int taskAffirmStatusCount = 0; int taskAffirmStatusCount = 0;
if(CollectionUtils.isNotEmpty(taskToConfirmMapList)){ if(CollectionUtils.isNotEmpty(taskToConfirmMapList)){
//taskAffirmStatusCount //taskAffirmStatusCount
@@ -1635,7 +1618,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
result.put("currentProjectStatusMap",currentProjectStatusMap);*/ result.put("currentProjectStatusMap",currentProjectStatusMap);*/
//设计符合性 //设计符合性
List<Map<String,Object>> designComplianceMapList = this.projectLawsInventoryEOService.getDesignComplianceStatistice(projectLawsInventoryEOList); List<Map<String,Object>> designComplianceMapList = this.platformProjectLawsInventoryEOService.getDesignComplianceStatistice(projectLawsInventoryEOList);
int designFlowTaskStatusCount = 0; int designFlowTaskStatusCount = 0;
if(CollectionUtils.isNotEmpty(designComplianceMapList)){ if(CollectionUtils.isNotEmpty(designComplianceMapList)){
for (Map<String, Object> designCompliance : designComplianceMapList) { for (Map<String, Object> designCompliance : designComplianceMapList) {
@@ -1647,7 +1630,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
result.put("designComplianceMap",designComplianceMap); result.put("designComplianceMap",designComplianceMap);
//验证符合性 //验证符合性
List<Map<String,Object>> verifyComplianceMapList = this.projectLawsInventoryEOService.getVerifyComplianceStatistice(projectLawsInventoryEOList); List<Map<String,Object>> verifyComplianceMapList = this.platformProjectLawsInventoryEOService.getVerifyComplianceStatistice(projectLawsInventoryEOList);
int verifyFlowTaskStatusCount = 0; int verifyFlowTaskStatusCount = 0;
if(CollectionUtils.isNotEmpty(verifyComplianceMapList)){ if(CollectionUtils.isNotEmpty(verifyComplianceMapList)){
for (Map<String, Object> verifyCompliance : verifyComplianceMapList) { for (Map<String, Object> verifyCompliance : verifyComplianceMapList) {
@@ -1691,7 +1674,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>(); QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
pciQueryWrap.lambda().in(ProjectCertificationInventoryEO::getProjectLibraryId,Arrays.asList(id.split(","))); pciQueryWrap.lambda().in(ProjectCertificationInventoryEO::getProjectLibraryId,Arrays.asList(id.split(",")));
List<ProjectCertificationInventoryEO> pciEoList = this.projectCertificationInventoryEOService.list(pciQueryWrap).stream().filter(pciEo -> { List<ProjectCertificationInventoryEO> pciEoList = this.platformProjectCertificationInventoryEOService.list(pciQueryWrap).stream().filter(pciEo -> {
boolean flag = false; boolean flag = false;
if (!StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.UNINVOLVED.getValue())) { if (!StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.UNINVOLVED.getValue())) {
flag = true; flag = true;
@@ -1700,7 +1683,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
}).distinct().collect(Collectors.toList()); }).distinct().collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(pciEoList)){ if(CollectionUtils.isNotEmpty(pciEoList)){
// 认证清单-任务确认统计 // 认证清单-任务确认统计
List<Map<String,Object>> rzTaskToConfirmMapList = this.projectCertificationInventoryEOService.getTaskToConfirmStatistics(pciEoList); List<Map<String,Object>> rzTaskToConfirmMapList = this.platformProjectCertificationInventoryEOService.getTaskToConfirmStatistics(pciEoList);
int taskAffirmStatusCount = 0; int taskAffirmStatusCount = 0;
if(CollectionUtils.isNotEmpty(rzTaskToConfirmMapList)){ if(CollectionUtils.isNotEmpty(rzTaskToConfirmMapList)){
for (Map<String, Object> rzTaskToConfirm : rzTaskToConfirmMapList) { for (Map<String, Object> rzTaskToConfirm : rzTaskToConfirmMapList) {
@@ -1712,7 +1695,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
result.put("rzTaskToConfirmMap",rzTaskToConfirmMap); result.put("rzTaskToConfirmMap",rzTaskToConfirmMap);
// Pre-Homo 统计 // Pre-Homo 统计
List<Map<String,Object>> prehomoMapList = this.projectCertificationInventoryEOService.getPrehomoStatistice(pciEoList); List<Map<String,Object>> prehomoMapList = this.platformProjectCertificationInventoryEOService.getPrehomoStatistice(pciEoList);
int preHomoCount = 0; int preHomoCount = 0;
if (CollectionUtils.isNotEmpty(prehomoMapList)) { if (CollectionUtils.isNotEmpty(prehomoMapList)) {
for (Map<String, Object> prehomo : prehomoMapList) { for (Map<String, Object> prehomo : prehomoMapList) {
@@ -1724,9 +1707,9 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
result.put("prehomoMap",prehomoMap); result.put("prehomoMap",prehomoMap);
// 认证进度 统计 // 认证进度 统计
List<Map<String,Object>> allMapList = this.projectCertificationInventoryEOService.getAllCertificationProgressStatistics(pciEoList); List<Map<String,Object>> allMapList = this.platformProjectCertificationInventoryEOService.getAllCertificationProgressStatistics(pciEoList);
List<Map<String,Object>> carMapList = this.projectCertificationInventoryEOService.getCarCertificationProgressStatistics(pciEoList); List<Map<String,Object>> carMapList = this.platformProjectCertificationInventoryEOService.getCarCertificationProgressStatistics(pciEoList);
List<Map<String,Object>> partMapList = this.projectCertificationInventoryEOService.getPartCertificationProgressStatistics(pciEoList); List<Map<String,Object>> partMapList = this.platformProjectCertificationInventoryEOService.getPartCertificationProgressStatistics(pciEoList);
certificationProgressMap.put("allMapList",allMapList);// 全部 certificationProgressMap.put("allMapList",allMapList);// 全部
certificationProgressMap.put("carMapList",carMapList);// 整车 certificationProgressMap.put("carMapList",carMapList);// 整车
certificationProgressMap.put("partMapList",partMapList);// 零部件 certificationProgressMap.put("partMapList",partMapList);// 零部件
@@ -1777,12 +1760,12 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
// Map<String,Object> certificationProgressMap = new HashMap<>(); // Map<String,Object> certificationProgressMap = new HashMap<>();
// //
// //清单确认统计 // //清单确认统计
// List<Map<String,Object>> listingToConfirmMapList = this.projectLawsInventoryEOMapper.getlistingToConfirmStatistics(id); // List<Map<String,Object>> listingToConfirmMapList = this.platformProjectLawsInventoryEOMapper.getlistingToConfirmStatistics(id);
// listingToConfirmMap.put("listingToConfirmMapList",listingToConfirmMapList); // listingToConfirmMap.put("listingToConfirmMapList",listingToConfirmMapList);
// result.put("listingToConfirmMap",listingToConfirmMap); // result.put("listingToConfirmMap",listingToConfirmMap);
// //
// //任务确认统计 // //任务确认统计
// List<Map<String,Object>> taskToConfirmMapList = this.projectLawsInventoryEOMapper.getTaskToConfirmStatistics(id); // List<Map<String,Object>> taskToConfirmMapList = this.platformProjectLawsInventoryEOMapper.getTaskToConfirmStatistics(id);
// taskToConfirmMap.put("taskToConfirmMapList",taskToConfirmMapList); // taskToConfirmMap.put("taskToConfirmMapList",taskToConfirmMapList);
// result.put("taskToConfirmMap",taskToConfirmMap); // result.put("taskToConfirmMap",taskToConfirmMap);
// //
@@ -1790,7 +1773,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
// lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,id); // lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,id);
// //lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getInventoryAffirmStatus, InventoryAffirmStatusEnum.ACCEPTED.getValue()); // //lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getInventoryAffirmStatus, InventoryAffirmStatusEnum.ACCEPTED.getValue());
// //lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getTaskAffirmStatus, TaskAffirmStatusEnum.ACCEPTED.getValue()); // //lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getTaskAffirmStatus, TaskAffirmStatusEnum.ACCEPTED.getValue());
// List<ProjectLawsInventoryEO> projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper); // List<ProjectLawsInventoryEO> projectLawsInventoryEOList = platformProjectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper);
// if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ // if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
// List<String> projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList()); // List<String> projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList());
// //
@@ -1887,7 +1870,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
QueryWrapper<ProjectLawsInventoryEO> lawsInventoryEOQueryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectLawsInventoryEO> lawsInventoryEOQueryWrapper = new QueryWrapper<>();
lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
List<ProjectLawsInventoryEO> projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper); List<ProjectLawsInventoryEO> projectLawsInventoryEOList = platformProjectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper);
List<SysDictItem> sysDictItems = new ArrayList<>(); List<SysDictItem> sysDictItems = new ArrayList<>();
// 法规清单所有的责任领域 // 法规清单所有的责任领域
@@ -1989,13 +1972,13 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
// }else if(StringUtils.equals(OperatorTypeEnum.QUERY_LISTING_TO_CONFIRM_STATISTICS.getValue(),operatorType)){ // }else if(StringUtils.equals(OperatorTypeEnum.QUERY_LISTING_TO_CONFIRM_STATISTICS.getValue(),operatorType)){
// //清单确认 状态 // //清单确认 状态
// String inventoryAffirmStatus = (String) params.get("inventoryAffirmStatus"); // String inventoryAffirmStatus = (String) params.get("inventoryAffirmStatus");
// List<Map<String,Object>> listingToConfirmList = this.projectLawsInventoryEOMapper.getListingToConfirmStatisticsGroupByTerritory(projectLibraryId,inventoryAffirmStatus); // List<Map<String,Object>> listingToConfirmList = this.platformProjectLawsInventoryEOMapper.getListingToConfirmStatisticsGroupByTerritory(projectLibraryId,inventoryAffirmStatus);
// disposeData(listingToConfirmList,cut); // disposeData(listingToConfirmList,cut);
// result.put("dataList",listingToConfirmList); // result.put("dataList",listingToConfirmList);
// }else if(StringUtils.equals(OperatorTypeEnum.QUERY_TASK_TO_CONFIRM_STATISTICS.getValue(),operatorType)){ // }else if(StringUtils.equals(OperatorTypeEnum.QUERY_TASK_TO_CONFIRM_STATISTICS.getValue(),operatorType)){
// //任务确认 状态 // //任务确认 状态
// String taskAffirmStatus = (String) params.get("taskAffirmStatus"); // String taskAffirmStatus = (String) params.get("taskAffirmStatus");
// List<Map<String,Object>> taskToConfirmList = this.projectLawsInventoryEOMapper.getTaskToConfirmStatisticsGroupByTerritory(projectLibraryId,taskAffirmStatus); // List<Map<String,Object>> taskToConfirmList = this.platformProjectLawsInventoryEOMapper.getTaskToConfirmStatisticsGroupByTerritory(projectLibraryId,taskAffirmStatus);
// disposeData(taskToConfirmList,cut); // disposeData(taskToConfirmList,cut);
// result.put("dataList",taskToConfirmList); // result.put("dataList",taskToConfirmList);
// }else if(StringUtils.equals(OperatorTypeEnum.QUERY_DESIGN_STATISTICS.getValue(),operatorType)){ // }else if(StringUtils.equals(OperatorTypeEnum.QUERY_DESIGN_STATISTICS.getValue(),operatorType)){
@@ -2053,7 +2036,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
Map<String,Object> pciEoMap = new HashMap<>(); Map<String,Object> pciEoMap = new HashMap<>();
QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>(); QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId); pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId);
List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.projectCertificationInventoryEOService.list(pciQueryWrap); List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.platformProjectCertificationInventoryEOService.list(pciQueryWrap);
String pciDutyTerritoryStr = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getDutyTerritory).collect(Collectors.joining(",")); String pciDutyTerritoryStr = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getDutyTerritory).collect(Collectors.joining(","));
if (StringUtils.isNotEmpty(pciDutyTerritoryStr)) { if (StringUtils.isNotEmpty(pciDutyTerritoryStr)) {
List<String> pciDutyTerritoryList = Arrays.asList(pciDutyTerritoryStr.split(",")).stream().distinct().collect(Collectors.toList()); List<String> pciDutyTerritoryList = Arrays.asList(pciDutyTerritoryStr.split(",")).stream().distinct().collect(Collectors.toList());
@@ -2467,7 +2450,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
@Override @Override
public ProjectLibraryBase selectById(String projectLibraryId) { public ProjectLibraryBase selectById(String projectLibraryId) {
ProjectLibraryBase result = null; ProjectLibraryBase result = null;
List<ProjectLibraryBase> records = this.projectLibraryBaseMapper.queryById(projectLibraryId); List<ProjectLibraryBase> records = this.platformProjectLibraryBaseMapper.queryById(projectLibraryId);
if(CollectionUtils.isNotEmpty(records)){ if(CollectionUtils.isNotEmpty(records)){
List<String> studioEngineerUserIdList = records.stream().map(ProjectLibraryBase::getStudioEngineer).distinct().collect(Collectors.toList()); List<String> studioEngineerUserIdList = records.stream().map(ProjectLibraryBase::getStudioEngineer).distinct().collect(Collectors.toList());
List<SysUser> studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(studioEngineerUserIdList); List<SysUser> studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(studioEngineerUserIdList);
@@ -2645,11 +2628,11 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
if(CollectionUtils.isNotEmpty(prpSdiList)){ if(CollectionUtils.isNotEmpty(prpSdiList)){
userAllDutyTerritorySdiList.addAll(prpSdiList); userAllDutyTerritorySdiList.addAll(prpSdiList);
} }
List<SysDictItem> pliSdiList = this.projectLawsInventoryEOService.getUserDutyTerritoryList(params); List<SysDictItem> pliSdiList = this.platformProjectLawsInventoryEOService.getUserDutyTerritoryList(params);
if(CollectionUtils.isNotEmpty(pliSdiList)){ if(CollectionUtils.isNotEmpty(pliSdiList)){
userAllDutyTerritorySdiList.addAll(pliSdiList); userAllDutyTerritorySdiList.addAll(pliSdiList);
} }
List<SysDictItem> pciSdiList = this.projectCertificationInventoryEOService.getUserDutyTerritoryList(params); List<SysDictItem> pciSdiList = this.platformProjectCertificationInventoryEOService.getUserDutyTerritoryList(params);
if(CollectionUtils.isNotEmpty(pciSdiList)){ if(CollectionUtils.isNotEmpty(pciSdiList)){
userAllDutyTerritorySdiList.addAll(pciSdiList); userAllDutyTerritorySdiList.addAll(pciSdiList);
} }
@@ -2682,8 +2665,8 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
@Override @Override
public Result<?> overallReplacementUser(JSONObject json) { public Result<?> overallReplacementUser(JSONObject json) {
this.projectRelatedPersonnelService.replacementUser(json); this.projectRelatedPersonnelService.replacementUser(json);
this.projectLawsInventoryEOService.replacementUser(json); this.platformProjectLawsInventoryEOService.replacementUser(json);
this.projectCertificationInventoryEOService.replacementUser(json); this.platformProjectCertificationInventoryEOService.replacementUser(json);
String projectLibraryId = json.getString("projectLibraryId"); String projectLibraryId = json.getString("projectLibraryId");
ProjectLibraryBase projectLibraryBase = this.selectById(projectLibraryId); ProjectLibraryBase projectLibraryBase = this.selectById(projectLibraryId);
json.put("parentId",projectLibraryBase.getParentId()); json.put("parentId",projectLibraryBase.getParentId());
@@ -2752,7 +2735,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
QueryWrapper<ProjectLawsInventoryEO> pliQueryWrap = new QueryWrapper<>(); QueryWrapper<ProjectLawsInventoryEO> pliQueryWrap = new QueryWrapper<>();
pliQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); pliQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
List<ProjectLawsInventoryEO> pliEOList = this.projectLawsInventoryEOMapper.selectList(pliQueryWrap); List<ProjectLawsInventoryEO> pliEOList = this.platformProjectLawsInventoryEOMapper.selectList(pliQueryWrap);
List<SysDictItem> sysDictItems = new ArrayList<>(); List<SysDictItem> sysDictItems = new ArrayList<>();
String pliDutyTerritoryStr = pliEOList.stream().map(ProjectLawsInventoryEO::getDutyTerritory).collect(Collectors.joining(",")); String pliDutyTerritoryStr = pliEOList.stream().map(ProjectLawsInventoryEO::getDutyTerritory).collect(Collectors.joining(","));
if (StringUtils.isNotEmpty(pliDutyTerritoryStr)) { if (StringUtils.isNotEmpty(pliDutyTerritoryStr)) {
@@ -2926,7 +2909,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
String projectLibraryId = (String) params.get("projectLibraryId"); String projectLibraryId = (String) params.get("projectLibraryId");
QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>(); QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId); pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId);
List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.projectCertificationInventoryEOService.list(pciQueryWrap).stream().filter(pciEo -> { List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.platformProjectCertificationInventoryEOService.list(pciQueryWrap).stream().filter(pciEo -> {
boolean flag = false; boolean flag = false;
if (!StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.UNINVOLVED.getValue())) { if (!StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.UNINVOLVED.getValue())) {
flag = true; flag = true;
@@ -3274,11 +3257,11 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
QueryWrapper<ProjectLawsInventoryEO> pliQueryWrap = new QueryWrapper<>(); QueryWrapper<ProjectLawsInventoryEO> pliQueryWrap = new QueryWrapper<>();
pliQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectId); pliQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectId);
List<ProjectLawsInventoryEO> pliEoList = this.projectLawsInventoryEOService.list(pliQueryWrap); List<ProjectLawsInventoryEO> pliEoList = this.platformProjectLawsInventoryEOService.list(pliQueryWrap);
QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>(); QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectId); pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectId);
List<ProjectCertificationInventoryEO> pciEoList = this.projectCertificationInventoryEOService.list(pciQueryWrap); List<ProjectCertificationInventoryEO> pciEoList = this.platformProjectCertificationInventoryEOService.list(pciQueryWrap);
QueryWrapper<ParamsManifestEO> pmQueryWrap = new QueryWrapper<>(); QueryWrapper<ParamsManifestEO> pmQueryWrap = new QueryWrapper<>();
pmQueryWrap.lambda().eq(ParamsManifestEO::getProjectId,projectId); pmQueryWrap.lambda().eq(ParamsManifestEO::getProjectId,projectId);
@@ -3351,11 +3334,11 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
QueryWrapper<ProjectLawsInventoryEO> pliQueryWrap = new QueryWrapper<>(); QueryWrapper<ProjectLawsInventoryEO> pliQueryWrap = new QueryWrapper<>();
pliQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectId); pliQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectId);
List<ProjectLawsInventoryEO> pliEoList = this.projectLawsInventoryEOService.list(pliQueryWrap); List<ProjectLawsInventoryEO> pliEoList = this.platformProjectLawsInventoryEOService.list(pliQueryWrap);
QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>(); QueryWrapper<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectId); pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectId);
List<ProjectCertificationInventoryEO> pciEoList = this.projectCertificationInventoryEOService.list(pciQueryWrap); List<ProjectCertificationInventoryEO> pciEoList = this.platformProjectCertificationInventoryEOService.list(pciQueryWrap);
QueryWrapper<ParamsManifestEO> pmQueryWrap = new QueryWrapper<>(); QueryWrapper<ParamsManifestEO> pmQueryWrap = new QueryWrapper<>();
pmQueryWrap.lambda().eq(ParamsManifestEO::getProjectId,projectId); pmQueryWrap.lambda().eq(ParamsManifestEO::getProjectId,projectId);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectNameInfoEOServiceImpl.java
+3 -11
View File
@@ -3,16 +3,14 @@ package com.jero.modules.platform.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.system.vo.DictModel; 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.ProjectLibraryBase;
import com.jero.modules.project.entity.ProjectNameInfoEO; import com.jero.modules.project.entity.ProjectNameInfoEO;
import com.jero.modules.project.entity.ProjectYearNameInfoEO; import com.jero.modules.project.entity.ProjectYearNameInfoEO;
import com.jero.modules.project.mapper.ProblemManagementEOMapper; 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.ProblemManagementEOServiceImpl;
import com.jero.modules.project.service.impl.ProjectYearNameInfoEOServiceImpl; 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.enums.DicCodeEnum;
import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysDictService;
import com.jero.modules.system.util.StringUtils; import com.jero.modules.system.util.StringUtils;
@@ -30,13 +28,7 @@ import java.util.List;
* @Version: V1.0 * @Version: V1.0
*/ */
@Service @Service
public class PlatformProjectNameInfoEOServiceImpl extends ServiceImpl<PlatpromProjectNameInfoEOMapper, ProjectNameInfoEO> implements IPlatformProjectNameInfoEOService { public class PlatformProjectNameInfoEOServiceImpl extends ServiceImpl<PlatformProjectNameInfoEOMapper, ProjectNameInfoEO> implements IPlatformProjectNameInfoEOService {
@Autowired
private ProjectNameInfoEOMapper projectNameInfoEOMapper;
@Autowired
private SpaceServiceImpl spaceService;
@Autowired @Autowired
private ProjectYearNameInfoEOServiceImpl projectYearNameInfoEOService; private ProjectYearNameInfoEOServiceImpl projectYearNameInfoEOService;
@Autowired @Autowired