diff --git a/SC-boot/linkage-common/src/main/java/jnpf/util/DownUtil.java b/SC-boot/linkage-common/src/main/java/jnpf/util/DownUtil.java
index 69aced31..0d6c789a 100644
--- a/SC-boot/linkage-common/src/main/java/jnpf/util/DownUtil.java
+++ b/SC-boot/linkage-common/src/main/java/jnpf/util/DownUtil.java
@@ -11,7 +11,6 @@ import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage;
import java.io.*;
import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
/**
*
@@ -191,6 +190,7 @@ public class DownUtil {
}
//强制将缓存区的数据进行输出
outputStream.flush();
+
}catch (Exception e){
e.getMessage();
}
diff --git a/SC-boot/linkage-scm/pom.xml b/SC-boot/linkage-scm/pom.xml
index 52dbdcdb..e30ea6e9 100644
--- a/SC-boot/linkage-scm/pom.xml
+++ b/SC-boot/linkage-scm/pom.xml
@@ -17,8 +17,36 @@
1.8
0.17.0
+
+
+
+ com.e-iceblue
+ https://repo.e-iceblue.cn/repository/maven-public/
+
+
+
+
+
+ e-iceblue
+ spire.doc.free
+ 5.2.0
+
+
+
+
+ org.apache.poi
+ poi
+ 4.1.2
+
+
+
+ org.apache.poi
+ poi-ooxml
+ 4.1.2
+
+
org.freemarker
@@ -67,17 +95,16 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -99,9 +126,7 @@
-
-
-
+
commons-cli
commons-cli
@@ -195,9 +220,4 @@
-
-
-
-
-
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/CollectionEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/CollectionEntity.java
index b1eef911..a0b48349 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/CollectionEntity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/CollectionEntity.java
@@ -113,7 +113,10 @@ public class CollectionEntity {
@TableField("CUSTOMER_ID")
private String customerId;
+<<<<<<< HEAD
@TableField("CONTRACT_ID")
private String contractId;
+=======
+>>>>>>> 6b66ea0276198dd5eb24cd6f115f6e164cbd7df3
}
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionCrForm.java
index 70eb2988..bf32c4d5 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionCrForm.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionCrForm.java
@@ -2,6 +2,7 @@
package jnpf.collection.model.collection;
+import com.baomidou.mybatisplus.annotation.TableField;
import jnpf.collection.model.collection.Collection_item0Model;
import lombok.Data;
import java.util.List;
@@ -76,6 +77,7 @@ public class CollectionCrForm {
/** 子表数据 **/
@JsonProperty("collection_item0List")
private List collection_item0List;
-
-
+ /** 客户id **/
+ @JsonProperty("customerId")
+ private String customerId;
}
\ No newline at end of file
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionInfoVO.java
index e4e2348d..210dc169 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionInfoVO.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionInfoVO.java
@@ -79,4 +79,7 @@ public class CollectionInfoVO{
/** 子表数据 **/
@JsonProperty("collection_item0List")
private List collection_item0List;
+ /** 客户id **/
+ @JsonProperty("customerId")
+ private String customerId;
}
\ No newline at end of file
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionListVO.java
index 35302f9a..ad3d5e7c 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionListVO.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionListVO.java
@@ -86,6 +86,8 @@ public class CollectionListVO{
/** 制单人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
-
+ /** 客户id **/
+ @JsonProperty("customerId")
+ private String customerId;
}
\ No newline at end of file
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionUpForm.java
index 7c552f64..e64319a6 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionUpForm.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionUpForm.java
@@ -90,5 +90,8 @@ public class CollectionUpForm{
/** 子表数据 **/
@JsonProperty("collection_item0List")
private List collection_item0List;
+ /** 客户id **/
+ @JsonProperty("customerId")
+ private String customerId;
}
\ No newline at end of file
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/controller/ContractMobileController.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/controller/ContractMobileController.java
new file mode 100644
index 00000000..db32bc9e
--- /dev/null
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/controller/ContractMobileController.java
@@ -0,0 +1,44 @@
+package jnpf.contractMobile.controller;
+
+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.contractMobile.entity.ContractMobileEntity;
+import jnpf.contractMobile.model.contractMobile.ContractMobileListVO;
+import jnpf.contractMobile.model.contractMobile.ContractMobilePagination;
+import jnpf.contractMobile.service.ContractMobileService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+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.*;
+
+import jnpf.util.*;
+
+@Slf4j
+@RestController
+@Api(tags = "合同档案(移)", value = "contractMobile")
+@RequestMapping("/api/contractMobile/ContractMobile")
+public class ContractMobileController {
+
+ @Autowired
+ private ContractMobileService contractMobileService;
+
+ @PostMapping("/getList")
+ @ApiOperation("合同档案列表")
+ public ActionResult list(@RequestBody ContractMobilePagination contractMobilePagination) throws IOException {
+ List list = contractMobileService.getList(contractMobilePagination);
+ List listVO = JsonUtil.getJsonToList(list, ContractMobileListVO.class);
+ PageListVO vo = new PageListVO();
+ vo.setList(listVO);
+ PaginationVO page = JsonUtil.getJsonToBean(contractMobilePagination, PaginationVO.class);
+ vo.setPagination(page);
+ return ActionResult.success(vo);
+ }
+}
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/entity/ContractMobileEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/entity/ContractMobileEntity.java
new file mode 100644
index 00000000..a85822f0
--- /dev/null
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/entity/ContractMobileEntity.java
@@ -0,0 +1,139 @@
+package jnpf.contractMobile.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * 合同档案(移)
+ */
+@Data
+@TableName("jg_contract")
+public class ContractMobileEntity {
+ @TableId("ID")
+ private String id;
+
+ @TableField("CREATOR_USER_ID")
+ private String creatorUserId;
+
+ @TableField("CREATOR_USER_NAME")
+ private String creatorUserName;
+
+ @TableField("CREATOR_TIME")
+ private Date creatorTime;
+
+ @TableField("LAST_MODIFY_USER_ID")
+ private String lastModifyUserId;
+
+ @TableField("LAST_MODIFY_USER_NAME")
+ private String lastModifyUserName;
+
+ @TableField("LAST_MODIFY_TIME")
+ private Date lastModifyTime;
+
+ @TableField("DELETE_USER_ID")
+ private String deleteUserId;
+
+ @TableField("DELETE_USER_NAME")
+ private String deleteUserName;
+
+ @TableField("DELETE_TIME")
+ private Date deleteTime;
+
+ @TableField("DELETE_MARK")
+ private String deleteMark;
+
+ @TableField("ORGNIZE_ID")
+ private String orgnizeId;
+
+ @TableField("DEPARTMENT_ID")
+ private String departmentId;
+
+ @TableField("CONTRACT_CODE")
+ private String contractCode;
+
+ @TableField("CONTRACT_NAME")
+ private String contractName;
+
+ @TableField("CONTRACT_NO")
+ private String contractNo;
+
+ @TableField("CONTRACT_TYPE")
+ private String contractType;
+
+ @TableField("CLASSIFICATION")
+ private String classification;
+
+ @TableField("DECLARATION_DATE")
+ private Date declarationDate;
+
+ @TableField("CODE")
+ private String code;
+
+ @TableField("NAME")
+ private String name;
+
+ @TableField("NUM")
+ private BigDecimal num;
+
+ @TableField("AMOUNT")
+ private BigDecimal amount;
+
+ @TableField("DEPT_CODE")
+ private String deptCode;
+
+ @TableField("DEPT_NAME")
+ private String deptName;
+
+ @TableField("STATUS")
+ private String status;
+
+ @TableField("BID_OPENING_DATE")
+ private Date bidOpeningDate;
+
+ @TableField("START_DATE")
+ private Date startDate;
+
+ @TableField("AUDIT_DATE")
+ private Date auditDate;
+
+ @TableField("COMPLETION_DATE")
+ private Date completionDate;
+
+ @TableField("CLOSING_DATE")
+ private Date closingDate;
+
+ @TableField("COLLECTION_CYCLE")
+ private Integer collectionCycle;
+
+ @TableField("SIGNING_DATE")
+ private Date signingDate;
+
+ @TableField("END_DATE")
+ private Date endDate;
+
+ @TableField("CURRENCY")
+ private String currency;
+
+ @TableField("ORGANIZATION")
+ private String organization;
+
+ @TableField("REMARK")
+ private String remark;
+
+ @TableField("APPROVAL")
+ private String approval;
+
+ @TableField("EXCHANGE_RATE")
+ private String exchangeRate;
+
+ @TableField("BANK_NO")
+ private String bankNo;
+
+ @TableField("TAX_NO")
+ private String taxNo;
+}
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/mapper/ContractMobileMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/mapper/ContractMobileMapper.java
new file mode 100644
index 00000000..ef2cbfe8
--- /dev/null
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/mapper/ContractMobileMapper.java
@@ -0,0 +1,7 @@
+package jnpf.contractMobile.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import jnpf.contractMobile.entity.ContractMobileEntity;
+
+public interface ContractMobileMapper extends BaseMapper {
+}
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/model/contractMobile/ContractMobileListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/model/contractMobile/ContractMobileListVO.java
new file mode 100644
index 00000000..6c6da092
--- /dev/null
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/model/contractMobile/ContractMobileListVO.java
@@ -0,0 +1,159 @@
+package jnpf.contractMobile.model.contractMobile;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ * 合同列表
+ *
+ */
+@Data
+public class ContractMobileListVO{
+
+ /** 主键 */
+ private String id;
+
+
+ /** 合同类型 **/
+ @JsonProperty("contractType")
+ private String contractType;
+
+
+ /** 合同编码 **/
+ @JsonProperty("contractCode")
+ private String contractCode;
+
+
+ /** 合同名称 **/
+ @JsonProperty("contractName")
+ private String contractName;
+
+
+ /** 合同状态 **/
+ @JsonProperty("status")
+ private String status;
+
+
+ /** 开标日期 **/
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @JsonProperty("bidOpeningDate")
+ private Date bidOpeningDate;
+
+
+ /** 开始日期 **/
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @JsonProperty("startDate")
+ private Date startDate;
+
+
+ /** 审核日期 **/
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @JsonProperty("auditDate")
+ private Date auditDate;
+
+
+ /** 供货完成日期 **/
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @JsonProperty("completionDate")
+ private Date completionDate;
+
+
+ /** 关闭日期 **/
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @JsonProperty("closingDate")
+ private Date closingDate;
+
+
+ /** 回款周期(日) **/
+ @JsonProperty("collectionCycle")
+ private String collectionCycle;
+
+
+ /** 签订日期 **/
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @JsonProperty("signingDate")
+ private Date signingDate;
+
+
+ /** 截止日期 **/
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @JsonProperty("endDate")
+ private Date endDate;
+
+
+ /** 供应商/客户编 **/
+ @JsonProperty("code")
+ private String code;
+
+
+ /** 供应商/客户名 **/
+ @JsonProperty("name")
+ private String name;
+
+
+ /** 对方合同号 **/
+ @JsonProperty("contractNo")
+ private String contractNo;
+
+
+ /** 币种 **/
+ @JsonProperty("currency")
+ private String currency;
+
+
+ /** 数量 **/
+ @JsonProperty("num")
+ private String num;
+
+
+ /** 金额 **/
+ @JsonProperty("amount")
+ private String amount;
+
+
+ /** 库存组织 **/
+ @JsonProperty("organization")
+ private String organization;
+
+
+ /** 备注 **/
+ @JsonProperty("remark")
+ private String remark;
+
+
+ /** 合同分类 **/
+ @JsonProperty("classification")
+ private String classification;
+
+
+ /** 申报日期 **/
+ @JsonProperty("declarationDate")
+ private String declarationDate;
+
+
+ /** 部门编码 **/
+ @JsonProperty("deptCode")
+ private String deptCode;
+
+
+ /** 录入人 **/
+ @JsonProperty("creatorusername")
+ private String creatorusername;
+
+
+ /** 部门名称 **/
+ @JsonProperty("deptName")
+ private String deptName;
+
+
+ /** 集团审批 **/
+ @JsonProperty("approval")
+ private String approval;
+
+
+}
\ No newline at end of file
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/model/contractMobile/ContractMobilePagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/model/contractMobile/ContractMobilePagination.java
new file mode 100644
index 00000000..1f9b8885
--- /dev/null
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/model/contractMobile/ContractMobilePagination.java
@@ -0,0 +1,13 @@
+package jnpf.contractMobile.model.contractMobile;
+
+import jnpf.base.Pagination;
+import lombok.Data;
+
+@Data
+public class ContractMobilePagination extends Pagination {
+
+ /**
+ * 菜单id
+ */
+ private String menuId;
+}
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/service/ContractMobileService.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/service/ContractMobileService.java
new file mode 100644
index 00000000..9ddd038f
--- /dev/null
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/service/ContractMobileService.java
@@ -0,0 +1,11 @@
+package jnpf.contractMobile.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import jnpf.contractMobile.entity.ContractMobileEntity;
+import jnpf.contractMobile.model.contractMobile.ContractMobilePagination;
+
+import java.util.*;
+
+public interface ContractMobileService extends IService {
+ List getList(ContractMobilePagination contractMobilePagination);
+}
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/service/impl/ContractMobileServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/service/impl/ContractMobileServiceImpl.java
new file mode 100644
index 00000000..c59ab06a
--- /dev/null
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/service/impl/ContractMobileServiceImpl.java
@@ -0,0 +1,65 @@
+package jnpf.contractMobile.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.contractMobile.entity.ContractMobileEntity;
+import jnpf.contractMobile.mapper.ContractMobileMapper;
+import jnpf.contractMobile.model.contractMobile.ContractMobilePagination;
+import jnpf.contractMobile.service.ContractMobileService;
+import jnpf.supplyProcessAnalysis.entity.ContractMEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import jnpf.util.*;
+
+import java.util.*;
+
+@Service
+public class ContractMobileServiceImpl extends ServiceImpl implements ContractMobileService {
+ @Autowired
+ private UserProvider userProvider;
+
+ @Override
+ public List getList(ContractMobilePagination contractMobilePagination) {
+ String userId = userProvider.get().getUserId();
+ List AllIdList = new ArrayList();
+ int total = 0;
+ int contractMNum = 0;
+ QueryWrapper contractMobileQueryWrapper = new QueryWrapper<>();
+ boolean pcPermission = false;
+ boolean appPermission = false;
+ boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+ if (isPc && pcPermission) {
+ if (!userProvider.get().getIsAdministrator()) {
+ return new ArrayList<>();
+ }
+ }
+ if (!isPc && appPermission) {
+ if (!userProvider.get().getIsAdministrator()) {
+ 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 page = new Page<>(contractMobilePagination.getCurrentPage(), contractMobilePagination.getPageSize());
+ IPage userIPage = this.page(page, contractMobileQueryWrapper);
+ return contractMobilePagination.setData(userIPage.getRecords(), userIPage.getTotal());
+ } else {
+ List list = new ArrayList();
+ return contractMobilePagination.setData(list, list.size());
+ }
+ }
+}
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/controller/ContractFileController.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/controller/ContractFileController.java
index 6a3cd571..a82d328b 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/controller/ContractFileController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/controller/ContractFileController.java
@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
import jnpf.base.ActionResult;
import jnpf.base.NoDataSourceBind;
import jnpf.base.UserInfo;
+import jnpf.base.entity.BillRuleEntity;
import jnpf.base.util.OptimizeUtil;
import jnpf.base.vo.DownloadVO;
import jnpf.base.vo.PageListVO;
@@ -27,9 +28,14 @@ import jnpf.contractfile.service.ContractFileService;
import jnpf.contractfile.service.Contract_item0Service;
import jnpf.contractfile.service.Contract_item1Service;
import jnpf.exception.DataException;
+import jnpf.model.EmployeeModel;
import jnpf.model.UploaderVO;
+import jnpf.model.employee.EmployeeImportVO;
+import jnpf.permission.model.user.vo.UserExportVO;
+import jnpf.permission.model.user.vo.UserImportVO;
import jnpf.util.*;
import jnpf.util.enums.FileTypeEnum;
+import jnpf.util.enums.ModuleTypeEnum;
import jnpf.util.file.UploadUtil;
import jnpf.utils.YozoUtils;
import lombok.Cleanup;
@@ -44,6 +50,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
+import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -52,8 +59,8 @@ import java.util.List;
import java.util.Map;
/**
- *
* contractFile
+ *
* @版本: V3.2.0
* @版权: LINKAGE-BOOT
* @作者: LINKAGE-BOOT研发团队
@@ -61,7 +68,7 @@ import java.util.Map;
*/
@Slf4j
@RestController
-@Api(tags = "contractFile" , value = "example")
+@Api(tags = "contractFile", value = "example")
@RequestMapping("/api/example/ContractFile")
public class ContractFileController {
@@ -85,28 +92,27 @@ public class ContractFileController {
private YozoUtils yozoUtils;
-
/**
* 列表
*
* @param contractFilePagination
* @return
*/
- @PostMapping("/getList")
- public ActionResult list(@RequestBody ContractFilePagination contractFilePagination)throws IOException{
- List list= contractFileService.getList(contractFilePagination);
+ @PostMapping("/getList")
+ public ActionResult list(@RequestBody ContractFilePagination contractFilePagination) throws IOException {
+ List list = contractFileService.getList(contractFilePagination);
//处理id字段转名称,若无需转或者为空可删除
- for(ContractFileEntity entity:list){
- entity.setApproval(generaterSwapUtil.switchSelectValue(entity.getApproval() ,"开" ,"关"));
- }
- List listVO=JsonUtil.getJsonToList(list,ContractFileListVO.class);
- for(ContractFileListVO contractFileVO:listVO){
- }
+ for (ContractFileEntity entity : list) {
+ entity.setApproval(generaterSwapUtil.switchSelectValue(entity.getApproval(), "开", "关"));
+ }
+ List listVO = JsonUtil.getJsonToList(list, ContractFileListVO.class);
+ for (ContractFileListVO contractFileVO : listVO) {
+ }
- PageListVO vo=new PageListVO();
+ PageListVO vo = new PageListVO();
vo.setList(listVO);
- PaginationVO page=JsonUtil.getJsonToBean(contractFilePagination,PaginationVO.class);
+ PaginationVO page = JsonUtil.getJsonToBean(contractFilePagination, PaginationVO.class);
vo.setPagination(page);
return ActionResult.success(vo);
}
@@ -121,198 +127,249 @@ public class ContractFileController {
@PostMapping
@Transactional
public ActionResult create(@RequestBody @Valid ContractFileCrForm contractFileCrForm) throws DataException {
- String mainId =RandomUtil.uuId();
- UserInfo userInfo=userProvider.get();
+ String mainId = RandomUtil.uuId();
+ UserInfo userInfo = userProvider.get();
+ contractFileCrForm.setStatus("1");
ContractFileEntity entity = JsonUtil.getJsonToBean(contractFileCrForm, ContractFileEntity.class);
- entity.setId(mainId);
- contractFileService.save(entity);
- List Contract_item0List = JsonUtil.getJsonToList(contractFileCrForm.getContract_item0List(),Contract_item0Entity.class);
- for(Contract_item0Entity entitys : Contract_item0List){
- entitys.setId(RandomUtil.uuId());
- entitys.setContractId(entity.getId());
-
-
-
-
+ entity.setId(mainId);
+ contractFileService.save(entity);
+ List Contract_item0List = JsonUtil.getJsonToList(contractFileCrForm.getContract_item0List(), Contract_item0Entity.class);
+ for (Contract_item0Entity entitys : Contract_item0List) {
+ entitys.setId(RandomUtil.uuId());
+ entitys.setContractId(entity.getId());
+ contract_item0Service.save(entitys);
+ }
+ List Contract_item1List = JsonUtil.getJsonToList(contractFileCrForm.getContract_item1List(), Contract_item1Entity.class);
+ for (Contract_item1Entity entitys : Contract_item1List) {
+ entitys.setId(RandomUtil.uuId());
+ entitys.setContractId(entity.getId());
+ contract_item1Service.save(entitys);
+ }
+ return ActionResult.success("创建成功");
+ }
- contract_item0Service.save(entitys);
- }
- List Contract_item1List = JsonUtil.getJsonToList(contractFileCrForm.getContract_item1List(),Contract_item1Entity.class);
- for(Contract_item1Entity entitys : Contract_item1List){
- entitys.setId(RandomUtil.uuId());
- entitys.setContractId(entity.getId());
-
- contract_item1Service.save(entitys);
- }
+ /**
+ * 模板下载
+ *
+ * @return
+ */
+ @ApiOperation("模板下载")
+ @GetMapping("/TemplateDownload")
+ public ActionResult TemplateDownload() {
+ UserInfo userInfo = userProvider.get();
+ DownloadVO vo = DownloadVO.builder().build();
+ try {
+ vo.setName("合同档案信息.xlsx");
+ vo.setUrl(UploaderUtil.uploaderFile("/api/file/DownloadModel?encryption=", userInfo.getId() + "#" + "合同档案信息" +
+ ".xlsx" + "#" + "Temporary"));
+ } catch (Exception e) {
+ log.error("信息导出Excel错误:" + e.getMessage());
+ }
+ return ActionResult.success(vo);
+ }
+ /**
+ * 上传文件(excel)
+ *
+ * @return
+ */
+ @ApiOperation("上传文件")
+ @PostMapping("/Uploader")
+ public ActionResult Uploader() {
+ List list = UpUtil.getFileAll();
+ MultipartFile file = list.get(0);
+ if (file.getOriginalFilename().endsWith(".xlsx") || file.getOriginalFilename().endsWith(".xls")) {
+ String filePath = configValueUtil.getTemporaryFilePath();
+ String fileName = RandomUtil.uuId() + "." + UpUtil.getFileType(file);
+ fileName = XSSEscape.escape(fileName);
+ //上传文件
+ FileUtil.upFile(file, filePath, fileName);
+ DownloadVO vo = DownloadVO.builder().build();
+ vo.setName(fileName);
+ return ActionResult.success(vo);
+ } else {
+ return ActionResult.fail("选择文件不符合导入");
+ }
- return ActionResult.success("创建成功");
-}
+ }
+ /**
+ * 导入预览
+ *
+ * @return
+ */
+ @ApiOperation("导入预览")
+ @GetMapping("/ImportPreview")
+ public ActionResult ImportPreview(String fileName) {
+ String filePath = configValueUtil.getTemporaryFilePath();
+ File temporary = new File(XSSEscape.escapePath(filePath + fileName));
+ //得到数据
+ List personList = ExcelUtil.importExcel(temporary, 0, 1, ContractFileModel.class);
+ //预览数据
+ Map map = contractFileService.importPreview(personList);
+ return ActionResult.success(map);
+ }
/**
- * 模板下载
- *
- * @return
- */
- @ApiOperation("模板下载")
- @GetMapping("/templateDownload")
- public ActionResult TemplateDownload(){
- UserInfo userInfo=userProvider.get();
- DownloadVO vo=DownloadVO.builder().build();
- try{
- vo.setName("职员信息.xlsx");
- vo.setUrl(UploaderUtil.uploaderFile("/api/Common/DownloadModel?encryption=" ,userInfo.getId()+"#"+"职员信息.xlsx"+"#"+"Temporary"));
- }catch(Exception e){
- log.error("信息导出Excel错误:{}" ,e.getMessage());
- }
- return ActionResult.success(vo);
+ * 导入数据
+ *
+ * @return
+ */
+ @ApiOperation("导入数据")
+ @PostMapping("/ImportData")
+ public ActionResult ImportData(@RequestBody ContractFileModel data) {
+ List dataList = JsonUtil.getJsonToList(data.getList(), ContractFileModel.class);
+ //导入数据
+ ContractfileImportVO result = contractFileService.importData(dataList);
+ return ActionResult.success(result);
}
+
/**
- * 导出Excel
- *
- * @return
- */
+ * 导出Excel
+ *
+ * @return
+ */
@ApiOperation("导出Excel")
@GetMapping("/Actions/Export")
public ActionResult Export(ContractFilePaginationExportModel contractFilePaginationExportModel) throws IOException {
- if (StringUtil.isEmpty(contractFilePaginationExportModel.getSelectKey())){
+ if (StringUtil.isEmpty(contractFilePaginationExportModel.getSelectKey())) {
return ActionResult.fail("请选择导出字段");
}
- ContractFilePagination contractFilePagination=JsonUtil.getJsonToBean(contractFilePaginationExportModel, ContractFilePagination.class);
- List list= contractFileService.getTypeList(contractFilePagination,contractFilePaginationExportModel.getDataType());
+ ContractFilePagination contractFilePagination = JsonUtil.getJsonToBean(contractFilePaginationExportModel, ContractFilePagination.class);
+ List list = contractFileService.getTypeList(contractFilePagination, contractFilePaginationExportModel.getDataType());
//处理id字段转名称,若无需转或者为空可删除
- for(ContractFileEntity entity:list){
- entity.setApproval(generaterSwapUtil.switchSelectValue(entity.getApproval() ,"开" ,"关"));
- }
- List listVO=JsonUtil.getJsonToList(list,ContractFileListVO.class);
- for(ContractFileListVO contractFileVO:listVO){
- }
+ for (ContractFileEntity entity : list) {
+ entity.setApproval(generaterSwapUtil.switchSelectValue(entity.getApproval(), "开", "关"));
+ }
+ List listVO = JsonUtil.getJsonToList(list, ContractFileListVO.class);
+ for (ContractFileListVO contractFileVO : listVO) {
+ }
//转换为map输出
- List