合同

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

@@ -1,9 +1,8 @@
 package com.management.platform.controller;
 
 
-import com.management.platform.entity.ContractDocument;
-import com.management.platform.entity.vo.ContractFileDelVo;
-import com.management.platform.entity.vo.ContractFileVo;
+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.RequestMapping;
@@ -15,7 +14,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 
 /**
  * <p>
@@ -52,7 +50,7 @@ public class ContractDocumentController {
      * @return
      */
     @RequestMapping("/fileDown")
-    public HttpRespMsg fileDown (HttpServletRequest request, HttpServletResponse response, @RequestParam(required=false) Integer folderId, ContractFileVo contractFileVo){
+    public HttpRespMsg fileDown (HttpServletRequest request, HttpServletResponse response, @RequestParam(required=false) Integer folderId, ContractFileVO contractFileVo){
         return contractDocumentService.fileDown(request,response,folderId,contractFileVo);
     }
 
@@ -63,7 +61,7 @@ public class ContractDocumentController {
      * @return
      */
     @RequestMapping("/fileDelete")
-    public HttpRespMsg fileDelete (HttpServletRequest request, ContractFileDelVo contractFileDelVo){
+    public HttpRespMsg fileDelete (HttpServletRequest request, ContractFileDelVO contractFileDelVo){
         return contractDocumentService.fileDelete(request,contractFileDelVo);
     }
 

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

@@ -1,29 +1,18 @@
 package com.management.platform.controller;
 
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.google.gson.JsonObject;
 import com.management.platform.entity.*;
-import com.management.platform.entity.vo.SysRichFunction;
-import com.management.platform.entity.vo.exportLeave;
+import com.management.platform.entity.vo.ExportLeave;
 import com.management.platform.mapper.DepartmentMapper;
 import com.management.platform.mapper.SysFunctionMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.DepartmentService;
-import com.management.platform.service.ExpenseSheetService;
 import com.management.platform.service.LeaveSheetService;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import javax.xml.stream.Location;
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -125,7 +114,7 @@ public class LeaveSheetController {
      * @return
      */
     @RequestMapping("/exportLeave")
-    public HttpRespMsg exportLeaveData(exportLeave exportLeave) {
+    public HttpRespMsg exportLeaveData(ExportLeave exportLeave) {
         String userId = request.getHeader("Token");
         return leaveSheetService.exportLeaveData(userId,exportLeave.getStatus(),exportLeave.getLeaveType(),exportLeave.getStartTime(),exportLeave.getEndTime());
     }

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

@@ -12,7 +12,7 @@ import java.util.List;
  * @date 2022-12-12 16:16
  */
 @Data
-public class ContractFileDelVo {
+public class ContractFileDelVO {
     private Integer contractId;
     private List<Integer> fileIds;
 }

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

@@ -12,7 +12,7 @@ import java.util.List;
  * @date 2022-12-09 17:29
  */
 @Data
-public class ContractFileVo {
+public class ContractFileVO {
     private Integer ContractId;
     private Integer fileId;
 }

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

@@ -0,0 +1,21 @@
+package com.management.platform.entity.vo;
+
+import com.management.platform.entity.Contract;
+import com.management.platform.entity.ContractDocument;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author cs
+ * @version 1.0
+ * @ClassName contractPageVo
+ * @Description
+ * @date 2022-12-14 10:20
+ */
+@Data
+public class ContractPageVO {
+    private Contract contract;
+    private List<ContractDocument> files;
+}

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

@@ -12,7 +12,7 @@ import lombok.experimental.Accessors;
  * @date 2022-09-16 18:48
  */
 @Data
-public class exportLeave {
+public class ExportLeave {
     public Integer status;
     public Integer leaveType;
     public String startTime;

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

@@ -2,8 +2,8 @@ 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.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;
@@ -22,9 +22,9 @@ import javax.servlet.http.HttpServletResponse;
 public interface ContractDocumentService extends IService<ContractDocument> {
     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, ContractFileVO contractFileVo);
 
     HttpRespMsg onlineShow(String inputFilePath);
 
-    HttpRespMsg fileDelete(HttpServletRequest request, ContractFileDelVo contractFileDelVo);
+    HttpRespMsg fileDelete(HttpServletRequest request, ContractFileDelVO contractFileDelVo);
 }

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

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.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;
@@ -28,7 +28,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import java.util.zip.ZipOutputStream;
 
 /**
  * <p>
@@ -125,7 +124,7 @@ public class ContractDocumentServiceImpl extends ServiceImpl<ContractDocumentMap
      * @return
      */
     @Override
-    public HttpRespMsg fileDown(HttpServletRequest request, HttpServletResponse response, Integer folderId, ContractFileVo contractFileVo) {
+    public HttpRespMsg fileDown(HttpServletRequest request, HttpServletResponse response, Integer folderId, ContractFileVO contractFileVo) {
         HttpRespMsg msg = new HttpRespMsg();
         Integer fileId = contractFileVo.getFileId();
         Integer contractId = contractFileVo.getContractId();
@@ -190,7 +189,7 @@ public class ContractDocumentServiceImpl extends ServiceImpl<ContractDocumentMap
      * @return
      */
     @Override
-    public HttpRespMsg fileDelete(HttpServletRequest request, ContractFileDelVo contractFileDelVo) {
+    public HttpRespMsg fileDelete(HttpServletRequest request, ContractFileDelVO contractFileDelVo) {
         HttpRespMsg msg = new HttpRespMsg();
         User user = userMapper.selectById(request.getHeader("Token"));
         Integer contractId = contractFileDelVo.getContractId();

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

@@ -2,6 +2,7 @@ package com.management.platform.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.*;
+import com.management.platform.entity.vo.ContractPageVO;
 import com.management.platform.mapper.*;
 import com.management.platform.service.ContractDocumentService;
 import com.management.platform.service.ContractService;
@@ -99,27 +100,36 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
             if (StringUtils.isNotBlank(name)){
                 name = "%" + name + "%";
             }
-            if (StringUtils.isNotBlank(typeName)){
-                typeName = typeName;
-            }
             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);
-            for (Contract contract : contracts) {
-                List<ContractDocument> fileUrl = contractDocumentMapper.selectList(new QueryWrapper<ContractDocument>().eq("contract_id", id).eq("is_deleted",0));
-                List<User> users = userMapper.selectList(new QueryWrapper<User>().eq("company_id", user.getCompanyId()));
-                WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
-                for (ContractDocument contractDocument : fileUrl) {
-                    if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                        for (User item : users) {
-                            if (item.getId().equals(contractDocument.getCreatorId())){
-                                contractDocument.setCreatorName(item.getCorpwxUserid());
-                            }
+            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());
+            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) {
+                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+                    for (User item : userList) {
+                        if (item.getId().equals(contractDocument.getCreatorId())){
+                            contractDocument.setCreatorName(item.getCorpwxUserid());
+                            break;
                         }
                     }
                 }
             }
+            ArrayList<ContractPageVO> contractPageVOS = new ArrayList<>();
+            for (Contract contract : contracts) {
+                ContractPageVO contractPageVO = new ContractPageVO();
+                contractPageVO.setContract(contract);
+                for (ContractDocument contractDocument : fileList) {
+                    if (contractDocument.getContractId().equals(contractDocument.getId())){
+                        contractPageVO.getFiles().add(contractDocument);
+                    }
+                }
+                contractPageVOS.add(contractPageVO);
+            }
             HashMap<String, Object> map = new HashMap<>();
-            map.put("data",contracts);
+            map.put("data",contractPageVOS);
             map.put("total",total.size());
             httpRespMsg.data = map;
             return httpRespMsg;