Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/controller/KwcCheckedController.java

@@ -167,4 +167,9 @@ public class KwcCheckedController {
     }
 
 
+    @PostMapping("test")
+    public HttpResult test() throws SystemException {
+        kwcContractLogisticsService.test();
+        return HttpResult.ok();
+    }
 }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/dto/req/QueryListReqDto.java

@@ -47,4 +47,19 @@ public class QueryListReqDto {
      * 企业id
      */
     private Long entId;
+
+    /**
+     * 签约方式
+     */
+    private Integer signingWay;
+
+    /**
+     * 付款方式
+     */
+    private Integer charging;
+
+    /**
+     * 交易方式
+     */
+    private Integer trading;
 }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/dto/res/QueryListResDto.java

@@ -68,6 +68,11 @@ public class QueryListResDto {
      */
     private Long id;
 
+    /**
+     * 主合同id
+     */
+    private Long contractPid;
+
     /**
      * 备注
      */

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/req/ContractLogisticsReqVo.java

@@ -27,7 +27,7 @@ public class ContractLogisticsReqVo implements Serializable {
     /**
      * 父合同ID 补充合同
      */
-    private Long pId;
+    private Long pid;
 
     /**
      * 基础信息

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/req/ContractTradeReqVo.java

@@ -27,7 +27,7 @@ public class ContractTradeReqVo implements Serializable {
     /**
      * 父合同ID 补充合同
      */
-    private Long pId;
+    private Long pid;
 
     /**
      * 基础信息

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/res/ContractLogisticsDetailResVo.java

@@ -17,6 +17,11 @@ public class ContractLogisticsDetailResVo implements Serializable {
     @Serial
     private static final long serialVersionUID = 6152841290674824503L;
 
+    /**
+     * 合同id
+     */
+    private Long id;
+
     /**
      * 基础信息
      */

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/res/ContractTradeDetailResVo.java

@@ -32,6 +32,11 @@ public class ContractTradeDetailResVo implements Serializable {
      */
     private List<TradeGoodsInfoResVo> goodsInfo;
 
+    /**
+     * id
+     */
+    private Long id;
+
     /**
      * 备注
      */

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/res/QueryListResVo.java

@@ -91,6 +91,11 @@ public class QueryListResVo implements Serializable {
     @JsonSerialize(using = LongToStringUtils.class)
     private Long id;
 
+    /**
+     * 主合同id
+     */
+    private Long contractPid;
+
     /**
      * 发起时间
      */

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractLogisticsService.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sckw.contract.dao.KwcContractLogisticsMapper;
+import com.sckw.contract.dubbo.RemoteContractServiceImpl;
 import com.sckw.contract.model.dto.req.QueryListReqDto;
 import com.sckw.contract.model.dto.res.QueryListResDto;
 import com.sckw.contract.model.entity.KwcContractLogistics;
@@ -32,7 +33,6 @@ import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.excel.utils.EasyExcelUtil;
 import com.sckw.product.api.dubbo.GoodsInfoService;
-import com.sckw.product.api.model.KwpGoods;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
@@ -62,6 +62,8 @@ public class KwcContractLogisticsService {
 
     @Autowired
     private KwcContractLogisticsUnitService kwcContractLogisticsUnitService;
+    @Autowired
+    private RemoteContractServiceImpl remoteContractService;
 
 
     @DubboReference(version = "2.0.0", group = "design", check = false)
@@ -88,7 +90,7 @@ public class KwcContractLogisticsService {
         LogisticsBaseInfoReqVo baseInfo = reqVo.getBaseInfo();
         List<LogisticsGoodsInfoReqVo> goodsInfo = reqVo.getGoodsInfo();
         //创建合同
-        KwcContractLogistics kwcContractLogistics = getKwcContractLogistics(baseInfo, goodsInfo, reqVo.getRemark(), reqVo.getPId());
+        KwcContractLogistics kwcContractLogistics = getKwcContractLogistics(baseInfo, goodsInfo, reqVo.getRemark(), reqVo.getPid());
         long contactId = new IdWorker(1L).nextId();
         kwcContractLogistics.setId(contactId);
         kwcContractLogistics.setStatus(ContractStatusEnum.SAVE.getCode());
@@ -144,7 +146,7 @@ public class KwcContractLogisticsService {
      * @date: 2023/7/14
      */
     public void supplement(ContractLogisticsReqVo reqVo) {
-        Long id = reqVo.getPId();
+        Long id = reqVo.getPid();
         KwcContractLogistics kwcContractLogistics = kwcContractLogisticsMapper.selectById(id);
         if (Objects.isNull(kwcContractLogistics)) {
             throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.CONTRACT_NOT_EXISTS);
@@ -201,6 +203,8 @@ public class KwcContractLogisticsService {
             logisticsBaseInfoResVo.setAmount(kwcContractLogistics.getAmount());
             logisticsBaseInfoResVo.setPerformedAmount(kwcContractLogistics.getPerformedAmount());
             contractLogisticsDetailResVo.setBaseInfo(logisticsBaseInfoResVo);
+            contractLogisticsDetailResVo.setId(kwcContractLogistics.getId());
+
         }
 
         //标的信息
@@ -335,7 +339,7 @@ public class KwcContractLogisticsService {
             throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.CONTRACT_NOT_EXISTS);
         }
 
-        KwcContractLogistics param = getKwcContractLogistics(reqVo.getBaseInfo(), reqVo.getGoodsInfo(), reqVo.getRemark(), reqVo.getPId());
+        KwcContractLogistics param = getKwcContractLogistics(reqVo.getBaseInfo(), reqVo.getGoodsInfo(), reqVo.getRemark(), reqVo.getPid());
         param.setId(contractId);
         param.setSigningUrl(reqVo.getContractFile());
         param.setStatus(ContractStatusEnum.SAVE.getCode());
@@ -441,7 +445,7 @@ public class KwcContractLogisticsService {
             return PageHelperUtil.getPageResult(new PageInfo<>());
         }
         List<QueryListResVo> list = getQueryListResVos(queryListResDtos);
-        return PageHelperUtil.getPageResult(new PageInfo<>(list));
+        return PageHelperUtil.getPageResult(new PageInfo<>(list), queryListResDtos, reqVo.getPageSize());
     }
 
 
@@ -560,4 +564,8 @@ public class KwcContractLogisticsService {
         }
         return list;
     }
+
+    public void test() {
+        remoteContractService.queryContractBaseInfo(Collections.singletonList(165121415794659328L));
+    }
 }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractTradeService.java

@@ -14,7 +14,6 @@ import com.sckw.contract.model.vo.req.*;
 import com.sckw.contract.model.vo.res.*;
 import com.sckw.core.common.enums.enums.DictEnum;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
-import com.sckw.core.exception.BusinessException;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.ContractStatusEnum;
@@ -140,7 +139,7 @@ public class KwcContractTradeService {
         TradeBaseInfoReqVo baseInfo = reqVo.getBaseInfo();
         List<TradeGoodsInfoReqVo> goodsInfoList = reqVo.getGoodsInfo();
         //创建合同
-        KwcContractTrade kwcContractTrade = getKwcContractTrade(baseInfo, reqVo.getGoodsInfo(), reqVo.getRemark(), reqVo.getPId());
+        KwcContractTrade kwcContractTrade = getKwcContractTrade(baseInfo, reqVo.getGoodsInfo(), reqVo.getRemark(), reqVo.getPid());
         long contactId = new IdWorker(1L).nextId();
         kwcContractTrade.setId(contactId);
         kwcContractTrade.setStatus(ContractStatusEnum.SAVE.getCode());
@@ -202,7 +201,7 @@ public class KwcContractTradeService {
      * @date: 2023/7/14
      */
     public void supplement(ContractTradeReqVo reqVo) {
-        Long id = reqVo.getPId();
+        Long id = reqVo.getPid();
         KwcContractTrade kwcContractTrade = kwcContractTradeMapper.selectById(id);
         if (Objects.isNull(kwcContractTrade)) {
             throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.CONTRACT_NOT_EXISTS);
@@ -267,7 +266,7 @@ public class KwcContractTradeService {
             }
         }
         contractTradeDetailResVo.setBaseInfo(tradeBaseInfoResVo);
-
+        contractTradeDetailResVo.setId(id);
         //标的信息
         List<KwcContractTradeGoods> kwcContractTradeGoodsList = kwcContractTradeGoodsService.queryGoodsInfoByContractId(id);
         List<Long> goodsIdList = kwcContractTradeGoodsList.stream().map(KwcContractTradeGoods::getGoodsId).toList();
@@ -339,7 +338,7 @@ public class KwcContractTradeService {
         Long id = reqVo.getId();
         if (Objects.isNull(id)) {
             //创建合同
-            KwcContractTrade kwcContractLogistics = getKwcContractTrade(reqVo.getBaseInfo(), reqVo.getGoodsInfo(), reqVo.getRemark(), reqVo.getPId());
+            KwcContractTrade kwcContractLogistics = getKwcContractTrade(reqVo.getBaseInfo(), reqVo.getGoodsInfo(), reqVo.getRemark(), reqVo.getPid());
             id = new IdWorker(1L).nextId();
             kwcContractLogistics.setId(id);
             kwcContractLogistics.setStatus(ContractStatusEnum.SUBMIT.getCode());
@@ -373,7 +372,7 @@ public class KwcContractTradeService {
         if (Objects.isNull(kwcContractTrade)) {
             throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.CONTRACT_NOT_EXISTS);
         }
-        KwcContractTrade param = getKwcContractTrade(reqVo.getBaseInfo(), reqVo.getGoodsInfo(), reqVo.getRemark(), reqVo.getPId());
+        KwcContractTrade param = getKwcContractTrade(reqVo.getBaseInfo(), reqVo.getGoodsInfo(), reqVo.getRemark(), reqVo.getPid());
         param.setId(contractId);
         param.setSigningUrl(reqVo.getContractFile());
         param.setStatus(ContractStatusEnum.SAVE.getCode());

sckw-modules/sckw-contract/src/main/resources/mapper/KwcContractLogisticsMapper.xml

@@ -60,7 +60,8 @@
                 b.firm_name entName,
                 e.ent_id targetEntId,
                 e.firm_name targetEntName,
-                a.performed_amount performedAmount
+                a.performed_amount performedAmount,
+                a.contract_pid contractPid
           from kwc_contract_logistics a
           left join kwc_contract_logistics_unit b on a.id = b.contract_id and b.unit_type = #{entType} and b.del_flag = 0
           left join kwc_contract_logistics_track c on a.id = c.contract_id and c.del_flag = 0 and c.type = 1

sckw-modules/sckw-contract/src/main/resources/mapper/KwcContractTradeMapper.xml

@@ -58,7 +58,8 @@
                b.ent_id,
                b.firm_name entName,
                e.ent_id targetEntId,
-               e.firm_name targetEntName
+               e.firm_name targetEntName,
+               a.contract_pid contractPid
           from kwc_contract_trade a
           left join kwc_contract_trade_unit b on a.id = b.contract_id and b.unit_type = #{entType} and b.del_flag = 0
           left join kwc_contract_trade_track c on a.id = c.contract_id and c.del_flag = 0 and c.type = 1
@@ -76,7 +77,10 @@
             and a.status = #{status}
         </if>
         <if test="keywords != null and keywords != ''">
-            and (b.firm_name like concat('%', #{keywords}, '%') or b.contacts like concat('%', #{keywords}, '%') or b.phone like concat('%', #{keywords}, '%'))
+            and (b.firm_name like concat('%', #{keywords}, '%') or
+                 b.contacts like concat('%', #{keywords}, '%') or
+                 b.phone like concat('%', #{keywords}, '%') or
+                 b.sign_phone like concat('%', #{keywords}, '%'))
         </if>
         <if test="idList != null and idList.size() > 0">
             and a.id in

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

@@ -28,8 +28,6 @@ import com.sckw.manage.model.vo.res.AddressQueryResVo;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import lombok.extern.slf4j.Slf4j;
-import org.checkerframework.checker.units.qual.A;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;