企业列表接口

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/controller/HlgCompanyController.java

@@ -96,9 +96,9 @@ public class HlgCompanyController {
 									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 									  HttpServletRequest req) {
 		Result<IPage<HlgCompany>> result = new Result<IPage<HlgCompany>>();
-		QueryWrapper<HlgCompany> queryWrapper = QueryGenerator.initQueryWrapperForRule(hlgCompany, req.getParameterMap());
-		Page<HlgCompany> page = new Page<HlgCompany>(pageNo, pageSize);
-		Page<HlgCompany> pageList = hlgCompanyService.pageList(page,hlgCompany, queryWrapper);
+//		QueryWrapper<HlgCompany> queryWrapper = QueryGenerator.initQueryWrapperForRule(hlgCompany, req.getParameterMap());
+//		Page<HlgCompany> page = new Page<HlgCompany>(pageNo, pageSize);
+		Page<HlgCompany> pageList = hlgCompanyService.pageList(pageNo, pageSize,hlgCompany);
 		result.setSuccess(true);
 		result.setResult(pageList);
 		return result;

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/entity/HlgCompany.java

@@ -123,4 +123,11 @@ public class HlgCompany implements Serializable {
 
 	@TableField(exist = false)
 	private Integer paymentType;
+
+	/**
+	 * 合同情况（1：待上传2：已上传）
+	 */
+	@TableField(exist = false)
+	@Dict(dicCode = "company_subcontractor_status")
+	private Integer companySubcontractorStatus;
 }

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/mapper/HlgCompanyMapper.java

@@ -24,4 +24,6 @@ public interface HlgCompanyMapper extends BaseMapper<HlgCompany> {
     List<HlgCompany> findAllCompanyListByOrgcode(String orgCode);
 
     List<HlgCompany> findCompanyPayList();
+
+    HlgCompany getByCompanyCode(String companyCode);
 }

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/mapper/xml/HlgCompanyMapper.xml

@@ -175,4 +175,13 @@
 
 	</select>
 
+
+
+	<select id="getByCompanyCode" resultType="org.jeecg.modules.hlgcompany.entity.HlgCompany" >
+		SELECT
+		<include refid="hlgCompanyColumns"/>
+		FROM hlg_company a
+		<include refid="hlgCompanyJoins"/>
+		WHERE a.company_code = #{0}
+	</select>
 </mapper>

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/service/IHlgCompanyService.java

@@ -19,7 +19,7 @@ public interface IHlgCompanyService extends IService<HlgCompany> {
 
     void saveCompany(HlgCompany hlgCompany);
 
-    Page<HlgCompany> pageList(Page<HlgCompany> page, HlgCompany hlgCompany, QueryWrapper<HlgCompany> queryWrapper);
+    Page<HlgCompany> pageList(Integer pageNo, Integer pageSize, HlgCompany hlgCompany);
 
     void lockCompany(HlgCompany hlgCompany);
 

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/service/impl/HlgCompanyServiceImpl.java

@@ -70,9 +70,53 @@ public class HlgCompanyServiceImpl extends ServiceImpl<HlgCompanyMapper, HlgComp
     @Resource
     private HlgCompanySubcontractorMapper hlgCompanySubcontractorMapper;
 
+    /**
+     * 去慧盈查询企业列表
+     * @param pageNo
+     * @param pageSize
+     * @param hlgCompany
+     * @return
+     */
     @Override
-    public Page<HlgCompany> pageList(Page<HlgCompany> pageList, HlgCompany hlgCompany, QueryWrapper<HlgCompany> queryWrapper) {
-        return pageList.setRecords(baseMapper.findList(pageList, hlgCompany, queryWrapper));
+    public Page<HlgCompany> pageList(Integer pageNo, Integer pageSize, HlgCompany hlgCompany) {
+        Page<HlgCompany> page = new Page<HlgCompany>();
+        //慧盈查询用户列表
+        String accessToken = OauthTokenUtils.getDayAccessToken();
+        String requestUrl = OauthApi.companyList;
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put("pageNo", pageNo);
+        parameters.put("pageSize", pageSize);
+        parameters.put("companyName", hlgCompany.getCompanyName());
+        parameters.put("dutyParagraph", hlgCompany.getDutyParagraph());
+        parameters.put("provinceCode", hlgCompany.getProvinceCode());
+        parameters.put("cityCode", hlgCompany.getCityCode());
+        parameters.put("countryCode", hlgCompany.getCountryCode());
+        parameters.put("companySubcontractorStatus", hlgCompany.getCompanySubcontractorStatus());
+        //数据加密
+        String biz_content = CryptTool.encode(JSONObject.toJSONString(parameters));
+        JSONObject jsonObject = OauthTokenUtils.doRequest(requestUrl, HttpsContants.POST, biz_content, accessToken);
+        log.info("企业列表===={}", jsonObject);
+        if (jsonObject != null) {
+            if (jsonObject.getBoolean(HttpsContants.SUCCESS_FLAG)) {
+                log.info("企业列表===={}", jsonObject);
+                JSONObject jsonObject1 = jsonObject.getJSONObject("result");
+                List<Map<String, Object>> list = ( List<Map<String, Object>>) jsonObject1.get("records");
+                log.info("企业列表==={}", list);
+                List<HlgCompany> list1=new ArrayList();
+                for (int i = 0; i <list.size() ; i++) {
+                    HlgCompany hlgCompany1=baseMapper.getByCompanyCode((String)list.get(i).get("companyCode"));
+                    hlgCompany1.setCompanySubcontractorStatus((Integer) list.get(i).get("companySubcontractorStatus"));
+                    list1.add(hlgCompany1);
+                }
+                page.setRecords(list1);
+                page.setTotal(jsonObject1.getLong("total"));
+            } else {
+                throw new JeecgBootException("查询数据异常");
+            }
+        } else {
+            throw new JeecgBootException("查询数据异常");
+        }
+        return page;
     }
 
     /**

happy-boot-module-settlement/src/main/java/org/jeecg/common/utils/OauthApi.java

@@ -8,6 +8,10 @@ package org.jeecg.common.utils;
 public interface OauthApi {
 
     /**
+     * 企业-列表
+     */
+    public static final String companyList = "/oauth/hlwcompany/list";
+    /**
      * 企业-新增
      */
     public static final String companyAdd = "/oauth/hlwcompany/add";