联建单位-简要信息列表

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitListbriefFormDTO.java

@@ -0,0 +1,55 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PartyUnitListbriefFormDTO extends PageFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -2776705671944626707L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 组织id
+     */
+    @NotBlank(message = "组织id不能为空")
+    private String agencyId;
+
+    /**
+     * 单位名称
+     */
+    private String unitName;
+
+    /**
+     * 服务事项
+     */
+    private String serviceMatter;
+
+    /**
+     * 分类
+     */
+    private String type;
+
+    /**
+     * 联系人
+     */
+    private String contact;
+
+    /**
+     * 联系人电话
+     */
+    private String contactMobile;
+
+
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyUnitListbrieResultDTO.java

@@ -0,0 +1,41 @@
+package com.epmet.dto.result;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PartyUnitListbrieResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -300315089751537091L;
+
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * 所属网格
+     */
+    private String gridName;
+
+    /**
+     * 分类
+     */
+    private String type;
+
+    /**
+     * 服务事项
+     */
+    private String serviceMatter;
+
+    /**
+     * 单位名称
+     */
+    private String unitName;
+
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java

@@ -36,9 +36,11 @@ import com.epmet.dto.IcPartyUnitDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
 import com.epmet.dto.form.PartyActivityFormDTO;
 import com.epmet.dto.form.PartyUnitFormDTO;
+import com.epmet.dto.form.PartyUnitListbriefFormDTO;
 import com.epmet.dto.form.demand.ServiceQueryFormDTO;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.dto.result.PartyUnitDistributionResultDTO;
+import com.epmet.dto.result.PartyUnitListbrieResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.excel.IcPartyUnitExcel;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
@@ -53,6 +55,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -233,6 +236,20 @@ public class IcPartyUnitController {
         return new Result<List<PartyUnitDistributionResultDTO>>().ok(icPartyUnitService.distribution(formDTO));
     }
 
+    /**
+     * 联建单位-简要信息列表
+     *
+     * @param form
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData>
+     * @author LZN
+     * @date 2022/5/18 13:54
+     */
+    @PostMapping("/listbrief")
+    public Result<PageData> getListbrief(@RequestBody PartyUnitListbriefFormDTO form){
+        ValidatorUtils.validateEntity(form);
+        PageData data = icPartyUnitService.getListbrief(form);
+        return new Result<PageData>().ok(data);
+    }
 
     /**
      * 计算区域化党建单位的群众满意度

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java

@@ -19,7 +19,9 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
+import com.epmet.dto.form.PartyUnitListbriefFormDTO;
 import com.epmet.dto.result.PartyUnitDistributionResultDTO;
+import com.epmet.dto.result.PartyUnitListbrieResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcPartyUnitEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -66,4 +68,14 @@ public interface IcPartyUnitDao extends BaseDao<IcPartyUnitEntity> {
     List<PartyUnitDistributionResultDTO> getDistribution(@Param("agencyId")String agencyId);
 
     int updateSatisfaction(@Param("partyUnitId") String serverId, @Param("satisfaction") BigDecimal satisfaction);
+
+    /**
+     * 联建单位-简要信息列表
+     *
+     * @param form
+     * @return java.util.List<com.epmet.dto.result.PartyUnitListbrieResultDTO>
+     * @author LZN
+     * @date 2022/5/18 13:54
+     */
+    List<PartyUnitListbrieResultDTO> getListbrief(PartyUnitListbriefFormDTO form);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java

@@ -25,8 +25,10 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IcPartyUnitDTO;
 import com.epmet.dto.form.PartyActivityFormDTO;
 import com.epmet.dto.form.PartyUnitFormDTO;
+import com.epmet.dto.form.PartyUnitListbriefFormDTO;
 import com.epmet.dto.form.demand.ServiceQueryFormDTO;
 import com.epmet.dto.result.PartyUnitDistributionResultDTO;
+import com.epmet.dto.result.PartyUnitListbrieResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcPartyUnitEntity;
 import org.springframework.web.multipart.MultipartFile;
@@ -158,4 +160,10 @@ public interface IcPartyUnitService extends BaseService<IcPartyUnitEntity> {
     void calPartyUnitSatisfation(ServerSatisfactionCalFormDTO formDTO);
 
     List<IcPartyUnitEntity> queryListById(List<String> partyUnitIds);
+
+    /**
+     * 联建单位-简要信息列表
+     * @param form
+     */
+    PageData getListbrief(PartyUnitListbriefFormDTO form);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java

@@ -51,8 +51,10 @@ import com.epmet.dto.IcPartyUnitDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
 import com.epmet.dto.form.PartyActivityFormDTO;
 import com.epmet.dto.form.PartyUnitFormDTO;
+import com.epmet.dto.form.PartyUnitListbriefFormDTO;
 import com.epmet.dto.form.demand.ServiceQueryFormDTO;
 import com.epmet.dto.result.PartyUnitDistributionResultDTO;
+import com.epmet.dto.result.PartyUnitListbrieResultDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.dto.result.demand.ServiceStatDTO;
@@ -594,6 +596,14 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
         return Collections.EMPTY_LIST;
     }
 
+    @Override
+    public PageData getListbrief(PartyUnitListbriefFormDTO form) {
+            PageHelper.startPage(form.getPageNo(),form.getPageSize());
+            List<PartyUnitListbrieResultDTO> dto = baseDao.getListbrief(form);
+            PageInfo<PartyUnitListbrieResultDTO> info = new PageInfo<>(dto);
+            return new PageData<>(dto,info.getTotal());
+    }
+
     private String getServiceMatter(Map<String, String> map, String matter) {
         List<String> matters = Arrays.asList(matter.split(StrConstant.COLON));
         List<String> list = matters.stream().map(map::get).collect(Collectors.toList());

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml

@@ -73,6 +73,42 @@
         ORDER BY
             ID
     </select>
+    <select id="getListbrief" resultType="com.epmet.dto.result.PartyUnitListbrieResultDTO">
+        SELECT
+            a.id,
+            b.GRID_ID,
+            a.UNIT_NAME,
+            a.type,
+            a.SERVICE_MATTER
+        FROM
+            ic_party_unit a
+            LEFT JOIN ic_party_activity b ON a.id = b.UNIT_ID
+            AND b.DEL_FLAG = '0'
+        <where>
+            a.DEL_FLAG = '0'
+            AND a.AGENCY_ID = #{agencyId}
+            <if test="gridId != null and gridId != ''">
+                AND b.GRID_ID = #{gridId}
+            </if>
+            <if test="unitName != null and unitName != ''">
+                AND a.UNIT_NAME = #{unitName}
+            </if>
+            <if test="serviceMatter != null and serviceMatter != ''">
+                AND a.SERVICE_MATTER = #{serviceMatter}
+            </if>
+            <if test="type != null and type != ''">
+                AND a.type = #{type}
+            </if>
+            <if test="contact != null and contact != ''">
+                AND a.CONTACT = #{contact}
+            </if>
+            <if test="contactMobile != null and contactMobile != ''">
+                AND a.CONTACT_MOBILE = #{contactMobile}
+            </if>
+        </where>
+        order by
+            a.CREATED_TIME
+    </select>
 
     <update id="updateSatisfaction" parameterType="map">
         update ic_party_unit