中间合同字段修改

hx-sale/src/main/java/com/fjhx/sale/entity/intermediate/po/IntermediateContract.java

@@ -21,7 +21,7 @@ public class IntermediateContract extends BasePo {
     /**
      * 单证id
      */
-    private Long documentsId;
+    private String documentsIds;
 
     /**
      * 卖方公司ID

hx-sale/src/main/java/com/fjhx/sale/service/intermediate/impl/IntermediateContractServiceImpl.java

@@ -90,8 +90,8 @@ public class IntermediateContractServiceImpl extends ServiceImpl<IntermediateCon
     @Override
     public void edit(IntermediateContractDto intermediateContractDto) {
         intermediateContractDto.setId(null);
-        Assert.notEmpty(intermediateContractDto.getDocumentsId(), "单证id不能为空");
-        IntermediateContract intermediateContract = this.getOne(q -> q.eq(IntermediateContract::getDocumentsId, intermediateContractDto.getDocumentsId()));
+        Assert.notEmpty(intermediateContractDto.getDocumentsIds(), "单证id不能为空");
+        IntermediateContract intermediateContract = this.getOne(q -> q.eq(IntermediateContract::getDocumentsIds, intermediateContractDto.getDocumentsIds()));
         if (ObjectUtil.isNotEmpty(intermediateContract)) {
             //编辑 赋值id
             intermediateContractDto.setId(intermediateContract.getId());
@@ -142,13 +142,13 @@ public class IntermediateContractServiceImpl extends ServiceImpl<IntermediateCon
      */
     @Override
     public ContractPdfInfoVo getPrintInfo(IntermediateContractDto dto) {
-        Assert.notEmpty(dto.getDocumentsId(), "单证id不能为空");
-        Documents documents = documentsService.getById(dto.getDocumentsId());
+        Assert.notEmpty(dto.getDocumentsIds(), "单证id不能为空");
+        Documents documents = documentsService.getById(dto.getDocumentsIds());
         Assert.notEmpty(documents, "查询不到单证信息");
         ContractPdfInfoVo contractPdfInfo = contractService.getContractPdfInfo(documents.getContractId());
         //重新赋值买卖方信息为中间合同信息
         //获得多公司信息
-        IntermediateContract intermediateContract = getOne(q -> q.eq(IntermediateContract::getDocumentsId, documents.getId()));
+        IntermediateContract intermediateContract = getOne(q -> q.eq(IntermediateContract::getDocumentsIds, documents.getId()));
         if (ObjectUtil.isNotEmpty(intermediateContract)) {
             List<Long> corporationIds = Arrays.asList(intermediateContract.getBuyCorporationId(), intermediateContract.getSellCorporationId());
             Map<Long, Corporation> corporationMap = corporationService.mapKEntity(Corporation::getId, q -> q.in(Corporation::getId, corporationIds));

hx-sale/src/main/resources/mapper/contract/ContractDocumentaryMapper.xml

@@ -3,16 +3,8 @@
 <mapper namespace="com.fjhx.sale.mapper.contract.ContractDocumentaryMapper">
     <select id="getPage" resultType="com.fjhx.sale.entity.contract.vo.ContractDocumentaryVo">
         select
-            cd.id,
-            cd.contract_id,
-            cd.documentary_type,
-            cd.documentary_time,
-            cd.documentary_remark,
-            cd.create_user,
-            cd.create_time,
-            cd.update_user,
-            cd.update_time
-        from contract_documentary cd
+            *
+        from ehsd_purchase_documentary cd
             ${ew.customSqlSegment}
     </select>