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

# Conflicts:
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml

@@ -133,7 +133,7 @@
         left join project_name_info as pni on plb.project_name_id = pni.id
         left join project_year_name_info as pyni on plb.year_name_id=pyni.id
         ) tmp_tb
-        where 1=1 and state = #{state}
+        where 1=1 and state = #{state} and plb.platform is null
           <if test="projectName !=null and projectName !=''">
             AND project_name LIKE CONCAT(CONCAT('%',#{projectName}),'%')
           </if>
@@ -153,7 +153,7 @@
         left join project_name_info as pni on plb.project_name_id = pni.id
         left join project_year_name_info as pyni on plb.year_name_id=pyni.id
         ) tmp_tb
-        where 1=1 and id in
+        where 1=1 and plb.platform is null and id in
             <foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
@@ -175,7 +175,7 @@
         left join project_name_info as pni on plb.project_name_id = pni.id
         left join project_year_name_info as pyni on plb.year_name_id=pyni.id
         ) tmp_tb
-        where 1=1 and state = #{state}
+        where 1=1 and plb.platform is null and state = #{state}
           and id in(
                 SELECT pm.id AS pm FROM params_manifest pm
                 JOIN ( SELECT id FROM
@@ -183,7 +183,7 @@
                     FROM
                     project_library_base a
                     JOIN mysql.help_topic b ON b.help_topic_id &lt; ( length( a.certification_engineer ) - length( REPLACE ( a.certification_engineer, ',', '' ) ) + 1 )) temp
-                    WHERE user_id = #{userId}) a ON pm.project_id = a.id
+                    WHERE user_id = #{userId} and platform is null) a ON pm.project_id = a.id
 
                 UNION
                 SELECT DISTINCT pcm.params_manifest_id AS pm FROM params_collect_manifest pcm WHERE sdt = #{userName} and state in('2','5')
@@ -211,7 +211,7 @@
         left join project_name_info as pni on plb.project_name_id = pni.id
         left join project_year_name_info as pyni on plb.year_name_id = pyni.id
         ) tmp_tb
-        where project_id = #{projectId}
+        where project_id = #{projectId} and plb.platform is null
     </select>
 
     <select id="labelListForProjectDetails" resultType="java.util.LinkedHashMap">
@@ -232,7 +232,7 @@
               FROM
                   project_library_base a
                       JOIN mysql.help_topic b ON b.help_topic_id &lt; ( length( a.certification_engineer ) - length( REPLACE ( a.certification_engineer, ',', '' ) ) + 1 )) temp
-                        WHERE user_id = #{userId}) a ON pm.project_id = a.id
+                        WHERE user_id = #{userId} and platform is null) a ON pm.project_id = a.id
         where pm.state = #{state}
     </select>
 </mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml

@@ -34,6 +34,7 @@
 
     <sql id="BaseQuerySql">
         <where>
+            platform is null
             <if test="paramsReportEO != null">
                 <if test="paramsReportEO.title !=null and paramsReportEO.title !=''">
                     AND title LIKE CONCAT(CONCAT('%',#{paramsReportEO.title}),'%')

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml

@@ -30,6 +30,7 @@
 
     <sql id="BaseQuerySql">
         <where>
+            plb.platform is null
             <if test="paramsReportExportHistoryEO != null">
                 <if test="paramsReportExportHistoryEO.projectName !=null and paramsReportExportHistoryEO.projectName !=''">
                     AND project_name LIKE CONCAT(CONCAT('%',#{paramsReportExportHistoryEO.projectName}),'%')
@@ -57,4 +58,4 @@
         <include refid="BaseQuerySql"/>
         order by export_time desc
     </select>
-</mapper>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml

@@ -135,6 +135,7 @@
 	    JOIN project_year_name_info pyni ON pyni.id = plb.year_name_id
         where plb.target_market =#{market}
         and pni.project_name =#{car}
+        and plb.platform is null
         GROUP BY plb.id
         ORDER BY project_version asc
     </select>
@@ -158,7 +159,7 @@
 	    LEFT JOIN ota_manage_apply oma ON oma.project_version = plb.id
 	    LEFT JOIN project_name_info pni ON pni.id = plb.project_name_id
 	    LEFT JOIN project_year_name_info pyni ON pyni.project_name_id = pni.id
-        WHERE oma.vdr = #{vdr}
+        WHERE oma.vdr = #{vdr} and plb.platform is null
         GROUP BY plb.id
     </select>
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java

@@ -2036,7 +2036,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
     public List<Map<String, Object>> getStatisticalStatus(String projectId, String plannedBpLaunchBatch, String cut, List<ProjectLibraryBase> plbEoList) {
         List<Map<String, Object>> result = new ArrayList<>();
         List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
-        if (!plbEoList.isEmpty()) {
+        if (ObjectUtils.isNotEmpty(plbEoList)) {
             projectLibraryBaseList = plbEoList.stream().filter(e -> e.getId().equals(projectId)).collect(Collectors.toList());
         }
         List<OtaManageApplyEO> receiveList = this.getBaseMapper().getListByProjectId(projectId, plannedBpLaunchBatch);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectCertificationInventoryEOController.java

@@ -0,0 +1,376 @@
+package com.jero.modules.platform.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
+import com.jero.modules.platform.service.IPlatformProjectCertificationInventoryEOService;
+import com.jero.modules.system.entity.SysRole;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+* @Description: 项目库-认证清单表
+* @Author: jero-boot
+* @Date:   2023-03-03
+* @Version: V1.0
+*/
+@Api(tags="平台件项目库-认证清单表")
+@RestController
+@RequestMapping("/platform/projectCertificationInventoryEO")
+@Slf4j
+public class PlatformProjectCertificationInventoryEOController extends JeroController<ProjectCertificationInventoryEO, IPlatformProjectCertificationInventoryEOService> {
+   @Autowired
+   private IPlatformProjectCertificationInventoryEOService platformProjectCertificationInventoryEOService;
+
+   /**
+    * 分页列表查询
+    *
+    * @param projectCertificationInventoryEO
+    * @param pageNo
+    * @param pageSize
+    * @param req
+    * @return
+    */
+   @AutoLog(value = "项目库-认证清单表-分页列表查询")
+   @ApiOperation(value="项目库-认证清单表-分页列表查询", notes="项目库-认证清单表-分页列表查询")
+   @GetMapping(value = "/page")
+   public Result<?> queryPageList(ProjectCertificationInventoryEO projectCertificationInventoryEO,
+                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                  @RequestParam(name="cut", defaultValue="cn") String cut,
+                                  HttpServletRequest req) {
+       String flowStatusStr = "";
+       if (StringUtils.isNotEmpty(projectCertificationInventoryEO.getFlowStatus())) {
+           flowStatusStr = projectCertificationInventoryEO.getFlowStatus();
+           projectCertificationInventoryEO.setFlowStatus(null);
+       }
+       QueryWrapper<ProjectCertificationInventoryEO> queryWrapper = QueryGenerator.initQueryWrapper(projectCertificationInventoryEO, req.getParameterMap());
+       if (StringUtils.isNotEmpty(flowStatusStr)) {
+           String finalflowStatusStr = flowStatusStr.replaceAll("\\*","");
+           queryWrapper.and(query -> {
+               query.lambda().like(ProjectCertificationInventoryEO::getFlowStatus, finalflowStatusStr);
+               if(StringUtils.contains(finalflowStatusStr,",")){
+                   String[] flowStatusArr = finalflowStatusStr.split(",");
+                   for (String fs : flowStatusArr) {
+                       query.or(q -> {
+                           q.like("flow_status",fs);
+                       });
+                   }
+               }
+           });
+       }
+       queryWrapper.orderByDesc("create_time");
+       Page<ProjectCertificationInventoryEO> page = new Page<ProjectCertificationInventoryEO>(pageNo, pageSize);
+       IPage<ProjectCertificationInventoryEO> pageList = this.platformProjectCertificationInventoryEOService.queryPage(queryWrapper,page,projectCertificationInventoryEO,cut);
+       return Result.OK(cut,pageList);
+   }
+
+   /**
+    * 列表查询
+    *
+    * @return
+    */
+   @AutoLog(value = "项目库-认证清单表-列表查询")
+   @ApiOperation(value="项目库-认证清单表-列表查询", notes="项目库-认证清单表-列表查询")
+   @GetMapping(value = "/list")
+   public Result<List<ProjectCertificationInventoryEO>> queryList() {
+       List<ProjectCertificationInventoryEO> list = platformProjectCertificationInventoryEOService.queryList();
+       return Result.OK(list);
+   }
+
+   /**
+    *   添加
+    *
+    * @param projectCertificationInventoryEO
+    * @return
+    */
+   @AutoLog(value = "项目库-认证清单表-添加")
+   @ApiOperation(value="项目库-认证清单表-添加", notes="项目库-认证清单表-添加")
+   @PostMapping(value = "/add")
+   public Result<?> add(@Validated @RequestBody ProjectCertificationInventoryEO projectCertificationInventoryEO) {
+       platformProjectCertificationInventoryEOService.add(projectCertificationInventoryEO);
+       return Result.OK("添加成功！");
+   }
+
+   /**
+    *  编辑
+    *
+    * @param projectCertificationInventoryEO
+    * @return
+    */
+   @AutoLog(value = "项目库-认证清单表-编辑")
+   @ApiOperation(value="项目库-认证清单表-编辑", notes="项目库-认证清单表-编辑")
+   @PutMapping(value = "/edit")
+   public Result<?> edit(@Validated @RequestBody ProjectCertificationInventoryEO projectCertificationInventoryEO) {
+       platformProjectCertificationInventoryEOService.editById(projectCertificationInventoryEO);
+       return Result.OK("编辑成功!");
+   }
+
+   /**
+    *   通过id删除
+    *
+    * @param id
+    * @return
+    */
+   @AutoLog(value = "项目库-认证清单表-通过id删除")
+   @ApiOperation(value="项目库-认证清单表-通过id删除", notes="项目库-认证清单表-通过id删除")
+   @DeleteMapping(value = "/delete")
+   public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+       platformProjectCertificationInventoryEOService.deleteById(id);
+       return Result.OK("删除成功!");
+   }
+
+   /**
+    *  批量删除
+    *
+    * @param ids
+    * @return
+    */
+   @AutoLog(value = "项目库-认证清单表-批量删除")
+   @ApiOperation(value="项目库-认证清单表-批量删除", notes="项目库-认证清单表-批量删除")
+   @DeleteMapping(value = "/deleteBatch")
+   public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+       this.platformProjectCertificationInventoryEOService.deleteByIds(Arrays.asList(ids.split(",")));
+       return Result.OK("批量删除成功!");
+   }
+
+   /**
+    * 通过id查询
+    *
+    * @param id
+    * @return
+    */
+   @AutoLog(value = "项目库-认证清单表-通过id查询")
+   @ApiOperation(value="项目库-认证清单表-通过id查询", notes="项目库-认证清单表-通过id查询")
+   @GetMapping(value = "/queryById")
+   public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+       ProjectCertificationInventoryEO projectCertificationInventoryEO = platformProjectCertificationInventoryEOService.queryById(id);
+       if(projectCertificationInventoryEO==null) {
+           return Result.error("未找到对应数据");
+       }
+       return Result.OK(projectCertificationInventoryEO);
+   }
+
+   /**
+   * 导出excel
+   *
+   * @param request
+   * @param projectCertificationInventoryEO
+   */
+   @RequestMapping(value = "/exportXls")
+   public ModelAndView exportXls(HttpServletRequest request, ProjectCertificationInventoryEO projectCertificationInventoryEO) {
+       return super.exportXls(request, projectCertificationInventoryEO, ProjectCertificationInventoryEO.class, "项目库-认证清单表");
+   }
+
+   /**
+     * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+   @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+   public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+       return super.importExcel(request, response, ProjectCertificationInventoryEO.class);
+   }
+
+    @AutoLog(value = "项目库-认证清单表-批量添加")
+    @ApiOperation(value="项目库-认证清单表-批量添加", notes="项目库-认证清单表-批量添加")
+    @PostMapping(value = "/batchAdd")
+    public Result<?> batchAdd(@RequestBody JSONObject json) {
+        return this.platformProjectCertificationInventoryEOService.batchAdd(json);
+    }
+
+    @AutoLog(value = "项目库-认证清单表-批量设置")
+    @ApiOperation(value="项目库-认证清单表-批量设置", notes="项目库-认证清单表-批量设置")
+    @PostMapping(value = "/setBatch")
+    public Result<?> setBatch(@RequestBody ProjectCertificationInventoryEO projectCertificationInventoryEO) {
+        return this.platformProjectCertificationInventoryEOService.setBatch(projectCertificationInventoryEO);
+    }
+
+    @AutoLog(value = "项目库-认证清单表-studio发布")
+    @ApiOperation(value="项目库-认证清单表-studio发布", notes="项目库-认证清单表-studio发布")
+    @PostMapping(value = "/issue")
+    public Result<?> issue(@RequestBody JSONObject json) {
+        return this.platformProjectCertificationInventoryEOService.issue(json);
+    }
+
+    @AutoLog(value = "项目库-认证清单表-当前登录用户角色")
+    @ApiOperation(value="项目库-认证清单表-当前登录用户角色", notes="项目库-认证清单表-当前登录用户角色")
+    @GetMapping(value = "/getRoleByUserId")
+    public Result<List<SysRole>> getRoleByUserId(@RequestParam Map<String,Object> params) {
+        return this.platformProjectCertificationInventoryEOService.getRoleByUserId(params);
+    }
+
+    @AutoLog(value = "项目库-认证清单表-获取流程状态列表")
+    @ApiOperation(value="项目库-认证清单表-获取流程状态列表", notes="项目库-认证清单表-获取流程状态列表")
+    @GetMapping(value = "/getFlowStatusList")
+    public Result<?> getFlowStatusList(@RequestParam("cut") String cut) {
+        return this.platformProjectCertificationInventoryEOService.getFlowStatusList(cut);
+    }
+
+    @AutoLog(value = "项目库-认证清单表-认证流程统一提交任务接口")
+    @ApiOperation(value="项目库-认证清单表-认证流程统一提交任务接口", notes="项目库-认证清单表-认证流程统一提交任务接口")
+    @PostMapping(value = "/submitTask")
+    public Result<?> submitTask(@RequestBody JSONObject json) {
+        return this.platformProjectCertificationInventoryEOService.submitTask(json);
+    }
+
+    @AutoLog(value = "项目库-认证清单表-批量保存")
+    @ApiOperation(value="项目库-认证清单表-批量保存", notes="项目库-认证清单表-批量保存")
+    @PostMapping(value = "/saveBatch")
+    public Result<?> saveBatch(@RequestBody JSONObject json) {
+        return this.platformProjectCertificationInventoryEOService.saveBatch(json);
+    }
+
+    @AutoLog(value = "项目库-认证清单表-流程重置")
+    @ApiOperation(value="项目库-认证清单表-流程重置", notes="项目库-认证清单表-流程重置")
+    @PostMapping(value = "/resetFlow")
+    public Result<?> resetFlow(@RequestBody JSONObject json) {
+        return this.platformProjectCertificationInventoryEOService.resetFlow(json);
+    }
+
+    @AutoLog(value = "项目库-认证清单表-转办")
+    @ApiOperation(value="项目库-认证清单表-转办", notes="项目库-认证清单表-转办")
+    @PostMapping(value = "/transferTask")
+    public Result<?> transferTask(@RequestBody JSONObject json) {
+        return this.platformProjectCertificationInventoryEOService.transferTask(json);
+    }
+
+    @AutoLog(value = "项目库-认证清单表-催办")
+    @ApiOperation(value="项目库-认证清单表-催办", notes="项目库-认证清单表-催办")
+    @PostMapping(value = "/expediting")
+    public Result<?> expediting(@RequestBody JSONObject json) {
+        return this.platformProjectCertificationInventoryEOService.expediting(json);
+    }
+
+    @AutoLog(value = "项目库-认证清单表-批量修改配置项")
+    @ApiOperation(value="项目库-认证清单表-批量修改配置项", notes="项目库-认证清单表-批量修改配置项")
+    @PostMapping(value = "/updateConfigItemBatch")
+    public Result<?> updateConfigItemBatch(@RequestBody JSONObject json) {
+        return this.platformProjectCertificationInventoryEOService.updateConfigItemBatch(json);
+    }
+
+    @ApiOperation(value="项目库-认证清单表-模板下载", notes="项目库-认证清单表-模板下载")
+    @GetMapping(value = "/exportTemplate")
+    public void exportTemplate(ProjectCertificationInventoryEO projectCertificationInventoryEO, HttpServletResponse response, HttpServletRequest request) throws Exception {
+        platformProjectCertificationInventoryEOService.exportTemplate(projectCertificationInventoryEO,response,request);
+    }
+
+    /**
+     * 导入数据
+     *
+     * @param file
+     * @param projectCertificationInventoryEO
+     * @return
+     */
+    @ApiOperation(value="项目库-认证清单表-导入数据", notes="项目库-认证清单表-导入数据")
+    @RequestMapping(value = "/importData", method = RequestMethod.POST)
+    public Result<?> importData(@RequestParam(value = "file", required = false) MultipartFile file,
+                                ProjectCertificationInventoryEO projectCertificationInventoryEO) {
+        platformProjectCertificationInventoryEOService.importData(file,projectCertificationInventoryEO);
+        return Result.OK("导入成功");
+    }
+    /**
+     * 导出数据
+     *  @param request
+     * @param projectCertificationInventoryEO
+     */
+    @ApiOperation(value="项目库-认证清单表-导出数据", notes="项目库-认证清单表-导出数据")
+    @RequestMapping(value = "/exportData",method = RequestMethod.GET)
+//	 @RequiresPermissions("projectLawsInventory:exportData")
+    public void exportData(HttpServletResponse response,
+                           HttpServletRequest request,
+                           ProjectCertificationInventoryEO projectCertificationInventoryEO) {
+        platformProjectCertificationInventoryEOService.exportData(response,request, projectCertificationInventoryEO);
+    }
+
+    @AutoLog(value = "项目库-认证清单表-调取添加")
+    @ApiOperation(value="项目库-认证清单表-调取添加", notes="项目库-认证清单表-调取添加")
+    @PostMapping(value = "/callAdd")
+    public Result<?> callAdd(@RequestBody JSONObject json) {
+        return this.platformProjectCertificationInventoryEOService.callAdd(json);
+    }
+
+    @AutoLog(value = "项目库-认证清单表-引用交付物")
+    @ApiOperation(value="项目库-认证清单表-引用交付物", notes="项目库-认证清单表-引用交付物")
+    @PostMapping(value = "/citeDeliverable")
+    public Result<?> citeDeliverable(@RequestBody JSONObject json) {
+        return this.platformProjectCertificationInventoryEOService.citeDeliverable(json);
+    }
+
+    /**
+     *  批量更新法规清单状态
+     * @param json
+     * @return
+     */
+    @AutoLog(value = "项目库-认证清单表-批量更新流程状态")
+    @ApiOperation(value="项目库-认证清单表-批量更新流程状态", notes="项目库-认证清单表-批量更新流程状态")
+    @PostMapping(value = "/updateStatusBatch")
+    public Result<?> updateStatusBatch(@RequestBody JSONObject json) {
+        return this.platformProjectCertificationInventoryEOService.updateStatusBatch(json);
+    }
+
+    /**
+     * 添加配置 等同于 复制
+     * @param json
+     * @return
+     */
+    @AutoLog(value = "项目库-认证清单表-添加配置")
+    @ApiOperation(value="项目库-认证清单表-添加配置", notes="项目库-认证清单表-添加配置")
+    @PostMapping(value = "/addConfigByIds")
+    public Result<?> addConfigByIds(@RequestBody JSONObject json) {
+        return this.platformProjectCertificationInventoryEOService.addConfigByIds(json);
+    }
+
+    /**
+     * 获取责任人和接口人
+     * @return
+     */
+    @AutoLog(value = "项目库-认证清单表-获取责任人和接口人")
+    @ApiOperation(value="项目库-认证清单表-获取责任人和接口人", notes="项目库-认证清单表-获取责任人和接口人")
+    @GetMapping(value = "/queryDutyPersonByProjectId")
+    public Result<?> queryDutyPersonByProjectId(@RequestParam Map<String,Object> params) {
+        return Result.OK(this.platformProjectCertificationInventoryEOService.queryDutyPersonByProjectId(params));
+    }
+
+    /**
+     * 匹配相关人员
+     * @param params
+     * @return
+     */
+    @AutoLog(value = "项目库-认证清单表-匹配相关人员")
+    @ApiOperation(value="项目库-认证清单表-匹配相关人员", notes="项目库-法规清单表-匹配相关人员")
+    @PostMapping(value = "/matchRelevantPeople")
+    public Result<?> matchRelevantPeople(@RequestBody Map<String,Object> params){
+        return this.platformProjectCertificationInventoryEOService.matchRelevantPeople(params);
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLawsInventoryEOController.java

@@ -0,0 +1,576 @@
+package com.jero.modules.platform.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.itextpdf.text.DocumentException;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.util.PageUtil;
+import com.jero.modules.document.entity.BussDocumentLibraryEO;
+import com.jero.modules.document.service.IBussDocumentLibraryEOService;
+import com.jero.modules.dummy.entity.DummyInventoryBaseEO;
+import com.jero.modules.dummy.service.IDummyInventoryBaseEOService;
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
+import com.jero.modules.project.service.IProjectLawsInventoryEOService;
+import com.jero.modules.project.vo.ProjectTaskUrgVo;
+import com.jero.modules.platform.service.IPlatformProjectLawsInventoryEOService;
+import com.jero.modules.system.entity.SysRole;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @Description: 项目库-法规清单表
+ * @Author: jero-boot
+ * @Date:   2022-04-14
+ * @Version: V1.0
+ */
+@Api(tags="平台件项目库-法规清单表")
+@RestController
+@RequestMapping("/platform/projectLawsInventoryEO")
+@Slf4j
+public class PlatformProjectLawsInventoryEOController extends JeroController<ProjectLawsInventoryEO, IProjectLawsInventoryEOService> {
+	@Autowired
+	private IPlatformProjectLawsInventoryEOService platformProjectLawsInventoryEOService;
+	 @Autowired
+	 private IBussDocumentLibraryEOService bussDocumentLibraryEOService;
+	 @Autowired
+	 private IDummyInventoryBaseEOService dummyInventoryBaseEOService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param projectLawsInventoryEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "项目库-法规清单表-分页列表查询")
+	@ApiOperation(value="项目库-法规清单表-分页列表查询", notes="项目库-法规清单表-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(ProjectLawsInventoryEO projectLawsInventoryEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		IPage<ProjectLawsInventoryEO> pageList = this.platformProjectLawsInventoryEOService.queryPage(projectLawsInventoryEO,pageNo,pageSize,req);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "项目库-法规清单表-列表查询")
+    @ApiOperation(value="项目库-法规清单表-列表查询", notes="项目库-法规清单表-列表查询")
+	@GetMapping(value = "/list")
+	@RequiresPermissions("projectLawsInventory:list")
+	public Result<List<ProjectLawsInventoryEO>> queryList(ProjectLawsInventoryEO projectLawsInventoryEO,HttpServletRequest req) {
+        List<ProjectLawsInventoryEO> list = platformProjectLawsInventoryEOService.queryList(projectLawsInventoryEO,req);
+        return Result.OK(projectLawsInventoryEO.getCut(),list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param projectLawsInventoryEO
+	 * @return
+	 */
+	@AutoLog(value = "项目库-法规清单表-添加")
+	@ApiOperation(value="项目库-法规清单表-添加", notes="项目库-法规清单表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody ProjectLawsInventoryEO projectLawsInventoryEO) {
+		platformProjectLawsInventoryEOService.add(projectLawsInventoryEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param projectLawsInventoryEO
+	 * @return
+	 */
+	@AutoLog(value = "项目库-法规清单表-编辑")
+	@ApiOperation(value="项目库-法规清单表-编辑", notes="项目库-法规清单表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody ProjectLawsInventoryEO projectLawsInventoryEO) {
+		platformProjectLawsInventoryEOService.editById(projectLawsInventoryEO);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "项目库-法规清单表-通过id删除")
+	@ApiOperation(value="项目库-法规清单表-通过id删除", notes="项目库-法规清单表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id,
+							@RequestParam(name="projectLibraryId",required=true) String projectLibraryId,
+							@RequestParam(name="cut",required=true) String cut) {
+		platformProjectLawsInventoryEOService.deleteById(id,projectLibraryId,cut);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "项目库-法规清单表-批量删除")
+	@ApiOperation(value="项目库-法规清单表-批量删除", notes="项目库-法规清单表-批量删除")
+	@PostMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestBody JSONObject json) {
+		String ids = json.getString("ids");
+		String projectLibraryId = json.getString("projectLibraryId");
+		String cut = json.getString("cut");
+		this.platformProjectLawsInventoryEOService.deleteByIds(Arrays.asList(ids.split(",")),projectLibraryId,cut);
+		return Result.OK("批量删除成功!");
+	}
+
+	 /**
+	  * 通过id查询
+	  *
+	  * @param id
+	  * @return
+	  */
+	 @AutoLog(value = "项目库-法规清单表-通过id查询")
+	 @ApiOperation(value="项目库-法规清单表-通过id查询", notes="项目库-法规清单表-通过id查询")
+	 @GetMapping(value = "/queryById")
+	 public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		 ProjectLawsInventoryEO projectLawsInventoryEO = platformProjectLawsInventoryEOService.queryById(id);
+		 if(projectLawsInventoryEO==null) {
+			 return Result.error("未找到对应数据");
+		 }
+		 return Result.OK(projectLawsInventoryEO);
+	 }
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param projectLawsInventoryEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ProjectLawsInventoryEO projectLawsInventoryEO) {
+        return super.exportXls(request, projectLawsInventoryEO, ProjectLawsInventoryEO.class, "项目库-法规清单表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ProjectLawsInventoryEO.class);
+    }
+
+	 /**
+	  *  批量更新法规清单状态
+	  * @param json
+	  * @return
+	  */
+	 @AutoLog(value = "项目库-法规清单表-批量更新状态")
+	 @ApiOperation(value="项目库-法规清单表-批量更新状态", notes="项目库-法规清单表-批量更新状态")
+	 @PostMapping(value = "/updateStatusBatch")
+	 public Result<?> updateStatusBatch(@RequestBody JSONObject json) {
+		 return this.platformProjectLawsInventoryEOService.updateStatusBatch(json);
+	 }
+
+	 /**
+	  * 匹配相关人员
+	  * @param params
+	  * @return
+	  */
+	 @AutoLog(value = "项目库-法规清单表-匹配相关人员")
+	 @ApiOperation(value="项目库-法规清单表-匹配相关人员", notes="项目库-法规清单表-匹配相关人员")
+	 @PostMapping(value = "/matchRelevantPeople")
+	 public Result<?> matchRelevantPeople(@RequestBody Map<String,Object> params){
+	 	return this.platformProjectLawsInventoryEOService.matchRelevantPeople(params);
+	 }
+
+	 /**
+	  * 流程调用接口
+	  * @param jsonObject
+	  * @return
+	  */
+	 @AutoLog(value = "项目库-法规清单表-流程调用")
+	 @ApiOperation(value="项目库-法规清单表-流程调用", notes="项目库-法规清单表-流程调用")
+	 @PostMapping(value = "/processCall")
+	 public Result<?> processCall(@RequestBody JSONObject jsonObject){
+		 return this.platformProjectLawsInventoryEOService.processCall(jsonObject);
+	 }
+
+	 /**
+	  * 通过id查询
+	  * @param params
+	  * @return
+	  */
+	 @AutoLog(value = "项目库-法规清单表-通过id与操作类型查询")
+	 @ApiOperation(value="项目库-法规清单表-通过id与操作类型查询", notes="项目库-法规清单表-通过id与操作类型查询")
+	 @GetMapping(value = "/queryProjectLawsInventoryInfoById")
+	 public Result<?> queryProjectLawsInventoryInfoById(@RequestParam Map<String,Object> params) {
+		 List<ProjectLawsInventoryEO> result = platformProjectLawsInventoryEOService.queryProjectLawsInventoryInfoById(params);
+		 return Result.OK((String) params.get("cut"),result);
+	 }
+
+	 @AutoLog(value = "法规清单添加调用文档库数据--分页")
+	 @ApiOperation(value="法规清单添加调用文档库数据--分页", notes="法规清单添加调用文档库数据--分页")
+	 @PostMapping(value = "/queryPageInfoBussDocument")
+	 public Result<?> queryPageInfo(@RequestBody BussDocumentLibraryEO bussDocumentLibraryEO,
+										 HttpServletRequest req) {
+		 QueryWrapper<BussDocumentLibraryEO> queryWrapper = QueryGenerator.initQueryWrapper(bussDocumentLibraryEO, req.getParameterMap());
+		 Page<BussDocumentLibraryEO> page = new Page<BussDocumentLibraryEO>(bussDocumentLibraryEO.getPageNo(), bussDocumentLibraryEO.getPageSize());
+		 IPage<BussDocumentLibraryEO> pageList = bussDocumentLibraryEOService.queryPageInfoDummy(page, queryWrapper,bussDocumentLibraryEO);
+		 return Result.OK(pageList);
+	 }
+
+	 /**
+	  * 复制
+	  *
+	  * @param ids
+	  * @return
+	  */
+	 @AutoLog(value = "复制")
+	 @ApiOperation(value="复制", notes="复制")
+	 @GetMapping(value = "/copyInfoByIds")
+	 public Result<?> copyInfoByIds(@RequestParam(name="ids",required=true) String ids,
+									@RequestParam(name="cut",required=true) String cut,
+									@RequestParam(name="operateType",required=true) String operateType) {
+		 try {
+			 platformProjectLawsInventoryEOService.copyInfoByIds(ids,operateType);
+		 } catch (Exception e) {
+			 if(CutEnum.CN.getValue().equals(cut)){
+				 return Result.error("复制失败");
+			 }else{
+				 return Result.error("Copy the failure");
+			 }
+		 }
+		 if(CutEnum.CN.getValue().equals(cut)){
+			 return Result.OK("复制成功");
+		 }else{
+			 return Result.OK("Copy success");
+		 }
+	 }
+
+
+	 /**
+	  *  批量设置
+	  *
+	  * @param projectLawsInventoryEO
+	  * @return
+	  */
+	 @AutoLog(value = "批量设置")
+	 @ApiOperation(value="批量设置", notes="批量设置")
+	 @PostMapping(value = "/setBatch")
+	 public Result<?> setBatch(@RequestBody ProjectLawsInventoryEO projectLawsInventoryEO) {
+		 String cut = projectLawsInventoryEO.getCut();
+		 try {
+			 platformProjectLawsInventoryEOService.setBatch(projectLawsInventoryEO);
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 log.error("批量设置失败：" + e.getMessage());
+			 if(CutEnum.CN.getValue().equals(cut)){
+				 return Result.error("批量设置失败！");
+			 }else{
+				 return Result.error("Batch set success");
+			 }
+		 }
+		 if(CutEnum.CN.getValue().equals(cut)){
+			 return Result.OK("批量设置成功");
+		 }else{
+			 return Result.OK("Batch set success");
+		 }
+	 }
+
+	 /**
+	  * 调取虚拟清单数据
+	  *
+	  * @param dummyInventoryBaseEO
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 @AutoLog(value = "调取虚拟清单数据")
+	 @ApiOperation(value="调取虚拟清单数据", notes="调取虚拟清单数据")
+	 @PostMapping(value = "/getPageInfoDummy")
+	 public Result<?> getPageInfoDummy(@RequestBody DummyInventoryBaseEO dummyInventoryBaseEO,
+									@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									HttpServletRequest req) {
+//		dummyInventoryBaseEO.setName("*发*");
+		 QueryWrapper<DummyInventoryBaseEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryBaseEO, req.getParameterMap());
+		 queryWrapper.orderByDesc("create_time");
+		 Page<DummyInventoryBaseEO> page = new Page<DummyInventoryBaseEO>(pageNo, pageSize);
+		 IPage<DummyInventoryBaseEO> pageList = dummyInventoryBaseEOService.getPageInfoDummy(page,queryWrapper);
+		 return Result.OK(dummyInventoryBaseEO.getCut(),pageList);
+	 }
+
+
+	 @ApiOperation(value = "模板下载")
+	 @GetMapping(value = "/exportTemplate")
+	 public void exportTemplate(ProjectLawsInventoryEO projectLawsInventoryEO, HttpServletResponse response, HttpServletRequest request) throws Exception {
+		 platformProjectLawsInventoryEOService.exportTemplate(projectLawsInventoryEO,response,request);
+	 }
+
+	 /**
+	  * 导出数据
+	  *  @param request
+	  * @param projectLawsInventoryEO
+	  */
+	 @RequestMapping(value = "/exportData")
+	 @RequiresPermissions("projectLawsInventory:exportData")
+	 public void exportData(HttpServletResponse response,
+							HttpServletRequest request,
+							ProjectLawsInventoryEO projectLawsInventoryEO) {
+		 platformProjectLawsInventoryEOService.exportData(response,request, projectLawsInventoryEO);
+	 }
+
+	 /**
+	  * 导入数据
+	  *
+	  * @param file
+	  * @param projectLawsInventoryEO
+	  * @return
+	  */
+	 @RequestMapping(value = "/importData", method = RequestMethod.POST)
+	 public Result<?> importData(@RequestParam(value = "file", required = false) MultipartFile file,
+								 ProjectLawsInventoryEO projectLawsInventoryEO) {
+		 platformProjectLawsInventoryEOService.importData(file,projectLawsInventoryEO);
+		 return Result.OK("导入成功");
+	 }
+
+
+	 @AutoLog(value = "变更")
+	 @ApiOperation(value="变更", notes="变更")
+	 @PostMapping(value = "/change")
+	 public Result<?> change(@RequestBody JSONObject params) {
+	 	return this.platformProjectLawsInventoryEOService.change(params);
+	 }
+
+	 @AutoLog(value = "下载pdf报告")
+	 @ApiOperation(value="下载pdf报告", notes="下载pdf报告")
+	 @GetMapping(value = "/downloadReport")
+	 public void downloadReport(@RequestParam Map<String,Object> params, HttpServletRequest req, HttpServletResponse resp) throws DocumentException {
+		 this.platformProjectLawsInventoryEOService.downloadReport(params,req,resp);
+	 }
+
+	 /**
+	  * 列表查询条件 标识传 1-->用于查询文档库字段属
+	  * 法规清单添加调取文档库时高级搜索条件
+	  * @param flag
+	  * @return
+	  */
+	 @AutoLog(value = "法规清单添加调取文档库时高级搜索条件")
+	 @ApiOperation(value="法规清单添加调取文档库时高级搜索条件", notes="法规清单添加调取文档库时高级搜索条件")
+	 @GetMapping(value = "/queryConditionInventory")
+	 public Result<List<Map<String,Object>>> queryConditionInventory(@RequestParam(name="flag",required=true) String flag,
+																	 @RequestParam(name="cut",required=true) String cut) {
+		 List<Map<String,Object>> list = bussDocumentLibraryEOService.queryConditionInventory(flag,cut);
+		 return Result.OK(list);
+	 }
+
+
+	 @ApiOperation(value="法规清单中添加调用文档库数据--分页", notes="法规清单中添加调用文档库数据--分页")
+	 @PostMapping(value = "/queryPageDummy")
+	 @ResponseBody
+	 public net.sf.json.JSONObject queryPageDummy(@RequestBody Map<String,Object> parameter) {
+		 IPage infoPage = bussDocumentLibraryEOService.getPageDummy(parameter);
+		 Result<IPage> ok = Result.OK(infoPage);
+		 net.sf.json.JSONObject jsonResult = net.sf.json.JSONObject.fromObject(ok);
+		 return jsonResult;
+	 }
+
+	/**
+	 *
+	 * @param params
+	 * 			cut:中英文标识
+	 * 			id：法规清单id
+	 * @param req
+	 * @param resp
+	 * @throws DocumentException
+	 */
+	@AutoLog(value = "下载docx报告")
+	@ApiOperation(value="下载docx报告", notes="下载docx报告")
+	@GetMapping(value = "/downloadDocxReport")
+ 	public void downloadDocxReport(@RequestParam Map<String,Object> params, HttpServletRequest req, HttpServletResponse resp) throws DocumentException {
+		this.platformProjectLawsInventoryEOService.downloadDocxReport(params,req,resp);
+	}
+
+	@AutoLog(value = "催办")
+	@ApiOperation(value="催办", notes="催办")
+	@PostMapping(value = "/expediting")
+	public Result<?> expediting(@RequestBody JSONObject json) {
+		return this.platformProjectLawsInventoryEOService.expediting(json);
+	}
+
+	/**
+	 * 当前登录用户角色
+	 * @return
+	 */
+	@ApiOperation(value = "当前登录用户角色")
+	@RequestMapping(value = "/getRoleByUserId", method = RequestMethod.GET)
+	public Result<List<SysRole>> getRoleByUserId(String projectLibraryId,String cut) {
+		Result<List<SysRole>> result = new Result<>();
+		List<SysRole> list = platformProjectLawsInventoryEOService.getRoleByUserId(projectLibraryId,cut);
+		if(list==null||list.size()<=0) {
+			result.error500("未找到角色信息");
+		}else {
+			result.setResult(list);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+
+	@AutoLog(value = "任务清单催办")
+	@ApiOperation(value="任务清单催办", notes="任务清单催办")
+	@PostMapping(value = "/taskUrg")
+	public Result<?> taskUrg(@RequestBody ProjectTaskUrgVo projectTaskUrgVo) {
+		return this.platformProjectLawsInventoryEOService.taskUrg(projectTaskUrgVo);
+	}
+
+
+	@AutoLog(value = "项目库-法规清单表-根据项目库id更新符合性流程发起人、责任人接口")
+	@ApiOperation(value="项目库-法规清单表-根据项目库id更新符合性流程发起人、责任人接口", notes="项目库-法规清单表-根据项目库id更新符合性流程发起人、责任人接口")
+	@GetMapping(value = "/updateFlowInfoByProjectLibraryIds")
+	public Result<?> updateFlowInfoByProjectLibraryIds(@RequestParam("projectLibraryIds") String projectLibraryIds){
+		return this.platformProjectLawsInventoryEOService.updateFlowInfoByProjectLibraryIds(projectLibraryIds);
+	}
+
+	@AutoLog(value = "项目库-法规清单表-studio发布")
+	@ApiOperation(value="项目库-法规清单表-studio发布", notes="项目库-法规清单表-studio发布")
+	@PostMapping(value = "/studioPublish")
+	public Result<?> studioPublish(@RequestBody JSONObject json) {
+		return this.platformProjectLawsInventoryEOService.studioPublish(json);
+	}
+
+	@AutoLog(value = "项目库-法规清单表-studio撤回")
+	@ApiOperation(value="项目库-法规清单表-studio撤回", notes="项目库-法规清单表-studio撤回")
+	@PostMapping(value = "/studioWithdrew")
+	public Result<?> studioWithdrew(@RequestBody JSONObject json) {
+		return this.platformProjectLawsInventoryEOService.studioWithdrew(json);
+	}
+
+	@AutoLog(value = "项目库-法规清单表-法规工程师退回")
+	@ApiOperation(value="项目库-法规清单表-法规工程师退回", notes="项目库-法规清单表-法规工程师退回")
+	@PostMapping(value = "/regulationOwnerReturned")
+	public Result<?> regulationOwnerReturned(@RequestBody JSONObject json) {
+		return this.platformProjectLawsInventoryEOService.regulationOwnerReturned(json);
+	}
+
+	@AutoLog(value = "流程重置-迁移法规清单流程历史数据专用")
+	@ApiOperation(value="流程重置-迁移法规清单流程历史数据专用", notes="流程重置-迁移法规清单流程历史数据专用")
+	@PostMapping(value = "/resetFlowTemp")
+	public Result<?> resetFlowTemp(@RequestBody JSONObject params) {
+		return this.platformProjectLawsInventoryEOService.resetFlowTemp(params);
+	}
+
+	/**
+	 *  批量更新法规清单状态
+	 * @param json
+	 * @return
+	 */
+	@AutoLog(value = "项目库-法规清单表-批量更新流程状态")
+	@ApiOperation(value="项目库-法规清单表-批量更新流程状态", notes="项目库-法规清单表-批量更新流程状态")
+	@PostMapping(value = "/updateFlowStatusBatch")
+	public Result<?> updateFlowStatusBatch(@RequestBody JSONObject json) {
+		return this.platformProjectLawsInventoryEOService.updateFlowStatusBatch(json);
+	}
+
+	@AutoLog(value = "项目库-法规清单表-引用交付物")
+	@ApiOperation(value="项目库-法规清单表-引用交付物", notes="项目库-法规清单表-引用交付物")
+	@PostMapping(value = "/citeDeliverable")
+	public Result<?> citeDeliverable(@RequestBody JSONObject json) {
+		return this.platformProjectLawsInventoryEOService.citeDeliverable(json);
+	}
+
+	@AutoLog(value = "项目库-法规清单表-强制转办")
+	@ApiOperation(value="项目库-法规清单表-强制转办", notes="项目库-法规清单表-强制转办")
+	@PostMapping(value = "/compulsoryTransfer")
+	public Result<?> compulsoryTransfer(@RequestBody JSONObject json) {
+		return this.platformProjectLawsInventoryEOService.compulsoryTransfer(json);
+	}
+
+	/**
+	 * 通过projectId查询责任人
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "项目库-法规清单表-通过projectId查询责任人")
+	@ApiOperation(value="项目库-法规清单表-通过projectId查询责任人", notes="项目库-法规清单表-通过projectId查询责任人")
+	@GetMapping(value = "/queryDutyPersonByProjectId")
+	public Result<?> queryDutyPersonByProjectId(@RequestParam Map<String,Object> params){
+		Map<String, List<Map<String, Object>>> res = this.platformProjectLawsInventoryEOService.queryDutyPersonByProjectId(params);
+		return Result.OK(res);
+	}
+
+	/**
+	 * 分页查询不符合项列表
+	 * @return
+	 */
+	@AutoLog(value = "项目库-法规清单表-查询不符合项列表")
+	@ApiOperation(value="项目库-法规清单表-查询不符合项列表", notes="项目库-法规清单表-查询不符合项列表")
+	@GetMapping(value = "/queryNotComplianList")
+	public Result<?> queryNotComplianList(@RequestParam Map<String,Object> 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);
+		return Result.OK(pages);
+	}
+
+	/**
+	 * 导出不符合项列表
+	 *  @param request
+	 * @param params
+	 */
+	@AutoLog(value = "项目库-法规清单表-导出不符合项列表")
+	@ApiOperation(value="项目库-法规清单表-导出不符合项列表", notes="项目库-法规清单表-导出不符合项列表")
+	@RequestMapping(value = "/exportNotComplianList")
+	public void exportNotComplianList(HttpServletResponse response,
+						   HttpServletRequest request,
+						   @RequestBody Map<String,Object> params) {
+		this.platformProjectLawsInventoryEOService.exportNotComplianList(response,request, params);
+	}
+
+	@AutoLog(value = "项目库-法规清单表-定版校验")
+	@ApiOperation(value="项目库-法规清单表-定版校验", notes="项目库-法规清单表-定版校验")
+	@GetMapping(value = "/finalizationVerify")
+	public Result<?> finalizationVerify(@RequestParam Map<String,Object> params){
+		return this.platformProjectLawsInventoryEOService.finalizationVerify(params);
+	}
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformProjectLibraryBaseController.java

@@ -0,0 +1,310 @@
+package com.jero.modules.platform.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.vo.DictModel;
+import com.jero.modules.project.entity.ProjectLibraryBase;
+import com.jero.modules.platform.service.IPlatformProjectLibraryBaseService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @Description: 项目库基础表
+ * @Author: jero-boot
+ * @Date:   2022-04-11
+ * @Version: V1.0
+ */
+@Api(tags="平台件项目库")
+@RestController
+@RequestMapping("/platform/projectLibraryBase")
+@Slf4j
+public class PlatformProjectLibraryBaseController extends JeroController<ProjectLibraryBase, IPlatformProjectLibraryBaseService> {
+	@Autowired
+	private IPlatformProjectLibraryBaseService platformIProjectLibraryBaseService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "项目库基础表-分页列表查询")
+	@ApiOperation(value="项目库基础表-分页列表查询", notes="项目库基础表-分页列表查询")
+	@PostMapping(value = "/page")
+	public Result<?> queryPageList(@RequestBody Map<String,Object> params) {
+		List<ProjectLibraryBase> pageList= platformIProjectLibraryBaseService.queryPageList(params);
+		Page pages = platformIProjectLibraryBaseService.getPages(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()), pageList);
+		return Result.OK(params.get("cut").toString(),pages);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "项目库基础表-列表查询")
+    @ApiOperation(value="项目库基础表-列表查询", notes="项目库基础表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<ProjectLibraryBase>> queryList(ProjectLibraryBase projectLibraryBase) {
+        List<ProjectLibraryBase> list = platformIProjectLibraryBaseService.getList(projectLibraryBase);
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param projectLibraryBase
+	 * @return
+	 */
+	@AutoLog(value = "项目库基础表-添加")
+	@ApiOperation(value="项目库基础表-添加", notes="项目库基础表-添加")
+	@RequiresPermissions("projectLibraryBase:add")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) throws ParseException {
+		platformIProjectLibraryBaseService.add(projectLibraryBase);
+		return Result.OK("添加成功！");
+	}
+	/**
+	 * 项目扩展(添加子项目子项目基本信息、相关人员名单、法规/认证任务计划与被扩展项目保持一致)
+	 *
+	 * @param projectLibraryBase
+	 * @return
+	 */
+	@AutoLog(value = "项目扩展(添加子项目)")
+	@ApiOperation(value="项目扩展(添加子项目)", notes="项目扩展(添加子项目)")
+	@RequiresPermissions("projectLibraryBase:add")
+	@PostMapping(value = "/addChild")
+	public Result<?> addChild(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) throws ParseException {
+		platformIProjectLibraryBaseService.addChild(projectLibraryBase);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param projectLibraryBase
+	 * @return
+	 */
+	@AutoLog(value = "项目库基础表-编辑")
+	@ApiOperation(value="项目库基础表-编辑", notes="项目库基础表-编辑")
+	@RequiresPermissions("projectLibraryBase:edit")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) {
+		platformIProjectLibraryBaseService.editById(projectLibraryBase);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "项目库基础表-通过id删除")
+	@ApiOperation(value="项目库基础表-通过id删除", notes="项目库基础表-通过id删除")
+	@RequiresPermissions("projectLibraryBase:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id,
+							@RequestParam(name="cut",required=true) String cut) {
+		platformIProjectLibraryBaseService.deleteById(id,cut);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "项目库基础表-批量删除")
+	@ApiOperation(value="项目库基础表-批量删除", notes="项目库基础表-批量删除")
+	@RequiresPermissions("projectLibraryBase:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids,
+								 @RequestParam(name="cut",required=true) String cut) {
+		this.platformIProjectLibraryBaseService.deleteByIds(Arrays.asList(ids.split(",")),cut);
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "项目库基础表-通过id查询")
+	@ApiOperation(value="项目库基础表-通过id查询", notes="项目库基础表-通过id查询")
+	@RequiresPermissions("projectLibraryBase:queryById")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id,
+							   @RequestParam(name="cut",required=true) String cut) {
+		List<ProjectLibraryBase> data = platformIProjectLibraryBaseService.queryById(id,cut);
+			if(data==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cut,data);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param projectLibraryBase
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ProjectLibraryBase projectLibraryBase) {
+        return super.exportXls(request, projectLibraryBase, ProjectLibraryBase.class, "项目库基础表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ProjectLibraryBase.class);
+    }
+
+	/**
+	 * 项目详情-统计接口
+	 * @param id 项目库id
+	 * @return
+	 */
+	@AutoLog(value = "项目详情-统计接口")
+	@ApiOperation(value="项目详情-统计接口", notes="项目详情-统计接口")
+	@GetMapping(value = "/getProjectDetailsStatistics")
+	public Result<?> getProjectDetailsStatistics(@RequestParam(name="id",required=true) String id,
+							   @RequestParam(name="cut",required=true) String cut) {
+		Map<String,Object> data = platformIProjectLibraryBaseService.getProjectDetailsStatistics(id);
+		return Result.OK(cut,data);
+	}
+
+	/**
+	 * 项目详情-统计接口-根据领域分组
+	 * @return
+	 */
+	@AutoLog(value = "项目详情-统计接口-根据领域分组")
+	@ApiOperation(value="项目详情-统计接口-根据领域分组", notes="项目详情-统计接口-根据领域分组")
+	@GetMapping(value = "/getProjectDetailsStatisticsGroupByTerritory")
+	public Result<?> getProjectDetailsStatisticsGroupByTerritory(@RequestParam Map<String,Object> params) {
+		Map<String,Object> data = platformIProjectLibraryBaseService.getProjectDetailsStatisticsGroupByTerritory(params);
+		return Result.OK((String)params.get("cut"),data);
+	}
+
+	/**
+	 * 导出excel
+	 *
+	 * @param request
+	 * @param params
+	 */
+	@RequestMapping(value = "/exportProjectDetailsStatisticsGroupByTerritoryXls")
+	public void exportProjectDetailsStatisticsGroupByTerritoryXls(HttpServletResponse response,HttpServletRequest request, @RequestParam Map<String,Object> params) {
+		platformIProjectLibraryBaseService.exportProjectDetailsStatisticsGroupByTerritoryXls(response,request, params);
+	}
+
+
+	/**
+	 * 项目置顶,取消置顶(只置顶主项目)
+	 * @param id
+	 * @param flag 0为置顶,  1为取消置顶
+	 * @return
+	 */
+	@AutoLog(value = "项目置顶,取消置顶(只置顶主项目)")
+	@ApiOperation(value="项目置顶,取消置顶(只置顶主项目)", notes="项目置顶,取消置顶(只置顶主项目)")
+	@GetMapping(value = "/top")
+	public Result<?> top(String id,String flag) {
+		platformIProjectLibraryBaseService.top(id,flag);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 * 获取项目所有的版本(主版本和子版本的集合)
+	 * @param id 项目id
+	 * @return
+	 */
+	@AutoLog(value = "获取项目所有的版本(主版本和子版本的集合)")
+	@ApiOperation(value="获取项目所有的版本(主版本和子版本的集合)", notes="获取项目所有的版本(主版本和子版本的集合)")
+	@GetMapping(value = "/getVersionsInfo")
+	public Result<?> getVersionsInfo(String id) {
+		List<String> versionsInfoList = platformIProjectLibraryBaseService.getVersionsInfo(id);
+		return Result.OK(versionsInfoList);
+	}
+
+	/**
+	 * 版本统计
+	 * @return
+	 */
+	@AutoLog(value = "版本统计")
+	@ApiOperation(value="版本统计)", notes="版本统计")
+	@PostMapping(value = "/versionStatistics")
+	public Result<?> versionStatistics(@RequestBody Map<String,Object> params) {
+		List<ProjectLibraryBase> projectLibraryBasesList = platformIProjectLibraryBaseService.versionStatistics(String.valueOf(params.get("id")));
+		Page pages = platformIProjectLibraryBaseService.getPages(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()), projectLibraryBasesList);
+		return Result.OK(pages);
+	}
+
+	@AutoLog(value = "对接火山引擎接口getProjectInfo")
+	@ApiOperation(value="对接火山引擎接口-获取项目统计信息1", notes="对接火山引擎接口-获取项目统计信息1")
+	@PostMapping(value = "/getProjectInfo")
+	public Result<?> getProjectInfo(){
+		JSONArray resList = platformIProjectLibraryBaseService.getProjectInfo();
+		return Result.OK(resList);
+	}
+
+	@AutoLog(value = "对接火山引擎接口getProjectProgressInfo")
+	@ApiOperation(value="对接火山引擎接口-获取项目统计信息2", notes="对接火山引擎接口-获取项目统计信息2")
+	@PostMapping(value = "/getProjectProgressInfo")
+	public Result<?> getProjectProgressInfo(){
+		JSONArray resList = this.platformIProjectLibraryBaseService.getProjectProgressInfo();
+		return Result.OK(resList);
+	}
+
+	// 导出项目进度统计(状态导出)
+	@RequestMapping(value = "/exportProjectProgressStatisticsXls")
+	public void exportProjectProgressStatisticsXls(HttpServletResponse response,HttpServletRequest request, @RequestParam Map<String,Object> params) {
+		this.platformIProjectLibraryBaseService.exportProjectProgressStatisticsXls(response,request, params);
+	}
+
+	@AutoLog(value = "获取用户在该项目中所有的责任领域")
+	@ApiOperation(value="获取用户在该项目中所有的责任领域", notes="获取用户在该项目中所有的责任领域")
+	@GetMapping(value = "/getUserAllDutyTerritoryList")
+	public Result<List<DictModel>> getUserAllDutyTerritoryList(@RequestParam Map<String,Object> params){
+		List<DictModel> resList = this.platformIProjectLibraryBaseService.getUserAllDutyTerritoryList(params);
+		return Result.OK(resList);
+	}
+
+	@AutoLog(value = "全局替换用户")
+	@ApiOperation(value="全局替换用户", notes="全局替换用户")
+	@PostMapping(value = "/overallReplacementUser")
+	public Result<?> overallReplacementUser(@RequestBody JSONObject json){
+		return this.platformIProjectLibraryBaseService.overallReplacementUser(json);
+	}
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/PlatformTaskPlanningEOController.java

@@ -0,0 +1,197 @@
+package com.jero.modules.platform.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.platform.entity.PlatformTaskPlanningEO;
+import com.jero.modules.platform.service.IPlatformTaskPlanningEOService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @Description: 平台件合规认证计划
+ * @Author: jero-boot
+ * @Date:   2023-09-14
+ * @Version: V1.0
+ */
+@Api(tags="平台件合规认证计划")
+@RestController
+@RequestMapping("/platform/platformTaskPlanningEO")
+@Slf4j
+public class PlatformTaskPlanningEOController extends JeroController<PlatformTaskPlanningEO, IPlatformTaskPlanningEOService> {
+	@Autowired
+	private IPlatformTaskPlanningEOService platformTaskPlanningEOService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param platformTaskPlanningEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "平台件合规认证计划-分页列表查询")
+	@ApiOperation(value="平台件合规认证计划-分页列表查询", notes="平台件合规认证计划-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(PlatformTaskPlanningEO platformTaskPlanningEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<PlatformTaskPlanningEO> queryWrapper = QueryGenerator.initQueryWrapper(platformTaskPlanningEO, req.getParameterMap());
+		Page<PlatformTaskPlanningEO> page = new Page<PlatformTaskPlanningEO>(pageNo, pageSize);
+		IPage<PlatformTaskPlanningEO> pageList = platformTaskPlanningEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "平台件合规认证计划-列表查询")
+    @ApiOperation(value="平台件合规认证计划-列表查询", notes="平台件合规认证计划-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<PlatformTaskPlanningEO>> queryList(String projectId) {
+        List<PlatformTaskPlanningEO> list = platformTaskPlanningEOService.queryList(projectId);
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param platformTaskPlanningEO
+	 * @return
+	 */
+	@AutoLog(value = "平台件合规认证计划-添加")
+	@ApiOperation(value="平台件合规认证计划-添加", notes="平台件合规认证计划-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody PlatformTaskPlanningEO platformTaskPlanningEO) {
+		platformTaskPlanningEOService.add(platformTaskPlanningEO);
+		return Result.OK("添加成功！");
+	}
+	/**
+	 *   添加
+	 *
+	 * @param data
+	 * @return
+	 */
+	@AutoLog(value = "平台件合规认证计划-批量添加")
+	@ApiOperation(value="平台件合规认证计划-批量添加", notes="平台件合规认证计划-批量添加")
+	@PostMapping(value = "/addBatch")
+	public Result<?> addBatch(@RequestBody Map<String,Object> data) {
+		JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(data.get("list")));
+		List<PlatformTaskPlanningEO> platformTaskPlanningEOList = jsonArray.toJavaList(PlatformTaskPlanningEO.class);
+		platformTaskPlanningEOService.addBatch(platformTaskPlanningEOList);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param platformTaskPlanningEO
+	 * @return
+	 */
+	@AutoLog(value = "平台件合规认证计划-编辑")
+	@ApiOperation(value="平台件合规认证计划-编辑", notes="平台件合规认证计划-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody PlatformTaskPlanningEO platformTaskPlanningEO) {
+		platformTaskPlanningEOService.editById(platformTaskPlanningEO);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "平台件合规认证计划-通过id删除")
+	@ApiOperation(value="平台件合规认证计划-通过id删除", notes="平台件合规认证计划-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		platformTaskPlanningEOService.deleteById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "平台件合规认证计划-批量删除")
+	@ApiOperation(value="平台件合规认证计划-批量删除", notes="平台件合规认证计划-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.platformTaskPlanningEOService.deleteByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "平台件合规认证计划-通过id查询")
+	@ApiOperation(value="平台件合规认证计划-通过id查询", notes="平台件合规认证计划-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		PlatformTaskPlanningEO platformTaskPlanningEO = platformTaskPlanningEOService.queryById(id);
+		if(platformTaskPlanningEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(platformTaskPlanningEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param platformTaskPlanningEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, PlatformTaskPlanningEO platformTaskPlanningEO) {
+        return super.exportXls(request, platformTaskPlanningEO, PlatformTaskPlanningEO.class, "平台件合规认证计划");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, PlatformTaskPlanningEO.class);
+    }
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/controller/platformProjectNameInfoEOController.java

@@ -0,0 +1,204 @@
+package com.jero.modules.platform.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.platform.service.IPlatformProjectNameInfoEOService;
+import com.jero.modules.project.entity.ProjectLibraryBase;
+import com.jero.modules.project.entity.ProjectNameInfoEO;
+import com.jero.modules.project.service.IProjectNameInfoEOService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * @Description: 项目名信息表
+ * @Author: jero-boot
+ * @Date:   2022-04-18
+ * @Version: V1.0
+ */
+@Api(tags="平台件-项目名信息表")
+@RestController
+@RequestMapping("/platform/projectNameInfoEO")
+@Slf4j
+public class platformProjectNameInfoEOController extends JeroController<ProjectNameInfoEO, IProjectNameInfoEOService> {
+	@Autowired
+	private IPlatformProjectNameInfoEOService platformProjectNameInfoEOService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param projectNameInfoEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "项目名信息表-分页列表查询")
+	@ApiOperation(value="项目名信息表-分页列表查询", notes="项目名信息表-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(ProjectNameInfoEO projectNameInfoEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ProjectNameInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(projectNameInfoEO, req.getParameterMap());
+		Page<ProjectNameInfoEO> page = new Page<ProjectNameInfoEO>(pageNo, pageSize);
+		IPage<ProjectNameInfoEO> pageList = platformProjectNameInfoEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "项目名信息表-列表查询")
+    @ApiOperation(value="项目名信息表-列表查询", notes="项目名信息表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<ProjectNameInfoEO>> queryList() {
+		List<ProjectNameInfoEO> list = platformProjectNameInfoEOService.queryList();
+		return Result.OK(list);
+	}
+    /**
+	 * 返回项目全拼
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "返回项目全拼")
+    @ApiOperation(value="返回项目全拼", notes="返回项目全拼")
+	@GetMapping(value = "/queryProjectNameList")
+	public Result<List<ProjectLibraryBase>> queryProjectNameList(String cut) {
+		List<ProjectLibraryBase> list = platformProjectNameInfoEOService.queryProjectNameList(cut);
+		return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param projectNameInfoEO
+	 * @return
+	 */
+	@AutoLog(value = "项目名信息表-添加")
+	@ApiOperation(value="项目名信息表-添加", notes="项目名信息表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody ProjectNameInfoEO projectNameInfoEO) {
+		platformProjectNameInfoEOService.add(projectNameInfoEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param projectNameInfoEO
+	 * @return
+	 */
+	@AutoLog(value = "项目名信息表-编辑")
+	@ApiOperation(value="项目名信息表-编辑", notes="项目名信息表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody ProjectNameInfoEO projectNameInfoEO) {
+		platformProjectNameInfoEOService.editById(projectNameInfoEO);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "项目名信息表-通过id删除")
+	@ApiOperation(value="项目名信息表-通过id删除", notes="项目名信息表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		platformProjectNameInfoEOService.deleteById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "项目名信息表-批量删除")
+	@ApiOperation(value="项目名信息表-批量删除", notes="项目名信息表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.platformProjectNameInfoEOService.deleteByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "项目名信息表-通过id查询")
+	@ApiOperation(value="项目名信息表-通过id查询", notes="项目名信息表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		ProjectNameInfoEO projectNameInfoEO = platformProjectNameInfoEOService.queryById(id);
+		if(projectNameInfoEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(projectNameInfoEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param projectNameInfoEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ProjectNameInfoEO projectNameInfoEO) {
+        return super.exportXls(request, projectNameInfoEO, ProjectNameInfoEO.class, "项目名信息表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ProjectNameInfoEO.class);
+    }
+
+	 /**
+	  * 接收space系统数据
+	  *
+	  * @return
+	  */
+//	 @AutoLog(value = "项目名信息表-space")
+//	 @ApiOperation(value="项目名信息表-space", notes="项目名信息表-space")
+//	 @RequestMapping(value = "/getSpaceInfo", method = RequestMethod.POST)
+//	 public void getSpaceInfo(@RequestParam(name="cut",required=true) String cut) {
+//		 platformProjectNameInfoEOService.getSpaceInfo(cut);
+//	 }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/entity/PlatformTaskPlanningEO.java

@@ -0,0 +1,96 @@
+package com.jero.modules.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+
+/**
+ * @Description: 平台件合规认证计划
+ * @Author: jero-boot
+ * @Date:   2023-09-14
+ * @Version: V1.0
+ */
+@Data
+@TableName("platform_task_planning")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="platform_task_planning对象", description="平台件合规认证计划")
+public class PlatformTaskPlanningEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+
+	/**节点名称*/
+	@Excel(name = "节点名称", width = 15)
+    @ApiModelProperty(value = "节点名称")
+    private java.lang.String nodeName;
+
+	/**节点时间*/
+	@Excel(name = "节点时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "节点时间")
+    private java.util.Date nodeTime;
+
+	/**项目id*/
+	@Excel(name = "项目id", width = 15)
+    @ApiModelProperty(value = "项目id")
+    private java.lang.String projectId;
+
+    @ApiModelProperty(value = "字段名与项目库保持一致")
+    @TableField(exist = false)
+    private java.lang.String name;
+
+    /**节点时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "字段名与项目库保持一致")
+    @TableField(exist = false)
+    private java.util.Date time;
+
+    @TableField(exist = false)
+    private String status;
+
+    @TableField(exist = false)
+    private boolean isG;
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatformProjectCertificationInventoryEOMapper.java

@@ -0,0 +1,14 @@
+package com.jero.modules.platform.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
+
+/**
+ * @Description: 项目库-认证清单表
+ * @Author: jero-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+public interface PlatformProjectCertificationInventoryEOMapper extends BaseMapper<ProjectCertificationInventoryEO> {
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatformProjectLawsInventoryEOMapper.java

@@ -0,0 +1,49 @@
+package com.jero.modules.platform.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 项目库-法规清单表
+ * @Author: jero-boot
+ * @Date:   2022-04-14
+ * @Version: V1.0
+ */
+public interface PlatformProjectLawsInventoryEOMapper extends BaseMapper<ProjectLawsInventoryEO> {
+
+    /**
+     * 获取清单确认统计
+     * @param projectLibraryId  项目库id
+     * @return
+     */
+    List<Map<String, Object>> getlistingToConfirmStatistics(@Param("projectLibraryId") String projectLibraryId);
+
+    /**
+     * 获取清单确认统计
+     * @param projectLibraryId  项目库id
+     * @return
+     */
+    List<Map<String, Object>> getTaskToConfirmStatistics(@Param("projectLibraryId")String projectLibraryId);
+
+    /**
+     * 统计该项目中，某一个 清单确认状态的数据  根据领域分组
+     * @param projectLibraryId      项目库id
+     * @param inventoryAffirmStatus 清单确认状态
+     * @return
+     */
+    List<Map<String, Object>> getListingToConfirmStatisticsGroupByTerritory(@Param("projectLibraryId") String projectLibraryId,@Param("inventoryAffirmStatus") String inventoryAffirmStatus);
+
+    /**
+     * 统计该项目中，某一个 任务确认状态的数据  根据领域分组
+     * @param projectLibraryId
+     * @param taskAffirmStatus
+     * @return
+     */
+    List<Map<String, Object>> getTaskToConfirmStatisticsGroupByTerritory(@Param("projectLibraryId") String projectLibraryId, @Param("taskAffirmStatus") String taskAffirmStatus);
+
+    List<Map<String,Object>> queryNotComplianList(@Param("params") Map<String, Object> params);
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatformProjectLibraryBaseMapper.java

@@ -0,0 +1,32 @@
+package com.jero.modules.platform.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.modules.project.entity.ProjectLibraryBase;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 项目库基础表
+ * @Author: jero-boot
+ * @Date:   2022-04-11
+ * @Version: V1.0
+ */
+public interface PlatformProjectLibraryBaseMapper extends BaseMapper<ProjectLibraryBase> {
+    /**分页列表*/
+    List<ProjectLibraryBase> queryPageList(@Param("params") Map<String, Object> params);
+    List<ProjectLibraryBase> queryMaimList();
+//    IPage<ProjectLibraryBase> queryPageList(IPage page, Map<String, Object> params);
+
+    List<ProjectLibraryBase> getList(@Param("projectLibraryBase") ProjectLibraryBase projectLibraryBase);
+
+    /**根据id查询*/
+    List<ProjectLibraryBase> queryById(String id);
+
+    ProjectLibraryBase selectProjectName(@Param("projectLibraryId") String projectLibraryId);
+
+    List<ProjectLibraryBase> getListByIds(@Param("idList") List<String> idList);
+
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatformProjectNameInfoEOMapper.java

@@ -0,0 +1,20 @@
+package com.jero.modules.platform.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.modules.project.entity.ProjectNameInfoEO;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * @Description: 项目名信息表
+ * @Author: jero-boot
+ * @Date:   2022-04-18
+ * @Version: V1.0
+ */
+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" +
+            "from project_name_info as pni\n" +
+            "left join project_year_name_info as pyni on pni.id=pyni.project_name_id;")
+    List<ProjectNameInfoEO> selectProjectNameAndYear();
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/PlatformTaskPlanningEOMapper.java

@@ -0,0 +1,14 @@
+package com.jero.modules.platform.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.modules.platform.entity.PlatformTaskPlanningEO;
+
+/**
+ * @Description: 平台件合规认证计划
+ * @Author: jero-boot
+ * @Date:   2023-09-14
+ * @Version: V1.0
+ */
+public interface PlatformTaskPlanningEOMapper extends BaseMapper<PlatformTaskPlanningEO> {
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectCertificationInventoryEOMapper.xml

@@ -0,0 +1,31 @@
+<?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">
+<mapper namespace="com.jero.modules.platform.mapper.PlatformProjectCertificationInventoryEOMapper">
+    <resultMap id="ProjectCertificationInventoryEOResultMap" type="com.jero.modules.project.entity.ProjectCertificationInventoryEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="category" property="category" />
+        <result column="inspection_item" property="inspectionItem" />
+        <result column="config_item" property="configItem" />
+        <result column="wvta_id" property="wvtaId" />
+        <result column="serial_number" property="serialNumber" />
+        <result column="duty_territory" property="dutyTerritory" />
+        <result column="deliverable" property="deliverable" />
+        <result column="buss_document_library_id" property="bussDocumentLibraryId" />
+        <result column="sdt" property="sdt" />
+        <result column="duty_person" property="dutyPerson" />
+        <result column="deliverable_type" property="deliverableType" />
+        <result column="deliverable_template" property="deliverableTemplate" />
+        <result column="delivery_result" property="deliveryResult" />
+        <result column="end_time" property="endTime" />
+        <result column="flow_status" property="flowStatus" />
+        <result column="report_number" property="reportNumber" />
+        <result column="product_model" property="productModel" />
+        <result column="production_enterprise_name" property="productionEnterpriseName" />
+        <result column="certification_progress" property="certificationProgress" />
+    </resultMap>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectLawsInventoryEOMapper.xml

@@ -0,0 +1,195 @@
+<?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">
+<mapper namespace="com.jero.modules.platform.mapper.PlatformProjectLawsInventoryEOMapper">
+    <resultMap id="ProjectLawsInventoryEOResultMap" type="com.jero.modules.project.entity.ProjectLawsInventoryEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="project_library_id" property="projectLibraryId" />
+        <result column="serial_number" property="serialNumber" />
+        <result column="title" property="title" />
+        <result column="subtitle" property="subtitle" />
+        <result column="corresponding_standard" property="correspondingStandard" />
+        <result column="implement_type" property="implementType" />
+        <result column="xin1_che1_xing2_shi2_shi1_ri4_qi1" property="xin1Che1Xing2Shi2Shi1Ri4Qi1" />
+        <result column="implement_time" property="implementTime" />
+        <result column="attestation_type" property="attestationType" />
+        <result column="attestation_rank" property="attestationRank" />
+        <result column="wvta_id" property="wvtaId" />
+        <result column="duty_territory" property="dutyTerritory" />
+        <result column="regulation_owner_id" property="regulationOwnerId" />
+        <result column="homologation_engineer_id" property="homologationEngineerId" />
+        <result column="engineering_interface_person" property="engineeringInterfacePerson" />
+        <result column="remark" property="remark" />
+        <result column="design_deliverable_type" property="designDeliverableType" />
+        <result column="design_deliverable_template" property="designDeliverableTemplate" />
+        <result column="design_initiator" property="designInitiator" />
+        <result column="design_duty" property="designDuty" />
+        <result column="design_due_date" property="designDueDate" />
+        <result column="prehomo_deliverable_type" property="prehomoDeliverableType" />
+        <result column="prehomo_deliverable_template" property="prehomoDeliverableTemplate" />
+        <result column="prehomo_initiator" property="prehomoInitiator" />
+        <result column="prehomo_duty" property="prehomoDuty" />
+        <result column="prehomo_due_date" property="prehomoDueDate" />
+        <result column="verify_deliverable_type" property="verifyDeliverableType" />
+        <result column="verify_deliverable_template" property="verifyDeliverableTemplate" />
+        <result column="verify_initiator" property="verifyInitiator" />
+        <result column="verify_duty" property="verifyDuty" />
+        <result column="verify_due_date" property="verifyDueDate" />
+        <result column="region" property="region" />
+        <result column="applicable_supplement" property="applicableSupplement" />
+        <result column="verify_remark" property="verifyRemark" />
+        <result column="prehomo_remark" property="prehomoRemark" />
+        <result column="design_remark" property="designRemark" />
+        <result column="file_id" property="fileId" />
+    </resultMap>
+
+    <select id="getlistingToConfirmStatistics" resultType="hashmap">
+        select
+            count(inventory_affirm_status) as "inventoryAffirmStatusCount",
+            inventory_affirm_status as "inventoryAffirmStatus",
+            id as "id"
+        from
+            project_laws_inventory
+        where
+            project_library_id in
+            <foreach collection="projectLibraryId.split(',')" index="index" separator="," open="(" close=")" item="item">
+                #{item}
+            </foreach>
+        group by inventory_affirm_status
+    </select>
+
+    <select id="getTaskToConfirmStatistics" resultType="hashmap">
+        select
+            count(task_affirm_status) as "taskAffirmStatusCount",
+            task_affirm_status as "taskAffirmStatus",
+            id as "id"
+        from
+            project_laws_inventory
+        where
+            project_library_id in
+            <foreach collection="projectLibraryId.split(',')" index="index" separator="," open="(" close=")" item="item">
+                #{item}
+            </foreach>
+        group by task_affirm_status
+    </select>
+
+
+    <select id="getListingToConfirmStatisticsGroupByTerritory" resultType="hashmap">
+        select
+            count(inventory_affirm_status) as "amount",
+            inventory_affirm_status as "inventoryAffirmStatus",
+            id as "id",
+            duty_territory as "dutyTerritory"
+        from
+            project_laws_inventory
+        where
+            project_library_id = #{projectLibraryId}
+          and inventory_affirm_status = #{inventoryAffirmStatus}
+        group by duty_territory;
+    </select>
+
+    <select id="getTaskToConfirmStatisticsGroupByTerritory" resultType="hashmap">
+        select
+            count(task_affirm_status) as "amount",
+            task_affirm_status as "taskAffirmStatus",
+            id as "id",
+            duty_territory as "dutyTerritory"
+        from
+            project_laws_inventory
+        where
+            project_library_id = #{projectLibraryId}
+          and task_affirm_status = #{taskAffirmStatus}
+        group by duty_territory;
+    </select>
+
+    <select id="queryNotComplianList" resultType="hashmap">
+        select
+                id as "id",
+                serial_number as "serialNumber",
+                title as "title",
+                flow_type as "flowType",
+                duty_territory as "dutyTerritory",
+                flow_status as "flowStatus",
+                regulation_owner_id as "regulationOwnerId",
+                duty_id as "dutyId",
+                stand_id as "standId"
+        from (
+              SELECT
+                  id,
+                  serial_number,
+                  title,
+                  "2" as flow_type,
+                  duty_territory,
+                  design_flow_status as flow_status,
+                  regulation_owner_id,
+                  design_duty_id as duty_id,
+                  project_library_id,
+                  stand_id
+              FROM
+                  project_laws_inventory
+              WHERE
+                  project_library_id = #{params.projectLibraryId}
+                  and design_flow_status IN
+                  <foreach collection="params.complianceFlowStatusList" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                  </foreach>
+              UNION
+              SELECT
+                  id,
+                  serial_number,
+                  title,
+                  "4" as flow_type,
+                  duty_territory,
+                  verify_flow_status as flow_status,
+                  regulation_owner_id,
+                  verify_duty_id as duty_id,
+                  project_library_id,
+                  stand_id
+              FROM
+                  project_laws_inventory
+              WHERE
+                  project_library_id = #{params.projectLibraryId}
+                  and verify_flow_status IN
+                  <foreach collection="params.complianceFlowStatusList" index="index" item="item" open="(" separator="," close=")">
+                        #{item}
+                  </foreach>
+        ) temp
+        <!--<include refid="BaseQuerySql"/>-->
+        <!--<if test="params.orderByField != null and params.orderByField != ''">
+            order by temp.${params.orderByField}
+            <if test="params.orderBy == 1">
+                asc
+            </if>
+            <if test="params.orderBy == 2">
+                desc
+            </if>
+        </if>-->
+        <if test="params.orderByField == null or params.orderByField == ''">
+            order by temp.serial_number desc
+        </if>
+    </select>
+
+    <sql id="BaseQuerySql">
+        <where>
+            <if test="params.serialNumber != null and params.serialNumber !=''">
+                and temp.serial_number like CONCAT(CONCAT('%',#{params.serialNumber}),'%')
+            </if>
+            <if test="params.title != null and params.title !=''">
+                and temp.title like CONCAT(CONCAT('%',#{params.title}),'%')
+            </if>
+            <if test="params.dutyTerritory != null and params.dutyTerritory !=''">
+                and temp.duty_territory like CONCAT(CONCAT('%',#{params.dutyTerritory}),'%')
+                <!--and (
+                    temp.duty_territory = #{params.dutyTerritory} or
+                    <foreach collection="params.dutyTerritory.split(',')" index="" item="item" open="(" close=")" separator="or">
+                        temp.duty_territory like  CONCAT(CONCAT('%',#{item}),'%')
+                    </foreach>
+                )-->
+            </if>
+        </where>
+    </sql>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectLibraryBaseMapper.xml

@@ -0,0 +1,303 @@
+<?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">
+<mapper namespace="com.jero.modules.platform.mapper.PlatformProjectLibraryBaseMapper">
+    <resultMap id="ProjectLibraryBaseResultMap" type="com.jero.modules.project.entity.ProjectLibraryBase">
+        <id column="id" property="id" />
+
+        <result column="project_name_id" property="projectNameId" />
+        <result column="year_name_id" property="yearNameId" />
+        <result column="target_market" property="targetMarket" />
+        <result column="project_status" property="projectStatus" />
+        <result column="studio_engineer" property="studioEngineer" />
+        <result column="certification_engineer" property="certificationEngineer" />
+        <result column="vehicle_platform" property="vehiclePlatform" />
+        <result column="digital_platform" property="digitalPlatform" />
+        <result column="ipd_info" property="ipdInfo" />
+        <result column="vehicle_development_plan" property="vehicleDevelopmentPlan" />
+        <result column="attestation_plan" property="attestationPlan" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="brand" property="brand" />
+    </resultMap>
+
+    <sql id="select_item">
+        select
+            plb.id,
+            plb.project_name_id,
+            pni.project_name as project_name,
+            pyni.id as year_name_id,
+            pyni.year_name,
+            plb.target_market,
+            plb.project_status,
+            plb.studio_engineer,
+            studiouser.username as studio_engineer_name,
+            plb.certification_engineer,
+            plb.vehicle_platform,
+            plb.digital_platform,
+            plb.ipd_info,
+            plb.vehicle_development_plan,
+            plb.attestation_plan,
+            plb.create_by,
+            plb.create_time,
+            plb.sys_org_code,
+            plb.update_by,
+            plb.update_time,
+            plb.parent_id,
+            plb.project_version,
+            plb.explanation,
+            plb.software_version,
+            plb.sort,
+            plb.flag,
+            plb.brand,
+            sdi.item_text brandText,
+            sdi.en_name brandTextEn
+        from project_library_base as plb
+        left join project_name_info as pni on  plb.project_name_id=pni.id
+        left join sys_user as studiouser on plb.studio_engineer=studiouser.id
+        left join project_year_name_info as pyni on plb.year_name_id=pyni.id
+        left join sys_dict_item as sdi on sdi.item_value = plb.brand
+    </sql>
+
+    <select id="queryPageList" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
+
+        <include refid="select_item"/>
+
+        <where>
+            <if test="params.projectName != null and params.projectName != ''">
+                <!--搜索条件:项目名称,包含%,单独搜索-->
+                <choose>
+                    <when test='params.projectName != null and params.projectName != "" and params.projectName.contains("%")'>
+                        ( pni.project_name like '%1%%' escape '1' or pni.project_name like '%1%%' escape '1')
+                    </when>
+                    <otherwise>
+            <!--(pni.project_name like concat('%',#{params.projectName},'%') or pyni.year_name like concat('%',#{params.projectName},'%'))-->
+        </otherwise>
+    </choose>
+</if>
+
+            <!--搜索条件:目标市场-->
+            <if test="params.targetMarket != null and params.targetMarket != '' ">
+                and plb.target_market like concat('%',#{params.targetMarket},'%')
+            </if>
+
+            <!--搜索条件:项目状态-->
+            <if test="params.projectStatus != null and params.projectStatus != '' ">
+                and plb.project_status like concat('%',#{params.projectStatus},'%')
+            </if>
+
+            <if test="params.studioEngineer != null and params.studioEngineer != ''">
+                <!--搜索条件:studio工程师,包含%,单独搜索-->
+                <choose>
+                    <when test='params.studioEngineer != null and params.studioEngineer != "" and params.studioEngineer.contains("%")'>
+                        and plb.studio_engineer like '%1%%' escape '1'
+                    </when>
+                    <otherwise>
+                        and plb.studio_engineer like concat('%',#{params.studioEngineer},'%')
+                    </otherwise>
+                </choose>
+            </if>
+
+            <if test="params.certificationEngineer != null and params.certificationEngineer != ''">
+                <!--搜索条件:认证工程师,包含%,单独搜索-->
+                <choose>
+                    <when test='params.certificationEngineer != null and params.certificationEngineer != "" and params.certificationEngineer.contains("%")'>
+                        and plb.certification_engineer like '%1%%' escape '1'
+                    </when>
+                    <otherwise>
+                        and plb.certification_engineer like concat('%',#{params.certificationEngineer},'%')
+                    </otherwise>
+                </choose>
+            </if>
+
+            <!--搜索条件:车型平台-->
+            <if test="params.vehiclePlatform != null and params.vehiclePlatform != '' ">
+                and plb.vehicle_platform like concat('%',#{params.vehiclePlatform},'%')
+            </if>
+
+            <!--搜索条件:数字平台-->
+            <if test="params.digitalPlatform != null and params.digitalPlatform != '' ">
+                and plb.digital_platform like concat('%',#{params.digitalPlatform},'%')
+            </if>
+
+            <!--搜索条件:品牌-->
+            <if test="params.brand != null and params.brand != '' ">
+                and plb.brand = #{params.brand}
+            </if>
+        </where>
+        order by plb.sort desc, plb.create_time desc
+    </select>
+    <select id="queryMaimList" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
+
+        <include refid="select_item"/>
+
+        <where>
+            parent_id = '' or parent_id is null
+        </where>
+        order by  plb.create_time desc
+    </select>
+<!--    <select id="queryPageList" resultType="com.jero.modules.project.entity.ProjectLibraryBase">-->
+
+<!--        <include refid="select_item"/>-->
+
+<!--        <where>-->
+<!--            <if test="params.projectName != null and params.projectName != ''">-->
+<!--                &lt;!&ndash;搜索条件:项目名称,包含%,单独搜索&ndash;&gt;-->
+<!--                <choose>-->
+<!--                    <when test='params.projectName != null and params.projectName != "" and params.projectName.contains("%")'>-->
+<!--                        ( pni.project_name like '%1%%' escape '1' or pni.project_name like '%1%%' escape '1')-->
+<!--                    </when>-->
+<!--                    <otherwise>-->
+<!--                        (pni.project_name like concat('%',#{params.projectName},'%') or pyni.year_name like concat('%',#{params.projectName},'%'))-->
+<!--                    </otherwise>-->
+<!--                </choose>-->
+<!--            </if>-->
+
+<!--            &lt;!&ndash;搜索条件:目标市场&ndash;&gt;-->
+<!--            <if test="params.targetMarket != null and params.targetMarket != '' ">-->
+<!--                and plb.target_market like concat('%',#{params.targetMarket},'%')-->
+<!--            </if>-->
+
+<!--            &lt;!&ndash;搜索条件:项目状态&ndash;&gt;-->
+<!--            <if test="params.projectStatus != null and params.projectStatus != '' ">-->
+<!--                and plb.project_status like concat('%',#{params.projectStatus},'%')-->
+<!--            </if>-->
+
+<!--            <if test="params.studioEngineer != null and params.studioEngineer != ''">-->
+<!--                &lt;!&ndash;搜索条件:studio工程师,包含%,单独搜索&ndash;&gt;-->
+<!--                <choose>-->
+<!--                    <when test='params.studioEngineer != null and params.studioEngineer != "" and params.studioEngineer.contains("%")'>-->
+<!--                        and plb.studio_engineer like '%1%%' escape '1'-->
+<!--                    </when>-->
+<!--                    <otherwise>-->
+<!--                        and plb.studio_engineer like concat('%',#{params.studioEngineer},'%')-->
+<!--                    </otherwise>-->
+<!--                </choose>-->
+<!--            </if>-->
+
+<!--            <if test="params.certificationEngineer != null and params.certificationEngineer != ''">-->
+<!--                &lt;!&ndash;搜索条件:认证工程师,包含%,单独搜索&ndash;&gt;-->
+<!--                <choose>-->
+<!--                    <when test='params.certificationEngineer != null and params.certificationEngineer != "" and params.certificationEngineer.contains("%")'>-->
+<!--                        and plb.certification_engineer like '%1%%' escape '1'-->
+<!--                    </when>-->
+<!--                    <otherwise>-->
+<!--                        and plb.certification_engineer like concat('%',#{params.certificationEngineer},'%')-->
+<!--                    </otherwise>-->
+<!--                </choose>-->
+<!--            </if>-->
+
+<!--            &lt;!&ndash;搜索条件:车型平台&ndash;&gt;-->
+<!--            <if test="params.vehiclePlatform != null and params.vehiclePlatform != '' ">-->
+<!--                and plb.vehicle_platform like concat('%',#{params.vehiclePlatform},'%')-->
+<!--            </if>-->
+
+<!--            &lt;!&ndash;搜索条件:数字平台&ndash;&gt;-->
+<!--            <if test="params.digitalPlatform != null and params.digitalPlatform != '' ">-->
+<!--                and plb.digital_platform like concat('%',#{params.digitalPlatform},'%')-->
+<!--            </if>-->
+<!--        </where>-->
+<!--        order by plb.create_time desc-->
+<!--    </select>-->
+    <select id="getList" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
+
+        <include refid="select_item"/>
+
+        <where>
+            <if test="projectLibraryBase.projectName != null and projectLibraryBase.projectName != ''">
+                <!--搜索条件:项目名称,包含%,单独搜索-->
+                <choose>
+                    <when test='projectLibraryBase.projectName != null and projectLibraryBase.projectName != "" and projectLibraryBase.projectName.contains("%")'>
+                        and pni.project_name like '%1%%' escape '1'
+                    </when>
+                    <otherwise>
+                        and pni.project_name like concat('%',#{projectLibraryBase.projectName},'%')
+                    </otherwise>
+                </choose>
+            </if>
+
+            <!--搜索条件:目标市场-->
+            <if test="projectLibraryBase.targetMarket != null and projectLibraryBase.targetMarket != '' ">
+                and plb.target_market like concat('%',#{projectLibraryBase.targetMarket},'%')
+            </if>
+
+            <!--搜索条件:项目状态-->
+            <if test="projectLibraryBase.projectStatus != null and projectLibraryBase.projectStatus != '' ">
+                and plb.project_status like concat('%',#{projectLibraryBase.projectStatus},'%')
+            </if>
+
+            <!--搜索条件:品牌-->
+            <if test="projectLibraryBase.brand != null and projectLibraryBase.brand != '' ">
+                and plb.brand = #{projectLibraryBase.brand}
+            </if>
+
+            <if test="projectLibraryBase.studioEngineer != null and projectLibraryBase.studioEngineer != ''">
+                <!--搜索条件:studio工程师,包含%,单独搜索-->
+                <choose>
+                    <when test='projectLibraryBase.studioEngineer != null and projectLibraryBase.studioEngineer != "" and projectLibraryBase.studioEngineer.contains("%")'>
+                        and plb.studio_engineer like '%1%%' escape '1'
+                    </when>
+                    <otherwise>
+                        and plb.studio_engineer like concat('%',#{projectLibraryBase.studioEngineer},'%')
+                    </otherwise>
+                </choose>
+            </if>
+
+            <if test="projectLibraryBase.certificationEngineer != null and projectLibraryBase.certificationEngineer != ''">
+                <!--搜索条件:认证工程师,包含%,单独搜索-->
+                <choose>
+                    <when test='projectLibraryBase.certificationEngineer != null and projectLibraryBase.certificationEngineer != "" and projectLibraryBase.certificationEngineer.contains("%")'>
+                        and plb.certification_engineer like '%1%%' escape '1'
+                    </when>
+                    <otherwise>
+                        and plb.certification_engineer like concat('%',#{projectLibraryBase.certificationEngineer},'%')
+                    </otherwise>
+                </choose>
+            </if>
+
+            <!--搜索条件:车型平台-->
+<!--            <if test="projectLibraryBase.vehiclePlatform != null and projectLibraryBase.vehiclePlatform != '' ">-->
+<!--                and plb.vehicle_platform like concat('%',#{projectLibraryBase.vehiclePlatform},'%')-->
+<!--            </if>-->
+
+            <!--搜索条件:数字平台-->
+<!--            <if test="projectLibraryBase.digitalPlatform != null and projectLibraryBase.digitalPlatform != '' ">-->
+<!--                and plb.digital_platform like concat('%',#{projectLibraryBase.digitalPlatform},'%')-->
+<!--            </if>-->
+        </where>
+        order by plb.create_time desc
+    </select>
+
+    <select id="queryById" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
+        <include refid="select_item"/>
+        <where>
+            <if test="id != null and id != '' ">
+                plb.id=#{id}
+            </if>
+        </where>
+        order by plb.create_time desc
+    </select>
+
+    <select id="selectProjectName" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
+        SELECT
+            concat( pni.project_name, '-', pyni.year_name ) AS project_name
+        FROM
+            project_library_base plb
+            LEFT JOIN project_name_info pni ON plb.project_name_id = pni.id
+            LEFT JOIN project_year_name_info pyni ON plb.year_name_id = pyni.id
+        WHERE
+            plb.id = #{projectLibraryId}
+    </select>
+
+    <select id="getListByIds" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
+
+        <include refid="select_item"/>
+        where plb.id in
+        <foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        order by plb.create_time desc
+    </select>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectNameInfoEOMapper.xml

@@ -0,0 +1,15 @@
+<?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">
+<mapper namespace="com.jero.modules.platform.mapper.PlatformProjectNameInfoEOMapper">
+    <resultMap id="ProjectNameInfoEOResultMap" type="com.jero.modules.project.entity.ProjectNameInfoEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="project_name" property="projectName" />
+        <result column="vehicle_platform" property="vehiclePlatform" />
+        <result column="digital_platform" property="digitalPlatform" />
+    </resultMap>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformTaskPlanningEOMapper.xml

@@ -0,0 +1,15 @@
+<?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">
+<mapper namespace="com.jero.modules.platform.mapper.PlatformTaskPlanningEOMapper">
+    <resultMap id="PlatformTaskPlanningEOResultMap" type="com.jero.modules.platform.entity.PlatformTaskPlanningEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="node_name" property="nodeName" />
+        <result column="node_time" property="nodeTime" />
+        <result column="project_id" property="projectId" />
+    </resultMap>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectCertificationInventoryEOService.java

@@ -0,0 +1,341 @@
+package com.jero.modules.platform.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.common.api.vo.Result;
+import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
+import com.jero.modules.system.entity.SysCategory;
+import com.jero.modules.system.entity.SysDictItem;
+import com.jero.modules.system.entity.SysRole;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
+import com.jero.modules.todoCenter.entity.ProcessInfoEO;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 项目库-认证清单表
+ * @Author: jero-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+public interface IPlatformProjectCertificationInventoryEOService extends IService<ProjectCertificationInventoryEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param projectCertificationInventoryEO
+	 * @return
+	 */
+    void add(ProjectCertificationInventoryEO projectCertificationInventoryEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param projectCertificationInventoryEO
+	 * @return
+	 */
+    void editById(ProjectCertificationInventoryEO projectCertificationInventoryEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ProjectCertificationInventoryEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ProjectCertificationInventoryEO> queryList();
+
+	/**
+	 * 批量添加
+	 * @param json
+	 * @return
+	 */
+    Result<?> batchAdd(JSONObject json);
+
+	/**
+	 * 批量设置
+	 * @param projectCertificationInventoryEO
+	 * @return
+	 */
+	Result<?> setBatch(ProjectCertificationInventoryEO projectCertificationInventoryEO);
+
+	/**
+	 * 处理数据
+	 * @param datas
+	 * @param cut
+	 */
+	void disposeData(List<ProjectCertificationInventoryEO> datas, String cut);
+
+	/**
+	 * 导入时的数据处理
+	 * @param datas
+	 * @param cut
+	 */
+	void importDisposeData(List<ProjectCertificationInventoryEO> datas, String cut);
+
+	String getTreeNameImport(String cut, List<SysCategory> categoryList, List<String> technologyTerritoryList);
+
+	String getTreeName(String cut, List<SysCategory> categoryList, List<String> technologyTerritoryList);
+
+	/**
+	 * studio发布
+	 * @param json
+	 * @return
+	 */
+	Result<?> issue(JSONObject json);
+
+	void addProcessInfoEO(ProcessInfoEO processInfoEO, String projectLibraryId);
+
+	void addProcessInfoDetailEO(List<ProcessInfoDetailEO> processInfoDetailEOList, String processInfoId, String taskDefinitionKey);
+
+	Result<List<SysRole>> getRoleByUserId(Map<String, Object> params);
+
+	Result<?> getFlowStatusList(String cut);
+
+	IPage<ProjectCertificationInventoryEO> queryPage(QueryWrapper<ProjectCertificationInventoryEO> queryWrapper,
+													 Page<ProjectCertificationInventoryEO> page,
+													 ProjectCertificationInventoryEO projectCertificationInventoryEO,
+													 String cut);
+
+	void createQueryPermission(QueryWrapper<ProjectCertificationInventoryEO> queryWrapper, String roleCode);
+
+	/**
+	 * 认证流程统一提交任务
+	 * @param json
+	 * @return
+	 */
+	Result<?> submitTask(JSONObject json);
+
+	/**
+	 * 认证工程师发起任务
+	 * @param json
+	 * @return
+	 */
+	Result<?> certificationInitiatingTask(JSONObject json);
+
+	/**
+	 * 批量保存
+	 * @param json
+	 * @return
+	 */
+	Result<?> saveBatch(JSONObject json);
+
+	/**
+	 * 流程重置
+	 * @param json
+	 * @return
+	 */
+    Result<?> resetFlow(JSONObject json);
+
+	/**
+	 * 转办任务
+	 * @param json
+	 * @return
+	 */
+    Result<?> transferTask(JSONObject json);
+
+	/**
+	 * 催办任务
+	 * @param json
+	 * @return
+	 */
+	Result<?> expediting(JSONObject json);
+
+	Map<String,Object> getCertificationInventoryLinkHrefFeishu(String projectLibraryId,String PRN_CN,String PRN_EN);
+
+	Map<String,Object> getStandNameAndItemName(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList);
+
+	/**
+	 * 模板下载
+	 * @param projectCertificationInventoryEO
+	 * @param response
+	 * @param request
+	 */
+	void exportTemplate(ProjectCertificationInventoryEO projectCertificationInventoryEO, HttpServletResponse response, HttpServletRequest request);
+
+	/**
+	 * 批量修改配置项
+	 * @param json
+	 * @return
+	 */
+	Result<?> updateConfigItemBatch(JSONObject json);
+
+	/**
+	 * 调取添加
+	 * @param json
+	 * @return
+	 */
+	Result<?> callAdd(JSONObject json);
+
+	/**
+	 * 导入数据
+	 * @param file
+	 * @param projectCertificationInventoryEO
+	 */
+	void importData(MultipartFile file, ProjectCertificationInventoryEO projectCertificationInventoryEO);
+
+	/**
+	 * projectCertificationInventoryEO
+	 * @param response
+	 * @param request
+	 * @param projectCertificationInventoryEO
+	 */
+	void exportData(HttpServletResponse response, HttpServletRequest request, ProjectCertificationInventoryEO projectCertificationInventoryEO);
+
+	/**
+	 * 引用交付物
+	 * @param json
+	 * @return
+	 */
+	Result<?> citeDeliverable(JSONObject json);
+
+	/**
+	 * 根据模板返送消息
+	 * @param projectCertificationInventoryEOS
+	 * @param templeteId
+	 * @param userIdList
+	 * @param userInfoList
+	 */
+	void sendMessageByTemplateId(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOS, String templeteId, List<String> userIdList, List<SysUser> userInfoList, Date endTimeString, String taskDefinitionKey);
+
+	/**
+	 * 数据唯一校验。
+	 * @param projectCertificationInventoryEOList
+	 * @param cut
+	 * @return
+	 */
+	List<ProjectCertificationInventoryEO> dataUniqueCheck(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList, String cut,List<String> result,String projectLibraryId);
+
+	/**
+	 *
+	 * @param json
+	 * @return
+	 */
+    Result<?> updateStatusBatch(JSONObject json);
+
+	/**
+	 * 添加配置
+	 * @param json
+	 * @return
+	 */
+    Result<?> addConfigByIds(JSONObject json);
+	String handlePhoneLink(String id, String prn_cn, String key);
+	void certificationInventoryEOListSortByEndTimeAsc(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList);
+	void certificationInventoryEOListSortByInventoryVerifyEndTimeAsc(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList);
+	void certificationInventoryEOListSortByTaskConfirmEndTimeAsc(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList);
+	Map<String, List<Map<String, Object>>> queryDutyPersonByProjectId(Map<String, Object> params);
+
+	/**
+	 * 获取任务确认统计信息
+	 * @param pciEoList
+	 * @return
+	 */
+    List<Map<String, Object>> getTaskToConfirmStatistics(List<ProjectCertificationInventoryEO> pciEoList);
+
+	/**
+	 * 获取Pre-Homo统计信息
+	 * @param pciEoList
+	 * @return
+	 */
+    List<Map<String, Object>> getPrehomoStatistice(List<ProjectCertificationInventoryEO> pciEoList);
+
+	/**
+	 * 获取认证进度统计信息 全部
+	 * @param pciEoList
+	 * @return
+	 */
+	List<Map<String, Object>> getAllCertificationProgressStatistics(List<ProjectCertificationInventoryEO> pciEoList);
+
+	/**
+	 * 获取认证进度统计信息 整车
+	 * @param pciEoList
+	 * @return
+	 */
+	List<Map<String, Object>> getCarCertificationProgressStatistics(List<ProjectCertificationInventoryEO> pciEoList);
+
+	/**
+	 * 获取认证进度统计信息  零部件
+	 * @param pciEoList
+	 * @return
+	 */
+	List<Map<String, Object>> getPartCertificationProgressStatistics(List<ProjectCertificationInventoryEO> pciEoList);
+
+	/**
+	 * 按照认证任务确认状态分组
+	 * @param pciEos
+	 * @return
+	 */
+	Map<String, Object> groupByFGRwqrStatus(List<ProjectCertificationInventoryEO> pciEos);
+
+	/**
+	 * 按照preHomo确认状态分组
+	 * @param pciEos
+	 * @return
+	 */
+	Map<String, Object> groupByPreHomoStatus(List<ProjectCertificationInventoryEO> pciEos);
+
+	/**
+	 * 根据认证进度分组
+	 * @param pciEos
+	 * @return
+	 */
+	Map<String, Object> groupByCertificationProgress(List<ProjectCertificationInventoryEO> pciEos);
+
+	/**
+	 * 同步待办中心明细数据-认证清单 截止日期
+	 * @param endTime
+	 * @param editEndTimeCertificationInventoryEOS
+	 */
+	void syncProcessInfoDetailEndTime(Date endTime, List<ProjectCertificationInventoryEO> editEndTimeCertificationInventoryEOS);
+
+	/**
+	 * 获取用户的责任领域数组
+	 * @param params
+	 * @return
+	 */
+	List<SysDictItem> getUserDutyTerritoryList(Map<String, Object> params);
+
+	/**
+	 * 替换用户
+	 * @param json
+	 */
+    void replacementUser(JSONObject json);
+
+	/**
+	 * 匹配相关人员
+	 * @param params
+	 * @return
+	 */
+	Result<?> matchRelevantPeople(Map<String, Object> params);
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectLawsInventoryEOService.java

@@ -0,0 +1,325 @@
+package com.jero.modules.platform.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.itextpdf.text.DocumentException;
+import com.jero.common.api.vo.Result;
+import com.jero.common.constant.enums.MessageTypeEnum;
+import com.jero.common.system.vo.LoginUser;
+import com.jero.modules.feishu.vo.FeishuMsgVo;
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
+import com.jero.modules.project.vo.ProjectTaskUrgVo;
+import com.jero.modules.system.entity.SysCategory;
+import com.jero.modules.system.entity.SysDictItem;
+import com.jero.modules.system.entity.SysRole;
+import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
+import com.jero.modules.todoCenter.entity.ProcessInfoEO;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 项目库-法规清单表
+ * @Author: jero-boot
+ * @Date:   2022-04-14
+ * @Version: V1.0
+ */
+public interface IPlatformProjectLawsInventoryEOService extends IService<ProjectLawsInventoryEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param projectLawsInventoryEO
+	 * @return
+	 */
+    void add(ProjectLawsInventoryEO projectLawsInventoryEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param projectLawsInventoryEO
+	 * @return
+	 */
+    void editById(ProjectLawsInventoryEO projectLawsInventoryEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id,String projectLibraryId,String cut);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids,String projectLibraryId,String cut);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ProjectLawsInventoryEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ProjectLawsInventoryEO> queryList(ProjectLawsInventoryEO projectLawsInventoryEO, HttpServletRequest req);
+
+	/**
+	 * 批量更新状态
+	 * @param json
+	 * @return
+	 */
+	Result<?> updateStatusBatch(JSONObject json);
+
+	void sendMessage(String msgTitle, String msgContent, List<String> userIdList, String projectLibraryId, Map<String,Object> params, FeishuMsgVo feishuMsgVo, MessageTypeEnum messageType,String initiator);
+
+	/**
+	 * 匹配相关人员
+	 * @param params
+	 * @return
+	 */
+    Result<?> matchRelevantPeople(Map<String, Object> params);
+
+	/**
+	 * 流程调用
+	 * @param jsonObject
+	 * @return
+	 */
+    Result<?> processCall(JSONObject jsonObject);
+
+	List<ProjectLawsInventoryEO> queryProjectLawsInventoryInfoById(Map<String, Object> params);
+
+
+	void copyInfoByIds(String ids,String operateType);
+
+	/**
+	 * 批量设置
+	 * @param projectLawsInventoryEO
+	 */
+	void setBatch(ProjectLawsInventoryEO projectLawsInventoryEO);
+
+	/**
+	 * 模板下载
+	 * @param projectLawsInventoryEO
+	 * @param response
+	 * @param request
+	 */
+	void exportTemplate(ProjectLawsInventoryEO projectLawsInventoryEO, HttpServletResponse response, HttpServletRequest request);
+
+	void exportData(HttpServletResponse response,
+					HttpServletRequest request,
+					ProjectLawsInventoryEO projectLawsInventoryEO);
+
+	void importData(MultipartFile file,
+					ProjectLawsInventoryEO projectLawsInventoryEO);
+
+	void dataDispose(List<ProjectLawsInventoryEO> list, LoginUser currentUser, int isProjectRole, String cut);
+
+	Result<?> change(JSONObject parmas);
+
+	/**
+	 * 下载pdf报告
+	 * @param params
+	 * @param req
+	 * @param resp
+	 * @throws DocumentException
+	 */
+	void downloadReport(Map<String, Object> params,HttpServletRequest req, HttpServletResponse resp)throws DocumentException;
+
+	/**
+	 * 下载docx报告
+	 * @param params
+	 * @param req
+	 * @param resp
+	 */
+	void downloadDocxReport(Map<String, Object> params, HttpServletRequest req, HttpServletResponse resp);
+
+	/**
+	 * 催办
+	 * @param json
+	 * @return
+	 */
+    Result<?> expediting(JSONObject json);
+
+	List<SysRole> getRoleByUserId(String projectLibraryId,String cut);
+
+	void addProcessInfo(ProcessInfoEO processInfoEO, String projectLibraryId, Date endTime);
+
+	void addProcessInfoDetail(String processInfoId, List<ProcessInfoDetailEO> processInfoDetailEOList, Date endTime);
+
+	Result<?> taskUrg(ProjectTaskUrgVo projectTaskUrgVo);
+
+    Result<?> updateFlowInfoByProjectLibraryIds(String projectLibraryIds);
+	void updateFlowInfo(ProjectLawsInventoryEO projectLawsInventoryEO);
+	/**
+	 * studio发布，启动清单确认流程
+	 * @param json
+	 * @return
+	 */
+	Result<?> studioPublish(JSONObject json);
+
+	/**
+	 * studio撤回
+	 * @param json
+	 * @return
+	 */
+	Result<?> studioWithdrew(JSONObject json);
+
+	/**
+	 * 法规工程师退回
+	 * @param json
+	 * @return
+	 */
+	Result<?> regulationOwnerReturned(JSONObject json);
+
+	/**
+	 * 根据id获取交付物类型展示名称
+	 * @param projectLawsInventoryId
+	 * @param cut
+	 * @param flowType
+	 * @return
+	 */
+	String getDeliverableTypeNameById(String projectLawsInventoryId, String cut, String flowType,List<ProjectLawsInventoryEO> projectLawsInventoryEOList,List<SysCategory> categoryList);
+
+	/**
+	 * 根据id获取责任领域展示名称
+	 * @param projectLawsInventoryId
+	 * @param cut
+	 * @param projectLawsInventoryEOList
+	 * @param sysDictItems
+	 * @param dicCode
+	 * @return
+	 */
+    String getDutyTerritoryNameById(String projectLawsInventoryId, String cut, List<ProjectLawsInventoryEO> projectLawsInventoryEOList, List<SysDictItem> sysDictItems,String dicCode);
+
+	void sendMessageByTemplateId(String templeteId,Map<String,Object> params);
+
+	Map<String, Object> getProjectLawsInventoryLinkHrefFeishu(String projectLibraryId, String PRN_CN, String PRN_EN,String roleOpen);
+
+	/**
+	 * 获取待办中心跳转链接
+	 * @param projectLibraryId
+	 * @param todoCenterParams
+	 * @return
+	 */
+	Map<String, Object> getToDoCenterLinkHrefFeishu(String projectLibraryId, Map<String,Object> todoCenterParams);
+
+	/**
+	 * 法规清单根据清单确认截至日期顺序排序
+	 * @param projectLawsInventoryEOS
+	 */
+	void lawsInventoryEOListSortByInventoryAffirmDueDate(List<ProjectLawsInventoryEO> projectLawsInventoryEOS);
+
+	/**
+	 * 法规清单根据设计符合性截至日期顺序排序
+	 * @param projectLawsInventoryEOS
+	 */
+	void lawsInventoryEOListSortByDesignDueDate(List<ProjectLawsInventoryEO> projectLawsInventoryEOS);
+
+	/**
+	 * 法规清单根据验证符合性截至日期顺序排序
+	 * @param projectLawsInventoryEOS
+	 */
+	void lawsInventoryEOListSortByVerifyDueDate(List<ProjectLawsInventoryEO> projectLawsInventoryEOS);
+
+	/**
+	 * 创建查询权限，2023-04-06 修改UAT问题第22条
+	 * @param isProjectRole
+	 * @param currentUser
+	 */
+    void createQueryPermission(int isProjectRole, LoginUser currentUser, QueryWrapper<ProjectLawsInventoryEO> projectLawsInventoryEOQueryWrapper);
+
+	Result<?> resetFlowTemp(JSONObject parmas);
+
+	/**
+	 * 批量更新流程状态
+	 * @param json
+	 * @return
+	 */
+	Result<?> updateFlowStatusBatch(JSONObject json);
+
+    Result<?> citeDeliverable(JSONObject json);
+
+    Result<?> compulsoryTransfer(JSONObject json);
+
+	Map<String, List<Map<String, Object>>> queryDutyPersonByProjectId(Map<String, Object> params);
+
+	/**
+	 * 获取任务确认统计信息
+	 * @param projectLawsInventoryEOList
+	 * @return
+	 */
+    List<Map<String, Object>> getTaskToConfirmStatistics(List<ProjectLawsInventoryEO> projectLawsInventoryEOList);
+
+	/**
+	 * 获取设计符合性统计信息
+	 * @param projectLawsInventoryEOList
+	 * @return
+	 */
+	List<Map<String, Object>> getDesignComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList);
+
+	/**
+	 * 获取验证符合性统计信息
+	 * @param projectLawsInventoryEOList
+	 * @return
+	 */
+	List<Map<String, Object>> getVerifyComplianceStatistice(List<ProjectLawsInventoryEO> projectLawsInventoryEOList);
+
+	List<Map<String,Object>> queryNotComplianList(Map<String, Object> params);
+
+	void exportNotComplianList(HttpServletResponse response, HttpServletRequest request, Map<String, Object> params);
+
+	/**
+	 * 按照法规任务确认状态分组
+	 * @param pliEos
+	 * @return
+	 */
+	Map<String, Object> groupByFGRwqrStatus(List<ProjectLawsInventoryEO> pliEos);
+
+	/**
+	 * 按照设计符合性状态分组
+	 * @param pliEos
+	 * @return
+	 */
+	Map<String, Object> groupByDesignStatus(List<ProjectLawsInventoryEO> pliEos);
+
+	/**
+	 * 按照验证符合性状态分组
+	 * @param pliEos
+	 * @return
+	 */
+	Map<String, Object> groupByVerifyStatus(List<ProjectLawsInventoryEO> pliEos);
+
+	IPage<ProjectLawsInventoryEO> queryPage(ProjectLawsInventoryEO projectLawsInventoryEO, Integer pageNo, Integer pageSize, HttpServletRequest req);
+
+	Result<?> finalizationVerify(Map<String, Object> params);
+
+	/**
+	 * 获取用户的责任领域数组
+	 * @param params
+	 * @return
+	 */
+	List<SysDictItem> getUserDutyTerritoryList(Map<String, Object> params);
+
+	/***
+	 * 替换用户
+	 * @param params
+	 */
+    void replacementUser(JSONObject json);
+	int checkUserRole(String projectLibraryId, String currentUserId, String lawsInventoryId);
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectLibraryBaseService.java

@@ -0,0 +1,191 @@
+package com.jero.modules.platform.service;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.vo.DictModel;
+import com.jero.modules.project.entity.ProjectLibraryBase;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 项目库基础表
+ * @Author: jero-boot
+ * @Date:   2022-04-11
+ * @Version: V1.0
+ */
+public interface IPlatformProjectLibraryBaseService extends IService<ProjectLibraryBase> {
+
+	/**
+	 * 保存
+	 *
+	 * @param projectLibraryBase
+	 * @return
+	 */
+    void add(ProjectLibraryBase projectLibraryBase) throws ParseException;
+
+	/**
+	 * 项目扩展(添加子项目-子项目基本信息、相关人员名单、法规/认证任务计划与被扩展项目保持一致)
+	 *
+	 * @param projectLibraryBase
+	 * @return
+	 */
+    void addChild(ProjectLibraryBase projectLibraryBase) throws ParseException;
+
+	/**
+	 * 更新
+	 *
+	 * @param projectLibraryBase
+	 * @return
+	 */
+    void editById(ProjectLibraryBase projectLibraryBase);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id, String cut);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids,String cut);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	List<ProjectLibraryBase> queryById(String id,String cut);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ProjectLibraryBase> getList(ProjectLibraryBase projectLibraryBase);
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @return
+	 */
+	List<ProjectLibraryBase> queryPageList(Map<String, Object> params);
+//	IPage<ProjectLibraryBase> queryPageList(Map<String, Object> params);
+
+	/**
+	 * 项目详情-统计接口
+	 * @param id
+	 * @return
+	 */
+    Map<String, Object> getProjectDetailsStatistics(String id);
+
+	/**
+	 * 项目详情-统计接口-根据领域分组
+	 * @param params
+	 * @return
+	 */
+    Map<String, Object> getProjectDetailsStatisticsGroupByTerritory(Map<String, Object> params);
+
+	void exportProjectDetailsStatisticsGroupByTerritoryXls(HttpServletResponse response, HttpServletRequest request, Map<String, Object> params);
+
+    void checkData(String id, String cut);
+
+	void disposeData(List<ProjectLibraryBase> records,String cut,boolean disposeTargetMarketFlag);
+
+	Page getPages(Integer currentPage, Integer pageSize, List<ProjectLibraryBase> list);
+
+	/**
+	 * 项目置顶,取消置顶(只置顶主项目)
+	 * @param id
+	 * @param flag 0为置顶,  1为取消置顶
+	 * @return
+	 */
+	void top(String id,String flag);
+
+	/**
+	 * 获取项目所有的版本(主版本和子版本的集合)
+	 * @param id
+	 * @return
+	 */
+	List<String> getVersionsInfo(String id);
+
+	/**
+	 * 版本统计
+	 * @param id
+	 * @return
+	 */
+	List<ProjectLibraryBase> versionStatistics(String id);
+
+	/**
+	 * 通过主项目id和子项目版本号
+	 * @param version
+	 * @param parentId
+	 * @return
+	 */
+	String getIdByVersionAndParentId(String version, String parentId);
+
+	/**
+	 *  查询主项目及其所有子项目
+	 * @param parentId
+	 * @return
+	 */
+	List<ProjectLibraryBase> getParentAndChildern(String parentId);
+
+	/**
+	 * 根据id查询项目库详情信息  发送飞书消息时使用，之前的 queryById不太兼容
+	 * @param projectLibraryId
+	 * @return
+	 */
+	ProjectLibraryBase selectById(String projectLibraryId);
+
+	/**
+	 * 对接火山引擎接口-获取项目统计信息
+	 * @return
+	 */
+	JSONArray getProjectInfo();
+
+	/**
+	 * 对接火山引擎接口-获取项目统计信息
+	 * @return
+	 */
+    JSONArray getProjectProgressInfo();
+
+	/**
+	 * 导出项目进度统计(状态导出)
+	 * @param response
+	 * @param request
+	 * @param params
+	 */
+    void exportProjectProgressStatisticsXls(HttpServletResponse response, HttpServletRequest request, Map<String, Object> params);
+
+	/**
+	 * 获取用户在该项目中所有的责任领域数组
+	 * @param params
+	 * @return
+	 */
+    List<DictModel> getUserAllDutyTerritoryList(Map<String, Object> params);
+
+	/**
+	 * 全局替换用户
+	 * @param json
+	 * @return
+	 */
+    Result<?> overallReplacementUser(JSONObject json);
+
+	List<ProjectLibraryBase> queryList(List<String> projectIdList);
+
+	List<ProjectLibraryBase> getListByIds(List<String> projectIdList);
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformProjectNameInfoEOService.java

@@ -0,0 +1,73 @@
+package com.jero.modules.platform.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.project.entity.ProjectLibraryBase;
+import com.jero.modules.project.entity.ProjectNameInfoEO;
+
+import java.util.List;
+
+/**
+ * @Description: 项目名信息表
+ * @Author: jero-boot
+ * @Date:   2022-04-18
+ * @Version: V1.0
+ */
+public interface IPlatformProjectNameInfoEOService extends IService<ProjectNameInfoEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param projectNameInfoEO
+	 * @return
+	 */
+    void add(ProjectNameInfoEO projectNameInfoEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param projectNameInfoEO
+	 * @return
+	 */
+    void editById(ProjectNameInfoEO projectNameInfoEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ProjectNameInfoEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ProjectNameInfoEO> queryList();
+
+	/**
+	 * 返回项目全拼
+	 * @return
+	 */
+	List<ProjectLibraryBase> queryProjectNameList(String cut);
+
+
+
+	//void getSpaceInfo(String cut);
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/IPlatformTaskPlanningEOService.java

@@ -0,0 +1,67 @@
+package com.jero.modules.platform.service;
+
+import com.jero.modules.platform.entity.PlatformTaskPlanningEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 平台件合规认证计划
+ * @Author: jero-boot
+ * @Date:   2023-09-14
+ * @Version: V1.0
+ */
+public interface IPlatformTaskPlanningEOService extends IService<PlatformTaskPlanningEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param platformTaskPlanningEO
+	 * @return
+	 */
+    void add(PlatformTaskPlanningEO platformTaskPlanningEO);
+
+	/**
+	 * 平台件合规认证计划-批量添加
+	 * @param platformTaskPlanningEOList
+	 */
+	void addBatch(List<PlatformTaskPlanningEO> platformTaskPlanningEOList);
+
+	/**
+	 * 更新
+	 *
+	 * @param platformTaskPlanningEO
+	 * @return
+	 */
+    void editById(PlatformTaskPlanningEO platformTaskPlanningEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    PlatformTaskPlanningEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<PlatformTaskPlanningEO> queryList(String projectId);
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectNameInfoEOServiceImpl.java

@@ -0,0 +1,374 @@
+package com.jero.modules.platform.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.system.vo.DictModel;
+import com.jero.modules.platform.mapper.PlatformProjectNameInfoEOMapper;
+import com.jero.modules.platform.service.IPlatformProjectNameInfoEOService;
+import com.jero.modules.project.entity.ProjectLibraryBase;
+import com.jero.modules.project.entity.ProjectNameInfoEO;
+import com.jero.modules.project.entity.ProjectYearNameInfoEO;
+import com.jero.modules.project.mapper.ProblemManagementEOMapper;
+import com.jero.modules.project.service.impl.ProblemManagementEOServiceImpl;
+import com.jero.modules.project.service.impl.ProjectYearNameInfoEOServiceImpl;
+import com.jero.modules.system.enums.DicCodeEnum;
+import com.jero.modules.system.service.ISysDictService;
+import com.jero.modules.system.util.StringUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description: 项目名信息表
+ * @Author: jero-boot
+ * @Date:   2022-04-18
+ * @Version: V1.0
+ */
+@Service
+public class PlatformProjectNameInfoEOServiceImpl extends ServiceImpl<PlatformProjectNameInfoEOMapper, ProjectNameInfoEO> implements IPlatformProjectNameInfoEOService {
+	@Autowired
+	private ProjectYearNameInfoEOServiceImpl projectYearNameInfoEOService;
+	@Autowired
+	private ProblemManagementEOMapper problemManagementEOMapper;
+	@Autowired
+	private ISysDictService sysDictService;
+	@Autowired
+	private ProblemManagementEOServiceImpl problemManagementEOService;
+	/**
+	 * 保存
+	 *
+	 * @param projectNameInfoEO
+	 * @return
+	 */
+	@Override
+	public void add(ProjectNameInfoEO projectNameInfoEO) {
+		Date now = new Date();
+		projectNameInfoEO.setCreateTime(now);
+		projectNameInfoEO.setUpdateTime(now);
+		save(projectNameInfoEO);
+	}
+
+	/**
+	 * 更新
+	 *
+	 * @param projectNameInfoEO
+	 * @return
+	 */
+	@Override
+	public void editById(ProjectNameInfoEO projectNameInfoEO) {
+		Date now = new Date();
+		projectNameInfoEO.setUpdateTime(now);
+		saveOrUpdate(projectNameInfoEO);
+	}
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public void deleteById(String id) {
+		removeById(id);
+	}
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+	public void deleteByIds(List<String> ids) {
+		removeByIds(ids);
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public ProjectNameInfoEO queryById(String id) {
+		return getById(id);
+	}
+
+	/**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+	public List<ProjectNameInfoEO> queryList() {
+		QueryWrapper<ProjectNameInfoEO> nameInfoEOQueryWrapper = new QueryWrapper<>();
+		List<ProjectNameInfoEO> projectNameInfoEOList = list(nameInfoEOQueryWrapper);
+//		List<String> projectNameInfoIdList = projectNameInfoEOList.stream().map(e -> e.getId()).collect(Collectors.toList());
+		for (ProjectNameInfoEO projectNameInfoEO : projectNameInfoEOList){
+			QueryWrapper<ProjectYearNameInfoEO> yearNameInfoEOQueryWrapper = new QueryWrapper<>();
+			yearNameInfoEOQueryWrapper.eq("project_name_id",projectNameInfoEO.getId());
+			List<ProjectYearNameInfoEO> yearNameInfoDataList = projectYearNameInfoEOService.list(yearNameInfoEOQueryWrapper);
+			if(CollectionUtils.isNotEmpty(yearNameInfoDataList)) {
+				projectNameInfoEO.setYearNameDataList(yearNameInfoDataList);
+			}
+		}
+
+//		List<ProjectNameInfoEO> projectNameAndYear = projectNameInfoEOMapper.selectProjectNameAndYear();
+		return projectNameInfoEOList;
+	}
+	/**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+	public List<ProjectLibraryBase> queryProjectNameList(String cut) {
+		List<ProjectLibraryBase> projectLibraryBaseList = problemManagementEOMapper.queryByIds(null);
+		//目标市场数据字典
+		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
+		for (ProjectLibraryBase projectLibraryBase : projectLibraryBaseList) {
+			//目标市场
+			String targetMarket = problemManagementEOService.getMarket(cut, targetMarketList, projectLibraryBase);
+			//主项目的版本号
+			String projectVersion = "";
+			if(StringUtils.isBlank(projectLibraryBase.getParentId())){
+				projectVersion = "00";
+			}else{
+				projectVersion = projectLibraryBase.getProjectVersion();
+			}
+			if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){
+				projectLibraryBase.setProjectName(projectLibraryBase.getProjectName()
+						+ "-" + projectLibraryBase.getYearName()
+						+ "-" + targetMarket
+						+"-"+projectVersion);
+			}
+		}
+		return projectLibraryBaseList;
+	}
+
+/*	@Override
+	public void getSpaceInfo(String cut){
+		String jsonData ="";
+		try {
+			jsonData = spaceService.getSign();
+			if(StringUtils.isNotBlank(jsonData)) {
+				//静态测试数据
+		*//*	jsonData = "{\n" +
+					"    \"resultData\": [\n" +
+					"        {\n" +
+					"            \"modelCode\": \"ES8_00\",\n" +
+					"            \"modelName\": \"ES8\",\n" +
+					"            \"hardwarePltCode\": \"mhp_npa\",\n" +
+					"            \"hardwarePltName\": \"NPA\",\n" +
+					"            \"softwarePltCode\": \"msp_nt1\",\n" +
+					"            \"softwarePltName\": \"NT1\",\n" +
+					"            \"modelYearInfoList\": [\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.1\",\n" +
+					"                    \"yearName\": \"G1.1\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.2\",\n" +
+					"                    \"yearName\": \"G1.2\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.3\",\n" +
+					"                    \"yearName\": \"G1.3\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.f\",\n" +
+					"                    \"yearName\": \"G1.F\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.f.e\",\n" +
+					"                    \"yearName\": \"G1.F.E\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_my2018\",\n" +
+					"                    \"yearName\": \"MY2018\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.5\",\n" +
+					"                    \"yearName\": \"G1.5\"\n" +
+					"                }\n" +
+					"            ]\n" +
+					"        },\n" +
+					"        {\n" +
+					"            \"modelCode\": \"FURY_00\",\n" +
+					"            \"modelName\": \"FURY\",\n" +
+					"            \"hardwarePltCode\": \"mhp_npa\",\n" +
+					"            \"hardwarePltName\": \"NPA\",\n" +
+					"            \"softwarePltCode\": \"msp_nt1\",\n" +
+					"            \"softwarePltName\": \"NT1\",\n" +
+					"            \"modelYearInfoList\": [\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.1\",\n" +
+					"                    \"yearName\": \"G1.1\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.2\",\n" +
+					"                    \"yearName\": \"G1.2\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.3\",\n" +
+					"                    \"yearName\": \"G1.3\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.f\",\n" +
+					"                    \"yearName\": \"G1.F\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.6\",\n" +
+					"                    \"yearName\": \"G1.6\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.5\",\n" +
+					"                    \"yearName\": \"G1.5\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.1.e\",\n" +
+					"                    \"yearName\": \"G1.1.E\"\n" +
+					"                }\n" +
+					"            ]\n" +
+					"        },\n" +
+					"        {\n" +
+					"            \"modelCode\": \"FORCE_00\",\n" +
+					"            \"modelName\": \"FORCE\",\n" +
+					"            \"hardwarePltCode\": \"mhp_npb\",\n" +
+					"            \"hardwarePltName\": \"NPB\",\n" +
+					"            \"softwarePltCode\": \"msp_nt2\",\n" +
+					"            \"softwarePltName\": \"NT2\",\n" +
+					"            \"modelYearInfoList\": [\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.1\",\n" +
+					"                    \"yearName\": \"G1.1\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.1.e\",\n" +
+					"                    \"yearName\": \"G1.1.E\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.2\",\n" +
+					"                    \"yearName\": \"G1.2\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.3\",\n" +
+					"                    \"yearName\": \"G1.3\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.f\",\n" +
+					"                    \"yearName\": \"G1.F\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.6\",\n" +
+					"                    \"yearName\": \"G1.6\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.5\",\n" +
+					"                    \"yearName\": \"G1.5\"\n" +
+					"                }\n" +
+					"            ]\n" +
+					"        },\n" +
+					"        {\n" +
+					"            \"modelCode\": \"Gemini_00\",\n" +
+					"            \"modelName\": \"Gemini\",\n" +
+					"            \"hardwarePltCode\": \"mhp_npa\",\n" +
+					"            \"hardwarePltName\": \"NPA\",\n" +
+					"            \"softwarePltCode\": \"msp_nt2\",\n" +
+					"            \"softwarePltName\": \"NT2\",\n" +
+					"            \"modelYearInfoList\": [\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.1\",\n" +
+					"                    \"yearName\": \"G1.1\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.1.e\",\n" +
+					"                    \"yearName\": \"G1.1.E\"\n" +
+					"                }\n" +
+					"            ]\n" +
+					"        },\n" +
+					"        {\n" +
+					"            \"modelCode\": \"Pegasus_00\",\n" +
+					"            \"modelName\": \"Pegasus\",\n" +
+					"            \"hardwarePltCode\": \"mhp_npc\",\n" +
+					"            \"hardwarePltName\": \"NPC\",\n" +
+					"            \"softwarePltCode\": \"msp_nt2\",\n" +
+					"            \"softwarePltName\": \"NT2\",\n" +
+					"            \"modelYearInfoList\": [\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.1\",\n" +
+					"                    \"yearName\": \"G1.1\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_g1.1.e\",\n" +
+					"                    \"yearName\": \"G1.1.E\"\n" +
+					"                },\n" +
+					"                {\n" +
+					"                    \"yearCode\": \"mp_G1.1.RH\",\n" +
+					"                    \"yearName\": \"G1.1.RH\"\n" +
+					"                }\n" +
+					"            ]\n" +
+					"        }\n" +
+					"    ],\n" +
+					"    \"resultCode\": \"WL-0000\",\n" +
+					"    \"resultDesc\": \"Success\"\n" +
+					"}";*//*
+
+				JSONObject result = (JSONObject) JSON.parse(jsonData);
+				JSONArray resultData = result.getJSONArray("resultData");
+
+				String modelName = "";//项目名称
+				String hardwarePltName = "";//车型平台
+				String softwarePltName = "";//数字平台
+
+				//获取resultData中所需的数据
+				for (int i = 0; i < resultData.size(); i++) {
+					JSONObject jsonObject = resultData.getJSONObject(i);
+					modelName = jsonObject.getString("modelName");//项目名称
+					hardwarePltName = jsonObject.getString("hardwarePltName");//车型平台
+					softwarePltName = jsonObject.getString("softwarePltName");//数字平台
+					String nameInfoId = UUID.randomUUID().toString().replace("-", "");
+
+					ProjectNameInfoEO projectNameInfoEO = new ProjectNameInfoEO();
+					projectNameInfoEO.setId(nameInfoId);
+					projectNameInfoEO.setProjectName(modelName);
+					projectNameInfoEO.setVehiclePlatform(hardwarePltName);
+					projectNameInfoEO.setDigitalPlatform(softwarePltName);
+					//保存
+					save(projectNameInfoEO);
+
+					//设置年款名
+					JSONArray modelYearInfoJson = jsonObject.getJSONArray("modelYearInfoList");
+					for (int j = 0; j < modelYearInfoJson.size(); j++) {
+						JSONObject modelYearInfo = modelYearInfoJson.getJSONObject(j);
+						String yearName = modelYearInfo.getString("yearName");
+
+						ProjectYearNameInfoEO projectYearNameInfoEO = new ProjectYearNameInfoEO();
+						projectYearNameInfoEO.setProjectNameId(nameInfoId);
+						projectYearNameInfoEO.setYearName(yearName);
+						//保存
+						projectYearNameInfoEOService.save(projectYearNameInfoEO);
+
+					}
+					if(CutEnum.CN.getValue().equals(cut)) {
+						throw new JeroBootException("从Space获取项目名称相关数据,成功保存");
+					}else{
+						throw new JeroBootException("Get the data related to the project name from Space and save it successfully.");
+					}
+				}
+			}else{
+				if(CutEnum.CN.getValue().equals(cut)) {
+					throw new JeroBootException("从Space获取项目名称相关数据为空");
+				}else{
+					throw new JeroBootException("Data related to obtaining project name from Space is empty.");
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}*/
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java

@@ -0,0 +1,144 @@
+package com.jero.modules.platform.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.modules.platform.entity.PlatformTaskPlanningEO;
+import com.jero.modules.platform.mapper.PlatformTaskPlanningEOMapper;
+import com.jero.modules.platform.service.IPlatformTaskPlanningEOService;
+import com.jero.modules.project.enums.PlanStatusEnum;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @Description: 平台件合规认证计划
+ * @Author: jero-boot
+ * @Date:   2023-09-14
+ * @Version: V1.0
+ */
+@Service
+public class PlatformTaskPlanningEOServiceImpl extends ServiceImpl<PlatformTaskPlanningEOMapper, PlatformTaskPlanningEO> implements IPlatformTaskPlanningEOService {
+
+	/**
+	 * 保存
+	 *
+	 * @param platformTaskPlanningEO
+	 * @return
+	 */
+	@Override
+    public void add(PlatformTaskPlanningEO platformTaskPlanningEO) {
+        Date now = new Date();
+        platformTaskPlanningEO.setCreateTime(now);
+        platformTaskPlanningEO.setUpdateTime(now);
+        save(platformTaskPlanningEO);
+    }
+
+	/**
+	 * 平台件合规认证计划-批量添加
+	 * @param platformTaskPlanningEOList
+	 */
+	@Override
+    public void addBatch(List<PlatformTaskPlanningEO> platformTaskPlanningEOList) {
+		if(!platformTaskPlanningEOList.isEmpty()){
+			//先删除在新增
+//			LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			LambdaQueryWrapper<PlatformTaskPlanningEO> wrapper = new LambdaQueryWrapper<>();
+//			wrapper.eq(PlatformTaskPlanningEO::getCreateBy,loginUser.getUsername());
+			wrapper.eq(PlatformTaskPlanningEO::getProjectId,platformTaskPlanningEOList.get(0).getProjectId());
+			this.remove(wrapper);
+			for (PlatformTaskPlanningEO platformTaskPlanningEO : platformTaskPlanningEOList) {
+				Date now = new Date();
+				platformTaskPlanningEO.setCreateTime(now);
+				platformTaskPlanningEO.setUpdateTime(now);
+			}
+			saveBatch(platformTaskPlanningEOList);
+		}
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param platformTaskPlanningEO
+	 * @return
+	 */
+	@Override
+    public void editById(PlatformTaskPlanningEO platformTaskPlanningEO) {
+    	Date now = new Date();
+        platformTaskPlanningEO.setUpdateTime(now);
+    	saveOrUpdate(platformTaskPlanningEO);
+    }
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public void deleteById(String id) {
+        removeById(id);
+    }
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+    public void deleteByIds(List<String> ids) {
+        removeByIds(ids);
+    }
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public PlatformTaskPlanningEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<PlatformTaskPlanningEO> queryList(String projectId) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd");
+		Date date = null;
+		try {
+			date = sdf.parse(sdf.format(new Date()));
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+		LambdaQueryWrapper<PlatformTaskPlanningEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(PlatformTaskPlanningEO::getProjectId,projectId);
+		wrapper.orderByAsc(PlatformTaskPlanningEO::getNodeTime);
+		List<PlatformTaskPlanningEO> taskPlanningEOList = list(wrapper);
+		for (PlatformTaskPlanningEO platformTaskPlanningEO : taskPlanningEOList) {
+			platformTaskPlanningEO.setName(platformTaskPlanningEO.getNodeName());
+			platformTaskPlanningEO.setTime(platformTaskPlanningEO.getNodeTime());
+			platformTaskPlanningEO.setG(false);
+			if(ObjectUtils.isNotEmpty(platformTaskPlanningEO.getNodeTime())){
+				if(platformTaskPlanningEO.getNodeTime().after(date)){
+					platformTaskPlanningEO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
+				}else if(platformTaskPlanningEO.getNodeTime().before(date)){
+					platformTaskPlanningEO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
+				}else{
+					platformTaskPlanningEO.setStatus(PlanStatusEnum.ON_GOING.getValue());
+				}
+			}
+		}
+		taskPlanningEOList = taskPlanningEOList.stream().filter(e->ObjectUtils.isNotEmpty(e.getNodeTime())).collect(Collectors.toList());
+		return taskPlanningEOList;
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsInventoryPlatformEOController.java

@@ -0,0 +1,208 @@
+package com.jero.modules.project.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.project.entity.LawsInventoryPlatformEO;
+import com.jero.modules.project.service.ILawsInventoryPlatformEOService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+
+ /**
+ * @Description: 车型项目库法规清单关联平台件表
+ * @Author: jero-boot
+ * @Date:   2023-09-19
+ * @Version: V1.0
+ */
+@Api(tags="车型项目库法规清单关联平台件表")
+@RestController
+@RequestMapping("/project/lawsInventoryPlatformEO")
+@Slf4j
+public class LawsInventoryPlatformEOController extends JeroController<LawsInventoryPlatformEO, ILawsInventoryPlatformEOService> {
+	@Autowired
+	private ILawsInventoryPlatformEOService lawsInventoryPlatformEOService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param lawsInventoryPlatformEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "车型项目库法规清单关联平台件表-分页列表查询")
+	@ApiOperation(value="车型项目库法规清单关联平台件表-分页列表查询", notes="车型项目库法规清单关联平台件表-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(LawsInventoryPlatformEO lawsInventoryPlatformEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<LawsInventoryPlatformEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsInventoryPlatformEO, req.getParameterMap());
+		Page<LawsInventoryPlatformEO> page = new Page<LawsInventoryPlatformEO>(pageNo, pageSize);
+		IPage<LawsInventoryPlatformEO> pageList = lawsInventoryPlatformEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "车型项目库法规清单关联平台件表-列表查询")
+    @ApiOperation(value="车型项目库法规清单关联平台件表-列表查询", notes="车型项目库法规清单关联平台件表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<LawsInventoryPlatformEO>> queryList() {
+        List<LawsInventoryPlatformEO> list = lawsInventoryPlatformEOService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param lawsInventoryPlatformEO
+	 * @return
+	 */
+	@AutoLog(value = "车型项目库法规清单关联平台件表-添加")
+	@ApiOperation(value="车型项目库法规清单关联平台件表-添加", notes="车型项目库法规清单关联平台件表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody LawsInventoryPlatformEO lawsInventoryPlatformEO) {
+		lawsInventoryPlatformEOService.add(lawsInventoryPlatformEO);
+		return Result.OK("添加成功！");
+	}
+	/**
+	 *   批量添加
+	 *
+	 * @param json
+	 * @return
+	 */
+	@AutoLog(value = "车型项目库法规清单关联平台件表-批量添加")
+	@ApiOperation(value="车型项目库法规清单关联平台件表-批量添加", notes="车型项目库法规清单关联平台件表-批量添加")
+	@PostMapping(value = "/addBatch")
+	public Result<?> addBatch(@Validated @RequestBody JSONObject json) {
+		JSONArray dataList = json.getJSONArray("list");
+		List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
+		for (Object data : dataList) {
+			LawsInventoryPlatformEO inventoryPlatformEO = JSONObject.parseObject(JSONObject.toJSONString(data), LawsInventoryPlatformEO.class);
+			lawsInventoryPlatformEOS.add(inventoryPlatformEO);
+		}
+		lawsInventoryPlatformEOService.addBatch(lawsInventoryPlatformEOS);
+		String msg = "";
+		if(ObjectUtils.isNotEmpty(json.get("msg"))){
+			msg = (String)json.get("msg");
+		}else{
+			msg = "";
+		}
+		return Result.OK(msg);
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param lawsInventoryPlatformEO
+	 * @return
+	 */
+	@AutoLog(value = "车型项目库法规清单关联平台件表-编辑")
+	@ApiOperation(value="车型项目库法规清单关联平台件表-编辑", notes="车型项目库法规清单关联平台件表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody LawsInventoryPlatformEO lawsInventoryPlatformEO) {
+		lawsInventoryPlatformEOService.editById(lawsInventoryPlatformEO);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "车型项目库法规清单关联平台件表-通过id删除")
+	@ApiOperation(value="车型项目库法规清单关联平台件表-通过id删除", notes="车型项目库法规清单关联平台件表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		lawsInventoryPlatformEOService.deleteById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "车型项目库法规清单关联平台件表-批量删除")
+	@ApiOperation(value="车型项目库法规清单关联平台件表-批量删除", notes="车型项目库法规清单关联平台件表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.lawsInventoryPlatformEOService.deleteByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "车型项目库法规清单关联平台件表-通过id查询")
+	@ApiOperation(value="车型项目库法规清单关联平台件表-通过id查询", notes="车型项目库法规清单关联平台件表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		LawsInventoryPlatformEO lawsInventoryPlatformEO = lawsInventoryPlatformEOService.queryById(id);
+		if(lawsInventoryPlatformEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(lawsInventoryPlatformEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param lawsInventoryPlatformEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, LawsInventoryPlatformEO lawsInventoryPlatformEO) {
+        return super.exportXls(request, lawsInventoryPlatformEO, LawsInventoryPlatformEO.class, "车型项目库法规清单关联平台件表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, LawsInventoryPlatformEO.class);
+    }
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/PhoneProjectLawsInventoryEOController.java

@@ -561,4 +561,6 @@ public class PhoneProjectLawsInventoryEOController extends JeroController<Projec
 	public Result<?> finalizationVerify(@RequestParam Map<String,Object> params){
 		return this.projectLawsInventoryEOService.finalizationVerify(params);
 	}
+
+
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java

@@ -1,32 +1,39 @@
 package com.jero.modules.project.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.alibaba.fastjson.JSONObject;
-import com.jero.common.api.vo.Result;
-import com.jero.common.system.query.QueryGenerator;
-import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
-import com.jero.modules.project.entity.ProjectLawsInventoryEO;
-import com.jero.modules.project.service.IProjectCertificationInventoryEOService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jero.modules.system.entity.SysRole;
-import lombok.extern.slf4j.Slf4j;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
+import com.jero.modules.project.service.IProjectCertificationInventoryEOService;
+import com.jero.modules.system.entity.SysRole;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import com.jero.common.aspect.annotation.AutoLog;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 
  /**
@@ -86,6 +93,19 @@ public class ProjectCertificationInventoryEOController extends JeroController<Pr
 		return Result.OK(cut,pageList);
 	}
 
+	 /**
+	  * 勾选认证清单进行关联平台件
+	  *
+	  * @return
+	  */
+	 @AutoLog(value = "勾选认证清单进行关联平台件")
+	 @ApiOperation(value="勾选认证清单进行关联平台件", notes="勾选认证清单进行关联平台件")
+	 @PostMapping(value = "/listPlatform")
+	 public Result<?> listPlatform(@RequestBody Map<String,Object> params) {
+		 String msg = projectCertificationInventoryEOService.listPlatform(params);
+		 return Result.OK(msg);
+	 }
+
     /**
 	 * 列表查询
 	 *

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java

@@ -575,4 +575,16 @@ public class ProjectLawsInventoryEOController extends JeroController<ProjectLaws
 	public Result<?> finalizationVerify(@RequestParam Map<String,Object> params){
 		return this.projectLawsInventoryEOService.finalizationVerify(params);
 	}
+	/**
+	 * 点击流程状态查看流程详情（平台件）
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "点击流程状态查看流程详情（平台件）")
+	@ApiOperation(value="点击流程状态查看流程详情（平台件）", notes="点击流程状态查看流程详情（平台件）")
+	@GetMapping(value = "/queryPlatformList")
+	public Result<List<ProjectLawsInventoryEO>> queryPlatformList(String lawsInventoryId,String flowFlag,String cut) {
+		List<ProjectLawsInventoryEO> list = projectLawsInventoryEOService.queryPlatformList(lawsInventoryId,flowFlag,cut);
+		return Result.OK(list);
+	}
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java

@@ -61,6 +61,41 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
 		Page pages = projectLibraryBaseService.getPages(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()), pageList);
 		return Result.OK(params.get("cut").toString(),pages);
 	}
+	@AutoLog(value = "认证清单引用交付物")
+	@ApiOperation(value="认证清单引用交付物", notes="认证清单引用交付物")
+	@PostMapping(value = "/quotePage")
+//	@PostMapping(value = "/page")
+	public Result<?> quotePage(@RequestBody Map<String,Object> params) {
+		params.put("flag","quote");
+		List<ProjectLibraryBase> pageList= projectLibraryBaseService.queryPageList(params);
+		Page pages = projectLibraryBaseService.getPages(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()), pageList);
+		return Result.OK(params.get("cut").toString(),pages);
+	}
+
+	/**
+	 * 勾选法规清单进行关联平台件
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "勾选法规清单进行关联平台件")
+	@ApiOperation(value="勾选法规清单进行关联平台件", notes="勾选法规清单进行关联平台件")
+	@PostMapping(value = "/listPlatform")
+	public Result<?> listPlatform(@RequestBody Map<String,Object> params) {
+		Map<String, Object> map = projectLibraryBaseService.listPlatform(params);
+		return Result.OK(params.get("cut").toString(),map);
+	}
+	/**
+	 * 不勾选法规清单进行关联平台件
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "不勾选法规清单进行关联平台件")
+	@ApiOperation(value="不勾选法规清单进行关联平台件", notes="不勾选法规清单进行关联平台件")
+	@PostMapping(value = "/listPlatformAll")
+	public Result<?> listPlatformAll(@RequestBody Map<String,Object> params) {
+		Map<String, Object> mapList = projectLibraryBaseService.listPlatformAll(params);
+		return Result.OK(params.get("cut").toString(),mapList);
+	}
 
     /**
 	 * 列表查询
@@ -170,6 +205,18 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
 		return Result.OK(cut,data);
 	}
 
+	@AutoLog(value = "待办中心-项目详情")
+	@ApiOperation(value="待办中心-项目详情", notes="待办中心-项目详情")
+	@GetMapping(value = "/queryByIdFlow")
+	public Result<?> queryByIdFlow(@RequestParam(name="id",required=true) String id,
+							   @RequestParam(name="cut",required=true) String cut) {
+		List<ProjectLibraryBase> data = projectLibraryBaseService.queryByIdFlow(id,cut);
+			if(data==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cut,data);
+	}
+
     /**
     * 导出excel
     *

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/LawsInventoryPlatformEO.java

@@ -0,0 +1,76 @@
+package com.jero.modules.project.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+
+/**
+ * @Description: 车型项目库法规清单关联平台件表
+ * @Author: jero-boot
+ * @Date:   2023-09-19
+ * @Version: V1.0
+ */
+@Data
+@TableName("laws_inventory_platform")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="laws_inventory_platform对象", description="车型项目库法规清单关联平台件表")
+public class LawsInventoryPlatformEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+
+	/**车型项目库法规清单id*/
+	@Excel(name = "车型项目库法规清单id", width = 15)
+    @ApiModelProperty(value = "车型项目库法规清单id")
+    private java.lang.String lawsInventoryId;
+
+	/**平台件项目库法规清单id*/
+	@Excel(name = "平台件项目库法规清单id", width = 15)
+    @ApiModelProperty(value = "平台件项目库法规清单id")
+    private java.lang.String platformLawsInventoryId;
+
+	@TableField(exist = false)
+    @ApiModelProperty(value = "平台件项目库法规清单ids")
+    private java.lang.String platformLawsInventoryIds;
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOEnPlatform.java

@@ -0,0 +1,218 @@
+package com.jero.modules.project.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+
+/**
+ * @Description: 认证清单工程接口人和责任人导出类
+ * @Author: jero-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("project_certification_inventory")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="project_certification_inventory对象", description="项目库-认证清单表")
+public class ProjectCertificationInventoryDutyEnginnerEOEnPlatform implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    /**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+    /**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+    /**更新日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+    /**类别*/
+    @Excel(name = "Category", width = 20)
+    @ApiModelProperty(value = "类别")
+    private String category;
+
+    /**检验项目*/
+    @Excel(name = "Inspection Items", width = 20)
+    @ApiModelProperty(value = "检验项目")
+    private String inspectionItem;
+
+    /**配置项*/
+    @ApiModelProperty(value = "配置项")
+    @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4")
+    private String configItem;
+
+    /**WVTA ID*/
+    @Excel(name = "WVTA ID", width = 20)
+    @ApiModelProperty(value = "WVTA ID")
+    private String wvtaId;
+
+    /**标准编号*/
+    @Excel(name = "Standard No", width = 20)
+    @ApiModelProperty(value = "标准编号")
+    private String serialNumber;
+
+    /**责任领域*/
+    @ApiModelProperty(value = "责任领域")
+    private String dutyTerritory;
+    /**责任领域名称**/
+    @Excel(name = "Responsible Field", width = 20)
+    @TableField(exist = false)
+    private String dutyTerritoryName;
+    /**责任领域名称-英文**/
+    @TableField(exist = false)
+    private String dutyTerritoryNameEn;
+
+    /**工程接口人*/
+    @ApiModelProperty(value = "工程接口人")
+    private String sdt;
+    /**工程接口人名称**/
+    @Excel(name = "Eng. Interface", width = 20)
+    @TableField(exist = false)
+    private String sdtName;
+
+    /**责任人*/
+    @ApiModelProperty(value = "责任人")
+    private String dutyPerson;
+    /**责任人名称**/
+    @Excel(name = "Assignee", width = 20)
+    @TableField(exist = false)
+    private String dutyPersonName;
+
+    /**交付物模板*/
+    @ApiModelProperty(value = "交付物模板")
+    private String deliverableTemplate;
+    /**交付物模板名称**/
+    @TableField(exist = false)
+    @Excel(name = "Deliverable Template", width = 40)
+    private String deliverableTemplateName;
+
+    /**交付物类型*/
+    @ApiModelProperty(value = "交付物类型")
+    private String deliverableType;
+    // 交付物类型名称
+    @Excel(name = "Deliverable Type", width = 20)
+    @TableField(exist = false)
+    private String deliverableTypeName;
+    // 交付物类型名称-英文
+    @TableField(exist = false)
+    private String deliverableTypeNameEn;
+
+    /**交付物*/
+//	@Excel(name = "交付物", width = 15)
+    @ApiModelProperty(value = "交付物")
+    private String deliverable;
+
+    /**文档库id*/
+//	@Excel(name = "文档库id", width = 15)
+    @ApiModelProperty(value = "文档库id")
+    private String bussDocumentLibraryId;
+
+
+
+    /**交付结果*/
+    @Excel(name = "Deliverables Result", width = 20)
+    @ApiModelProperty(value = "交付结果")
+    private String deliveryResult;
+
+    /**截止日期*/
+    @Excel(name = "Due Date", width = 20, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "截止日期")
+    private java.util.Date endTime;
+
+    /**流程状态*/
+    @ApiModelProperty(value = "流程状态")
+    private String flowStatus;
+    // 流程状态展示名称
+    @Excel(name = "Process Status", width = 20)
+    @TableField(exist = false)
+    private String flowStatusName;
+
+    /**报告编号*/
+//    @Excel(name = "Report No", width = 20)
+    @ApiModelProperty(value = "报告编号")
+    private String reportNumber;
+
+    /**产品型号*/
+//    @Excel(name = "Product Model", width = 20)
+    @ApiModelProperty(value = "产品型号")
+    private String productModel;
+
+    /**生产企业名称*/
+//    @Excel(name = "Name Of Manufacturer", width = 40)
+    @ApiModelProperty(value = "生产企业名称")
+    private String productionEnterpriseName;
+
+    /**认证进度*/
+
+    @ApiModelProperty(value = "认证进度")
+    private String certificationProgress;
+
+    /**认证进度展示名称**/
+    @TableField(exist = false)
+//    @Excel(name = "Homologation Progress", width = 40)
+    private String certificationProgress_dictText;
+
+    //	@Excel(name = "认证进度备注", width = 15)
+    @ApiModelProperty(value = "认证进度备注")
+    private String certificationProgressRemark;
+
+    /**项目库id*/
+    @ApiModelProperty(value = "项目库id")
+    private String projectLibraryId;
+
+    @TableField(exist = false)
+    private String cut;
+
+    @TableField(exist = false)
+    private String ids;
+
+    @TableField(exist = false)
+    private String roleCode;
+
+    /**值类型，对应SysCategoryValueTypeEnum中value**/
+    @TableField(exist = false)
+    private String valueType;
+
+    @TableField(exist = false)
+    private String excelName;
+
+    //    @Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd")
+    @TableField(exist = false)
+    private String endTimeStr;
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOPlatform.java

@@ -0,0 +1,218 @@
+package com.jero.modules.project.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * @Description: 认证清单工程接口人和责任人导出类
+ * @Author: jero-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("project_certification_inventory")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="project_certification_inventory对象", description="项目库-认证清单表")
+public class ProjectCertificationInventoryDutyEnginnerEOPlatform implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+	/**类别*/
+	@Excel(name = "类别", width = 20)
+    @ApiModelProperty(value = "类别")
+    private String category;
+
+	/**检验项目*/
+	@Excel(name = "检验项目", width = 20)
+    @ApiModelProperty(value = "检验项目")
+    private String inspectionItem;
+
+	/**配置项*/
+    @ApiModelProperty(value = "配置项")
+    @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4")
+    private String configItem;
+
+	/**WVTA ID*/
+	@Excel(name = "WVTA ID", width = 20)
+    @ApiModelProperty(value = "WVTA ID")
+    private String wvtaId;
+
+	/**标准编号*/
+	@Excel(name = "标准编号", width = 20)
+    @ApiModelProperty(value = "标准编号")
+    private String serialNumber;
+
+	/**责任领域*/
+    @ApiModelProperty(value = "责任领域")
+    private String dutyTerritory;
+    /**责任领域名称**/
+    @Excel(name = "责任领域", width = 20)
+    @TableField(exist = false)
+    private String dutyTerritoryName;
+    /**责任领域名称-英文**/
+    @TableField(exist = false)
+    private String dutyTerritoryNameEn;
+
+    /**工程接口人*/
+    @ApiModelProperty(value = "工程接口人")
+    private String sdt;
+    /**工程接口人名称**/
+    @Excel(name = "工程接口人", width = 20)
+    @TableField(exist = false)
+    private String sdtName;
+
+    /**责任人*/
+    @ApiModelProperty(value = "责任人")
+    private String dutyPerson;
+    /**责任人名称**/
+    @Excel(name = "责任人", width = 20)
+    @TableField(exist = false)
+    private String dutyPersonName;
+
+    /**交付物模板*/
+    @ApiModelProperty(value = "交付物模板")
+    private String deliverableTemplate;
+    /**交付物模板名称**/
+    @TableField(exist = false)
+    @Excel(name = "交付物模板", width = 20)
+    private String deliverableTemplateName;
+
+    /**交付物类型*/
+    @ApiModelProperty(value = "交付物类型")
+    private String deliverableType;
+    // 交付物类型名称
+    @Excel(name = "交付物类型", width = 20)
+    @TableField(exist = false)
+    private String deliverableTypeName;
+    // 交付物类型名称-英文
+    @TableField(exist = false)
+    private String deliverableTypeNameEn;
+
+	/**交付物*/
+//	@Excel(name = "交付物", width = 15)
+    @ApiModelProperty(value = "交付物")
+    private String deliverable;
+
+	/**文档库id*/
+//	@Excel(name = "文档库id", width = 15)
+    @ApiModelProperty(value = "文档库id")
+    private String bussDocumentLibraryId;
+
+
+
+	/**交付结果*/
+	@Excel(name = "交付结果", width = 20)
+    @ApiModelProperty(value = "交付结果")
+    private String deliveryResult;
+
+	/**截止日期*/
+	@Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "截止日期")
+    private Date endTime;
+	/**流程状态*/
+    @ApiModelProperty(value = "流程状态")
+    private String flowStatus;
+    // 流程状态展示名称
+    @Excel(name = "流程状态", width = 20)
+    @TableField(exist = false)
+    private String flowStatusName;
+
+	/**报告编号*/
+//	@Excel(name = "报告编号", width = 20)
+    @ApiModelProperty(value = "报告编号")
+    private String reportNumber;
+
+	/**产品型号*/
+//	@Excel(name = "产品型号", width = 20)
+    @ApiModelProperty(value = "产品型号")
+    private String productModel;
+
+	/**生产企业名称*/
+//	@Excel(name = "生产企业名称", width = 20)
+    @ApiModelProperty(value = "生产企业名称")
+    private String productionEnterpriseName;
+
+	/**认证进度*/
+
+    @ApiModelProperty(value = "认证进度")
+    private String certificationProgress;
+
+	/**认证进度展示名称**/
+//    @Excel(name = "认证进度", width = 20)
+	@TableField(exist = false)
+    private String certificationProgress_dictText;
+
+//	@Excel(name = "认证进度备注", width = 15)
+    @ApiModelProperty(value = "认证进度备注")
+    private String certificationProgressRemark;
+
+    /**项目库id*/
+    @ApiModelProperty(value = "项目库id")
+    private String projectLibraryId;
+
+    @TableField(exist = false)
+    private String cut;
+
+    @TableField(exist = false)
+    private String ids;
+
+    @TableField(exist = false)
+    private String roleCode;
+
+    /**值类型，对应SysCategoryValueTypeEnum中value**/
+    @TableField(exist = false)
+    private String valueType;
+
+    @TableField(exist = false)
+    private String excelName;
+
+//    @Excel(name = "*截止日期", width = 20, format = "yyyy-MM-dd")
+    @TableField(exist = false)
+    private String endTimeStr;
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java

@@ -1,24 +1,22 @@
 package com.jero.modules.project.entity;
 
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
 import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -261,4 +259,8 @@ public class ProjectCertificationInventoryEO implements Serializable {
     /**一级责任领域**/
     @TableField(exist = false)
     private String firstLevelDutyTerritory;
+
+    @ApiModelProperty(value = "关联平台件数据")
+    @TableField(exist = false)
+    private List<ProjectCertificationInventoryEO> projectCertificationInventoryEOS;
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEnPlatform.java

@@ -0,0 +1,224 @@
+package com.jero.modules.project.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+
+/**
+ * @Description: 项目库-认证清单表
+ * @Author: jero-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("project_certification_inventory")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="project_certification_inventory对象", description="项目库-认证清单表")
+public class ProjectCertificationInventoryEOEnPlatform implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    /**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+    /**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+    /**更新日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+    /**类别*/
+    @Excel(name = "Category", width = 20)
+    @ApiModelProperty(value = "类别")
+    private String category;
+
+    /**检验项目*/
+    @Excel(name = "Inspection Items", width = 20)
+    @ApiModelProperty(value = "检验项目")
+    private String inspectionItem;
+
+    /**配置项*/
+    @ApiModelProperty(value = "配置项")
+    @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4")
+    private String configItem;
+
+    /**认证类型*/
+    @Excel(name = "Certification Type", width = 20)
+    @ApiModelProperty(value = "认证类型")
+    @TableField(exist = false)
+    private String attestationTypeName;
+
+    /**WVTA ID*/
+    @Excel(name = "WVTA ID", width = 20)
+    @ApiModelProperty(value = "WVTA ID")
+    private String wvtaId;
+
+    /**标准编号*/
+    @Excel(name = "Standard No", width = 20)
+    @ApiModelProperty(value = "标准编号")
+    private String serialNumber;
+
+    /**责任领域*/
+    @ApiModelProperty(value = "责任领域")
+    private String dutyTerritory;
+    /**责任领域名称**/
+    @Excel(name = "Responsible Field", width = 20)
+    @TableField(exist = false)
+    private String dutyTerritoryName;
+    /**责任领域名称-英文**/
+    @TableField(exist = false)
+    private String dutyTerritoryNameEn;
+
+    /**工程接口人*/
+    @ApiModelProperty(value = "工程接口人")
+    private String sdt;
+    /**工程接口人名称**/
+    @Excel(name = "Eng. Interface", width = 20)
+    @TableField(exist = false)
+    private String sdtName;
+
+    /**责任人*/
+    @ApiModelProperty(value = "责任人")
+    private String dutyPerson;
+    /**责任人名称**/
+    @Excel(name = "Assignee", width = 20)
+    @TableField(exist = false)
+    private String dutyPersonName;
+
+    /**交付物模板*/
+    @ApiModelProperty(value = "交付物模板")
+    private String deliverableTemplate;
+    /**交付物模板名称**/
+    @TableField(exist = false)
+    @Excel(name = "Deliverable Template", width = 40)
+    private String deliverableTemplateName;
+
+    /**交付物类型*/
+    @ApiModelProperty(value = "交付物类型")
+    private String deliverableType;
+    // 交付物类型名称
+    @Excel(name = "Deliverable Type", width = 20)
+    @TableField(exist = false)
+    private String deliverableTypeName;
+    // 交付物类型名称-英文
+    @TableField(exist = false)
+    private String deliverableTypeNameEn;
+
+    /**交付物*/
+//	@Excel(name = "交付物", width = 15)
+    @ApiModelProperty(value = "交付物")
+    private String deliverable;
+
+    /**文档库id*/
+//	@Excel(name = "文档库id", width = 15)
+    @ApiModelProperty(value = "文档库id")
+    private String bussDocumentLibraryId;
+
+
+
+    /**交付结果*/
+    @Excel(name = "Deliverables Result", width = 20)
+    @ApiModelProperty(value = "交付结果")
+    private String deliveryResult;
+
+    /**截止日期*/
+    @Excel(name = "Due Date", width = 20, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "截止日期")
+    private java.util.Date endTime;
+
+    /**流程状态*/
+    @ApiModelProperty(value = "流程状态")
+    private String flowStatus;
+    // 流程状态展示名称
+    @Excel(name = "Process Status", width = 20)
+    @TableField(exist = false)
+    private String flowStatusName;
+
+    /**报告编号*/
+    @Excel(name = "Report No", width = 20)
+    @ApiModelProperty(value = "报告编号")
+    private String reportNumber;
+
+    /**产品型号*/
+    @Excel(name = "Product Model", width = 20)
+    @ApiModelProperty(value = "产品型号")
+    private String productModel;
+
+    /**生产企业名称*/
+    @Excel(name = "Name Of Manufacturer", width = 40)
+    @ApiModelProperty(value = "生产企业名称")
+    private String productionEnterpriseName;
+
+    /**认证进度*/
+
+    @ApiModelProperty(value = "认证进度")
+    private String certificationProgress;
+
+    /**认证进度展示名称**/
+    @TableField(exist = false)
+    private String certificationProgress_dictText;
+
+    //	@Excel(name = "认证进度备注", width = 15)
+    @ApiModelProperty(value = "认证进度备注")
+    private String certificationProgressRemark;
+
+    /**项目库id*/
+    @ApiModelProperty(value = "项目库id")
+    private String projectLibraryId;
+
+    @TableField(exist = false)
+    private String cut;
+
+    @TableField(exist = false)
+    private String ids;
+
+    @TableField(exist = false)
+    private String roleCode;
+
+    /**值类型，对应SysCategoryValueTypeEnum中value**/
+    @TableField(exist = false)
+    private String valueType;
+
+    @TableField(exist = false)
+    private String excelName;
+
+    //    @Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd")
+    @TableField(exist = false)
+    private String endTimeStr;
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOPlatform.java

@@ -0,0 +1,264 @@
+package com.jero.modules.project.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * @Description: 项目库-认证清单表
+ * @Author: jero-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("project_certification_inventory")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="project_certification_inventory对象", description="项目库-认证清单表")
+public class ProjectCertificationInventoryEOPlatform implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+	/**类别*/
+	@Excel(name = "类别", width = 20)
+    @ApiModelProperty(value = "类别")
+    private String category;
+
+	/**检验项目*/
+	@Excel(name = "检验项目", width = 20)
+    @ApiModelProperty(value = "检验项目")
+    private String inspectionItem;
+
+	/**配置项*/
+    @ApiModelProperty(value = "配置项")
+    @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4")
+    private String configItem;
+
+    /**认证类型名称**/
+    @Excel(name = "认证类型", width = 20)
+    @TableField(exist = false)
+    private String attestationTypeName;
+
+	/**WVTA ID*/
+	@Excel(name = "WVTA ID", width = 20)
+    @ApiModelProperty(value = "WVTA ID")
+    private String wvtaId;
+
+	/**标准编号*/
+	@Excel(name = "标准编号", width = 20)
+    @ApiModelProperty(value = "标准编号")
+    private String serialNumber;
+
+	/**责任领域*/
+    @ApiModelProperty(value = "责任领域")
+    private String dutyTerritory;
+    /**责任领域名称**/
+    @Excel(name = "责任领域", width = 20)
+    @TableField(exist = false)
+    private String dutyTerritoryName;
+    /**责任领域名称-英文**/
+    @TableField(exist = false)
+    private String dutyTerritoryNameEn;
+
+    /**责任部门*/
+    @ApiModelProperty(value = "责任部门")
+    private String dutyDepart;
+    /**工程接口人*/
+    @ApiModelProperty(value = "工程接口人")
+    private String sdt;
+    /**工程接口人名称**/
+    @Excel(name = "工程接口人", width = 20)
+    @TableField(exist = false)
+    private String sdtName;
+
+    /**责任人*/
+    @ApiModelProperty(value = "责任人")
+    private String dutyPerson;
+    /**责任人名称**/
+    @Excel(name = "责任人", width = 20)
+    @TableField(exist = false)
+    private String dutyPersonName;
+
+    /**交付物模板*/
+    @ApiModelProperty(value = "交付物模板")
+    private String deliverableTemplate;
+    /**交付物模板名称**/
+    @TableField(exist = false)
+    @Excel(name = "交付物模板", width = 20)
+    private String deliverableTemplateName;
+
+    /**交付物类型*/
+    @ApiModelProperty(value = "交付物类型")
+    private String deliverableType;
+    // 交付物类型名称
+    @Excel(name = "交付物类型", width = 20)
+    @TableField(exist = false)
+    private String deliverableTypeName;
+    // 交付物类型名称-英文
+    @TableField(exist = false)
+    private String deliverableTypeNameEn;
+
+	/**交付物*/
+//	@Excel(name = "交付物", width = 15)
+    @ApiModelProperty(value = "交付物")
+    private String deliverable;
+
+	/**文档库id*/
+//	@Excel(name = "文档库id", width = 15)
+    @ApiModelProperty(value = "文档库id")
+    private String bussDocumentLibraryId;
+
+
+
+	/**交付结果*/
+	@Excel(name = "交付结果", width = 20)
+    @ApiModelProperty(value = "交付结果")
+    private String deliveryResult;
+
+	/**截止日期*/
+	@Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "截止日期")
+    private Date endTime;
+	/**流程状态*/
+    @ApiModelProperty(value = "流程状态")
+    private String flowStatus;
+    // 流程状态展示名称
+    @Excel(name = "流程状态", width = 20)
+    @TableField(exist = false)
+    private String flowStatusName;
+
+	/**报告编号*/
+	@Excel(name = "报告编号", width = 20)
+    @ApiModelProperty(value = "报告编号")
+    private String reportNumber;
+
+	/**产品型号*/
+	@Excel(name = "产品型号", width = 20)
+    @ApiModelProperty(value = "产品型号")
+    private String productModel;
+
+	/**生产企业名称*/
+	@Excel(name = "生产企业名称", width = 20)
+    @ApiModelProperty(value = "生产企业名称")
+    private String productionEnterpriseName;
+
+	/**认证进度*/
+    @ApiModelProperty(value = "认证进度")
+    private String certificationProgress;
+
+    // 认证进度排序字段
+    @TableField(exist = false)
+    private String certificationProgressNumber;
+
+	/**认证进度展示名称**/
+	@TableField(exist = false)
+    private String certificationProgress_dictText;
+
+//	@Excel(name = "认证进度备注", width = 15)
+    @ApiModelProperty(value = "认证进度备注")
+    private String certificationProgressRemark;
+
+    /**项目库id*/
+    @ApiModelProperty(value = "项目库id")
+    private String projectLibraryId;
+
+    @TableField(exist = false)
+    private String cut;
+
+    @TableField(exist = false)
+    private String ids;
+
+    @TableField(exist = false)
+    private String roleCode;
+
+    /**值类型，对应SysCategoryValueTypeEnum中value**/
+    @TableField(exist = false)
+    private String valueType;
+
+    @TableField(exist = false)
+    private String excelName;
+
+//    @Excel(name = "*截止日期", width = 20, format = "yyyy-MM-dd")
+    @TableField(exist = false)
+    private String endTimeStr;
+
+    @TableField(exist = false)
+    private String reasonForReturn;
+
+    //排序（1->正序， 2->倒序）
+    @TableField(exist = false)
+    private String orderBy;
+
+    //排序字段
+    @TableField(exist = false)
+    private String orderByField;
+
+    /**清单校核截止时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "清单校核截止时间")
+    private Date inventoryVerifyEndTime;
+
+    /**责任确认截止时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "责任确认截止时间")
+    private Date taskConfirmEndTime;
+
+    /**认证类型*/
+    @ApiModelProperty(value = "认证类型")
+    private String attestationType;
+
+    /**一级责任领域**/
+    @TableField(exist = false)
+    private String firstLevelDutyTerritory;
+
+    @ApiModelProperty(value = "关联平台件数据")
+    @TableField(exist = false)
+    private List<ProjectCertificationInventoryEOPlatform> projectCertificationInventoryEOS;
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java

@@ -1,12 +1,10 @@
 package com.jero.modules.project.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -17,6 +15,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -187,6 +186,10 @@ public class ProjectLawsInventoryEO implements Serializable {
     @ApiModelProperty(value = "法规工程师名称")
     private String regulationOwnerName;//法规工程师名称
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "法规工程师名称（前端指定要的）")
+    private String regulationOwnerIdName;//法规工程师名称（前端指定要的）
+
 	/**认证工程师id*/
     @ApiModelProperty(value = "认证工程师id")
     private String homologationEngineerId;
@@ -538,4 +541,13 @@ public class ProjectLawsInventoryEO implements Serializable {
     /**一级责任领域**/
     @TableField(exist = false)
     private String firstLevelDutyTerritory;
+
+    @TableField(exist = false)
+    private String projectName;//项目名称
+
+    @TableField(exist = false)
+    private List<ProjectLawsInventoryEO> projectLawsInventoryEOS;
+
+    @TableField(exist = false)
+    private String platformIds;//平台件数据id
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java

@@ -161,6 +161,9 @@ public class ProjectLibraryBase implements Comparable<ProjectLibraryBase> {
     @TableField(exist = false)
     private String projectNameCn;
 
+    @ApiModelProperty(value = "平台件数据标识，platform = YES，为平台件数据，platform为空是项目库数据")
+    private String platform;
+
     @Override
     public int compareTo(ProjectLibraryBase o) {
         if (!this.getProjectName().equals(o.getProjectName())) {

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowFlagEnum.java

@@ -0,0 +1,45 @@
+package com.jero.modules.project.enums;
+
+/**
+ * 任务状态枚举类
+ */
+public enum FlowFlagEnum {
+    DESIGN("设计符合性流程状态","design"),
+    VERIFY("验证符合性流程状态","verify"),
+    ;
+
+
+    String name;
+    String value;
+
+    private FlowFlagEnum(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public static String getTextByValue(String value) {
+        FlowFlagEnum[] values = values();
+        for (FlowFlagEnum taskStatusEnum : values) {
+            if (taskStatusEnum.value.equals(value)) {
+                return taskStatusEnum.name;
+            }
+        }
+        return null;
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java

@@ -0,0 +1,66 @@
+package com.jero.modules.project.enums;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * 消息类型枚举类
+ */
+public enum FlowStateEnum {
+    INCONFORMITY("不符合","Non-Compliance","Non-Compliance"),
+    TO_TRACK("待追踪","To be tracked","To be tracked"),
+    CONFORMITY("符合","Compliance","Compliance"),
+    UNINVOLVED("不涉及","NA","NA"),
+    LIST_TO_BE_RELEASED("清单待发布","List to be released","List to be released"),
+    LIST_TO_BE_CHECKED("任务待发起","Task to be initiated","List to be checked"),
+    REGULATORY_ENGINEER_RETURNS("法规工程师退回","Regulatory engineer returns","Regulatory engineer returns"),
+    REFUSAL_OF_RESPONSIBLE_PERSON("责任人拒绝","Refusal of responsible person","Duty Person Rejected"),
+    TASK_TO_BE_CONFIRMED("任务待确认","Task to be confirmed","Task to be confirmed"),
+    RESULTS_TO_BE_SUBMITTED("结果待提交","Results to be submitted","Results to be submitted"),
+    RESULTS_TO_BE_REVIEWED("结果待审查","Results to be reviewed","Results to be reviewed"),
+
+    ;
+
+    String nameCn;
+    String nameEn;
+    String value;
+
+    private FlowStateEnum(String nameCn, String nameEn, String value) {
+        this.nameCn = nameCn;
+        this.nameEn = nameEn;
+        this.value = value;
+    }
+
+    public String getNameCn() {
+        return nameCn;
+    }
+
+    public void setNameCn(String nameCn) {
+        this.nameCn = nameCn;
+    }
+
+    public String getNameEn() {
+        return nameEn;
+    }
+
+    public void setNameEn(String nameEn) {
+        this.nameEn = nameEn;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public static List<String> getValueInfo() {
+        List<String> result = new LinkedList<>();
+        FlowStateEnum[] values = values();
+        for (FlowStateEnum flowStateEnum : values) {
+            result.add(flowStateEnum.getValue());
+        }
+        return result;
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/LawsInventoryPlatformEOMapper.java

@@ -0,0 +1,17 @@
+package com.jero.modules.project.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.project.entity.LawsInventoryPlatformEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 车型项目库法规清单关联平台件表
+ * @Author: jero-boot
+ * @Date:   2023-09-19
+ * @Version: V1.0
+ */
+public interface LawsInventoryPlatformEOMapper extends BaseMapper<LawsInventoryPlatformEO> {
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProblemManagementEOMapper.java

@@ -1,11 +1,11 @@
 package com.jero.modules.project.mapper;
 
-import java.util.List;
-
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.modules.project.entity.ProblemManagementEO;
 import com.jero.modules.project.entity.ProjectLibraryBase;
 import org.apache.ibatis.annotations.Param;
-import com.jero.modules.project.entity.ProblemManagementEO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
 
 /**
  * @Description: 问题管理
@@ -17,4 +17,6 @@ public interface ProblemManagementEOMapper extends BaseMapper<ProblemManagementE
 
     List<ProjectLibraryBase> queryByIds(@Param("ids") String ids);
 
+    List<ProjectLibraryBase> queryByIdsProblem(@Param("ids") String ids);
+
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java

@@ -1,7 +1,6 @@
 package com.jero.modules.project.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.modules.project.entity.ProjectLibraryBase;
 import org.apache.ibatis.annotations.Param;
 
@@ -25,6 +24,8 @@ public interface ProjectLibraryBaseMapper extends BaseMapper<ProjectLibraryBase>
     /**根据id查询*/
     List<ProjectLibraryBase> queryById(String id);
 
+    List<ProjectLibraryBase> queryByIdFlow(String id);
+
     ProjectLibraryBase selectProjectName(@Param("projectLibraryId") String projectLibraryId);
 
     List<ProjectLibraryBase> getListByIds(@Param("idList") List<String> idList);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml

@@ -108,7 +108,7 @@
                 LEFT JOIN project_name_info pni ON ( pni.id = plb.project_name_id )
                 LEFT JOIN project_year_name_info pyni ON ( pyni.id = plb.year_name_id )
         WHERE
-            1=1
+            1=1 and plb.platform is null
             <if test="params.id != null and params.id != null">
                 and pli.stand_id = #{params.id}
             </if>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsInventoryPlatformEOMapper.xml

@@ -0,0 +1,14 @@
+<?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">
+<mapper namespace="com.jero.modules.project.mapper.LawsInventoryPlatformEOMapper">
+    <resultMap id="LawsInventoryPlatformEOResultMap" type="com.jero.modules.project.entity.LawsInventoryPlatformEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="laws_inventory_id" property="lawsInventoryId" />
+        <result column="platform_laws_inventory_id" property="platformLawsInventoryId" />
+    </resultMap>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml

@@ -62,6 +62,7 @@
         LEFT JOIN project_name_info pni ON pni.id = plb.project_name_id
         LEFT JOIN project_year_name_info pyni ON pyni.id = plb.year_name_id
         where
+        plb.platform is null
         <!--<if test="ncrTrackVO.projectLibraryId != null and ncrTrackVO.projectLibraryId != ''">
             plb.id =#{ncrTrackVO.projectLibraryId}
             and
@@ -90,7 +91,7 @@
             (pli.design_duty_id =#{ncrTrackVO.duty} or pli.prehomo_duty_id =#{ncrTrackVO.duty} or pli.verify_duty_id =#{ncrTrackVO.duty})
             and
         </if>-->
-        (
+        and(
         design_flow_status =#{ncrTrackVO.inconformity}
         or verify_flow_status =#{ncrTrackVO.inconformity}
         )
@@ -160,6 +161,7 @@
         LEFT JOIN project_name_info pni ON pni.id = plb.project_name_id
         LEFT JOIN project_year_name_info pyni ON pyni.id = plb.year_name_id
         where
+
         <if test="ncrTrackVO.projectLibraryId != null and ncrTrackVO.projectLibraryId != ''">
             plb.id =#{ncrTrackVO.projectLibraryId}
             and
@@ -192,6 +194,7 @@
         <foreach collection="list" index="index" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
+        and plb.platform is null
         order by pli.create_time desc
 
     </select>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml

@@ -52,6 +52,45 @@
         left join project_name_info as pni on  plb.project_name_id=pni.id
         left join sys_user as studiouser on plb.studio_engineer=studiouser.id
         left join project_year_name_info as pyni on plb.year_name_id=pyni.id
+        <where>
+            plb.platform is null
+            <if test="ids != null and ids !=''">
+                and plb.id in
+                <foreach collection="ids.split(',')" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+    <select id="queryByIdsProblem" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
+        select
+            plb.id,
+            plb.project_name_id,
+            pni.project_name as project_name,
+            pyni.id as year_name_id,
+            pyni.year_name,
+            plb.target_market,
+            plb.project_status,
+            plb.studio_engineer,
+            studiouser.username as studio_engineer_name,
+            plb.certification_engineer,
+            plb.vehicle_platform,
+            plb.digital_platform,
+            plb.ipd_info,
+            plb.vehicle_development_plan,
+            plb.attestation_plan,
+            plb.create_by,
+            plb.create_time,
+            plb.sys_org_code,
+            plb.update_by,
+            plb.update_time,
+            plb.parent_id,
+            plb.project_version,
+            plb.platform
+        from project_library_base as plb
+        left join project_name_info as pni on  plb.project_name_id=pni.id
+        left join sys_user as studiouser on plb.studio_engineer=studiouser.id
+        left join project_year_name_info as pyni on plb.year_name_id=pyni.id
         <where>
             <if test="ids != null and ids !=''">
                 plb.id in
@@ -60,5 +99,6 @@
                 </foreach>
             </if>
         </where>
+        order by plb.platform
     </select>
 </mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml

@@ -66,11 +66,16 @@
         <include refid="select_item"/>
 
         <where>
+        1=1
+            <if test="params.flag != 'quote'">
+                and plb.platform is null
+            </if>
+
             <if test="params.projectName != null and params.projectName != ''">
                 <!--搜索条件:项目名称,包含%,单独搜索-->
                 <choose>
                     <when test='params.projectName != null and params.projectName != "" and params.projectName.contains("%")'>
-                        ( pni.project_name like '%1%%' escape '1' or pni.project_name like '%1%%' escape '1')
+                        and ( pni.project_name like '%1%%' escape '1' or pni.project_name like '%1%%' escape '1')
                     </when>
                     <otherwise>
             <!--(pni.project_name like concat('%',#{params.projectName},'%') or pyni.year_name like concat('%',#{params.projectName},'%'))-->
@@ -127,14 +132,23 @@
                 and plb.brand = #{params.brand}
             </if>
         </where>
-        order by plb.sort desc, plb.create_time desc
+        <if test="params.flag = 'quote'">
+            order by plb.platform, plb.sort desc, plb.create_time desc
+        </if>
+        <if test="params.flag != 'quote'">
+            order by plb.sort desc, plb.create_time desc
+        </if>
+
     </select>
     <select id="queryMaimList" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
 
         <include refid="select_item"/>
 
         <where>
+            plb.platform is null
+            and(
             parent_id = '' or parent_id is null
+            )
         </where>
         order by  plb.create_time desc
     </select>
@@ -206,6 +220,7 @@
         <include refid="select_item"/>
 
         <where>
+            plb.platform is null
             <if test="projectLibraryBase.projectName != null and projectLibraryBase.projectName != ''">
                 <!--搜索条件:项目名称,包含%,单独搜索-->
                 <choose>
@@ -273,8 +288,18 @@
     <select id="queryById" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
         <include refid="select_item"/>
         <where>
+            plb.platform is null
             <if test="id != null and id != '' ">
-                plb.id=#{id}
+                and plb.id=#{id}
+            </if>
+        </where>
+        order by plb.create_time desc
+    </select>
+    <select id="queryByIdFlow" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
+        <include refid="select_item"/>
+        <where>
+            <if test="id != null and id != '' ">
+                and plb.id=#{id}
             </if>
         </where>
         order by plb.create_time desc
@@ -288,7 +313,7 @@
             LEFT JOIN project_name_info pni ON plb.project_name_id = pni.id
             LEFT JOIN project_year_name_info pyni ON plb.year_name_id = pyni.id
         WHERE
-            plb.id = #{projectLibraryId}
+            plb.id = #{projectLibraryId} and platform is null
     </select>
 
     <select id="getListByIds" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
@@ -298,6 +323,7 @@
         <foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
+        and plb.platform is null
         order by plb.create_time desc
     </select>
 </mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml

@@ -34,7 +34,9 @@
         	LEFT JOIN project_name_info AS pni ON plb.project_name_id = pni.id
         	LEFT JOIN project_year_name_info AS pyni ON plb.year_name_id = pyni.id
         	LEFT JOIN sys_dict_item AS sdi ON sdi.item_value = plb.target_market
-        	where plb.parent_id = #{parentId}
+        	where plb.platform is null and(
+        	plb.parent_id = #{parentId}
         	or plb.id = #{id}
+        	)
     </select>
 </mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/ILawsInventoryPlatformEOService.java

@@ -0,0 +1,67 @@
+package com.jero.modules.project.service;
+
+import com.jero.modules.project.entity.LawsInventoryPlatformEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 车型项目库法规清单关联平台件表
+ * @Author: jero-boot
+ * @Date:   2023-09-19
+ * @Version: V1.0
+ */
+public interface ILawsInventoryPlatformEOService extends IService<LawsInventoryPlatformEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param lawsInventoryPlatformEO
+	 * @return
+	 */
+    void add(LawsInventoryPlatformEO lawsInventoryPlatformEO);
+
+	/**
+	 * 批量保存
+	 * @param lawsInventoryPlatformEOList
+	 */
+	void addBatch(List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList);
+
+	/**
+	 * 更新
+	 *
+	 * @param lawsInventoryPlatformEO
+	 * @return
+	 */
+    void editById(LawsInventoryPlatformEO lawsInventoryPlatformEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    LawsInventoryPlatformEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<LawsInventoryPlatformEO> queryList();
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java

@@ -4,10 +4,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jero.common.api.vo.Result;
-import com.jero.common.system.vo.DictModel;
-import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.common.api.vo.Result;
+import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
 import com.jero.modules.system.entity.SysCategory;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysRole;
@@ -339,4 +338,11 @@ public interface IProjectCertificationInventoryEOService extends IService<Projec
 	 * @return
 	 */
 	Result<?> matchRelevantPeople(Map<String, Object> params);
+
+	/**
+	 * 勾选认证清单进行关联平台件
+	 * @param params
+	 * @return
+	 */
+	String listPlatform(Map<String, Object> params);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.itextpdf.text.DocumentException;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.enums.MessageTypeEnum;
-import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.feishu.vo.FeishuMsgVo;
 import com.jero.modules.project.entity.ProjectLawsInventoryEO;
@@ -323,4 +322,6 @@ public interface IProjectLawsInventoryEOService extends IService<ProjectLawsInve
 	 */
     void replacementUser(JSONObject json);
 	int checkUserRole(String projectLibraryId, String currentUserId, String lawsInventoryId);
+
+	List<ProjectLawsInventoryEO> queryPlatformList(String lawsInventoryId,String flowFlag,String cut);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java

@@ -70,6 +70,8 @@ public interface IProjectLibraryBaseService extends IService<ProjectLibraryBase>
 	 */
 	List<ProjectLibraryBase> queryById(String id,String cut);
 
+	List<ProjectLibraryBase> queryByIdFlow(String id,String cut);
+
     /**
 	 * 列表查询
 	 *
@@ -83,6 +85,20 @@ public interface IProjectLibraryBaseService extends IService<ProjectLibraryBase>
 	 * @return
 	 */
 	List<ProjectLibraryBase> queryPageList(Map<String, Object> params);
+
+	/**
+	 * 勾选法规清单进行关联平台件
+	 * @param params
+	 * @return
+	 */
+	Map<String,Object> listPlatform(Map<String, Object> params);
+
+	/**
+	 * 不勾选法规清单进行关联平台件
+	 * @param params
+	 * @return
+	 */
+	Map<String,Object> listPlatformAll(Map<String, Object> params);
 //	IPage<ProjectLibraryBase> queryPageList(Map<String, Object> params);
 
 	/**

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsInventoryPlatformEOServiceImpl.java

@@ -0,0 +1,119 @@
+package com.jero.modules.project.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.modules.project.entity.LawsInventoryPlatformEO;
+import com.jero.modules.project.mapper.LawsInventoryPlatformEOMapper;
+import com.jero.modules.project.service.ILawsInventoryPlatformEOService;
+import com.jero.modules.system.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description: 车型项目库法规清单关联平台件表
+ * @Author: jero-boot
+ * @Date:   2023-09-19
+ * @Version: V1.0
+ */
+@Service
+public class LawsInventoryPlatformEOServiceImpl extends ServiceImpl<LawsInventoryPlatformEOMapper, LawsInventoryPlatformEO> implements ILawsInventoryPlatformEOService {
+
+	/**
+	 * 保存
+	 *
+	 * @param lawsInventoryPlatformEO
+	 * @return
+	 */
+	@Override
+    public void add(LawsInventoryPlatformEO lawsInventoryPlatformEO) {
+        Date now = new Date();
+        lawsInventoryPlatformEO.setCreateTime(now);
+        lawsInventoryPlatformEO.setUpdateTime(now);
+        save(lawsInventoryPlatformEO);
+    }
+	/**
+	 * 批量保存
+	 *
+	 * @param lawsInventoryPlatformEOList
+	 * @return
+	 */
+	@Override
+    public void addBatch(List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList) {
+		if(!lawsInventoryPlatformEOList.isEmpty()){
+			List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
+			for (LawsInventoryPlatformEO lawsInventoryPlatformEO : lawsInventoryPlatformEOList) {
+				if(StringUtils.isNotBlank(lawsInventoryPlatformEO.getPlatformLawsInventoryIds())){
+					for (String platformLawsInventoryId : lawsInventoryPlatformEO.getPlatformLawsInventoryIds().split(",")) {
+						LawsInventoryPlatformEO inventoryPlatformEO = new LawsInventoryPlatformEO();
+						inventoryPlatformEO.setCreateTime(new Date());
+						inventoryPlatformEO.setUpdateTime(new Date());
+						inventoryPlatformEO.setLawsInventoryId(lawsInventoryPlatformEO.getLawsInventoryId());
+						inventoryPlatformEO.setPlatformLawsInventoryId(platformLawsInventoryId);
+						lawsInventoryPlatformEOS.add(inventoryPlatformEO);
+					}
+				}
+			}
+			if(!lawsInventoryPlatformEOS.isEmpty()){
+				this.saveBatch(lawsInventoryPlatformEOS);
+			}
+		}
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param lawsInventoryPlatformEO
+	 * @return
+	 */
+	@Override
+    public void editById(LawsInventoryPlatformEO lawsInventoryPlatformEO) {
+    	Date now = new Date();
+        lawsInventoryPlatformEO.setUpdateTime(now);
+    	saveOrUpdate(lawsInventoryPlatformEO);
+    }
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public void deleteById(String id) {
+        removeById(id);
+    }
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+    public void deleteByIds(List<String> ids) {
+        removeByIds(ids);
+    }
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public LawsInventoryPlatformEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<LawsInventoryPlatformEO> queryList() {
+        return list();
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProblemManagementEOServiceImpl.java

@@ -265,10 +265,12 @@ public class ProblemManagementEOServiceImpl extends ServiceImpl<ProblemManagemen
 
 	public String getMarket(String cut, List<DictModel> targetMarketList, ProjectLibraryBase projectLibraryBase) {
 		List<DictModel> dictModelList = new ArrayList<>();
-		for (String s : projectLibraryBase.getTargetMarket().split(",")) {
-			List<DictModel> dictModelListTemp = targetMarketList.stream()
-					.filter(e -> s.equals(e.getValue())).collect(Collectors.toList());
-			dictModelList.addAll(dictModelListTemp);
+		if(StringUtils.isNotBlank(projectLibraryBase.getTargetMarket())){
+			for (String s : projectLibraryBase.getTargetMarket().split(",")) {
+				List<DictModel> dictModelListTemp = targetMarketList.stream()
+						.filter(e -> s.equals(e.getValue())).collect(Collectors.toList());
+				dictModelList.addAll(dictModelListTemp);
+			}
 		}
 		String targetMarket = "";
 		if(dictModelList.size() != 0){

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationDirectoryEOServiceImpl.java

@@ -59,7 +59,7 @@ public class ProjectCertificationDirectoryEOServiceImpl extends ServiceImpl<Proj
 	 */
 	@Override
     public void add(ProjectCertificationDirectoryEO projectCertificationDirectoryEO) {
-		checkData(projectCertificationDirectoryEO.getProjectLibraryId(),null,projectCertificationDirectoryEO.getCut());
+		checkDataLaws(projectCertificationDirectoryEO.getProjectLibraryId(),null,projectCertificationDirectoryEO.getCut());
         Date now = new Date();
         projectCertificationDirectoryEO.setCreateTime(now);
         projectCertificationDirectoryEO.setUpdateTime(now);
@@ -75,7 +75,7 @@ public class ProjectCertificationDirectoryEOServiceImpl extends ServiceImpl<Proj
 	 */
 	@Override
     public void editById(ProjectCertificationDirectoryEO projectCertificationDirectoryEO) {
-		checkData(projectCertificationDirectoryEO.getProjectLibraryId(),projectCertificationDirectoryEO.getId(),projectCertificationDirectoryEO.getCut());
+		checkDataLaws(projectCertificationDirectoryEO.getProjectLibraryId(),projectCertificationDirectoryEO.getId(),projectCertificationDirectoryEO.getCut());
     	Date now = new Date();
         projectCertificationDirectoryEO.setUpdateTime(now);
     	saveOrUpdate(projectCertificationDirectoryEO);
@@ -90,7 +90,7 @@ public class ProjectCertificationDirectoryEOServiceImpl extends ServiceImpl<Proj
 	@Override
     public void deleteById(String id,String cut) {
 		ProjectCertificationDirectoryEO projectCertificationDirectoryEO = queryById(id);
-		checkData(projectCertificationDirectoryEO.getProjectLibraryId(),id,cut);
+		checkDataLaws(projectCertificationDirectoryEO.getProjectLibraryId(),id,cut);
         removeById(id);
     }
 
@@ -257,4 +257,23 @@ public class ProjectCertificationDirectoryEOServiceImpl extends ServiceImpl<Proj
 //		}
 		return true;
 	}
+	/**
+	 * 验证数据权限，只有法规工程师，并且创建人是当前登陆人，才能进行增、删、改操作。
+	 * @return
+	 */
+	public boolean checkDataLaws(String projectLibraryId,String id,String cut){
+		int roleCode = checkUserRole(projectLibraryId);
+		if(roleCode != Integer.parseInt(ProjectRoleEnum.REGULATI_ENGINEER.getValue())
+				&& roleCode != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())
+				&& roleCode != Integer.parseInt(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){
+			String message = "";
+			if(StringUtils.equals(cut, CutEnum.CN.getValue())){
+				message = "没有权限操作，只有法规工程师才可以操作。";
+			}else if(StringUtils.equals(cut, CutEnum.EN.getValue())){
+				message = "Only regulatory engineer can perform this operation.";
+			}
+			throw new JeroBootException(message);
+		}
+		return true;
+	}
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java

@@ -1,8 +1,5 @@
 package com.jero.modules.project.service.impl;
 
-import cn.afterturn.easypoi.excel.ExcelImportUtil;
-import cn.afterturn.easypoi.excel.entity.ImportParams;
-import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
 import cn.hutool.core.util.URLUtil;
 import cn.hutool.core.util.ZipUtil;
 import com.alibaba.fastjson.JSON;
@@ -14,20 +11,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.query.QueryGenerator;
-import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.DateUtils;
 import com.jero.common.util.oss.CosBootUtil;
 import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO;
 import com.jero.modules.authDummy.service.IAuthDummyInventoryBaseEOService;
 import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService;
-import com.jero.modules.cert.template.vo.ParamsInfoCnImport;
-import com.jero.modules.cert.template.vo.ParamsInfoEnImport;
-import com.jero.modules.document.controller.BussDocumentLibraryEOController;
 import com.jero.modules.document.entity.BussDocumentLibraryEO;
 import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper;
 import com.jero.modules.document.service.IBussDocumentLibraryEOService;
@@ -37,24 +31,49 @@ import com.jero.modules.feishu.enums.TemplateInfoEnum2;
 import com.jero.modules.feishu.service.IFeishuService;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
-import com.jero.modules.project.entity.*;
+import com.jero.modules.project.entity.LawsInventoryPlatformEO;
+import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEO;
+import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOEn;
 import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
+import com.jero.modules.project.entity.ProjectCertificationInventoryEOEn;
 import com.jero.modules.project.entity.ProjectCertificationInventoryLogEO;
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
 import com.jero.modules.project.entity.ProjectLibraryBase;
+import com.jero.modules.project.entity.ProjectLibraryRoleRelEO;
 import com.jero.modules.project.entity.ProjectRelatedPersonnel;
-import com.jero.modules.project.enums.*;
+import com.jero.modules.project.entity.ProjectUserPermission;
+import com.jero.modules.project.enums.CertificationFlowNodeEnum;
+import com.jero.modules.project.enums.CertificationInventoryFlowStatusEnum;
+import com.jero.modules.project.enums.CertificationProgressEnum;
+import com.jero.modules.project.enums.JumpLinkEnum;
+import com.jero.modules.project.enums.OperatorTypeEnum;
+import com.jero.modules.project.enums.PermissionDescriptionEnum;
+import com.jero.modules.project.enums.ProjectInventoryFieldEnum;
+import com.jero.modules.project.enums.ProjectMessageEnum;
+import com.jero.modules.project.enums.ProjectUserLocationEnum;
+import com.jero.modules.project.enums.ReviewResultEnum;
+import com.jero.modules.project.enums.RoleRelModelTypeEnum;
+import com.jero.modules.project.enums.TaskAffirmStatusEnum;
+import com.jero.modules.project.enums.TaskStatusEnum;
+import com.jero.modules.project.mapper.ProjectCertificationInventoryEOMapper;
 import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
 import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper;
-import com.jero.modules.project.service.*;
+import com.jero.modules.project.service.IProjectCertificationInventoryEOService;
+import com.jero.modules.project.service.IProjectCertificationInventoryLogEOService;
+import com.jero.modules.project.service.IProjectLawsInventoryEOService;
+import com.jero.modules.project.service.IProjectLibraryBaseService;
+import com.jero.modules.project.service.IProjectLibraryRoleRelEOService;
+import com.jero.modules.project.service.IProjectRelatedPersonnelService;
+import com.jero.modules.project.service.IProjectUserPermissionService;
 import com.jero.modules.split.common.FileUnZip;
-import com.jero.modules.system.enums.ProjectRoleEnum;
-import com.jero.modules.project.mapper.ProjectCertificationInventoryEOMapper;
 import com.jero.modules.system.entity.SysCategory;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysRole;
 import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.enums.ProjectRoleEnum;
 import com.jero.modules.system.enums.SysCategoryValueTypeEnum;
 import com.jero.modules.system.mapper.SysCategoryMapper;
+import com.jero.modules.system.mapper.SysDictItemMapper;
 import com.jero.modules.system.mapper.SysRoleMapper;
 import com.jero.modules.system.mapper.SysUserMapper;
 import com.jero.modules.system.service.IProjectUserDutyTerritoryService;
@@ -64,45 +83,69 @@ import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
 import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
 import com.jero.modules.todoCenter.entity.ProcessInfoEO;
-import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum;
 import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService;
 import com.jero.modules.todoCenter.service.IProcessInfoEOService;
 import com.jero.modules.wkflow.enums.FlowTypeEnum;
 import com.jero.modules.wkflow.service.IProcessHistoryEOService;
 import lombok.SneakyThrows;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FileUtils;
-import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.HSSFDateUtil;
+import org.apache.poi.hssf.usermodel.HSSFRichTextString;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.xssf.streaming.SXSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.SecurityUtils;
 import org.aspectj.util.FileUtil;
 import org.jeecgframework.poi.excel.ExcelExportUtil;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
-import org.joda.time.DateTime;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.BeanUtils;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
-
-import java.io.*;
-import java.text.*;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.text.Collator;
+import java.text.DateFormat;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.Collectors;
 
 import static com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl.copyFile;
 
@@ -187,6 +230,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 	private IProjectLibraryRoleRelEOService projectLibraryRoleRelEOService;
 	@Autowired
 	private IProcessHistoryEOService processHistoryEOService;
+	@Autowired
+	private LawsInventoryPlatformEOServiceImpl lawsInventoryPlatformEOService;
+	@Autowired
+	private SysDictItemMapper sysDictItemMapper;
 
 	/**
 	 * 保存
@@ -1508,7 +1555,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		pciQueryWrap.lambda().in(ProjectCertificationInventoryEO::getFlowStatus,flowStatusList);
 		List<ProjectCertificationInventoryEO> pciEoList = this.list(pciQueryWrap);
 		if(CollectionUtils.isNotEmpty(pciEoList)){
-			List<Date> inventoryVerifyEndTimeList = pciEoList.stream().map(ProjectCertificationInventoryEO::getInventoryVerifyEndTime).distinct().collect(Collectors.toList());
+			List<Date> inventoryVerifyEndTimeList = pciEoList.stream().filter(e->ObjectUtils.isNotEmpty(e.getInventoryVerifyEndTime()))
+					.map(ProjectCertificationInventoryEO::getInventoryVerifyEndTime).distinct().collect(Collectors.toList());
 			inventoryVerifyEndTimeList.add(inventoryVerifyEndTime);
 			Collections.sort(inventoryVerifyEndTimeList, (d1, d2) -> d1.compareTo(d2)); // 根据时间顺序排序
 			inventoryVerifyEndTime = inventoryVerifyEndTimeList.get(0);
@@ -1880,11 +1928,80 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			}
 		}
 		IPage<ProjectCertificationInventoryEO> pageList = this.page(page, queryWrapper);
+		//平台件数据处理
+		platformDispose(projectCertificationInventoryEO, pageList.getRecords());
+
+
+
 		this.disposeData(pageList.getRecords(),cut);
 		List<ProjectCertificationInventoryEO> records = this.hearSort(projectCertificationInventoryEO, pageList.getRecords());
 		pageList.setRecords(records);
 		return pageList;
 	}
+	private void platformDispose(ProjectCertificationInventoryEO projectCertificationInventoryEO, List<ProjectCertificationInventoryEO> result) {
+		List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList = new ArrayList<>();
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOS = new ArrayList<>();
+
+		if(!result.isEmpty()){
+			//认证清单ID
+			List<String> certificationInventoryIdList = result.stream().map(ProjectCertificationInventoryEO::getId).collect(Collectors.toList());
+			LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
+			wrapper.in(LawsInventoryPlatformEO::getLawsInventoryId,certificationInventoryIdList);
+			lawsInventoryPlatformEOList = lawsInventoryPlatformEOService.list(wrapper);
+			if(!lawsInventoryPlatformEOList.isEmpty()){
+				List<String> collect = lawsInventoryPlatformEOList.stream().map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).distinct().collect(Collectors.toList());
+				LambdaQueryWrapper<ProjectCertificationInventoryEO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+				lambdaQueryWrapper.in(ProjectCertificationInventoryEO::getId,collect);
+				projectCertificationInventoryEOS = this.list(lambdaQueryWrapper);//平台件清单
+			}
+		}
+		for (ProjectCertificationInventoryEO certificationInventoryEO : result) {
+			if(!projectCertificationInventoryEOS.isEmpty()){
+				List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
+				List<LawsInventoryPlatformEO> collect = lawsInventoryPlatformEOList.stream()
+						.filter(e -> certificationInventoryEO.getId().equals(e.getLawsInventoryId())).collect(Collectors.toList());
+				if(ObjectUtils.isNotEmpty(collect)){
+					List<String> platformLawsInventoryIdList = collect.stream()
+							.map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).distinct().collect(Collectors.toList());
+
+					List<ProjectCertificationInventoryEO> inventoryEOList = projectCertificationInventoryEOS.stream()
+							.filter(e -> platformLawsInventoryIdList.contains(e.getId())).collect(Collectors.toList());
+					certificationInventoryEO.setProjectCertificationInventoryEOS(inventoryEOList);
+
+					if(ObjectUtils.isNotEmpty(inventoryEOList)){
+						List<String> projectLibraryIdList = inventoryEOList.stream()
+								.map(ProjectCertificationInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList());
+						LambdaQueryWrapper<ProjectLibraryBase> wrapper = new LambdaQueryWrapper<>();
+						wrapper.in(ProjectLibraryBase::getId,projectLibraryIdList);
+						projectLibraryBaseList = projectLibraryBaseService.list(wrapper);
+					}
+
+				}
+
+
+				List<LawsInventoryPlatformEO> inventoryPlatformEOList = lawsInventoryPlatformEOList.stream()
+						.filter(e -> certificationInventoryEO.getId().equals(e.getLawsInventoryId())).collect(Collectors.toList());
+				if(!inventoryPlatformEOList.isEmpty()){
+					List<String> idList = inventoryPlatformEOList.stream()
+							.map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).collect(Collectors.toList());
+					List<ProjectCertificationInventoryEO> certificationInventoryEOS = projectCertificationInventoryEOS.stream()
+							.filter(e -> idList.contains(e.getId())).collect(Collectors.toList());
+
+					List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseList.stream()
+							.filter(e -> certificationInventoryEOS.get(0).getProjectLibraryId().equals(e.getId())).collect(Collectors.toList());
+					if(ObjectUtils.isNotEmpty(libraryBaseList)){
+						certificationInventoryEO.setConfigItem(libraryBaseList.get(0).getProjectNameId());
+					}
+
+					if(!certificationInventoryEOS.isEmpty()){
+						setProjectCertificationInventoryEO(certificationInventoryEOS.get(0),certificationInventoryEO);
+					}
+
+
+				}
+			}
+		}
+	}
 
 	/**
 	 * 表头排序
@@ -3511,8 +3628,13 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			throw new JeroBootException("无法获取项目库信息，项目库id为：" + projectLibraryId + " 请联系管理员！");
 		}
 
-		List<String> certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
-		List<SysUser> certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList);
+		List<SysUser> certificationEngineerList = new ArrayList<>();
+		List<String> certificationEngineerIdList = new ArrayList<>();
+		if(StringUtils.isNotBlank(projectLibraryBase.getCertificationEngineer())){
+			certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
+			certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList);
+		}
+
 		String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
 		String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
 
@@ -3635,6 +3757,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			log.error("studio-流程重置失败：" + ex.getMessage());
 			throw new JeroBootException("流程重置失败！");
 		}
+		//流程重置后，将平台件关联信息删除
+		LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.in(LawsInventoryPlatformEO::getLawsInventoryId,Arrays.asList(ids.split(",")));
+		lawsInventoryPlatformEOService.remove(wrapper);
 		return Result.OK("流程重置成功！");
 	}
 
@@ -4158,6 +4284,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		}
 
 		String configItem = json.getString("configItem");
+		String sdt = json.getString("sdt");//工程接口人
 		if(StringUtils.isEmpty(ids)){
 			throw new JeroBootException("请选择一个配置！");
 		}
@@ -4166,6 +4293,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = this.list(queryWrap);
 		projectCertificationInventoryEOList.forEach(certificationInventoryEO -> {
 			certificationInventoryEO.setConfigItem(configItem);
+			certificationInventoryEO.setSdt(sdt);
 		});
 
 		this.updateBatchById(projectCertificationInventoryEOList);
@@ -6804,4 +6932,407 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		return result;
 	}
 
+	/**
+	 * 勾选认证清单进行关联平台件
+	 *
+	 * @return
+	 */
+//	@Override
+//	public void listPlatform(Map<String,Object> params) {
+//		String ids = (String) params.get("ids");//认证清单id
+//		String projectLibraryIds = (String) params.get("projectLibraryIds");//平台件项目id
+//
+//		//认证清单数据
+//		LambdaQueryWrapper<ProjectCertificationInventoryEO> wrapper = new LambdaQueryWrapper<>();
+//		wrapper.in(ProjectCertificationInventoryEO::getId,Arrays.asList(ids.split(",")));
+//		List<ProjectCertificationInventoryEO> certificationInventoryEOList = this.list(wrapper);
+//
+//		//平台件项目对应的认证清单数据
+//		LambdaQueryWrapper<ProjectCertificationInventoryEO> wrapper1 = new LambdaQueryWrapper<>();
+//		wrapper1.in(ProjectCertificationInventoryEO::getProjectLibraryId,Arrays.asList(projectLibraryIds.split(",")));
+//		List<ProjectCertificationInventoryEO> certificationInventoryEOS = this.list(wrapper1);
+//
+//		if(!certificationInventoryEOS.isEmpty()){
+//			//平台件项目信息
+//			List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
+//			if(!certificationInventoryEOList.isEmpty()){
+//				List<String> projectIdList = certificationInventoryEOS.stream().map(ProjectCertificationInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList());
+//				LambdaQueryWrapper<ProjectLibraryBase> wrapper2 = new LambdaQueryWrapper<>();
+//				wrapper2.in(ProjectLibraryBase::getId,projectIdList);
+//				projectLibraryBaseList = projectLibraryBaseService.list(wrapper2);
+//			}
+//
+//			List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
+//
+//			List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = new ArrayList<>();
+//			for (ProjectCertificationInventoryEO projectCertificationInventoryEO : certificationInventoryEOList) {
+//				//类别
+//				String category = projectCertificationInventoryEO.getCategory();
+//				//检验项目
+//				String inspectionItem = projectCertificationInventoryEO.getInspectionItem();
+//				//配置项
+//				String configItem = projectCertificationInventoryEO.getConfigItem();
+//				//编号
+//				String serialNumber = projectCertificationInventoryEO.getSerialNumber();
+//				//责任领域
+//				String dutyTerritory = projectCertificationInventoryEO.getDutyTerritory();
+//
+//				List<ProjectCertificationInventoryEO> result = new ArrayList<>();
+//				//如果车型项目库中的配置项为空或为标配时，不去匹配直接关联
+//				if(StringUtils.isBlank(configItem) || "标配".equals(configItem)){
+//					if(!certificationInventoryEOS.isEmpty()){
+//						result = setData(certificationInventoryEOS, projectCertificationInventoryEO);
+//					}
+//				}else if(StringUtils.isNotBlank(configItem) && !"标配".equals(configItem)){
+//					//如果车型项目库中的配置项不为空且不为标配时，如果车型项目库认证清单的配置项与平台件认证清单的配置项不一致，则不再匹配
+//					//如果一致，则用类别，检验项目，编号，责任领域去做匹配
+//
+//					List<ProjectCertificationInventoryEO> projectCertificationInventoryEOS = new ArrayList<>();
+//					for (int i = 0; i < certificationInventoryEOS.size(); i++) {
+//						int finalI = i;
+//						List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseList.stream()
+//								.filter(e -> certificationInventoryEOS.get(finalI).getProjectLibraryId().equals(e.getId())).collect(Collectors.toList());
+//						//平台件项目库中的认证清单的配置项为平台件项目名称
+//						String configItemTemp = "";
+//						if(!libraryBaseList.isEmpty()){
+//							//配置项
+//							configItemTemp = libraryBaseList.get(0).getProjectNameId();
+//						}
+//						//类别
+//						String categoryTemp = certificationInventoryEOS.get(i).getCategory();
+//						//检验项目
+//						String inspectionItemTemp = certificationInventoryEOS.get(i).getInspectionItem();
+//						//编号
+//						String serialNumberTemp = certificationInventoryEOS.get(i).getSerialNumber();
+//						//责任领域
+//						String dutyTerritoryTemp = certificationInventoryEOS.get(i).getDutyTerritory();
+//
+//						if(configItem.equals(configItemTemp)
+//								&& category.equals(categoryTemp)
+//								&& inspectionItem.equals(inspectionItemTemp)
+//								&& serialNumber.equals(serialNumberTemp)
+//								&& dutyTerritory.equals(dutyTerritoryTemp)){
+//
+//							projectCertificationInventoryEOS.add(certificationInventoryEOS.get(i));
+//						}
+//					}
+//					if(!projectCertificationInventoryEOS.isEmpty()){
+//						result = setData(projectCertificationInventoryEOS, projectCertificationInventoryEO);
+//					}
+//				}
+//				if(!result.isEmpty()){
+//					this.saveOrUpdateBatch(result);
+//				}
+//			}
+//		}
+//	}
+
+	private List<ProjectCertificationInventoryEO> setData(List<ProjectCertificationInventoryEO> certificationInventoryEOS,
+						 ProjectCertificationInventoryEO projectCertificationInventoryEO) {
+		List<ProjectCertificationInventoryEO> projectCertificationInventoryEOS = new ArrayList<>();
+		//设置平台件认证清单数据
+		setProjectCertificationInventoryEO(certificationInventoryEOS.get(0), projectCertificationInventoryEO);
+		projectCertificationInventoryEOS.add(projectCertificationInventoryEO);
+
+		//如果车型项目库中的配置项为空或为标配时，不去匹配直接关联，此时一对多，一指的是车型库认证清单，多指的是平台件认证清单
+		//例：一条车型库认证清单对应3条平台件认证清单，此时需要复制两条项目库认证清单，将这两条认证清单中的交付物模板到生产企业名称
+		//的字段值替换为平台件认证清单的数据，原有的那条认证清单这部分数据也需要替换
+		for (int i = 1; i < certificationInventoryEOS.size(); i++) {
+			ProjectCertificationInventoryEO certificationInventoryEO = new ProjectCertificationInventoryEO();
+			BeanUtils.copyProperties(projectCertificationInventoryEO,certificationInventoryEO);
+			certificationInventoryEO.setId(UUID.randomUUID().toString().replace("-",""));
+			//设置平台件认证清单数据
+			setProjectCertificationInventoryEO(certificationInventoryEOS.get(i), certificationInventoryEO);
+			projectCertificationInventoryEOS.add(certificationInventoryEO);
+		}
+		return projectCertificationInventoryEOS;
+	}
+
+	private void setProjectCertificationInventoryEO(ProjectCertificationInventoryEO certificationInventoryEO,
+													ProjectCertificationInventoryEO projectCertificationInventoryEO) {
+		//类别  category
+		projectCertificationInventoryEO.setCategory(StringUtils.isNotEmpty(certificationInventoryEO.getCategory()) ? certificationInventoryEO.getCategory() : "");
+		//检验项目  inspectionItem
+		projectCertificationInventoryEO.setInspectionItem(StringUtils.isNotEmpty(certificationInventoryEO.getInspectionItem()) ? certificationInventoryEO.getInspectionItem() : "");
+		//认证类型  attestationType
+		projectCertificationInventoryEO.setAttestationType(StringUtils.isNotEmpty(certificationInventoryEO.getAttestationType()) ? certificationInventoryEO.getAttestationType() : "");
+		//WVTA ID  wvtaId
+		projectCertificationInventoryEO.setWvtaId(StringUtils.isNotEmpty(certificationInventoryEO.getWvtaId()) ? certificationInventoryEO.getWvtaId() : "");
+		//标准编号  serialNumber
+		projectCertificationInventoryEO.setSerialNumber(StringUtils.isNotEmpty(certificationInventoryEO.getSerialNumber()) ? certificationInventoryEO.getSerialNumber() : "");
+		//责任部门  dutyDepart
+		projectCertificationInventoryEO.setDutyDepart(StringUtils.isNotEmpty(certificationInventoryEO.getDutyDepart()) ? certificationInventoryEO.getDutyDepart() : "");
+		//责任领域  firstLevelDutyTerritory
+		projectCertificationInventoryEO.setFirstLevelDutyTerritory(StringUtils.isNotEmpty(certificationInventoryEO.getFirstLevelDutyTerritory()) ? certificationInventoryEO.getFirstLevelDutyTerritory() : "");
+		//工程接口人  sdt
+		projectCertificationInventoryEO.setSdt(StringUtils.isNotEmpty(certificationInventoryEO.getSdt()) ? certificationInventoryEO.getSdt() : "");
+		//责任人  dutyPerson
+		projectCertificationInventoryEO.setDutyPerson(StringUtils.isNotEmpty(certificationInventoryEO.getDutyPerson()) ? certificationInventoryEO.getDutyPerson() : "");
+
+		//交付物模板-deliverableTemplate
+		projectCertificationInventoryEO.setDeliverableTemplate(StringUtils.isNotEmpty(certificationInventoryEO.getDeliverableTemplate()) ? certificationInventoryEO.getDeliverableTemplate() : "");
+		//交付物类型-deliverableType
+		projectCertificationInventoryEO.setDeliverableType(StringUtils.isNotEmpty(certificationInventoryEO.getDeliverableType()) ? certificationInventoryEO.getDeliverableType() : "");
+		//交付结果-deliveryResult
+		projectCertificationInventoryEO.setDeliveryResult(StringUtils.isNotEmpty(certificationInventoryEO.getDeliveryResult()) ? certificationInventoryEO.getDeliveryResult() : "");
+		//截止日期-endTime
+		projectCertificationInventoryEO.setEndTime(certificationInventoryEO.getEndTime());
+		//流程状态-flowStatus
+		projectCertificationInventoryEO.setFlowStatus(StringUtils.isNotEmpty(certificationInventoryEO.getFlowStatus()) ? certificationInventoryEO.getFlowStatus() : "");
+		//报告编号-reportNumber
+		projectCertificationInventoryEO.setReportNumber(StringUtils.isNotEmpty(certificationInventoryEO.getReportNumber()) ? certificationInventoryEO.getReportNumber() : "");
+		//产品型号-productModel
+		projectCertificationInventoryEO.setProductModel(StringUtils.isNotEmpty(certificationInventoryEO.getProductModel()) ? certificationInventoryEO.getProductModel() : "");
+		//生产企业名称-productionEnterpriseName
+		projectCertificationInventoryEO.setProductionEnterpriseName(StringUtils.isNotEmpty(certificationInventoryEO.getProductionEnterpriseName()) ? certificationInventoryEO.getProductionEnterpriseName() : "");
+	}
+	/**
+	 * 勾选认证清单进行关联平台件
+	 *
+	 * @return
+	 */
+	@Override
+	public String listPlatform(Map<String,Object> params) {
+		String cut = (String) params.get("cut");//
+		String ids = (String) params.get("ids");//认证清单id
+		String projectLibraryIds = (String) params.get("projectLibraryIds");//平台件项目id
+
+		//认证清单数据
+		LambdaQueryWrapper<ProjectCertificationInventoryEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.in(ProjectCertificationInventoryEO::getId,Arrays.asList(ids.split(",")));
+		List<ProjectCertificationInventoryEO> certificationInventoryEOList = this.list(wrapper);
+
+		//平台件项目对应的认证清单数据
+		LambdaQueryWrapper<ProjectCertificationInventoryEO> wrapper1 = new LambdaQueryWrapper<>();
+		wrapper1.in(ProjectCertificationInventoryEO::getProjectLibraryId,Arrays.asList(projectLibraryIds.split(",")));
+		List<ProjectCertificationInventoryEO> certificationInventoryEOS = this.list(wrapper1);
+
+		//平台件项目信息
+		List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
+		if(!certificationInventoryEOList.isEmpty()){
+			List<String> projectIdList = certificationInventoryEOS.stream().map(ProjectCertificationInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList());
+			LambdaQueryWrapper<ProjectLibraryBase> wrapper2 = new LambdaQueryWrapper<>();
+			wrapper2.in(ProjectLibraryBase::getId,projectIdList);
+			projectLibraryBaseList = projectLibraryBaseService.list(wrapper2);
+		}
+		List<SysDictItem> sysDictItemList = sysDictItemMapper.selectItemsByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue());
+
+		List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
+
+		List<ProjectCertificationInventoryEO> result = new ArrayList<>();
+
+		List<ProjectCertificationInventoryEO> emptyList = new ArrayList<>();
+		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : certificationInventoryEOList) {
+			//类别
+			String category = projectCertificationInventoryEO.getCategory();
+			//检验项目
+			String inspectionItem = projectCertificationInventoryEO.getInspectionItem();
+			//配置项
+			String configItem = projectCertificationInventoryEO.getConfigItem();
+			//编号
+			String serialNumber = projectCertificationInventoryEO.getSerialNumber();
+			//责任领域
+			String dutyTerritory = projectCertificationInventoryEO.getDutyTerritory();
+
+			List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList = new ArrayList<>();
+			List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList = new ArrayList<>();
+
+			for (ProjectCertificationInventoryEO certificationInventoryEO : certificationInventoryEOS) {
+				List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseList.stream()
+						.filter(e -> certificationInventoryEO.getProjectLibraryId().equals(e.getId())).collect(Collectors.toList());
+				//平台件项目库中的认证清单的配置项为平台件项目名称
+				String configItemTemp = "";
+				if(!libraryBaseList.isEmpty()){
+					//配置项
+					configItemTemp = libraryBaseList.get(0).getProjectNameId();
+				}
+				//类别
+				String categoryTemp = certificationInventoryEO.getCategory();
+				//检验项目
+				String inspectionItemTemp = certificationInventoryEO.getInspectionItem();
+				//编号
+				String serialNumberTemp = certificationInventoryEO.getSerialNumber();
+				//责任领域
+				String dutyTerritoryTemp = certificationInventoryEO.getDutyTerritory();
+
+				if((StringUtils.isBlank(configItem) || "标配".equals(configItem))
+						&& category.equals(categoryTemp)
+						&& inspectionItem.equals(inspectionItemTemp)
+						&& serialNumber.equals(serialNumberTemp)
+						&& dutyTerritory.equals(dutyTerritoryTemp)){
+					//如果车型项目库中的配置项为空或为标配时，则用类别，检验项目，编号，责任领域去匹配，匹配上后将平台件信息添加到关联表
+					projectCertificationInventoryEOList.add(certificationInventoryEO);
+
+
+				}else if(StringUtils.isNotBlank(configItem) && !"标配".equals(configItem)){
+					//如果车型项目库中的配置项不为空且不为标配时，如果车型项目库认证清单的配置项与平台件认证清单的配置项不一致，则不再匹配
+					//如果一致，则用类别，检验项目，编号，责任领域去做匹配
+					if(configItem.equals(configItemTemp)
+							&& category.equals(categoryTemp)
+							&& inspectionItem.equals(inspectionItemTemp)
+							&& serialNumber.equals(serialNumberTemp)
+							&& dutyTerritory.equals(dutyTerritoryTemp)){
+						projectCertificationInventoryEOList.add(certificationInventoryEO);
+					}
+				}
+			}
+			if(projectCertificationInventoryEOList.isEmpty()){
+				emptyList.add(projectCertificationInventoryEO);
+			}
+
+			if(!projectCertificationInventoryEOList.isEmpty()){
+				setDataTemp(lawsInventoryPlatformEOS, projectCertificationInventoryEO, projectCertificationInventoryEOList.get(0));
+				if(projectCertificationInventoryEOList.size() > 1){
+					//往认证清单表中添加projectCertificationInventoryEOList.size()-1条数据
+					List<ProjectCertificationInventoryEO> list = new ArrayList<>();
+					for (int i = 1; i < projectCertificationInventoryEOList.size(); i++) {
+						ProjectCertificationInventoryEO projectCertificationInventoryEOTemp = new ProjectCertificationInventoryEO();
+						BeanUtils.copyProperties(projectCertificationInventoryEO,projectCertificationInventoryEOTemp);
+						projectCertificationInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", ""));
+						list.add(projectCertificationInventoryEOTemp);
+
+						setDataTemp(lawsInventoryPlatformEOS, projectCertificationInventoryEOTemp, projectCertificationInventoryEOList.get(i));
+					}
+					if(!list.isEmpty()){
+						result.addAll(list);
+					}
+				}
+			}
+		}
+		if(!result.isEmpty()){
+			this.saveBatch(result);
+		}
+		if(!lawsInventoryPlatformEOS.isEmpty()){
+			lawsInventoryPlatformEOService.saveBatch(lawsInventoryPlatformEOS);
+		}
+		//认证清单未匹配上平台件的提示语
+		String html = getMsg(cut, sysDictItemList, emptyList);
+		return html;
+	}
+
+	@NotNull
+	private String getMsg(String cut, List<SysDictItem> sysDictItemList, List<ProjectCertificationInventoryEO> emptyList) {
+		List<String> msgList = new ArrayList<>();
+		//未匹配上法规清单
+		if(ObjectUtils.isNotEmpty(emptyList)){
+			for (ProjectCertificationInventoryEO projectCertificationInventoryEO : emptyList) {
+				List<String> list = new LinkedList<>();
+				if(com.jero.modules.system.util.StringUtils.isNotBlank(projectCertificationInventoryEO.getDutyTerritory())){
+					for (String s : projectCertificationInventoryEO.getDutyTerritory().split(",")) {
+						List<SysDictItem> collect = sysDictItemList.stream().filter(e -> e.getItemValue().equals(s)).collect(Collectors.toList());
+						if(CutEnum.CN.getValue().equals(cut) && !collect.isEmpty()){
+							list.add(collect.get(0).getItemText());
+						}else if(CutEnum.EN.getValue().equals(cut) && !collect.isEmpty()){
+							list.add(collect.get(0).getEnName());
+						}
+					}
+				}
+				String serialNumber = projectCertificationInventoryEO.getSerialNumber();
+				String dutyTerritoryName = com.jero.modules.system.util.StringUtils.join(list,",");
+				String msg = "";
+				if(CutEnum.CN.getValue().equals(cut)){
+					msg = serialNumber+" "+dutyTerritoryName+"未匹配到数据";
+				}else{
+					msg = serialNumber+" "+dutyTerritoryName+" no data matched";
+				}
+				msgList.add(msg);
+			}
+		}
+		String html = "";
+		for (String s : msgList) {
+			html += s + "</br>";
+		}
+		return html;
+	}
+
+	private void setDataTemp(List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS,
+							 ProjectCertificationInventoryEO projectCertificationInventoryEO,
+							 ProjectCertificationInventoryEO certificationInventoryEO) {
+		LawsInventoryPlatformEO inventoryPlatformEO = new LawsInventoryPlatformEO();
+		inventoryPlatformEO.setCreateTime(new Date());
+		inventoryPlatformEO.setUpdateTime(new Date());
+		inventoryPlatformEO.setLawsInventoryId(projectCertificationInventoryEO.getId());
+		inventoryPlatformEO.setPlatformLawsInventoryId(certificationInventoryEO.getId());
+		lawsInventoryPlatformEOS.add(inventoryPlatformEO);
+	}
+//	@Override
+//	public void listPlatform(Map<String,Object> params) {
+//		String cut = (String) params.get("cut");//
+//		String ids = (String) params.get("ids");//认证清单id
+//		String projectLibraryIds = (String) params.get("projectLibraryIds");//平台件项目id
+//
+//		//认证清单数据
+//		LambdaQueryWrapper<ProjectCertificationInventoryEO> wrapper = new LambdaQueryWrapper<>();
+//		wrapper.in(ProjectCertificationInventoryEO::getId,Arrays.asList(ids.split(",")));
+//		List<ProjectCertificationInventoryEO> certificationInventoryEOList = this.list(wrapper);
+//
+//		//平台件项目对应的认证清单数据
+//		LambdaQueryWrapper<ProjectCertificationInventoryEO> wrapper1 = new LambdaQueryWrapper<>();
+//		wrapper1.in(ProjectCertificationInventoryEO::getProjectLibraryId,Arrays.asList(projectLibraryIds.split(",")));
+//		List<ProjectCertificationInventoryEO> certificationInventoryEOS = this.list(wrapper1);
+//
+//		//平台件项目信息
+//		List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
+//		if(!certificationInventoryEOList.isEmpty()){
+//			List<String> projectIdList = certificationInventoryEOS.stream().map(ProjectCertificationInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList());
+//			LambdaQueryWrapper<ProjectLibraryBase> wrapper2 = new LambdaQueryWrapper<>();
+//			wrapper2.in(ProjectLibraryBase::getId,projectIdList);
+//			projectLibraryBaseList = projectLibraryBaseService.list(wrapper2);
+//		}
+//
+//		List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
+//
+//		for (ProjectCertificationInventoryEO projectCertificationInventoryEO : certificationInventoryEOList) {
+//			//类别
+//			String category = projectCertificationInventoryEO.getCategory();
+//			//检验项目
+//			String inspectionItem = projectCertificationInventoryEO.getInspectionItem();
+//			//配置项
+//			String configItem = projectCertificationInventoryEO.getConfigItem();
+//			//编号
+//			String serialNumber = projectCertificationInventoryEO.getSerialNumber();
+//			//责任领域
+//			String dutyTerritory = projectCertificationInventoryEO.getDutyTerritory();
+//
+//			for (ProjectCertificationInventoryEO certificationInventoryEO : certificationInventoryEOS) {
+//				List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseList.stream()
+//						.filter(e -> certificationInventoryEO.getProjectLibraryId().equals(e.getId())).collect(Collectors.toList());
+//				//平台件项目库中的认证清单的配置项为平台件项目名称
+//				String configItemTemp = "";
+//				if(!libraryBaseList.isEmpty()){
+//					//配置项
+//					configItemTemp = libraryBaseList.get(0).getProjectNameId();
+//				}
+//				//类别
+//				String categoryTemp = certificationInventoryEO.getCategory();
+//				//检验项目
+//				String inspectionItemTemp = certificationInventoryEO.getInspectionItem();
+//				//编号
+//				String serialNumberTemp = certificationInventoryEO.getSerialNumber();
+//				//责任领域
+//				String dutyTerritoryTemp = certificationInventoryEO.getDutyTerritory();
+//
+//				if(StringUtils.isBlank(configItem) || "标配".equals(configItem)){
+//					//如果车型项目库中的配置项为空或为标配时，直接将平台件信息添加到关联表
+//					setDataTemp(lawsInventoryPlatformEOS, projectCertificationInventoryEO, certificationInventoryEO);
+//				}else if(StringUtils.isNotBlank(configItem) && !"标配".equals(configItem)){
+//					//如果车型项目库中的配置项不为空且不为标配时，如果车型项目库认证清单的配置项与平台件认证清单的配置项不一致，则不再匹配
+//					//如果一致，则用类别，检验项目，编号，责任领域去做匹配
+//					if(configItem.equals(configItemTemp)
+//							&& category.equals(categoryTemp)
+//							&& inspectionItem.equals(inspectionItemTemp)
+//							&& serialNumber.equals(serialNumberTemp)
+//							&& dutyTerritory.equals(dutyTerritoryTemp)){
+//						setDataTemp(lawsInventoryPlatformEOS, projectCertificationInventoryEO, certificationInventoryEO);
+//					}
+//				}
+//			}
+//		}
+//		if(!lawsInventoryPlatformEOS.isEmpty()){
+//			lawsInventoryPlatformEOService.saveBatch(lawsInventoryPlatformEOS);
+//		}
+//	}
+
+
+
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java

@@ -289,6 +289,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 	private BussDocumentLibraryEOServiceImpl documentLibraryEOService;
 	@Autowired
 	private ProcessHistoryEOServiceImpl processHistoryEOServiceImpl;
+	@Autowired
+	private ProjectLawsInventoryEOMapper projectLawsInventoryEOMapper;
+	@Autowired
+	private LawsInventoryPlatformEOServiceImpl lawsInventoryPlatformEOService;
 
 	/**
 	 * 保存
@@ -510,6 +514,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 	@Override
 	public void editById(ProjectLawsInventoryEO projectLawsInventoryEO) {
 		this.editService.editById(projectLawsInventoryEO);
+		if(StringUtils.isNotBlank(projectLawsInventoryEO.getPlatformIds())){
+			LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
+			wrapper.eq(LawsInventoryPlatformEO::getLawsInventoryId,projectLawsInventoryEO.getId());
+			wrapper.in(LawsInventoryPlatformEO::getPlatformLawsInventoryId,Arrays.asList(projectLawsInventoryEO.getPlatformIds().split(",")));
+			lawsInventoryPlatformEOService.remove(wrapper);
+		}
 	}
 
 	/**
@@ -629,6 +639,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				throw new JeroBootException("The user has no deletion permission");
 			}
 		}
+		//引用流程重置的逻辑
+		String operateType = "lawsInventoryAllResetFlow";
+		resetFolw(id, projectLibraryId, operateType);
 
 		//更新log
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -681,6 +694,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				throw new JeroBootException("The user has no deletion permission");
 			}
 		}
+		//引用流程重置的逻辑
+		String operateType = "lawsInventoryAllResetFlow";
+		resetFolw(StringUtils.join(ids,","), projectLibraryId, operateType);
 
 		//更新log
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -692,7 +708,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		String contentLog = username + "删除了清单中的“" + serialNumber + "”";
 		String enContentLog = username + " deleted “" + serialNumber + "” from the list";
 		projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId, CutEnum.CN.getValue());
-		projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId, CutEnum.EN.getValue());
+		projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId, CutEnum.EN.getValue());
 		removeByIds(ids);
 		this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(ids);
 
@@ -1820,7 +1836,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		}
 	}
 
-	private String getTreeName(String cut, List<SysCategory> categoryList, List<String> technologyTerritoryList) {
+	public String getTreeName(String cut, List<SysCategory> categoryList, List<String> technologyTerritoryList) {
 		StringBuilder sb = new StringBuilder();
 		for (String technologyTerritory : technologyTerritoryList) {
 			List<SysCategory> collect = categoryList.stream().filter(e -> technologyTerritory.equals(e.getId())).collect(Collectors.toList());
@@ -4771,6 +4787,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		String ids = parmas.getString("ids");
 		String projectLibraryId = parmas.getString("projectLibraryId");
 		String operateType = parmas.getString("operateType");
+		resetFolw(ids, projectLibraryId, operateType);
+		return Result.OK("变更成功！");
+	}
+
+	private void resetFolw(String ids, String projectLibraryId, String operateType) {
 		if (StringUtils.isNotEmpty(ids)) {
 
 			List<String> piFlowTypeList = new ArrayList<>();
@@ -4794,14 +4815,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerSubmitStatus, null);
 			updateWrapper.set(ProjectLawsInventoryEO::getSendMsgFlag, null);
 			updateWrapper.set(ProjectLawsInventoryEO::getSendMsgCurrentFlag, null);
-			//updateWrapper.set(ProjectLawsInventoryEO::getDesignDueDate,null);
-			//updateWrapper.set(ProjectLawsInventoryEO::getPrehomoDueDate,null);
-			//updateWrapper.set(ProjectLawsInventoryEO::getVerifyDueDate,null);
 			updateWrapper.set(ProjectLawsInventoryEO::getInventoryAffirmDueDate, null);
 			updateWrapper.set(ProjectLawsInventoryEO::getTaskAffirmDueDate, null);
 
 			// 区分重置设计、验证、全部流程
-			if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_ALL_RESET_FLOW.getValue())){
+			if(StringUtils.equals(operateType, OperatorTypeEnum.LAWS_INVENTORY_ALL_RESET_FLOW.getValue())){
 				updateWrapper.set(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
 				updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
 				piFlowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
@@ -4828,86 +4846,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			pIds = actiProcInstIdList.stream().map(String::valueOf).collect(Collectors.joining(","));
 
-			/*QueryWrapper<ProjectTaskInventoryEO> taskInventoryQueryWrapper = new QueryWrapper<>();
-			taskInventoryQueryWrapper.lambda().in(ProjectTaskInventoryEO::getProjectLawsInventoryId,idList);
-			List<ProjectTaskInventoryEO> projectTaskInventoryList = this.projectTaskInventoryEOService.getBaseMapper().selectList(taskInventoryQueryWrapper);
-
-			//删除流程历史
-			if(CollectionUtils.isNotEmpty(projectTaskInventoryList)){
-				List<String> actiProcInstIdList = new ArrayList<>();
-				List<String> verifyPIdList = projectTaskInventoryList.stream().map(ProjectTaskInventoryEO::getVerifyPId).distinct().collect(Collectors.toList());
-				List<String> prehomoPIdList = projectTaskInventoryList.stream().map(ProjectTaskInventoryEO::getPrehomoPId).distinct().collect(Collectors.toList());
-				List<String> designPIdList = projectTaskInventoryList.stream().map(ProjectTaskInventoryEO::getDesignPId).distinct().collect(Collectors.toList());
-
-				actiProcInstIdList.addAll(verifyPIdList);
-				actiProcInstIdList.addAll(prehomoPIdList);
-				actiProcInstIdList.addAll(designPIdList);
-
-				actiProcInstIdList = actiProcInstIdList.stream().distinct().collect(Collectors.toList());;
-				if(CollectionUtils.isNotEmpty(actiProcInstIdList)){
-					QueryWrapper<ProcessHistoryEO> processHistoryDeleteWrapper = new QueryWrapper<>();
-					processHistoryDeleteWrapper.lambda().in(ProcessHistoryEO::getActiProcInstId,actiProcInstIdList);
-					processHistoryEOService.remove(processHistoryDeleteWrapper);
-				}
-				pIds = actiProcInstIdList.stream().map(String::valueOf).collect(Collectors.joining(","));
-			}
-
-			QueryWrapper<ProjectLawsInventoryEO> queryLawsInventoryWrapper = new QueryWrapper<>();
-			queryLawsInventoryWrapper.lambda().in(ProjectLawsInventoryEO::getId,idList);
-
-			List<ProjectTaskInventoryEO> projectTaskInventoryEOList = new ArrayList<>();
-			List<ProjectLawsInventoryEO> projectLawsInventoryEOList = this.baseMapper.selectList(queryLawsInventoryWrapper);
-			projectLawsInventoryEOList.forEach(projectLawsInventory -> {
-				ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
-				String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
-				projectTaskInventoryEO.setId(projectTaskInventoryId);
-				projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventory.getId());
-				projectTaskInventoryEO.setStandId(projectLawsInventory.getStandId());
-				projectTaskInventoryEO.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
-				projectTaskInventoryEOList.add(projectTaskInventoryEO);
-			});
-//			idList.forEach(id -> {
-//				ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
-//				String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
-//				projectTaskInventoryEO.setId(projectTaskInventoryId);
-//				projectTaskInventoryEO.setProjectLawsInventoryId(id);
-//				projectTaskInventoryEOList.add(projectTaskInventoryEO);
-//			});
-			//项目任务清单数据初始化。
-			this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(idList);
-			this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
-
-			//初始化项目状态评估
-			projectTaskInventoryEOList.forEach(taskInventory -> {
-				this.initConditionAssessmentEO(taskInventory.getProjectLawsInventoryId());
-			});
-
-			//删除该法规的任务明细数据
-			QueryWrapper<ProjectTaskInventoryDetailEO> deleteTaskInventoryDetailWrapper = new QueryWrapper<>();
-			deleteTaskInventoryDetailWrapper.lambda().in(ProjectTaskInventoryDetailEO::getProjectTaskInventoryId,idList);
-			this.projectTaskInventoryDetailEOService.remove(deleteTaskInventoryDetailWrapper);
-
-			//查询反馈意见表 获取id  用于删除 反馈意见历史数据。
-			QueryWrapper<ProjectTaskInventoryFeedbackEO> queryTaskInventoryFeedbackWrapper = new QueryWrapper<>();
-			queryTaskInventoryFeedbackWrapper.lambda().in(ProjectTaskInventoryFeedbackEO::getProjectTaskInventoryId,idList);
-			List<ProjectTaskInventoryFeedbackEO> projectTaskInventoryFeedbackEOList = projectTaskInventoryFeedbackEOService.getBaseMapper().selectList(queryTaskInventoryFeedbackWrapper);
-			List<String> feedbackIdList = projectTaskInventoryFeedbackEOList.stream().map(ProjectTaskInventoryFeedbackEO::getId).distinct().collect(Collectors.toList());
-			if(CollectionUtils.isNotEmpty(feedbackIdList)){
-				QueryWrapper<FeedbackHistory> deleteFeedbackHistoryWrapper = new QueryWrapper<>();
-				deleteFeedbackHistoryWrapper.lambda().in(FeedbackHistory::getFeedbackId,feedbackIdList);
-				feedbackHistoryService.remove(deleteFeedbackHistoryWrapper);
-			}
-
-			//删除反馈意见数据
-			QueryWrapper<ProjectTaskInventoryFeedbackEO> deleteTaskInventoryFeedbackWrapper = new QueryWrapper<>();
-			deleteTaskInventoryFeedbackWrapper.lambda().in(ProjectTaskInventoryFeedbackEO::getProjectTaskInventoryId,idList);
-			this.projectTaskInventoryFeedbackEOService.remove(deleteTaskInventoryFeedbackWrapper);
-
-			//删除当前项目状态表
-			QueryWrapper<ConditionAssessmentEO> deleteConditionAssessmentWrapper = new QueryWrapper<>();
-			deleteConditionAssessmentWrapper.lambda().in(ConditionAssessmentEO::getProjectLawsInventoryId,idList);
-			this.conditionAssessmentEOService.remove(deleteConditionAssessmentWrapper);*/
-
 			JSONObject params = new JSONObject();
 			params.put("projectLawsInventoryIds", projectLawsInventoryIds);
 			params.put("pIds", pIds);
@@ -4955,7 +4893,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(), paramsMsg);
 			}
 		}
-		return Result.OK("变更成功！");
+		//流程重置后，将平台件关联信息删除
+		LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.in(LawsInventoryPlatformEO::getLawsInventoryId,Arrays.asList(ids.split(",")));
+		lawsInventoryPlatformEOService.remove(wrapper);
 	}
 
 	private void importDatas(List<ProjectLawsInventoryEO> dataList,
@@ -9904,6 +9845,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 		String resultMsg = "";
 		ProcessHistoryEO citePhEo = null;
+		String flag = "";
 		if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
 			resultMsg = "引用交付物成功！";
 		} else {
@@ -9984,19 +9926,27 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			if (ObjectUtils.isEmpty(citePhEo)) {
 				if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+					flag = "error";
 					resultMsg = "所选引用项目中，没有匹配到数据，请重新选择！";
 				} else {
+					flag = "error";
 					resultMsg = "There is no matching data in the selected reference project. Please reselect!";
 				}
 			}
 		} else {
 			if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
+				flag = "error";
 				resultMsg = "所选引用项目中流程完成数据为空，请重新选择！";
 			} else {
+				flag = "error";
 				resultMsg = "The process completion data in the selected reference project is empty, please reselect!";
 			}
 		}
-		return Result.OK(resultMsg, citePhEo);
+		if(StringUtils.isNotBlank(flag)){
+			return Result.error(resultMsg);
+		}else{
+			return Result.OK(resultMsg, citePhEo);
+		}
 	}
 
 	@Override
@@ -11717,6 +11667,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		IPage<ProjectLawsInventoryEO> pageList = this.page(page, queryWrapper);
 		List<ProjectLawsInventoryEO> result = pageList.getRecords();
 
+		//关联平台件数据
+		platformDispose(projectLawsInventoryEO, result);
+
 		this.dataDispose(result,currentUser,isProjectRole,projectLawsInventoryEO.getCut());
 		this.dataDictDispose(result,projectLawsInventoryEO.getCut());
 		//表头排序
@@ -11724,6 +11677,241 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		return pageList;
 	}
 
+	public void platformDispose(ProjectLawsInventoryEO projectLawsInventoryEO, List<ProjectLawsInventoryEO> result) {
+		List<String> valueList = FlowStateEnum.getValueInfo();
+		List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList = new ArrayList<>();
+		List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>();
+
+		List<String> lawsInventoryIdList = new ArrayList<>();
+		List<String> inventoryIdList = new ArrayList<>();
+		List<String> fileIdList = new ArrayList<>();
+		List<String> userIdList = new ArrayList<>();
+		if(!result.isEmpty()){
+			lawsInventoryIdList = result.stream().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList());
+			LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
+			wrapper.in(LawsInventoryPlatformEO::getLawsInventoryId,lawsInventoryIdList);
+			lawsInventoryPlatformEOList = lawsInventoryPlatformEOService.list(wrapper);
+			if(!lawsInventoryPlatformEOList.isEmpty()){
+				List<String> collect = lawsInventoryPlatformEOList.stream().map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).distinct().collect(Collectors.toList());
+				LambdaQueryWrapper<ProjectLawsInventoryEO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+				lambdaQueryWrapper.in(ProjectLawsInventoryEO::getId,collect);
+				projectLawsInventoryEOS = this.list(lambdaQueryWrapper);
+				if(!projectLawsInventoryEOS.isEmpty()){
+					inventoryIdList = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList());
+					List<String> collect1 = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getDesignDutyId).distinct().collect(Collectors.toList());
+					List<String> collect2 = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getVerifyDutyId).distinct().collect(Collectors.toList());
+					List<String> collect3 = projectLawsInventoryEOS.stream().filter(e->StringUtils.isNotBlank(e.getDesignDeliverableTemplate())).map(ProjectLawsInventoryEO::getDesignDeliverableTemplate).distinct().collect(Collectors.toList());
+					List<String> collect4 = projectLawsInventoryEOS.stream().filter(e->StringUtils.isNotBlank(e.getVerifyDeliverableTemplate())).map(ProjectLawsInventoryEO::getVerifyDeliverableTemplate).distinct().collect(Collectors.toList());
+					if(!collect1.isEmpty()){
+						userIdList.addAll(collect1);
+					}
+					if(!collect2.isEmpty()){
+						userIdList.addAll(collect2);
+					}
+					if(!collect3.isEmpty()){
+						fileIdList.addAll(collect3);
+					}
+					if(!collect4.isEmpty()){
+						fileIdList.addAll(collect4);
+					}
+				}
+			}
+		}
+		//树形结构数据字典(技术领域)
+		List<SysCategory> categoryList = sysCategoryService.list();
+		//文件
+		List<OSSFile> fileInfos = new ArrayList<>();
+		if (fileIdList.size() != 0) {
+			fileInfos = iOSSFileService.getFileInfos(StringUtils.join(fileIdList, ","));
+		}
+		List<SysUser> sysUsers = new ArrayList<>();
+		if (CollectionUtils.isNotEmpty(userIdList)) {
+			userIdList = userIdList.stream().distinct().collect(Collectors.toList());
+			QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
+			sysUserQueryWrapper.lambda().in(SysUser::getId, userIdList);
+			sysUsers = sysUserMapper.selectList(sysUserQueryWrapper);
+		}
+		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = new ArrayList<>();
+		String cut = projectLawsInventoryEO.getCut();
+		for (ProjectLawsInventoryEO lawsInventoryEO : result) {
+			if(!lawsInventoryPlatformEOList.isEmpty()){
+				List<LawsInventoryPlatformEO> inventoryPlatformEOList = lawsInventoryPlatformEOList.stream()
+						.filter(e -> lawsInventoryEO.getId().equals(e.getLawsInventoryId())).collect(Collectors.toList());
+				if(!inventoryPlatformEOList.isEmpty()){
+					List<String> idList = inventoryPlatformEOList.stream()
+							.map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).collect(Collectors.toList());
+					List<ProjectLawsInventoryEO> lawsInventoryEOS = projectLawsInventoryEOS.stream()
+							.filter(e -> idList.contains(e.getId())).collect(Collectors.toList());
+					if(ObjectUtils.isNotEmpty(lawsInventoryEOS)){
+						for (String value : valueList) {
+							List<ProjectLawsInventoryEO> collect = lawsInventoryEOS.stream()
+									.filter(e -> value.equals(e.getDesignFlowStatus())).collect(Collectors.toList());
+							if(ObjectUtils.isNotEmpty(collect)){
+								//流程状态
+								lawsInventoryEO.setDesignFlowStatus(value);
+								break;
+							}
+						}
+						for (String value : valueList) {
+							List<ProjectLawsInventoryEO> collect = lawsInventoryEOS.stream()
+									.filter(e -> value.equals(e.getVerifyFlowStatus())).collect(Collectors.toList());
+							if(ObjectUtils.isNotEmpty(collect)){
+								//流程状态
+								lawsInventoryEO.setVerifyFlowStatus(value);
+								break;
+							}
+						}
+					}
+					lawsInventoryEO.setProjectLawsInventoryEOS(lawsInventoryEOS);
+					if(!lawsInventoryEOS.isEmpty()){
+						projectLawsInventoryEOList.addAll(lawsInventoryEOS);
+					}
+					//如果关联平台件数据不为空，编辑时将设计符合性和验证符合性的数据覆盖
+					if(!lawsInventoryEOS.isEmpty()){
+						for (ProjectLawsInventoryEO inventoryEO : lawsInventoryEOS) {
+							//设计
+							String designDeliverableType = inventoryEO.getDesignDeliverableType();//交付物类型
+							String designDutyId = inventoryEO.getDesignDutyId();//责任人
+							String designDeliverableTemplate = inventoryEO.getDesignDeliverableTemplate();//交付物模板
+							//验证
+							String verifyDeliverableType = inventoryEO.getVerifyDeliverableType();//交付物类型
+							String verifyDutyId = inventoryEO.getVerifyDutyId();//责任人
+							String verifyDeliverableTemplate = inventoryEO.getVerifyDeliverableTemplate();//交付物模板
+							//设计交付物类型
+							if (StringUtils.isNotBlank(designDeliverableType)) {
+//								lawsInventoryEO.setDesignDeliverableType(designDeliverableType);
+								List<String> designDeliverableTypeList = Arrays.asList(designDeliverableType.split(","));
+								String name = getTreeName(cut, categoryList, designDeliverableTypeList);
+								inventoryEO.setDesignDeliverableTypeName(name);
+							}
+							//验证交付物类型
+							if (StringUtils.isNotBlank(verifyDeliverableType)) {
+//								lawsInventoryEO.setVerifyDeliverableType(verifyDeliverableType);
+								List<String> verifyDeliverableTypeList = Arrays.asList(verifyDeliverableType.split(","));
+								String name = getTreeName(cut, categoryList, verifyDeliverableTypeList);
+								inventoryEO.setVerifyDeliverableTypeName(name);
+							}
+							//交付物类型模板
+							if (fileInfos.size() != 0) {
+								if (StringUtils.isNotBlank(designDeliverableTemplate)) {
+//									lawsInventoryEO.setDesignDeliverableTemplate(designDeliverableTemplate);
+									String fileName = this.editService.getFileName(null, fileInfos, designDeliverableTemplate);
+									if (StringUtils.isNotBlank(fileName)) {
+										inventoryEO.setDesignDeliverableTemplateName(fileName);
+									}
+								}
+								if (StringUtils.isNotBlank(verifyDeliverableTemplate)) {
+//									lawsInventoryEO.setVerifyDeliverableTemplate(verifyDeliverableTemplate);
+									String fileName = this.editService.getFileName(null, fileInfos, verifyDeliverableTemplate);
+									if (StringUtils.isNotBlank(fileName)) {
+										inventoryEO.setVerifyDeliverableTemplateName(fileName);
+									}
+								}
+							}
+							//设计责任人
+							if (StringUtils.isNotEmpty(designDutyId)) {
+//								lawsInventoryEO.setVerifyDutyId(designDutyId);
+								String designDutyName = sysUsers.stream().filter(e -> designDutyId.equals(e.getId())).
+										map(SysUser::getUsername).collect(Collectors.joining(","));
+								inventoryEO.setDesignDutyIdName(designDutyName);
+							} else {
+								inventoryEO.setDesignDutyIdName("");
+							}
+							//验证责任人
+							if (StringUtils.isNotEmpty(verifyDutyId)) {
+//								lawsInventoryEO.setVerifyDutyId(verifyDutyId);
+								String verifyDutyName = sysUsers.stream().filter(e -> verifyDutyId.equals(e.getId())).
+										map(SysUser::getUsername).collect(Collectors.joining(","));
+								inventoryEO.setVerifyDutyIdName(verifyDutyName);
+							} else {
+								inventoryEO.setVerifyDutyIdName("");
+							}
+						}
+						//设计交付物类型
+						lawsInventoryEO.setDesignDeliverableType(lawsInventoryEOS.get(0).getDesignDeliverableType());
+						lawsInventoryEO.setDesignDeliverableTypeName(lawsInventoryEOS.get(0).getDesignDeliverableTypeName());
+						//验证交付物类型
+						lawsInventoryEO.setVerifyDeliverableType(lawsInventoryEOS.get(0).getVerifyDeliverableType());
+						lawsInventoryEO.setVerifyDeliverableTypeName(lawsInventoryEOS.get(0).getVerifyDeliverableTypeName());
+						//交付物类型模板
+						lawsInventoryEO.setDesignDeliverableTemplate(lawsInventoryEOS.get(0).getDesignDeliverableTemplate());
+						lawsInventoryEO.setDesignDeliverableTemplateName(lawsInventoryEOS.get(0).getDesignDeliverableTemplateName());
+
+						lawsInventoryEO.setVerifyDeliverableTemplate(lawsInventoryEOS.get(0).getVerifyDeliverableTemplate());
+						lawsInventoryEO.setVerifyDeliverableTemplateName(lawsInventoryEOS.get(0).getVerifyDeliverableTemplateName());
+
+						//责任人
+						lawsInventoryEO.setVerifyDutyId(lawsInventoryEOS.get(0).getDesignDutyId());
+						lawsInventoryEO.setDesignDutyIdName(lawsInventoryEOS.get(0).getDesignDutyIdName());
+
+						lawsInventoryEO.setVerifyDutyId(lawsInventoryEOS.get(0).getVerifyDutyId());
+						lawsInventoryEO.setVerifyDutyIdName(lawsInventoryEOS.get(0).getVerifyDutyIdName());
+
+						//截止时间
+						lawsInventoryEO.setDesignDueDate(lawsInventoryEOS.get(0).getDesignDueDate());
+						lawsInventoryEO.setVerifyDueDate(lawsInventoryEOS.get(0).getVerifyDueDate());
+
+						//交付物说明
+						lawsInventoryEO.setDesignRemark(lawsInventoryEOS.get(0).getDesignRemark());
+						lawsInventoryEO.setVerifyRemark(lawsInventoryEOS.get(0).getVerifyRemark());
+						//编号  serialNumber
+						lawsInventoryEO.setSerialNumber(lawsInventoryEOS.get(0).getSerialNumber());
+						//标题  title
+						lawsInventoryEO.setTitle(lawsInventoryEOS.get(0).getTitle());
+						//子标题  subtitle
+						lawsInventoryEO.setSubtitle(lawsInventoryEOS.get(0).getSubtitle());
+						//使用增补件  applicableSupplement
+						lawsInventoryEO.setApplicableSupplement(lawsInventoryEOS.get(0).getApplicableSupplement());
+						//认证类型  attestationType
+						lawsInventoryEO.setAttestationType(lawsInventoryEOS.get(0).getAttestationType());
+						//认证级别  attestationRank
+						lawsInventoryEO.setAttestationRank(lawsInventoryEOS.get(0).getAttestationRank());
+						//责任部门  dutyDepart
+						lawsInventoryEO.setDutyDepart(lawsInventoryEOS.get(0).getDutyDepart());
+						//责任领域  dutyTerritory
+						lawsInventoryEO.setDutyTerritory(lawsInventoryEOS.get(0).getDutyTerritory());
+						//法规工程师  regulationOwnerId
+						lawsInventoryEO.setRegulationOwnerId(lawsInventoryEOS.get(0).getRegulationOwnerId());
+						//工程接口人  engineeringInterfacePerson
+						lawsInventoryEO.setEngineeringInterfacePerson(lawsInventoryEOS.get(0).getEngineeringInterfacePerson());
+						//备注  remark
+						lawsInventoryEO.setRemark(lawsInventoryEOS.get(0).getRemark());
+					}
+				}
+			}
+		}
+		if(!projectLawsInventoryEOList.isEmpty()){
+			List<String> projectLibraryIdList = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList());
+			LambdaQueryWrapper<ProjectLibraryBase> wrapper = new LambdaQueryWrapper<>();
+			wrapper.in(ProjectLibraryBase::getId,projectLibraryIdList);
+			List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseService.list(wrapper);
+			for (ProjectLawsInventoryEO lawsInventoryEO : result) {
+				List<ProjectLawsInventoryEO> lawsInventoryEOS = lawsInventoryEO.getProjectLawsInventoryEOS();
+				if(ObjectUtils.isNotEmpty(lawsInventoryEOS)){
+					for (ProjectLawsInventoryEO inventoryEO : lawsInventoryEOS) {
+						List<ProjectLibraryBase> collect = libraryBaseList.stream().filter(e -> inventoryEO.getProjectLibraryId().equals(e.getId())).collect(Collectors.toList());
+						if(!collect.isEmpty()){
+							inventoryEO.setProjectName(collect.get(0).getProjectNameId());
+						}
+					}
+				}
+			}
+			//平台件信息默认按项目名称正序排序
+			for (ProjectLawsInventoryEO lawsInventoryEO : result) {
+				List<ProjectLawsInventoryEO> nventoryEOList = lawsInventoryEO.getProjectLawsInventoryEOS();
+				if(ObjectUtils.isNotEmpty(nventoryEOList)){
+					Collator comparator = Collator.getInstance(Locale.CHINESE);
+					Collections.sort(nventoryEOList,(e1,e2)->{
+						String e1ProjectName = StringUtils.isNotBlank(e1.getProjectName()) ? e1.getProjectName() : "";
+						String e2ProjectName = StringUtils.isNotBlank(e2.getProjectName()) ? e2.getProjectName() : "";
+						return comparator.compare(e1ProjectName,e2ProjectName);
+					});
+					lawsInventoryEO.setProjectLawsInventoryEOS(nventoryEOList);
+				}
+			}
+		}
+	}
+
 	@Override
 	public Result<?> finalizationVerify(Map<String, Object> params) {
 		boolean result = false; // 返回true，可以定版，返回false 不能定版
@@ -11964,4 +12152,161 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		return result;
 	}
 
+	public List<ProjectLawsInventoryEO> queryPlatformList(String lawsInventoryId,String flowFlag,String cut){
+		if(StringUtils.isBlank(lawsInventoryId) || StringUtils.isBlank(flowFlag)){
+			return new ArrayList<>();
+		}
+		List<SysDictItem> sysDictItems = this.sysDictItemServiceImpl.selectItemsAll();
+		List<SysCategory> categoryList = sysCategoryService.list();
+
+		LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(LawsInventoryPlatformEO::getLawsInventoryId,lawsInventoryId);
+		List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = lawsInventoryPlatformEOService.list(wrapper);
+		List<String> idList = new ArrayList<>();
+		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = new ArrayList<>();
+		List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
+		if(ObjectUtils.isNotEmpty(lawsInventoryPlatformEOS)){
+			idList = lawsInventoryPlatformEOS.stream().map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).collect(Collectors.toList());
+			projectLawsInventoryEOList = this.listByIds(idList);
+			if(ObjectUtils.isNotEmpty(projectLawsInventoryEOList)){
+				List<String> projectIdList = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getProjectLibraryId).collect(Collectors.toList());
+				projectLibraryBaseList = projectLibraryBaseService.listByIds(projectIdList);
+			}
+			List<String> userIdList = new ArrayList<>();
+			List<String> collect1 = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getDesignDutyId).distinct().collect(Collectors.toList());
+			List<String> collect2 = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getVerifyDutyId).distinct().collect(Collectors.toList());
+			if(ObjectUtils.isNotEmpty(collect1)){
+				userIdList.addAll(collect1);
+			}
+			if(ObjectUtils.isNotEmpty(collect2)){
+				userIdList.addAll(collect2);
+			}
+
+			List<String> fileIdList = new ArrayList<>();
+			List<String> collect3 = projectLawsInventoryEOList.stream()
+					.filter(e->StringUtils.isNotBlank(e.getDesignDeliverableTemplate())).map(ProjectLawsInventoryEO::getDesignDeliverableTemplate).distinct().collect(Collectors.toList());
+			List<String> collect4 = projectLawsInventoryEOList.stream()
+					.filter(e->StringUtils.isNotBlank(e.getVerifyDeliverableTemplate())).map(ProjectLawsInventoryEO::getVerifyDeliverableTemplate).distinct().collect(Collectors.toList());
+			if(ObjectUtils.isNotEmpty(collect3)){
+				fileIdList.addAll(collect3);
+			}
+			if(ObjectUtils.isNotEmpty(collect4)){
+				fileIdList.addAll(collect4);
+			}
+
+			List<SysUser> sysUsers = new ArrayList<>();
+			if (CollectionUtils.isNotEmpty(userIdList)) {
+				userIdList = userIdList.stream().distinct().collect(Collectors.toList());
+				QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
+				sysUserQueryWrapper.lambda().in(SysUser::getId, userIdList);
+				sysUsers = sysUserMapper.selectList(sysUserQueryWrapper);
+			}
+
+			List<OSSFile> fileInfos = new ArrayList<>();
+			if (fileIdList.size() != 0) {
+				fileInfos = iOSSFileService.getFileInfos(StringUtils.join(fileIdList, ","));
+			}
+
+			for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOList) {
+				List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseList.stream()
+						.filter(e -> e.getId().equals(projectLawsInventoryEO.getProjectLibraryId())).collect(Collectors.toList());
+				if(ObjectUtils.isNotEmpty(libraryBaseList)){
+					projectLawsInventoryEO.setProjectName(libraryBaseList.get(0).getProjectNameId());
+				}
+				//流程状态
+				String flowStatus = "";
+				if(FlowFlagEnum.DESIGN.getValue().equals(flowFlag)){//流程标识，点击设计符合性流程状态跳转
+					flowStatus = projectLawsInventoryEO.getDesignFlowStatus();
+				}else if(FlowFlagEnum.VERIFY.getValue().equals(flowFlag)){//流程标识，点击验证符合性流程状态跳转
+					flowStatus = projectLawsInventoryEO.getVerifyFlowStatus();
+				}
+				if (StringUtils.isNotEmpty(flowStatus)) {
+					String designFlowStatusName = ComplianceFlowStatusEnum.getTextByValue(flowStatus, cut);
+					if("design".equals(flowFlag)){
+						projectLawsInventoryEO.setDesignFlowStatusName(designFlowStatusName);
+					}else{
+						projectLawsInventoryEO.setVerifyFlowStatusName(designFlowStatusName);
+					}
+				}
+
+				//发起人.
+//				if("design".equals(flowFlag)){
+//					projectLawsInventoryEO.get
+//				}else{
+//
+//				}
+				//责任人
+				String dutyId = "";
+				if("design".equals(flowFlag)){
+					dutyId = projectLawsInventoryEO.getDesignDutyId();
+				}else{
+					dutyId = projectLawsInventoryEO.getVerifyDutyId();
+				}
+				if (StringUtils.isNotEmpty(dutyId)) {
+					String finalDutyId = dutyId;
+					String designDutyName = sysUsers.stream().filter(e -> finalDutyId.equals(e.getId())).
+							map(SysUser::getUsername).collect(Collectors.joining(","));
+					if("design".equals(flowFlag)){
+						projectLawsInventoryEO.setDesignDutyIdName(designDutyName);
+					}else{
+						projectLawsInventoryEO.setVerifyDutyIdName(designDutyName);
+					}
+				} else {
+					projectLawsInventoryEO.setDesignDutyIdName("");
+				}
+
+				//交付物模板
+				String deliverableTemplate = "";
+				if("design".equals(flowFlag)){
+					deliverableTemplate = projectLawsInventoryEO.getDesignDeliverableTemplate();
+				}else{
+					deliverableTemplate = projectLawsInventoryEO.getVerifyDeliverableTemplate();
+				}
+				if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())) {
+					String fileName = this.editService.getFileName(projectLawsInventoryEO, fileInfos, projectLawsInventoryEO.getDesignDeliverableTemplate());
+					if (StringUtils.isNotBlank(fileName)) {
+						if("design".equals(flowFlag)){
+							projectLawsInventoryEO.setDesignDeliverableTemplateName(fileName);
+						}else{
+							projectLawsInventoryEO.setVerifyDeliverableTemplateName(fileName);
+						}
+					}
+				}
+				//交付物类型
+				String deliverableType = "";
+				if("design".equals(flowFlag)){
+					deliverableType = projectLawsInventoryEO.getDesignDeliverableType();
+				}else{
+					deliverableType = projectLawsInventoryEO.getVerifyDeliverableType();
+				}
+				if (StringUtils.isNotBlank(deliverableType)) {
+					List<String> designDeliverableTypeList = Arrays.asList(deliverableType.split(","));
+					String name = getTreeName(cut, categoryList, designDeliverableTypeList);
+					if("design".equals(flowFlag)){
+						projectLawsInventoryEO.setDesignDeliverableTypeName(name);
+					}else{
+						projectLawsInventoryEO.setVerifyDeliverableTypeName(name);
+					}
+
+				}
+
+				//责任领域
+				String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
+				if (StringUtils.isNotEmpty(dutyTerritory)) {
+					String dutyTerritory_dictText = disposeShowDictItemValue(sysDictItems, dutyTerritory, cut, ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
+					projectLawsInventoryEO.setDutyTerritory_dictText(dutyTerritory_dictText);
+				}
+				//交付物说明
+				String remark = "";
+				if("design".equals(flowFlag)){
+					remark = projectLawsInventoryEO.getDesignRemark();
+				}else{
+					remark = projectLawsInventoryEO.getVerifyRemark();
+				}
+			}
+		}
+		return projectLawsInventoryEOList;
+	}
+
+
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java

@@ -22,18 +22,46 @@ import com.jero.modules.cert.template.enums.ControlTypeEnum;
 import com.jero.modules.dummy.enums.OrderEnum;
 import com.jero.modules.enums.DictCodeEnum;
 import com.jero.modules.feishu.enums.TemplateInfoEnum2;
-import com.jero.modules.ota.entity.OtaManageApplyEO;
 import com.jero.modules.ota.service.impl.OtaManageApplyEOServiceImpl;
-import com.jero.modules.project.entity.*;
-import com.jero.modules.project.enums.*;
+import com.jero.modules.project.entity.LawsInventoryPlatformEO;
+import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
+import com.jero.modules.project.entity.ProjectLawsInventoryLogEO;
+import com.jero.modules.project.entity.ProjectLibraryBase;
+import com.jero.modules.project.entity.ProjectLibraryRoleRelEO;
+import com.jero.modules.project.entity.ProjectRelatedPersonnel;
+import com.jero.modules.project.entity.ProjectTaskInventoryEO;
+import com.jero.modules.project.entity.ProjectTaskPlanning;
+import com.jero.modules.project.entity.ProjectUserPermission;
+import com.jero.modules.project.enums.CertificationFlowNodeEnum;
+import com.jero.modules.project.enums.CertificationInventoryFlowStatusEnum;
+import com.jero.modules.project.enums.CertificationProgressEnum;
+import com.jero.modules.project.enums.ComplianceFlowStatusEnum;
+import com.jero.modules.project.enums.DesignComplianceStatusEnum;
+import com.jero.modules.project.enums.HSStatisticalNodesEnum;
+import com.jero.modules.project.enums.OperatorTypeEnum;
+import com.jero.modules.project.enums.PermissionDescriptionEnum;
+import com.jero.modules.project.enums.ProjectRoleEnum;
+import com.jero.modules.project.enums.ProjectTaskPlanningNameEnum;
+import com.jero.modules.project.enums.ProjectUserLocationEnum;
+import com.jero.modules.project.enums.RoleRelModelTypeEnum;
+import com.jero.modules.project.enums.TaskAffirmStatusEnum;
+import com.jero.modules.project.enums.TaskStatusEnum;
+import com.jero.modules.project.enums.TopEnum;
 import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper;
 import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
 import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
 import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper;
 import com.jero.modules.project.mapper.ProjectTaskInventoryEOMapper;
 import com.jero.modules.project.mapper.ProjectUserPermissionMapper;
-import com.jero.modules.project.service.*;
+import com.jero.modules.project.service.IConditionAssessmentEOService;
+import com.jero.modules.project.service.IProjectCertificationInventoryEOService;
+import com.jero.modules.project.service.IProjectLibraryBaseService;
+import com.jero.modules.project.service.IProjectLibraryRoleRelEOService;
+import com.jero.modules.project.service.IProjectLibraryStatisticsService;
+import com.jero.modules.project.service.IProjectUserPermissionService;
 import com.jero.modules.project.vo.TimeNodeVO;
+import com.jero.modules.system.entity.SysCategory;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.enums.DicCodeEnum;
@@ -43,6 +71,7 @@ import com.jero.modules.system.mapper.SysUserMapper;
 import com.jero.modules.system.service.IProjectUserBrandService;
 import com.jero.modules.system.service.ISysDictService;
 import com.jero.modules.system.service.ISysUserService;
+import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
 import com.jero.modules.system.util.StringUtils;
 import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
@@ -50,7 +79,6 @@ import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService;
 import com.jero.modules.top.entity.TopProjectEO;
 import com.jero.modules.top.service.ITopProjectEOService;
 import com.jero.modules.wkflow.enums.FlowTypeEnum;
-import javafx.beans.binding.ObjectBinding;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
@@ -178,6 +206,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	private IProjectLibraryStatisticsService projectLibraryStatisticsService;
 	@Autowired
 	private OtaManageApplyEOServiceImpl otaManageApplyEOService;
+	@Autowired
+	private LawsInventoryPlatformEOServiceImpl lawsInventoryPlatformEOService;
+	@Autowired
+	private SysCategoryServiceImpl sysCategoryService;
 
 	private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 	private static DecimalFormat df = new DecimalFormat("#.00");
@@ -1001,6 +1033,38 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		}
 		return records;
 	}
+	@Override
+	public List<ProjectLibraryBase> queryByIdFlow(String id,String cut) {
+		List<ProjectLibraryBase> records = projectLibraryBaseMapper.queryByIdFlow(id);
+		disposeData(records,"",false);
+		//目标市场数据字典
+		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
+		for(ProjectLibraryBase projectLibraryBase: records){
+			//历史数据的主版本没有版本号,所以默认给00
+			if(StringUtils.isBlank(projectLibraryBase.getParentId()) && StringUtils.isBlank(projectLibraryBase.getProjectVersion())){
+				projectLibraryBase.setProjectVersion("00");
+			}
+			//目标市场
+			Map<String,Object> param = new HashMap<>();
+			param.put("cut",cut);
+			String targetMarket = getMarket(param, targetMarketList, projectLibraryBase);
+			//主项目的版本号
+			String projectVersion = "";
+			if(StringUtils.isBlank(projectLibraryBase.getParentId())){
+				projectVersion = "00";
+			}else{
+				projectVersion = projectLibraryBase.getProjectVersion();
+			}
+			if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){
+				projectLibraryBase.setProjectName(projectLibraryBase.getProjectName()
+						+ "-" + projectLibraryBase.getYearName()
+						+ "-" + targetMarket + "-" + projectVersion);
+			}else{
+				projectLibraryBase.setProjectName(projectLibraryBase.getProjectNameId());
+			}
+		}
+		return records;
+	}
 
 	/**
 	 * 列表查询
@@ -1020,6 +1084,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	 */
 	@Override
 	public List<ProjectLibraryBase> queryPageList(Map<String,Object> params) {
+		String quote = (String) params.get("quote");
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		Integer isViewer = sysRoleMapper.queryUserRoleByCode(ProjectRoleEnum.VIEWER.getName(), loginUser.getId());
 		Set<String> projectIds = new HashSet<>();
@@ -1084,6 +1149,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 						+ "-" + projectLibraryBase.getYearName()
 						+ "-" + targetMarket
 						+ "-" + projectVersion);
+			}else{
+				projectLibraryBase.setProjectName(projectLibraryBase.getProjectNameId());
 			}
 		}
 
@@ -1204,6 +1271,297 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		hearSort(params, resultLast);
 		return resultLast;
 	}
+	/**
+	 * 勾选法规清单进行关联平台件
+	 *
+	 * @return
+	 */
+	@Override
+	public Map<String,Object> listPlatform(Map<String,Object> params) {
+		String cut = (String) params.get("cut");//
+		String ids = (String) params.get("ids");//法规清单id
+		String projectLibraryIds = (String) params.get("projectLibraryIds");//平台件法规清单id
+
+		//法规清单数据
+		LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.in(ProjectLawsInventoryEO::getId,Arrays.asList(ids.split(",")));
+		List<ProjectLawsInventoryEO> lawsInventoryEOList = projectLawsInventoryEOService.list(wrapper);
+
+		//平台件项目对应的法规清单数据
+		LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper1 = new LambdaQueryWrapper<>();
+		wrapper1.in(ProjectLawsInventoryEO::getProjectLibraryId,Arrays.asList(projectLibraryIds.split(",")));
+		List<ProjectLawsInventoryEO> lawsInventoryEOS = projectLawsInventoryEOService.list(wrapper1);
+
+		//平台件项目信息
+		List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
+		if(!lawsInventoryEOList.isEmpty() && ObjectUtils.isNotEmpty(lawsInventoryEOS)){
+			List<String> projectIdList = lawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList());
+			LambdaQueryWrapper<ProjectLibraryBase> wrapper2 = new LambdaQueryWrapper<>();
+			wrapper2.in(ProjectLibraryBase::getId,projectIdList);
+			projectLibraryBaseList = this.list(wrapper2);
+		}
+
+		//普通数据字典
+		List<SysDictItem> sysDictItemList = sysDictItemMapper.selectItemsByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue());
+		List<SysCategory> categoryList = sysCategoryService.list();
+		List<Map<String,Object>> mapList = new ArrayList<>();
+		List<Map<String,Object>> mapListOne = new ArrayList<>();
+		List<ProjectLawsInventoryEO> emptyList = new ArrayList<>();
+		for (ProjectLawsInventoryEO projectLawsInventoryEO : lawsInventoryEOList) {
+			Map<String,Object> map = new HashMap<>();
+			List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>();
+			//serialNumber dutyTerritory
+			String serialNumber = projectLawsInventoryEO.getSerialNumber();
+			String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
+			String subtitle = "";
+			if(StringUtils.isNotBlank(projectLawsInventoryEO.getSubtitle())){
+				subtitle = projectLawsInventoryEO.getSubtitle();
+			}
+
+			//责任领域
+			List<String> list = new LinkedList<>();
+			if(StringUtils.isNotBlank(dutyTerritory)){
+				for (String s : dutyTerritory.split(",")) {
+					List<SysDictItem> collect = sysDictItemList.stream().filter(e -> e.getItemValue().equals(s)).collect(Collectors.toList());
+					if(CutEnum.CN.getValue().equals(cut) && !collect.isEmpty()){
+						list.add(collect.get(0).getItemText());
+					}else if(CutEnum.EN.getValue().equals(cut) && !collect.isEmpty()){
+						list.add(collect.get(0).getEnName());
+					}
+				}
+			}
+			String dutyTerritoryNew = "";
+			if(!list.isEmpty()){
+				dutyTerritoryNew = StringUtils.join(list, ",");
+			}
+			//设计-交付物类型
+			String designDeliverableTypeName = "";
+			String verifyDeliverableTypeName = "";
+			String designDeliverableType = projectLawsInventoryEO.getDesignDeliverableType();
+			if(StringUtils.isNotBlank(designDeliverableType)){
+				designDeliverableTypeName = projectLawsInventoryEOService.getTreeName(cut, categoryList, Arrays.asList(designDeliverableType.split(",")));
+			}
+
+			//验证-交付物类型
+			String verifyDeliverableType = projectLawsInventoryEO.getVerifyDeliverableType();
+			if(StringUtils.isNotBlank(verifyDeliverableType)){
+				verifyDeliverableTypeName = projectLawsInventoryEOService.getTreeName(cut, categoryList, Arrays.asList(verifyDeliverableType.split(",")));
+			}
+
+			for (ProjectLawsInventoryEO lawsInventoryEO : lawsInventoryEOS) {
+				String serialNumberTemp = lawsInventoryEO.getSerialNumber();
+				String dutyTerritoryTemp = lawsInventoryEO.getDutyTerritory();
+				if(serialNumber.equals(serialNumberTemp) && StringUtils.isNotBlank(dutyTerritory) && dutyTerritory.equals(dutyTerritoryTemp)){
+					List<ProjectLibraryBase> projectLibraryBases = projectLibraryBaseList.stream().filter(e -> e.getId().equals(lawsInventoryEO.getProjectLibraryId())).collect(Collectors.toList());
+					if(!projectLibraryBases.isEmpty()){
+						lawsInventoryEO.setProjectName(projectLibraryBases.get(0).getProjectNameId());
+					}
+					if(!list.isEmpty()){
+						lawsInventoryEO.setDutyTerritory_dictText(dutyTerritoryNew);
+					}
+					lawsInventoryEO.setDesignDeliverableTypeName(designDeliverableTypeName);
+					lawsInventoryEO.setVerifyDeliverableTypeName(verifyDeliverableTypeName);
+					projectLawsInventoryEOS.add(lawsInventoryEO);
+				}
+			}
+			if(ObjectUtils.isEmpty(projectLawsInventoryEOS)){
+				emptyList.add(projectLawsInventoryEO);
+			}
+			if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
+				map.put("lawsInventoryId",projectLawsInventoryEO.getId());
+				map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle);
+				map.put("result",projectLawsInventoryEOS);
+				mapList.add(map);
+			}else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){
+				Map<String,Object> mapTemp = new HashMap<>();
+				mapTemp.put("lawsInventoryId",projectLawsInventoryEO.getId());
+				mapTemp.put("result",projectLawsInventoryEOS);
+				mapListOne.add(mapTemp);
+			}
+		}
+
+		if(!mapListOne.isEmpty()){
+			//匹配一条平台件时直接新增
+			List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
+			for (Map<String, Object> map : mapListOne) {
+				LawsInventoryPlatformEO inventoryPlatformEO = new LawsInventoryPlatformEO();
+				inventoryPlatformEO.setCreateTime(new Date());
+				inventoryPlatformEO.setUpdateTime(new Date());
+				inventoryPlatformEO.setLawsInventoryId((String) map.get("lawsInventoryId"));
+				List<ProjectLawsInventoryEO> projectLawsInventoryEOS = (List<ProjectLawsInventoryEO>) map.get("result");
+				inventoryPlatformEO.setPlatformLawsInventoryId(projectLawsInventoryEOS.get(0).getId());
+				lawsInventoryPlatformEOS.add(inventoryPlatformEO);
+			}
+
+			if (!lawsInventoryPlatformEOS.isEmpty()) {
+				lawsInventoryPlatformEOService.saveBatch(lawsInventoryPlatformEOS);
+			}
+		}
+		//法规清单未匹配上平台件的提示语
+		String html = getMsg(cut, sysDictItemList, emptyList);
+
+		Map<String,Object> map = new HashMap<>();
+		map.put("msg",html);
+		map.put("result",mapList);
+		return map;
+	}
+
+	@NotNull
+	private String getMsg(String cut, List<SysDictItem> sysDictItemList, List<ProjectLawsInventoryEO> emptyList) {
+		List<String> msgList = new ArrayList<>();
+		//未匹配上法规清单
+		if(ObjectUtils.isNotEmpty(emptyList)){
+			for (ProjectLawsInventoryEO projectLawsInventoryEO : emptyList) {
+				List<String> list = new LinkedList<>();
+				if(StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())){
+					for (String s : projectLawsInventoryEO.getDutyTerritory().split(",")) {
+						List<SysDictItem> collect = sysDictItemList.stream().filter(e -> e.getItemValue().equals(s)).collect(Collectors.toList());
+						if(CutEnum.CN.getValue().equals(cut) && !collect.isEmpty()){
+							list.add(collect.get(0).getItemText());
+						}else if(CutEnum.EN.getValue().equals(cut) && !collect.isEmpty()){
+							list.add(collect.get(0).getEnName());
+						}
+					}
+				}
+				String serialNumber = projectLawsInventoryEO.getSerialNumber();
+				String dutyTerritoryName = StringUtils.join(list,",");
+				String msg = "";
+				if(CutEnum.CN.getValue().equals(cut)){
+					msg = serialNumber+" "+dutyTerritoryName+"未匹配到数据";
+				}else{
+					msg = serialNumber+" "+dutyTerritoryName+" no data matched";
+				}
+				msgList.add(msg);
+			}
+		}
+		String html = "";
+		for (String s : msgList) {
+			html += s + "</br>";
+		}
+		return html;
+	}
+
+	/**
+	 * 不勾选法规清单进行关联平台件
+	 *
+	 * @return
+	 */
+	@Override
+	public Map<String,Object> listPlatformAll(Map<String,Object> params) {
+		String cut = (String) params.get("cut");//
+		String projectLibraryIds = (String) params.get("projectLibraryIds");//法规清单id
+		String platformProjectLibraryIds = (String) params.get("platformProjectLibraryIds");//平台件法规id
+		//法规清单数据
+		LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.in(ProjectLawsInventoryEO::getId,Arrays.asList(projectLibraryIds.split(",")));
+		List<ProjectLawsInventoryEO> lawsInventoryEOList = projectLawsInventoryEOService.list(wrapper);
+
+		ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO();
+		projectLawsInventoryEOTemp.setCut(cut);
+		projectLawsInventoryEOService.platformDispose(projectLawsInventoryEOTemp,lawsInventoryEOList);
+		//只有法规的设计符合性确认和验证符合性确认中的流程状态均为清单待发布的时候，才能关联平台件数据
+		lawsInventoryEOList = lawsInventoryEOList.stream()
+				.filter(e->ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue().equals(e.getDesignFlowStatus())
+				&& ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue().equals(e.getVerifyFlowStatus())).collect(Collectors.toList());
+
+		//平台件项目对应的法规清单数据
+		LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper1 = new LambdaQueryWrapper<>();
+		wrapper1.in(ProjectLawsInventoryEO::getId,Arrays.asList(platformProjectLibraryIds.split(",")));
+		List<ProjectLawsInventoryEO> lawsInventoryEOS = projectLawsInventoryEOService.list(wrapper1);
+
+		//平台件项目信息
+		List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
+		if(!lawsInventoryEOList.isEmpty()){
+			List<String> projectIdList = lawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList());
+			LambdaQueryWrapper<ProjectLibraryBase> wrapper2 = new LambdaQueryWrapper<>();
+			wrapper2.in(ProjectLibraryBase::getId,projectIdList);
+			projectLibraryBaseList = this.list(wrapper2);
+		}
+
+		//普通数据字典
+		List<SysDictItem> sysDictItemList = sysDictItemMapper.selectItemsByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue());
+		List<Map<String,Object>> mapList = new ArrayList<>();
+		List<Map<String,Object>> mapListOne = new ArrayList<>();
+		List<ProjectLawsInventoryEO> emptyList = new ArrayList<>();
+		for (ProjectLawsInventoryEO projectLawsInventoryEO : lawsInventoryEOList) {
+			Map<String,Object> map = new HashMap<>();
+			List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>();
+			//serialNumber dutyTerritory
+			String serialNumber = projectLawsInventoryEO.getSerialNumber();
+			String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
+			String subtitle = StringUtils.isNotEmpty(projectLawsInventoryEO.getSubtitle()) ? projectLawsInventoryEO.getSubtitle() : "";;
+			//责任领域
+			List<String> list = new LinkedList<>();
+			if(StringUtils.isNotBlank(dutyTerritory)){
+				for (String s : dutyTerritory.split(",")) {
+					List<SysDictItem> collect = sysDictItemList.stream().filter(e -> e.getItemValue().equals(s)).collect(Collectors.toList());
+					if(CutEnum.CN.getValue().equals(cut) && !collect.isEmpty()){
+						list.add(collect.get(0).getItemText());
+					}else if(CutEnum.EN.getValue().equals(cut) && !collect.isEmpty()){
+						list.add(collect.get(0).getEnName());
+					}
+				}
+			}
+			String dutyTerritoryNew = "";
+			if(!list.isEmpty()){
+				dutyTerritoryNew = StringUtils.join(list, ",");
+			}
+
+			for (ProjectLawsInventoryEO lawsInventoryEO : lawsInventoryEOS) {
+				String serialNumberTemp = lawsInventoryEO.getSerialNumber();
+				String dutyTerritoryTemp = lawsInventoryEO.getDutyTerritory();
+				if(serialNumber.equals(serialNumberTemp) && StringUtils.isNotBlank(dutyTerritory) && dutyTerritory.equals(dutyTerritoryTemp)){
+					List<ProjectLibraryBase> projectLibraryBases = projectLibraryBaseList.stream().filter(e -> e.getId().equals(lawsInventoryEO.getProjectLibraryId())).collect(Collectors.toList());
+					if(!projectLibraryBases.isEmpty()){
+						lawsInventoryEO.setProjectName(projectLibraryBases.get(0).getProjectNameId());
+					}
+					if(!list.isEmpty()){
+						lawsInventoryEO.setDutyTerritory_dictText(dutyTerritoryNew);
+					}
+					projectLawsInventoryEOS.add(lawsInventoryEO);
+				}
+			}
+			if(ObjectUtils.isEmpty(projectLawsInventoryEOS)){
+				emptyList.add(projectLawsInventoryEO);
+			}
+
+			if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
+				map.put("lawsInventoryId",projectLawsInventoryEO.getId());
+				map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle);
+				map.put("result",projectLawsInventoryEOS);
+				mapList.add(map);
+			}else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){
+				Map<String,Object> mapTemp = new HashMap<>();
+				mapTemp.put("lawsInventoryId",projectLawsInventoryEO.getId());
+				mapTemp.put("result",projectLawsInventoryEOS);
+				mapListOne.add(mapTemp);
+			}
+		}
+		if(!mapListOne.isEmpty()){
+			//匹配一条平台件时直接新增
+			List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
+			for (Map<String, Object> map : mapListOne) {
+				LawsInventoryPlatformEO inventoryPlatformEO = new LawsInventoryPlatformEO();
+				inventoryPlatformEO.setCreateTime(new Date());
+				inventoryPlatformEO.setUpdateTime(new Date());
+				inventoryPlatformEO.setLawsInventoryId((String) map.get("lawsInventoryId"));
+				List<ProjectLawsInventoryEO> projectLawsInventoryEOS = (List<ProjectLawsInventoryEO>) map.get("result");
+				inventoryPlatformEO.setPlatformLawsInventoryId(projectLawsInventoryEOS.get(0).getId());
+				lawsInventoryPlatformEOS.add(inventoryPlatformEO);
+			}
+
+			if (!lawsInventoryPlatformEOS.isEmpty()) {
+				lawsInventoryPlatformEOService.saveBatch(lawsInventoryPlatformEOS);
+			}
+		}
+		//法规清单未匹配上平台件的提示语
+		String html = getMsg(cut, sysDictItemList, emptyList);
+
+		Map<String,Object> map = new HashMap<>();
+		map.put("msg",html);
+		map.put("result",mapList);
+		return map;
+	}
 
 	private void hearSort(Map<String, Object> params, List<ProjectLibraryBase> resultLast) {
 		if(ObjectUtils.isNotEmpty(params.get("orderByField"))){
@@ -1393,10 +1751,12 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 
 	public String getMarket(Map<String, Object> params, List<DictModel> targetMarketList, ProjectLibraryBase projectLibraryBase) {
 		List<DictModel> dictModelList = new ArrayList<>();
-		for (String s : projectLibraryBase.getTargetMarket().split(",")) {
-			List<DictModel> dictModelListTemp = targetMarketList.stream()
-					.filter(e -> s.equals(e.getValue())).collect(Collectors.toList());
-			dictModelList.addAll(dictModelListTemp);
+		if(StringUtils.isNotBlank(projectLibraryBase.getTargetMarket())){
+			for (String s : projectLibraryBase.getTargetMarket().split(",")) {
+				List<DictModel> dictModelListTemp = targetMarketList.stream()
+						.filter(e -> s.equals(e.getValue())).collect(Collectors.toList());
+				dictModelList.addAll(dictModelListTemp);
+			}
 		}
 		String targetMarket = "";
 		if(dictModelList.size() != 0){

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java

@@ -17,9 +17,11 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 项目名信息表
@@ -132,27 +134,56 @@ public class ProjectNameInfoEOServiceImpl extends ServiceImpl<ProjectNameInfoEOM
 	 */
 	@Override
 	public List<ProjectLibraryBase> queryProjectNameList(String cut) {
-		List<ProjectLibraryBase> projectLibraryBaseList = problemManagementEOMapper.queryByIds(null);
+		List<ProjectLibraryBase> projectLibraryBaseList = problemManagementEOMapper.queryByIdsProblem(null);
 		//目标市场数据字典
 		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
-		for (ProjectLibraryBase projectLibraryBase : projectLibraryBaseList) {
-			//目标市场
-			String targetMarket = problemManagementEOService.getMarket(cut, targetMarketList, projectLibraryBase);
-			//主项目的版本号
-			String projectVersion = "";
-			if(com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getParentId())){
-				projectVersion = "00";
+
+		List<ProjectLibraryBase> projectLibraryBaseParentList = projectLibraryBaseList.stream().filter(e -> StringUtils.isBlank(e.getParentId())).distinct().collect(Collectors.toList());
+
+		List<ProjectLibraryBase> result = new LinkedList<>();
+		for (ProjectLibraryBase projectLibraryBase : projectLibraryBaseParentList) {
+			//子项目
+			List<ProjectLibraryBase> children = projectLibraryBaseList.stream()
+					.filter(e -> StringUtils.isNotBlank(e.getParentId()) && projectLibraryBase.getId().equals(e.getParentId())).collect(Collectors.toList());
+			if(children.size() != 0){
+				//子项目的基础上添加的子项目
+				List<String> childrenIdList = children.stream().map(ProjectLibraryBase::getId).distinct().collect(Collectors.toList());
+				List<ProjectLibraryBase> childrenList = projectLibraryBaseList.stream()
+						.filter(e -> StringUtils.isNotBlank(e.getParentId()) && childrenIdList.contains(e.getParentId())).collect(Collectors.toList());
+				children.addAll(childrenList);
+
+				//按版本排序
+				Collections.sort(children);
+				result.add(projectLibraryBase);
+				result.addAll(children);
 			}else{
-				projectVersion = projectLibraryBase.getProjectVersion();
-			}
-			if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){
-				projectLibraryBase.setProjectName(projectLibraryBase.getProjectName()
-						+ "-" + projectLibraryBase.getYearName()
-						+ "-" + targetMarket
-						+"-"+projectVersion);
+				result.add(projectLibraryBase);
 			}
 		}
-		return projectLibraryBaseList;
+		for (ProjectLibraryBase projectLibraryBase : result) {
+			if(StringUtils.isBlank(projectLibraryBase.getPlatform())){
+				//目标市场
+				String targetMarket = problemManagementEOService.getMarket(cut, targetMarketList, projectLibraryBase);
+				//主项目的版本号
+				String projectVersion = "";
+				if(StringUtils.isBlank(projectLibraryBase.getParentId())){
+					projectVersion = "00";
+				}else{
+					projectVersion = projectLibraryBase.getProjectVersion();
+				}
+				if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){
+					String projectName = projectLibraryBase.getProjectName();
+					String yearName = projectLibraryBase.getYearName();
+					projectLibraryBase.setProjectName(projectLibraryBase.getProjectName()
+							+ "-" + projectLibraryBase.getYearName()
+							+ "-" + targetMarket
+							+"-"+projectVersion);
+				}
+			}else{
+				projectLibraryBase.setProjectName(projectLibraryBase.getProjectNameId());
+			}
+		}
+		return result;
 	}
 
 /*	@Override

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml

@@ -67,8 +67,12 @@
                 pi.project_laws_inventory_id,
                 pi.buss_document_library_id,
                 pi.acti_proc_inst_id,
-                <!--pni.project_name,-->
-                <!--concat( pni.project_name, '-', pyni.year_name ) AS project_name,-->
+                case
+                when
+                year_name_id is null
+                THEN plb.project_name_id
+                when year_name_id is not null
+                THEN
                 concat(
                     pni.project_name, '-',
                     pyni.year_name, '-',
@@ -87,7 +91,7 @@
                             AND dict_id = ( SELECT id FROM sys_dict WHERE dict_code = 'region' )
                     ) , '-',
                     plb.project_version
-                ) AS project_name,
+                ) end AS project_name,
                 pyni.year_name,
                 pli.serial_number,
                 pli.title,
@@ -109,7 +113,8 @@
                 plb.target_market,
                 plb.studio_engineer,
                 plb.project_version,
-                plb.parent_id
+                plb.parent_id,
+                plb.platform
             FROM
                 process_info pi
                 left join project_library_base plb on plb.id = pi.project_library_id
@@ -160,8 +165,12 @@
                    pi.project_laws_inventory_id,
                    pi.buss_document_library_id,
                    pi.acti_proc_inst_id,
-                   <!--pni.project_name,-->
-                   <!--concat( pni.project_name, '-', pyni.year_name ) AS project_name,-->
+                   case
+                   when
+                   year_name_id is null
+                   THEN plb.project_name_id
+                   when year_name_id is not null
+                   THEN
                     concat(
                         pni.project_name, '-',
                         pyni.year_name, '-',
@@ -180,7 +189,7 @@
                                 AND dict_id = ( SELECT id FROM sys_dict WHERE dict_code = 'region' )
                         ) , '-',
                         plb.project_version
-                    ) AS project_name,
+                    ) end AS project_name,
                    pyni.year_name,
                    pli.serial_number,
                    pli.title,
@@ -201,8 +210,9 @@
                    plb.target_market,
                    plb.studio_engineer,
                    plb.project_version,
-                   plb.parent_id
-               FROM
+                   plb.parent_id,
+                   plb.platform
+        FROM
                    process_info pi
                    LEFT JOIN project_library_base plb ON plb.id = pi.project_library_id
                    LEFT JOIN project_name_info pni ON pni.id = plb.project_name_id
@@ -230,8 +240,12 @@
                    pi.project_laws_inventory_id,
                    pi.buss_document_library_id,
                    pi.acti_proc_inst_id,
-                    <!--pni.project_name,-->
-                    <!--concat( pni.project_name, '-', pyni.year_name ) AS project_name,-->
+                   case
+                   when
+                   year_name_id is null
+                   THEN plb.project_name_id
+                   when year_name_id is not null
+                   THEN
                     concat(
                         pni.project_name, '-',
                         pyni.year_name, '-',
@@ -250,7 +264,7 @@
                                 AND dict_id = ( SELECT id FROM sys_dict WHERE dict_code = 'region' )
                         ) , '-',
                         plb.project_version
-                    ) AS project_name,
+                    ) end AS project_name,
                    pyni.year_name,
                    '--' as serial_number,
                    '--' as standard_info,
@@ -265,34 +279,6 @@
                             process_info_detail pid
                        where pid.process_info_id = pi.id and pid.STATUS = 'NotDone' and pid.end_time is not null and pid.user_id = #{params.currentUserId}  order by pid.end_time asc limit 1
                    ) as end_time,
-                    <!--(
-                        case when flow_type = '21' then
-                            (
-                                SELECT
-                                    pci.end_time
-                                FROM
-                                    project_certification_inventory pci
-                                WHERE
-                                    pci.project_library_id = pi.id
-                                    AND ( pci.flow_status = 'List to be checked' OR pci.flow_status = 'Refusal of responsible person' )
-                                ORDER BY
-                                pci.end_time ASC
-                                LIMIT 1
-                            )
-                            when flow_type = '10' then
-                            (
-                                SELECT
-                                    pid.end_time
-                                FROM
-                                    process_info_detail pid
-                                WHERE
-                                    pid.process_info_id = pi.id
-                                    AND pid.STATUS = 'NotDone'
-                                ORDER BY
-                                pid.end_time ASC
-                                LIMIT 1
-                            ) end
-                    )AS end_time,-->
                    pi.STATUS,
                    pi.prc_num,
                    pi.prc_name,
@@ -300,7 +286,8 @@
                    plb.target_market,
                    plb.studio_engineer,
                    plb.project_version,
-                   plb.parent_id
+                   plb.parent_id,
+                   plb.platform
                FROM
                    process_info pi
                    LEFT JOIN project_library_base plb ON plb.id = pi.project_library_id
@@ -321,7 +308,7 @@
                     <foreach collection="params.qdqrFlowTypeValue" index="index" item="item" open="(" separator="," close=")">
                         #{item}
                     </foreach>
-        )temp
+                   )temp
         <include refid="BaseQuerySql"/>
         order by
             temp.end_time IS NULL,
@@ -467,6 +454,7 @@
                 <foreach collection="params.flowTypeList" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
+                and plb.platform is null
             union
             SELECT
                 pi.id,
@@ -537,6 +525,7 @@
             <foreach collection="params.qdqrFlowTypeValue" index="index" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
+            and plb.platform is null
             <if test="params.mobileProcessing == 0">
             union
             SELECT

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java

@@ -120,4 +120,7 @@ public class ProcessInfoVO implements Serializable {
     private String dutyTerritoryName;
     /**流程类型排序字段*/
     private String flowTypeShowOrderBy;
+
+    //该字段有值时，代表数据为平台件的数据
+    private String platform;
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java

@@ -2,15 +2,21 @@ package com.jero.modules.wkflow.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
+import com.jero.modules.project.entity.LawsInventoryPlatformEO;
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
 import com.jero.modules.project.enums.CertificationFlowNodeEnum;
 import com.jero.modules.project.enums.OperatorTypeEnum;
 import com.jero.modules.project.enums.RequestSourceEnum;
 import com.jero.modules.project.enums.ReviewResultEnum;
+import com.jero.modules.project.service.impl.LawsInventoryPlatformEOServiceImpl;
+import com.jero.modules.project.service.impl.ProjectLawsInventoryEOServiceImpl;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.todoCenter.entity.ProcessInfoEO;
@@ -23,18 +29,17 @@ import com.jero.modules.wkflow.enums.FlowTypeEnum;
 import com.jero.modules.wkflow.mapper.ProcessHistoryEOMapper;
 import com.jero.modules.wkflow.service.IProcessHistoryEOService;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 /**
  * @Description: 流程历史表
  * @Author: jero-boot
@@ -50,6 +55,10 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl<ProcessHistoryEOMap
 	private IProcessInfoEOService processInfoEOService;
 	@Autowired
 	private IOSSFileService ossFileService;
+	@Autowired
+	private LawsInventoryPlatformEOServiceImpl lawsInventoryPlatformEOService;
+	@Autowired
+	private ProjectLawsInventoryEOServiceImpl projectLawsInventoryEOService;
 
 	/**
 	 * 保存
@@ -296,6 +305,22 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl<ProcessHistoryEOMap
 		if (StringUtils.isEmpty(projectLawsInventoryId)) {
 			throw new JeroBootException("法规清单id不能为空！");
 		}
+		//查询是否关联平台件
+		LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(LawsInventoryPlatformEO::getLawsInventoryId,projectLawsInventoryId);
+		List<LawsInventoryPlatformEO> platformEOList = lawsInventoryPlatformEOService.list(wrapper);
+
+		//List<String> valueList = FlowStateEnum.getValueInfo();
+		List<ProjectLawsInventoryEO> lawsInventoryEOList = new ArrayList<>();
+		if(ObjectUtils.isNotEmpty(platformEOList)){
+			List<String> lawsInventoryIdList = platformEOList.stream()
+					.map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).distinct().collect(Collectors.toList());
+			lawsInventoryEOList = projectLawsInventoryEOService.listByIds(lawsInventoryIdList);
+			if(ObjectUtils.isNotEmpty(lawsInventoryEOList)){
+				projectLawsInventoryId = lawsInventoryEOList.get(0).getId();
+			}
+		}
+
 		String flowType = (String) params.get("flowType");
 		List<String> flowTypeList = new ArrayList<>();
 		flowTypeList.add(flowType);