用户承揽合同

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

@@ -1,9 +1,6 @@
 package org.jeecg.modules.hlgcompany.controller;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -44,6 +41,9 @@ import org.jeecg.modules.hlgcpmanager.service.IHlgCpAccountDetailService;
 import org.jeecg.modules.hlgpayment.entity.HlgPaymentDetail;
 import org.jeecg.modules.hlgplatform.entity.HlgPlatform;
 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.service.IHlgUserSubcontractService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -73,6 +73,8 @@ public class HlgCompanyController {
 	private IHlgCompanySubcontractorService hlgCompanySubcontractorService;
 	 @Resource
 	 private HlgCpAccountDetailMapper hlgCpAccountDetailMapper;
+	 @Autowired
+	 private IHlgUserSubcontractService hlgUserSubcontractService;
 
 
 	 /**
@@ -330,10 +332,10 @@ public class HlgCompanyController {
 	  * @return
 	  */
 	 @GetMapping(value = "/userSubcontractorList")
-	 public Result<?> userSubcontractorList(HlgCompany hlgCompany, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-												 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-												 HttpServletRequest req) {
-		 Result<IPage<HlgCompanySubcontractor>> result = new Result<IPage<HlgCompanySubcontractor>>();
+	 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>>();
 		 String accessToken = OauthTokenUtils.getDayAccessToken();
 		 String requestUrl = OauthApi.applicationSubcontractorList;
 		 Map<String, Object> parameters = new HashMap<>();
@@ -346,9 +348,20 @@ public class HlgCompanyController {
 			 if (jsonObject.getBoolean("success")) {
 				 log.info("用户服务商列表===={}", jsonObject);
 				 JSONObject jsonObject1=jsonObject.getJSONObject("result");
-				 List<HlgCompanySubcontractor>  list= (List<HlgCompanySubcontractor>) jsonObject1.get("records");
-				 Page<HlgCompanySubcontractor> pageList=new Page<HlgCompanySubcontractor>();
-				 pageList.setRecords(list);
+				 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"));
+                         String subcontract=hlgUserSubcontractService.getByUserIdAndSubId(hlgUser.getId(),(Integer)list.get(i).get("id"));
+						 hlgSubcontractor.setSubcontract(subcontract);
+						 list1.add(hlgSubcontractor);
+					 }
+				 }
+				 Page<HlgSubcontractor> pageList=new Page<HlgSubcontractor>();
+				 pageList.setRecords(list1);
 				 pageList.setTotal(jsonObject1.getInteger("total"));
 				 pageList.setCurrent(jsonObject1.getInteger("current"));
 				 pageList.setSize(jsonObject1.getInteger("size"));

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgsubcontractor/entity/HlgSubcontractor.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -72,4 +73,7 @@ public class HlgSubcontractor implements Serializable {
 	/**备注*/
 	@Excel(name = "备注", width = 15)
 	private java.lang.String remark;
+
+	@TableField(exist = false)
+	private String subcontract;
 }

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlguser/mapper/HlgUserSubcontractMapper.java

@@ -20,4 +20,6 @@ public interface HlgUserSubcontractMapper extends BaseMapper<HlgUserSubcontract>
     int getCountByUserContract(@Param("hlgPlatformSubcontractor") HlgPlatformSubcontractor hlgPlatformSubcontractor);
 
     HlgUserSubcontract getByIdcardNumber(@Param("idcardNumber") String idcardNumber, @Param("subcontractorId") Integer subcontractorId);
+
+    String getByUserIdAndSubId(@Param("userId")Integer userId, @Param("subcontractorId")Integer subId);
 }

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlguser/mapper/xml/HlgUserSubcontractMapper.xml

@@ -106,4 +106,12 @@
 		WHERE u.idcard_number = #{idcardNumber}
 		and a.subcontractor_id = #{subcontractorId}
 	</select>
+
+
+	<select id="getByUserIdAndSubId" resultType="String">
+		select a.subcontract
+		from hlg_user_subcontract a
+		WHERE a.user_id = #{userId}
+		and a.subcontractor_id = #{subcontractorId}
+	</select>
 </mapper>

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

@@ -19,4 +19,6 @@ public interface IHlgUserSubcontractService extends IService<HlgUserSubcontract>
     boolean updateSubcontractById(HlgUserSubcontract hlgUserSubcontract);
 
     HlgUserSubcontract getByIdcardNumber(String idcardNumber, Integer subcontractorId);
+
+    String getByUserIdAndSubId(Integer id, Integer id1);
 }

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

@@ -120,4 +120,9 @@ public class HlgUserSubcontractServiceImpl extends ServiceImpl<HlgUserSubcontrac
     public HlgUserSubcontract getByIdcardNumber(String idcardNumber, Integer subcontractorId) {
         return baseMapper.getByIdcardNumber(idcardNumber, subcontractorId);
     }
+
+    @Override
+    public String getByUserIdAndSubId(Integer userId, Integer subId) {
+        return baseMapper.getByUserIdAndSubId(userId,subId);
+    }
 }