|
@@ -2,14 +2,8 @@ package com.huyi.service.conmany.controller;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
-import com.huyi.service.base.entity.SysCompany;
|
|
|
-import com.huyi.service.base.entity.SysConfig;
|
|
|
-import com.huyi.service.base.entity.SysUser;
|
|
|
-import com.huyi.service.base.entity.SysUserCompanyRel;
|
|
|
-import com.huyi.service.base.service.ISysCompanyService;
|
|
|
-import com.huyi.service.base.service.ISysConfigService;
|
|
|
-import com.huyi.service.base.service.ISysUserCompanyRelService;
|
|
|
-import com.huyi.service.base.service.ISysUserService;
|
|
|
+import com.huyi.service.base.entity.*;
|
|
|
+import com.huyi.service.base.service.*;
|
|
|
import com.huyi.service.conmany.service.IOwnCompanyManageService;
|
|
|
import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
|
|
|
import com.tianhu.common.core.cfca.AxqCommonUtil;
|
|
@@ -68,6 +62,10 @@ public class CompanyInformationController extends BaseController {
|
|
|
@Autowired
|
|
|
private ISysUserCompanyRelService relService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private IPubFileInfService fileInfService;
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 企业四要素认证状态;未认证
|
|
|
*/
|
|
@@ -116,8 +114,8 @@ public class CompanyInformationController extends BaseController {
|
|
|
sysUserCompanyRel.eq(SysUserCompanyRel::getSucrHandler,HANDER);
|
|
|
List<SysUserCompanyRel> contactsList = iSysUserCompanyRelService.findSysUserCompanyRels(sysUserCompanyRel);
|
|
|
List<Map> userList = null;
|
|
|
- List<Map> handlerPositiveList = null;
|
|
|
- List<Map> handlerNegativeList = null;
|
|
|
+ List<PubFileInf> handlerPositiveList = null;
|
|
|
+ List<PubFileInf> handlerNegativeList = null;
|
|
|
|
|
|
Map queryMap = new HashMap();
|
|
|
queryMap.put("companyId",scyId);
|
|
@@ -146,9 +144,24 @@ public class CompanyInformationController extends BaseController {
|
|
|
userMap.put("userId",sucrUserId);
|
|
|
userList = iOwnCompanyManageService.selectUserList(userMap);
|
|
|
Map handlerMap = new HashMap();
|
|
|
- handlerMap.put("userId",sucrUserId);
|
|
|
+ /* handlerMap.put("userId",sucrUserId);
|
|
|
handlerPositiveList = iOwnCompanyManageService.handlerPositiveList(handlerMap);
|
|
|
- handlerNegativeList = iOwnCompanyManageService.handlerNegativeList(handlerMap);
|
|
|
+ handlerNegativeList = iOwnCompanyManageService.handlerNegativeList(handlerMap);*/
|
|
|
+ //身份证人面
|
|
|
+ String positive = contactsList.get(0).getSucrCardFile();
|
|
|
+ //身份证国徽面
|
|
|
+ String otherSide = contactsList.get(0).getSucrCardBackFile();
|
|
|
+ if(CommonUtil.isNotEmpty(positive)){
|
|
|
+ LambdaQueryWrapper<PubFileInf> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ lambdaQueryWrapper.eq(PubFileInf::getPfiFileId,positive);
|
|
|
+ handlerPositiveList = fileInfService.findPubFileInfs(lambdaQueryWrapper);
|
|
|
+ }
|
|
|
+ if(CommonUtil.isNotEmpty(otherSide)){
|
|
|
+ LambdaQueryWrapper<PubFileInf> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ lambdaQueryWrapper.eq(PubFileInf::getPfiFileId,otherSide);
|
|
|
+ handlerNegativeList = fileInfService.findPubFileInfs(lambdaQueryWrapper);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
map.put("contactsList", userList);
|
|
|
//发票信息
|