到账认领取消认领增加流程、

到账认领流水增加合同搜索

hx-sale/src/main/java/com/fjhx/sale/controller/claim/ClaimController.java

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -89,4 +90,12 @@ public class ClaimController {
         return claimService.claimRecord(claim.getBusinessId());
     }
 
+    /**
+     * 查询到账认领明细数据
+     */
+    @PostMapping("/claimDetail")
+    public Map<String,Object> claimDetail(@RequestBody Claim claim) {
+        return claimService.claimDetail(claim.getBusinessId());
+    }
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/claim/ClaimService.java

@@ -11,6 +11,7 @@ import com.fjhx.sale.entity.claim.dto.ClaimDto;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -57,4 +58,11 @@ public interface ClaimService extends BaseService<Claim> {
      * 查询认领记录
      */
     List<ClaimContractVo> claimRecord(Long businessId);
+
+    /**
+     *
+     * @param id 流水ID
+     * @return
+     */
+    Map<String,Object> claimDetail(Long id);
 }

hx-sale/src/main/java/com/fjhx/sale/service/claim/impl/ClaimServiceImpl.java

@@ -28,7 +28,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 
@@ -159,4 +161,21 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
         return claimContractVoList;
     }
 
+    /**
+     * 认领明细
+     * @param id 流水ID
+     * @return
+     */
+    @Override
+    public Map<String,Object> claimDetail(Long id) {
+        AccountRunningWater accountRunningWater = accountRunningWaterService.detail(id);
+        if(ObjectUtils.isEmpty(accountRunningWater)){
+            throw new ServiceException("数据异常");
+        }
+        Map<String,Object> map = new HashMap<>();
+        map.put("water",accountRunningWater);
+        map.put("claimRecord",this.claimRecord(id));
+        return map;
+    }
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -1887,6 +1887,17 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         if(dto.getDocumentarySearch()==2&&ObjectUtil.isNotEmpty(dto.getDocumentaryType())){//无记录
             wrapper.gt("t1.documentaryCount",0);
         }
+        if (StringUtils.isNotEmpty(dto.getKeyword())) {
+            //归属公司
+            List<Long> corporationIds = corporationService.listObject(Corporation::getId, q -> q.like(Corporation::getName, dto.getKeyword()));
+            List<Long> customerIds = customerService.listObject(Customer::getId, q -> q.like(Customer::getName, dto.getKeyword()));
+            wrapper.and(q -> q
+                    .like("t1", Contract::getCode, dto.getKeyword())
+                    .or().like("t1", Contract::getUserName, dto.getUserName())
+                    .or().in("t1", Contract::getSellCorporationId, corporationIds)
+                    .or().in("t1", Contract::getBuyCorporationId, customerIds)
+            );
+        }
         Page<ContractVo> page = baseMapper.getExportCopyList(dto.getPage(), wrapper,dto.getDocumentaryType());
         List<ContractVo> list = page.getRecords();
         if(CollectionUtils.isNotEmpty(list)){