项目状态看板查询

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

@@ -57,8 +57,8 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
 	@AutoLog(value = "项目库基础表-列表查询")
     @ApiOperation(value="项目库基础表-列表查询", notes="项目库基础表-列表查询")
 	@GetMapping(value = "/list")
-	public Result<List<ProjectLibraryBase>> queryList() {
-        List<ProjectLibraryBase> list = projectLibraryBaseService.queryList();
+	public Result<List<ProjectLibraryBase>> queryList(ProjectLibraryBase projectLibraryBase) {
+        List<ProjectLibraryBase> list = projectLibraryBaseService.getList(projectLibraryBase);
         return Result.OK(list);
 	}
 

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

@@ -3,6 +3,7 @@ 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;
 
 import java.util.List;
 import java.util.Map;
@@ -17,6 +18,8 @@ public interface ProjectLibraryBaseMapper extends BaseMapper<ProjectLibraryBase>
     /**分页列表*/
     IPage<ProjectLibraryBase> queryPageList(IPage page, Map<String, Object> params);
 
+    List<ProjectLibraryBase> getList(@Param("projectLibraryBase") ProjectLibraryBase projectLibraryBase);
+
     /**根据id查询*/
     List<ProjectLibraryBase> queryById(String id);
 

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

@@ -109,6 +109,69 @@
         </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.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"/>
@@ -119,4 +182,4 @@
         </where>
         order by plb.create_time desc
     </select>
-</mapper>
+</mapper>

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

@@ -61,7 +61,7 @@ public interface IProjectLibraryBaseService extends IService<ProjectLibraryBase>
 	 *
 	 * @return
 	 */
-    List<ProjectLibraryBase> queryList();
+    List<ProjectLibraryBase> getList(ProjectLibraryBase projectLibraryBase);
 
 	/**
 	 * 分页列表查询

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

@@ -138,8 +138,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	 * @return
 	 */
 	@Override
-	public List<ProjectLibraryBase> queryList() {
-		return list();
+	public List<ProjectLibraryBase> getList(ProjectLibraryBase projectLibraryBase) {
+		List<ProjectLibraryBase> list = projectLibraryBaseMapper.getList(projectLibraryBase);
+		return list;
 	}
 
 	/**

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

@@ -63,10 +63,10 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
     @Override
     public List<List<TimeNodeVO>> timelineList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req) {
 
-        QueryWrapper<ProjectLibraryBase> queryWrapper = QueryGenerator.initQueryWrapper(projectLibraryBase, req.getParameterMap());
+//        QueryWrapper<ProjectLibraryBase> queryWrapper = QueryGenerator.initQueryWrapper(projectLibraryBase, req.getParameterMap());
 
         //项目库信息
-        List<ProjectLibraryBase> projectLibraryBaseList = projectLibraryBaseService.list(queryWrapper);
+        List<ProjectLibraryBase> projectLibraryBaseList = projectLibraryBaseService.getList(projectLibraryBase);
         List<List<TimeNodeVO>> result = new ArrayList<>();
         if(projectLibraryBaseList.size() != 0){
             //项目库id
@@ -85,12 +85,16 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
      */
     @Override
     public List<Map<String,Object>> scheduleInfoList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req) {
+       if(StringUtils.isNotBlank(projectLibraryBase.getProjectName())){
+           projectLibraryBase.setProjectName(projectLibraryBase.getProjectName().replace("*",""));
+       }
         //目标市场数据字典
         List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsByDictCode("region");
-        QueryWrapper<ProjectLibraryBase> queryWrapper = QueryGenerator.initQueryWrapper(projectLibraryBase, req.getParameterMap());
-        queryWrapper.orderByDesc("create_time");
-        //项目库信息
-        List<ProjectLibraryBase> projectLibraryBaseList = projectLibraryBaseService.list(queryWrapper);
+//        QueryWrapper<ProjectLibraryBase> queryWrapper = QueryGenerator.initQueryWrapper(projectLibraryBase, req.getParameterMap());
+//        queryWrapper.orderByDesc("create_time");
+//        //项目库信息
+//        List<ProjectLibraryBase> projectLibraryBaseList = projectLibraryBaseService.list(queryWrapper);
+        List<ProjectLibraryBase> projectLibraryBaseList = projectLibraryBaseService.getList(projectLibraryBase);
 
         List<Map<String,Object>> result = new ArrayList<>();
         if(projectLibraryBaseList.size() != 0){
@@ -373,7 +377,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
         }else{
             calendarAfter.setTime(new Date());
         }
-        calendarAfter.add(Calendar.YEAR, +6);
+        calendarAfter.add(Calendar.MONTH, +5);
         Date dateAfter = calendarAfter.getTime();
 
         Calendar min = Calendar.getInstance();