合同

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ContractDocumentController.java

@@ -2,9 +2,9 @@ package com.management.platform.controller;
 
 
 import com.management.platform.entity.vo.ContractFileDelVO;
-import com.management.platform.entity.vo.ContractFileVO;
 import com.management.platform.service.ContractDocumentService;
 import com.management.platform.util.HttpRespMsg;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RequestParam;
@@ -38,20 +38,22 @@ public class ContractDocumentController {
      * @return
      */
     @RequestMapping("/fileUpload")
-    public HttpRespMsg fileUpload (HttpServletRequest request, @RequestParam Integer ContractId, @RequestParam(required=false) Integer folderId, @RequestParam("file") MultipartFile[] files){
+    public HttpRespMsg fileUpload (HttpServletRequest request, @RequestParam Integer ContractId, @RequestParam(required=false) Integer folderId, @RequestParam("file") MultipartFile files){
         return contractDocumentService.fileUpload(request,ContractId,folderId,files);
     }
 
     /**
      * 下载文件
      * @param request
+     * @param response
      * @param folderId
-     * @param contractFileVo
+     * @param contractId
+     * @param fileId
      * @return
      */
     @RequestMapping("/fileDown")
-    public HttpRespMsg fileDown (HttpServletRequest request, HttpServletResponse response, @RequestParam(required=false) Integer folderId, ContractFileVO contractFileVo){
-        return contractDocumentService.fileDown(request,response,folderId,contractFileVo);
+    public HttpRespMsg fileDown (HttpServletRequest request, HttpServletResponse response, @RequestParam(required=false) Integer folderId, Integer contractId, Integer fileId){
+        return contractDocumentService.fileDown(request,response,folderId,contractId,fileId);
     }
 
     /**

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Contract.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -64,7 +65,7 @@ public class Contract extends Model<Contract> {
      * 金额
      */
     @TableField("amounts")
-    private Integer amounts;
+    private Double amounts;
 
     /**
      * 合同类型的id

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/vo/ContractFileVO.java

@@ -2,17 +2,15 @@ package com.management.platform.entity.vo;
 
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @author cs
  * @version 1.0
- * @ClassName contractFileVo
+ * @ClassName ContractFileVO
  * @Description
- * @date 2022-12-09 17:29
+ * @date 2022-12-15 11:23
  */
 @Data
 public class ContractFileVO {
-    private Integer ContractId;
+    private Integer contractId;
     private Integer fileId;
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/vo/ContractPageVO.java

@@ -15,7 +15,6 @@ import java.util.Map;
  * @date 2022-12-14 10:20
  */
 @Data
-public class ContractPageVO {
-    private Contract contract;
+public class ContractPageVO extends Contract{
     private List<ContractDocument> files;
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ContractDocumentService.java

@@ -3,7 +3,6 @@ package com.management.platform.service;
 import com.management.platform.entity.ContractDocument;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.management.platform.entity.vo.ContractFileDelVO;
-import com.management.platform.entity.vo.ContractFileVO;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
@@ -20,9 +19,9 @@ import javax.servlet.http.HttpServletResponse;
  * @since 2022-12-09
  */
 public interface ContractDocumentService extends IService<ContractDocument> {
-    HttpRespMsg fileUpload(HttpServletRequest request, @RequestParam Integer ContractId, @RequestParam(required=false) Integer folderId, @RequestParam("file") MultipartFile[] files);
+    HttpRespMsg fileUpload(HttpServletRequest request, @RequestParam Integer ContractId, @RequestParam(required=false) Integer folderId, @RequestParam("file") MultipartFile files);
 
-    HttpRespMsg fileDown(HttpServletRequest request, HttpServletResponse response, Integer folderId, ContractFileVO contractFileVo);
+    HttpRespMsg fileDown(HttpServletRequest request, HttpServletResponse response, Integer folderId, Integer contractId,Integer fileId);
 
     HttpRespMsg onlineShow(String inputFilePath);
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ContractDocumentServiceImpl.java

@@ -5,7 +5,6 @@ import com.management.platform.entity.Contract;
 import com.management.platform.entity.ContractDocument;
 import com.management.platform.entity.User;
 import com.management.platform.entity.vo.ContractFileDelVO;
-import com.management.platform.entity.vo.ContractFileVO;
 import com.management.platform.mapper.ContractDocumentMapper;
 import com.management.platform.mapper.ContractMapper;
 import com.management.platform.mapper.UserMapper;
@@ -47,71 +46,69 @@ public class ContractDocumentServiceImpl extends ServiceImpl<ContractDocumentMap
     private ContractDocumentMapper contractDocumentMapper;
     @Value(value = "${upload.path}")
     private String path;
+
     /**
      * 上传合同附件
      * @param request
      * @param ContractId
      * @param folderId
-     * @param files
+     * @param file
      * @return
      */
     @Override
-    public HttpRespMsg fileUpload(HttpServletRequest request, @RequestParam Integer ContractId, @RequestParam(required=false) Integer folderId, @RequestParam("file") MultipartFile[] files) {
+    public HttpRespMsg fileUpload(HttpServletRequest request, @RequestParam Integer ContractId, @RequestParam(required=false) Integer folderId, @RequestParam("file") MultipartFile file) {
         HttpRespMsg msg = new HttpRespMsg();
-        User user = userMapper.selectById(request.getHeader("Token"));
-        for (MultipartFile file : files) {
-            ContractDocument record = new ContractDocument();
-            record.setCreatorId(user.getId());
-            record.setCreatorName(user.getName());
-            record.setDocumentName(file.getOriginalFilename());
-            record.setFolderId(folderId);
-            record.setContractId(ContractId);
-            if (file != null && !file.isEmpty()) {
-                //截取文件后缀
-                String fileSuffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
-                record.setDocumentType(DocumentTypeUtil.DocumentType(fileSuffix));
-                //处理文件
-                File dir = new File(path);
-                if (!dir.exists()) {
-                    dir.mkdir();
-                }
-                String fileName= "";
-                if (file!=null && !file.isEmpty()) {
-                    fileName = file.getOriginalFilename();
+        User user = userMapper.selectById(request.getHeader("token"));
+        ContractDocument record = new ContractDocument();
+        record.setCreatorId(user.getId());
+        record.setCreatorName(user.getName());
+        record.setDocumentName(file.getOriginalFilename());
+        record.setFolderId(folderId);
+        record.setContractId(ContractId);
+        if (file != null && !file.isEmpty()) {
+            //截取文件后缀
+            String fileSuffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+            record.setDocumentType(DocumentTypeUtil.DocumentType(fileSuffix));
+            //处理文件
+            File dir = new File(path);
+            if (!dir.exists()) {
+                dir.mkdir();
+            }
+            String fileName= "";
+            if (file!=null && !file.isEmpty()) {
+                fileName = file.getOriginalFilename();
 
-                    int pos = fileName.lastIndexOf(".");
-                    String suffix = fileName.substring(pos).toLowerCase();
-                    //用uuid替换原始的文件名
-                    String purFName = UUID.randomUUID().toString().replaceAll("-", "");
-                    fileName = purFName + suffix;
-                    File saveFile = new File(dir, fileName);
-                    try {
-                        saveFile.createNewFile();
-                        file.transferTo(saveFile);
-                        //计算文件大小
-                        long fileSize = saveFile.length();
-                        String fileLength = FileUtil.getReadableFileSize(fileSize);
-                        record.setServerName(path + fileName);
-                        record.setSize(fileLength);
-                        String pathPrefix = "/upload/";
-                        record.setUrl(pathPrefix + fileName);
-                        contractDocumentMapper.insert(record);
-                        msg.data = record;
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                        fileName = null;
-                        msg.setError(e.getMessage()+", path="+dir.getAbsolutePath());
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        fileName = null;
-                        msg.setError(e.getMessage()+", path="+dir.getAbsolutePath());
-                    }
-                } else {
-                    msg.setError(MessageUtils.message("file.nonExistentError"));
+                int pos = fileName.lastIndexOf(".");
+                String suffix = fileName.substring(pos).toLowerCase();
+                //用uuid替换原始的文件名
+                String purFName = UUID.randomUUID().toString().replaceAll("-", "");
+                fileName = purFName + suffix;
+                File saveFile = new File(dir, fileName);
+                try {
+                    saveFile.createNewFile();
+                    file.transferTo(saveFile);
+                    //计算文件大小
+                    long fileSize = saveFile.length();
+                    String fileLength = FileUtil.getReadableFileSize(fileSize);
+                    record.setServerName(path + fileName);
+                    record.setSize(fileLength);
+                    String pathPrefix = "/upload/";
+                    record.setUrl(pathPrefix + fileName);
+                    contractDocumentMapper.insert(record);
+                    msg.data = record;
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    fileName = null;
+                    msg.setError(e.getMessage()+", path="+dir.getAbsolutePath());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    fileName = null;
+                    msg.setError(e.getMessage()+", path="+dir.getAbsolutePath());
                 }
+            } else {
+                msg.setError(MessageUtils.message("file.nonExistentError"));
             }
         }
-
         return msg;
     }
 
@@ -120,15 +117,16 @@ public class ContractDocumentServiceImpl extends ServiceImpl<ContractDocumentMap
      * @param request
      * @param response
      * @param folderId
-     * @param contractFileVo
+     * @param contractId
+     * @param fileId
      * @return
      */
     @Override
-    public HttpRespMsg fileDown(HttpServletRequest request, HttpServletResponse response, Integer folderId, ContractFileVO contractFileVo) {
+    public HttpRespMsg fileDown(HttpServletRequest request, HttpServletResponse response, Integer folderId, Integer contractId,Integer fileId) {
         HttpRespMsg msg = new HttpRespMsg();
-        Integer fileId = contractFileVo.getFileId();
-        Integer contractId = contractFileVo.getContractId();
         List<ContractDocument> files = contractDocumentMapper.selectList(new QueryWrapper<ContractDocument>().eq("contract_id", contractId));
+        System.err.println(folderId);
+        System.err.println(fileId);
         try {
             ServletOutputStream os = response.getOutputStream();
             for (ContractDocument file : files) {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ContractServiceImpl.java

@@ -25,6 +25,7 @@ import java.io.*;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.ExecutorService;
@@ -102,9 +103,14 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
             }
             List<Contract> contracts = contractMapper.selectContract(user.getCompanyId(), pageStart, pageSize, number, name , typeName , status, startDate,endDate);
             List<Contract> total = contractMapper.selectContract(user.getCompanyId(), null, null, number, name, typeName, status, startDate, endDate);
+            //首先获取所有合同的Id
             List<Integer> contractCollect = contracts.stream().map(c -> c.getId()).collect(Collectors.toList());
-            List<ContractDocument> fileList = contractDocumentMapper.selectList(new QueryWrapper<ContractDocument>().in("contract_id", contractCollect));
-            List<String> userCollect = fileList.stream().map(c -> c.getCreatorId()).collect(Collectors.toList());
+            contractCollect.add(-1);
+            //查询所有合同的所有附件
+            List<ContractDocument> fileList = contractDocumentMapper.selectList(new QueryWrapper<ContractDocument>().in("contract_id", contractCollect).eq("is_deleted",0));
+            //获取所有附件的上传者id
+            List<String> userCollect = fileList.stream().map(c -> c.getCreatorId()).distinct().collect(Collectors.toList());
+            userCollect.add("-1");
             List<User> userList = userMapper.selectList(new QueryWrapper<User>().in("id", userCollect));
             WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
             for (ContractDocument contractDocument : fileList) {
@@ -120,12 +126,25 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
             ArrayList<ContractPageVO> contractPageVOS = new ArrayList<>();
             for (Contract contract : contracts) {
                 ContractPageVO contractPageVO = new ContractPageVO();
-                contractPageVO.setContract(contract);
+                List<ContractDocument> files = new ArrayList<>();
+                contractPageVO.setId(contract.getId());
+                contractPageVO.setCompanyId(contract.getCompanyId());
+                contractPageVO.setCreatorId(contract.getCreatorId());
+                contractPageVO.setIndate(contract.getIndate());
+                contractPageVO.setNumber(contract.getNumber());
+                contractPageVO.setName(contract.getName());
+                contractPageVO.setStatus(contract.getStatus());
+                contractPageVO.setTypeId(contract.getTypeId());
+                contractPageVO.setTypeName(contract.getTypeName());
+                contractPageVO.setCheckerId(contract.getCheckerId());
+                contractPageVO.setRemarks(contract.getRemarks());
+                contractPageVO.setAmounts(contract.getAmounts());
                 for (ContractDocument contractDocument : fileList) {
-                    if (contractDocument.getContractId().equals(contractDocument.getId())){
-                        contractPageVO.getFiles().add(contractDocument);
+                    if (contract.getId().equals(contractDocument.getContractId())){
+                        files.add(contractDocument);
                     }
                 }
+                contractPageVO.setFiles(files);
                 contractPageVOS.add(contractPageVO);
             }
             HashMap<String, Object> map = new HashMap<>();
@@ -135,6 +154,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
             return httpRespMsg;
         }catch (NullPointerException e) {
             //httpRespMsg.setError("验证失败");
+            System.err.println(e);
             httpRespMsg.setError(MessageUtils.message("access.verificationError"));
             return httpRespMsg;
         }
@@ -157,7 +177,8 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
         User user = userMapper.selectById(request.getHeader("token"));
         WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
         HttpRespMsg contractPage = getContractPage(request, null, null, number, name, typeName, status, startDate, endDate);
-        List<Contract> data = (List<Contract>) contractPage.data;
+        HashMap<String, Object> resultDate = (HashMap<String, Object>) contractPage.data;
+        List<ContractPageVO> data = (List<ContractPageVO>)resultDate.get("data");
         List<String> headList = new ArrayList<String>();
 //        headList.add("合同编号");
 //        headList.add("合同名称");
@@ -175,7 +196,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
         headList.add(MessageUtils.message("leave.task"));
         ArrayList<List<String>> allList = new ArrayList<>();
         allList.add(headList);
-        for (Contract contract : data) {
+        for (ContractPageVO contract : data) {
             ArrayList<String> item = new ArrayList<>();
             item.add(contract.getNumber()==null?"":contract.getNumber());
             item.add(contract.getName());
@@ -248,6 +269,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
         contract.setCompanyId(user.getCompanyId());
         contractMapper.insert(contract);
         httpRespMsg.msg = MessageUtils.message("contract.addSuc");
+        httpRespMsg.data = contract.getId();
         return httpRespMsg;
     }
 
@@ -269,7 +291,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
             }
             //合同金额不可为负
             if (contract.getAmounts()!=null && contract.getAmounts() < 0){
-                httpRespMsg.msg = MessageUtils.message("Contract.amountNegative");
+                httpRespMsg.setError(MessageUtils.message("Contract.amountNegative"));
                 return httpRespMsg;
             }
             //合同编号不可重复
@@ -302,7 +324,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
         String token = request.getHeader("TOKEN");
         User user = userMapper.selectById(token);
         WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
-        Integer companyId = wxCorpInfo.getCompanyId();
+        Integer companyId = user.getCompanyId();
         //然后处理文件
         String fileName = multipartFile.getOriginalFilename();
         File file = new File(fileName == null ? "file" : fileName);
@@ -333,11 +355,12 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
             List<Contract> contractList = contractMapper.selectList(new QueryWrapper<Contract>().eq("company_id", companyId));
             List<ContractType> typeList = contractTypeMapper.selectList(new QueryWrapper<ContractType>().eq("company_id", companyId));
             ArrayList<Contract> saveContract = new ArrayList<>();
+            int dataIndex = 1;
             for (int rowIndex = 1; rowIndex <= rowNum; rowIndex++) {
                 int cellIndex = 0;
-                int dataIndex = 1;
                 Row row = sheet.getRow(rowIndex);
                 if (row == null) {
+                    dataIndex++;
                     continue;
                 }
                 if (ExcelUtil.isRowEmpty(row)) {
@@ -345,24 +368,26 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
                 }
                 boolean NoExists = false;
                 boolean TypeExists = false;
-                if (row.getCell(cellIndex) != null) {
-                    row.getCell(cellIndex).setCellType(CellType.STRING);
+                for (int i = 0; i < 5; i++) {
+                    if (row.getCell(i) != null) {
+                        row.getCell(i).setCellType(CellType.STRING);
+                    }
                 }
                 if (row.getCell(1) == null) {
                     //msg.setError("第"+dataIndex+"行缺少合同名称");
-                    msg.setError(MessageUtils.message("",dataIndex));
+                    msg.setError(MessageUtils.message("Contract.nameNullError",dataIndex));
                     return msg;
                 }
-                String No = row.getCell(0).getStringCellValue().trim();
-                String name = row.getCell(1).getStringCellValue().trim();
-                String amounts = row.getCell(2).getStringCellValue().trim();
-                String type = row.getCell(3).getStringCellValue().trim();
-                String remarks = row.getCell(3).getStringCellValue().trim();
+                String No = row.getCell(0)==null?null:row.getCell(0).getStringCellValue();
+                String name = row.getCell(1)==null?null:row.getCell(1).getStringCellValue();
+                String amounts = row.getCell(2)==null?null:row.getCell(2).getStringCellValue();
+                String type = row.getCell(3)==null?null:row.getCell(3).getStringCellValue();
+                String remarks = row.getCell(4)==null?null:row.getCell(4).getStringCellValue();
                 Contract item = new Contract();
                 //检查合同编号是否存在
                 if (StringUtils.isNotBlank(No)){
                     for (Contract contract : contractList) {
-                        if (contract.getNumber().equals(No)){
+                        if (No.equals(contract.getNumber())){
                             NoExists = true;
                             break;
                         }
@@ -375,17 +400,19 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
                     for (int i = 0; i < saveContract.size(); i++) {
                         if (saveContract.get(i).getNumber().equals(No)){
                             //msg.setError("第"+dataIndex+"行合同编号与第"第"+dataIndex+"行合同编号重复);
-                            msg.setError(MessageUtils.message("Contract.NoRepeat",dataIndex,i+1));
+                            msg.setError(MessageUtils.message("Contract.NoRepeat",i+1,dataIndex));
                             return msg;
                         }
                     }
-                    item.setNumber(No);
+                    item.setNumber(No.trim());
                 }
-                //检查类型名称是否存在
+                //检查合同类型是否存在
+                Integer typeId = null;
                 if (StringUtils.isNotBlank(type)){
                     for (ContractType contractType : typeList) {
                         if (contractType.getTypeName().equals(type)){
                             TypeExists = true;
+                            typeId = contractType.getId();
                             break;
                         }
                     }
@@ -394,15 +421,25 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
                         msg.setError(MessageUtils.message("Contract.typeExists",dataIndex));
                         return msg;
                     }
-                    item.setName(name);
+                    item.setTypeId(typeId);
                 }
+                item.setName(name.trim());
                 item.setCompanyId(companyId);
                 item.setCreatorId(user.getId());
                 item.setIndate(LocalDate.now());
                 item.setStatus(3);
-                item.setAmounts(Integer.parseInt(amounts));
-                item.setRemarks(remarks);
+                if (Double.parseDouble(amounts) <= 0 ){
+                    //第{0}行金额不可为负数
+                    msg.setError(MessageUtils.message("Contract.amountNegativeByCell",dataIndex));
+                    return msg;
+                }else if (StringUtils.isNotBlank(amounts)){
+                    item.setAmounts(Double.parseDouble(amounts));
+                }
+                if (StringUtils.isNotBlank(remarks)){
+                    item.setRemarks(remarks.trim());
+                }
                 saveContract.add(item);
+                dataIndex++;
             }
             if(saveContract.size()>0){
                 int i = 0;