space系统关联项目库修改

2022-05-20 17:44:50 +08:00
parent 9de55d1001
commit 5d07ce440d
6 changed files with 37 additions and 15 deletions
@@ -9,7 +9,6 @@ import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.project.entity.ProjectNameInfoEO;
 import com.jero.modules.project.service.IProjectNameInfoEOService;
-import com.jero.modules.system.util.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -70,11 +69,6 @@ public class ProjectNameInfoEOController extends JeroController<ProjectNameInfoE
 	@GetMapping(value = "/list")
 	public Result<List<ProjectNameInfoEO>> queryList() {
 		List<ProjectNameInfoEO> list = projectNameInfoEOService.queryList();
-		for(ProjectNameInfoEO projectNameInfoEO : list){
-			if(StringUtils.isNotBlank(projectNameInfoEO.getYearName())){
-				projectNameInfoEO.setProjectName(projectNameInfoEO.getProjectName()+ "-" +projectNameInfoEO.getYearName());
-			}
-		}
 		return Result.OK(list);
 	}

@@ -37,6 +37,12 @@ public class ProjectLibraryBase implements Serializable {
    @TableField(exist = false)
    private java.lang.String projectName;

+    /**年款号id*/
+    private java.lang.String yearNameId;
+    /**年款名称*/
+    @TableField(exist = false)
+    private java.lang.String yearName;
+
    /**目标市场*/
    @Dict(dicCode = "region")
    private java.lang.String targetMarket;
@@ -56,9 +62,11 @@ public class ProjectLibraryBase implements Serializable {
    private java.lang.String certificationEngineerName;

    /**车型平台*/
+    @TableField(exist = false)
    private java.lang.String vehiclePlatform;

    /**数字平台*/
+    @TableField(exist = false)
    private java.lang.String digitalPlatform;

    /**IPD信息*/
@@ -13,7 +13,7 @@ import java.util.List;
 * @Version: V1.0
 */
 public interface ProjectNameInfoEOMapper extends BaseMapper<ProjectNameInfoEO> {
-    @Select("select pni.id,pni.project_name,pyni.year_name,pni.vehicle_platform,pni.digital_platform\n" +
+    @Select("select pni.id,pni.project_name,pnyi.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();
@@ -5,6 +5,7 @@
        <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" />
@@ -26,6 +27,8 @@
            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,
@@ -44,6 +47,7 @@
        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
    </sql>

    <select id="queryPageList" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
@@ -161,14 +165,14 @@
            </if>

            <!--搜索条件:车型平台-->
-            <if test="projectLibraryBase.vehiclePlatform != null and projectLibraryBase.vehiclePlatform != '' ">
-                and plb.vehicle_platform like concat('%',#{projectLibraryBase.vehiclePlatform},'%')
-            </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>
+<!--            <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>
@@ -10,9 +10,11 @@ import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.project.entity.ConditionAssessmentEO;
 import com.jero.modules.project.entity.ProjectLawsInventoryEO;
 import com.jero.modules.project.entity.ProjectLibraryBase;
+import com.jero.modules.project.entity.ProjectNameInfoEO;
 import com.jero.modules.project.enums.*;
 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.ProjectTaskInventoryEOMapper;
 import com.jero.modules.project.service.IConditionAssessmentEOService;
 import com.jero.modules.project.service.IProjectLibraryBaseService;
@@ -73,6 +75,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	@Autowired
 	private SysDictItemServiceImpl sysDictItemServiceImpl;

+	@Autowired
+	private ProjectNameInfoEOMapper projectNameInfoEOMapper;
+
 	/**
 	 * 保存
 	 *
@@ -88,6 +93,12 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		projectLibraryBase.setCreateBy(sysUser.getUsername());
 		projectLibraryBase.setUpdateBy(sysUser.getUsername());
+		String yearNameId = projectLibraryBase.getYearNameId();
+		String digitalPlatform = projectLibraryBase.getDigitalPlatform();
+		String vehiclePlatform = projectLibraryBase.getVehiclePlatform();
+
+		List<ProjectNameInfoEO> projectNameAndYear = projectNameInfoEOMapper.selectProjectNameAndYear();
+//		projectNameAndYear.stream().filter("year_id")
 		save(projectLibraryBase);

 		//创建任务计划时间轴
@@ -168,6 +179,11 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		IPage<ProjectLibraryBase> result = projectLibraryBaseMapper.queryPageList(page, params);
 		List<ProjectLibraryBase> records = result.getRecords();
 		disposeData(records);
+		for(ProjectLibraryBase projectLibraryBase: records){
+			if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){
+				projectLibraryBase.setProjectName(projectLibraryBase.getProjectName() + "-" + projectLibraryBase.getYearName());
+			}
+		}
 		return result;
 	}

@@ -28,7 +28,7 @@ import java.util.UUID;
@Service
 public class ProjectNameInfoEOServiceImpl extends ServiceImpl<ProjectNameInfoEOMapper, ProjectNameInfoEO> implements IProjectNameInfoEOService {
 	@Autowired
-	private ProjectNameInfoEOMapper prjectNameMapper;
+	private ProjectNameInfoEOMapper projectNameInfoEOMapper;

 	@Autowired
 	private SpaceServiceImpl spaceService;
@@ -102,7 +102,7 @@ public class ProjectNameInfoEOServiceImpl extends ServiceImpl<ProjectNameInfoEOM
 	 */
 	@Override
 	public List<ProjectNameInfoEO> queryList() {
-		List<ProjectNameInfoEO> projectNameAndYear = prjectNameMapper.selectProjectNameAndYear();
+		List<ProjectNameInfoEO> projectNameAndYear = projectNameInfoEOMapper.selectProjectNameAndYear();
 		return projectNameAndYear;
 	}