Merge remote-tracking branch 'origin/dev' into dev

yd-api/src/main/java/com/yd/api/agms/AgmsController.java

@@ -233,6 +233,20 @@ public class AgmsController {
     }
 
     /**
+     * AGMS -- 保单发佣清算明细报表导出
+     * @param requestVO 请求数据
+     * @return 响应数据
+     */
+    @RequestMapping(value="/exportCommissionPayoutStatusQuerySheet2")
+    public Object exportCommissionPayoutStatusQuerySheet2(@RequestBody CommissionPayoutStatusQueryRequestVO requestVO, HttpServletResponse response) {
+        JsonResult result = new JsonResult();
+        ExportCommissionPayoutStatusQueryResponseVO responseVO = agmsFortuneService.exportCommissionPayoutStatusQuerySheet2(requestVO,response);
+        result.setData(responseVO);
+        result.addResult(responseVO);
+        return result;
+    }
+
+    /**
      * AGMS -- 导出财富文档
      * @param requestVO 请求数据
      * @return 响应数据

yd-api/src/main/java/com/yd/api/agms/service/AgmsFortuneService.java

@@ -66,4 +66,6 @@ public interface AgmsFortuneService {
     FortunePayoutBatchQueryResponseVO fortunePayoutBatchQuery();
 
     ExportCommissionPayoutStatusQueryResponseVO exportCommissionPayoutStatusQuery(CommissionPayoutStatusQueryRequestVO requestVO, HttpServletResponse response);
+
+    ExportCommissionPayoutStatusQueryResponseVO exportCommissionPayoutStatusQuerySheet2(CommissionPayoutStatusQueryRequestVO requestVO, HttpServletResponse response);
 }

yd-api/src/main/java/com/yd/api/agms/vo/fortune/CommissionPayoutStatusQueryRequestVO.java

@@ -43,7 +43,7 @@ public class CommissionPayoutStatusQueryRequestVO {
     private Long practitionerId;
 
     /**
-     * 发佣状态  暂不开放  可发  保留  已发并关账
+     * 发佣状态  0-作废   1-待来佣   2-可发  3-保留  4-已发并关账
      */
     private Long commissionPayoutStatus;
 

yd-api/src/main/java/com/yd/api/agms/vo/fortune/CommissionPayoutStatusUpdateRequestVO.java

@@ -15,7 +15,7 @@ public class CommissionPayoutStatusUpdateRequestVO {
 
     /**
      * 佣金发放状态
-     * 2.可发放  3.保留
+     * 0.作废    1.待发佣   2.可发放    3.保留
      */
     private String paymentStatus;
 

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java

@@ -2541,11 +2541,15 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
             return responseVO;
         }
         List<Long> practitionerIdList = this.getPractitionerIdList(practitionerId, 1);
-        AclPractitioner practitioner = aclPractitionerDALService.findPractitionerByRaise(practitionerId);
-        if (null != practitioner && null != practitioner.getRaiseId()) {
-            practitionerIdList.add(practitioner.getId());
-            List<Long> practitionerRaiseIdList = this.getPractitionerIdList(practitioner.getId(), null);
-            practitionerIdList.addAll(practitionerRaiseIdList);
+        List<AclPractitioner> practitionerRaises = aclPractitionerDALService.findPractitionerByRaise(practitionerId);
+        if(practitionerRaises != null && practitionerRaises.size() > 0){
+        	for(AclPractitioner practitioner : practitionerRaises){
+		        if (null != practitioner && null != practitioner.getRaiseId()) {
+		            practitionerIdList.add(practitioner.getId());
+		            List<Long> practitionerRaiseIdList = this.getPractitionerIdList(practitioner.getId(), null);
+		            practitionerIdList.addAll(practitionerRaiseIdList);
+		        }
+        	}
         }
         List<AclPractitioner> practitioners = aclPractitionerDALService.findByIds(practitionerIdList);
         if (practitioners.isEmpty()) {
@@ -3285,11 +3289,15 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
     private void getMemberInfoForOnLine(Map<String, SubordinateSystemMemberInfo> memberInfoMap, Long practitionerId, Integer time) {
         //1、查询该团队长所在体系的所有成员
         List<Long> practitionerIdList = this.getPractitionerIdList(practitionerId, null);
-        AclPractitioner practitionerRaise = aclPractitionerDALService.findPractitionerByRaise(practitionerId);
-        if (null != practitionerRaise && null != practitionerRaise.getRaiseId()) {
-            practitionerIdList.add(practitionerRaise.getId());
-            List<Long> practitionerRaiseIdList = this.getPractitionerIdList(practitionerRaise.getId(), null);
-            practitionerIdList.addAll(practitionerRaiseIdList);
+        List<AclPractitioner> practitionerRaises = aclPractitionerDALService.findPractitionerByRaise(practitionerId);
+        if(practitionerRaises != null && practitionerRaises.size() > 0){
+        	for(AclPractitioner practitionerRaise : practitionerRaises){
+		        if (null != practitionerRaise && null != practitionerRaise.getRaiseId()) {
+		            practitionerIdList.add(practitionerRaise.getId());
+		            List<Long> practitionerRaiseIdList = this.getPractitionerIdList(practitionerRaise.getId(), null);
+		            practitionerIdList.addAll(practitionerRaiseIdList);
+		        }
+        	}
         }
         List<AclPractitioner> practitionerList = aclPractitionerDALService.findByIds(practitionerIdList);
         if (!practitionerList.isEmpty() && practitionerList.get(0) != null) {

yd-api/src/main/java/com/yd/api/practitioner/service/impl/ScheduleTrackServiceImpl.java

@@ -317,11 +317,15 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
 
             // 获取团队成员或被辅导人的practitionerId
             List<Long> practitionerIdList = practitionerService.getPractitionerIdList(practitionerId,null);
-            AclPractitioner practitioner = aclPractitionerDALService.findPractitionerByRaise(practitionerId);
-            if(null != practitioner && null != practitioner.getRaiseId()){
-                practitionerIdList.add(practitioner.getId());
-                List<Long> practitionerRaiseIdList = practitionerService.getPractitionerIdList(practitioner.getId(),null);
-                practitionerIdList.addAll(practitionerRaiseIdList);
+            List<AclPractitioner> practitionerRaises = aclPractitionerDALService.findPractitionerByRaise(practitionerId);
+            if(practitionerRaises != null && practitionerRaises.size() > 0){
+                for(AclPractitioner practitioner : practitionerRaises){
+		            if(null != practitioner && null != practitioner.getRaiseId()){
+		                practitionerIdList.add(practitioner.getId());
+		                List<Long> practitionerRaiseIdList = practitionerService.getPractitionerIdList(practitioner.getId(),null);
+		                practitionerIdList.addAll(practitionerRaiseIdList);
+		            }
+            	}
             }
 
             // 根据团队长经纪人id查询团队每个成员本日，本周，本月得分以及---线上本月FYC

yd-api/src/main/java/com/yd/dal/mapper/agms/AgmsFortuneMapper.java

 package com.yd.dal.mapper.agms;
 
 import com.yd.dal.entity.agms.fortune.*;
-import com.yd.dal.entity.customer.AclCustomerFortune;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author xxy
@@ -45,6 +45,9 @@ public interface AgmsFortuneMapper {
      */
     List<WithdrawLabelInfo> salaryPolicyNoDetails(@Param("item")WithdrawQueryInfo info);
 
+    List<Map<String, Object>> querySheet2Data(@Param("list1") List<Long> fortuneIdList, @Param("list2") List<Long> fortuneIdList2);
 
+    List<Long> querySalePractitionerFortune(List<Long> fortuneIdList);
 
+    List<Long> querySalePractitionerFortune1(List<Long> fortuneIdList);
 }

yd-api/src/main/java/com/yd/dal/mapper/customer/AclPractitionerMapper.java

@@ -100,7 +100,8 @@ public interface AclPractitionerMapper {
     List<PayScaleInfo> queryEGHistorySalaryPDFByPractitionerId(Long practitionerId);
 
     public List<TeamMemberDetail> queryTeamMemberDetailRaiseList(List<Long> practitionerIdList);
-    public AclPractitioner findPractitionerByRaise(Long practitionerId);
+    
+    public List<AclPractitioner> findPractitionerByRaise(Long practitionerId);
     
     /**
      * 通过联合销售ID查询联合销售经纪人信息列表

yd-api/src/main/java/com/yd/dal/service/agms/AgmsFortuneDALService.java

 package com.yd.dal.service.agms;
 
 import com.yd.dal.entity.agms.fortune.*;
-import com.yd.dal.entity.agms.fortune.CommissionPayoutStatus;
-import com.yd.dal.entity.agms.fortune.CommissionPayoutStatusQueryInfo;
-import com.yd.dal.entity.agms.fortune.CustomerFortuneStatisticalInfo;
-import com.yd.dal.entity.customer.AclCustomerFortune;
 
 import java.util.List;
 import java.util.Map;
@@ -49,4 +45,9 @@ public interface AgmsFortuneDALService {
      */
     List<WithdrawLabelInfo> salaryPolicyNoDetails(WithdrawQueryInfo info);
 
+    List<Map<String, Object>> querySheet2Data(List<Long> fortuneIdList, List<Long> fortuneIdList2);
+
+    List<Long> querySalePractitionerFortune(List<Long> fortuneIdList);
+
+    List<Long> querySalePractitionerFortune1(List<Long> fortuneIdList);
 }

yd-api/src/main/java/com/yd/dal/service/agms/impl/AgmsFortuneDALServiceImpl.java

@@ -72,4 +72,19 @@ public class AgmsFortuneDALServiceImpl implements AgmsFortuneDALService {
     public List<WithdrawLabelInfo> salaryPolicyNoDetails(WithdrawQueryInfo info) {
         return agmsFortuneMapper.salaryPolicyNoDetails(info);
     }
+
+    @Override
+    public List<Map<String, Object>> querySheet2Data(List<Long> fortuneIdList, List<Long> fortuneIdList2) {
+        return agmsFortuneMapper.querySheet2Data(fortuneIdList, fortuneIdList2);
+    }
+
+    @Override
+    public List<Long> querySalePractitionerFortune(List<Long> fortuneIdList) {
+        return agmsFortuneMapper.querySalePractitionerFortune(fortuneIdList);
+    }
+
+    @Override
+    public List<Long> querySalePractitionerFortune1(List<Long> fortuneIdList) {
+        return agmsFortuneMapper.querySalePractitionerFortune1(fortuneIdList);
+    }
 }

yd-api/src/main/java/com/yd/dal/service/customer/AclPractitionerDALService.java

@@ -229,7 +229,7 @@ public interface AclPractitionerDALService {
      * @param practitionerId
      * @return
      */
-    AclPractitioner findPractitionerByRaise(Long practitionerId);
+    List<AclPractitioner> findPractitionerByRaise(Long practitionerId);
     
     /**
      * 通过联合销售ID查询联合销售经纪人信息列表

yd-api/src/main/java/com/yd/dal/service/customer/impl/AclPractitionerDALServiceImpl.java

@@ -334,7 +334,7 @@ public class AclPractitionerDALServiceImpl implements AclPractitionerDALService
     }
 
     @Override
-    public AclPractitioner findPractitionerByRaise(Long practitionerId) {
+    public List<AclPractitioner> findPractitionerByRaise(Long practitionerId) {
         return aclPractitionerMapper.findPractitionerByRaise(practitionerId);
     }
 

yd-api/src/main/java/com/yd/rmi/cache/SystemConfigService.java

@@ -13,6 +13,7 @@ import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 /**
@@ -261,6 +262,24 @@ public class SystemConfigService implements CommandLineRunner{
 		return mdDropOption;
 	}
 
+	public MdDropOptions getDropOptionInfo(String elementKey, String dropOptionId, String masterCode) {
+		if (CommonUtil.isNullOrBlank(elementKey) || CommonUtil.isNullOrBlank(masterCode) || CommonUtil.isNullOrBlank(dropOptionId)) {
+			return null;
+		}
+		ConcurrentHashMap<String, MdDropOptions> mdDropOptionsMap;
+		Element element = systemConfigCache.get(elementKey);
+		if (element != null && element.getObjectValue() != null) {
+			mdDropOptionsMap = (ConcurrentHashMap<String, MdDropOptions>) element.getObjectValue();
+		} else {
+			List<MdDropOptions> mdDropOptionsList = mdDropOptionsDALService.findByDropMasterCode(masterCode);
+			mdDropOptionsMap = new ConcurrentHashMap<>();
+			mdDropOptionsList.forEach(i -> mdDropOptionsMap.put(i.getId() + "", i));
+			element = new Element(elementKey, mdDropOptionsMap);
+			systemConfigCache.put(element);
+		}
+		return mdDropOptionsMap.get(dropOptionId);
+	}
+
 	@SuppressWarnings("unchecked")
     public List<MdPractitionerHiringApproveSteps> findHiringApproveStepsByPractitionerLevel(String practitionerLevelCode) {
 		List<MdPractitionerHiringApproveSteps> hiringApproveSteps = new ArrayList<>();

yd-api/src/main/resources/i18n/messages_zh_CN.properties

-##   暂时不用更新2019/10/10-water   ##
-######################参数信息校验########################
-600000=参数检验成功！
-610001=入参中[{0}]不能为空！
-610002=入参中[{0}]不能同时为空！
-##用户信息校验
-630001=用户的手机号码[{0}]格式不正确！
-630002=手机号[{0}]已被注册，请勿重复注册！
+##   \u6682\u65F6\u4E0D\u7528\u66F4\u65B02019/10/10-water   ##
+######################\u53C2\u6570\u4FE1\u606F\u6821\u9A8C########################
+600000=\u53C2\u6570\u68C0\u9A8C\u6210\u529F\uFF01
+610001=\u5165\u53C2\u4E2D[{0}]\u4E0D\u80FD\u4E3A\u7A7A\uFF01
+610002=\u5165\u53C2\u4E2D[{0}]\u4E0D\u80FD\u540C\u65F6\u4E3A\u7A7A\uFF01
+##\u7528\u6237\u4FE1\u606F\u6821\u9A8C
+630001=\u7528\u6237\u7684\u624B\u673A\u53F7\u7801[{0}]\u683C\u5F0F\u4E0D\u6B63\u786E\uFF01
+630002=\u624B\u673A\u53F7[{0}]\u5DF2\u88AB\u6CE8\u518C\uFF0C\u8BF7\u52FF\u91CD\u590D\u6CE8\u518C\uFF01
 
-######################用户提示信息########################
-800000=执行成功！
-800001=执行失败！
-##系统提示信息
-810001=token无效或者错误！
-820001=未查询到相应结果。
+######################\u7528\u6237\u63D0\u793A\u4FE1\u606F########################
+800000=\u6267\u884C\u6210\u529F\uFF01
+800001=\u6267\u884C\u5931\u8D25\uFF01
+##\u7CFB\u7EDF\u63D0\u793A\u4FE1\u606F
+810001=token\u65E0\u6548\u6216\u8005\u9519\u8BEF\uFF01
+820001=\u672A\u67E5\u8BE2\u5230\u76F8\u5E94\u7ED3\u679C\u3002
 
-830001=该用户非经纪人。
-830002=只有寿险经纪人才有权限进入！
-830003=请上传图片格式
-830004=上传照片尺寸比例为4：3
-830005=上传头像尺寸比例为1:1
-830006=生活照只能有三张,请将之前的删除
-830007=上传头像失败，请重新上传！
-830008=上传生活照失败，请重新上传！
-830009=上传微信二维码失败，请重新上传！
-830010=该用户已经注册为银盾经纪人
-830011=该增员已存在！
-830012=请填写跟进时间！
-830013=请填写备注！
-830014=此客户已是其他经纪人商机
-830015=每天同一个跟进状态只能对一个商机经行一次增加!
-830016=您不是团队长,无法进行编辑保存
-830017=您不是团队长,无法进行查看
-830018=您暂无团队,无法设置
-830019=已申请过专家支持!请等待
-830020=活动时间段冲突
-830021=请选择发佣日期
-830022=请选择关账记录
-830023=已关账并发放的记录,不能修改
-830024=存在已关账保单,禁止修改为非可发放状态
-830025=上传失败，请重新上传！
-830026=经纪人审批步骤出现问题,请联系it！
-830027=标签级别不能为空！
-830028=此标签不是一级标签,上级标签id不能为空！
-900003=保险公司响应报文为空！
-830029=标签显示类别不能为空！
-830030=标签ID不能为空！
-830031=标签是否有效不能为空！
-830032=上级显示标签不存在！
-830033=上级显示标签的标签显示类别与保存标签的显示类别不一致！
-830034=保存标签的标签级别与上级显示标签的标签级别不能相隔多级！
-830035=根据基础标签ID查找不到有效的基础标签！
-830036=标签名称有值时标签级别不能为空！
-830037=该标签类别已经有一级标签！
-830038=该标签类别已存在相同的标签名称！
-##等保水平越权错误信息
-630028=该账户无权限访问此接口！
+830001=\u8BE5\u7528\u6237\u975E\u7ECF\u7EAA\u4EBA\u3002
+830002=\u53EA\u6709\u5BFF\u9669\u7ECF\u7EAA\u4EBA\u624D\u6709\u6743\u9650\u8FDB\u5165\uFF01
+830003=\u8BF7\u4E0A\u4F20\u56FE\u7247\u683C\u5F0F
+830004=\u4E0A\u4F20\u7167\u7247\u5C3A\u5BF8\u6BD4\u4F8B\u4E3A4\uFF1A3
+830005=\u4E0A\u4F20\u5934\u50CF\u5C3A\u5BF8\u6BD4\u4F8B\u4E3A1:1
+830006=\u751F\u6D3B\u7167\u53EA\u80FD\u6709\u4E09\u5F20,\u8BF7\u5C06\u4E4B\u524D\u7684\u5220\u9664
+830007=\u4E0A\u4F20\u5934\u50CF\u5931\u8D25\uFF0C\u8BF7\u91CD\u65B0\u4E0A\u4F20\uFF01
+830008=\u4E0A\u4F20\u751F\u6D3B\u7167\u5931\u8D25\uFF0C\u8BF7\u91CD\u65B0\u4E0A\u4F20\uFF01
+830009=\u4E0A\u4F20\u5FAE\u4FE1\u4E8C\u7EF4\u7801\u5931\u8D25\uFF0C\u8BF7\u91CD\u65B0\u4E0A\u4F20\uFF01
+830010=\u8BE5\u7528\u6237\u5DF2\u7ECF\u6CE8\u518C\u4E3A\u94F6\u76FE\u7ECF\u7EAA\u4EBA
+830011=\u8BE5\u589E\u5458\u5DF2\u5B58\u5728\uFF01
+830012=\u8BF7\u586B\u5199\u8DDF\u8FDB\u65F6\u95F4\uFF01
+830013=\u8BF7\u586B\u5199\u5907\u6CE8\uFF01
+830014=\u6B64\u5BA2\u6237\u5DF2\u662F\u5176\u4ED6\u7ECF\u7EAA\u4EBA\u5546\u673A
+830015=\u6BCF\u5929\u540C\u4E00\u4E2A\u8DDF\u8FDB\u72B6\u6001\u53EA\u80FD\u5BF9\u4E00\u4E2A\u5546\u673A\u7ECF\u884C\u4E00\u6B21\u589E\u52A0!
+830016=\u60A8\u4E0D\u662F\u56E2\u961F\u957F,\u65E0\u6CD5\u8FDB\u884C\u7F16\u8F91\u4FDD\u5B58
+830017=\u60A8\u4E0D\u662F\u56E2\u961F\u957F,\u65E0\u6CD5\u8FDB\u884C\u67E5\u770B
+830018=\u60A8\u6682\u65E0\u56E2\u961F,\u65E0\u6CD5\u8BBE\u7F6E
+830019=\u5DF2\u7533\u8BF7\u8FC7\u4E13\u5BB6\u652F\u6301!\u8BF7\u7B49\u5F85
+830020=\u6D3B\u52A8\u65F6\u95F4\u6BB5\u51B2\u7A81
+830021=\u8BF7\u9009\u62E9\u53D1\u4F63\u65E5\u671F
+830022=\u8BF7\u9009\u62E9\u5173\u8D26\u8BB0\u5F55
+830023=\u5DF2\u5173\u8D26\u5E76\u53D1\u653E\u7684\u8BB0\u5F55,\u4E0D\u80FD\u4FEE\u6539
+830024=\u5B58\u5728\u5DF2\u5173\u8D26\u4FDD\u5355,\u7981\u6B62\u4FEE\u6539\u4E3A\u975E\u53EF\u53D1\u653E\u72B6\u6001
+830025=\u4E0A\u4F20\u5931\u8D25\uFF0C\u8BF7\u91CD\u65B0\u4E0A\u4F20\uFF01
+830026=\u7ECF\u7EAA\u4EBA\u5BA1\u6279\u6B65\u9AA4\u51FA\u73B0\u95EE\u9898,\u8BF7\u8054\u7CFBit\uFF01
+830027=\u6807\u7B7E\u7EA7\u522B\u4E0D\u80FD\u4E3A\u7A7A\uFF01
+830028=\u6B64\u6807\u7B7E\u4E0D\u662F\u4E00\u7EA7\u6807\u7B7E,\u4E0A\u7EA7\u6807\u7B7Eid\u4E0D\u80FD\u4E3A\u7A7A\uFF01
+900003=\u4FDD\u9669\u516C\u53F8\u54CD\u5E94\u62A5\u6587\u4E3A\u7A7A\uFF01
+830029=\u6807\u7B7E\u663E\u793A\u7C7B\u522B\u4E0D\u80FD\u4E3A\u7A7A\uFF01
+830030=\u6807\u7B7EID\u4E0D\u80FD\u4E3A\u7A7A\uFF01
+830031=\u6807\u7B7E\u662F\u5426\u6709\u6548\u4E0D\u80FD\u4E3A\u7A7A\uFF01
+830032=\u4E0A\u7EA7\u663E\u793A\u6807\u7B7E\u4E0D\u5B58\u5728\uFF01
+830033=\u4E0A\u7EA7\u663E\u793A\u6807\u7B7E\u7684\u6807\u7B7E\u663E\u793A\u7C7B\u522B\u4E0E\u4FDD\u5B58\u6807\u7B7E\u7684\u663E\u793A\u7C7B\u522B\u4E0D\u4E00\u81F4\uFF01
+830034=\u4FDD\u5B58\u6807\u7B7E\u7684\u6807\u7B7E\u7EA7\u522B\u4E0E\u4E0A\u7EA7\u663E\u793A\u6807\u7B7E\u7684\u6807\u7B7E\u7EA7\u522B\u4E0D\u80FD\u76F8\u9694\u591A\u7EA7\uFF01
+830035=\u6839\u636E\u57FA\u7840\u6807\u7B7EID\u67E5\u627E\u4E0D\u5230\u6709\u6548\u7684\u57FA\u7840\u6807\u7B7E\uFF01
+830036=\u6807\u7B7E\u540D\u79F0\u6709\u503C\u65F6\u6807\u7B7E\u7EA7\u522B\u4E0D\u80FD\u4E3A\u7A7A\uFF01
+830037=\u8BE5\u6807\u7B7E\u7C7B\u522B\u5DF2\u7ECF\u6709\u4E00\u7EA7\u6807\u7B7E\uFF01
+830038=\u8BE5\u6807\u7B7E\u7C7B\u522B\u5DF2\u5B58\u5728\u76F8\u540C\u7684\u6807\u7B7E\u540D\u79F0\uFF01
+830039=\u5DF2\u4F5C\u5E9F\u7684\u8BB0\u5F55,\u4E0D\u80FD\u4FEE\u6539
+##\u7B49\u4FDD\u6C34\u5E73\u8D8A\u6743\u9519\u8BEF\u4FE1\u606F
+630028=\u8BE5\u8D26\u6237\u65E0\u6743\u9650\u8BBF\u95EE\u6B64\u63A5\u53E3\uFF01