合同明细-采购、销售数据调整

SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/controller/ContractMobileController.java

@@ -63,13 +63,6 @@ public class ContractMobileController {
         }else {
             return ActionResult.fail("id不能为空！");
         }
-
-//        List<ContractMobileListVO> listVO = JsonUtil.getJsonToList(list, ContractMobileListVO.class);
-//        PageListVO vo = new PageListVO();
-//        vo.setList(list);
-//        PaginationVO page = JsonUtil.getJsonToBean(contractMobilePagination, PaginationVO.class);
-//        vo.setPagination(page);
-
     }
 
 

SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/model/contractMobile/MobileContractDetailsVO.java

@@ -76,7 +76,7 @@ public class MobileContractDetailsVO {
     /** 销售订单信息 **/
      @JsonProperty("salesOrderList")
     private List<MobileContractSalesOrderVO> salesOrderList;
-    /** 销售订单信息 **/
+    /** 附件信息 **/
      @JsonProperty("enclosureList")
     private List<JSONObject> enclosureList;
 

SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/model/contractMobile/MobileContractPurchaseOrderListVO.java

@@ -15,6 +15,10 @@ import java.util.Date;
  */
 @Data
 public class MobileContractPurchaseOrderListVO {
+
+    /** 采购订单号id **/
+    @JsonProperty("id")
+    private String id;
     /** 采购订单号编号 **/
     @JsonProperty("documentNo")
     private String documentNo;

SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/model/contractMobile/MobileContractSalesOrderListVO.java

@@ -15,6 +15,11 @@ import java.util.Date;
  */
 @Data
 public class MobileContractSalesOrderListVO {
+
+    /** 采购订单号ID **/
+    @JsonProperty("id")
+    private String id;
+
     /** 采购订单号编号 **/
     @JsonProperty("documentNo")
     private String documentNo;

SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/service/impl/ContractMobileServiceImpl.java

@@ -122,38 +122,13 @@ public class ContractMobileServiceImpl extends ServiceImpl<ContractMobileMapper,
                 return new ArrayList<>();
             }
         }
-//        if (StringUtil.isNotEmpty(contractMPagination.getContractCode())) {
-//            contractMNum++;
-//            contractMQueryWrapper.lambda().like(ContractMEntity::getContractCode, contractMPagination.getContractCode());
-//        }
-//        if (StringUtil.isNotEmpty(contractMPagination.getContractName())) {
-//            contractMNum++;
-//            contractMQueryWrapper.lambda().like(ContractMEntity::getContractName, contractMPagination.getContractName());
-//        }
-//        if (StringUtil.isNotEmpty(contractMPagination.getName())) {
-//            contractMNum++;
-//            contractMQueryWrapper.lambda().like(ContractMEntity::getName, contractMPagination.getName());
-//        }
+
         if ((total > 0 && AllIdList.size() > 0) || total == 0) {
             Page<MobileContractDetailsVO> page = new Page<>(contractMobilePagination.getCurrentPage(), contractMobilePagination.getPageSize());
             IPage<MobileContractDetailsVO> userIPage = contractMobileMapper.getContractDetailData(page, contractMobileQueryWrapper);
 //            IPage<ContractMobileEntity> userIPage = this.page(page, contractMobileQueryWrapper);
             List<MobileContractDetailsVO> records = userIPage.getRecords();
-//            for (int i = 0; i < records.size(); i++) {
-//                MobileContractDetailsVO vo = records.get(i);
-//                if (vo.getContractType().equals("采购合同")) {
-//                    LambdaQueryWrapper<PurchaseorderEntity> wrapper = new LambdaQueryWrapper<>();
-//                    wrapper.eq(PurchaseorderEntity::getContractCode,vo.getId());
-//                    List<MobileContractPurchaseOrderVO> list1 = contractMobileMapper.getContractDetailDataList1(wrapper);
-//                    vo.setPurchaseOrderList(list1);
-//                }
-//                if (vo.getContractType().equals("销售合同")) {
-//                    LambdaQueryWrapper<SaleorderitemEntity> wrapper = new LambdaQueryWrapper<>();
-//                    wrapper.eq(SaleorderitemEntity::getContractId,vo.getId());
-//                    List<MobileContractSalesOrderVO> list2 = contractMobileMapper.getContractDetailDataList2(wrapper);
-//                    vo.setSalesOrderList(list2);
-//                }
-//            }
+
             return contractMobilePagination.setData(records, userIPage.getTotal());
         } else {
             List<MobileContractDetailsVO> list = new ArrayList();

SC-boot/linkage-scm/src/main/resources/mapper/contractMobile/ContractMobileMapper.xml

@@ -739,6 +739,8 @@
 		<!--总金额-->
 		<result property="grossAmount" column="grossAmount"/>
 		<collection property="purchaseOrderList" ofType="jnpf.contractMobile.model.contractMobile.MobileContractPurchaseOrderListVO" javaType="List">
+			<!--采购订单ID-->
+			<result property="id" column="id"/>
 			<!--采购订单编号-->
 			<result property="documentNo" column="document_no"/>
 			<!--创建时间-->
@@ -821,6 +823,8 @@
 		<!--总金额-->
 		<result property="grossAmount" column="grossAmount"/>
 		<collection property="salesOrderList" ofType="jnpf.contractMobile.model.contractMobile.MobileContractSalesOrderListVO" javaType="List">
+			<!--销售订单id-->
+			<result property="id" column="id"/>
 			<!--销售订单编号-->
 			<result property="documentNo" column="document_no"/>
 			<!--创建时间-->