修改用户合同id获取

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

@@ -43,6 +43,7 @@ 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.entity.HlgUserSubcontract;
 import org.jeecg.modules.hlguser.service.IHlgUserSubcontractService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -355,8 +356,11 @@ public class HlgCompanyController {
 					 	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);
+                         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);
 					 }
 				 }

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

@@ -76,4 +76,7 @@ public class HlgSubcontractor implements Serializable {
 
 	@TableField(exist = false)
 	private String subcontract;
+
+	@TableField(exist = false)
+	private Integer userContractId;//用户合同id
 }

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

@@ -21,5 +21,5 @@ public interface HlgUserSubcontractMapper extends BaseMapper<HlgUserSubcontract>
 
     HlgUserSubcontract getByIdcardNumber(@Param("idcardNumber") String idcardNumber, @Param("subcontractorId") Integer subcontractorId);
 
-    String getByUserIdAndSubId(@Param("userId")Integer userId, @Param("subcontractorId")Integer subId);
+    HlgUserSubcontract getByUserIdAndSubId(@Param("userId")Integer userId, @Param("subcontractorId")Integer subId);
 }

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

@@ -108,8 +108,9 @@
 	</select>
 
 
-	<select id="getByUserIdAndSubId" resultType="String">
-		select a.subcontract
+	<select id="getByUserIdAndSubId" resultType="org.jeecg.modules.hlguser.entity.HlgUserSubcontract">
+		select a.subcontract as "subcontract",
+		a.id as "id"
 		from hlg_user_subcontract a
 		WHERE a.user_id = #{userId}
 		and a.subcontractor_id = #{subcontractorId}

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

@@ -4,6 +4,8 @@ import org.jeecg.modules.hlgplatform.entity.HlgPlatformSubcontractor;
 import org.jeecg.modules.hlguser.entity.HlgUserSubcontract;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * @Description: hlg_user_subcontract
  * @Author: jeecg-boot
@@ -20,5 +22,5 @@ public interface IHlgUserSubcontractService extends IService<HlgUserSubcontract>
 
     HlgUserSubcontract getByIdcardNumber(String idcardNumber, Integer subcontractorId);
 
-    String getByUserIdAndSubId(Integer id, Integer id1);
+    HlgUserSubcontract getByUserIdAndSubId(Integer id, Integer id1);
 }

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

@@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -122,7 +123,7 @@ public class HlgUserSubcontractServiceImpl extends ServiceImpl<HlgUserSubcontrac
     }
 
     @Override
-    public String getByUserIdAndSubId(Integer userId, Integer subId) {
+    public HlgUserSubcontract getByUserIdAndSubId(Integer userId, Integer subId) {
         return baseMapper.getByUserIdAndSubId(userId,subId);
     }
 }