合同档案(23/1/6)

SC-boot/linkage-scm/src/main/java/jnpf/contractfile/controller/ContractFileController.java

@@ -1,47 +1,45 @@
 
 
 package jnpf.contractfile.controller;
+
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
-import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import jnpf.base.ActionResult;
-import jnpf.base.vo.PageListVO;
-import jnpf.base.vo.PaginationVO;
 import jnpf.base.UserInfo;
 import jnpf.base.vo.DownloadVO;
+import jnpf.base.vo.PageListVO;
+import jnpf.base.vo.PaginationVO;
 import jnpf.config.ConfigValueUtil;
-import jnpf.exception.DataException;
+import jnpf.contractfile.entity.ContractFileEntity;
-import org.springframework.transaction.annotation.Transactional;
-import jnpf.contractfile.model.contractfile.*;
-import jnpf.contractfile.model.contractfile.ContractFilePagination;
 import jnpf.contractfile.entity.Contract_item0Entity;
 import jnpf.contractfile.entity.Contract_item1Entity;
+import jnpf.contractfile.model.contractfile.*;
+import jnpf.contractfile.service.ContractFileService;
+import jnpf.contractfile.service.Contract_item0Service;
+import jnpf.contractfile.service.Contract_item1Service;
+import jnpf.exception.DataException;
 import jnpf.util.*;
-import lombok.extern.slf4j.Slf4j;
+import jnpf.util.enums.FileTypeEnum;
+import jnpf.util.file.UploadUtil;
 import lombok.Cleanup;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import jnpf.contractfile.entity.ContractFileEntity;
-import jnpf.contractfile.service.ContractFileService;
-import jnpf.contractfile.service.Contract_item0Service;
-import jnpf.contractfile.service.Contract_item1Service;
-import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import jnpf.util.GeneraterSwapUtil;
+import java.util.ArrayList;
-import java.util.*;
+import java.util.List;
-
+import java.util.Map;
-import jnpf.util.file.UploadUtil;
-import jnpf.util.enums.FileTypeEnum;
 
 /**
  *
@@ -76,6 +74,7 @@ public class ContractFileController {
 
 
 
+
     /**
      * 列表
      *

SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileListQueryModel.java

@@ -0,0 +1,21 @@
+package jnpf.contractfile.model.contractfile;
+
+import lombok.Data;
+
+@Data
+public class ContractFileListQueryModel {
+    /** 合同编码 */
+    private String contractCode;
+
+    /** 合同名称 */
+    private String contractName;
+
+    /** 供应商/客户名 **/
+//    @JsonProperty("name")
+    private String name;
+
+    /**
+     * 菜单id
+     */
+//    private String menuId;
+}

SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/controller/MobilePortController.java

@@ -3,11 +3,15 @@ package jnpf.mobilePort.controller;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import jnpf.base.ActionResult;
+import jnpf.contractfile.model.contractfile.ContractFileListQueryModel;
+import jnpf.util.JsonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 
@@ -17,6 +21,78 @@ import java.util.HashMap;
 @RequestMapping("/api/info")
 public class MobilePortController {
 
+    /**
+     *合同档案(23/1/6)
+     * @author 王闯
+     * @date 2023/1/6 16:45
+     * @param contractFilePagination
+     * @return ActionResult
+     */
+    @GetMapping("/contractList")
+    @ApiOperation("移动端合同档案(23/1/6)接口数据contractList")
+    public ActionResult mobelList(@RequestBody ContractFileListQueryModel contractFilePagination)throws IOException {
+
+        String data=" [\n" +
+                "     {\n" +
+                "     \"contractNo\": '合同编码000001',\n" +
+                "     \"contractDate\": '2022年12⽉18⽇',\n" +
+                "     \"contractName\": '合同名称000001',\n" +
+                "     \"supplierCustomer\": '矿产资源废钢贸易库',\n" +
+                "     \"contractType\": '采购合同',\n" +
+                "     \"completionProgress\": \"70\",\n" +
+                "     \"bidOpeningDate\": '2022/12/5',\n" +
+                "     \"auditDate\": '2022/12/6',\n" +
+                "     \"signingDate\": '2022/12/7',\n" +
+                "     \"closingDate\": '2023/01/5',\n" +
+                "     \"contractQuantity\": 0,\n" +
+                "     \"contractAmount\": 0,\n" +
+                "     \"completedQuantity\": 5000,\n" +
+                "     \"unCompletedQuantity\": 5000,\n" +
+                " \t},\n" +
+                "     {\n" +
+                "     \"contractNo\": '合同编码000002',\n" +
+                "     \"contractDate\": '2022年12⽉18⽇',\n" +
+                "     \"contractName\": '合同名称000002',\n" +
+                "     \"supplierCustomer\": '矿产资源废钢贸易库',\n" +
+                "     \"contractType\": '采购合同',\n" +
+                "     \"completionProgress\": 70,\n" +
+                "     \"bidOpeningDate\": '2022/12/5',\n" +
+                "     \"auditDate\": '2022/12/6',\n" +
+                "     \"signingDate\": '2022/12/7',\n" +
+                "     \"closingDate\": '2023/01/5',\n" +
+                "     \"contractQuantity\": 0,\n" +
+                "     \"contractAmount\": 0,\n" +
+                "     \"completedQuantity\": 5000,\n" +
+                "    \"unCompletedQuantity\": 5000,\n" +
+                "     },\n" +
+                "     {\n" +
+                "     \"contractNo\": '合同编码000003',\n" +
+                "     \"contractDate\": '2022年12⽉18⽇',\n" +
+                "     \"contractName\": '合同名称000003',\n" +
+                "     \"supplierCustomer\": '矿产资源废钢贸易库',\n" +
+                "     \"contractType\": '采购合同',\n" +
+                "     \"completionProgress\": 70,\n" +
+                "     \"bidOpeningDate\": '2022/12/5',\n" +
+                "     \"auditDate\": '2022/12/6',\n" +
+                "     \"signingDate\": '2022/12/7',\n" +
+                "     \"closingDate\": '2023/01/5',\n" +
+                "     \"contractQuantity\": 0,\n" +
+                "     \"contractAmount\": 0,\n" +
+                "     \"completedQuantity\": 5000,\n" +
+                "     \"unCompletedQuantity\": 5000,\n" +
+                "     }\n" +
+                " ]\n";
+        return ActionResult.success(JsonUtil.getJsonToJsonArray(data));
+//        ArrayList<MaterialEntity> materialEntities = new ArrayList<>();
+//        MaterialEntity materialEntity = new MaterialEntity();
+//        materialEntity.setId("sfds");
+//        materialEntities.add(materialEntity);
+//        materialEntities.add(materialEntity);
+//        materialEntities.add(materialEntity);
+//        materialEntities.add(materialEntity);
+//        return ActionResult.success(materialEntities);
+    }
+
     @GetMapping("/home")
     @ApiOperation("移动端接口数据home")
     public ActionResult getHome(){
@@ -64,7 +140,7 @@ public class MobilePortController {
         data.put("msgList",msgList);
         data.put("infoa",infoa);
         data.put("infob",infob);
-        return ActionResult.success(data);
+        return ActionResult.success("ssf");
     }
 
     @GetMapping("/onTheWay")