Merge remote-tracking branch 'origin/master'

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/CompanyController.java

@@ -220,6 +220,15 @@ public class CompanyController {
         try {
             CompanyUser companyUser = companyUserService.findByCompanyId(companyId);
 
+            //sz 查询用户真实姓名
+            List<JpCloudUser> promoterList = jpCloudUserService.findUserByNames(Arrays.asList(companyUser.getUserName()));
+
+            if(promoterList.size() > 0){
+                JpCloudUser jpCloudUser = promoterList.get(0);
+                companyUser.setRealName(jpCloudUser.getRealName());
+                companyUser.setPhone(jpCloudUser.getPhone());
+            }
+
             if (companyUser != null) {
                 msgResult.setResult(true);
                 msgResult.setData(companyUser);
@@ -255,6 +264,7 @@ public class CompanyController {
 
             List<JpCloudUser> jpCloudUserList = jpCloudUserService.findUserByNames(list);
 
+
             msgResult.setResult(true);
             msgResult.setData(jpCloudUserList);
         }
@@ -272,8 +282,12 @@ public class CompanyController {
 
     @ApiOperation(value="获取推广人员信息列表")
     @RequestMapping(value = "promoterList",method = RequestMethod.POST)
-    public MessageResult<List<JpCloudUser>> promoterList(){
-        MessageResult<List<JpCloudUser>> msgResult = new MessageResult<>();
+    public MessageResult<Map> promoterList(
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize
+        ){
+
+        MessageResult<Map> msgResult = new MessageResult<>();
 
         try {
             List<Company> companyList = companyService.list();
@@ -290,8 +304,19 @@ public class CompanyController {
 
             List<JpCloudUser> jpCloudUserList = jpCloudUserService.findUserByNames(disList);
 
+            Page<JpCloudUser> page = new Page<JpCloudUser>();
+
+            for (JpCloudUser jpCloudUser:jpCloudUserList) {
+                page.add(jpCloudUser);
+            }
+
+            page.setPageSize(pageSize);
+            page.setPageNum(pageIndex);
+            page.setTotal(jpCloudUserList.size());
+
+
             msgResult.setResult(true);
-            msgResult.setData(jpCloudUserList);
+            msgResult.setData(PojoUtils.pageWrapper(page));
         }
         catch(Exception ex){
             logger.error(ex.getMessage(),ex);

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/dto/PromoterAndAgentDto.java

@@ -12,6 +12,12 @@ public class PromoterAndAgentDto {
     @ApiModelProperty(value = "推广者帐号")
     private String promoter;
 
+    @ApiModelProperty(value = "推广者姓名")
+    private String promoterName;
+
+    @ApiModelProperty(value = "推广者手机号")
+    private String promoterPhone;
+
     @ApiModelProperty(value = "保险代理人")
     private String agentName;
 

picc-admin-server/src/main/java/com/jpsoft/picc/modules/business/controller/InsuranceApplicationController.java

@@ -457,7 +457,7 @@ public class InsuranceApplicationController {
 
             Company company = companyService.get(insuranceApplication.getCompanyId());
 
-            String promoter = "";
+            String promoter = "";//推广员账号
 
             if (StringUtils.isNotEmpty(company.getPromoter())) {
                 promoter = company.getPromoter();
@@ -471,10 +471,11 @@ public class InsuranceApplicationController {
 
             if (promoterList.size()>0){
                 JpCloudUser jpCloudUser = promoterList.get(0);
-                promoterAndAgentDto.setPromoter(jpCloudUser.getName() + "," + jpCloudUser.getRealName() + "," + jpCloudUser.getPhone());
-            }
-            else {
-                promoterAndAgentDto.setPromoter(promoter);
+                //promoterAndAgentDto.setPromoter(jpCloudUser.getName() + "," + jpCloudUser.getRealName() + "," + jpCloudUser.getPhone());
+                //sz
+                promoterAndAgentDto.setPromoter(jpCloudUser.getName());
+                promoterAndAgentDto.setPromoterName(jpCloudUser.getRealName());
+                promoterAndAgentDto.setPromoterPhone(jpCloudUser.getPhone());
             }
 
             String agentName = "";

picc-admin-server/src/main/java/com/jpsoft/picc/modules/business/controller/InsurancePolicyController.java

@@ -462,7 +462,16 @@ public class InsurancePolicyController {
                 } else {
                     throw new Exception("下月投保单不存在");
                 }
-            } else {
+            } else if("资料不齐".equals(processStatus)){
+                if (insurancePolicy != null) {
+                    //材料不齐
+                    //sz
+                    destPolicyStatus = PolicyStatus.Back;
+
+                } else {
+                    throw new Exception("下月投保单不存在");
+                }
+            }else {
                 //20
                 destPolicyStatus = PolicyStatus.PendingTrial;
             }

picc-common/src/main/java/com/jpsoft/picc/modules/base/entity/CompanyUser.java

@@ -45,6 +45,10 @@ public class CompanyUser {
     @ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
 
+	@ApiModelProperty(value = "真实姓名")
+	private String realName;
+
+
 	/**
 	 *获取ID
 	 */
@@ -244,4 +248,17 @@ public class CompanyUser {
 	public void setDelFlag(Boolean delFlag){
 		this.delFlag = delFlag;
 	}
+	/**
+	 *获取真实姓名
+	 */
+	public String getRealName(){
+		return realName;
+	}
+
+	/**
+	 *设置真实姓名
+	 */
+	public void setRealName(String realName){
+		this.realName = realName;
+	}
 }