用户服务商+上传合同

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

@@ -44,6 +44,7 @@ import org.jeecg.modules.hlgplatform.mapper.HlgPlatformMapper;
 import org.jeecg.modules.hlgsubcontractor.entity.HlgSubcontractor;
 import org.jeecg.modules.hlguser.entity.HlgUser;
 import org.jeecg.modules.hlguser.entity.HlgUserSubcontract;
+import org.jeecg.modules.hlguser.service.IHlgUserService;
 import org.jeecg.modules.hlguser.service.IHlgUserSubcontractService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -76,6 +77,8 @@ public class HlgCompanyController {
 	 private HlgCpAccountDetailMapper hlgCpAccountDetailMapper;
 	 @Autowired
 	 private IHlgUserSubcontractService hlgUserSubcontractService;
+	 @Autowired
+	 private IHlgUserService hlgUserService;
 
 
 	 /**
@@ -336,12 +339,13 @@ public class HlgCompanyController {
 	 public Result<?> userSubcontractorList(HlgUser hlgUser, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
 											@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
 											HttpServletRequest req) {
-		 Result<IPage<HlgSubcontractor>> result = new Result<IPage<HlgSubcontractor>>();
+		 Result<IPage<Object>> result = new Result<IPage<Object>>();
 		 String accessToken = OauthTokenUtils.getDayAccessToken();
-		 String requestUrl = OauthApi.applicationSubcontractorList;
+		 String requestUrl = OauthApi.subcontractorList;
 		 Map<String, Object> parameters = new HashMap<>();
 		 parameters.put("pageNo", pageNo);
 		 parameters.put("pageSize", pageSize);
+		 parameters.put("userCode",hlgUserService.getById(hlgUser.getId()).getUserCode() );
 		 String biz_content = CryptTool.encode(JSONObject.toJSONString(parameters));
 		 JSONObject jsonObject = OauthTokenUtils.doRequest(requestUrl, HttpsContants.POST, biz_content, accessToken);
 		 log.info("jsonObject===={}", jsonObject);
@@ -349,28 +353,14 @@ public class HlgCompanyController {
 			 if (jsonObject.getBoolean("success")) {
 				 log.info("用户服务商列表===={}", jsonObject);
 				 JSONObject jsonObject1=jsonObject.getJSONObject("result");
-				 List<Map<String,Object>>  list= (List<Map<String,Object>>) jsonObject1.get("records");
-				 List<HlgSubcontractor> list1=new ArrayList<HlgSubcontractor>();
-				 if(list.size()>0){
-					 for (int i = 0; i <list.size() ; i++) {
-					 	HlgSubcontractor hlgSubcontractor=new HlgSubcontractor();
-					 	hlgSubcontractor.setId((Integer)list.get(i).get("id"));
-						 hlgSubcontractor.setName((String) list.get(i).get("name"));
-                         HlgUserSubcontract hlgUserSubcontract=hlgUserSubcontractService.getByUserIdAndSubId(hlgUser.getId(),(Integer)list.get(i).get("id"));
-						 if(hlgUserSubcontract!=null){
-							hlgSubcontractor.setSubcontract(hlgUserSubcontract.getSubcontract());
-							hlgSubcontractor.setUserContractId(hlgUserSubcontract.getId());
-						 }
-						 list1.add(hlgSubcontractor);
-					 }
-				 }
-				 Page<HlgSubcontractor> pageList=new Page<HlgSubcontractor>();
-				 pageList.setRecords(list1);
+				 List<Object>  list= (List<Object>) jsonObject1.get("records");
+				 Page<Object> pageList=new Page<Object>();
+				 pageList.setRecords(list);
+				 result.setResult(pageList);
 				 pageList.setTotal(jsonObject1.getInteger("total"));
 				 pageList.setCurrent(jsonObject1.getInteger("current"));
 				 pageList.setSize(jsonObject1.getInteger("size"));
 				 result.setSuccess(true);
-				 result.setResult(pageList);
 				 return result;
 			 } else {
 				 //抛出异常

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlguser/service/impl/HlgUserSubcontractServiceImpl.java

@@ -44,12 +44,9 @@ public class HlgUserSubcontractServiceImpl extends ServiceImpl<HlgUserSubcontrac
     public void saveUserSubContract(HlgUserSubcontract hlgUserSubcontract) {
         //获取当前登录用户
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        hlgUserSubcontract.setGenerateBy(sysUser.getUsername());
-        hlgUserSubcontract.setGenrateTime(new Date());
         //获取用户所在平台的orgCode
         HlgUser hlgUser = hlgUserMapper.selectById(hlgUserSubcontract.getUserId());
         hlgUserSubcontract.setSysOrgCode(hlgUser.getSysOrgCode());
-        save(hlgUserSubcontract);
         //同步慧盈
         String accessToken = OauthTokenUtils.getDayAccessToken();
         String requestUrl = OauthApi.orderUploadUserContract;

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

@@ -99,4 +99,7 @@ public interface OauthApi {
     //用户列表
     public static final String userList="/oauth/hlwUser/list";
 
+    //用户服务商列表
+    public static final String subcontractorList="/oauth/hlwUser/subcontractorList";
+
 }