待办中心-项目详情

2023-09-15 17:17:58 +08:00
parent a94e803313
commit 20e0f1283d
5 changed files with 87 additions and 6 deletions
@@ -170,6 +170,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
    *
@@ -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);
@@ -285,6 +285,15 @@
        </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
+    </select>

    <select id="selectProjectName" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
        SELECT
@@ -70,6 +70,8 @@ public interface IProjectLibraryBaseService extends IService<ProjectLibraryBase>
 	 */
 	List<ProjectLibraryBase> queryById(String id,String cut);

+	List<ProjectLibraryBase> queryByIdFlow(String id,String cut);
+
    /**
 	 * 列表查询
 	 *
@@ -22,17 +22,43 @@ 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.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.SysDictItem;
 import com.jero.modules.system.entity.SysUser;
@@ -50,7 +76,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;
@@ -1001,6 +1026,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;
+	}

 	/**
 	 * 列表查询