dubbo接口新增参数

sckw-modules-api/sckw-contract-api/src/main/java/com/sckw/contract/api/RemoteContractService.java

@@ -29,4 +29,14 @@ public interface RemoteContractService {
      * @date: 2023/8/31
      */
     void updatePerformed(Long contractId, BigDecimal performedAmount);
+
+    /**
+     * @param entId 企业id
+     * @return Map<Integer, Integer>
+     * @desc: 根据企业id统计企业下的有效合同个数
+     * @author: czh
+     * @date: 2023/9/8
+     */
+    Map<Integer, Integer> queryContractValidCount(Long entId);
+
 }

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/RemoteUserService.java

@@ -186,13 +186,13 @@ public interface RemoteUserService {
     List<EntTypeResDto> queryEntTypeById(Long entId);
 
     /**
-     * @param cityCode 区域code  entTypeList 企业类型  page 页数 pageSize页大小
+     * @param cityCode 区域code  entTypeList 企业类型  entIdList 企业id page 页数 pageSize页大小
      * @return PageResult
      * @desc: 根据区域code和企业类型分页查询企业信息
      * @author: czh
      * @date: 2023/9/1
      */
-    PageResult queryEntInfoByCityCodeAndEntTypesWithPage(Integer cityCode, List<Integer> entTypeList, Integer page, Integer pageSize);
+    PageResult queryEntInfoByCityCodeAndEntTypesWithPage(Integer cityCode, List<Integer> entTypeList, List<Long> entIdList, Integer page, Integer pageSize);
 
     /**
      * @param id 用户id

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/dubbo/RemoteContractServiceImpl.java

@@ -93,6 +93,19 @@ public class RemoteContractServiceImpl implements RemoteContractService {
         }
     }
 
+
+    /**
+     * @param entId 企业id
+     * @return Map<Integer, Integer>
+     * @desc: 根据企业id统计企业下的有效合同个数
+     * @author: czh
+     * @date: 2023/9/8
+     */
+    @Override
+    public Map<Integer, Integer> queryContractValidCount(Long entId) {
+        return null;
+    }
+
     private ContractCommonInfoResDto fillContractLogistics(KwcContractLogistics kwcContractLogistics) {
         ContractCommonInfoResDto contractCommonInfoResDto = new ContractCommonInfoResDto();
         List<EntInfo> entList = new ArrayList<>();

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmCooperateManageService.java

@@ -78,7 +78,7 @@ public class KwmCooperateManageService {
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private PaymentDubboService paymentDubboService;
 
-    @Value(value = "${}")
+    @Value(value = "${jumpUrl.cooperateManageUrl}")
     private String cooperateManageUrl;
 
     /**

sckw-modules/sckw-system/src/main/java/com/sckw/system/dao/KwsEnterpriseDao.java

@@ -149,6 +149,6 @@ public interface KwsEnterpriseDao {
      * @author: czh
      * @date: 2023/9/1
      */
-    List<KwsEnterprise> queryEntInfoByCityCodeAndEntTypesWithPage(@Param(value = "cityCode") Integer cityCode, @Param(value = "entTypeList") List<Integer> entTypeList);
+    List<KwsEnterprise> queryEntInfoByCityCodeAndEntTypesWithPage(@Param(value = "cityCode") Integer cityCode, @Param(value = "entTypeList") List<Integer> entTypeList, @Param(value = "entIdList") List<Long> entIdList);
 
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteBaseService.java

@@ -190,14 +190,14 @@ public class RemoteBaseService {
 
 
     /**
-     * @param cityCode 区域code  entTypeList 企业类型
+     * @param cityCode 区域code  entTypeList 企业类型  entIdList 企业id
      * @return PageResult
      * @desc: 根据区域code和企业类型分页查询企业信息
      * @author: czh
      * @date: 2023/9/1
      */
-    public List<KwsEnterprise> queryEntInfoByCityCodeAndEntTypesWithPage(Integer cityCode, List<Integer> entTypeList) {
-        return kwsEnterpriseService.queryEntInfoByCityCodeAndEntTypesWithPage(cityCode, entTypeList);
+    public List<KwsEnterprise> queryEntInfoByCityCodeAndEntTypesWithPage(Integer cityCode, List<Integer> entTypeList, List<Long> entIdList) {
+        return kwsEnterpriseService.queryEntInfoByCityCodeAndEntTypesWithPage(cityCode, entTypeList, entIdList);
     }
 
     /**

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteUserServiceImpl.java

@@ -177,16 +177,16 @@ public class RemoteUserServiceImpl implements RemoteUserService {
 
 
     /**
-     * @param cityCode 区域code  entTypeList 企业类型  page 页数 pageSize页大小
+     * @param cityCode 区域code  entTypeList 企业类型  entIdList 企业id page 页数 pageSize页大小
      * @return PageResult
      * @desc: 根据区域code和企业类型分页查询企业信息
      * @author: czh
      * @date: 2023/9/1
      */
     @Override
-    public PageResult queryEntInfoByCityCodeAndEntTypesWithPage(Integer cityCode, List<Integer> entTypeList, Integer page, Integer pageSize) {
+    public PageResult queryEntInfoByCityCodeAndEntTypesWithPage(Integer cityCode, List<Integer> entTypeList, List<Long> entIdList, Integer page, Integer pageSize) {
         PageHelper.startPage(page, pageSize);
-        List<KwsEnterprise> list = remoteBaseService.queryEntInfoByCityCodeAndEntTypesWithPage(cityCode, entTypeList);
+        List<KwsEnterprise> list = remoteBaseService.queryEntInfoByCityCodeAndEntTypesWithPage(cityCode, entTypeList, entIdList);
         return PageHelperUtil.getPageResult(new PageInfo<>(list));
     }
 

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -1045,13 +1045,13 @@ public class KwsEnterpriseService {
     }
 
     /**
-     * @param cityCode 区域code  entTypeList 企业类型
+     * @param cityCode 区域code  entTypeList 企业类型 entIdList 企业id
      * @return PageResult
      * @desc: 根据区域code和企业类型分页查询企业信息
      * @author: czh
      * @date: 2023/9/1
      */
-    public List<KwsEnterprise> queryEntInfoByCityCodeAndEntTypesWithPage(Integer cityCode, List<Integer> entTypeList) {
-        return kwsEnterpriseDao.queryEntInfoByCityCodeAndEntTypesWithPage(cityCode, entTypeList);
+    public List<KwsEnterprise> queryEntInfoByCityCodeAndEntTypesWithPage(Integer cityCode, List<Integer> entTypeList, List<Long> entIdList) {
+        return kwsEnterpriseDao.queryEntInfoByCityCodeAndEntTypesWithPage(cityCode, entTypeList, entIdList);
     }
 }

sckw-modules/sckw-system/src/main/resources/mapper/KwsEnterpriseDao.xml

@@ -298,6 +298,12 @@
         <if test="cityCode != null">
           and (b.code = #{cityCode} or b.province_code = #{cityCode} or b.pcode = #{cityCode})
         </if>
+        <if test="entIdList != null and entIdList.size() > 0">
+          and a.id in
+          <foreach collection="entIdList" item="item" open="(" close=")" separator=",">
+            #{item}
+          </foreach>
+        </if>
         and exists (select 1
                       from kws_ent_type k
                      where a.id = k.ent_id