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

平台件--项目库

Browse Source
This commit is contained in:
zhn
2023-09-13 14:11:29 +08:00
parent d314228b4b
commit bd8d357299
5 changed files with 79 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLibraryBaseController.java
+22 -22
View File
@@ -46,7 +46,7 @@ import java.util.Map;
@Slf4j @Slf4j
public class PlatformProjectLibraryBaseController extends JeroController<ProjectLibraryBase, IPlatformIProjectLibraryBaseService> { public class PlatformProjectLibraryBaseController extends JeroController<ProjectLibraryBase, IPlatformIProjectLibraryBaseService> {
@Autowired @Autowired
private IPlatformIProjectLibraryBaseService projectPlatformService; private IPlatformIProjectLibraryBaseService 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/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/impl/PlatformProjectLibraryBaseServiceImpl.java
+53 -70
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.IPlatformIProjectLibraryBaseService;
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;
@@ -130,10 +124,7 @@ import java.util.stream.Collectors;
@Service @Service
public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformProjectLibraryBaseMapper, ProjectLibraryBase> implements IPlatformIProjectLibraryBaseService { public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformProjectLibraryBaseMapper, ProjectLibraryBase> implements IPlatformIProjectLibraryBaseService {
@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
+2 -2
View File
@@ -10,7 +10,7 @@ import com.jero.modules.project.mapper.ProblemManagementEOMapper;
import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; 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.mapper.PlatformProjectNameInfoEOMapper;
import com.jero.modules.platform.service.IPlatformProjectNameInfoEOService; import com.jero.modules.platform.service.IPlatformProjectNameInfoEOService;
import com.jero.modules.space.service.SpaceServiceImpl; import com.jero.modules.space.service.SpaceServiceImpl;
import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.enums.DicCodeEnum;
@@ -30,7 +30,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 @Autowired
private ProjectNameInfoEOMapper projectNameInfoEOMapper; private ProjectNameInfoEOMapper projectNameInfoEOMapper;