组织领导班子提交

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgLeaderDTO.java

@@ -93,4 +93,13 @@ public class IcPartyOrgLeaderDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 组织名称
+     */
+    private String orgName;
+    /**
+     * 父组织名称
+     */
+    private String orgPidName;
+
 }

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

@@ -19,7 +19,11 @@ package com.epmet.modules.partyOrg.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.partyOrg.entity.IcPartyOrgLeaderEntity;
+import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgLeaderDTO;
 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 IcPartyOrgLeaderDao extends BaseDao<IcPartyOrgLeaderEntity> {
 
+    List<IcPartyOrgLeaderDTO> partyOrgLeaderList(@Param("type") String type);
 }

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

@@ -92,4 +92,6 @@ public interface IcPartyOrgLeaderService extends BaseService<IcPartyOrgLeaderEnt
      * @date 2024-03-06
      */
     void delete(String[] ids);
+
+    List<IcPartyOrgLeaderDTO> partyOrgLeaderList(String type);
 }

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

@@ -99,4 +99,9 @@ public class IcPartyOrgLeaderServiceImpl extends BaseServiceImpl<IcPartyOrgLeade
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public List<IcPartyOrgLeaderDTO> partyOrgLeaderList(String type) {
+        return baseDao.partyOrgLeaderList(type);
+    }
+
 }

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

@@ -9,6 +9,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.modules.partyOrg.service.IcPartyOrgLeaderService;
 import com.epmet.modules.partyOrg.service.YiFengPartyOrgService;
 import com.epmet.modules.partymember.service.IcPartyPlaceService;
 import com.epmet.modules.partymember.service.YiFengScreenService;
@@ -16,6 +17,7 @@ import com.epmet.resi.partymember.dto.IcPartyPlaceDTO;
 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;
+import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgLeaderDTO;
 import com.epmet.resi.partymember.dto.partyOrg.result.LingShanPartyOrgAndOtherObjQtyRstDTO;
 import com.epmet.resi.partymember.dto.partyOrg.result.LingShanScreenPartyObjectByTypeRstDTO;
 import com.epmet.resi.partymember.dto.partymember.result.*;
@@ -42,6 +44,22 @@ public class YiFengScreenController {
     @Autowired
     private IcPartyPlaceService icPartyPlaceService;
 
+    @Autowired
+    private IcPartyOrgLeaderService icPartyOrgLeaderService;
+
+
+    /**
+     * @Description: 领导班子列表
+     * @param type:
+     * @Return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgLeaderDTO>>
+     * @Author: lichao
+     * @Date: 2024/3/6 16:41
+     */
+    @GetMapping("partyOrgLeaderList")
+    public Result<List<IcPartyOrgLeaderDTO>> partyOrgLeaderList(@RequestParam String type){
+        List<IcPartyOrgLeaderDTO> result = icPartyOrgLeaderService.partyOrgLeaderList(type);
+        return new Result<List<IcPartyOrgLeaderDTO>>().ok(result);
+    }
     /**
      * @Description: 移风党建列表
      * @param params:

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

@@ -17,6 +17,20 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="partyOrgLeaderList" resultType="com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgLeaderDTO">
+
+        select org.PARTY_ORG_NAME as orgName,orgP.PARTY_ORG_NAME as orgPidName,leader.*
+        from ic_party_org_leader leader
+                 left join ic_party_org org on org.ID = leader.PARTY_ORG_ID
+                 left join ic_party_org orgP on orgP.ID = org.ORG_PID
+        where
+            leader.DEL_FLAG = 0
+          <if test="type !=null and type != ''">
+              and
+              org.PARTY_ORG_TYPE = #{type}
+          </if>
+          order by org.id,orgP.id
+    </select>
 
 
 </mapper>