Merge remote-tracking branch 'origin/master'

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

@@ -282,7 +282,14 @@ public class CompanyController {
 
     @ApiOperation(value="获取推广人员信息列表")
     @RequestMapping(value = "promoterList",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "name",value = "姓名", paramType = "query"),
+            @ApiImplicitParam(name = "phone",value = "电话", paramType = "query"),
+            @ApiImplicitParam(name = "userName",value = "用户名", paramType = "query"),
+            @ApiImplicitParam(name = "companyName",value = "企业名称", paramType = "query")
+    })
     public MessageResult<Map> promoterList(
+            String name,String phone,String userName,String companyName,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize
         ){
@@ -300,20 +307,43 @@ public class CompanyController {
                 }
             }
 
-            List<String> disList = list.stream().distinct().collect(Collectors.toList());
-
-            List<JpCloudUser> jpCloudUserList = jpCloudUserService.findUserByNames(disList);
+            List<JpCloudUser> jpCloudUserList;
+            if(StringUtils.isEmpty(name)&&StringUtils.isEmpty(phone)&&StringUtils.isEmpty(userName)){
+                jpCloudUserList = jpCloudUserService.findUserByNames(list);
+            }
+            else{
+                jpCloudUserList = jpCloudUserService.findUser(userName,name,phone);
+            }
 
-            Page<JpCloudUser> page = new Page<JpCloudUser>();
+            List<String> promotionList = new ArrayList<>();
 
             for (JpCloudUser jpCloudUser:jpCloudUserList) {
-                page.add(jpCloudUser);
+                promotionList.add(jpCloudUser.getName());
             }
 
-            page.setPageSize(pageSize);
-            page.setPageNum(pageIndex);
-            page.setTotal(jpCloudUserList.size());
+            Map<String,Object> searchParams = new HashMap<>();
+
+            List<Sort> sortList = new ArrayList<>();
+            sortList.add(new Sort("create_time","asc"));
+
+            Page<Company> page = new Page<>();
 
+            if(promotionList.size()>0){
+                searchParams.put("promotionList",promotionList);
+
+                if(StringUtils.isNotEmpty(companyName)){
+                    searchParams.put("name","%" + companyName + "%");
+                }
+
+                page = companyService.pageSearch(searchParams,pageIndex,pageSize,sortList);
+
+                for (Company company: page) {
+                    List<JpCloudUser> jpCloudUserList1 = jpCloudUserService.findUser(company.getPromoter(),"","");
+                    if(jpCloudUserList1.size()>0){
+                        company.setJpCloudUser(jpCloudUserList1.get(0));
+                    }
+                }
+            }
 
             msgResult.setResult(true);
             msgResult.setData(PojoUtils.pageWrapper(page));

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

@@ -57,6 +57,8 @@ public class Company {
 	private String companyStampFile;
     @ApiModelProperty(value = "推广员账号")
 	private String promoter;
+	@ApiModelProperty(value = "云账号信息")
+	private JpCloudUser jpCloudUser;
     @ApiModelProperty(value = "近三年损失情况（时间、原因、损失金额）")
 	private String remark;
     @ApiModelProperty(value = "云平台买方ID")

picc-common/src/main/resources/mapper/base/Company.xml

@@ -201,6 +201,9 @@ id_,name_,legal_name,legal_card,legal_card_file,uscc_code,uscc_files,type_,busin
 				and create_time < str_to_date( #{searchParams.endTime},'%Y-%m-%d')
 			]]>
 		</if>
+		<foreach item="item" collection="searchParams.promotionList"  open="and promoter_ in(" separator="," close=")">
+			${item}
+		</foreach>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 	        ${sort.name} ${sort.order}
 	 	</foreach>