sangwenwei 8 місяців тому
батько
коміт
9194c6986d
46 змінених файлів з 24 додано та 451 видалено
  1. 0 1
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/bid/controller/TenderBidController.java
  2. 0 1
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/bid/mapper/TenderBidDetailMapper.java
  3. 0 2
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/borrow/mapper/RefundMapper.java
  4. 0 1
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/drive/mapper/DriveInfoMapper.java
  5. 1 5
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/drive/service/DriveApplyService.java
  6. 1 2
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/editor/domain/EditorFiles.java
  7. 1 2
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/evection/controller/EvectionController.java
  8. 1 2
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/evection/service/EvectionService.java
  9. 1 2
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/finance/controller/CwFinanceInvoiceController.java
  10. 0 1
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/finance/mapper/JyFinanceInvoiceInvalidMapper.java
  11. 0 1
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/goOut/controller/GoOutController.java
  12. 2 8
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/holiday/controller/HolidayController.java
  13. 1 3
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/holiday/service/HolidayService.java
  14. 1 4
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/humanResources/controller/StaffDimissionController.java
  15. 1 5
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/humanResources/controller/StaffUserInfoController.java
  16. 0 1
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/humanResources/mapper/JyDimissionProcessMapper.java
  17. 0 1
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/humanResources/service/StaffDimissionService.java
  18. 0 5
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/inscription/controller/InscriptionController.java
  19. 4 16
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/inscription/service/InscriptionService.java
  20. 0 2
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/knowledge/service/KnowledgeShareInfoService.java
  21. 0 2
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/meetingRoom/controller/MeetingRoomController.java
  22. 0 1
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/meetingRoom/mapper/MeetingRoomMapper.java
  23. 0 3
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/meetingRoom/service/MeetingRoomService.java
  24. 0 1
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/monthly/controller/MonthlyController.java
  25. 0 1
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/monthly/service/MonthlyService.java
  26. 0 2
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/notify/controller/JyNotifyController.java
  27. 0 2
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/notify/mapper/JyNotifyLogMapper.java
  28. 0 1
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/notify/mapper/JyNotifyMapper.java
  29. 0 1
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/notify/mapper/PluginNotifyCommentsMapper.java
  30. 0 2
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/notify/service/JyNotifyService.java
  31. 1 6
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/payment/service/PaymentService.java
  32. 0 1
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/controller/JyProjectController.java
  33. 0 320
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/mapper/xml/ProjectListMapper.xml
  34. 0 1
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/service/JyProjectMembersService.java
  35. 1 9
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/service/JyProjectService.java
  36. 0 2
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/reimbursement/controller/JyReimbursementInfoController.java
  37. 0 2
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/reimbursement/service/JyReimbursementInfoService.java
  38. 1 3
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/tender/service/TenderService.java
  39. 1 2
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/useSeal/controller/SignetController.java
  40. 1 4
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/useSeal/service/SignetService.java
  41. 1 3
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workClientInfo/controller/JyWorkClientController.java
  42. 0 1
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workClientInfo/mapper/JyWorkClientBankMapper.java
  43. 2 5
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workClientInfo/service/JyWorkClientService.java
  44. 1 6
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workContractInfo/controller/JyWorkContractController.java
  45. 1 4
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workContractInfo/service/JyWorkContractFileService.java
  46. 0 1
      jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workContractInfo/service/JyWorkContractService.java

+ 0 - 1
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/bid/controller/TenderBidController.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.business.bid.service.TenderBidService;
 import com.jeeplus.business.bid.service.dto.TenderBidDTO;
-import com.jeeplus.business.tender.service.DTO.TenderDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.ResponseEntity;

+ 0 - 1
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/bid/mapper/TenderBidDetailMapper.java

@@ -2,7 +2,6 @@ package com.jeeplus.business.bid.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.business.bid.domain.JyTenderBidDetail;
-import com.jeeplus.business.notify.service.dto.WorkAttachmentDto;
 import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

+ 0 - 2
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/borrow/mapper/RefundMapper.java

@@ -2,9 +2,7 @@ package com.jeeplus.business.borrow.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.business.borrow.domain.Refund;
-import lombok.Data;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 

+ 0 - 1
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/drive/mapper/DriveInfoMapper.java

@@ -1,6 +1,5 @@
 package com.jeeplus.business.drive.mapper;
 
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

+ 1 - 5
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/drive/service/DriveApplyService.java

@@ -5,8 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -20,11 +19,9 @@ import com.jeeplus.business.drive.service.dto.DriveAccountDTO;
 import com.jeeplus.business.drive.service.dto.DriveApplyDTO;
 import com.jeeplus.business.drive.service.dto.DriveDTO;
 import com.jeeplus.business.drive.service.dto.DriveMaintainDTO;
-import com.jeeplus.business.meetingRoom.domain.MeetingRoom;
 import com.jeeplus.business.project.domain.JyProject;
 import com.jeeplus.business.project.mapper.JyProjectMapper;
 import com.jeeplus.business.project.service.JyProjectService;
-import com.jeeplus.business.project.service.dto.JyProjectDTO;
 import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.sys.domain.WorkAttachmentInfo;
@@ -32,7 +29,6 @@ import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.utils.StringUtils;
-import com.sun.mail.imap.protocol.ID;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+ 1 - 2
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/editor/domain/EditorFiles.java

@@ -1,7 +1,6 @@
 package com.jeeplus.business.editor.domain;
 
-import java.io.Serializable;
-import java.util.Date;
+
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jeeplus.core.domain.BaseEntity;

+ 1 - 2
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/evection/controller/EvectionController.java

@@ -2,8 +2,7 @@ package com.jeeplus.business.evection.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jeeplus.business.drive.service.dto.DriveApplyDTO;
-import com.jeeplus.business.drive.service.dto.DriveDTO;
+
 import com.jeeplus.business.evection.service.EvectionService;
 import com.jeeplus.business.evection.service.dto.EvectionDTO;
 import com.jeeplus.business.finance.util.EasyPoiUtil;

+ 1 - 2
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/evection/service/EvectionService.java

@@ -9,8 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jeeplus.business.drive.domain.DriveApply;
-import com.jeeplus.business.drive.service.dto.DriveApplyDTO;
+
 import com.jeeplus.business.evection.domain.Evection;
 import com.jeeplus.business.evection.mapper.EvectionMapper;
 import com.jeeplus.business.evection.service.dto.EvectionDTO;

+ 1 - 2
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/finance/controller/CwFinanceInvoiceController.java

@@ -42,8 +42,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-//import com.jeeplus.sys.utils.DictUtils;
-//import com.jeeplus.sys.utils.SpringContextHolder;
+
 
 @Api("财务管理-发票")
 @RestController

+ 0 - 1
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/finance/mapper/JyFinanceInvoiceInvalidMapper.java

@@ -5,7 +5,6 @@ import com.jeeplus.business.finance.domain.JyFinanceInvoiceInvalid;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-//@InterceptorIgnore(tenantLine = "true")
 public interface JyFinanceInvoiceInvalidMapper extends BaseMapper<JyFinanceInvoiceInvalid> {
 
 }

+ 0 - 1
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/goOut/controller/GoOutController.java

@@ -2,7 +2,6 @@ package com.jeeplus.business.goOut.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jeeplus.business.drive.service.dto.DriveApplyDTO;
 import com.jeeplus.business.finance.util.EasyPoiUtil;
 import com.jeeplus.business.goOut.service.GoOutService;
 import com.jeeplus.business.goOut.service.dto.GoOutDTO;

+ 2 - 8
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/holiday/controller/HolidayController.java

@@ -1,25 +1,19 @@
 package com.jeeplus.business.holiday.controller;
 
-import cn.hutool.extra.spring.SpringUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jeeplus.business.drive.service.dto.DriveApplyDTO;
 import com.jeeplus.business.finance.util.EasyPoiUtil;
-import com.jeeplus.business.goOut.service.dto.GoOutDTO;
 import com.jeeplus.business.holiday.domain.Holiday;
 import com.jeeplus.business.holiday.mapper.HolidayMapper;
 import com.jeeplus.business.holiday.service.HolidayService;
 import com.jeeplus.business.holiday.service.dto.HolidayDTO;
-import com.jeeplus.common.TokenProvider;
 import com.jeeplus.common.excel.ExcelOptions;
 import com.jeeplus.common.excel.annotation.ExportMode;
 import com.jeeplus.common.utils.ResponseUtil;
 import com.jeeplus.logging.annotation.ApiLog;
 import com.jeeplus.logging.constant.enums.LogTypeEnum;
-import com.jeeplus.sys.feign.IUserApi;
-import com.jeeplus.sys.service.dto.UserDTO;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 3
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/holiday/service/HolidayService.java

@@ -25,10 +25,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import javax.xml.crypto.Data;
-import java.text.SimpleDateFormat;
+
 import java.time.LocalDate;
-import java.time.LocalTime;
 import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
 import java.util.*;

+ 1 - 4
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/humanResources/controller/StaffDimissionController.java

@@ -4,12 +4,10 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.business.finance.util.EasyPoiUtil;
-import com.jeeplus.business.holiday.domain.Holiday;
-import com.jeeplus.business.holiday.service.dto.HolidayDTO;
+
 import com.jeeplus.business.humanResources.service.StaffDimissionService;
 import com.jeeplus.business.humanResources.service.dto.StaffDimissionDTO;
 import com.jeeplus.business.humanResources.service.dto.StaffHeirDTO;
-import com.jeeplus.business.humanResources.service.dto.StaffUserInfoDTO;
 import com.jeeplus.common.excel.ExcelOptions;
 import com.jeeplus.common.excel.annotation.ExportMode;
 import com.jeeplus.common.utils.ResponseUtil;
@@ -17,7 +15,6 @@ import com.jeeplus.logging.annotation.ApiLog;
 import com.jeeplus.logging.constant.enums.LogTypeEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;

+ 1 - 5
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/humanResources/controller/StaffUserInfoController.java

@@ -12,7 +12,6 @@ import com.jeeplus.business.humanResources.service.StaffUserInfoService;
 import com.jeeplus.business.humanResources.service.dto.StaffUserInfoDTO;
 import com.jeeplus.business.humanResources.service.dto.UserInfo;
 import com.jeeplus.business.humanResources.utils.IdCardUtil;
-import com.jeeplus.business.monthly.service.dto.MonthlyDTO;
 import com.jeeplus.common.excel.EasyExcelUtils;
 import com.jeeplus.common.excel.ExcelOptions;
 import com.jeeplus.common.excel.annotation.ExportMode;
@@ -28,7 +27,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -36,11 +34,9 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+
 import java.lang.reflect.Field;
 import java.lang.reflect.Type;
-import java.net.URLEncoder;
 import java.util.*;
 import java.util.stream.Collectors;
 

+ 0 - 1
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/humanResources/mapper/JyDimissionProcessMapper.java

@@ -3,7 +3,6 @@ package com.jeeplus.business.humanResources.mapper;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.business.humanResources.domain.JyDimissionProcess;
-import com.jeeplus.business.monthly.domain.JyProcess;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

+ 0 - 1
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/humanResources/service/StaffDimissionService.java

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.collect.Lists;
 import com.jeeplus.business.goOut.mapper.GoOutMapper;
 import com.jeeplus.business.humanResources.domain.JyDimissionProcess;
 import com.jeeplus.business.humanResources.domain.StaffDimission;

+ 0 - 5
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/inscription/controller/InscriptionController.java

@@ -2,13 +2,10 @@ package com.jeeplus.business.inscription.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jeeplus.business.drive.service.dto.DriveApplyDTO;
 import com.jeeplus.business.finance.util.EasyPoiUtil;
-import com.jeeplus.business.goOut.service.dto.GoOutDTO;
 import com.jeeplus.business.inscription.domain.Inscription;
 import com.jeeplus.business.inscription.service.InscriptionService;
 import com.jeeplus.business.inscription.service.dto.InscriptionDTO;
-import com.jeeplus.business.project.domain.JyProject;
 import com.jeeplus.business.project.utils.FreemarkerUtil;
 import com.jeeplus.business.project.utils.JyResponseUtil;
 import com.jeeplus.common.excel.ExcelOptions;
@@ -16,12 +13,10 @@ import com.jeeplus.common.excel.annotation.ExportMode;
 import com.jeeplus.common.utils.ResponseUtil;
 import com.jeeplus.logging.annotation.ApiLog;
 import com.jeeplus.logging.constant.enums.LogTypeEnum;
-import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;

+ 4 - 16
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/inscription/service/InscriptionService.java

@@ -24,37 +24,25 @@ import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.utils.StringUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
+
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.poi.hwpf.extractor.WordExtractor;
-import org.apache.poi.ooxml.POIXMLDocument;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.xwpf.usermodel.XWPFParagraph;
-import org.apache.tools.ant.taskdefs.Sleep;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTBody;
+
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.annotation.Resource;
-import javax.xml.parsers.DocumentBuilder;
 import java.io.*;
-import java.math.BigInteger;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
+
 import java.util.*;
 
 @Service

+ 0 - 2
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/knowledge/service/KnowledgeShareInfoService.java

@@ -21,7 +21,6 @@ import com.jeeplus.business.knowledge.mapper.KnowledgeShareTypeMapper;
 import com.jeeplus.business.knowledge.mapper.KnowledgeShareVisitMapper;
 import com.jeeplus.business.knowledge.service.dto.KnowledgeShareInfoDto;
 import com.jeeplus.business.knowledge.service.dto.KnowledgeShareListDto;
-import com.jeeplus.business.workContractInfo.mapper.JyWorkContractInfoMapper;
 import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.domain.BaseEntity;
 import com.jeeplus.sys.domain.WorkAttachmentInfo;
@@ -31,7 +30,6 @@ import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 
 
-import io.swagger.models.auth.In;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;

+ 0 - 2
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/meetingRoom/controller/MeetingRoomController.java

@@ -6,7 +6,6 @@ import com.jeeplus.business.finance.util.EasyPoiUtil;
 import com.jeeplus.business.meetingRoom.domain.MeetingRoom;
 import com.jeeplus.business.meetingRoom.service.MeetingRoomService;
 import com.jeeplus.business.meetingRoom.service.dto.MeetingRoomDTO;
-import com.jeeplus.business.monthly.service.dto.MonthlyDTO;
 import com.jeeplus.common.excel.ExcelOptions;
 import com.jeeplus.common.excel.annotation.ExportMode;
 import com.jeeplus.common.utils.ResponseUtil;
@@ -22,7 +21,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

+ 0 - 1
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/meetingRoom/mapper/MeetingRoomMapper.java

@@ -1,6 +1,5 @@
 package com.jeeplus.business.meetingRoom.mapper;
 
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

+ 0 - 3
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/meetingRoom/service/MeetingRoomService.java

@@ -1,7 +1,6 @@
 package com.jeeplus.business.meetingRoom.service;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -16,7 +15,6 @@ import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.utils.StringUtils;
-import org.joda.time.Period;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -26,7 +24,6 @@ import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.*;

+ 0 - 1
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/monthly/controller/MonthlyController.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.business.finance.util.EasyPoiUtil;
-import com.jeeplus.business.inscription.service.dto.InscriptionDTO;
 import com.jeeplus.business.monthly.service.MonthlyService;
 import com.jeeplus.business.monthly.service.dto.MonthlyDTO;
 import com.jeeplus.common.excel.ExcelOptions;

+ 0 - 1
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/monthly/service/MonthlyService.java

@@ -23,7 +23,6 @@ import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.flowable.feign.IFlowableApi;
 import com.jeeplus.sys.domain.WorkAttachmentInfo;
-import com.jeeplus.sys.feign.IOfficeApi;
 import com.jeeplus.sys.feign.IPostApi;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;

+ 0 - 2
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/notify/controller/JyNotifyController.java

@@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.jeeplus.business.finance.util.EasyPoiUtil;
-import com.jeeplus.business.monthly.service.dto.MonthlyDTO;
 import com.jeeplus.business.notify.domain.JyNotifyLog;
 import com.jeeplus.business.notify.domain.PluginNotifyComments;
 import com.jeeplus.business.notify.service.JyNotifyService;
@@ -30,7 +29,6 @@ import com.jeeplus.utils.StringUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;

+ 0 - 2
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/notify/mapper/JyNotifyLogMapper.java

@@ -1,9 +1,7 @@
 package com.jeeplus.business.notify.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jeeplus.business.notify.domain.JyNotifyLog;
-import com.jeeplus.business.notify.service.dto.JyNotifyDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

+ 0 - 1
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/notify/mapper/JyNotifyMapper.java

@@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.business.notify.domain.JyNotify;
 import com.jeeplus.business.notify.service.dto.JyNotifyDTO;
 import com.jeeplus.business.notify.service.dto.WorkAttachmentDto;
-import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

+ 0 - 1
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/notify/mapper/PluginNotifyCommentsMapper.java

@@ -6,7 +6,6 @@ import com.jeeplus.business.notify.domain.PluginNotifyComments;
 import com.jeeplus.business.notify.service.dto.PluginNotifyCommentsDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.http.ResponseEntity;
 
 import java.util.List;
 

+ 0 - 2
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/notify/service/JyNotifyService.java

@@ -23,9 +23,7 @@ import com.jeeplus.business.notify.mapper.*;
 import com.jeeplus.business.notify.service.dto.JyNotifyDTO;
 import com.jeeplus.business.notify.service.dto.PluginNotifyCommentsDTO;
 import com.jeeplus.business.notify.service.dto.PluginNotifyOfficesDTO;
-import com.jeeplus.business.notify.service.dto.WorkAttachmentDto;
 import com.jeeplus.business.notify.service.mapstruct.JyNotifyWrapper;
-import com.jeeplus.business.project.domain.JyProjectEiaQualificationFile;
 import com.jeeplus.common.TokenProvider;
 import com.jeeplus.common.constant.CommonConstants;
 import com.jeeplus.common.utils.CommonUtils;

+ 1 - 6
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/payment/service/PaymentService.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jeeplus.business.borrow.domain.BorrowMoney;
 import com.jeeplus.business.borrow.service.dto.BorrowDTO;
 import com.jeeplus.business.payment.domain.Payment;
 import com.jeeplus.business.payment.mapper.PaymentMapper;
@@ -16,9 +15,7 @@ import com.jeeplus.business.project.domain.JyProject;
 import com.jeeplus.business.project.mapper.JyProjectMapper;
 import com.jeeplus.business.reimbursement.domain.JyReimbursementDetailInfoPayment;
 import com.jeeplus.business.reimbursement.mapper.JyReimbursementInfoPaymentMapper;
-import com.jeeplus.business.workClientInfo.domain.dto.JyWorkClientInfosDto;
-import com.jeeplus.business.workClientInfo.mapper.JyWorkClientBankMapper;
-import com.jeeplus.business.workClientInfo.mapper.JyWorkClientInfoMapper;
+
 import com.jeeplus.business.workClientInfo.service.JyWorkClientService;
 import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
@@ -27,12 +24,10 @@ import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.utils.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 

+ 0 - 1
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/controller/JyProjectController.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.jeeplus.aop.demo.annotation.DemoMode;
 import com.jeeplus.business.finance.util.EasyPoiUtil;
-import com.jeeplus.business.monthly.service.dto.MonthlyDTO;
 import com.jeeplus.business.program.configuration.projectDict.domain.vo.FileDictVo;
 import com.jeeplus.business.program.configuration.projectDict.service.ProjectDictService;
 import com.jeeplus.business.program.configuration.projectDict.service.dto.ProjectDictDto;

+ 0 - 320
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/mapper/xml/ProjectListMapper.xml

@@ -353,119 +353,7 @@
         where a.id = #{id}
     </select>
 
-    <select id="findList" resultType="com.jeeplus.assess.program.configuration.projectList.service.dto.ExportFileDto">
-        SELECT
-            (@i:=@i+1) AS `no`,
-            tab.*
-        FROM
-            (SELECT
-                b.`year`,
-                d.`name` AS client_name,
-                a.`name`,
-                a.assessment_objective,
-                a.assessment_object,
-                a.assessment_range,
-                a.project_mould as program_type,
-                DATE_FORMAT(a.assessment_date,'%Y-%m-%d') AS assessment_date,
-                DATE_FORMAT(b.evaluation_report_date, '%Y-%m-%d') as "evaluation_report_date",
-                b.protocol_num,
-                c.no as contract_num,
-                e.report_no,
-                f.`name` AS project_manager_name,
-                g.`name` AS signature_evaluator_first,
-                h.`name` AS signature_evaluator_second,
-                b.wayst_evaluation,
-                b.fixed_assets_evaluation,
-                b.net_assets_evaluation,
-                b.rent_evaluation,
-                b.forensics,
-                b.report_charges,
-                i.name as current_dispose_person,
-                (CASE b.is_invoice WHEN 0 THEN "否" WHEN 1 THEN "是" ELSE "" END) AS is_invoice,
-                DATE_FORMAT(b.invoice_date,'%Y-%m-%d') AS invoice_date,
-                (CASE b.is_contract_archive WHEN 0 THEN "否" WHEN 1 THEN "是" ELSE "" END) AS is_contract_archive,
-                (CASE b.is_papers_intact WHEN 0 THEN "否" WHEN 1 THEN "是" ELSE "" END) AS is_papers_intact,
-                (CASE b.is_papers_archive WHEN 0 THEN "否" WHEN 1 THEN "是" ELSE "" END) AS is_papers_archive
-            FROM
-                program_project_list_info a
-                LEFT JOIN program_archive b ON a.id = b.program_id
-                LEFT JOIN work_contract_info c ON a.contract_id = c.id
-                LEFT JOIN work_client_info d ON c.client_id = d.id
-                LEFT JOIN program_report_no e ON a.id = e.program_id
-                LEFT JOIN sys_user f ON a.project_manager = f.id
-                LEFT JOIN sys_user i ON b.current_dispose_person = i.id
-                LEFT JOIN sys_user g ON b.signature_evaluator_first = g.id
-                LEFT JOIN sys_user h ON b.signature_evaluator_second = h.id
-            WHERE a.del_flag = 0
-            <if test="infoList != null">
-                AND a.id IN
-                <foreach collection="infoList" item="item" index="index" open="(" close=")" separator=",">
-                    #{item.id}
-                </foreach>
-            </if>
-            ORDER BY a.create_time DESC) AS tab
-            ,(SELECT @i:=0) AS itable
-    </select>
 
-    <resultMap id="BaseResultMap" type="com.jeeplus.assess.program.configuration.projectList.domain.ProgramProjectListInfo">
-        <id property="id" column="id" jdbcType="VARCHAR"/>
-        <result property="createById" column="create_by_id" jdbcType="VARCHAR"/>
-        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-        <result property="updateById" column="update_by_id" jdbcType="VARCHAR"/>
-        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
-        <result property="delFlag" column="del_flag" jdbcType="VARCHAR"/>
-        <result property="contractId" column="contract_id" jdbcType="VARCHAR"/>
-        <result property="contractName" column="contract_name" jdbcType="VARCHAR"/>
-        <result property="client" column="client" jdbcType="VARCHAR"/>
-        <result property="clientName" column="client_name" jdbcType="VARCHAR"/>
-        <result property="amount" column="amount" jdbcType="VARCHAR"/>
-        <result property="contractType" column="contract_type" jdbcType="VARCHAR"/>
-        <result property="name" column="name" jdbcType="VARCHAR"/>
-        <result property="no" column="no" jdbcType="VARCHAR"/>
-        <result property="projectType" column="project_type" jdbcType="VARCHAR"/>
-        <result property="approvalNo" column="approval_no" jdbcType="VARCHAR"/>
-        <result property="company" column="company" jdbcType="VARCHAR"/>
-        <result property="projectMould" column="project_mould" jdbcType="VARCHAR"/>
-        <result property="propertyHolder" column="property_holder" jdbcType="VARCHAR"/>
-        <result property="propertyHolderName" column="property_holder_name" jdbcType="VARCHAR"/>
-        <result property="location" column="location" jdbcType="VARCHAR"/>
-        <result property="isFirst" column="is_first" jdbcType="VARCHAR"/>
-        <result property="yearNum" column="year_num" jdbcType="VARCHAR"/>
-        <result property="checkYear" column="check_year" jdbcType="VARCHAR"/>
-        <result property="projectManager" column="project_manager" jdbcType="VARCHAR"/>
-        <result property="projectManagerName" column="project_manager_name" jdbcType="VARCHAR"/>
-        <result property="reportType" column="report_type" jdbcType="VARCHAR"/>
-        <result property="industry" column="industry" jdbcType="VARCHAR"/>
-        <result property="enterpriseType" column="enterprise_type" jdbcType="VARCHAR"/>
-        <result property="riskLevel" column="risk_level" jdbcType="VARCHAR"/>
-        <result property="projectSource" column="project_source" jdbcType="VARCHAR"/>
-        <result property="estimate" column="estimate" jdbcType="DECIMAL"/>
-        <result property="planEndTime" column="plan_end_time" jdbcType="TIMESTAMP"/>
-        <result property="useNum" column="use_num" jdbcType="INTEGER"/>
-        <result property="appointment" column="appointment" jdbcType="INTEGER"/>
-        <result property="workHours" column="work_hours" jdbcType="DOUBLE"/>
-        <result property="remarks" column="remarks" jdbcType="VARCHAR"/>
-        <result property="assessmentEnterprise" column="assessment_enterprise" jdbcType="VARCHAR"/>
-        <result property="assessmentEnterpriseName" column="assessment_enterprise_name" jdbcType="VARCHAR"/>
-        <result property="linkNum" column="link_num" jdbcType="VARCHAR"/>
-        <result property="relationship" column="relationship" jdbcType="VARCHAR"/>
-        <result property="assessmentWay" column="assessment_way" jdbcType="VARCHAR"/>
-        <result property="assessmentObjective" column="assessment_objective" jdbcType="VARCHAR"/>
-        <result property="assessmentDate" column="assessment_date" jdbcType="TIMESTAMP"/>
-        <result property="num" column="num" jdbcType="DECIMAL"/>
-        <result property="projectDevelopment" column="project_development" jdbcType="VARCHAR"/>
-        <result property="delegateProjectType" column="delegate_project_type" jdbcType="VARCHAR"/>
-        <result property="assessmentObject" column="assessment_object" jdbcType="VARCHAR"/>
-        <result property="workBeginDate" column="work_begin_date" jdbcType="TIMESTAMP"/>
-        <result property="workEndDate" column="work_end_date" jdbcType="TIMESTAMP"/>
-        <result property="reportingDate" column="reporting_date" jdbcType="TIMESTAMP"/>
-        <result property="isHave" column="is_have" jdbcType="VARCHAR"/>
-        <result property="isInfluence" column="is_influence" jdbcType="VARCHAR"/>
-        <result property="mode" column="mode" jdbcType="VARCHAR"/>
-        <result property="status" column="status" jdbcType="VARCHAR"/>
-        <result property="procInsId" column="proc_ins_id" jdbcType="VARCHAR"/>
-        <result property="processDefinitionId" column="process_definition_id" jdbcType="VARCHAR"/>
-    </resultMap>
 
     <sql id="Base_Column_List">
         ppli.id,
@@ -526,20 +414,6 @@
         ppli.proc_ins_id,
         ppli.process_definition_id
     </sql>
-    <select id="findPage" resultType="com.jeeplus.assess.program.configuration.projectList.domain.ProgramProjectListInfo">
-        SELECT
-        <include refid="Base_Column_List"></include>,
-        su.name AS create_by_id,
-        sup.name as project_manager_name,
-        ppli.create_by_id as create_by
-        FROM
-            program_project_list_info ppli
-            LEFT JOIN sys_user su ON ppli.create_by_id = su.id
-            LEFT JOIN sys_user sup ON ppli.project_manager = su.id
-            LEFT JOIN
-            ${ew.customSqlSegment}
-            ORDER BY ppli.create_time DESC
-    </select>
 
     <select id="selectInvoiceFlag" resultType="string">
         select
@@ -573,200 +447,6 @@
         where jy_pr.create_by_id = #{currentUser.id} and jy_pr.del_flag = '0') a
     </select>
 
-    <select id="getListByidList" resultType="com.jeeplus.assess.program.configuration.projectList.domain.ProgramProjectListInfo">
-        SELECT
-        a.id,
-        a.contract_id,
-        a.contract_name,
-        a.client,
-        a.client_name,
-        a.amount,
-        a.contract_type,
-        a.NAME,
-        a.NO,
-        a.project_type,
-        a.approval_no,
-        a.company,
-        a.project_mould,
-        a.property_holder,
-        a. property_holder_name,
-        a.location,
-        a.is_first,
-        a.year_num,
-        a.check_year,
-        a.project_manager,
-        a.project_manager_name,
-        a.report_type,
-        a.industry,
-        a.enterprise_type,
-        a.risk_level,
-        a.project_source,
-        a.estimate,
-        a.plan_end_time,
-        a.use_num,
-        a.appointment,
-        a. work_hours,
-        a.remarks,
-        a.assessment_enterprise,
-        a.assessment_enterprise_name,
-        a.link_num,
-        a.relationship,
-        a.assessment_way,
-        a.assessment_objective,
-        a.assessment_date,
-        a.num,
-        a.project_development,
-        a.delegate_project_type,
-        a.assessment_object,
-        a.assessment_range,
-        a.generate_report_number,
-        a.work_begin_date,
-        a.work_end_date,
-        a.reporting_date,
-        a.is_have,
-        a.is_influence,
-        a.MODE,
-        a.STATUS,
-        a.proc_ins_id,
-        a.process_definition_id,
-        a.agree_time,
-        a.agree_user_id,
-        a.tab_type,
-        a.create_time,
-        a.create_by_id,
-        a.update_time,
-        a.update_by_id,
-        a.del_flag,
-        a.tenant_id,
-        pa1.id as auditId1,
-        pa2.id as auditId2,
-        pa3.id as auditId3,
-        pa.id as archive_id
-        from
-            program_project_list_info a
-        LEFT JOIN program_report_no prn ON prn.program_id = a.id and prn.del_flag = '0'
-        LEFT JOIN program_audit pa1 ON pa1.program_id = a.id and pa1.audit_level = '1' and pa1.del_flag = '0'
-        LEFT JOIN program_audit pa2 ON pa2.program_id = a.id and pa2.audit_level = '2' and pa2.del_flag = '0'
-        LEFT JOIN program_audit pa3 ON pa3.program_id = a.id and pa3.audit_level = '3' and pa3.del_flag = '0'
-        LEFT JOIN program_archive pa ON pa.program_id = a.id and pa.del_flag = '0'
-        <where>
-            a.del_flag = 0
-            and a.id in
-            <foreach collection="idList" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </where>
-    </select>
-    <select id="getOverdueFilingProjectList"
-            resultType="com.jeeplus.assess.program.configuration.projectList.domain.ProgramProjectListInfo">
-        SELECT
-        distinct
-        a.id,
-        a.create_by_id AS create_by,
-        a.create_time,
-        a.update_by_id,
-        a.update_time,
-        a.del_flag,
-        a.contract_id,
-        a.contract_name,
-        a.client,
-        a.client_name,
-        a.amount,
-        a.contract_type,
-        a.name,
-        a.no,
-        a.project_type,
-        a.approval_no,
-        a.company,
-        a.project_mould,
-        a.property_holder,
-        a.property_holder_name,
-        a.location,
-        a.is_first,
-        a.year_num,
-        a.check_year,
-        a.project_manager,
-        c.name AS project_manager_name,
-        a.report_type,
-        a.industry,
-        a.enterprise_type,
-        a.risk_level,
-        a.project_source,
-        a.estimate,
-        a.plan_end_time,
-        a.use_num,
-        a.appointment,
-        a.work_hours,
-        a.remarks,
-        a.assessment_enterprise,
-        a.assessment_enterprise_name,
-        a.link_num,
-        a.relationship,
-        a.assessment_way,
-        a.assessment_objective,
-        a.assessment_date,
-        a.num,
-        a.project_development,
-        a.delegate_project_type,
-        a.assessment_object,
-        a.work_begin_date,
-        a.work_end_date,
-        a.reporting_date,
-        a.is_have,
-        a.is_influence,
-        a.mode,
-        a.status,
-        a.proc_ins_id,
-        a.process_definition_id,
-        prn.report_no,
-        pa1.status as status1,
-        pa1.id as auditId1,
-        pa1.proc_ins_id as procInsId1,
-        pa2.status as status2,
-        pa2.id as auditId2,
-        pa2.proc_ins_id as procInsId2,
-        pa3.status as status3,
-        pa3.id as auditId3,
-        pa3.proc_ins_id as procInsId3,
-        pa.status as archive_status,
-        pa.id as archive_id,
-        pa.proc_ins_id as procInsIdArchive,
-        d.id AS issued_id,
-        d.proc_ins_id AS procInsId4,
-        d.status AS issued_status,
-        d.agree_time AS agree_time,
-        wci.no AS contract_no,
-        art.ID_ as task_id,
-        art1.ID_ as task_id_audit1,
-        art2.ID_ as task_id_audit2,
-        art3.ID_ as task_id_audit3,
-        artd.ID_ as task_id_issued,
-        art_archive.ID_ as task_id_archive
-        FROM
-        program_project_list_info a
-        LEFT JOIN sys_user b ON a.create_by_id = b.id
-        LEFT JOIN sys_user c ON a.project_manager = c.id
-        LEFT JOIN work_contract_info wci ON wci.id = a.contract_id and wci.del_flag = '0'
-        LEFT JOIN program_report_no prn ON prn.program_id = a.id and prn.del_flag = '0'
-        LEFT JOIN program_audit pa1 ON pa1.program_id = a.id and pa1.audit_level = '1' and pa1.del_flag = '0'
-        LEFT JOIN program_audit pa2 ON pa2.program_id = a.id and pa2.audit_level = '2' and pa2.del_flag = '0'
-        LEFT JOIN program_audit pa3 ON pa3.program_id = a.id and pa3.audit_level = '3' and pa3.del_flag = '0'
-        LEFT JOIN program_archive pa ON pa.program_id = a.id and pa.del_flag = '0'
-        left join program_members pm on a.id = pm.project_id
-        LEFT JOIN proofread_issued d ON a.id = d.project_id
-        LEFT JOIN act_ru_task art ON a.proc_ins_id = art.PROC_INST_ID_
-        LEFT JOIN act_ru_task art1 ON pa1.proc_ins_id = art1.PROC_INST_ID_
-        LEFT JOIN act_ru_task art2 ON pa2.proc_ins_id = art2.PROC_INST_ID_
-        LEFT JOIN act_ru_task art3 ON pa3.proc_ins_id = art3.PROC_INST_ID_
-        LEFT JOIN act_ru_task artd ON d.proc_ins_id = artd.PROC_INST_ID_
-        LEFT JOIN act_ru_task art_archive ON pa.proc_ins_id = art_archive.PROC_INST_ID_
-        <where>
-            a.del_flag = 0
-            and (pa.status is null or (pa.status != 5 and pa.status != 7))
-            and d.status = 5 and d.agree_time &lt;= #{threeDayAgo}
-        </where>
-        ORDER BY a.update_time DESC
-    </select>
     <select id="getOverArchiveFlag" resultType="java.lang.Integer">
         select count(id) from program_archive
         where over_archive_status =1 and status != 7 and create_by_id = #{currentUser.id}

+ 0 - 1
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/service/JyProjectMembersService.java

@@ -3,7 +3,6 @@ package com.jeeplus.business.project.service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jeeplus.business.project.domain.JyProjectMembers;
 import com.jeeplus.business.project.mapper.JyProjectMemberMapper;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service

+ 1 - 9
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/service/JyProjectService.java

@@ -8,10 +8,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.EncryptUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jeeplus.business.finance.util.Global;
 import com.jeeplus.business.project.domain.*;
 import com.jeeplus.business.project.mapper.*;
 import com.jeeplus.business.project.service.dto.*;
@@ -21,24 +19,20 @@ import com.jeeplus.business.project.utils.ImageUtil;
 import com.jeeplus.business.useSeal.domain.Signet;
 import com.jeeplus.business.useSeal.mapper.SignetMapper;
 import com.jeeplus.business.useSeal.service.dto.SignetDTO;
-import com.jeeplus.business.workClientInfo.domain.JyWorkClientInfo;
 import com.jeeplus.business.workClientInfo.domain.JyWorkClientLinkman;
 import com.jeeplus.business.workClientInfo.mapper.JyWorkClientInfoMapper;
 import com.jeeplus.business.workClientInfo.mapper.JyWorkClientLinkmanMapper;
 import com.jeeplus.business.workContractInfo.domain.JyWorkContractInfo;
 import com.jeeplus.business.workContractInfo.mapper.JyWorkContractInfoMapper;
-import com.jeeplus.business.workContractInfo.service.JyWorkContractService;
 import com.jeeplus.business.workContractInfo.service.dto.JyWorkContractInfoDto;
 import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.flowable.feign.IFlowableApi;
 import com.jeeplus.sys.domain.WorkAttachmentInfo;
-import com.jeeplus.sys.feign.IDictApi;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;
 
-//import com.jeeplus.sys.mapper.DictValueMapper;
-import com.jeeplus.sys.service.dto.DictValueDTO;
+
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 
@@ -46,11 +40,9 @@ import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.annotation.Resource;
 import java.io.File;

+ 0 - 2
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/reimbursement/controller/JyReimbursementInfoController.java

@@ -3,9 +3,7 @@ package com.jeeplus.business.reimbursement.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
-import com.jeeplus.business.drive.service.dto.DriveApplyDTO;
 import com.jeeplus.business.finance.util.EasyPoiUtil;
-import com.jeeplus.business.project.domain.JyProject;
 import com.jeeplus.business.project.service.dto.JyProjectDTO;
 import com.jeeplus.business.reimbursement.domain.JyReimbursementInfo;
 import com.jeeplus.business.reimbursement.service.JyReimbursementInfoService;

+ 0 - 2
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/reimbursement/service/JyReimbursementInfoService.java

@@ -25,10 +25,8 @@ import com.jeeplus.business.workContractInfo.mapper.JyWorkContractInfoMapper;
 import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.sys.domain.WorkAttachmentInfo;
-import com.jeeplus.sys.feign.IOfficeApi;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;
-import com.jeeplus.sys.service.dto.OfficeDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;

+ 1 - 3
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/tender/service/TenderService.java

@@ -3,13 +3,11 @@ package com.jeeplus.business.tender.service;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jeeplus.business.drive.service.dto.DriveApplyDTO;
-import com.jeeplus.business.reimbursement.service.dto.JyReimbursementInfoDTO;
+
 import com.jeeplus.business.tender.domain.BidDetail;
 import com.jeeplus.business.tender.domain.Tender;
 import com.jeeplus.business.tender.mapper.BidDetailMapper;

+ 1 - 2
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/useSeal/controller/SignetController.java

@@ -4,8 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.business.finance.util.EasyPoiUtil;
-import com.jeeplus.business.monthly.service.dto.MonthlyDTO;
-import com.jeeplus.business.project.service.dto.JyProjectDTO;
+
 import com.jeeplus.business.useSeal.domain.Signet;
 import com.jeeplus.common.excel.ExcelOptions;
 import com.jeeplus.common.excel.annotation.ExportMode;

+ 1 - 4
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/useSeal/service/SignetService.java

@@ -10,12 +10,10 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.business.project.domain.JyProject;
 import com.jeeplus.business.project.domain.JyProjectOutinstance;
-import com.jeeplus.business.project.domain.JyProjectReportsSubmit;
 import com.jeeplus.business.project.mapper.JyProjectMapper;
 import com.jeeplus.business.project.mapper.JyProjectOutinstanceMapper;
 import com.jeeplus.business.project.mapper.JyProjectReportsSubmitMapper;
-import com.jeeplus.business.project.service.JyProjectService;
-import com.jeeplus.business.project.service.dto.JyProjectDTO;
+
 import com.jeeplus.business.workContractInfo.mapper.JyWorkContractInfoMapper;
 import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
@@ -27,7 +25,6 @@ import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import com.jeeplus.sys.feign.IDictApi;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;
-import com.jeeplus.sys.service.dto.DictValueDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.utils.StringUtils;
 import org.springframework.beans.BeanUtils;

+ 1 - 3
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workClientInfo/controller/JyWorkClientController.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import com.jeeplus.business.finance.util.EasyPoiUtil;
-import com.jeeplus.business.monthly.service.dto.MonthlyDTO;
 import com.jeeplus.business.workClientInfo.domain.JyWorkClientInfo;
 import com.jeeplus.business.workClientInfo.domain.dto.JyWorkClientInfosDto;
 import com.jeeplus.business.workClientInfo.service.JyWorkClientService;
@@ -19,8 +18,7 @@ import com.jeeplus.logging.annotation.ApiLog;
 import com.jeeplus.logging.constant.enums.LogTypeEnum;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.service.dto.UserDTO;
-//import com.jeeplus.sys.utils.TicketQueryUtils;
-//import com.jeeplus.sys.utils.UserUtils;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

+ 0 - 1
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workClientInfo/mapper/JyWorkClientBankMapper.java

@@ -1,7 +1,6 @@
 package com.jeeplus.business.workClientInfo.mapper;
 
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 

+ 2 - 5
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workClientInfo/service/JyWorkClientService.java

@@ -9,9 +9,7 @@ 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.jeeplus.pubmodules.oss.domain.WorkAttachment;
-//import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
-//import com.jeeplus.pubmodules.oss.service.OssService;
+
 
 
 
@@ -31,8 +29,7 @@ import com.jeeplus.sys.feign.IDictApi;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;
 import com.jeeplus.sys.service.dto.UserDTO;
-//import com.jeeplus.sys.utils.DictUtils;
-//import com.jeeplus.sys.utils.UserUtils;
+
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;

+ 1 - 6
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workContractInfo/controller/JyWorkContractController.java

@@ -1,25 +1,21 @@
 package com.jeeplus.business.workContractInfo.controller;
 
-import cn.hutool.core.util.ObjectUtil;
-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.jeeplus.business.finance.util.EasyPoiUtil;
-import com.jeeplus.business.monthly.service.dto.MonthlyDTO;
 import com.jeeplus.business.workContractInfo.domain.JyWorkContractInfo;
 import com.jeeplus.business.workContractInfo.service.JyWorkContractService;
 import com.jeeplus.business.workContractInfo.service.dto.JyWorkContractInfoDto;
 import com.jeeplus.common.excel.ExcelOptions;
 import com.jeeplus.common.excel.annotation.ExportMode;
 import com.jeeplus.common.utils.ResponseUtil;
-import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.logging.annotation.ApiLog;
 import com.jeeplus.logging.constant.enums.LogTypeEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -29,7 +25,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-//import com.jeeplus.sys.utils.TicketQueryUtils;
 
 @Slf4j
 @Api(tags ="嘉溢合同登记")

+ 1 - 4
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workContractInfo/service/JyWorkContractFileService.java

@@ -16,10 +16,7 @@ import javax.annotation.Resource;
 import java.util.Date;
 import java.util.UUID;
 
-//import com.jeeplus.sys.utils.UserUtils;
-//import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
-//import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
-//import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
+
 
 @Service
 public class JyWorkContractFileService {

+ 0 - 1
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/workContractInfo/service/JyWorkContractService.java

@@ -17,7 +17,6 @@ import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.flowable.feign.IFlowableApi;
 import com.jeeplus.sys.domain.WorkAttachmentInfo;
-import com.jeeplus.sys.feign.IDictApi;
 import com.jeeplus.sys.feign.IPostApi;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;