需求人列表

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DemandUserFormDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+@Data
+public class DemandUserFormDTO implements Serializable {
+    public interface InternalGroup {
+    }
+
+//    public interface GridIdGroup extends CustomerClientShowGroup {
+//    }
+
+    @NotBlank(message = "工作人员所属组织id不能为空", groups = InternalGroup.class)
+    private String agencyId;
+
+//    @NotBlank(message = "请先选择所属网格", groups = GridIdGroup.class)
+    private String gridId;
+
+
+    private String name;
+
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/DemandUserResDTO.java

@@ -0,0 +1,14 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class DemandUserResDTO implements Serializable {
+    private String icResiUserId;
+    private String name;
+    private String mobile;
+    private String label;
+    private String gridId;
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -660,4 +660,15 @@ public class IcResiUserController {
         return new Result<Map<String, Map<String, String>>>().ok(icResiUserService.getHomeUserCategoryCount(formDTO.getBuildId()));
     }
 
+    /**
+     * @LoginUser TokenDto tokenDto,
+     * 新增需求，需求人列表：展示当前工作人员所属组织+页面已选择所属网格 下的居民列表
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("demandusers")
+    public Result<List<DemandUserResDTO>> queryDemandUsers(@RequestBody DemandUserFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, DemandUserFormDTO.InternalGroup.class);
+        return new Result<List<DemandUserResDTO>>().ok(icResiUserService.queryDemandUsers(formDTO));
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -19,6 +19,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.ResiUserQueryValueDTO;
+import com.epmet.dto.result.DemandUserResDTO;
 import com.epmet.dto.result.IcFormResColumnDTO;
 import com.epmet.dto.result.PersonDataResultDTO;
 import com.epmet.dto.result.SearchByNameResultDTO;
@@ -145,4 +146,14 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
     Map<String,String> selectPersonType(@Param("columns")List<String> columns,@Param("customerId")String customerId,
                                         @Param("tableName")String tableName,@Param("userId")String userId);
 
+    /**
+     *
+     * @param agencyId
+     * @param gridId
+     * @param name
+     * @return
+     */
+    List<DemandUserResDTO> selectDemandUsers(@Param("agencyId") String agencyId,
+                                             @Param("gridId")String gridId,
+                                             @Param("name")String name);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

@@ -139,4 +139,6 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      * @return
      */
     List<FormItemResult> listFormItems(String customerId, String formCode);
+
+    List<DemandUserResDTO> queryDemandUsers(DemandUserFormDTO formDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -840,4 +840,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         Result<List<FormItemResult>> result = operCustomizeOpenFeignClient.listItems(form);
         return getResultDataOrThrowsException(result, ServiceConstant.OPER_CUSTOMIZE_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "查询表单相关信息失败", null);
     }
+
+    @Override
+    public List<DemandUserResDTO> queryDemandUsers(DemandUserFormDTO formDTO) {
+        return baseDao.selectDemandUsers(formDTO.getAgencyId(),formDTO.getGridId(),formDTO.getName());
+    }
 }

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -271,4 +271,27 @@
             AND IC_RESI_USER = #{userId}
         </if>
     </select>
+
+
+    <select id="selectDemandUsers" parameterType="map" resultType="com.epmet.dto.result.DemandUserResDTO">
+    SELECT
+        ir.id as icResiUserId,
+        IFNULL(ir.`NAME`,'') AS name,
+        IFNULL(ir.MOBILE,'') AS mobile,
+        concat(ir.`NAME`,'(',ir.MOBILE,')')as label,
+        ir.grid_id as gridId
+    FROM
+        ic_resi_user ir
+    WHERE
+        ir.DEL_FLAG = '0'
+        AND ir.AGENCY_ID = #{agencyId}
+        <if test="gridId != null and gridId != ''">
+            AND ir.GRID_ID = #{gridId}
+        </if>
+        <if test="name != null and name != ''">
+            AND ir.`NAME` concat('%',#{name},'%')
+        </if>
+    ORDER BY
+        CONVERT ( ir.NAME USING gbk ) ASC
+    </select>
 </mapper>