完善

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java

@@ -15,7 +15,7 @@ import com.epmet.modules.partyOrg.service.IcPartyWishService;
 import com.epmet.modules.partyOrg.service.YiFengPartyOrgService;
 import com.epmet.modules.partymember.dao.IcPartyMemberDao;
 import com.epmet.modules.partymember.service.*;
-import com.epmet.resi.partymember.dto.IcPartyPlaceDTO;
+import com.epmet.resi.partymember.dto.*;
 import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO;
 import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO;
 import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO;
@@ -33,6 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -68,7 +69,70 @@ public class YiFengScreenController {
     private IcPartyMemberService icPartyMemberService;
     @Autowired
     private IcCultureLegacyService icCultureLegacyService;
+    @Autowired
+    private IcSeedStrategyService icSeedStrategyService;
+    @Autowired
+    private IcSeedPowerService icSeedPowerService;
+    @Autowired
+    private IcSeedProjectService icSeedProjectService;
+
+    @Autowired
+    private IcSeedNewsService icSeedNewsService;
+
 
+    /**
+     * @Description: 种业咨询列表
+     * @param :
+     * @Return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData < com.epmet.resi.partymember.dto.IcSeedNewsDTO>>
+     * @Author: lichao
+     * @Date: 2024/3/20 15:18
+     */
+    @GetMapping("seedNewsList")
+    public Result<PageData<IcSeedNewsDTO>> seedNewsList(){
+        Map<String, Object> params = new HashMap<>();
+        PageData<IcSeedNewsDTO> page = icSeedNewsService.page(params);
+        return new Result<PageData<IcSeedNewsDTO>>().ok(page);
+    }
+
+    /**
+     * @Description: 在谈项目列表
+     * @param :
+     * @Return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData < com.epmet.resi.partymember.dto.IcSeedProjectDTO>>
+     * @Author: lichao
+     * @Date: 2024/3/20 15:15
+     */
+    @GetMapping("seedProjectList")
+    public Result<PageData<IcSeedProjectDTO>> seedProjectList(){
+        Map<String, Object> params = new HashMap<>();
+        PageData<IcSeedProjectDTO> page = icSeedProjectService.page(params);
+        return new Result<PageData<IcSeedProjectDTO>>().ok(page);
+    }
+
+    /**
+     * @Description: 科技人才
+     * @param type:
+     * @Return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.partymember.dto.IcSeedPowerDTO>>
+     * @Author: lichao
+     * @Date: 2024/3/20 15:09
+     */
+    @GetMapping("seedPowerList")
+    public Result<List<IcSeedPowerDTO>> seedPowerList(Integer type){
+        List<IcSeedPowerDTO> result = icSeedPowerService.seedPowerList(type);
+        return new Result<List<IcSeedPowerDTO>>().ok(result);
+    }
+
+    /**
+     * @Description: 领导关怀
+     * @param type:
+     * @Return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.partymember.dto.IcSeedStrategyDTO>>
+     * @Author: lichao
+     * @Date: 2024/3/20 15:06
+     */
+    @GetMapping("seedStrategyList")
+    public Result<List<IcSeedStrategyDTO>> seedStrategyList(Integer type){
+        List<IcSeedStrategyDTO> result = icSeedStrategyService.seedStrategyList(type);
+        return new Result<List<IcSeedStrategyDTO>>().ok(result);
+    }
 
     /**
      * @Description: 文化移风列表

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcSeedPowerDao.java

@@ -19,7 +19,11 @@ package com.epmet.modules.partymember.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.partymember.entity.IcSeedPowerEntity;
+import com.epmet.resi.partymember.dto.IcSeedPowerDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 种都力量
@@ -30,4 +34,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IcSeedPowerDao extends BaseDao<IcSeedPowerEntity> {
 
+    List<IcSeedPowerDTO> seedPowerList(@Param("type") Integer type);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcSeedStrategyDao.java

@@ -19,7 +19,11 @@ package com.epmet.modules.partymember.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.partymember.entity.IcSeedStrategyEntity;
+import com.epmet.resi.partymember.dto.IcSeedStrategyDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 种都战略
@@ -30,4 +34,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IcSeedStrategyDao extends BaseDao<IcSeedStrategyEntity> {
 
+    List<IcSeedStrategyDTO> seedStrategyList(@Param("type") Integer type);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcSeedPowerService.java

@@ -92,4 +92,6 @@ public interface IcSeedPowerService extends BaseService<IcSeedPowerEntity> {
      * @date 2024-03-19
      */
     void delete(String[] ids);
+
+    List<IcSeedPowerDTO> seedPowerList(Integer type);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcSeedStrategyService.java

@@ -93,4 +93,6 @@ public interface IcSeedStrategyService extends BaseService<IcSeedStrategyEntity>
      * @date 2024-03-19
      */
     void delete(String[] ids);
+
+    List<IcSeedStrategyDTO> seedStrategyList(Integer type);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedNewsServiceImpl.java

@@ -67,6 +67,7 @@ public class IcSeedNewsServiceImpl extends BaseServiceImpl<IcSeedNewsDao, IcSeed
 
         QueryWrapper<IcSeedNewsEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+        wrapper.orderByAsc("SORT");
 
         return wrapper;
     }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedPowerServiceImpl.java

@@ -98,4 +98,9 @@ public class IcSeedPowerServiceImpl extends BaseServiceImpl<IcSeedPowerDao, IcSe
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public List<IcSeedPowerDTO> seedPowerList(Integer type) {
+        return baseDao.seedPowerList(type);
+    }
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedProjectServiceImpl.java

@@ -69,6 +69,7 @@ public class IcSeedProjectServiceImpl extends BaseServiceImpl<IcSeedProjectDao,
         QueryWrapper<IcSeedProjectEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
 
+        wrapper.orderByAsc("SORT");
         return wrapper;
     }
 

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedStrategyServiceImpl.java

@@ -100,4 +100,9 @@ public class IcSeedStrategyServiceImpl extends BaseServiceImpl<IcSeedStrategyDao
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public List<IcSeedStrategyDTO> seedStrategyList(Integer type) {
+        return baseDao.seedStrategyList(type);
+    }
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcSeedPowerDao.xml

@@ -19,6 +19,19 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="seedPowerList" resultType="com.epmet.resi.partymember.dto.IcSeedPowerDTO">
+
+
+        select *
+        from ic_seed_power
+        where
+        DEL_FLAG = '0'
+        <if test="type != null">
+            and TYPE = #{type}
+        </if>
+        order by SORT asc
+
+    </select>
 
 
 </mapper>

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcSeedStrategyDao.xml

@@ -20,6 +20,18 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="seedStrategyList" resultType="com.epmet.resi.partymember.dto.IcSeedStrategyDTO">
+
+        select *
+        from ic_seed_strategy
+        where
+        DEL_FLAG = '0'
+        <if test="type != null">
+            and TYPE = #{type}
+        </if>
+        order by SORT asc
+
+    </select>
 
 
 </mapper>