Merge branch 'dev_thirdplatform' into dev

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/RegisterByAuthFormDTO.java

@@ -0,0 +1,44 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author sun
+ * @Description 运营端-根据授权状态和初始化状态获取客户列表（不分页）-接口入参
+ */
+@Data
+public class RegisterByAuthFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -6547893374373422628L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    /**
+     * 居民端是否授权(0：未授权，1：已授权)
+     * */
+    @NotNull(message = "居民端是否授权不能为空", groups = { AddUserInternalGroup.class })
+    private Integer resiAuth;
+
+    /**
+     * 工作端是否授权(0：未授权，1：已授权)
+     * */
+    @NotNull(message = "工作端是否授权不能为空", groups = { AddUserInternalGroup.class })
+    private Integer workAuth;
+
+    /**
+     * 初始化状态（0:已初始化、1:未初始化）
+     * */
+    @NotNull(message = "初始化状态不能为空", groups = { AddUserInternalGroup.class })
+    private Integer initState;
+
+    /**
+     * 所属端  resi:居民端  work:工作端
+     */
+    private String client;
+
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/RegisterByAuthResultDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author sun
+ * @Description 运营端-根据授权状态和初始化状态获取客户列表（不分页）-接口返参
+ */
+@Data
+public class RegisterByAuthResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 4642988014737245076L;
+
+    /**
+     * 客户Id
+     */
+    private String customerId;
+
+    /**
+     * 客户名称
+     */
+    private String customerName;
+
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java

@@ -7,12 +7,10 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.form.CreateAgencyFormDTO;
+import com.epmet.dto.form.RegisterByAuthFormDTO;
 import com.epmet.dto.form.RegisterFormDTO;
 import com.epmet.dto.form.RegisterInfoFormDTO;
-import com.epmet.dto.result.AgencyLevelListResultDTO;
-import com.epmet.dto.result.CreateAgencyResultDTO;
-import com.epmet.dto.result.InitCustomerResultDTO;
-import com.epmet.dto.result.MyInfoResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -122,4 +120,16 @@ public class PaCustomerController {
         return new Result();
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 根据授权状态和初始化状态获取客户列表（不分页）
+     **/
+    @PostMapping(value = "registerbyauth")
+    public Result<List<RegisterByAuthResultDTO>> registerByAuth(@LoginUser TokenDto tokenDTO, @RequestBody RegisterByAuthFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, RegisterByAuthFormDTO.AddUserInternalGroup.class);
+        return new Result<List<RegisterByAuthResultDTO>>().ok( paCustomerService.registerByAuth(formDTO));
+    }
+
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java

@@ -19,7 +19,9 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.PaCustomerDTO;
+import com.epmet.dto.form.RegisterByAuthFormDTO;
 import com.epmet.dto.result.CustomerAgencyResultDTO;
+import com.epmet.dto.result.RegisterByAuthResultDTO;
 import com.epmet.entity.PaCustomerEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -58,4 +60,13 @@ public interface PaCustomerDao extends BaseDao<PaCustomerEntity> {
      * @Description 修改客户数据状态为已完成初始化
      **/
     int updateCustomerById(PaCustomerDTO dto);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 根据所属端授权状态、初始化状态查询客户列表数据
+     **/
+    List<RegisterByAuthResultDTO> selectCustomerList(RegisterByAuthFormDTO formDTO);
+
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java

@@ -22,12 +22,10 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.PaCustomerDTO;
 import com.epmet.dto.form.CreateAgencyFormDTO;
+import com.epmet.dto.form.RegisterByAuthFormDTO;
 import com.epmet.dto.form.RegisterFormDTO;
 import com.epmet.dto.form.RegisterInfoFormDTO;
-import com.epmet.dto.result.AgencyLevelListResultDTO;
-import com.epmet.dto.result.CreateAgencyResultDTO;
-import com.epmet.dto.result.InitCustomerResultDTO;
-import com.epmet.dto.result.MyInfoResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.PaCustomerEntity;
 
 import java.util.List;
@@ -155,4 +153,12 @@ public interface PaCustomerService extends BaseService<PaCustomerEntity> {
      * @Description 修改客户数据状态为已完成初始化
      **/
     void updateCustomer(String customerId);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 根据授权状态和初始化状态获取客户列表（不分页）
+     **/
+    List<RegisterByAuthResultDTO> registerByAuth(RegisterByAuthFormDTO formDTO);
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java

@@ -35,6 +35,7 @@ import com.epmet.constant.PaConstant;
 import com.epmet.dao.*;
 import com.epmet.dto.*;
 import com.epmet.dto.form.CreateAgencyFormDTO;
+import com.epmet.dto.form.RegisterByAuthFormDTO;
 import com.epmet.dto.form.RegisterFormDTO;
 import com.epmet.dto.form.RegisterInfoFormDTO;
 import com.epmet.dto.result.*;
@@ -432,4 +433,33 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
         }
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 根据授权状态和初始化状态获取客户列表（不分页）
+     **/
+    @Override
+    public List<RegisterByAuthResultDTO> registerByAuth(RegisterByAuthFormDTO formDTO) {
+        List<RegisterByAuthResultDTO> resultList = new ArrayList<>();
+        //1.根据是否初始化和居民端授权状态查询客户列表信息
+        formDTO.setClient(PaConstant.CLIENT_RESI);
+        List<RegisterByAuthResultDTO> list1 = baseDao.selectCustomerList(formDTO);
+
+        //2.根据是否初始化和工作端授权状态查询客户列表信息
+        formDTO.setClient(PaConstant.CLIENT_WORK);
+        List<RegisterByAuthResultDTO> list2 = baseDao.selectCustomerList(formDTO);
+
+        //3.取交集数据
+        list1.forEach(dto->{
+            list2.forEach(cu->{
+                if(dto.getCustomerId().equals(cu.getCustomerId())){
+                    resultList.add(dto);
+                }
+            });
+        });
+
+        return resultList;
+    }
+
 }

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml

@@ -56,6 +56,27 @@
             pca.CREATED_TIME DESC
     </select>
 
+    <select id="selectCustomerList" resultType="com.epmet.dto.result.RegisterByAuthResultDTO">
+        SELECT
+            pc.id AS "customerId",
+            pc.customer_name AS "customerName"
+        FROM
+            pa_customer pc
+        INNER JOIN customer_mp cm ON pc.id = cm.customer_id
+        WHERE
+            pc.del_flag = '0'
+        AND cm.del_flag = '0'
+        AND pc.is_initialize = #{initState}
+        <if test='null != client and "" != client and "resi" == client'>
+            AND cm.client = #{client}
+            AND cm.AUTHORIZATION_FLAG = #{resiAuth}
+        </if>
+        <if test='null != client and "" != client and "work" == client'>
+            AND cm.client = #{client}
+            AND cm.AUTHORIZATION_FLAG = #{workAuth}
+        </if>
+    </select>
+
     <update id="updateCustomerById">
         UPDATE pa_customer
         SET is_initialize = #{isInitialize}

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java

@@ -440,9 +440,6 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
         if (baseDao.insert(customerEntity) < NumConstant.ONE) {
             throw new RenException(EpmetErrorCode.OPER_ADD_CUSTOMER_ERROR.getCode());
         }
-        if(true){
-            throw new RenException(EpmetErrorCode.OPER_ADD_CUSTOMER_ERROR.getCode());
-        }
 
         //3.调用epmet-user服务，初始化客户对应的角色;调用access服务给角色分配权限信息
         Result initResult = epmetUserFeignClient.initGovStaffRolesForCustomer(formDTO.getCustomerId());