Merge remote-tracking branch 'origin/dev_ic_platform' into develop

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GridOptionFormDTO.java

@@ -0,0 +1,24 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description /gov/org/customergrid/gridoption
+ * @Author yinzuomei
+ * @Date 2021/11/12 10:54 上午
+ */
+@Data
+public class GridOptionFormDTO implements Serializable {
+    /**
+     * 部门Id
+     */
+    @NotBlank(message = "组织机构ID不能为空")
+    private String agencyId;
+    //等着杨林改完，我再限制必填吧
+    //@NotBlank(message = "查询条件和查看居民详情:query;新增或修改居民信息：addorupdate")
+    private String purpose;
+}
+

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java

@@ -289,15 +289,17 @@ public class CustomerGridController {
 
     /**
      * @Description 获取组织下网格选项
+     * 居民信息：1）查询条件 :所属网格下拉框；2）查看详情：所属网格下拉框
+     * label: 社区-网格
+     * value: 网格id
      * @Param formDTO
      * @Return {@link Result<List<OptionResultDTO>>}
      * @Author zhaoqifeng
      * @Date 2021/10/26 14:02
      */
     @PostMapping("gridoption")
-    public Result<List<OptionResultDTO>> getGridOption(@RequestBody AgencyIdFormDTO formDTO){
+    public Result<List<OptionResultDTO>> getGridOption(@RequestBody GridOptionFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO);
-        return new Result<List<OptionResultDTO>>().ok(customerGridService.getGridOption(formDTO.getAgencyId()));
+        return new Result<List<OptionResultDTO>>().ok(customerGridService.getGridOption(formDTO.getAgencyId(),formDTO.getPurpose()));
     }
-
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java

@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.UserIdAndPidDTO;
 import com.epmet.dto.UserIdDTO;
@@ -342,4 +343,6 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @Description 查询组织下直属网格列表
      **/
     List<CustomerGridEntity> selectByPid(@Param("pid") String pid);
+
+    List<OptionResultDTO> getGridOptionForQuery(String gridPids);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java

@@ -337,5 +337,5 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      * @Author zhaoqifeng
      * @Date 2021/10/26 14:01
      */
-    List<OptionResultDTO> getGridOption(String agencyId);
+    List<OptionResultDTO> getGridOption(String agencyId,String purpose);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@@ -844,7 +844,20 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
      * @Date 2021/10/26 14:01
      */
     @Override
-    public List<OptionResultDTO> getGridOption(String agencyId) {
+    public List<OptionResultDTO> getGridOption(String agencyId, String purpose) {
+        //查询条件和查看居民详情:query;新增或修改居民信息：addorupdate
+        if ("query".equals(purpose) || StringUtils.isEmpty(purpose)) {
+            CustomerAgencyDTO customerAgencyDTO = customerAgencyService.get(agencyId);
+            String gridPids = "";
+            if (null != customerAgencyDTO) {
+                if (StringUtils.isEmpty(customerAgencyDTO.getPid()) || NumConstant.ZERO_STR.equals(customerAgencyDTO.getPid())) {
+                    gridPids = agencyId;
+                } else {
+                    gridPids = customerAgencyDTO.getPids().concat(StrConstant.COLON).concat(agencyId);
+                }
+            }
+            return baseDao.getGridOptionForQuery(gridPids);
+        }
         LambdaQueryWrapper<CustomerGridEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(CustomerGridEntity::getPid, agencyId);
         wrapper.last("ORDER BY CONVERT ( GRID_NAME USING gbk ) ASC");
@@ -859,4 +872,5 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
             return dto;
         }).collect(Collectors.toList());
     }
+
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -689,4 +689,18 @@
         AND pid = #{pid}
     </select>
 
+    <select id="getGridOptionForQuery" parameterType="java.lang.String" resultType="com.epmet.commons.tools.dto.result.OptionResultDTO">
+        select
+            cg.id as value,
+            (
+            case when ca.ORGANIZATION_NAME is null or ca.ORGANIZATION_NAME='' then cg.GRID_NAME
+            else concat(ca.ORGANIZATION_NAME,'-',cg.GRID_NAME)
+            end
+            )as label
+        from customer_grid cg
+            left join customer_agency ca
+        on(cg.PID=ca.id and ca.DEL_FLAG='0')
+        where cg.DEL_FLAG='0'
+          and cg.PIDS like concat(#{gridPids},'%')
+    </select>
 </mapper>