Merge remote-tracking branch 'origin/master'

# Conflicts:
#	jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workContract/mapper/WorkContractInfoMapper.java
#	jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/common/handler/ExtUserTaskActivityBehavior.java
#	jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/serialNumTpl/service/SerialnumTplService.java

jeeplus-api/jeeplus-public-modules-api/src/main/java/com/jeeplus/sys/domain/WorkAttachmentInfo.java

@@ -6,6 +6,7 @@ package com.jeeplus.sys.domain;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jeeplus.core.domain.BaseEntity;
+import com.jeeplus.sys.service.dto.UserDTO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -20,6 +21,14 @@ import lombok.EqualsAndHashCode;
 @TableName("work_attachment")
 public class WorkAttachmentInfo extends BaseEntity {
 
+    private String by;
+
+    private UserDTO createBy;
+
+    private String name;
+
+    private String size;
+
     private static final long serialVersionUID = 1L;
 
     /**

jeeplus-api/jeeplus-public-modules-api/src/main/java/com/jeeplus/sys/factory/WorkAttachmentApiFallbackFactory.java

@@ -2,11 +2,16 @@ package com.jeeplus.sys.factory;
 
 import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 
+import java.io.InputStream;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户服务降级处理
@@ -26,6 +31,97 @@ public class WorkAttachmentApiFallbackFactory implements FallbackFactory <IWorkA
             public List<WorkAttachmentInfo> selectWorkAttachmentByAttachmentId(String id) {
                 return null;
             }
+
+            @Override
+            public void insertWorkAttachment(Map<String, String> map) {
+
+            }
+
+            @Override
+            public void deleteById(String id) {
+
+            }
+
+            @Override
+            public void deleteByAttachmentId(String attachmentId) {
+
+            }
+
+            @Override
+            public void deleteByAttachmentIdNotInIds(String attachmentId, List<String> delIds) {
+
+            }
+
+            @Override
+            public void saveOrUpdateFileListFlag(List<WorkAttachmentInfoDTO> fileList, String attachmentId, String attachmentFlag,String currentToken) {
+
+            }
+
+            @Override
+            public void saveOrUpdateFileList(Map<String, String> map) {
+
+            }
+
+            @Override
+            public List<WorkAttachmentInfo> selectListByAttachmentId(String attachmentId) {
+                return null;
+            }
+
+            @Override
+            public void deleteByIds(String ids) {
+
+            }
+
+            @Override
+            public String saveFile(Map<String, String> map) {
+                return null;
+            }
+
+            @Override
+            public void downByStreamSaveLocal(String key, String fileName, String downFileStr) {
+
+            }
+
+            @Override
+            public String genSerialNum(String companyId, String bizCode,String currentToken) {
+                return null;
+            }
+
+            @Override
+            public String genSerialNumNoSort(String companyId, String bizCode,String currentToken) throws Exception {
+                return null;
+            }
+
+            @Override
+            public String genSerialReviewNum(String companyId, String bizCode, String currentToken) throws Exception {
+                return null;
+            }
+
+            @Override
+            public List<WorkAttachmentInfo> getByAttachmentIdAndUrlAndAttachmentFlag(WorkAttachmentInfo workattachment) {
+                return null;
+            }
+
+            @Override
+            public void downQzByStreamSaveLocal(String key, String fileName, String downFileStr) {
+
+            }
+
+            @Override
+            public String datePath() {
+                return null;
+            }
+
+            @Override
+            public String uploadFile2OSS(InputStream inStream, String fileDir, String fileName) {
+                return null;
+            }
+
+            @Override
+            public void saveMsg2(Map<String, String> map) {
+
+            }
+
         };
     }
 }

jeeplus-api/jeeplus-public-modules-api/src/main/java/com/jeeplus/sys/feign/IWorkAttachmentApi.java

@@ -4,12 +4,15 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.jeeplus.common.constant.AppNameConstants;
 import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import com.jeeplus.sys.factory.WorkAttachmentApiFallbackFactory;
+import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
+import java.io.InputStream;
 import java.util.List;
+import java.util.Map;
 
 
 @FeignClient(contextId = "workAttachmentApi", name = AppNameConstants.APP_PUBLIC_MODULES, fallbackFactory = WorkAttachmentApiFallbackFactory.class)
@@ -23,6 +26,163 @@ public interface IWorkAttachmentApi {
      */
     @PostMapping("/oss/file/selectWorkAttachmentByAttachmentId")
     List<WorkAttachmentInfo> selectWorkAttachmentByAttachmentId(@RequestParam(value = "id")String id);
+
+    /**
+     * 财务模块保存附件使用
+     * @param map
+     */
+    @RequestMapping(value = "/oss/file/financeFileSave", method = RequestMethod.POST)
+    void insertWorkAttachment (@RequestBody Map<String ,String > map);
+
+    /**
+     * 财务模块使用，根据id删除附件
+     * @param id
+     */
+    @GetMapping("/oss/file/deleteById")
+    void deleteById(@RequestParam(value = "id")String id);
+
+    /**
+     * 财务模块使用，根据attachmentId删除附件
+     * @param attachmentId
+     */
+    @GetMapping("/oss/file/deleteByAttachmentId")
+    void deleteByAttachmentId(@RequestParam(value = "attachmentId")String attachmentId);
+
+    @RequestMapping(value = "/oss/file/deleteByAttachmentIdNotInIds", method = RequestMethod.POST)
+    void deleteByAttachmentIdNotInIds(@RequestParam(value = "attachmentId")String attachmentId,
+                                      @RequestParam(value = "delIds")List<String> delIds);
+
+    /**
+     * 保存/修改附件
+     * @param fileList
+     * @param attachmentId
+     * @param attachmentFlag
+     */
+    @RequestMapping(value = "/oss/file/saveOrUpdateFileListFlag", method = RequestMethod.POST)
+    void saveOrUpdateFileListFlag(@RequestParam(value = "fileList")List<WorkAttachmentInfoDTO> fileList,
+                                  @RequestParam(value = "attachmentId")String attachmentId,
+                                  @RequestParam(value = "attachmentFlag")String attachmentFlag,
+                                  @RequestParam(value = "currentToken")String currentToken);
+
+    /**
+     * 保存附件信息
+     * @param map
+     */
+    @RequestMapping(value = "/oss/file/saveOrUpdateFileList", method = RequestMethod.POST)
+    void saveOrUpdateFileList(@RequestBody Map<String ,String > map);
+
+    /**
+     * 根据attachmentId查询附件信息
+     * @param attachmentId
+     * @return
+     */
+    @PostMapping("/oss/file/selectListByAttachmentId")
+    List<WorkAttachmentInfo> selectListByAttachmentId(@RequestParam(value = "attachmentId")String attachmentId);
+
+    /**
+     * 财务模块使用，根据attachmentId删除附件
+     * @param ids
+     */
+    @RequestMapping(value = "/oss/file/deleteByIds", method = RequestMethod.POST)
+    void deleteByIds(@RequestBody String ids);
+
+    /**
+     * 保存附件信息
+     * @param map
+     */
+    @RequestMapping(value = "/oss/file/saveFile", method = RequestMethod.POST)
+    String saveFile(@RequestBody Map<String ,String > map);
+
+    /**
+     * 附件下载到本地指定文件夹
+     * @param key
+     * @param fileName
+     * @param downFileStr
+     */
+    @RequestMapping(value = "/oss/file/downByStreamSaveLocal", method = RequestMethod.POST)
+    void downByStreamSaveLocal(@RequestParam(value = "key")String key,
+                               @RequestParam(value = "fileName")String fileName,
+                               @RequestParam(value = "downFileStr")String downFileStr);
+
+    /**
+     * 获取编号模板编号
+     * @param companyId
+     * @param bizCode
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/oss/file/genSerialNum", method = RequestMethod.POST)
+    String genSerialNum(@RequestParam(value = "companyId")String companyId,
+                               @RequestParam(value = "bizCode")String bizCode,
+                               @RequestParam(value = "currentToken")String currentToken
+                        ) throws Exception;
+
+    /**
+     * 获取编号模板报告编号
+     * @param companyId
+     * @param bizCode
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/oss/file/genSerialNumNoSort", method = RequestMethod.POST)
+    String genSerialNumNoSort(@RequestParam(value = "companyId")String companyId,
+                              @RequestParam(value = "bizCode")String bizCode,
+                              @RequestParam(value = "currentToken")String currentToken
+                        ) throws Exception;
+
+    /**
+     * 获取编号模板报告编号
+     * @param companyId
+     * @param bizCode
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/oss/file/genSerialReviewNum", method = RequestMethod.POST)
+    String genSerialReviewNum(@RequestParam(value = "companyId")String companyId,
+                              @RequestParam(value = "bizCode")String bizCode,
+                              @RequestParam(value = "currentToken")String currentToken
+    ) throws Exception;
+
+    /**
+     * 根据关联id和url查询数据信息
+     * @param workattachment
+     * @return
+     */
+    @PostMapping("/oss/file/getByAttachmentIdAndUrlAndAttachmentFlag")
+    List<WorkAttachmentInfo> getByAttachmentIdAndUrlAndAttachmentFlag(@RequestBody WorkAttachmentInfo workattachment);
+
+    /**
+     * 附件下载到本地指定文件夹(签章系统)
+     * @param key
+     * @param fileName
+     * @param downFileStr
+     */
+    @RequestMapping(value = "/oss/file/downQzByStreamSaveLocal", method = RequestMethod.POST)
+    void downQzByStreamSaveLocal(@RequestParam(value = "key")String key,
+                                 @RequestParam(value = "fileName")String fileName,
+                                 @RequestParam(value = "downFileStr")String downFileStr);
+
+    @PostMapping("/oss/file/datePath")
+    String datePath();
+
+    /**
+     * 上传到OSS服务器  如果同名文件会覆盖服务器上的
+     * @param inStream
+     * @param fileDir
+     * @param fileName
+     * @return
+     */
+    @RequestMapping(value = "/oss/file/uploadFile2OSS", method = RequestMethod.POST)
+    String uploadFile2OSS(@RequestParam(value = "inStream")InputStream inStream,
+                          @RequestParam(value = "fileDir")String fileDir,
+                          @RequestParam(value = "fileName")String fileName);
+
+    /**
+     * 保存附件信息
+     * @param map
+     */
+    @RequestMapping(value = "/oss/file/saveMsg2", method = RequestMethod.POST)
+    void saveMsg2(@RequestBody Map<String ,String > map);
 }
 
 

jeeplus-api/jeeplus-public-modules-api/src/main/java/com/jeeplus/sys/service/dto/WorkAttachmentInfoDTO.java

@@ -13,6 +13,12 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = false)
 public class WorkAttachmentInfoDTO extends BaseDTO {
 
+    private String name;
+
+    private String size;
+
+    private String by;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -73,4 +79,4 @@ public class WorkAttachmentInfoDTO extends BaseDTO {
     private String temporaryUrl;
 
 
-}
+}

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/flowable/factory/FlowableApiFallbackFactory.java

@@ -42,7 +42,7 @@ public class FlowableApiFallbackFactory implements FallbackFactory <IFlowableApi
             }
 
             @Override
-            public String taskDispose(String list) {
+            public String taskDispose(Map<String, String> map) {
                 return null;
             }
 

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/flowable/feign/IFlowableApi.java

@@ -26,16 +26,16 @@ public interface IFlowableApi {
     /**
      * 发送通知
      */
-    @GetMapping(value = "/flowable/task/add")
-    String add(Map<String ,String > map);
+    @RequestMapping(value = "/flowable/task/add", method = RequestMethod.POST)
+    String add(@RequestBody Map<String ,String > map);
 
     /**
      * 已经签收或者等待签收的任务
-     * @param data
+     * @param map
      * @return
      */
     @RequestMapping(value = "/flowable/task/taskDispose", method = RequestMethod.POST)
-    String taskDispose(@RequestBody String data);
+    String taskDispose(@RequestBody Map<String ,String > map);
 
     /**
      * 根据processInstanceId获取taskId

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/factory/DictApiFallbackFactory.java

@@ -5,6 +5,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 字典服务降级处理
  *
@@ -28,6 +30,11 @@ public class DictApiFallbackFactory implements FallbackFactory <IDictApi> {
             public String getDictLabel(String value, String type, String defaultLabel) {
                 return null;
             }
+
+            @Override
+            public String getDictMap(String dict) {
+                return null;
+            }
         };
     }
 }

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/factory/OfficeApiFallbackFactory.java

@@ -1,11 +1,14 @@
 package com.jeeplus.sys.factory;
 
+import com.jeeplus.sys.domain.Office;
 import com.jeeplus.sys.feign.IOfficeApi;
 import com.jeeplus.sys.service.dto.OfficeDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 机构服务降级处理
  *
@@ -24,6 +27,31 @@ public class OfficeApiFallbackFactory implements FallbackFactory <IOfficeApi> {
             public OfficeDTO getOfficeDTOByName(String name) {
                 return null;
             }
+
+            @Override
+            public Office selectById(String id) {
+                return null;
+            }
+
+            @Override
+            public OfficeDTO getOfficeById(String id) {
+                return null;
+            }
+
+            @Override
+            public List<String> getOfficeNameByIds(List<String> ids) {
+                return null;
+            }
+
+            @Override
+            public List<Office> selectListByParentId(String parentId) {
+                return null;
+            }
+
+            @Override
+            public List<Office> selectListByIsPublic(String isPublic) {
+                return null;
+            }
         };
     }
 }

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/factory/UserApiFallbackFactory.java

@@ -1,7 +1,10 @@
 package com.jeeplus.sys.factory;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.collect.Lists;
+import com.jeeplus.sys.domain.User;
 import com.jeeplus.sys.feign.IUserApi;
+import com.jeeplus.sys.service.dto.CertDTO;
 import com.jeeplus.sys.service.dto.DataRuleDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 import lombok.extern.slf4j.Slf4j;
@@ -105,10 +108,49 @@ public class UserApiFallbackFactory implements FallbackFactory <IUserApi> {
             }
 
             @Override
-            public UserDTO getLoginUser() {
+            public String getSysParam(String parameter,String token) {
                 return null;
             }
 
+            @Override
+            public List<CertDTO> getCertListByUserId() {
+                return null;
+            }
+
+            @Override
+            public String getFileDir(String url) {
+                return null;
+            }
+
+            @Override
+            public boolean delFile(String id) {
+                return false;
+            }
+
+            @Override
+            public List<UserDTO> getUserInfoByEnName(String enName) {
+                return null;
+            }
+
+            @Override
+            public List<User> selectListByName(String name) {
+                return null;
+            }
+
+            @Override
+            public List<User> getUserByOfficeAll(String operatorOffice) {
+                return null;
+            }
+
+            @Override
+            public IPage<UserDTO> findPage() {
+                return null;
+            }
+
+            @Override
+            public void saveOrUpdate(UserDTO userDTO) {
+
+            }
 
         };
     }

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/feign/IDictApi.java

@@ -6,6 +6,8 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 @FeignClient(contextId = "dictApi", name = AppNameConstants.APP_SYSTEM_SERVICE, fallbackFactory = DictApiFallbackFactory.class)
 public interface IDictApi {
     /**
@@ -27,4 +29,12 @@ public interface IDictApi {
     @GetMapping(value = "/feign/sys/dict/getDictLabel")
     String getDictLabel(@RequestParam(value = "value") String value, @RequestParam(value = "type") String type, @RequestParam(value = "defaultLabel", required = false) String defaultLabel);
 
+    /**
+     * 获取字典标签
+     *
+     * @param dict
+     * @return
+     */
+    @GetMapping(value = "/feign/sys/dict/getDictMap")
+    String getDictMap(@RequestParam(value = "dict") String dict);
 }

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/feign/IOfficeApi.java

@@ -1,11 +1,13 @@
 package com.jeeplus.sys.feign;
 
 import com.jeeplus.common.constant.AppNameConstants;
+import com.jeeplus.sys.domain.Office;
 import com.jeeplus.sys.factory.OfficeApiFallbackFactory;
 import com.jeeplus.sys.service.dto.OfficeDTO;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 @FeignClient(contextId = "officeApi", name = AppNameConstants.APP_SYSTEM_SERVICE, fallbackFactory = OfficeApiFallbackFactory.class)
 public interface IOfficeApi {
@@ -17,4 +19,43 @@ public interface IOfficeApi {
     @GetMapping(value = "/feign/sys/office/getOfficeDTOByName")
     OfficeDTO getOfficeDTOByName(@RequestParam(value = "name") String name);
 
+    /**
+     * 根据id获取组织
+     *
+     * @return
+     */
+    @GetMapping(value = "/feign/sys/office/selectById")
+    Office selectById(@RequestParam(value = "id") String id);
+
+    /**
+     * 根据office.id 查询部门的所有父节点信息
+     *
+     * @return
+     */
+    @GetMapping(value = "/feign/sys/office/getOfficeById")
+    OfficeDTO getOfficeById(@RequestParam(value = "id") String id);
+
+    /**
+     * 根据当前人管理的部门id查询这些部门信息
+     * @param ids
+     * @return
+     */
+    @RequestMapping(value = "/feign/sys/office/getOfficeNameByIds", method = RequestMethod.POST)
+    List<String> getOfficeNameByIds(@RequestBody List<String> ids);
+
+    /**
+     * 根据父级id查询组织信息
+     * @param parentId
+     * @return
+     */
+    @GetMapping(value = "/feign/sys/office/selectListByParentId")
+    List<Office> selectListByParentId(@RequestParam(value = "parentId")String parentId);
+
+    /**
+     * 根据父级id查询组织信息
+     * @param isPublic
+     * @return
+     */
+    @GetMapping(value = "/feign/sys/office/selectListByIsPublic")
+    List<Office> selectListByIsPublic(@RequestParam(value = "isPublic")String isPublic);
 }

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/feign/IUserApi.java

@@ -1,14 +1,14 @@
 package com.jeeplus.sys.feign;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jeeplus.common.constant.AppNameConstants;
+import com.jeeplus.sys.domain.User;
 import com.jeeplus.sys.factory.UserApiFallbackFactory;
+import com.jeeplus.sys.service.dto.CertDTO;
 import com.jeeplus.sys.service.dto.DataRuleDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Set;
@@ -72,7 +72,7 @@ public interface IUserApi {
      *
      * @return
      */
-    @GetMapping(value = BASE_URL + "/getByToken")
+    @RequestMapping(value = BASE_URL + "/getByToken", method = RequestMethod.POST)
     UserDTO getByToken(@RequestParam("token") String token);
 
     /**
@@ -165,13 +165,61 @@ public interface IUserApi {
     void updateUserUpPassword(@RequestBody UserDTO userDTO);
 
     /**
-     * 获取当前登录人信息
-     *
-     * @return 取不到返回null
+     * 获取系统参数
+     * @param parameter
+     * @return
+     */
+    @GetMapping(value = BASE_URL + "/getSysParam")
+    String getSysParam(@RequestParam(value = "parameter") String parameter,@RequestParam(value = "token") String token);
+
+    @GetMapping(value = BASE_URL + "/getCertListByUserId")
+    List<CertDTO> getCertListByUserId();
+
+    /**
+     * 获取文件的Dir
+     * @param url
+     * @return
+     */
+    @GetMapping(value = BASE_URL + "/getFileDir")
+    String getFileDir(@RequestParam(value = "url")String url);
+
+    /**
+     * 删除文件
+     * @param id
+     * @return
      */
-    @GetMapping(value = BASE_URL + "/getLoginUser")
-    UserDTO getLoginUser();
+    @GetMapping(value = BASE_URL + "/delFile")
+    boolean delFile(@RequestParam(value = "id")String id);
+
+    /**
+     * 根据角色英文名称查询角色下人员信息
+     * @param enName 角色英文名称
+     * @return
+     */
+    @GetMapping(value = BASE_URL + "/getUserInfoByEnName")
+    List<UserDTO> getUserInfoByEnName(@RequestParam(value = "enName")String enName);
+
+    /**
+     * 根据姓名查询用户信息
+     * @param name
+     * @return
+     */
+    @GetMapping(value = BASE_URL + "/selectListByName")
+    List<User> selectListByName(@RequestParam(value = "name")String name);
+
+    /**
+     * 根据经办人部门查询所有的用户信息
+     * @param operatorOffice
+     * @return
+     */
+    @GetMapping(value = BASE_URL + "/getUserByOfficeAll")
+    List<User> getUserByOfficeAll(@RequestParam(value = "operatorOffice")String operatorOffice);
+
+    @GetMapping(value = BASE_URL + "/findPage")
+    IPage<UserDTO> findPage();
 
+    @RequestMapping(value = BASE_URL + "/saveOrUpdate", method = RequestMethod.POST)
+    void saveOrUpdate(@RequestBody UserDTO userDTO);
 }
 
 

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/invoice/service/FinanceInvoiceService.java

@@ -2,18 +2,25 @@ package com.jeeplus.assess.invoice.service;
 
 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.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.flowable.feign.IFlowableApi;
 import com.jeeplus.sys.domain.User;
-import com.jeeplus.sys.service.UserService;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
+import com.jeeplus.sys.feign.IUserApi;
+import com.jeeplus.sys.feign.IWorkAttachmentApi;
+//import com.jeeplus.sys.service.UserService;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
+//import com.jeeplus.sys.utils.UserUtils;
 import com.jeeplus.assess.invoice.domain.*;
 import com.jeeplus.assess.invoice.mapper.*;
 import com.jeeplus.assess.invoice.service.dto.FinanceInvoiceBaseDTO;
@@ -21,11 +28,10 @@ import com.jeeplus.assess.invoice.service.dto.FinanceInvoiceDTO;
 import com.jeeplus.assess.invoice.service.dto.FinanceInvoiceDetailDTO;
 import com.jeeplus.assess.invoice.service.dto.FinanceInvoiceReceivablesDTO;
 import com.jeeplus.assess.invoice.service.mapstruct.*;
-import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
-import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
+//import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
+//import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
 import com.jeeplus.assess.workContract.mapper.WorkContractInfoMapper;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+//import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@@ -52,14 +58,14 @@ public class FinanceInvoiceService extends ServiceImpl<FinanceInvoiceMapper, Fin
     private FinanceInvoiceReceivablesMapper financeInvoiceReceivablesMapper;
     @Resource
     private FinanceInvoiceInvalidMapper financeInvoiceInvalidMapper;
-    @Resource
-    private SerialnumTplService serialnumTplService;
-    @Resource
-    private OssServiceMapper ossServiceMapper;
+//    @Resource
+//    private SerialnumTplService serialnumTplService;
+//    @Resource
+//    private OssServiceMapper ossServiceMapper;
     @Resource
     private WorkContractInfoMapper workContractInfoMapper;
-    @Resource
-    private UserService userService;
+//    @Resource
+//    private UserService userService;
     @Resource
     private IFlowableApi flowTaskService;
 
@@ -241,7 +247,7 @@ public class FinanceInvoiceService extends ServiceImpl<FinanceInvoiceMapper, Fin
                 queryWrapper.eq("su.id",financeInvoiceDTO.getOperator());
             }
             if (StringUtils.isNotBlank(financeInvoiceDTO.getReconciliationPeopleName())) {
-                List<User> users = userService.list(new QueryWrapper<User>().lambda().like(User::getName, financeInvoiceDTO.getReconciliationPeopleName()));
+                List<User> users = SpringUtil.getBean ( IUserApi.class ).selectListByName(financeInvoiceDTO.getReconciliationPeopleName());
                 List<String> userIdList = users.stream().distinct().map(User::getId).collect(Collectors.toList());
                 if (CollectionUtil.isNotEmpty(userIdList)) {
                     queryWrapper.in("fi.reconciliation_people",userIdList);
@@ -250,7 +256,7 @@ public class FinanceInvoiceService extends ServiceImpl<FinanceInvoiceMapper, Fin
                 }
             }
             if (StringUtils.isNotBlank(financeInvoiceDTO.getOperatorOffice())){
-                List<User> userList = userService.getUserByOfficeAll(financeInvoiceDTO.getOperatorOffice());
+                List<User> userList = SpringUtil.getBean ( IUserApi.class ).getUserByOfficeAll(financeInvoiceDTO.getOperatorOffice());
                 if (CollectionUtil.isNotEmpty(userList)) {
                     List<String> userIdList = userList.stream().distinct().map(User::getId).collect(Collectors.toList());
                     if (CollectionUtil.isNotEmpty(userIdList)) {
@@ -345,10 +351,10 @@ public class FinanceInvoiceService extends ServiceImpl<FinanceInvoiceMapper, Fin
         FinanceInvoiceDTO financeInvoiceDTO = financeInvoiceMapper.queryById(id);
 
         // 查询附件信息
-        List<WorkAttachmentDto> fileList = workContractInfoMapper.findDtos(id);
+        List<WorkAttachmentInfo> fileList = workContractInfoMapper.findDtos(id);
         if (CollectionUtil.isNotEmpty(fileList)) {
-            for (WorkAttachmentDto i : fileList) {
-                i.setCreateBy(UserUtils.get(i.getBy()));
+            for (WorkAttachmentInfo i : fileList) {
+                i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
             }
         }
         if(CollectionUtil.isNotEmpty(fileList)){
@@ -363,9 +369,9 @@ public class FinanceInvoiceService extends ServiceImpl<FinanceInvoiceMapper, Fin
         if (ObjectUtil.isNotEmpty(financeInvoice)) {
             if(StringUtils.isBlank(financeInvoice.getId())){
                 //获取当前登录人信息
-                UserDTO userDTO = UserUtils.getCurrentUserDTO();
+                UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
                 //发票编号生成
-                String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), FinanceInvoiceDTO.BIZ_CODE);
+                String serialNum = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), FinanceInvoiceDTO.BIZ_CODE, TokenProvider.getCurrentToken());
                 financeInvoice.setNo(serialNum);
                 if (StringUtils.isBlank(financeInvoice.getInvalidStatus())){
                     financeInvoice.setInvalidStatus("0");
@@ -420,18 +426,16 @@ public class FinanceInvoiceService extends ServiceImpl<FinanceInvoiceMapper, Fin
                         return true;
                     }
                     return false;
-                }).map(WorkAttachmentDto::getId).collect(Collectors.toList());
+                }).map(WorkAttachmentInfo::getId).collect(Collectors.toList());
                 if(CollectionUtil.isNotEmpty(delIds)){
-                    ossServiceMapper.delete(new QueryWrapper<WorkAttachment>().lambda()
-                            .eq(WorkAttachment::getAttachmentId,financeInvoice.getId())
-                            .notIn(WorkAttachment::getId,delIds));
+                    SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteByAttachmentIdNotInIds(financeInvoice.getId(),delIds);
                 }else{
-                    ossServiceMapper.delete(new QueryWrapper<WorkAttachment>().lambda().eq(WorkAttachment::getAttachmentId,financeInvoice.getId()));
+                    SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteByAttachmentId(financeInvoice.getId());
                 }
                 //获取当前登录人信息
-                UserDTO userDTO = UserUtils.getCurrentUserDTO();
+                UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
                 AtomicInteger j = new AtomicInteger(1);
-                List<WorkAttachmentDto> collect = financeInvoiceDTO.getWorkAttachmentDtoList().stream().filter(item -> {
+                List<WorkAttachmentInfo> collect = financeInvoiceDTO.getWorkAttachmentDtoList().stream().filter(item -> {
                     if (StringUtils.isNotBlank(item.getId())) {
                         return false;
                     }
@@ -442,7 +446,7 @@ public class FinanceInvoiceService extends ServiceImpl<FinanceInvoiceMapper, Fin
                     j.getAndIncrement();
                 });
             }else{
-                ossServiceMapper.delete(new QueryWrapper<WorkAttachment>().lambda().eq(WorkAttachment::getAttachmentId,financeInvoice.getId()));
+                SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteByAttachmentId(financeInvoice.getId());
             }
             // 发票明细保存
             if(CollectionUtil.isNotEmpty(financeInvoiceDTO.getFinanceInvoiceDetailDTOList())){
@@ -539,8 +543,8 @@ public class FinanceInvoiceService extends ServiceImpl<FinanceInvoiceMapper, Fin
      * @param userDTO 当前登录人信息
      * @param j 排序序号
      */
-    public void saveFiles(WorkAttachmentDto item,String id,UserDTO userDTO,AtomicInteger j){
-        WorkAttachment i = new WorkAttachment();
+    public void saveFiles(WorkAttachmentInfo item,String id,UserDTO userDTO,AtomicInteger j){
+        WorkAttachmentInfo i = new WorkAttachmentInfo();
         //包含了url、size、name
         i.setId(UUID.randomUUID().toString().replace("-", ""));
         i.setCreateTime(new Date());
@@ -557,7 +561,12 @@ public class FinanceInvoiceService extends ServiceImpl<FinanceInvoiceMapper, Fin
         i.setAttachmentFlag("invoice");
         i.setFileSize(item.getSize());
         i.setSort(j.get());
-        ossServiceMapper.insertWorkAttachment(i, userDTO);
+        Map<String,String> map = new HashMap<>();
+        String workAttachment = JSON.toJSONString((i));
+        String userDTOInfo = JSON.toJSONString((userDTO));
+        map.put("workAttachment",workAttachment);
+        map.put("userDTO",userDTOInfo);
+        SpringUtil.getBean ( IWorkAttachmentApi.class ).insertWorkAttachment(map);
     }
 
     public ResponseEntity deleteByIds(String ids) {

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/invoice/service/dto/FinanceInvoiceDTO.java

@@ -3,7 +3,8 @@ package com.jeeplus.assess.invoice.service.dto;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.service.dto.BaseDTO;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -225,7 +226,7 @@ public class FinanceInvoiceDTO extends BaseDTO {
     /**
      * 附件信息
      */
-    private List<WorkAttachmentDto> workAttachmentDtoList;
+    private List<WorkAttachmentInfo> workAttachmentDtoList;
 
     /**
      * 发票明细
@@ -304,4 +305,4 @@ public class FinanceInvoiceDTO extends BaseDTO {
 
 
     private static final long serialVersionUID = 1L;
-}
+}

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectDict/service/ProjectDictService.java

@@ -1,14 +1,17 @@
 package com.jeeplus.assess.program.configuration.projectDict.service;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import com.jeeplus.assess.program.configuration.fileDict.domain.ProgramFileDict;
 import com.jeeplus.assess.program.configuration.fileDict.mapper.ProgramFileDictMapper;
 import com.jeeplus.assess.program.configuration.projectDict.domain.ProgramProjectDict;
 import com.jeeplus.assess.program.configuration.projectDict.domain.vo.FileDictVo;
 import com.jeeplus.assess.program.configuration.projectDict.mapper.ProjectDictMapper;
 import com.jeeplus.assess.program.configuration.projectDict.service.dto.ProjectDictDto;
+import com.jeeplus.common.TokenProvider;
+import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.sys.utils.UserUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -66,7 +69,7 @@ public class ProjectDictService {
      * @return
      */
     public String add(ProjectDictDto projectDictDto) {
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         String id = UUID.randomUUID().toString().replace("-", "");
         ProgramProjectDict dict = new ProgramProjectDict();
         BeanUtils.copyProperties(projectDictDto, dict);
@@ -86,7 +89,7 @@ public class ProjectDictService {
      * @return
      */
     public String update(ProjectDictDto projectDictDto) {
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         ProgramProjectDict dict = new ProgramProjectDict();
         BeanUtils.copyProperties(projectDictDto, dict);
         dict.setUpdateById(userDTO.getId());

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/service/ProjectListService.java

@@ -3,6 +3,8 @@ package com.jeeplus.assess.program.configuration.projectList.service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+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;
@@ -24,19 +26,22 @@ import com.jeeplus.assess.workContract.domain.WorkContractInfo;
 import com.jeeplus.assess.workContract.mapper.WorkContractInfoMapper;
 import com.jeeplus.assess.workContract.service.WorkContractService;
 import com.jeeplus.assess.workContract.service.dto.WorkContractInfoDto;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.flowable.feign.IFlowableApi;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
-import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
-import com.jeeplus.pubmodules.oss.service.OssService;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
-import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
+//import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
+//import com.jeeplus.pubmodules.oss.service.OssService;
+//import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
 import com.jeeplus.sys.domain.User;
-import com.jeeplus.sys.service.UserService;
-import com.jeeplus.sys.service.dto.DictValueDTO;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
+import com.jeeplus.sys.feign.IUserApi;
+import com.jeeplus.sys.feign.IWorkAttachmentApi;
+//import com.jeeplus.sys.service.UserService;
+//import com.jeeplus.sys.service.dto.DictValueDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.DictUtils;
-import com.jeeplus.sys.utils.UserUtils;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
+//import com.jeeplus.sys.utils.DictUtils;
+//import com.jeeplus.sys.utils.UserUtils;
 import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -60,12 +65,12 @@ public class ProjectListService {
     private ProjectMemberMapper projectMemberMapper;
     @Autowired
     private WorkContractInfoMapper workContractInfoMapper;
-    @Autowired
-    private OssServiceMapper ossServiceMapper;
-    @Autowired
-    private OssService ossService;
-    @Autowired
-    private SerialnumTplService serialnumTplService;
+//    @Autowired
+//    private OssServiceMapper ossServiceMapper;
+//    @Autowired
+//    private OssService ossService;
+//    @Autowired
+//    private SerialnumTplService serialnumTplService;
     @Autowired
     private WorkContractService workContractService;
     @Autowired
@@ -88,8 +93,8 @@ public class ProjectListService {
     private IFlowableApi flowTaskService;
     @Autowired
     private ProgramMembersService programMembersService;
-    @Autowired
-    private UserService userService;
+//    @Autowired
+//    private UserService userService;
 
     public String save(ProjectListDto dto, String tabType) throws Exception{
         if (StringUtils.isNotEmpty(dto.getId())) {
@@ -99,9 +104,10 @@ public class ProjectListService {
     }
 
     public String add(ProjectListDto dto,String tabType) throws Exception{
+        String currentToken = TokenProvider.getCurrentToken();
         ProgramProjectListInfo info = new ProgramProjectListInfo();
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         // 保存项目管理列表主表信息
         BeanUtils.copyProperties(dto, info);
         String reportNo = "";
@@ -109,9 +115,9 @@ public class ProjectListService {
         if (("true").equals(dto.getGenerateReportNumber())) {
             if(StringUtils.isNotBlank(info.getReportType())){
                 if (info.getReportType().equals("1")){
-                    reportNo = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), ProgramReportNoDto.BIZ_CODE);
+                    reportNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), ProgramReportNoDto.BIZ_CODE,currentToken);
                 } else if (info.getReportType().equals("2")) {
-                    reportNo = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), ProgramReportNoDto.BIZ_CODE_);
+                    reportNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), ProgramReportNoDto.BIZ_CODE_,currentToken);
                 }
                 ProgramReportNo programReportNo = new ProgramReportNo();
                 programReportNo.setProgramId(id);
@@ -120,9 +126,9 @@ public class ProjectListService {
             }
         }
         //合同编号生成
-        String no = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), ProjectListDto.BIZ_CODE);
+        String no = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), ProjectListDto.BIZ_CODE,currentToken);
         //项目立项号生成
-        String approvalNo = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), ProjectListDto.BIY_CODE);
+        String approvalNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), ProjectListDto.BIY_CODE,currentToken);
         info.setId(id);
         info.setNo(no);
         info.setApprovalNo(approvalNo);
@@ -240,14 +246,14 @@ public class ProjectListService {
                                 if (StringUtils.isNotBlank(programProjectListInfo.getReportType())) {
                                     if ("1".equals(programProjectListInfo.getReportType())) {
                                         // 生成合同编号-评估类
-                                        String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), WorkContractInfoDto.BIZ_CODE);
+                                        String serialNum = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), WorkContractInfoDto.BIZ_CODE,currentToken);
                                         // 根据合同id和合同编号来修改合同数据
                                         WorkContractInfo workContractInfo = new WorkContractInfo();
                                         workContractInfo.setNo(serialNum);
                                         workContractInfoMapper.update(workContractInfo, new QueryWrapper<WorkContractInfo>().lambda().eq(WorkContractInfo::getId, contractId));
                                     }else if("2".equals(programProjectListInfo.getReportType())){
                                         // 生成合同编号-咨询类
-                                        String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), WorkContractInfoDto.BIZ_CODE_);
+                                        String serialNum = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), WorkContractInfoDto.BIZ_CODE_,currentToken);
                                         // 根据合同id和合同编号来修改合同数据
                                         WorkContractInfo workContractInfo = new WorkContractInfo();
                                         workContractInfo.setNo(serialNum);
@@ -272,18 +278,20 @@ public class ProjectListService {
         }else{
             programArchiveMapper.insert(programArchive);
         }
+        String currentToken = TokenProvider.getCurrentToken();
         if (ObjectUtil.isNotEmpty(programArchiveDto)) {
-            ossService.saveOrUpdateFileListFlag(programArchiveDto.getReportFileList(),programArchive.getId(),"report");
-            ossService.saveOrUpdateFileListFlag(programArchiveDto.getDetailFileList(),programArchive.getId(),"detail");
-            ossService.saveOrUpdateFileListFlag(programArchiveDto.getExplainFileList(),programArchive.getId(),"explain");
-            ossService.saveOrUpdateFileListFlag(programArchiveDto.getPapersFileList(),programArchive.getId(),"papers");
-            ossService.saveOrUpdateFileListFlag(programArchiveDto.getOtherFileList(),programArchive.getId(),"other");
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).saveOrUpdateFileListFlag(programArchiveDto.getReportFileList(),programArchive.getId(),"report",currentToken);
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).saveOrUpdateFileListFlag(programArchiveDto.getDetailFileList(),programArchive.getId(),"detail",currentToken);
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).saveOrUpdateFileListFlag(programArchiveDto.getExplainFileList(),programArchive.getId(),"explain",currentToken);
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).saveOrUpdateFileListFlag(programArchiveDto.getPapersFileList(),programArchive.getId(),"papers",currentToken);
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).saveOrUpdateFileListFlag(programArchiveDto.getOtherFileList(),programArchive.getId(),"other",currentToken);
         }
         return programArchive.getId();
     }
 
     public String saveFormThree(ProgramAuditDto programAuditDto) throws Exception {
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        String currentToken = TokenProvider.getCurrentToken();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         ProgramAudit programAudit = ProgramAuditWrapper.INSTANCE.toEntity(programAuditDto);
         //生成项目报告号
         ProgramProjectListInfo projectListInfo = projectListMapper.getById(programAuditDto.getProgramId());
@@ -296,9 +304,9 @@ public class ProjectListService {
                         if (projectListInfo.getGenerateReportNumber().equals("false")) {
                             if(StringUtils.isNotBlank(projectListInfo.getReportType())){
                                 if (projectListInfo.getReportType().equals("1")){
-                                    reportNo = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), ProgramReportNoDto.BIZ_CODE);
+                                    reportNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), ProgramReportNoDto.BIZ_CODE,currentToken);
                                 } else if (projectListInfo.getReportType().equals("2")) {
-                                    reportNo = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), ProgramReportNoDto.BIZ_CODE_);
+                                    reportNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), ProgramReportNoDto.BIZ_CODE_,currentToken);
                                 }
                                 ProgramReportNo programReportNo = new ProgramReportNo();
                                 programReportNo.setProgramId(projectListInfo.getId());
@@ -318,7 +326,15 @@ public class ProjectListService {
         }
         if (ObjectUtil.isNotEmpty(programAuditDto)) {
             //附件
-            ossService.saveOrUpdateFileList(programAuditDto.getWorkAttachmentDtoList(),programAudit.getId(),"program");
+            Map<String,String> map = new HashMap<>();
+            String fileList = JSON.toJSONString((programAuditDto.getWorkAttachmentDtoList()));
+            String attachmentId = programAudit.getId();
+            String attachmentFlag = "program";
+            map.put("fileList",fileList);
+            map.put("attachmentId",attachmentId);
+            map.put("attachmentFlag",attachmentFlag);
+            map.put("currentToken", TokenProvider.getCurrentToken ( ));
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).saveOrUpdateFileList(map);
             //专业评估人员
             if (CollectionUtil.isNotEmpty(programAuditDto.getProgramAuditAssessPeopleDtoList())) {
                 programAuditAssessPeopleMapper.delete(new QueryWrapper<ProgramAuditAssessPeople>().lambda().eq(ProgramAuditAssessPeople::getAuditId,programAudit.getId()));
@@ -334,8 +350,9 @@ public class ProjectListService {
     }
 
     public String update(ProjectListDto dto) throws Exception{
+        String currentToken = TokenProvider.getCurrentToken();
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         // 修改项目管理列表主表信息
         ProgramProjectListInfo info = new ProgramProjectListInfo();
         BeanUtils.copyProperties(dto, info);
@@ -349,9 +366,9 @@ public class ProjectListService {
             if (null == programReportNo) {
                 if(StringUtils.isNotBlank(info.getReportType())){
                     if (info.getReportType().equals("1")){
-                        reportNo = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), ProgramReportNoDto.BIZ_CODE);
+                        reportNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), ProgramReportNoDto.BIZ_CODE,currentToken);
                     } else if (info.getReportType().equals("2")) {
-                        reportNo = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), ProgramReportNoDto.BIZ_CODE_);
+                        reportNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), ProgramReportNoDto.BIZ_CODE_,currentToken);
                     }
                     programReportNo = new ProgramReportNo();
                     programReportNo.setProgramId(info.getId());
@@ -453,14 +470,14 @@ public class ProjectListService {
                                 if (StringUtils.isNotBlank(programProjectListInfo.getReportType())) {
                                     if ("1".equals(programProjectListInfo.getReportType())) {
                                         // 生成合同编号-评估类
-                                        String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), WorkContractInfoDto.BIZ_CODE);
+                                        String serialNum = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), WorkContractInfoDto.BIZ_CODE,currentToken);
                                         // 根据合同id和合同编号来修改合同数据
                                         WorkContractInfo workContractInfo = new WorkContractInfo();
                                         workContractInfo.setNo(serialNum);
                                         workContractInfoMapper.update(workContractInfo, new QueryWrapper<WorkContractInfo>().lambda().eq(WorkContractInfo::getId, contractId));
                                     }else if("2".equals(programProjectListInfo.getReportType())){
                                         // 生成合同编号-咨询类
-                                        String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), WorkContractInfoDto.BIZ_CODE_);
+                                        String serialNum = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), WorkContractInfoDto.BIZ_CODE_,currentToken);
                                         // 根据合同id和合同编号来修改合同数据
                                         WorkContractInfo workContractInfo = new WorkContractInfo();
                                         workContractInfo.setNo(serialNum);
@@ -498,7 +515,7 @@ public class ProjectListService {
         if (CollectionUtils.isNotEmpty(members)) {
             members.stream().forEach(member -> {
                 if (StringUtils.isNotBlank(member.getUserId())) {
-                    User byId = userService.getById(member.getUserId());
+                    UserDTO byId = SpringUtil.getBean ( IUserApi.class ).getById(member.getUserId());
                     if (ObjectUtil.isNotEmpty(byId)) {
                         member.setName(byId.getName());
                     }
@@ -507,10 +524,10 @@ public class ProjectListService {
             dto.setMembers(members);
         }
         // 查询附件信息
-        List<WorkAttachmentDto> files = workContractInfoMapper.findDtos(id);
+        List<WorkAttachmentInfo> files = workContractInfoMapper.findDtos(id);
         if (CollectionUtils.isNotEmpty(files)) {
-            for (WorkAttachmentDto i : files) {
-                i.setCreateBy(UserUtils.get(i.getBy()));
+            for (WorkAttachmentInfo i : files) {
+                i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
             }
             dto.setFiles(files);
         }
@@ -520,10 +537,10 @@ public class ProjectListService {
     public ProgramAuditDto findByIdAudit(String id){
         ProgramAuditDto byIdAudit = programAuditMapper.findByIdAudit(id);
         // 查询附件信息
-        List<WorkAttachmentDto> files = workContractInfoMapper.findDtos(id);
+        List<WorkAttachmentInfo> files = workContractInfoMapper.findDtos(id);
         if (CollectionUtils.isNotEmpty(files)) {
-            for (WorkAttachmentDto i : files) {
-                i.setCreateBy(UserUtils.get(i.getBy()));
+            for (WorkAttachmentInfo i : files) {
+                i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
             }
             byIdAudit.setWorkAttachmentDtoList(files);
         }
@@ -535,52 +552,52 @@ public class ProjectListService {
         if(ObjectUtil.isNotEmpty(programArchiveDto)){
             if(ObjectUtil.isNotEmpty(programArchiveDto.getProgramProjectListInfo())){
                 if(StringUtils.isNotBlank(programArchiveDto.getProgramProjectListInfo().getProjectManager())){
-                    UserDTO userDTO = UserUtils.get(programArchiveDto.getProgramProjectListInfo().getProjectManager());
+                    UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getById(programArchiveDto.getProgramProjectListInfo().getProjectManager());
                     programArchiveDto.getProgramProjectListInfo().setOfficeId(userDTO.getOfficeDTO().getName());
                 }
             }
         }
         // 查询附件信息 - 评估报告
-        List<WorkAttachmentDto> reportFileList = workContractInfoMapper.findByAttachmentIdAndFlag(id, "report");
+        List<WorkAttachmentInfoDTO> reportFileList = workContractInfoMapper.findByAttachmentIdAndFlag(id, "report");
         if (CollectionUtils.isNotEmpty(reportFileList)) {
-            for (WorkAttachmentDto i : reportFileList) {
-                i.setCreateBy(UserUtils.get(i.getBy()));
+            for (WorkAttachmentInfoDTO i : reportFileList) {
+                i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
             }
             programArchiveDto.setReportFileList(reportFileList);
         }
 
         // 查询附件信息 - 评估说明
-        List<WorkAttachmentDto> explainFileList = workContractInfoMapper.findByAttachmentIdAndFlag(id, "explain");
+        List<WorkAttachmentInfoDTO> explainFileList = workContractInfoMapper.findByAttachmentIdAndFlag(id, "explain");
         if (CollectionUtils.isNotEmpty(explainFileList)) {
-            for (WorkAttachmentDto i : explainFileList) {
-                i.setCreateBy(UserUtils.get(i.getBy()));
+            for (WorkAttachmentInfoDTO i : explainFileList) {
+                i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
             }
             programArchiveDto.setExplainFileList(explainFileList);
         }
 
         // 查询附件信息 - 评估明细表
-        List<WorkAttachmentDto> detailFileList = workContractInfoMapper.findByAttachmentIdAndFlag(id, "detail");
+        List<WorkAttachmentInfoDTO> detailFileList = workContractInfoMapper.findByAttachmentIdAndFlag(id, "detail");
         if (CollectionUtils.isNotEmpty(detailFileList)) {
-            for (WorkAttachmentDto i : detailFileList) {
-                i.setCreateBy(UserUtils.get(i.getBy()));
+            for (WorkAttachmentInfoDTO i : detailFileList) {
+                i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
             }
             programArchiveDto.setDetailFileList(detailFileList);
         }
 
         // 查询附件信息 - 评估操作计算底稿
-        List<WorkAttachmentDto> papersFileList = workContractInfoMapper.findByAttachmentIdAndFlag(id, "papers");
+        List<WorkAttachmentInfoDTO> papersFileList = workContractInfoMapper.findByAttachmentIdAndFlag(id, "papers");
         if (CollectionUtils.isNotEmpty(papersFileList)) {
-            for (WorkAttachmentDto i : papersFileList) {
-                i.setCreateBy(UserUtils.get(i.getBy()));
+            for (WorkAttachmentInfoDTO i : papersFileList) {
+                i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
             }
             programArchiveDto.setPapersFileList(papersFileList);
         }
 
         // 查询附件信息 - 其他
-        List<WorkAttachmentDto> otherFileList = workContractInfoMapper.findByAttachmentIdAndFlag(id, "other");
+        List<WorkAttachmentInfoDTO> otherFileList = workContractInfoMapper.findByAttachmentIdAndFlag(id, "other");
         if (CollectionUtils.isNotEmpty(otherFileList)) {
-            for (WorkAttachmentDto i : otherFileList) {
-                i.setCreateBy(UserUtils.get(i.getBy()));
+            for (WorkAttachmentInfoDTO i : otherFileList) {
+                i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
             }
             programArchiveDto.setOtherFileList(otherFileList);
         }
@@ -594,9 +611,9 @@ public class ProjectListService {
         projectLinkMapper.deleteByInfoId(id);
         projectMemberMapper.deleteByInfoId(id);
         // 附件删除
-        LambdaQueryWrapper<WorkAttachment> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(WorkAttachment::getAttachmentId, id);
-        ossServiceMapper.delete(wrapper);
+//        LambdaQueryWrapper<WorkAttachmentInfo> wrapper = new LambdaQueryWrapper<>();
+//        wrapper.eq(WorkAttachmentInfo::getAttachmentId, id);
+        SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteByAttachmentId(id);
         return "删除项目成功";
     }
 
@@ -705,15 +722,16 @@ public class ProjectListService {
     }
 
     public String saveReportNo(String id) throws Exception{
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        String currentToken = TokenProvider.getCurrentToken();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         ProgramProjectListInfo programProjectListInfo = projectListMapper.selectById(id);
         String reportNo = "";
         if(ObjectUtil.isNotEmpty(programProjectListInfo)){
             if(StringUtils.isNotBlank(programProjectListInfo.getReportType())){
                 if (programProjectListInfo.getReportType().equals("1")){
-                    reportNo = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), ProgramReportNoDto.BIZ_CODE);
+                    reportNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), ProgramReportNoDto.BIZ_CODE,currentToken);
                 } else if (programProjectListInfo.getReportType().equals("2")) {
-                    reportNo = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), ProgramReportNoDto.BIZ_CODE_);
+                    reportNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), ProgramReportNoDto.BIZ_CODE_,currentToken);
                 }
                 ProgramReportNo programReportNo = new ProgramReportNo();
                 programReportNo.setProgramId(id);
@@ -764,7 +782,7 @@ public class ProjectListService {
         if(StringUtils.isBlank(projectDto.getProjectManager())){
             data.put("projectMaster","");
         }else{
-            data.put("projectMaster",UserUtils.get(projectDto.getProjectManager()).getName());
+            data.put("projectMaster",SpringUtil.getBean ( IUserApi.class ).getById(projectDto.getProjectManager()).getName());
         }
         //如果存在审核意见则进行处理
         if(null != auditDto){
@@ -772,12 +790,12 @@ public class ProjectListService {
             List<ProgramAuditAssessPeopleDto> programAuditAssessPeopleDtoList = auditDto.getProgramAuditAssessPeopleDtoList();
             List<String> appraiserList = Lists.newArrayList();
             for (ProgramAuditAssessPeopleDto assessPeopleDto:programAuditAssessPeopleDtoList) {
-                appraiserList.add(UserUtils.get(assessPeopleDto.getAssessPeople()).getName());
+                appraiserList.add(SpringUtil.getBean ( IUserApi.class ).getById(assessPeopleDto.getAssessPeople()).getName());
             }
             data.put("appraisers",String.join(",",appraiserList));
 
             //项目审核人
-            data.put("projectauditor",UserUtils.get(auditDto.getAuditPeople()).getName());
+            data.put("projectauditor",SpringUtil.getBean ( IUserApi.class ).getById(auditDto.getAuditPeople()).getName());
             //明细表
             data.put("detailedStatement",disposeAuditDetails(auditDto.getDetailOpinion()));
             //评估报告
@@ -789,7 +807,7 @@ public class ProjectListService {
             //保留意见
             data.put("qualifiedOpinion",auditDto.getRetainOpinion());
             //执行人
-            data.put("executor",UserUtils.get(auditDto.getCreateBy().getId()).getName());
+            data.put("executor",SpringUtil.getBean ( IUserApi.class ).getById(auditDto.getCreateBy().getId()).getName());
 
             Date auditDate=projectDto.getAgreeTime();
             if(null == auditDate){
@@ -808,7 +826,7 @@ public class ProjectListService {
             //未修改意见
             data.put("notModifiedOpinion",auditDto.getChangeOpinion());
             //审核人
-            data.put("auditor",UserUtils.get(auditDto.getAuditPeople()).getName());
+            data.put("auditor",SpringUtil.getBean ( IUserApi.class ).getById(auditDto.getAuditPeople()).getName());
 
         }else{
             data.put("appraisers","");
@@ -951,14 +969,14 @@ public class ProjectListService {
         if(StringUtils.isBlank(projectDto.getProjectManager())){
             data.put("projectMaster","");
         }else{
-            data.put("projectMaster",UserUtils.get(projectDto.getProjectManager()).getName());
+            data.put("projectMaster",SpringUtil.getBean ( IUserApi.class ).getById(projectDto.getProjectManager()).getName());
         }
 
         //项目审核人
         if(StringUtils.isBlank(projectDto.getAgreeUserId())){
             data.put("projectauditor","");
         }else{
-            data.put("projectauditor",UserUtils.get(projectDto.getProjectManager()).getName());
+            data.put("projectauditor",SpringUtil.getBean ( IUserApi.class ).getById(projectDto.getProjectManager()).getName());
         }
         //项目审核时间
         Date agreeTime=projectDto.getAgreeTime();
@@ -976,11 +994,11 @@ public class ProjectListService {
             data.put("correctPersonnel","");
             data.put("executor","");
         }else{
-            data.put("auditPersonnel",UserUtils.get(proofreadInfoDto.getUpdateById()).getName());
+            data.put("auditPersonnel",SpringUtil.getBean ( IUserApi.class ).getById(proofreadInfoDto.getUpdateById()).getName());
             //改正人员签字
-            data.put("correctPersonnel",UserUtils.get(proofreadInfoDto.getUpdateById()).getName());
+            data.put("correctPersonnel",SpringUtil.getBean ( IUserApi.class ).getById(proofreadInfoDto.getUpdateById()).getName());
             //执行人
-            data.put("executor",UserUtils.get(proofreadInfoDto.getUpdateById()).getName());
+            data.put("executor",SpringUtil.getBean ( IUserApi.class ).getById(proofreadInfoDto.getUpdateById()).getName());
         }
         //保留意见
         if(StringUtils.isBlank(proofreadInfoDto.getReservations())){
@@ -1086,14 +1104,14 @@ public class ProjectListService {
         if(StringUtils.isBlank(projectDto.getProjectManager())){
             data.put("projectMaster","");
         }else{
-            data.put("projectMaster",UserUtils.get(projectDto.getProjectManager()).getName());
+            data.put("projectMaster",SpringUtil.getBean ( IUserApi.class ).getById(projectDto.getProjectManager()).getName());
         }
 
         //项目审核人
         if(StringUtils.isBlank(projectDto.getAgreeUserId())){
             data.put("projectauditor","");
         }else{
-            data.put("projectauditor",UserUtils.get(projectDto.getAgreeUserId()).getName());
+            data.put("projectauditor",SpringUtil.getBean ( IUserApi.class ).getById(projectDto.getAgreeUserId()).getName());
         }
         //项目审核时间
         Date agreeTime=projectDto.getAgreeTime();
@@ -1114,9 +1132,9 @@ public class ProjectListService {
         }else{
             data.put("auditPersonnel",proofreadInfoDto.getProjectManagerName());
             //改正人员签字
-            data.put("correctPersonnel",UserUtils.get(proofreadInfoDto.getUpdateById()).getName());
+            data.put("correctPersonnel",SpringUtil.getBean ( IUserApi.class ).getById(proofreadInfoDto.getUpdateById()).getName());
             //执行人
-            data.put("executor",UserUtils.get(proofreadInfoDto.getUpdateById()).getName());
+            data.put("executor",SpringUtil.getBean ( IUserApi.class ).getById(proofreadInfoDto.getUpdateById()).getName());
         }
         //保留意见
         if(StringUtils.isBlank(proofreadInfoDto.getReservations())){
@@ -1328,7 +1346,7 @@ public class ProjectListService {
         if(StringUtils.isBlank(projectDto.getProjectManager())){
             data.put("projectMaster","");
         }else{
-            data.put("projectMaster",UserUtils.get(projectDto.getProjectManager()).getName());
+            data.put("projectMaster",SpringUtil.getBean ( IUserApi.class ).getById(projectDto.getProjectManager()).getName());
         }
         //项目负责人时间
         Date agreeTime=projectDto.getAgreeTime();
@@ -1344,7 +1362,7 @@ public class ProjectListService {
         ProgramAuditDto audit1Dto = findByIdAudit(programProjectListInfo.getAuditId1());
         if(null != audit1Dto){
             //一级审核人
-            data.put("firstAuditMaster",UserUtils.get(audit1Dto.getAuditPeople()).getName());
+            data.put("firstAuditMaster",SpringUtil.getBean ( IUserApi.class ).getById(audit1Dto.getAuditPeople()).getName());
             //审核时间
             Date auditDate=audit1Dto.getAuditDate();
             if(null == auditDate){
@@ -1361,7 +1379,7 @@ public class ProjectListService {
         ProgramAuditDto audit2Dto = findByIdAudit(programProjectListInfo.getAuditId2());
         if(null != audit2Dto){
             //二级审核人
-            data.put("secondAuditMaster",UserUtils.get(audit2Dto.getAuditPeople()).getName());
+            data.put("secondAuditMaster",SpringUtil.getBean ( IUserApi.class ).getById(audit2Dto.getAuditPeople()).getName());
             //审核时间
             Date auditDate=audit2Dto.getAuditDate();
             if(null == auditDate){
@@ -1378,7 +1396,7 @@ public class ProjectListService {
         ProgramAuditDto audit3Dto = findByIdAudit(programProjectListInfo.getAuditId3());
         if(null != audit1Dto){
             //一级审核人
-            data.put("thirdAuditMaster",UserUtils.get(audit3Dto.getAuditPeople()).getName());
+            data.put("thirdAuditMaster",SpringUtil.getBean ( IUserApi.class ).getById(audit3Dto.getAuditPeople()).getName());
             //审核时间
             Date auditDate=audit3Dto.getAuditDate();
             if(null == auditDate){
@@ -1397,7 +1415,7 @@ public class ProjectListService {
 
         if(null != proofreadInfoDto){
             //校对负责人
-            data.put("proofreadMaster",UserUtils.get(proofreadInfoDto.getUpdateById()).getName());
+            data.put("proofreadMaster",SpringUtil.getBean ( IUserApi.class ).getById(proofreadInfoDto.getUpdateById()).getName());
             //审核时间
             Date processDate=proofreadInfoDto.getProcessDate();
             if(null == processDate){
@@ -1414,7 +1432,7 @@ public class ProjectListService {
         if(null != issuedById){
             //校对负责人
             if(StringUtils.isNotBlank(issuedById.getAgreeUserId())){
-                data.put("signer",UserUtils.get(issuedById.getAgreeUserId()).getName());
+                data.put("signer",SpringUtil.getBean ( IUserApi.class ).getById(issuedById.getAgreeUserId()).getName());
             }else{
                 data.put("signer","");
             }
@@ -1438,7 +1456,7 @@ public class ProjectListService {
             //校对负责人
             data.put("archiveMaster","");
             if(StringUtils.isNotBlank(programArchiveDto.getAuditUserId())){
-                data.put("archiveMaster",UserUtils.get(programArchiveDto.getAuditUserId()).getName());
+                data.put("archiveMaster",SpringUtil.getBean ( IUserApi.class ).getById(programArchiveDto.getAuditUserId()).getName());
             }else{
                 data.put("archiveMaster","");
             }
@@ -1464,7 +1482,7 @@ public class ProjectListService {
      * @return
      */
     public ResponseEntity<List<String>> getHaveProjectIds(){
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         return ResponseEntity.ok(projectListMapper.getHaveProjectIds(userDTO));
     }
 

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/service/dto/ProgramArchiveDto.java

@@ -3,7 +3,7 @@ package com.jeeplus.assess.program.configuration.projectList.service.dto;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.service.dto.BaseDTO;
 import com.jeeplus.assess.program.configuration.projectList.domain.ProgramProjectListInfo;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -181,27 +181,27 @@ public class ProgramArchiveDto extends BaseDTO {
     /**
      * 附件 - 评估报告
      */
-    private List<WorkAttachmentDto> reportFileList;
+    private List<WorkAttachmentInfoDTO> reportFileList;
 
     /**
      * 附件 - 评估说明
      */
-    private List<WorkAttachmentDto> explainFileList;
+    private List<WorkAttachmentInfoDTO> explainFileList;
 
     /**
      * 附件 - 评估明细表
      */
-    private List<WorkAttachmentDto> detailFileList;
+    private List<WorkAttachmentInfoDTO> detailFileList;
 
     /**
      * 附件 - 评估操作计算底稿
      */
-    private List<WorkAttachmentDto> papersFileList;
+    private List<WorkAttachmentInfoDTO> papersFileList;
 
     /**
      * 附件 - 其他
      */
-    private List<WorkAttachmentDto> otherFileList;
+    private List<WorkAttachmentInfoDTO> otherFileList;
 
     /**
      * 项目报告号

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/service/dto/ProgramAuditDto.java

@@ -2,7 +2,8 @@ package com.jeeplus.assess.program.configuration.projectList.service.dto;
 
 import com.jeeplus.core.service.dto.BaseDTO;
 import com.jeeplus.assess.program.configuration.projectList.domain.ProgramProjectListInfo;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 import lombok.Data;
 
 import java.util.Date;
@@ -98,7 +99,7 @@ public class ProgramAuditDto extends BaseDTO {
     /**
      * 附件信息
      */
-    private List<WorkAttachmentDto> workAttachmentDtoList;
+    private List<WorkAttachmentInfo> workAttachmentDtoList;
 
     private static final long serialVersionUID = 1L;
-}
+}

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/service/dto/ProjectListDto.java

@@ -4,7 +4,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.assess.program.configuration.projectList.domain.ProgramProjectListLink;
 import com.jeeplus.assess.program.configuration.projectList.domain.ProgramProjectListMember;
 import com.jeeplus.core.domain.BaseEntity;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -143,7 +144,7 @@ public class ProjectListDto extends BaseEntity {
 
     private List<ProgramProjectListMember> members;
 
-    private List<WorkAttachmentDto> files;
+    private List<WorkAttachmentInfo> files;
 
     /**
      * 审批通过时间

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/typeDict/service/ProgramTypeDictService.java

@@ -16,7 +16,7 @@ import com.jeeplus.assess.program.configuration.typeDict.mapper.ProgramTypeDictM
 import com.jeeplus.assess.program.configuration.typeDict.service.dto.ProgramTypeDictDTO;
 import com.jeeplus.assess.program.configuration.typeDict.service.mapstruct.ProgramTypeDictWrapper;
 import com.jeeplus.core.service.TreeService;
-import com.jeeplus.sys.domain.Menu;
+//import com.jeeplus.sys.domain.Menu;
 import com.jeeplus.sys.service.dto.MenuDTO;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.http.ResponseEntity;

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/projectRecords/controller/ProjectController.java

@@ -3,23 +3,27 @@ package com.jeeplus.assess.projectRecords.controller;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.spring.SpringUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.jeeplus.aop.demo.annotation.DemoMode;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.common.excel.ExcelOptions;
 import com.jeeplus.common.excel.ExportMode;
 import com.jeeplus.core.excel.EasyPoiUtil;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.logging.annotation.ApiLog;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
+import com.jeeplus.sys.feign.IWorkAttachmentApi;
 import com.jeeplus.sys.service.dto.RoleDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 import com.jeeplus.sys.utils.UserUtils;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
-import com.jeeplus.pubmodules.oss.service.OssService;
+//import com.jeeplus.pubmodules.oss.service.OssService;
 import com.jeeplus.assess.projectRecords.constant.enums.ProjectStatusEnum;
 import com.jeeplus.assess.projectRecords.constant.enums.ProjectTypeEnum;
 import com.jeeplus.assess.projectRecords.constant.enums.YesOrNoEnum;
@@ -54,10 +58,7 @@ import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
@@ -79,8 +80,8 @@ public class ProjectController {
     @Autowired
     private UserService userService;
 
-    @Resource
-    private OssService ossService;
+//    @Resource
+//    private OssService ossService;
 
     private int successNum;
 
@@ -202,10 +203,10 @@ public class ProjectController {
             projectService.update (pro,wrapper);//修改
         }
         //项目id处理
-        List<WorkAttachmentDto> workAttachmentDtos = new ArrayList<>();
-        List<WorkAttachment> workAttachments = projectDTO.getWorkAttachments();
+        List<WorkAttachmentInfoDTO> workAttachmentDtos = new ArrayList<>();
+        List<WorkAttachmentInfo> workAttachments = projectDTO.getWorkAttachments();
         workAttachments.stream().forEach(ite -> {
-            WorkAttachmentDto w = new WorkAttachmentDto();
+            WorkAttachmentInfoDTO w = new WorkAttachmentInfoDTO();
             w.setBy(ite.getCreateById());
             w.setName(ite.getAttachmentName());
             String fileSize = ite.getFileSize();
@@ -214,7 +215,15 @@ public class ProjectController {
             w.setUrl(ite.getUrl());
             workAttachmentDtos.add(w);
         });
-        ossService.saveOrUpdateFileList(workAttachmentDtos,pro.getId(),"projectRecords");
+        Map<String,String> map = new HashMap<>();
+        String fileList = JSON.toJSONString((workAttachmentDtos));
+        String attachmentId = pro.getId();
+        String attachmentFlag = "projectRecords";
+        map.put("fileList",fileList);
+        map.put("attachmentId",attachmentId);
+        map.put("attachmentFlag",attachmentFlag);
+        map.put("currentToken", TokenProvider.getCurrentToken ( ));
+        SpringUtil.getBean ( IWorkAttachmentApi.class ).saveOrUpdateFileList(map);
         return ResponseEntity.ok ("保存项目成功");
     }
 

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/projectRecords/service/dto/ProjectDTO.java

@@ -2,8 +2,8 @@ package com.jeeplus.assess.projectRecords.service.dto;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.jeeplus.core.service.dto.BaseDTO;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import com.jeeplus.sys.service.dto.OfficeDTO;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -273,7 +273,7 @@ public class ProjectDTO extends BaseDTO {
     /**
      * oss上传文件相关数据
      */
-    public List<WorkAttachment> workAttachments;
+    public List<WorkAttachmentInfo> workAttachments;
 
     private OfficeDTO officeDTO;
 

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/proofread/service/ProofreadInfoService.java

@@ -1,14 +1,17 @@
 package com.jeeplus.assess.proofread.service;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jeeplus.assess.proofread.domain.ProofreadDetail;
 import com.jeeplus.assess.proofread.domain.ProofreadInfo;
 import com.jeeplus.assess.proofread.mapper.ProofreadDetailMapper;
 import com.jeeplus.assess.proofread.mapper.ProofreadInfoMapper;
 import com.jeeplus.assess.proofread.service.dto.ProofreadInfoDto;
+import com.jeeplus.common.TokenProvider;
+import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.sys.utils.UserUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -47,7 +50,7 @@ public class ProofreadInfoService {
         //生成主键id值
         String id = UUID.randomUUID().toString().replace("-", "");
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         //保存基本信息
         ProofreadInfo info = new ProofreadInfo();
         BeanUtils.copyProperties(dto, info);
@@ -75,7 +78,7 @@ public class ProofreadInfoService {
 
     public String update(ProofreadInfoDto dto) {
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         //修改基本信息
         ProofreadInfo info = new ProofreadInfo();
         BeanUtils.copyProperties(dto, info);

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/proofread/service/ProofreadIssuedService.java

@@ -1,8 +1,11 @@
 package com.jeeplus.assess.proofread.service;
 
+import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jeeplus.common.TokenProvider;
+import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.sys.utils.UserUtils;
 import com.jeeplus.assess.proofread.domain.ProofreadIssued;
 import com.jeeplus.assess.proofread.mapper.ProofreadIssuedMapper;
 import org.springframework.stereotype.Service;
@@ -29,7 +32,7 @@ public class ProofreadIssuedService {
 
     public String add(ProofreadIssued issued) {
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         String id = issued.getProjectId();
         issued.setId(id);
         issued.setCreateById(userDTO.getId());
@@ -43,7 +46,7 @@ public class ProofreadIssuedService {
 
     public void update(ProofreadIssued issued) {
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         issued.setUpdateById(userDTO.getId());
         issued.setUpdateTime(new Date());
         LambdaQueryWrapper<ProofreadIssued> wrapper = new LambdaQueryWrapper<>();

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/proofread/service/ProofreadTypeService.java

@@ -1,10 +1,13 @@
 package com.jeeplus.assess.proofread.service;
 
+import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.domain.BaseEntity;
 import com.jeeplus.core.service.TreeService;
+import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.sys.utils.UserUtils;
 import com.jeeplus.assess.proofread.domain.ProofreadType;
 import com.jeeplus.assess.proofread.mapper.ProofreadTypeMapper;
 import org.apache.commons.lang3.StringUtils;
@@ -56,7 +59,7 @@ public class ProofreadTypeService extends TreeService<ProofreadTypeMapper, Proof
      */
     public String add(ProofreadType type) {
         // 获取当前登录人信息
-        UserDTO userDto = UserUtils.getCurrentUserDTO();
+        UserDTO userDto = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         // 生成id值
         String id = UUID.randomUUID().toString().replace("-", "");
         type.setId(id);
@@ -78,7 +81,7 @@ public class ProofreadTypeService extends TreeService<ProofreadTypeMapper, Proof
      */
     public String update(ProofreadType info) {
         // 获取当前登录人信息
-        UserDTO userDto = UserUtils.getCurrentUserDTO();
+        UserDTO userDto = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         info.setUpdateById(userDto.getId());
         info.setUpdateTime(new Date());
         mapper.updateById(info);

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/mapper/ReimbursementInfoMapper.java

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.assess.reimbursement.reimbursementInfo.domain.*;
 import com.jeeplus.assess.reimbursement.reimbursementInfo.service.dto.RetureListDto;
 import com.jeeplus.assess.reimbursement.reimbursementInfo.service.dto.TreeUserDto;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -17,7 +17,7 @@ public interface ReimbursementInfoMapper extends BaseMapper<ReimbursementInfo> {
 
     IPage<RetureListDto> findList (Page<RetureListDto> page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper);
 
-    List<WorkAttachmentDto> findFiles(@Param("id") String id);
+    List<WorkAttachmentInfo> findFiles(@Param("id") String id);
 
     void updateStatusById(@Param("id") String id, @Param("type") String type);
 

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/mapper/xml/ReimbursementInfoMapper.xml

@@ -93,7 +93,7 @@
 		ORDER BY a.update_time DESC
 	</select>
 
-	<select id="findFiles" resultType="com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto">
+	<select id="findFiles" resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
 		SELECT
 			id,
 			url,

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/service/ReimbursementInfoService.java

@@ -2,6 +2,7 @@ package com.jeeplus.assess.reimbursement.reimbursementInfo.service;
 
 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.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -11,16 +12,21 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.flowable.feign.IFlowableApi;
 import com.jeeplus.sys.domain.Office;
-import com.jeeplus.sys.mapper.OfficeMapper;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
+import com.jeeplus.sys.feign.IDictApi;
+import com.jeeplus.sys.feign.IOfficeApi;
+import com.jeeplus.sys.feign.IUserApi;
+import com.jeeplus.sys.feign.IWorkAttachmentApi;
+//import com.jeeplus.sys.mapper.OfficeMapper;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.DictUtils;
-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;
+//import com.jeeplus.sys.utils.DictUtils;
+//import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
+//import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
 import com.jeeplus.assess.program.configuration.projectList.domain.ProgramProjectListInfo;
 import com.jeeplus.assess.program.configuration.projectList.domain.ProgramReportNo;
 import com.jeeplus.assess.program.configuration.projectList.mapper.ProgramReportNoMapper;
@@ -32,7 +38,6 @@ import com.jeeplus.assess.reimbursement.reimbursementInfo.service.dto.RetureList
 import com.jeeplus.assess.reimbursement.reimbursementInfo.service.dto.SaveInfoDto;
 import com.jeeplus.assess.reimbursement.reimbursementInfo.service.dto.TreeUserDto;
 import com.jeeplus.assess.workContract.service.WorkContractService;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
 import com.jeeplus.assess.workContract.service.dto.WorkContractInfoDto;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -56,17 +61,17 @@ public class ReimbursementInfoService {
     @Resource
     private ReimbursementAmountInfoMapper amountInfoMapper;
 
-    @Resource
-    private OssServiceMapper ossServiceMapper;
+//    @Resource
+//    private OssServiceMapper ossServiceMapper;
 
-    @Resource
-    private SerialnumTplService serialnumTplService;
+//    @Resource
+//    private SerialnumTplService serialnumTplService;
 
     @Resource
     private WorkContractService workContractService;
 
-    @Autowired
-    private OfficeMapper officeMapper;
+//    @Autowired
+//    private OfficeMapper officeMapper;
 
     @Autowired
     private ReimbursementDetailInfoContractMapper reimbursementDetailInfoContractMapper;
@@ -237,7 +242,7 @@ public class ReimbursementInfoService {
 
     public ReimbursementInfo save(SaveInfoDto dto) throws Exception{
         // 获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         if (StringUtils.isNotEmpty(dto.getId())) {
             return update(dto, userDTO);
         } else {
@@ -249,7 +254,7 @@ public class ReimbursementInfoService {
         // 生成id
         String id = UUID.randomUUID().toString().replace("-", "");
         // 生成编号
-        String no = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), dto.BIZ_CODE);
+        String no = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), dto.BIZ_CODE, TokenProvider.getCurrentToken());
         // 保存基础信息表信息
         ReimbursementInfo info = new ReimbursementInfo();
         BeanUtils.copyProperties(dto, info);
@@ -440,9 +445,9 @@ public class ReimbursementInfoService {
         amountInfoLambdaQueryWrapper.eq(ReimbursementAmountInfo::getInfoId, id);
         amountInfoMapper.delete(amountInfoLambdaQueryWrapper);
         // 删除附件信息
-        LambdaQueryWrapper<WorkAttachment> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(WorkAttachment::getAttachmentId, id);
-        ossServiceMapper.delete(wrapper);
+//        LambdaQueryWrapper<WorkAttachmentInfo> wrapper = new LambdaQueryWrapper<>();
+//        wrapper.eq(WorkAttachmentInfo::getAttachmentId, id);
+        SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteByAttachmentId(id);
         return "操作成功";
     }
 
@@ -453,7 +458,7 @@ public class ReimbursementInfoService {
         if (ObjectUtil.isNotEmpty(info)){
             BeanUtils.copyProperties(info, dto);
             if(StringUtils.isNotBlank(info.getDepartment())) {
-                Office byId = officeMapper.selectById(info.getDepartment());
+                Office byId = SpringUtil.getBean ( IOfficeApi.class ).selectById(info.getDepartment());
                 if (ObjectUtil.isNotEmpty(byId)) {
                     dto.setDepartmentName(byId.getName());
                 }
@@ -484,10 +489,10 @@ public class ReimbursementInfoService {
             List<ReimbursementAmountInfo> amountInfos = amountInfoMapper.selectList(amountInfoLambdaQueryWrapper);
             dto.setAmountInfos(amountInfos);
             // 查询附件信息
-            List<WorkAttachmentDto> files = infoMapper.findFiles(id);
+            List<WorkAttachmentInfo> files = infoMapper.findFiles(id);
             if (CollectionUtils.isNotEmpty(files)) {
-                for (WorkAttachmentDto i : files) {
-                    i.setCreateBy(UserUtils.get(i.getBy()));
+                for (WorkAttachmentInfo i : files) {
+                    i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                 }
             }
             dto.setFiles(files);
@@ -511,14 +516,15 @@ public class ReimbursementInfoService {
 
     //用户树形
     public List<TreeUserDto> userTree(String name) {
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
         List<TreeUserDto> list = new ArrayList<>();
         // 查询部门
         List<TreeUserDto> officeList = infoMapper.findOfficeList();
         List<TreeUserDto> filterList = new ArrayList<>();
-        if (UserUtils.getCurrentUserDTO ().isAdmin ()) {
+        if (userDTO.isAdmin ()) {
             filterList = officeList;
         } else {
-            String parentIds = officeMapper.selectById(UserUtils.getCurrentUserDTO().getOfficeDTO().getId()).getParentIds();
+            String parentIds = SpringUtil.getBean ( IOfficeApi.class ).selectById(userDTO.getOfficeDTO().getId()).getParentIds();
             String[] split = parentIds.split(",");
             if(split.length>2){
                 // 公司id
@@ -533,7 +539,7 @@ public class ReimbursementInfoService {
                     }
                 });
                 // 根据公司id找到其下部门
-                List<Office> oList = officeMapper.selectList(new QueryWrapper<Office>().lambda().eq(Office::getParentId, companyId));
+                List<Office> oList = SpringUtil.getBean ( IOfficeApi.class ).selectListByParentId(companyId);
                 // 过滤出这些部门
                 List<TreeUserDto> finalFilterList4 = filterList;
                 oList.stream().forEach(item -> {
@@ -544,7 +550,7 @@ public class ReimbursementInfoService {
                     });
                 });
                 // 找到所有的公有部门
-                List<Office> publicOfficeList = officeMapper.selectList(new QueryWrapper<Office>().lambda().eq(Office::getIsPublic, "1"));
+                List<Office> publicOfficeList = SpringUtil.getBean ( IOfficeApi.class ).selectListByIsPublic("1");
                 // 过滤出这些部门
                 List<TreeUserDto> finalFilterList3 = filterList;
                 publicOfficeList.stream().forEach(item -> {
@@ -556,9 +562,9 @@ public class ReimbursementInfoService {
                 });
             }else{
                 // 私有的
-                if ("0".equals(UserUtils.getCurrentUserDTO().getOfficeDTO().getIsPublic())) {
+                if ("0".equals(userDTO.getOfficeDTO().getIsPublic())) {
                     // 公司id
-                    String companyId = UserUtils.getCurrentUserDTO().getOfficeDTO().getId();
+                    String companyId = userDTO.getOfficeDTO().getId();
                     // 过滤出登录人所属公司和集团
                     List<TreeUserDto> finalFilterList2 = filterList;
                     officeList.stream().forEach(o -> {
@@ -569,7 +575,7 @@ public class ReimbursementInfoService {
                         }
                     });
                     // 根据公司id找到其下部门
-                    List<Office> oList = officeMapper.selectList(new QueryWrapper<Office>().lambda().eq(Office::getParentId, companyId));
+                    List<Office> oList = SpringUtil.getBean ( IOfficeApi.class ).selectListByParentId(companyId);
                     // 过滤出这些部门
                     List<TreeUserDto> finalFilterList1 = filterList;
                     oList.stream().forEach(item -> {
@@ -580,7 +586,7 @@ public class ReimbursementInfoService {
                         });
                     });
                     // 找到所有的公有部门
-                    List<Office> publicOfficeList = officeMapper.selectList(new QueryWrapper<Office>().lambda().eq(Office::getIsPublic, "1"));
+                    List<Office> publicOfficeList = SpringUtil.getBean ( IOfficeApi.class ).selectListByIsPublic("1");
                     // 过滤出这些部门
                     List<TreeUserDto> finalFilterList = filterList;
                     publicOfficeList.stream().forEach(item -> {
@@ -763,7 +769,7 @@ public class ReimbursementInfoService {
                         retureListDto.setContractName(retureListDto.getProjectName());
                         retureListDto.setProjectName("");
                     }
-                    retureListDto.setSourceType(DictUtils.getDictLabel(retureListDto.getSourceType(),"pg_reimbursement_source_type",""));
+                    retureListDto.setSourceType(SpringUtil.getBean ( IDictApi.class ).getDictLabel(retureListDto.getSourceType(),"pg_reimbursement_source_type",""));
                 }
             }
         }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/service/dto/SaveInfoDto.java

@@ -2,9 +2,9 @@ package com.jeeplus.assess.reimbursement.reimbursementInfo.service.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.domain.BaseEntity;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
 import com.jeeplus.assess.reimbursement.reimbursementInfo.domain.*;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -71,7 +71,7 @@ public class SaveInfoDto extends BaseEntity {
 
     private List<ReimbursementAmountInfo> amountInfos;
 
-    private List<WorkAttachmentDto> files;
+    private List<WorkAttachmentInfo> files;
     /**
      * 报销类型
      */

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementType/service/ReimbursementTypeService.java

@@ -1,9 +1,12 @@
 package com.jeeplus.assess.reimbursement.reimbursementType.service;
 
+import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.domain.BaseEntity;
+import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.sys.utils.UserUtils;
 import com.jeeplus.assess.reimbursement.reimbursementType.domain.ReimbursementTypeInfo;
 import com.jeeplus.assess.reimbursement.reimbursementType.mapper.ReimbursementTypeMapper;
 import org.apache.commons.lang3.StringUtils;
@@ -57,7 +60,7 @@ public class ReimbursementTypeService {
      */
     public String add(ReimbursementTypeInfo info) {
         // 获取当前登录人信息
-        UserDTO userDto = UserUtils.getCurrentUserDTO();
+        UserDTO userDto = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         // 生成id值
         String id = UUID.randomUUID().toString().replace("-", "");
         info.setId(id);
@@ -79,7 +82,7 @@ public class ReimbursementTypeService {
      */
     public String update(ReimbursementTypeInfo info) {
         // 获取当前登录人信息
-        UserDTO userDto = UserUtils.getCurrentUserDTO();
+        UserDTO userDto = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         info.setUpdateBy(userDto.getId());
         info.setUpdateDate(new Date());
         mapper.updateById(info);

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workClientInfo/domain/dto/WorkClientInfosDto.java

@@ -3,7 +3,8 @@ package com.jeeplus.assess.workClientInfo.domain.dto;
 import com.jeeplus.assess.workClientInfo.domain.WorkClientBank;
 import com.jeeplus.assess.workClientInfo.domain.WorkClientInfo;
 import com.jeeplus.assess.workClientInfo.domain.WorkClientLinkman;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
+//import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import lombok.Data;
 
 import java.util.List;
@@ -17,6 +18,6 @@ public class WorkClientInfosDto {
 
     private List<WorkClientLinkman> workClientLinkman;
 
-    private List<WorkAttachment> workAttachments;
+    private List<WorkAttachmentInfo> workAttachments;
 
 }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workClientInfo/service/WorkClientService.java

@@ -2,6 +2,8 @@ package com.jeeplus.assess.workClientInfo.service;
 
 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.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -17,12 +19,16 @@ import com.jeeplus.assess.workClientInfo.mapper.WorkClientJobTypeInfoMapper;
 import com.jeeplus.assess.workClientInfo.mapper.WorkClientLinkmanMapper;
 import com.jeeplus.assess.workContract.service.WorkContractService;
 import com.jeeplus.assess.workContract.service.dto.WorkContractInfoDto;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
-import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
-import com.jeeplus.pubmodules.oss.service.OssService;
+//import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
+//import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
+//import com.jeeplus.pubmodules.oss.service.OssService;
+import com.jeeplus.common.TokenProvider;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
+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 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;
@@ -45,8 +51,8 @@ public class WorkClientService {
     @Resource
     private WorkClientLinkmanMapper workClientLinkmanMapper;
 
-    @Resource
-    private OssServiceMapper ossServiceMapper;
+//    @Resource
+//    private OssServiceMapper ossServiceMapper;
 
     @Resource
     private WorkClientJobTypeInfoMapper workClientJobTypeInfoMapper;
@@ -54,8 +60,8 @@ public class WorkClientService {
     @Resource
     private WorkContractService workContractService;
 
-    @Resource
-    private OssService ossService;
+//    @Resource
+//    private OssService ossService;
 
     /**
      * 客户信息列表
@@ -85,7 +91,7 @@ public class WorkClientService {
     @Transactional(rollbackFor = Exception.class)
     public String save(WorkClientInfosDto workClientInfosDto) {
         //获取当前登录人信息
-        UserDTO dto = UserUtils.getCurrentUserDTO();
+        UserDTO dto = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         //客户信息处理
         String id = UUID.randomUUID().toString().replace("-", "");
         WorkClientInfo workClientInfo = workClientInfosDto.getWorkClientInfo();
@@ -135,10 +141,10 @@ public class WorkClientService {
             });
         }
         //附件信息处理
-        List<WorkAttachment> workAttachments = workClientInfosDto.getWorkAttachments();
+        List<WorkAttachmentInfo> workAttachments = workClientInfosDto.getWorkAttachments();
         if (CollectionUtil.isNotEmpty(workAttachments)) {
             int j = 1;
-            for (WorkAttachment i : workAttachments) {
+            for (WorkAttachmentInfo i : workAttachments) {
                 i.setId(UUID.randomUUID().toString().replace("-", ""));
 
                 //文件类型处理
@@ -148,12 +154,17 @@ public class WorkClientService {
                 }
                 i.setDelFlag(0);
 
-                UserDTO userDTO = UserUtils.getCurrentUserDTO();
+                UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
                 i.setCreateTime(new Date());
                 i.setUpdateTime(new Date());
                 i.setAttachmentId(id);
                 i.setSort(j);
-                ossServiceMapper.insertWorkAttachment(i, userDTO);
+                Map<String,String> map = new HashMap<>();
+                String workAttachment = JSON.toJSONString((i));
+                String userDTOInfo = JSON.toJSONString((userDTO));
+                map.put("workAttachment",workAttachment);
+                map.put("userDTO",userDTOInfo);
+                SpringUtil.getBean ( IWorkAttachmentApi.class ).insertWorkAttachment(map);
                 j++;
             }
         }
@@ -191,9 +202,9 @@ public class WorkClientService {
         wrapper1.eq(WorkClientLinkman::getClientId, id);
         workClientLinkmanMapper.delete(wrapper1);
         //客户关联附件信息删除
-        LambdaQueryWrapper<WorkAttachment> wrapper2 = new LambdaQueryWrapper<>();
-        wrapper2.eq(WorkAttachment::getAttachmentId, id);
-        ossServiceMapper.delete(wrapper2);
+//        LambdaQueryWrapper<WorkAttachmentInfo> wrapper2 = new LambdaQueryWrapper<>();
+//        wrapper2.eq(WorkAttachmentInfo::getAttachmentId, id);
+        SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteByAttachmentId(id);
         map.put("success",true);
         map.put("message","删除成功！");
         return map;
@@ -233,10 +244,10 @@ public class WorkClientService {
         wrapper1.orderByDesc(WorkClientLinkman::getUpdateTime);
         dto.setWorkClientLinkman(workClientLinkmanMapper.selectList(wrapper1));
         //客户关联附件信息查询
-        LambdaQueryWrapper<WorkAttachment> wrapper2 = new LambdaQueryWrapper<>();
-        wrapper2.eq(WorkAttachment::getAttachmentId, id);
-        wrapper2.orderByAsc(WorkAttachment::getSort);
-        dto.setWorkAttachments(ossServiceMapper.selectList(wrapper2));
+//        LambdaQueryWrapper<WorkAttachmentInfo> wrapper2 = new LambdaQueryWrapper<>();
+//        wrapper2.eq(WorkAttachmentInfo::getAttachmentId, id);
+//        wrapper2.orderByAsc(WorkAttachmentInfo::getSort);
+        dto.setWorkAttachments(SpringUtil.getBean ( IWorkAttachmentApi.class ).selectListByAttachmentId(id));
         return dto;
     }
 
@@ -248,7 +259,7 @@ public class WorkClientService {
     @Transactional(rollbackFor = Exception.class)
     public String update(WorkClientInfosDto workClientInfosDto) {
         //获取当前登录人信息
-        UserDTO dto = UserUtils.getCurrentUserDTO();
+        UserDTO dto = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         //客户信息处理
         WorkClientInfo workClientInfo = workClientInfosDto.getWorkClientInfo();
         //客户行业处理
@@ -303,23 +314,28 @@ public class WorkClientService {
             });
         }
         //附件信息处理
-        List<WorkAttachment> workAttachments = workClientInfosDto.getWorkAttachments();
+        List<WorkAttachmentInfo> workAttachments = workClientInfosDto.getWorkAttachments();
         List<String> collect = workAttachments.stream().distinct().filter(item -> {
             if (StringUtils.isNotBlank(item.getId())) {
                 return true;
             }
             return false;
-        }).map(WorkAttachment::getId).collect(Collectors.toList());
+        }).map(WorkAttachmentInfo::getId).collect(Collectors.toList());
         if (CollectionUtil.isNotEmpty(workAttachments)) {
             if(CollectionUtil.isNotEmpty(collect)){
-                ossService.remove(new QueryWrapper<WorkAttachment>().lambda()
-                        .eq(WorkAttachment::getAttachmentId,workClientInfo.getId())
-                        .notIn(WorkAttachment::getId,collect));
+                SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteByAttachmentIdNotInIds(workClientInfo.getId(),collect);
+//                ossService.remove(new QueryWrapper<WorkAttachmentInfo>().lambda()
+//                        .eq(WorkAttachmentInfo::getAttachmentId,workClientInfo.getId())
+//                        .notIn(WorkAttachmentInfo::getId,collect));
             }
             workAttachments.stream().forEach(i -> i.setAttachmentId(workClientInfo.getId()));
-            ossService.saveMsg(workAttachments);
+            Map<String,String> map = new HashMap<>();
+            map.put("workAttachments",JSON.toJSONString(workAttachments));
+            map.put("currentToken", TokenProvider.getCurrentToken());
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).saveMsg2(map);
         } else{
-            ossService.remove(new QueryWrapper<WorkAttachment>().lambda().eq(WorkAttachment::getAttachmentId,workClientInfo.getId()));
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteByAttachmentId(workClientInfo.getId());
+//            ossService.remove(new QueryWrapper<WorkAttachmentInfo>().lambda().eq(WorkAttachmentInfo::getAttachmentId,workClientInfo.getId()));
         }
         return "更新完成!";
     }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workContract/mapper/WorkContractInfoMapper.java

@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.assess.program.configuration.projectList.domain.ProgramProjectListInfo;
 import com.jeeplus.assess.workContract.domain.WorkContractInfo;
 import com.jeeplus.assess.workContract.service.dto.WorkContractInfoDto;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -27,13 +27,13 @@ public interface WorkContractInfoMapper extends BaseMapper<WorkContractInfo> {
     Integer findIsExit(@Param("id") String id, @Param("name")String name);
 
     @InterceptorIgnore(tenantLine = "true")
-    List<WorkAttachment> findList(@Param("id") String id);
+    List<WorkAttachmentInfo> findList(@Param("id") String id);
 
     @InterceptorIgnore(tenantLine = "true")
-    List<WorkAttachmentDto> findDtos(@Param("id") String id);
+    List<WorkAttachmentInfo> findDtos(@Param("id") String id);
 
     @InterceptorIgnore(tenantLine = "true")
-    List<WorkAttachmentDto> findByAttachmentIdAndFlag(@Param("attachmentId") String id,@Param("attachmentFlag") String attachmentFlag);
+    List<WorkAttachmentInfoDTO> findByAttachmentIdAndFlag(@Param("attachmentId") String id,@Param("attachmentFlag") String attachmentFlag);
 
     void updateStatusById(@Param("id") String id, @Param("status")String status);
 

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workContract/mapper/xml/WorkContractInfoMapper.xml

@@ -105,11 +105,11 @@
 			AND attachment_name = #{name}
 	</select>
 
-	<select id="findList" resultType="com.jeeplus.pubmodules.oss.domain.WorkAttachment">
+	<select id="findList" resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
 		SELECT * FROM work_attachment WHERE del_flag = 0 AND attachment_id = #{id}
 	</select>
 
-	<select id="findDtos" resultType="com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto">
+	<select id="findDtos" resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
 		SELECT
 			id,
 			url,
@@ -123,7 +123,7 @@
 			AND attachment_id = #{id}
 	</select>
 
-	<select id="findByAttachmentIdAndFlag" resultType="com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto">
+	<select id="findByAttachmentIdAndFlag" resultType="com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO">
 		SELECT
 			id,
 			url,

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workContract/service/WorkContractBorrowService.java

@@ -1,13 +1,16 @@
 package com.jeeplus.assess.workContract.service;
 
+import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jeeplus.assess.workContract.domain.WorkContractBorrow;
 import com.jeeplus.assess.workContract.domain.WorkContractBorrowMessage;
 import com.jeeplus.assess.workContract.mapper.WorkContractBorrowMapper;
 import com.jeeplus.assess.workContract.mapper.WorkContractBorrowMessageMapper;
 import com.jeeplus.assess.workContract.service.dto.WorkContractBorrowDto;
+import com.jeeplus.common.TokenProvider;
+import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.sys.utils.UserUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -43,7 +46,7 @@ public class WorkContractBorrowService {
     @Transactional(rollbackFor = Exception.class)
     public String add(WorkContractBorrowDto workContractBorrowDto) throws Exception{
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         String id = UUID.randomUUID().toString().replace("-", "");
         WorkContractBorrow borrow = new WorkContractBorrow();
         BeanUtils.copyProperties(workContractBorrowDto, borrow);
@@ -64,7 +67,7 @@ public class WorkContractBorrowService {
     @Transactional(rollbackFor = Exception.class)
     public String update(WorkContractBorrowDto workContractBorrowDto, String id) {
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         WorkContractBorrow borrow = new WorkContractBorrow();
         BeanUtils.copyProperties(workContractBorrowDto, borrow);
         borrow.setContractInfoId(id);
@@ -109,7 +112,7 @@ public class WorkContractBorrowService {
      */
     public void saveMessage (WorkContractBorrowDto workContractBorrowDto, String id) {
         //保存借用信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         WorkContractBorrowMessage message = new WorkContractBorrowMessage();
         BeanUtils.copyProperties(workContractBorrowDto, message);
         String messageId = UUID.randomUUID().toString().replace("-", "");

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workContract/service/WorkContractService.java

@@ -1,6 +1,8 @@
 package com.jeeplus.assess.workContract.service;
 
 import cn.hutool.core.collection.CollectionUtil;
+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;
@@ -9,18 +11,20 @@ import com.jeeplus.assess.program.configuration.projectList.domain.ProgramProjec
 import com.jeeplus.assess.workContract.domain.WorkContractInfo;
 import com.jeeplus.assess.workContract.mapper.WorkContractInfoMapper;
 import com.jeeplus.assess.workContract.service.dto.WorkContractInfoDto;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.flowable.feign.IFlowableApi;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
-import com.jeeplus.sys.utils.TicketQueryUtils;
-import com.jeeplus.pubmodules.oss.service.OssService;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
+import com.jeeplus.sys.feign.IUserApi;
+import com.jeeplus.sys.feign.IWorkAttachmentApi;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.sys.service.dto.UserDTO;
-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;
+//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;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -34,11 +38,11 @@ public class WorkContractService {
     @Resource
     private WorkContractInfoMapper workContractInfoMapper;
 
-    @Resource
-    private OssServiceMapper ossServiceMapper;
+//    @Resource
+//    private OssServiceMapper ossServiceMapper;
 
-    @Resource
-    private SerialnumTplService serialnumTplService;
+//    @Resource
+//    private SerialnumTplService serialnumTplService;
 
     @Resource
     private IFlowableApi flowTaskService;
@@ -107,10 +111,11 @@ public class WorkContractService {
      */
     @Transactional(rollbackFor = Exception.class)
     public String add(WorkContractInfoDto workContractInfoDto) throws Exception{
+        String currentToken = TokenProvider.getCurrentToken();
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(currentToken);
         //合同编号生成
-        String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), WorkContractInfoDto.BIZ_CODE);
+        String serialNum = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), WorkContractInfoDto.BIZ_CODE,currentToken);
         String id = UUID.randomUUID().toString().replace("-", "");
         WorkContractInfo info = new WorkContractInfo();
         BeanUtils.copyProperties(workContractInfoDto, info);
@@ -121,7 +126,7 @@ public class WorkContractService {
         info.setUpdateById(userDTO.getId());
         info.setUpdateTime(new Date());
         workContractInfoMapper.insert(info);
-        List<WorkAttachmentDto> list = workContractInfoDto.getWorkAttachmentList();
+        List<WorkAttachmentInfo> list = workContractInfoDto.getWorkAttachmentList();
         if (CollectionUtil.isNotEmpty(list)) {
             saveFiles(list, userDTO, id);
         }
@@ -134,7 +139,7 @@ public class WorkContractService {
     @Transactional(rollbackFor = Exception.class)
     public String update(WorkContractInfoDto workContractInfoDto) throws Exception{
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         //合同编号生成
 //        String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), WorkContractInfoDto.BIZ_CODE);
         WorkContractInfo info = new WorkContractInfo();
@@ -143,7 +148,7 @@ public class WorkContractService {
         info.setUpdateById(userDTO.getId());
         info.setUpdateTime(new Date());
         workContractInfoMapper.updateById(info);
-        List<WorkAttachmentDto> list = workContractInfoDto.getWorkAttachmentList();
+        List<WorkAttachmentInfo> list = workContractInfoDto.getWorkAttachmentList();
         if (CollectionUtil.isNotEmpty(list)) {
             updateFiles(list, userDTO, workContractInfoDto.getId());
         }
@@ -156,9 +161,9 @@ public class WorkContractService {
     public String removeById(String id) {
         workContractInfoMapper.deleteById(id);
         // 附件删除
-        LambdaQueryWrapper<WorkAttachment> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(WorkAttachment::getAttachmentId, id);
-        ossServiceMapper.delete(wrapper);
+//        LambdaQueryWrapper<WorkAttachment> wrapper = new LambdaQueryWrapper<>();
+//        wrapper.eq(WorkAttachment::getAttachmentId, id);
+        SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteByAttachmentId(id);
         return "删除完成!";
     }
 
@@ -171,10 +176,10 @@ public class WorkContractService {
         if (info != null) {
             BeanUtils.copyProperties(info, dto);
             // 查询附件信息
-            List<WorkAttachmentDto> dtos = workContractInfoMapper.findDtos(id);
+            List<WorkAttachmentInfo> dtos = workContractInfoMapper.findDtos(id);
             if (CollectionUtil.isNotEmpty(dtos)) {
-                for (WorkAttachmentDto i : dtos) {
-                    i.setCreateBy(UserUtils.get(i.getBy()));
+                for (WorkAttachmentInfo i : dtos) {
+                    i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                 }
             }
             dto.setWorkAttachmentList(dtos);
@@ -196,10 +201,10 @@ public class WorkContractService {
      * @param id 关联id
      */
     @Transactional(rollbackFor = Exception.class)
-    public void saveFiles(List<WorkAttachmentDto> list, UserDTO userDTO, String id) {
+    public void saveFiles(List<WorkAttachmentInfo> list, UserDTO userDTO, String id) {
         int j = 1;
-        for (WorkAttachmentDto dto : list) {
-            WorkAttachment i = new WorkAttachment();
+        for (WorkAttachmentInfo dto : list) {
+            WorkAttachmentInfo i = new WorkAttachmentInfo();
             //包含了url、size、name
             i.setId(UUID.randomUUID().toString().replace("-", ""));
 //            i.getCreateBy().setId(userDTO.getId());
@@ -218,7 +223,12 @@ public class WorkContractService {
             i.setAttachmentFlag("workcontract");
             i.setFileSize(dto.getSize());
             i.setSort(j);
-            ossServiceMapper.insertWorkAttachment(i, userDTO);
+            Map<String,String> map = new HashMap<>();
+            String workAttachment = JSON.toJSONString((i));
+            String userDTOInfo = JSON.toJSONString((userDTO));
+            map.put("workAttachment",workAttachment);
+            map.put("userDTO",userDTOInfo);
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).insertWorkAttachment(map);
             j++;
         }
     }
@@ -230,10 +240,10 @@ public class WorkContractService {
      * @param id 关联id
      */
     @Transactional(rollbackFor = Exception.class)
-    public void saveFilesNew(List<WorkAttachmentDto> list, UserDTO userDTO, String id,String attachmentFlag) {
+    public void saveFilesNew(List<WorkAttachmentInfoDTO> list, UserDTO userDTO, String id,String attachmentFlag) {
         int j = 1;
-        for (WorkAttachmentDto dto : list) {
-            WorkAttachment i = new WorkAttachment();
+        for (WorkAttachmentInfoDTO dto : list) {
+            WorkAttachmentInfo i = new WorkAttachmentInfo();
             //包含了url、size、name
             i.setId(UUID.randomUUID().toString().replace("-", ""));
 //            i.getCreateBy().setId(userDTO.getId());
@@ -252,7 +262,12 @@ public class WorkContractService {
             i.setAttachmentFlag(attachmentFlag);
             i.setFileSize(dto.getSize());
             i.setSort(j);
-            ossServiceMapper.insertWorkAttachment(i, userDTO);
+            Map<String,String> map = new HashMap<>();
+            String workAttachment = JSON.toJSONString((i));
+            String userDTOInfo = JSON.toJSONString((userDTO));
+            map.put("workAttachment",workAttachment);
+            map.put("userDTO",userDTOInfo);
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).insertWorkAttachment(map);
             j++;
         }
     }
@@ -264,28 +279,28 @@ public class WorkContractService {
      * @param id 关联id
      */
     @Transactional(rollbackFor = Exception.class)
-    public void updateFiles(List<WorkAttachmentDto> list, UserDTO userDTO, String id) {
+    public void updateFiles(List<WorkAttachmentInfo> list, UserDTO userDTO, String id) {
         int j = 1;
         String names = new String();
         //表中存在，但是传过来不存在，说明已删除，表中数据也要删除
-        for (WorkAttachmentDto dto : list) {
+        for (WorkAttachmentInfo dto : list) {
             names = names + "," +dto.getUrl();
         }
         //查询保存的附件信息
-        List<WorkAttachment> infoList = workContractInfoMapper.findList(id);
+        List<WorkAttachmentInfo> infoList = workContractInfoMapper.findList(id);
         if (CollectionUtil.isNotEmpty(infoList)) {
-            for (WorkAttachment i : infoList) {
+            for (WorkAttachmentInfo i : infoList) {
                 if (!names.contains(i.getUrl())) {
-                    ossServiceMapper.deleteById(i.getId());
+                    SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteById(i.getId());
                 }
             }
         }
         //保存信息
-        for (WorkAttachmentDto dto : list) {
+        for (WorkAttachmentInfo dto : list) {
             //判断是否存在
             Integer isExit = workContractInfoMapper.findIsExit(id, dto.getName());
             if (isExit == 0) {
-                WorkAttachment i = new WorkAttachment();
+                WorkAttachmentInfo i = new WorkAttachmentInfo();
                 //包含了url、size、name
                 i.setId(UUID.randomUUID().toString().replace("-", ""));
 //                i.getCreateBy().setId(userDTO.getId());
@@ -304,7 +319,12 @@ public class WorkContractService {
                 i.setAttachmentFlag("workcontract");
                 i.setFileSize(dto.getSize());
                 i.setSort(j);
-                ossServiceMapper.insertWorkAttachment(i, userDTO);
+                Map<String,String> map = new HashMap<>();
+                String workAttachment = JSON.toJSONString((i));
+                String userDTOInfo = JSON.toJSONString((userDTO));
+                map.put("workAttachment",workAttachment);
+                map.put("userDTO",userDTOInfo);
+                SpringUtil.getBean ( IWorkAttachmentApi.class ).insertWorkAttachment(map);
                 j++;
             }
         }
@@ -331,10 +351,10 @@ public class WorkContractService {
         if (null != infoList && infoList.size()>0) {
             for (WorkContractInfoDto info: infoList) {
                 // 查询附件信息
-                List<WorkAttachmentDto> dtos = workContractInfoMapper.findDtos(info.getId());
+                List<WorkAttachmentInfo> dtos = workContractInfoMapper.findDtos(info.getId());
                 if (CollectionUtil.isNotEmpty(dtos)) {
-                    for (WorkAttachmentDto i : dtos) {
-                        i.setCreateBy(UserUtils.get(i.getBy()));
+                    for (WorkAttachmentInfo i : dtos) {
+                        i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                     }
                 }
             }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workContract/service/dto/WorkContractInfoDto.java

@@ -2,8 +2,8 @@ package com.jeeplus.assess.workContract.service.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.service.dto.BaseDTO;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 import lombok.Data;
 
 import java.util.Date;
@@ -106,7 +106,7 @@ public class WorkContractInfoDto extends BaseDTO {
     /**
      * 附件信息
      */
-    private List<WorkAttachmentDto> workAttachmentList;
+    private List<WorkAttachmentInfo> workAttachmentList;
 
     private String contractFileId;
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/common/CommonUtils.java

@@ -1,200 +1,200 @@
-package com.jeeplus.finance.common;
-
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.extra.spring.SpringUtil;
-import com.jeeplus.sys.service.DictTypeService;
-import com.jeeplus.sys.service.OfficeService;
-import com.jeeplus.sys.service.dto.OfficeDTO;
-import com.jeeplus.sys.service.dto.RoleDTO;
-import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class CommonUtils {
-
-    /**
-     * 判断当前用户是否拥有 “ 财务部门主任 ” 的角色
-     * @return
-     */
-    public static boolean haveRoleCwBmzr() {
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
-        List<RoleDTO> roles = new ArrayList<>(); // 当前用户拥有的角色
-        if (CollectionUtil.isNotEmpty(userDTO.getRoleDTOList())) {
-            roles = userDTO.getRoleDTOList().stream().filter(item -> {
-                // 过滤当前用户是否拥有财务部门主任角色
-                if ("cw_bmzr".equals(item.getEnName())) {
-                    return true;
-                }
-                return false;
-            }).collect(Collectors.toList());
-        }
-        if (CollectionUtil.isNotEmpty(roles)) {
-            return true;
-        }
-        return false;
-    }
-    /**
-     * 判断当前用户是否拥有 “ 财务员工 ” 的角色
-     * @return
-     */
-    public static boolean haveRoleCwYg() {
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
-        List<RoleDTO> roles = new ArrayList<>(); // 当前用户拥有的角色
-        if (CollectionUtil.isNotEmpty(userDTO.getRoleDTOList())) {
-            roles = userDTO.getRoleDTOList().stream().filter(item -> {
-                // 过滤当前用户是否拥有财务员工角色
-                if ("cwyg".equals(item.getEnName())) {
-                    return true;
-                }
-                return false;
-            }).collect(Collectors.toList());
-        }
-        if (CollectionUtil.isNotEmpty(roles)) {
-            return true;
-        }
-        return false;
-    }
-    /**
-     * 判断当前用户是否拥有 “ 专家组成员 ” 的角色
-     * @return
-     */
-    public static boolean haveRoleZjzcy() {
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
-        List<RoleDTO> roles = new ArrayList<>(); // 当前用户拥有的角色
-        if (CollectionUtil.isNotEmpty(userDTO.getRoleDTOList())) {
-            roles = userDTO.getRoleDTOList().stream().filter(item -> {
-                // 过滤当前用户是否拥有专家组成员角色
-                if ("zjzcy".equals(item.getEnName())) {
-                    return true;
-                }
-                return false;
-            }).collect(Collectors.toList());
-        }
-        if (CollectionUtil.isNotEmpty(roles)) {
-            return true;
-        }
-        return false;
-    }
-    /**
-     * 判断当前用户是否拥有 “ 项目员工 ” 的角色
-     * @return
-     */
-    public static boolean haveRoleXmYg() {
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
-        List<RoleDTO> roles = new ArrayList<>(); // 当前用户拥有的角色
-        if (CollectionUtil.isNotEmpty(userDTO.getRoleDTOList())) {
-            roles = userDTO.getRoleDTOList().stream().filter(item -> {
-                // 过滤当前用户是否拥有项目员工角色
-                if ("xmyg".equals(item.getEnName())) {
-                    return true;
-                }
-                return false;
-            }).collect(Collectors.toList());
-        }
-        if (CollectionUtil.isNotEmpty(roles)) {
-            return true;
-        }
-        return false;
-    }
-    /**
-     * 判断当前用户是否拥有 “ 会计所长 ” 的角色
-     * @return
-     */
-    public static boolean haveRoleKjsz() {
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
-        List<RoleDTO> roles = new ArrayList<>(); // 当前用户拥有的角色
-        if (CollectionUtil.isNotEmpty(userDTO.getRoleDTOList())) {
-            roles = userDTO.getRoleDTOList().stream().filter(item -> {
-                // 过滤当前用户是否拥有会计所长角色
-                if ("kjsz".equals(item.getEnName())) {
-                    return true;
-                }
-                return false;
-            }).collect(Collectors.toList());
-        }
-        if (CollectionUtil.isNotEmpty(roles)) {
-            return true;
-        }
-        return false;
-    }
-    /**
-     * 判断当前用户是否拥有 “ 质控部主任 ” 的角色
-     * @return
-     */
-    public static boolean haveRoleZkbzr() {
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
-        List<RoleDTO> roles = new ArrayList<>(); // 当前用户拥有的角色
-        if (CollectionUtil.isNotEmpty(userDTO.getRoleDTOList())) {
-            roles = userDTO.getRoleDTOList().stream().filter(item -> {
-                // 过滤当前用户是否拥有质控部主任角色
-                if ("zkbzr".equals(item.getEnName())) {
-                    return true;
-                }
-                return false;
-            }).collect(Collectors.toList());
-        }
-        if (CollectionUtil.isNotEmpty(roles)) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * 判断当前用户是否拥有 “ 质控部员工 ” 的角色
-     * @return
-     */
-    public static boolean haveRoleZkbyg() {
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
-        List<RoleDTO> roles = new ArrayList<>(); // 当前用户拥有的角色
-        if (CollectionUtil.isNotEmpty(userDTO.getRoleDTOList())) {
-            roles = userDTO.getRoleDTOList().stream().filter(item -> {
-                // 过滤当前用户是否拥有质控部员工角色
-                if ("zkbyg".equals(item.getEnName())) {
-                    return true;
-                }
-                return false;
-            }).collect(Collectors.toList());
-        }
-        if (CollectionUtil.isNotEmpty(roles)) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * 计算时间差
-     * 注：参数小于或等于当前时间
-     */
-    public static String timeDef(Date time) {
-        Long def = new Date().getTime() - time.getTime();
-        // 计算天数
-        long day = def / (1000 * 60 * 60 * 24);
-        if (day != 0) {
-            return day + "天前";
-        }
-        // 计算小时
-        long house = def / (1000 * 60 * 60);
-        if (house != 0) {
-            return house + "小时前";
-        }
-        // 计算分钟
-        long min = def / (1000 * 60);
-        return min + "分钟前";
-    }
-
-    /**
-     * 获取所有公司中的第一个
-     * @return
-     */
-    public static String getFirstCompanyId() {
-        List<OfficeDTO> allCompany = SpringUtil.getBean(OfficeService.class).getAllCompany();
-        if (CollectionUtil.isNotEmpty(allCompany)) {
-            return allCompany.get(0).getId();
-        }
-        return "";
-    }
-}
+//package com.jeeplus.finance.common;
+//
+//import cn.hutool.core.collection.CollectionUtil;
+//import cn.hutool.extra.spring.SpringUtil;
+////import com.jeeplus.sys.service.DictTypeService;
+//import com.jeeplus.sys.service.OfficeService;
+//import com.jeeplus.sys.service.dto.OfficeDTO;
+//import com.jeeplus.sys.service.dto.RoleDTO;
+//import com.jeeplus.sys.service.dto.UserDTO;
+//import com.jeeplus.sys.utils.UserUtils;
+//
+//import java.util.ArrayList;
+//import java.util.Date;
+//import java.util.List;
+//import java.util.stream.Collectors;
+//
+//public class CommonUtils {
+//
+//    /**
+//     * 判断当前用户是否拥有 “ 财务部门主任 ” 的角色
+//     * @return
+//     */
+//    public static boolean haveRoleCwBmzr() {
+//        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+//        List<RoleDTO> roles = new ArrayList<>(); // 当前用户拥有的角色
+//        if (CollectionUtil.isNotEmpty(userDTO.getRoleDTOList())) {
+//            roles = userDTO.getRoleDTOList().stream().filter(item -> {
+//                // 过滤当前用户是否拥有财务部门主任角色
+//                if ("cw_bmzr".equals(item.getEnName())) {
+//                    return true;
+//                }
+//                return false;
+//            }).collect(Collectors.toList());
+//        }
+//        if (CollectionUtil.isNotEmpty(roles)) {
+//            return true;
+//        }
+//        return false;
+//    }
+//    /**
+//     * 判断当前用户是否拥有 “ 财务员工 ” 的角色
+//     * @return
+//     */
+//    public static boolean haveRoleCwYg() {
+//        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+//        List<RoleDTO> roles = new ArrayList<>(); // 当前用户拥有的角色
+//        if (CollectionUtil.isNotEmpty(userDTO.getRoleDTOList())) {
+//            roles = userDTO.getRoleDTOList().stream().filter(item -> {
+//                // 过滤当前用户是否拥有财务员工角色
+//                if ("cwyg".equals(item.getEnName())) {
+//                    return true;
+//                }
+//                return false;
+//            }).collect(Collectors.toList());
+//        }
+//        if (CollectionUtil.isNotEmpty(roles)) {
+//            return true;
+//        }
+//        return false;
+//    }
+//    /**
+//     * 判断当前用户是否拥有 “ 专家组成员 ” 的角色
+//     * @return
+//     */
+//    public static boolean haveRoleZjzcy() {
+//        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+//        List<RoleDTO> roles = new ArrayList<>(); // 当前用户拥有的角色
+//        if (CollectionUtil.isNotEmpty(userDTO.getRoleDTOList())) {
+//            roles = userDTO.getRoleDTOList().stream().filter(item -> {
+//                // 过滤当前用户是否拥有专家组成员角色
+//                if ("zjzcy".equals(item.getEnName())) {
+//                    return true;
+//                }
+//                return false;
+//            }).collect(Collectors.toList());
+//        }
+//        if (CollectionUtil.isNotEmpty(roles)) {
+//            return true;
+//        }
+//        return false;
+//    }
+//    /**
+//     * 判断当前用户是否拥有 “ 项目员工 ” 的角色
+//     * @return
+//     */
+//    public static boolean haveRoleXmYg() {
+//        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+//        List<RoleDTO> roles = new ArrayList<>(); // 当前用户拥有的角色
+//        if (CollectionUtil.isNotEmpty(userDTO.getRoleDTOList())) {
+//            roles = userDTO.getRoleDTOList().stream().filter(item -> {
+//                // 过滤当前用户是否拥有项目员工角色
+//                if ("xmyg".equals(item.getEnName())) {
+//                    return true;
+//                }
+//                return false;
+//            }).collect(Collectors.toList());
+//        }
+//        if (CollectionUtil.isNotEmpty(roles)) {
+//            return true;
+//        }
+//        return false;
+//    }
+//    /**
+//     * 判断当前用户是否拥有 “ 会计所长 ” 的角色
+//     * @return
+//     */
+//    public static boolean haveRoleKjsz() {
+//        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+//        List<RoleDTO> roles = new ArrayList<>(); // 当前用户拥有的角色
+//        if (CollectionUtil.isNotEmpty(userDTO.getRoleDTOList())) {
+//            roles = userDTO.getRoleDTOList().stream().filter(item -> {
+//                // 过滤当前用户是否拥有会计所长角色
+//                if ("kjsz".equals(item.getEnName())) {
+//                    return true;
+//                }
+//                return false;
+//            }).collect(Collectors.toList());
+//        }
+//        if (CollectionUtil.isNotEmpty(roles)) {
+//            return true;
+//        }
+//        return false;
+//    }
+//    /**
+//     * 判断当前用户是否拥有 “ 质控部主任 ” 的角色
+//     * @return
+//     */
+//    public static boolean haveRoleZkbzr() {
+//        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+//        List<RoleDTO> roles = new ArrayList<>(); // 当前用户拥有的角色
+//        if (CollectionUtil.isNotEmpty(userDTO.getRoleDTOList())) {
+//            roles = userDTO.getRoleDTOList().stream().filter(item -> {
+//                // 过滤当前用户是否拥有质控部主任角色
+//                if ("zkbzr".equals(item.getEnName())) {
+//                    return true;
+//                }
+//                return false;
+//            }).collect(Collectors.toList());
+//        }
+//        if (CollectionUtil.isNotEmpty(roles)) {
+//            return true;
+//        }
+//        return false;
+//    }
+//
+//    /**
+//     * 判断当前用户是否拥有 “ 质控部员工 ” 的角色
+//     * @return
+//     */
+//    public static boolean haveRoleZkbyg() {
+//        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+//        List<RoleDTO> roles = new ArrayList<>(); // 当前用户拥有的角色
+//        if (CollectionUtil.isNotEmpty(userDTO.getRoleDTOList())) {
+//            roles = userDTO.getRoleDTOList().stream().filter(item -> {
+//                // 过滤当前用户是否拥有质控部员工角色
+//                if ("zkbyg".equals(item.getEnName())) {
+//                    return true;
+//                }
+//                return false;
+//            }).collect(Collectors.toList());
+//        }
+//        if (CollectionUtil.isNotEmpty(roles)) {
+//            return true;
+//        }
+//        return false;
+//    }
+//
+//    /**
+//     * 计算时间差
+//     * 注：参数小于或等于当前时间
+//     */
+//    public static String timeDef(Date time) {
+//        Long def = new Date().getTime() - time.getTime();
+//        // 计算天数
+//        long day = def / (1000 * 60 * 60 * 24);
+//        if (day != 0) {
+//            return day + "天前";
+//        }
+//        // 计算小时
+//        long house = def / (1000 * 60 * 60);
+//        if (house != 0) {
+//            return house + "小时前";
+//        }
+//        // 计算分钟
+//        long min = def / (1000 * 60);
+//        return min + "分钟前";
+//    }
+//
+//    /**
+//     * 获取所有公司中的第一个
+//     * @return
+//     */
+//    public static String getFirstCompanyId() {
+//        List<OfficeDTO> allCompany = SpringUtil.getBean(OfficeService.class).getAllCompany();
+//        if (CollectionUtil.isNotEmpty(allCompany)) {
+//            return allCompany.get(0).getId();
+//        }
+//        return "";
+//    }
+//}

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/controller/ContractInfoController.java

@@ -13,6 +13,8 @@ import com.jeeplus.finance.invoice.util.EasyPoiUtil;
 import com.jeeplus.flowable.feign.IFlowableApi;
 import com.jeeplus.logging.annotation.ApiLog;
 import com.jeeplus.logging.constant.enums.LogTypeEnum;
+//import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.service.dto.UserDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/domain/ContractFile.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.domain.BaseEntity;
 import com.jeeplus.core.query.Query;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import lombok.Data;
 
 import java.util.List;
@@ -71,11 +71,11 @@ public class ContractFile extends BaseEntity {
      * 合同正文附件信息
      */
     @TableField(exist = false)
-    private List<WorkAttachmentDto> contractProperList;
+    private List<WorkAttachmentInfo> contractProperList;
 
     /**
      * 归档附件信息
      */
     @TableField(exist = false)
-    private List<WorkAttachmentDto> contractInfoList;
+    private List<WorkAttachmentInfo> contractInfoList;
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/domain/ContractFilePaper.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.domain.BaseEntity;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import lombok.Data;
 
 import java.util.Date;
@@ -72,11 +72,11 @@ public class ContractFilePaper extends BaseEntity {
      * 合同正文附件信息
      */
     @TableField(exist = false)
-    private List<WorkAttachmentDto> contractProperList;
+    private List<WorkAttachmentInfo> contractProperList;
 
     /**
      * 归档附件信息
      */
     @TableField(exist = false)
-    private List<WorkAttachmentDto> contractInfoList;
+    private List<WorkAttachmentInfo> contractInfoList;
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/domain/ContractInfo.java

@@ -10,7 +10,7 @@ import com.jeeplus.core.domain.BaseEntity;
 import com.jeeplus.core.query.Query;
 import com.jeeplus.core.query.QueryType;
 import com.jeeplus.finance.workClientInfo.service.dto.CwWorkClientBaseDTO;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import lombok.Data;
 
 import java.util.Date;
@@ -150,7 +150,7 @@ public class ContractInfo extends BaseEntity {
      * 附件信息
      */
     @TableField(exist = false)
-    private List<WorkAttachmentDto> contractProperList;
+    private List<WorkAttachmentInfo> contractProperList;
 
     /**
      * 被服务单位信息
@@ -162,7 +162,7 @@ public class ContractInfo extends BaseEntity {
      * 归档附件信息
      */
     @TableField(exist = false)
-    private List<WorkAttachmentDto> contractInfoList;
+    private List<WorkAttachmentInfo> contractInfoList;
 
     /**
      * 合同金额类别

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/mapper/ContractFileMapper.java

@@ -2,8 +2,7 @@ package com.jeeplus.finance.contractRegistration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.finance.contractRegistration.domain.ContractFile;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -14,7 +13,7 @@ import java.util.List;
  **/
 public interface ContractFileMapper extends BaseMapper<ContractFile> {
 
-    List<WorkAttachmentDto> findDtos(@Param("id") String id);
+    List<WorkAttachmentInfo> findDtos(@Param("id") String id);
 
     ContractFile findById (@Param("id") String id);
 
@@ -24,7 +23,7 @@ public interface ContractFileMapper extends BaseMapper<ContractFile> {
 
     ContractFile selectFileByContractInfoId (@Param("id") String id);
 
-    List<WorkAttachment> findList(@Param("id") String id);
+    List<WorkAttachmentInfo> findList(@Param("id") String id);
 
     Integer findIsExit(@Param("id") String id, @Param("name")String name);
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/mapper/ContractFilePaperMapper.java

@@ -2,7 +2,7 @@ package com.jeeplus.finance.contractRegistration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.finance.contractRegistration.domain.ContractFilePaper;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -23,7 +23,7 @@ public interface ContractFilePaperMapper extends BaseMapper<ContractFilePaper> {
 
     void updateStatusById(@Param("id") String id, @Param("filedType")String filedType);
 
-    List<WorkAttachment> findList(@Param("id") String id);
+    List<WorkAttachmentInfo> findList(@Param("id") String id);
 
     Integer findIsExit(@Param("id") String id, @Param("contractInfoId") String contractInfoId, @Param("name")String name);
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/mapper/ContractInfoMapper.java

@@ -8,8 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.finance.contractRegistration.domain.ContractFile;
 import com.jeeplus.finance.contractRegistration.domain.ContractInfo;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -24,7 +23,7 @@ public interface ContractInfoMapper extends BaseMapper<ContractInfo> {
 
     ContractFile getById(String id);
 
-    List<WorkAttachmentDto> findDtos(@Param("id") String id);
+    List<WorkAttachmentInfo> findDtos(@Param("id") String id);
 
     IPage<ContractInfo> findPageList(Page<ContractInfo> page, @Param("officeIds") String officeIds, @Param(Constants.WRAPPER) QueryWrapper queryWrapper);
 
@@ -40,7 +39,7 @@ public interface ContractInfoMapper extends BaseMapper<ContractInfo> {
 
     void updatefiledPaperTypeById(@Param("id") String id, @Param("status")String status);
 
-    List<WorkAttachment> findList(@Param("id") String id);
+    List<WorkAttachmentInfo> findList(@Param("id") String id);
 
     Integer findIsExit(@Param("id") String id, @Param("name")String name);
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/mapper/xml/ContractFileMapper.xml

@@ -16,7 +16,7 @@
             resultType="com.jeeplus.finance.contractRegistration.domain.ContractFile">
         SELECT * FROM `cw_work_contract_file` WHERE del_flag = 0 AND contract_info_id = #{id}
     </select>
-    <select id="findList" resultType="com.jeeplus.pubmodules.oss.domain.WorkAttachment">
+    <select id="findList" resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
         SELECT * FROM work_attachment WHERE del_flag = 0 AND attachment_id = #{id}
     </select>
     <select id="findIsExit" resultType="java.lang.Integer">
@@ -65,7 +65,7 @@
 			a.id = #{id}
 			AND a.del_flag = 0
     </select>
-    <select id="findDtos" resultType="com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto">
+    <select id="findDtos" resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
         SELECT
 			id,
 			url,

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/mapper/xml/ContractFilePaperMapper.xml

@@ -15,7 +15,7 @@
     <select id="getById" resultType="com.jeeplus.finance.contractRegistration.domain.ContractFilePaper">
         select * from cw_work_contract_file_paper where id = #{id}
     </select>
-    <select id="findList" resultType="com.jeeplus.pubmodules.oss.domain.WorkAttachment">
+    <select id="findList" resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
         SELECT * FROM work_attachment WHERE del_flag = 0 AND attachment_id = #{id}
     </select>
     <select id="findIsExit" resultType="java.lang.Integer">

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/mapper/xml/ContractInfoMapper.xml

@@ -141,7 +141,7 @@
 			a.id = #{id}
 			AND a.del_flag = 0
     </select>
-    <select id="findList" resultType="com.jeeplus.pubmodules.oss.domain.WorkAttachment">
+    <select id="findList" resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
         SELECT * FROM work_attachment WHERE del_flag = 0 AND attachment_id = #{id}
     </select>
     <select id="findIsExit" resultType="java.lang.Integer">
@@ -154,7 +154,7 @@
 			AND attachment_id = #{id}
 			AND attachment_name = #{name}
     </select>
-    <select id="findDtos" resultType="com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto">
+    <select id="findDtos" resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
         SELECT
 			id,
 			url,

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/service/ContractFilePaperService.java

@@ -1,25 +1,25 @@
 package com.jeeplus.finance.contractRegistration.service;
 
+import cn.hutool.extra.spring.SpringUtil;
+import com.alibaba.fastjson.JSON;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.finance.contractRegistration.domain.ContractFilePaper;
 import com.jeeplus.finance.contractRegistration.domain.ContractInfo;
 import com.jeeplus.finance.contractRegistration.mapper.ContractFilePaperMapper;
 import com.jeeplus.finance.contractRegistration.mapper.ContractInfoMapper;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
-import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
-import com.jeeplus.pubmodules.oss.service.OssService;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+//import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
+import com.jeeplus.sys.feign.IUserApi;
+import com.jeeplus.sys.feign.IWorkAttachmentApi;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.sys.utils.UserUtils;
 import org.flowable.editor.language.json.converter.util.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.beans.BeanUtils;
 
 import javax.annotation.Resource;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * @author: 王强
@@ -28,8 +28,8 @@ import java.util.UUID;
 @Service
 public class ContractFilePaperService {
 
-    @Resource
-    private OssServiceMapper ossServiceMapper;
+//    @Resource
+//    private OssServiceMapper ossServiceMapper;
 
     @Resource
     private ContractFilePaperMapper mapper;
@@ -37,9 +37,6 @@ public class ContractFilePaperService {
     @Resource
     private ContractInfoMapper infoMapper;
 
-    @Resource
-    private OssService ossService;
-
     public String saveInfo(ContractFilePaper filePaper) throws Exception {
 
         ContractFilePaper info = mapper.selectFilePaperByContractInfoId(filePaper.getId());
@@ -79,14 +76,15 @@ public class ContractFilePaperService {
     @Transactional(rollbackFor = Exception.class)
     public String update(ContractFilePaper filePaper, String id) {
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken (TokenProvider.getCurrentToken ( ));
+//        UserDTO userDTO = UserUtils.getCurrentUserDTO();
         ContractFilePaper file = new ContractFilePaper();
         BeanUtils.copyProperties(filePaper, file);
         file.setId(id);
         file.setUpdateById(userDTO.getId());
         file.setUpdateTime(new Date());
         mapper.updateById(file);
-        List<WorkAttachmentDto> list = filePaper.getContractProperList();
+        List<WorkAttachmentInfo> list = filePaper.getContractProperList();
         if (CollectionUtils.isNotEmpty(list)) {
             updateFiles(list, userDTO, file.getId(),filePaper.getContractInfoId());
         }else {
@@ -102,7 +100,8 @@ public class ContractFilePaperService {
     @Transactional(rollbackFor = Exception.class)
     public String add(ContractFilePaper filePaper) throws Exception{
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken (TokenProvider.getCurrentToken ( ));
+//        UserDTO userDTO = UserUtils.getCurrentUserDTO();
         String id = UUID.randomUUID().toString().replace("-", "");
         ContractFilePaper file = new ContractFilePaper();
         BeanUtils.copyProperties(filePaper, file);
@@ -112,11 +111,10 @@ public class ContractFilePaperService {
         file.setUpdateById(userDTO.getId());
         file.setUpdateTime(new Date());
         mapper.insert(file);
-        ossService.saveOrUpdateFileList(filePaper.getContractProperList(),id,"cwWorkContract");
-//        List<WorkAttachmentDto> list = filePaper.getContractProperList();
-//        if (CollectionUtils.isNotEmpty(list)) {
-//            saveFiles(list, userDTO, id);
-//        }
+        List<WorkAttachmentInfo> list = filePaper.getContractProperList();
+        if (CollectionUtils.isNotEmpty(list)) {
+            saveFiles(list, userDTO, id);
+        }
         return id;
     }
 
@@ -127,28 +125,29 @@ public class ContractFilePaperService {
      * @param id 关联id
      */
     @Transactional(rollbackFor = Exception.class)
-    public void updateFiles(List<WorkAttachmentDto> list, UserDTO userDTO, String id,String contractInfoId) {
+    public void updateFiles(List<WorkAttachmentInfo> list, UserDTO userDTO, String id,String contractInfoId) {
         int j = 1;
         String names = new String();
         //表中存在，但是传过来不存在，说明已删除，表中数据也要删除
-        for (WorkAttachmentDto dto : list) {
+        for (WorkAttachmentInfo dto : list) {
             names = names + "," +dto.getUrl();
         }
         //查询保存的附件信息
-        List<WorkAttachment> infoList = mapper.findList(id);
+        List<WorkAttachmentInfo> infoList = mapper.findList(id);
         if (CollectionUtils.isNotEmpty(infoList)) {
-            for (WorkAttachment i : infoList) {
+            for (WorkAttachmentInfo i : infoList) {
                 if (!names.contains(i.getUrl())) {
-                    ossServiceMapper.deleteById(i.getId());
+//                    ossServiceMapper.deleteById(i.getId());
+                    SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteById(i.getId());
                 }
             }
         }
         //保存信息
-        for (WorkAttachmentDto dto : list) {
+        for (WorkAttachmentInfo dto : list) {
             //判断是否存在
             Integer isExit = mapper.findIsExit(id, contractInfoId, dto.getName());
             if (isExit == 0) {
-                WorkAttachment i = new WorkAttachment();
+                WorkAttachmentInfo i = new WorkAttachmentInfo();
                 //包含了url、size、name
                 i.setId(UUID.randomUUID().toString().replace("-", ""));
 //                i.getCreateBy().setId(userDTO.getId());
@@ -167,7 +166,13 @@ public class ContractFilePaperService {
                 i.setAttachmentFlag("cwWorkContract");
                 i.setFileSize(dto.getSize());
                 i.setSort(j);
-                ossServiceMapper.insertWorkAttachment(i, userDTO);
+                Map<String,String> map = new HashMap<>();
+                String workAttachment = JSON.toJSONString((i));
+                String userDTOInfo = JSON.toJSONString((userDTO));
+                map.put("workAttachment",workAttachment);
+                map.put("userDTO",userDTOInfo);
+                SpringUtil.getBean ( IWorkAttachmentApi.class ).insertWorkAttachment(map);
+//                ossServiceMapper.insertWorkAttachment(i, userDTO);
                 j++;
             }
         }
@@ -180,10 +185,10 @@ public class ContractFilePaperService {
      * @param id 关联id
      */
     @Transactional(rollbackFor = Exception.class)
-    public void saveFiles(List<WorkAttachmentDto> list, UserDTO userDTO, String id) {
+    public void saveFiles(List<WorkAttachmentInfo> list, UserDTO userDTO, String id) {
         int j = 1;
-        for (WorkAttachmentDto dto : list) {
-            WorkAttachment i = new WorkAttachment();
+        for (WorkAttachmentInfo dto : list) {
+            WorkAttachmentInfo i = new WorkAttachmentInfo();
             //包含了url、size、name
             i.setId(UUID.randomUUID().toString().replace("-", ""));
 //            i.getCreateBy().setId(userDTO.getId());
@@ -202,7 +207,13 @@ public class ContractFilePaperService {
             i.setAttachmentFlag("cwWorkContract");
             i.setFileSize(dto.getSize());
             i.setSort(j);
-            ossServiceMapper.insertWorkAttachment(i, userDTO);
+            Map<String,String> map = new HashMap<>();
+            String workAttachment = JSON.toJSONString((i));
+            String userDTOInfo = JSON.toJSONString((userDTO));
+            map.put("workAttachment",workAttachment);
+            map.put("userDTO",userDTOInfo);
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).insertWorkAttachment(map);
+//            ossServiceMapper.insertWorkAttachment(i, userDTO);
             j++;
         }
     }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/service/ContractFileService.java

@@ -1,24 +1,26 @@
 package com.jeeplus.finance.contractRegistration.service;
 
+import cn.hutool.extra.spring.SpringUtil;
+import com.alibaba.fastjson.JSON;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.finance.contractRegistration.domain.ContractFile;
 import com.jeeplus.finance.contractRegistration.domain.ContractInfo;
 import com.jeeplus.finance.contractRegistration.mapper.ContractFileMapper;
 import com.jeeplus.finance.contractRegistration.mapper.ContractInfoMapper;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
-import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+//import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
+//import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
+import com.jeeplus.sys.feign.IUserApi;
+import com.jeeplus.sys.feign.IWorkAttachmentApi;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.sys.utils.UserUtils;
 import org.flowable.editor.language.json.converter.util.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * @author: 王强
@@ -33,8 +35,8 @@ public class ContractFileService {
     @Resource
     private ContractInfoMapper infoMapper;
 
-    @Resource
-    private OssServiceMapper ossServiceMapper;
+//    @Resource
+//    private OssServiceMapper ossServiceMapper;
 
     /**
      * 根据id修改status
@@ -73,7 +75,7 @@ public class ContractFileService {
     @Transactional(rollbackFor = Exception.class)
     public String add(ContractFile contractFile) throws Exception{
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         String id = UUID.randomUUID().toString().replace("-", "");
         ContractFile file = new ContractFile();
         BeanUtils.copyProperties(contractFile, file);
@@ -83,7 +85,7 @@ public class ContractFileService {
         file.setUpdateById(userDTO.getId());
         file.setUpdateTime(new Date());
         mapper.insert(file);
-        List<WorkAttachmentDto> list = contractFile.getContractInfoList();
+        List<WorkAttachmentInfo> list = contractFile.getContractInfoList();
         if (CollectionUtils.isNotEmpty(list)) {
             saveFiles(list, userDTO, id);
         }
@@ -96,14 +98,14 @@ public class ContractFileService {
     @Transactional(rollbackFor = Exception.class)
     public String update(ContractFile contractFile, String id) {
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         ContractFile file = new ContractFile();
         BeanUtils.copyProperties(contractFile, file);
         file.setId(id);
         file.setUpdateById(userDTO.getId());
         file.setUpdateTime(new Date());
         mapper.updateById(file);
-        List<WorkAttachmentDto> list = contractFile.getContractInfoList();
+        List<WorkAttachmentInfo> list = contractFile.getContractInfoList();
         if (CollectionUtils.isNotEmpty(list)) {
             updateFiles(list, userDTO, file.getId());
         }else {
@@ -120,18 +122,18 @@ public class ContractFileService {
         }
         if (dto != null){
             // 查询归档附件信息
-            List<WorkAttachmentDto> dtos = mapper.findDtos(dto.getFileId());
-            List<WorkAttachmentDto> contractInfoList = mapper.findDtos(dto.getContractInfoId());
+            List<WorkAttachmentInfo> dtos = mapper.findDtos(dto.getFileId());
+            List<WorkAttachmentInfo> contractInfoList = mapper.findDtos(dto.getContractInfoId());
 
             if (CollectionUtils.isNotEmpty(dtos)) {
-                for (WorkAttachmentDto i : dtos) {
-                    i.setCreateBy(UserUtils.get(i.getBy()));
+                for (WorkAttachmentInfo i : dtos) {
+                    i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                 }
                 dto.setContractInfoList(dtos);
             }
             if (CollectionUtils.isNotEmpty(contractInfoList)){
-                for (WorkAttachmentDto i : contractInfoList){
-                    i.setCreateBy(UserUtils.get(i.getBy()));
+                for (WorkAttachmentInfo i : contractInfoList){
+                    i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                 }
                 dto.setContractProperList(contractInfoList);
             }
@@ -151,28 +153,29 @@ public class ContractFileService {
      * @param id 关联id
      */
     @Transactional(rollbackFor = Exception.class)
-    public void updateFiles(List<WorkAttachmentDto> list, UserDTO userDTO, String id) {
+    public void updateFiles(List<WorkAttachmentInfo> list, UserDTO userDTO, String id) {
         int j = 1;
         String names = new String();
         //表中存在，但是传过来不存在，说明已删除，表中数据也要删除
-        for (WorkAttachmentDto dto : list) {
+        for (WorkAttachmentInfo dto : list) {
             names = names + "," +dto.getUrl();
         }
         //查询保存的附件信息
-        List<WorkAttachment> infoList = mapper.findList(id);
+        List<WorkAttachmentInfo> infoList = mapper.findList(id);
         if (CollectionUtils.isNotEmpty(infoList)) {
-            for (WorkAttachment i : infoList) {
+            for (WorkAttachmentInfo i : infoList) {
                 if (!names.contains(i.getUrl())) {
-                    ossServiceMapper.deleteById(i.getId());
+//                    ossServiceMapper.deleteById(i.getId());
+                    SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteById(i.getId());
                 }
             }
         }
         //保存信息
-        for (WorkAttachmentDto dto : list) {
+        for (WorkAttachmentInfo dto : list) {
             //判断是否存在
             Integer isExit = mapper.findIsExit(id, dto.getName());
             if (isExit == 0) {
-                WorkAttachment i = new WorkAttachment();
+                WorkAttachmentInfo i = new WorkAttachmentInfo();
                 //包含了url、size、name
                 i.setId(UUID.randomUUID().toString().replace("-", ""));
 //                i.getCreateBy().setId(userDTO.getId());
@@ -191,7 +194,13 @@ public class ContractFileService {
                 i.setAttachmentFlag("cwWorkContract");
                 i.setFileSize(dto.getSize());
                 i.setSort(j);
-                ossServiceMapper.insertWorkAttachment(i, userDTO);
+                Map<String,String> map = new HashMap<>();
+                String workAttachment = JSON.toJSONString((i));
+                String userDTOInfo = JSON.toJSONString((userDTO));
+                map.put("workAttachment",workAttachment);
+                map.put("userDTO",userDTOInfo);
+                SpringUtil.getBean ( IWorkAttachmentApi.class ).insertWorkAttachment(map);
+//                ossServiceMapper.insertWorkAttachment(i, userDTO);
                 j++;
             }
         }
@@ -203,10 +212,10 @@ public class ContractFileService {
      * @param id 关联id
      */
     @Transactional(rollbackFor = Exception.class)
-    public void saveFiles(List<WorkAttachmentDto> list, UserDTO userDTO, String id) {
+    public void saveFiles(List<WorkAttachmentInfo> list, UserDTO userDTO, String id) {
         int j = 1;
-        for (WorkAttachmentDto dto : list) {
-            WorkAttachment i = new WorkAttachment();
+        for (WorkAttachmentInfo dto : list) {
+            WorkAttachmentInfo i = new WorkAttachmentInfo();
             //包含了url、size、name
             i.setId(UUID.randomUUID().toString().replace("-", ""));
 //            i.getCreateBy().setId(userDTO.getId());
@@ -225,7 +234,13 @@ public class ContractFileService {
             i.setAttachmentFlag("cwWorkContract");
             i.setFileSize(dto.getSize());
             i.setSort(j);
-            ossServiceMapper.insertWorkAttachment(i, userDTO);
+            Map<String,String> map = new HashMap<>();
+            String workAttachment = JSON.toJSONString((i));
+            String userDTOInfo = JSON.toJSONString((userDTO));
+            map.put("workAttachment",workAttachment);
+            map.put("userDTO",userDTOInfo);
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).insertWorkAttachment(map);
+//            ossServiceMapper.insertWorkAttachment(i, userDTO);
             j++;
         }
     }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/service/ContractInfoService.java

@@ -2,12 +2,15 @@ package com.jeeplus.finance.contractRegistration.service;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.druid.sql.visitor.functions.If;
+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.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.domain.BaseEntity;
 import com.jeeplus.finance.contractRegistration.domain.ContractFile;
 import com.jeeplus.finance.contractRegistration.domain.ContractFilePaper;
@@ -20,13 +23,14 @@ import com.jeeplus.finance.contractRegistration.mapper.ContractParticipantMapper
 import com.jeeplus.finance.workClientInfo.domain.CwWorkClientBase;
 import com.jeeplus.finance.workClientInfo.service.CwWorkClientService;
 import com.jeeplus.finance.workClientInfo.service.dto.CwWorkClientBaseDTO;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
-import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
-import com.jeeplus.pubmodules.oss.service.OssService;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
-import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
+//import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
+//import com.jeeplus.pubmodules.oss.service.OssService;
+//import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
+import com.jeeplus.sys.feign.IUserApi;
+import com.jeeplus.sys.feign.IWorkAttachmentApi;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.sys.utils.UserUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.editor.language.json.converter.util.CollectionUtils;
 import org.springframework.beans.BeanUtils;
@@ -49,11 +53,11 @@ public class ContractInfoService {
     @Resource
     private ContractInfoMapper mapper;
 
-    @Resource
-    private SerialnumTplService serialnumTplService;
+//    @Resource
+//    private SerialnumTplService serialnumTplService;
 
-    @Resource
-    private OssServiceMapper ossServiceMapper;
+//    @Resource
+//    private OssServiceMapper ossServiceMapper;
 
     @Resource
     private ContractFileMapper fileMapper;
@@ -67,8 +71,8 @@ public class ContractInfoService {
     @Resource
     private CwWorkClientService cwWorkClientService;
 
-    @Resource
-    private OssService ossService;
+//    @Resource
+//    private OssService ossService;
 
     /**
      * 根据id修改status
@@ -88,8 +92,8 @@ public class ContractInfoService {
      */
     public void updatePaperInfo(ContractInfo info) {
         mapper.updatePaperInfo(info.getId(), info.getActualContractAmount(),info.getContractApprovalType(), info.getFiledPaperType());
-        List<WorkAttachmentDto> list = info.getContractInfoList();
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        List<WorkAttachmentInfo> list = info.getContractInfoList();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         if (CollectionUtils.isNotEmpty(list)) {
             updateFiles(list, userDTO, info.getId());
         }
@@ -170,7 +174,7 @@ public class ContractInfoService {
 
         StringBuilder officeIds = new StringBuilder();
         List<String> manageOfficeIdList= Lists.newArrayList();
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         //判定是否为会计所长
         /*if(CommonUtils.haveRoleKjsz()){
             //获取当前人管理的部门id
@@ -209,10 +213,10 @@ public class ContractInfoService {
         if (dto != null){
             dto.setContractStatus("新创建");
             // 查询附件信息
-            List<WorkAttachmentDto> dtos = mapper.findDtos(id);
+            List<WorkAttachmentInfo> dtos = mapper.findDtos(id);
             if (CollectionUtils.isNotEmpty(dtos)) {
-                for (WorkAttachmentDto i : dtos) {
-                    i.setCreateBy(UserUtils.get(i.getBy()));
+                for (WorkAttachmentInfo i : dtos) {
+                    i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                 }
             }
             dto.setContractProperList(dtos);
@@ -227,16 +231,16 @@ public class ContractInfoService {
     public ContractInfo findById(String id) {
 
         ContractInfo dto = mapper.findById(id);
-        List<WorkAttachmentDto> fileList = Lists.newArrayList();
+        List<WorkAttachmentInfo> fileList = Lists.newArrayList();
 
         if (dto != null){
             List<ContractParticipant> participant = participantMapper.findByInfoId(dto.getId());
             dto.setContractStatus("新创建");
             // 查询附件信息
-            List<WorkAttachmentDto> dtos = mapper.findDtos(id);
+            List<WorkAttachmentInfo> dtos = mapper.findDtos(id);
             if (CollectionUtils.isNotEmpty(dtos)) {
-                for (WorkAttachmentDto i : dtos) {
-                    i.setCreateBy(UserUtils.get(i.getBy()));
+                for (WorkAttachmentInfo i : dtos) {
+                    i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                 }
             }
             fileList.addAll(dtos);
@@ -254,9 +258,9 @@ public class ContractInfoService {
 //            ContractFile file = fileMapper.getInfoByConId(dto.getId());
 //            if (null != file){
 //                //查归档附件信息
-//                List<WorkAttachmentDto> fileDtos = mapper.findDtos(file.getId());
+//                List<WorkAttachmentInfo> fileDtos = mapper.findDtos(file.getId());
 //                if (CollectionUtils.isNotEmpty(fileDtos)) {
-//                    for (WorkAttachmentDto i : fileDtos) {
+//                    for (WorkAttachmentInfo i : fileDtos) {
 //                        i.setCreateBy(UserUtils.get(i.getBy()));
 //                    }
 //                    dto.setContractInfoList(fileDtos);
@@ -266,10 +270,10 @@ public class ContractInfoService {
             ContractFilePaper filePaper = paperMapper.selectFilePaperByContractInfoId(id);
             if (null != filePaper){
                 //查归档附件信息
-                List<WorkAttachmentDto> fileDtos = mapper.findDtos(filePaper.getId());
+                List<WorkAttachmentInfo> fileDtos = mapper.findDtos(filePaper.getId());
                 if (CollectionUtils.isNotEmpty(fileDtos)) {
-                    for (WorkAttachmentDto i : fileDtos) {
-                        i.setCreateBy(UserUtils.get(i.getBy()));
+                    for (WorkAttachmentInfo i : fileDtos) {
+                        i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                     }
                     fileList.addAll(fileDtos);
                     //dto.setContractInfoList(fileDtos);
@@ -287,10 +291,10 @@ public class ContractInfoService {
                     List<ContractParticipant> participant = participantMapper.findByInfoId(dto.getId());
                     dto.setContractStatus("新创建");
                     // 查询附件信息
-                    List<WorkAttachmentDto> dtos = mapper.findDtos(dto.getId());
+                    List<WorkAttachmentInfo> dtos = mapper.findDtos(dto.getId());
                     if (CollectionUtils.isNotEmpty(dtos)) {
-                        for (WorkAttachmentDto i : dtos) {
-                            i.setCreateBy(UserUtils.get(i.getBy()));
+                        for (WorkAttachmentInfo i : dtos) {
+                            i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                         }
                     }
                     fileList.addAll(dtos);
@@ -306,10 +310,10 @@ public class ContractInfoService {
                     }
                     if (null != infoByConId){
                         //查归档附件信息
-                        List<WorkAttachmentDto> fileDtos = mapper.findDtos(id);
+                        List<WorkAttachmentInfo> fileDtos = mapper.findDtos(id);
                         if (CollectionUtils.isNotEmpty(fileDtos)) {
-                            for (WorkAttachmentDto i : fileDtos) {
-                                i.setCreateBy(UserUtils.get(i.getBy()));
+                            for (WorkAttachmentInfo i : fileDtos) {
+                                i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                             }
                             fileList.addAll(fileDtos);
                             //dto.setContractInfoList(fileDtos);
@@ -329,10 +333,10 @@ public class ContractInfoService {
                         List<ContractParticipant> participant = participantMapper.findByInfoId(dto.getId());
                         dto.setContractStatus("新创建");
                         // 查询合同登记附件信息
-                        List<WorkAttachmentDto> dtos = mapper.findDtos(dto.getId());
+                        List<WorkAttachmentInfo> dtos = mapper.findDtos(dto.getId());
                         if (CollectionUtils.isNotEmpty(dtos)) {
-                            for (WorkAttachmentDto i : dtos) {
-                                i.setCreateBy(UserUtils.get(i.getBy()));
+                            for (WorkAttachmentInfo i : dtos) {
+                                i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                             }
                         }
                         fileList.addAll(dtos);
@@ -347,10 +351,10 @@ public class ContractInfoService {
 
                         }
                         //查归档附件信息
-                        List<WorkAttachmentDto> fileDtos = mapper.findDtos(filePaper.getId());
+                        List<WorkAttachmentInfo> fileDtos = mapper.findDtos(filePaper.getId());
                         if (CollectionUtils.isNotEmpty(fileDtos)) {
-                            for (WorkAttachmentDto i : fileDtos) {
-                                i.setCreateBy(UserUtils.get(i.getBy()));
+                            for (WorkAttachmentInfo i : fileDtos) {
+                                i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                             }
                             fileList.addAll(fileDtos);
                             //dto.setContractInfoList(fileDtos);
@@ -359,9 +363,9 @@ public class ContractInfoService {
 //                        ContractFile contractFile = fileMapper.getInfoByConId(dto.getId());
 //                        if (null != contractFile){
 //                            //查归档附件信息
-//                            List<WorkAttachmentDto> fileDtos = mapper.findDtos(contractFile.getId());
+//                            List<WorkAttachmentInfo> fileDtos = mapper.findDtos(contractFile.getId());
 //                            if (CollectionUtils.isNotEmpty(fileDtos)) {
-//                                for (WorkAttachmentDto i : fileDtos) {
+//                                for (WorkAttachmentInfo i : fileDtos) {
 //                                    i.setCreateBy(UserUtils.get(i.getBy()));
 //                                }
 //                                dto.setContractInfoList(fileDtos);
@@ -389,10 +393,10 @@ public class ContractInfoService {
             List<ContractParticipant> participant = participantMapper.findByInfoId(dto.getId());
             dto.setContractStatus("新创建");
             // 查询附件信息
-            List<WorkAttachmentDto> dtos = mapper.findDtos(id);
+            List<WorkAttachmentInfo> dtos = mapper.findDtos(id);
             if (CollectionUtils.isNotEmpty(dtos)) {
-                for (WorkAttachmentDto i : dtos) {
-                    i.setCreateBy(UserUtils.get(i.getBy()));
+                for (WorkAttachmentInfo i : dtos) {
+                    i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                 }
             }
             List<CwWorkClientBaseDTO> list = new ArrayList<>();
@@ -409,10 +413,10 @@ public class ContractInfoService {
             ContractFile file = fileMapper.getInfoByConId(dto.getId());
             if (null != file){
                 //查归档附件信息
-                List<WorkAttachmentDto> fileDtos = mapper.findDtos(file.getId());
+                List<WorkAttachmentInfo> fileDtos = mapper.findDtos(file.getId());
                 if (CollectionUtils.isNotEmpty(fileDtos)) {
-                    for (WorkAttachmentDto i : fileDtos) {
-                        i.setCreateBy(UserUtils.get(i.getBy()));
+                    for (WorkAttachmentInfo i : fileDtos) {
+                        i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                     }
                     dto.setContractInfoList(fileDtos);
                 }
@@ -470,7 +474,7 @@ public class ContractInfoService {
     @Transactional(rollbackFor = Exception.class)
     public String update(ContractInfo info) throws Exception{
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
 
         ContractInfo contractInfo = new ContractInfo();
         BeanUtils.copyProperties(info, contractInfo);
@@ -479,19 +483,20 @@ public class ContractInfoService {
 
         //合同编号生成
         String serialNum = "";
+        String currentToken = TokenProvider.getCurrentToken();
         if (StringUtils.isNotBlank(contractInfo.getContractType()) && StringUtils.isBlank(contractInfo.getContractNo())){
             if (contractInfo.getContractType().equals("1")){
-                serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.SERIAL_NUMBER1);
+                serialNum = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.SERIAL_NUMBER1,currentToken);
             } else if (contractInfo.getContractType().equals("2")) {
-                serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.SERIAL_NUMBER2);
+                serialNum = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.SERIAL_NUMBER2,currentToken);
             } else if (contractInfo.getContractType().equals("3")) {
-                serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.SERIAL_NUMBER3);
+                serialNum = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.SERIAL_NUMBER3,currentToken);
             } else if (contractInfo.getContractType().equals("4")) {
-                serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.SERIAL_NUMBER4);
+                serialNum = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.SERIAL_NUMBER4,currentToken);
             } else if (contractInfo.getContractType().equals("5")) {
-                serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.SERIAL_NUMBER5);
+                serialNum = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.SERIAL_NUMBER5,currentToken);
             } else if (contractInfo.getContractType().equals("6")) {
-                serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.SERIAL_NUMBER6);
+                serialNum = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.SERIAL_NUMBER6,currentToken);
             }
             contractInfo.setContractNo(serialNum);
         }
@@ -545,7 +550,7 @@ public class ContractInfoService {
             }
         }
 
-        List<WorkAttachmentDto> list = info.getContractProperList();
+        List<WorkAttachmentInfo> list = info.getContractProperList();
         if (CollectionUtils.isNotEmpty(list)) {
             updateFiles(list, userDTO, info.getId());
         }
@@ -559,24 +564,25 @@ public class ContractInfoService {
     @Transactional(rollbackFor = Exception.class)
     public String add(ContractInfo contractInfo) throws Exception{
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
+        String currentToken = TokenProvider.getCurrentToken();
         //合同流水号生成
-        String serialNumber = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.BIZ_CODE);
+        String serialNumber = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.BIZ_CODE,currentToken);
         //合同编号生成
         String serialNum = "";
         if (StringUtils.isNotEmpty(contractInfo.getContractType())){
             if (contractInfo.getContractType().equals("1")){
-                serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.SERIAL_NUMBER1);
+                serialNum = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.SERIAL_NUMBER1,currentToken);
             } else if (contractInfo.getContractType().equals("2")) {
-                serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.SERIAL_NUMBER2);
+                serialNum = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.SERIAL_NUMBER2,currentToken);
             } else if (contractInfo.getContractType().equals("3")) {
-                serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.SERIAL_NUMBER3);
+                serialNum = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.SERIAL_NUMBER3,currentToken);
             } else if (contractInfo.getContractType().equals("4")) {
-                serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.SERIAL_NUMBER4);
+                serialNum = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.SERIAL_NUMBER4,currentToken);
             } else if (contractInfo.getContractType().equals("5")) {
-                serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.SERIAL_NUMBER5);
+                serialNum = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.SERIAL_NUMBER5,currentToken);
             } else if (contractInfo.getContractType().equals("6")) {
-                serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.SERIAL_NUMBER6);
+                serialNum = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), ContractInfo.SERIAL_NUMBER6,currentToken);
             }
             contractInfo.setContractSerialNumber(serialNumber);
         }
@@ -611,11 +617,10 @@ public class ContractInfoService {
                 });
             }
         }
-        ossService.saveOrUpdateFileList(contractInfo.getContractProperList(),id,"cwWorkContract");
-//        List<WorkAttachmentDto> list = contractInfo.getContractProperList();
-//        if (CollectionUtils.isNotEmpty(list)) {
-//            saveFiles(list, userDTO, id);
-//        }
+        List<WorkAttachmentInfo> list = contractInfo.getContractProperList();
+        if (CollectionUtils.isNotEmpty(list)) {
+            saveFiles(list, userDTO, id);
+        }
 
         return id;
     }
@@ -627,10 +632,10 @@ public class ContractInfoService {
      * @param id 关联id
      */
     @Transactional(rollbackFor = Exception.class)
-    public void saveFiles(List<WorkAttachmentDto> list, UserDTO userDTO, String id) {
+    public void saveFiles(List<WorkAttachmentInfo> list, UserDTO userDTO, String id) {
         int j = 1;
-        for (WorkAttachmentDto dto : list) {
-            WorkAttachment i = new WorkAttachment();
+        for (WorkAttachmentInfo dto : list) {
+            WorkAttachmentInfo i = new WorkAttachmentInfo();
             //包含了url、size、name
             i.setId(UUID.randomUUID().toString().replace("-", ""));
 //            i.getCreateBy().setId(userDTO.getId());
@@ -649,7 +654,13 @@ public class ContractInfoService {
             i.setAttachmentFlag("cwWorkContract");
             i.setFileSize(dto.getSize());
             i.setSort(j);
-            ossServiceMapper.insertWorkAttachment(i, userDTO);
+//            ossServiceMapper.insertWorkAttachment(i, userDTO);
+            Map<String,String> map = new HashMap<>();
+            String workAttachment = JSON.toJSONString((i));
+            String userDTOInfo = JSON.toJSONString((userDTO));
+            map.put("workAttachment",workAttachment);
+            map.put("userDTO",userDTOInfo);
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).insertWorkAttachment(map);
             j++;
         }
     }
@@ -661,28 +672,29 @@ public class ContractInfoService {
      * @param id 关联id
      */
     @Transactional(rollbackFor = Exception.class)
-    public void updateFiles(List<WorkAttachmentDto> list, UserDTO userDTO, String id) {
+    public void updateFiles(List<WorkAttachmentInfo> list, UserDTO userDTO, String id) {
         int j = 1;
         String names = new String();
         //表中存在，但是传过来不存在，说明已删除，表中数据也要删除
-        for (WorkAttachmentDto dto : list) {
+        for (WorkAttachmentInfo dto : list) {
             names = names + "," +dto.getUrl();
         }
         //查询保存的附件信息
-        List<WorkAttachment> infoList = mapper.findList(id);
+        List<WorkAttachmentInfo> infoList = mapper.findList(id);
         if (CollectionUtils.isNotEmpty(infoList)) {
-            for (WorkAttachment i : infoList) {
+            for (WorkAttachmentInfo i : infoList) {
                 if (!names.contains(i.getUrl())) {
-                    ossServiceMapper.deleteById(i.getId());
+//                    ossServiceMapper.deleteById(i.getId());
+                    SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteById(i.getId());
                 }
             }
         }
         //保存信息
-        for (WorkAttachmentDto dto : list) {
+        for (WorkAttachmentInfo dto : list) {
             //判断是否存在
             Integer isExit = mapper.findIsExit(id, dto.getName());
             if (isExit == 0) {
-                WorkAttachment i = new WorkAttachment();
+                WorkAttachmentInfo i = new WorkAttachmentInfo();
                 //包含了url、size、name
                 i.setId(UUID.randomUUID().toString().replace("-", ""));
 //                i.getCreateBy().setId(userDTO.getId());
@@ -701,7 +713,13 @@ public class ContractInfoService {
                 i.setAttachmentFlag("cwWorkContract");
                 i.setFileSize(dto.getSize());
                 i.setSort(j);
-                ossServiceMapper.insertWorkAttachment(i, userDTO);
+                Map<String,String> map = new HashMap<>();
+                String workAttachment = JSON.toJSONString((i));
+                String userDTOInfo = JSON.toJSONString((userDTO));
+                map.put("workAttachment",workAttachment);
+                map.put("userDTO",userDTOInfo);
+                SpringUtil.getBean ( IWorkAttachmentApi.class ).insertWorkAttachment(map);
+//                ossServiceMapper.insertWorkAttachment(i, userDTO);
                 j++;
             }
         }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/service/CwWorkContractBorrowService.java

@@ -1,6 +1,8 @@
 package com.jeeplus.finance.contractRegistration.service;
 
+import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.finance.contractRegistration.domain.CwWorkContractBorrow;
 import com.jeeplus.finance.contractRegistration.domain.CwWorkContractBorrowMessage;
 import com.jeeplus.finance.contractRegistration.mapper.ContractInfoMapper;
@@ -10,10 +12,13 @@ import com.jeeplus.finance.contractRegistration.service.dto.CwWorkContractBorrow
 //先注释import com.jeeplus.flowable.model.MyNoticeList;
 //import com.jeeplus.flowable.service.MyNoticeService;
 import com.jeeplus.flowable.feign.IFlowableApi;
-import com.jeeplus.sys.service.UserService;
+import com.jeeplus.sys.feign.IDictApi;
+import com.jeeplus.sys.feign.ITenantApi;
+import com.jeeplus.sys.feign.IUserApi;
+//import com.jeeplus.sys.service.UserService;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.DictUtils;
-import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.sys.utils.DictUtils;
+//import com.jeeplus.sys.utils.UserUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.bpmn.model.FlowNode;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,8 +52,8 @@ public class CwWorkContractBorrowService {
     @Resource
     private IFlowableApi flowTaskService;
 
-    @Resource
-    private UserService userService;
+//    @Resource
+//    private UserService userService;
 
     public String saveInfo(CwWorkContractBorrowDto workContractBorrowDto) throws Exception {
         if (StringUtils.isNotEmpty(workContractBorrowDto.getId())) {
@@ -67,7 +72,7 @@ public class CwWorkContractBorrowService {
     @Transactional(rollbackFor = Exception.class)
     public String add(CwWorkContractBorrowDto workContractBorrowDto) throws Exception{
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         String id = UUID.randomUUID().toString().replace("-", "");
         CwWorkContractBorrow borrow = new CwWorkContractBorrow();
         BeanUtils.copyProperties(workContractBorrowDto, borrow);
@@ -88,7 +93,7 @@ public class CwWorkContractBorrowService {
     @Transactional(rollbackFor = Exception.class)
     public String update(CwWorkContractBorrowDto workContractBorrowDto, String id) {
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         CwWorkContractBorrow borrow = new CwWorkContractBorrow();
         BeanUtils.copyProperties(workContractBorrowDto, borrow);
         borrow.setContractInfoId(id);
@@ -133,7 +138,7 @@ public class CwWorkContractBorrowService {
      */
     public void saveMessage (CwWorkContractBorrowDto workContractBorrowDto, String id) {
         //保存借用信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         CwWorkContractBorrowMessage message = new CwWorkContractBorrowMessage();
         BeanUtils.copyProperties(workContractBorrowDto, message);
         String messageId = UUID.randomUUID().toString().replace("-", "");
@@ -185,7 +190,8 @@ public class CwWorkContractBorrowService {
      * @return
      */
     public List<CwWorkContractBorrowMessage> getAdventMessageList() {
-        String adventDay = DictUtils.getDictLabel("advent_day", "cw_borrow_advent", "");
+        String adventDay = SpringUtil.getBean ( IDictApi.class ).getDictLabel("advent_day", "cw_borrow_advent", "");
+//        String adventDay = DictUtils.getDictLabel("advent_day", "cw_borrow_advent", "");
         adventDay = "-" + adventDay;
         List<CwWorkContractBorrowMessage> adventMessageList = borrowMapper.getAdventMessageList(adventDay);
         if(null != adventMessageList && adventMessageList.size()>0){
@@ -212,7 +218,8 @@ public class CwWorkContractBorrowService {
 
                 Set<String> noticeUserSet = new HashSet<String>();
                 if(StringUtils.isNotBlank(info.getBorrowName())){
-                    UserDTO borrowUser = userService.getUserByName(info.getBorrowName());
+                    String tenantId = SpringUtil.getBean ( ITenantApi.class ).getCurrentTenantId ( );
+                    UserDTO borrowUser = SpringUtil.getBean ( IUserApi.class ).getByLoginName(info.getBorrowName(),tenantId);
                     if(null != borrowUser && StringUtils.isNotBlank(borrowUser.getId())){
                         noticeUserSet.add(borrowUser.getId());
                     }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/controller/CwFinanceInvoiceController.java

@@ -15,8 +15,8 @@ import com.jeeplus.finance.invoice.util.EasyPoiUtil;
 import com.jeeplus.flowable.feign.IFlowableApi;
 import com.jeeplus.logging.annotation.ApiLog;
 import com.jeeplus.logging.constant.enums.LogTypeEnum;
-import com.jeeplus.sys.utils.DictUtils;
-import com.jeeplus.sys.utils.SpringContextHolder;
+//import com.jeeplus.sys.utils.DictUtils;
+//import com.jeeplus.sys.utils.SpringContextHolder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/mapper/xml/CwFinanceInvoiceMapper.xml

@@ -50,10 +50,10 @@
             <collection property="financeInvoiceReceivablesDTOList" column="id" select="getFirList" ofType="com.jeeplus.finance.invoice.service.dto.CwFinanceInvoiceReceivablesDTO"></collection>
             <collection property="financeInvoiceBaseDTOList" column="id" select="getBaseList" ofType="com.jeeplus.finance.invoice.service.dto.CwFinanceInvoiceBaseDTO"></collection>
             <collection property="financeInvoiceDetailDTOList" column="id" select="getFidList" ofType="com.jeeplus.finance.invoice.service.dto.CwFinanceInvoiceDetailDTO"></collection>
-            <collection property="workAttachmentDtoList" ofType="com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto" column="id" select="getFileList"></collection>
+            <collection property="workAttachmentDtoList" ofType="com.jeeplus.sys.domain.WorkAttachmentInfo" column="id" select="getFileList"></collection>
     </resultMap>
 
-    <resultMap id="AttachmentMap" type="com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto">
+    <resultMap id="AttachmentMap" type="com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO">
         <id property="id" column="id" jdbcType="VARCHAR"/>
         <result property="createBy.id" column="create_by_id" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/CwFinanceInvoiceService.java

@@ -2,12 +2,15 @@ package com.jeeplus.finance.invoice.service;
 
 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.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.finance.invoice.domain.*;
 import com.jeeplus.finance.invoice.mapper.*;
@@ -20,13 +23,15 @@ import com.jeeplus.finance.workClientInfo.domain.CwWorkClientBase;
 import com.jeeplus.finance.workClientInfo.domain.CwWorkClientBilling;
 import com.jeeplus.finance.workClientInfo.service.CwWorkClientBillingService;
 import com.jeeplus.finance.workClientInfo.service.CwWorkClientService;
-import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
-import com.jeeplus.pubmodules.oss.service.OssService;
-import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
+//import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
+//import com.jeeplus.pubmodules.oss.service.OssService;
+//import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
 import com.jeeplus.sys.domain.User;
-import com.jeeplus.sys.service.UserService;
+import com.jeeplus.sys.feign.IUserApi;
+import com.jeeplus.sys.feign.IWorkAttachmentApi;
+//import com.jeeplus.sys.service.UserService;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.sys.utils.UserUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@@ -53,14 +58,14 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
     private CwFinanceInvoiceReceivablesMapper cwFinanceInvoiceReceivablesMapper;
     @Resource
     private CwFinanceInvoiceInvalidMapper cwFinanceInvoiceInvalidMapper;
-    @Resource
-    private SerialnumTplService serialnumTplService;
-    @Resource
-    private OssServiceMapper ossServiceMapper;
-    @Resource
-    private UserService userService;
-    @Resource
-    private OssService ossService;
+//    @Resource
+//    private SerialnumTplService serialnumTplService;
+//    @Resource
+//    private OssServiceMapper ossServiceMapper;
+//    @Resource
+//    private UserService userService;
+//    @Resource
+//    private OssService ossService;
     @Resource
     private CwWorkClientBillingService cwWorkClientBillingService;
     @Resource
@@ -224,7 +229,7 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
             }
             // 对账人
             if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getReconciliationPeopleName())) {
-                List<User> users = userService.list(new QueryWrapper<User>().lambda().like(User::getName, cwFinanceInvoiceDTO.getReconciliationPeopleName()));
+                List<User> users = SpringUtil.getBean ( IUserApi.class ).selectListByName(cwFinanceInvoiceDTO.getReconciliationPeopleName());
                 List<String> userIdList = users.stream().distinct().map(User::getId).collect(Collectors.toList());
                 if (CollectionUtil.isNotEmpty(userIdList)) {
                     queryWrapper.in("fi.reconciliation_people",userIdList);
@@ -234,7 +239,7 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
             }
             // 经办人部门
             if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getOperatorOffice())){
-                List<User> userList = userService.getUserByOfficeAll(cwFinanceInvoiceDTO.getOperatorOffice());
+                List<User> userList = SpringUtil.getBean ( IUserApi.class ).getUserByOfficeAll(cwFinanceInvoiceDTO.getOperatorOffice());
                 if (CollectionUtil.isNotEmpty(userList)) {
                     List<String> userIdList = userList.stream().distinct().map(User::getId).collect(Collectors.toList());
                     if (CollectionUtil.isNotEmpty(userIdList)) {
@@ -258,7 +263,7 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
         // 如果当前用户是部门主任，则可以查看部门所有的项目、自己创建的项目以及所属项目组的项目
         // 如果当前用户是员工，则可以查看自己创建的项目以及所属项目组的项目
         StringBuilder officeIds = new StringBuilder();
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+//        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         List<String> manageOfficeIdList= Lists.newArrayList();
         //判定是否为会计所长
         /*if(CommonUtils.haveRoleKjsz()){
@@ -315,9 +320,9 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
         if (ObjectUtil.isNotEmpty(cwFinanceInvoice)) {
             if(StringUtils.isBlank(cwFinanceInvoice.getId())){
                 //获取当前登录人信息
-                UserDTO userDTO = UserUtils.getCurrentUserDTO();
+                UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
                 //发票编号生成
-                String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), CwFinanceInvoiceDTO.BIZ_CODE);
+                String serialNum = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), CwFinanceInvoiceDTO.BIZ_CODE,TokenProvider.getCurrentToken());
                 cwFinanceInvoice.setNo(serialNum);
                 if (StringUtils.isBlank(cwFinanceInvoice.getInvalidStatus())){
                     cwFinanceInvoice.setInvalidStatus("0");
@@ -372,7 +377,16 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
                         .eq(CwFinanceInvoiceBase::getInvoiceId, cwFinanceInvoice.getId()));
             }
             // 附件
-            ossService.saveOrUpdateFileList(cwFinanceInvoiceDTO.getWorkAttachmentDtoList(), cwFinanceInvoice.getId(),"cw_invoice");
+            Map<String,String> map = new HashMap<>();
+            String fileList = JSON.toJSONString((cwFinanceInvoiceDTO.getWorkAttachmentDtoList()));
+            String attachmentId = cwFinanceInvoice.getId();
+            String attachmentFlag = "cw_invoice";
+            map.put("fileList",fileList);
+            map.put("attachmentId",attachmentId);
+            map.put("attachmentFlag",attachmentFlag);
+            map.put("currentToken", TokenProvider.getCurrentToken ( ));
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).saveOrUpdateFileList(map);
+
             // 发票明细保存
             if(CollectionUtil.isNotEmpty(cwFinanceInvoiceDTO.getFinanceInvoiceDetailDTOList())){
                 List<String> delIds = cwFinanceInvoiceDTO.getFinanceInvoiceDetailDTOList().stream().distinct().filter(item -> {

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/dto/CwFinanceInvoiceDTO.java

@@ -4,7 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.service.dto.BaseDTO;
 import com.jeeplus.finance.projectRecords.service.dto.CwProjectRecordsDTO;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -232,7 +232,7 @@ public class CwFinanceInvoiceDTO extends BaseDTO {
     /**
      * 附件信息
      */
-    private List<WorkAttachmentDto> workAttachmentDtoList;
+    private List<WorkAttachmentInfo> workAttachmentDtoList;
 
     /**
      * 发票明细

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/dto/DictTypeInfoDTO.java

@@ -0,0 +1,39 @@
+/**
+ * Copyright &copy; 2021-2026 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.finance.invoice.service.dto;
+
+import com.google.common.collect.Lists;
+import com.jeeplus.core.service.dto.BaseDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * 数据字典Entity
+ *
+ * @author lgf
+ * @version 2021-01-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DictTypeInfoDTO extends BaseDTO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 类型
+     */
+    private String type;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 子表列表
+     */
+    private List <DictValueInfoDTO> dictValueDTOList = Lists.newArrayList ( );
+}

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/dto/DictValueInfoDTO.java

@@ -0,0 +1,57 @@
+/**
+ * Copyright &copy; 2021-2026 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.finance.invoice.service.dto;
+
+
+import com.jeeplus.core.service.dto.BaseDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 数据字典Entity
+ *
+ * @author lgf
+ * @version 2021-05-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DictValueInfoDTO extends BaseDTO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 标签页
+     */
+    private String label;
+
+    /**
+     * 键值
+     */
+    private String value;
+
+    /**
+     * 排序
+     */
+    private String sort;
+
+    /**
+     * 字典类型
+     */
+    private DictTypeInfoDTO dictTypeDTO;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 构造函数
+     *
+     * @param dictTypeDTO
+     */
+    public DictValueInfoDTO(DictTypeInfoDTO dictTypeDTO) {
+        this.dictTypeDTO = dictTypeDTO;
+    }
+
+}

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/util/ExcelDiceAddressListHandlerImpl.java

@@ -2,8 +2,15 @@ package com.jeeplus.finance.invoice.util;
 
 import cn.afterturn.easypoi.handler.inter.IExcelDictHandler;
 import cn.hutool.core.util.ObjectUtil;
-import com.jeeplus.sys.service.dto.DictValueDTO;
-import com.jeeplus.sys.utils.DictUtils;
+import cn.hutool.extra.spring.SpringUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.jeeplus.finance.invoice.service.dto.DictValueInfoDTO;
+import com.jeeplus.sys.feign.IDictApi;
+import com.jeeplus.sys.feign.IUserApi;
+//import com.jeeplus.sys.utils.DictUtils;
+//import com.jeeplus.sys.service.dto.DictValueDTO;
+//import com.jeeplus.sys.utils.DictUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,7 +45,9 @@ public class ExcelDiceAddressListHandlerImpl implements IExcelDictHandler {
 //        dictMap.put("dictKey", "1");
 //        dictMap.put("dictValue", "深度富有");
 //        list.add(dictMap);
-        List<DictValueDTO> dictValueDTOs = DictUtils.getDictMap ().get (dict);
+        String datas = SpringUtil.getBean ( IDictApi.class ).getDictMap (dict);
+        List<DictValueInfoDTO> dictValueDTOs = JSON.parseObject(datas, new TypeReference<List<DictValueInfoDTO>>() {});
+//        List<DictValueInfoDTO> dictValueDTOs = DictUtils.getDictMap ().get (dict);
         dictValueDTOs.forEach (dictValueDTO -> {
             Map<String, String> dictMap = new HashMap<> ();
             dictMap.put ("dictKey", dictValueDTO.getValue ());
@@ -51,7 +60,7 @@ public class ExcelDiceAddressListHandlerImpl implements IExcelDictHandler {
     @Override
     public String toName(String dict, Object obj, String name, Object value) {
         if (ObjectUtil.isNotEmpty(value)) {
-            return DictUtils.getDictLabel (value.toString (), dict, null);
+            return SpringUtil.getBean ( IDictApi.class ).getDictLabel (value.toString (), dict, null);
         }
         return "";
     }
@@ -59,7 +68,7 @@ public class ExcelDiceAddressListHandlerImpl implements IExcelDictHandler {
     @Override
     public String toValue(String dict, Object obj, String name, Object value) {
         if (ObjectUtil.isNotEmpty(value)) {
-            return DictUtils.getDictLabel (value.toString (), dict, null);
+            return SpringUtil.getBean ( IDictApi.class ).getDictLabel (value.toString (), dict, null);
         }
         return "";
     }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/util/FlowTaskUtil.java

@@ -1,7 +1,7 @@
 package com.jeeplus.finance.invoice.util;
 
 import com.jeeplus.flowable.feign.IFlowableApi;
-import com.jeeplus.sys.utils.SpringContextHolder;
+//import com.jeeplus.sys.utils.SpringContextHolder;
 //import org.flowable.task.api.Task;
 
 import javax.annotation.Resource;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/util/SignaturePostUtil.java

@@ -3,7 +3,7 @@ package com.jeeplus.finance.invoice.util;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.jeeplus.finance.invoice.domain.SealUserInfo;
-import com.jeeplus.sys.utils.Global;
+//import com.jeeplus.sys.utils.Global;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
@@ -46,7 +46,7 @@ public class SignaturePostUtil {
     private static final String HTTPTOP = "http://192.168.2.130:9182";
 
     private final static String apptoken = "uIJQmTwyGJ";
-    private final static String appsecret = Global.getConfig("appsecret");
+//    private final static String appsecret = Global.getConfig("appsecret");
     private final static String signature = "232a44ee9ebd251d119f0a65628f678e";
 
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/controller/CwProjectRecordsController.java

@@ -1,6 +1,7 @@
 package com.jeeplus.finance.projectRecords.controller;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.common.excel.ExcelOptions;
@@ -11,7 +12,8 @@ import com.jeeplus.finance.projectRecords.service.CwProjectRecordsService;
 import com.jeeplus.finance.projectRecords.service.dto.CwProjectRecordsDTO;
 import com.jeeplus.logging.annotation.ApiLog;
 import com.jeeplus.logging.constant.enums.LogTypeEnum;
-import com.jeeplus.sys.utils.DictUtils;
+//import com.jeeplus.sys.utils.DictUtils;
+import com.jeeplus.sys.feign.IDictApi;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -168,7 +170,7 @@ public class CwProjectRecordsController {
         }
         result.stream().forEach(item -> {
             if (StringUtils.isNotBlank(item.getStatus())){
-                item.setStatus(DictUtils.getDictLabel(item.getStatus(),"cw_status",""));
+                item.setStatus(SpringUtil.getBean ( IDictApi.class ).getDictLabel(item.getStatus(),"cw_status",""));
             }
         });
         EasyPoiUtil.exportExcel ( result, sheetName,  sheetName, CwProjectRecordsDTO.class, fileName, response );

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/xml/CwProjectRecordsMapper.xml

@@ -45,13 +45,13 @@
         <result property="realHeaderName" column="real_header_name" jdbcType="VARCHAR"/>
         <result property="reportReview" column="report_review" jdbcType="VARCHAR"/>
         <collection property="cwProjectClientInfoDTOList" ofType="com.jeeplus.finance.workClientInfo.service.dto.CwWorkClientBaseDTO" column="id" select="getProjectClient"></collection>
-        <collection property="workAttachmentDtoList" ofType="com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto" column="id" select="getFileList"></collection>
+        <collection property="workAttachmentDtoList" ofType="com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO" column="id" select="getFileList"></collection>
         <collection property="cwProjectClientContactDTOList" ofType="com.jeeplus.finance.projectRecords.service.dto.CwProjectClientContactDTO" column="id" select="getContact"></collection>
         <collection property="cwProjectMembersDTOList" ofType="com.jeeplus.finance.projectRecords.service.dto.CwProjectMembersDTO" column="id" select="getMembers"></collection>
 
     </resultMap>
 
-    <resultMap id="AttachmentMap" type="com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto">
+    <resultMap id="AttachmentMap" type="com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO">
         <id property="id" column="id" jdbcType="VARCHAR"/>
         <result property="createBy.id" column="create_by_id" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/CwManHourManagementService.java

@@ -3,20 +3,23 @@ package com.jeeplus.finance.projectRecords.service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
+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.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.finance.projectRecords.domain.CwManHourManagement;
 import com.jeeplus.finance.projectRecords.mapper.CwManHourManagementMapper;
 import com.jeeplus.finance.projectRecords.service.dto.CwManHourManagementDTO;
 import com.jeeplus.finance.projectRecords.service.mapstruct.CwManHourManagementWrapper;
 import com.jeeplus.sys.domain.User;
-import com.jeeplus.sys.mapper.UserMapper;
+//import com.jeeplus.sys.mapper.UserMapper;
+import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.sys.utils.UserUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@@ -39,8 +42,8 @@ public class CwManHourManagementService extends ServiceImpl<CwManHourManagementM
 
     @Resource
     private CwManHourManagementMapper cwManHourManagementMapper;
-    @Resource
-    private UserMapper userMapper;
+//    @Resource
+//    private UserMapper userMapper;
 
     /**
      * 差选项目列表信息
@@ -58,7 +61,7 @@ public class CwManHourManagementService extends ServiceImpl<CwManHourManagementM
                 queryWrapper.between("a.create_time", cwManHourManagementDTO.getCreateDates()[0], cwManHourManagementDTO.getCreateDates()[1]);
             }
             if (StringUtils.isNotBlank(cwManHourManagementDTO.getProjectMasterName())) {
-                List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, cwManHourManagementDTO.getProjectMasterName()));
+                List<User> userList = SpringUtil.getBean ( IUserApi.class ).selectListByName(cwManHourManagementDTO.getProjectMasterName());
                 List<String> ids = userList.stream().distinct().map(User::getId).collect(Collectors.toList());
                 if (CollectionUtil.isNotEmpty(ids)) {
                     queryWrapper.in("a.project_master_id", ids);
@@ -112,12 +115,13 @@ public class CwManHourManagementService extends ServiceImpl<CwManHourManagementM
     public String saveForm(CwManHourManagementDTO cwManHourManagementDTO) throws Exception{
         if(StringUtils.isBlank(cwManHourManagementDTO.getId())){
             //获取当前登录人信息
-            UserDTO userDTO = UserUtils.getCurrentUserDTO();
+            UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
+//            UserDTO userDTO = UserUtils.getCurrentUserDTO();
         }
         CwManHourManagement cwManHourManagement = CwManHourManagementWrapper.INSTANCE.toEntity(cwManHourManagementDTO);
         if (ObjectUtil.isNotEmpty(cwManHourManagement)) {
             if (StringUtils.isBlank(cwManHourManagement.getCreateById())) {
-                cwManHourManagement.setCreateById(UserUtils.getCurrentUserDTO().getId());
+                cwManHourManagement.setCreateById(SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken()).getId());
             }
         }
         if(StringUtils.isNotBlank(cwManHourManagementDTO.getProjectId())){

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/CwProjectRecordsService.java

@@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ArrayUtil;
 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;
@@ -11,6 +13,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.finance.contractRegistration.domain.ContractInfo;
 import com.jeeplus.finance.contractRegistration.mapper.ContractInfoMapper;
@@ -29,12 +32,13 @@ import com.jeeplus.finance.projectRecords.service.mapstruct.CwProjectRecordsWrap
 import com.jeeplus.finance.workClientInfo.domain.CwWorkClientContact;
 import com.jeeplus.finance.workClientInfo.service.CwWorkClientContactService;
 import com.jeeplus.finance.workClientInfo.service.dto.CwWorkClientBaseDTO;
-import com.jeeplus.pubmodules.oss.service.OssService;
-import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
+//import com.jeeplus.pubmodules.oss.service.OssService;
+//import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
 import com.jeeplus.sys.domain.User;
-import com.jeeplus.sys.mapper.UserMapper;
+import com.jeeplus.sys.feign.IUserApi;
+import com.jeeplus.sys.feign.IWorkAttachmentApi;
+//import com.jeeplus.sys.mapper.UserMapper;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@@ -55,18 +59,18 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
 
     @Resource
     private CwProjectRecordsMapper cwProjectRecordsMapper;
-    @Resource
-    private OssService ossService;
+//    @Resource
+//    private OssService ossService;
     @Resource
     private CwProjectClientContactMapper cwProjectClientContactMapper;
     @Resource
     private CwProjectClientContactService cwProjectClientContactService;
     @Resource
     private ContractInfoMapper contractInfoMapper;
-    @Resource
-    private SerialnumTplService serialnumTplService;
-    @Resource
-    private UserMapper userMapper;
+//    @Resource
+//    private SerialnumTplService serialnumTplService;
+//    @Resource
+//    private UserMapper userMapper;
     @Resource
     private CwWorkClientContactService cwWorkClientContactService;
     @Resource
@@ -88,7 +92,8 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
                 queryWrapper.between("a.create_time", cwProjectRecordsDTO.getCreateDates()[0], cwProjectRecordsDTO.getCreateDates()[1]);
             }
             if (StringUtils.isNotBlank(cwProjectRecordsDTO.getProjectMasterName())) {
-                List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, cwProjectRecordsDTO.getProjectMasterName()));
+                List<User> userList = SpringUtil.getBean ( IUserApi.class ).selectListByName(cwProjectRecordsDTO.getProjectMasterName());
+//                List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, cwProjectRecordsDTO.getProjectMasterName()));
                 if (CollectionUtils.isNotEmpty(userList)){
                     List<String> ids = userList.stream().distinct().map(User::getId).collect(Collectors.toList());
                     if (CollectionUtil.isNotEmpty(ids)) {
@@ -102,7 +107,7 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
 
             }
             if (StringUtils.isNotBlank(cwProjectRecordsDTO.getRealHeaderName())) {
-                List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, cwProjectRecordsDTO.getRealHeaderName()));
+                List<User> userList = SpringUtil.getBean ( IUserApi.class ).selectListByName(cwProjectRecordsDTO.getRealHeaderName());
                 List<String> ids = userList.stream().distinct().map(User::getId).collect(Collectors.toList());
                 if (CollectionUtil.isNotEmpty(ids)) {
                     queryWrapper.in("a.real_header", ids);
@@ -130,7 +135,7 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
                 queryWrapper.between("a.create_time", cwProjectRecordsDTO.getCreateDates()[0], cwProjectRecordsDTO.getCreateDates()[1]);
             }
             if (StringUtils.isNotBlank(cwProjectRecordsDTO.getProjectMasterName())) {
-                List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, cwProjectRecordsDTO.getProjectMasterName()));
+                List<User> userList = SpringUtil.getBean ( IUserApi.class ).selectListByName(cwProjectRecordsDTO.getProjectMasterName());
                 List<String> ids = userList.stream().distinct().map(User::getId).collect(Collectors.toList());
                 if (CollectionUtil.isNotEmpty(ids)) {
                     queryWrapper.in("a.project_master_id", ids);
@@ -139,7 +144,7 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
                 }
             }
             if (StringUtils.isNotBlank(cwProjectRecordsDTO.getRealHeaderName())) {
-                List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, cwProjectRecordsDTO.getRealHeaderName()));
+                List<User> userList = SpringUtil.getBean ( IUserApi.class ).selectListByName( cwProjectRecordsDTO.getRealHeaderName());
                 List<String> ids = userList.stream().distinct().map(User::getId).collect(Collectors.toList());
                 if (CollectionUtil.isNotEmpty(ids)) {
                     queryWrapper.in("a.real_header", ids);
@@ -201,11 +206,13 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
      * @throws Exception
      */
     public String saveForm(CwProjectRecordsDTO cwProjectRecordsDTO) throws Exception{
+        //获取当前登录人信息
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
         if(StringUtils.isBlank(cwProjectRecordsDTO.getId())){
-            //获取当前登录人信息
-            UserDTO userDTO = UserUtils.getCurrentUserDTO();
+//            UserDTO userDTO = UserUtils.getCurrentUserDTO();
             //项目编号生成
-            String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), CwProjectRecordsDTO.BIZ_CODE);
+            String serialNum = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), CwProjectRecordsDTO.BIZ_CODE,TokenProvider.getCurrentToken());
+//            String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), CwProjectRecordsDTO.BIZ_CODE);
             cwProjectRecordsDTO.setProjectNumber(serialNum);
             cwProjectRecordsDTO.setStatus("5");
         } else {
@@ -229,13 +236,24 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
         CwProjectRecords cwProjectRecords = CwProjectRecordsWrapper.INSTANCE.toEntity(cwProjectRecordsDTO);
         if (ObjectUtil.isNotEmpty(cwProjectRecords)) {
             if (StringUtils.isBlank(cwProjectRecords.getCreateById())) {
-                cwProjectRecords.setCreateById(UserUtils.getCurrentUserDTO().getId());
+                cwProjectRecords.setCreateById(userDTO.getId());
             }
         }
         this.saveOrUpdate(cwProjectRecords);
         if (ObjectUtil.isNotEmpty(cwProjectRecordsDTO)) {
             // 附件
-            ossService.saveOrUpdateFileList(cwProjectRecordsDTO.getWorkAttachmentDtoList(),cwProjectRecords.getId(),"cw_project_records");
+//            ossService.saveOrUpdateFileList(cwProjectRecordsDTO.getWorkAttachmentDtoList(),cwProjectRecords.getId(),"cw_project_records");
+
+            Map<String,String> map = new HashMap<>();
+            String fileList = JSON.toJSONString((cwProjectRecordsDTO.getWorkAttachmentDtoList()));
+            String attachmentId = cwProjectRecords.getId();
+            String attachmentFlag = "cw_project_records";
+            map.put("fileList",fileList);
+            map.put("attachmentId",attachmentId);
+            map.put("attachmentFlag",attachmentFlag);
+            map.put("currentToken", TokenProvider.getCurrentToken ( ));
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).saveOrUpdateFileList(map);
+
             // 被服务单位
             //根据项目id删除原有的被服务单位数据信息
             cwProjectRecordsMapper.deleteProjectClientInfoByProjectId(cwProjectRecords.getId());
@@ -309,9 +327,9 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
                             CwWorkClientContact cwWorkClientContact = new CwWorkClientContact();
                             BeanUtil.copyProperties(item, cwWorkClientContact);
                             cwWorkClientContact.setId(UUID.randomUUID().toString().replace("-", ""));
-                            cwWorkClientContact.setCreateById(UserUtils.getCurrentUserDTO().getId());
+                            cwWorkClientContact.setCreateById(userDTO.getId());
                             cwWorkClientContact.setCreateTime(new Date());
-                            cwWorkClientContact.setUpdateById(UserUtils.getCurrentUserDTO().getId());
+                            cwWorkClientContact.setUpdateById(userDTO.getId());
                             cwWorkClientContact.setUpdateTime(new Date());
                             cwWorkClientContactService.save(cwWorkClientContact);
                             item.setClientContactId(cwWorkClientContact.getId());
@@ -562,7 +580,7 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
      * @return
      */
     public ResponseEntity<List<String>> getHaveProjectIds(){
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
         return ResponseEntity.ok(cwProjectRecordsMapper.getHaveProjectIds(userDTO));
     }
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/dto/CwProjectRecordsDTO.java

@@ -7,9 +7,10 @@ import com.jeeplus.core.query.Query;
 import com.jeeplus.core.query.QueryType;
 import com.jeeplus.core.service.dto.BaseDTO;
 import com.jeeplus.finance.workClientInfo.service.dto.CwWorkClientBaseDTO;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import com.jeeplus.sys.service.dto.OfficeDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -102,7 +103,7 @@ public class CwProjectRecordsDTO extends BaseDTO {
     /**
      * 附件
      */
-    private List<WorkAttachmentDto> workAttachmentDtoList;
+    private List<WorkAttachmentInfo> workAttachmentDtoList;
 
     /**
      * 被服务单位信息

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/controller/CwProjectReportController.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.common.excel.ExcelOptions;
 import com.jeeplus.common.excel.annotation.ExportMode;
 import com.jeeplus.common.redis.RedisUtils;
@@ -22,13 +23,14 @@ import com.jeeplus.finance.workClientInfo.service.dto.CwWorkClientBaseDTO;
 import com.jeeplus.flowable.feign.IFlowableApi;
 import com.jeeplus.logging.annotation.ApiLog;
 import com.jeeplus.logging.constant.enums.LogTypeEnum;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
+//import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
 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.UserDTO;
-import com.jeeplus.sys.utils.DictUtils;
-import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.sys.utils.DictUtils;
+//import com.jeeplus.sys.utils.UserUtils;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import io.swagger.annotations.Api;
@@ -89,7 +91,7 @@ public class CwProjectReportController {
     @ApiLog(value = "签章附件保存", type = LogTypeEnum.SAVE)
     @PostMapping("saveSignFiles")
     public ResponseEntity saveSignFiles(@RequestBody CwProjectReportData reportData) {
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         if (CollectionUtil.isEmpty(reportData.getCwFileInfoList())) {
             reportData.setCwFileInfoList(new ArrayList<>());
         }
@@ -267,7 +269,7 @@ public class CwProjectReportController {
 
         CwProjectReportData cwProjectReportDto = projectReportService.queryById(cwProjectReportData.getId());
         // 获取签章页面url
-        String mobile = UserUtils.getCurrentUserDTO().getMobile();
+        String mobile = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken()).getMobile();
         String signatureContractUrl = SignaturePostUtil.getSignatureContractUrl(cwProjectReportDto.getSignatureContractId(), mobile);
         // 将数据存储到redis中，key为contractId
         if("1".equals(cwProjectReportDto.getSignatureType())) {
@@ -414,21 +416,21 @@ public class CwProjectReportController {
 //                    info.setStatus(DictUtils.getDictLabel(info.getStatus(), "cw_status", ""));
 //                }
                 if(StringUtils.isNotBlank(info.getReviewStatus())){
-                    info.setReviewStatus(DictUtils.getDictLabel(info.getReviewStatus(), "cw_status", ""));
+                    info.setReviewStatus(SpringUtil.getBean ( IDictApi.class ).getDictLabel(info.getReviewStatus(), "cw_status", ""));
                 }
                 if ("1".equals(info.getSignatureType())) {
                     if(StringUtils.isNotBlank(info.getStatus1())){
-                        info.setStatus1(DictUtils.getDictLabel(info.getStatus1(), "cw_status", ""));
+                        info.setStatus1(SpringUtil.getBean ( IDictApi.class ).getDictLabel(info.getStatus1(), "cw_status", ""));
                     }
                 }
                 if ("2".equals(info.getSignatureType())) {
                     if(StringUtils.isNotBlank(info.getStatus2())){
-                        info.setStatus1(DictUtils.getDictLabel(info.getStatus2(), "cw_project_report_sign_status", ""));
+                        info.setStatus1(SpringUtil.getBean ( IDictApi.class ).getDictLabel(info.getStatus2(), "cw_project_report_sign_status", ""));
                     }
                 }
                 if ("3".equals(info.getSignatureType())) {
                     if(StringUtils.isNotBlank(info.getStatus3())){
-                        info.setStatus1(DictUtils.getDictLabel(info.getStatus3(), "cw_project_report_sign_status", ""));
+                        info.setStatus1(SpringUtil.getBean ( IDictApi.class ).getDictLabel(info.getStatus3(), "cw_project_report_sign_status", ""));
                     }
                 }
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/controller/CwProjectReportSignatureCallBackController.java

@@ -2,6 +2,7 @@ package com.jeeplus.finance.projectReport.controller;
 
 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.alibaba.fastjson.TypeReference;
 import com.aliyun.oss.OSSClient;
@@ -12,6 +13,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.common.redis.RedisUtils;
 import com.jeeplus.finance.invoice.util.SignaturePostUtil;
 import com.jeeplus.finance.projectReport.domain.CwProjectReportData;
@@ -23,19 +25,22 @@ import com.jeeplus.finance.projectReport.mapper.CwProjectReportSignatureMapper;
 import com.jeeplus.finance.projectReport.mapper.ProjectReportWorkAttachmentMapper;
 import com.jeeplus.finance.projectReport.service.CwProjectReportService;
 import com.jeeplus.flowable.feign.IFlowableApi;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
-import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
-import com.jeeplus.pubmodules.oss.service.OSSClientService;
-import com.jeeplus.pubmodules.oss.service.dto.AttachmentDTO;
+//import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
+//import com.jeeplus.pubmodules.oss.service.OSSClientService;
+//import com.jeeplus.pubmodules.oss.service.dto.AttachmentDTO;
 import com.jeeplus.sys.domain.User;
-import com.jeeplus.sys.service.OfficeService;
-import com.jeeplus.sys.service.UserService;
+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.OfficeService;
+//import com.jeeplus.sys.service.UserService;
 import com.jeeplus.sys.service.dto.OfficeDTO;
 import com.jeeplus.sys.service.dto.PostDTO;
 import com.jeeplus.sys.service.dto.RoleDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.Global;
-import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.sys.utils.Global;
+//import com.jeeplus.sys.utils.UserUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.bpmn.model.FlowNode;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,31 +78,31 @@ public class CwProjectReportSignatureCallBackController {
 
     @Autowired
     private CwProjectReportService cwProjectReportService;
-    @Autowired
-    private OSSClientService ossClientService;
-    @Autowired
-    private OssServiceMapper ossServiceMapper;
+//    @Autowired
+//    private OSSClientService ossClientService;
+//    @Autowired
+//    private OssServiceMapper ossServiceMapper;
     @Autowired
     private CwProjectReportSignatureMapper cwProjectReportSignatureMapper;
     @Autowired
     private ProjectReportWorkAttachmentMapper attachmentMapper;
     @Autowired
     private CwProjectReportMapper reportMapper;
-    @Autowired
-    private UserService userService;
-
-    private static final String HTTPTOP = Global.getConfig("signature_http_top");
+//    @Autowired
+//    private UserService userService;
 
-    private final static String apptoken = Global.getConfig("apptoken");
-    private final static String appsecret = Global.getConfig("appsecret");
-    private final static String signature = Global.getConfig("signature");
+//    private static final String HTTPTOP = Global.getConfig("signature_http_top");
+//
+//    private final static String apptoken = Global.getConfig("apptoken");
+//    private final static String appsecret = Global.getConfig("appsecret");
+//    private final static String signature = Global.getConfig("signature");
 
     @Autowired
     private RedisUtils redisUtils;
     @Autowired
     private IFlowableApi flowTaskService;
-    @Autowired
-    private OfficeService officeService;
+//    @Autowired
+//    private OfficeService officeService;
 
 
     /**
@@ -226,7 +231,8 @@ public class CwProjectReportSignatureCallBackController {
 
     @RequestMapping(value = "/getApprovalCallBackAccomplish", method= RequestMethod.POST)
     public String getApprovalCallBackAccomplish(PresignCallBack presignCallBack, HttpServletResponse response) {
-//        //根据contractId查询对应的报告信息
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken (TokenProvider.getCurrentToken ( ));
+        //根据contractId查询对应的报告信息
         CwProjectReportData projectReportData = cwProjectReportService.queryByContractId(presignCallBack.getContractId());
         //对文件回调路径进行处理并保存
         String signatureUrl = null;
@@ -266,7 +272,8 @@ public class CwProjectReportSignatureCallBackController {
                 cons = aliDownloadUrl;
             }
             String ossKey = file.split(cons+"/")[1];
-            ossClientService.downQzByStreamSaveLocal(ossKey,fileName,path+fileName);
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).downQzByStreamSaveLocal(ossKey,fileName,path+fileName);
+//            ossClientService.downQzByStreamSaveLocal(ossKey,fileName,path+fileName);
             //将下载下来的文件转换为file文件
             File srcFile = new File(path+fileName);
             deleteFile = path+fileName;
@@ -293,12 +300,14 @@ public class CwProjectReportSignatureCallBackController {
                     MultipartFile cMultiFile = new MockMultipartFile("file", f.getName(), null, new FileInputStream(f));
                     if (!cMultiFile.isEmpty()) {
                         // 文件保存路径
-                        String realPath =DIRECTORY.replace("/","")+"/cw_project_report_file"+ossClientService.datePath()+"/"+ System.currentTimeMillis();
+                        String realPath =DIRECTORY.replace("/","")+"/cw_project_report_file"+SpringUtil.getBean ( IWorkAttachmentApi.class ).datePath()+"/"+ System.currentTimeMillis();
+//                        String realPath =DIRECTORY.replace("/","")+"/cw_project_report_file"+ossClientService.datePath()+"/"+ System.currentTimeMillis();
                         //文件原名称
                         String newName = cMultiFile.getOriginalFilename();
                         if(StringUtils.isNotBlank(newName)){
                             newName = newName.substring(13, newName.length());
-                            ossClientService.uploadFile2OSS(cMultiFile.getInputStream(),realPath,newName);
+                            SpringUtil.getBean ( IWorkAttachmentApi.class ).uploadFile2OSS(cMultiFile.getInputStream(),realPath,newName);
+//                            ossClientService.uploadFile2OSS(cMultiFile.getInputStream(),realPath,newName);
                             filepath = "/" + realPath + newName;
                         }
                     }
@@ -310,7 +319,7 @@ public class CwProjectReportSignatureCallBackController {
                     String newFileName = f.getName().substring(13, f.getName().length());
 
                     //将签章完成的附件进行保存到附件表中
-                    WorkAttachment workattachment = new WorkAttachment();
+                    WorkAttachmentInfo workattachment = new WorkAttachmentInfo();
                     workattachment.setDelFlag(0);
                     workattachment.setUrl(filepath);
                     workattachment.setType(substring);
@@ -325,9 +334,15 @@ public class CwProjectReportSignatureCallBackController {
                     workattachment.setUpdateTime(new Date());
                     //先查询数据库中是否已经对数据进行保存
                     //若未保存，则进行保存，否则直接跳过
-                    List<AttachmentDTO> byAttachmentIdAndUrl = ossServiceMapper.getByAttachmentIdAndUrlAndAttachmentFlag(workattachment);
+                    List<WorkAttachmentInfo> byAttachmentIdAndUrl = SpringUtil.getBean ( IWorkAttachmentApi.class ).getByAttachmentIdAndUrlAndAttachmentFlag(workattachment);
                     if(byAttachmentIdAndUrl.size() == 0){
-                        ossServiceMapper.insert(workattachment);
+                        Map<String,String> map = new HashMap<>();
+                        String workAttachment = JSON.toJSONString((workattachment));
+                        String userDTOInfo = JSON.toJSONString((userDTO));
+                        map.put("workAttachment",workAttachment);
+                        map.put("userDTO",userDTOInfo);
+                        SpringUtil.getBean ( IWorkAttachmentApi.class ).insertWorkAttachment(map);
+//                        ossServiceMapper.insert(workattachment);
 
                         //将附件信息添加到签章附件信息表中
                         CwProjectReportFile cwProjectReportFile = new CwProjectReportFile();
@@ -415,7 +430,8 @@ public class CwProjectReportSignatureCallBackController {
                 cons = aliDownloadUrl;
             }
             String ossKey = file.split(cons+"/")[1];
-            ossClientService.downQzByStreamSaveLocal(ossKey,fileName,path+fileName);
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).downQzByStreamSaveLocal(ossKey,fileName,path+fileName);
+//            ossClientService.downQzByStreamSaveLocal(ossKey,fileName,path+fileName);
             //将下载下来的文件转换为file文件
             File srcFile = new File(path+fileName);
             deleteFile = path+fileName;
@@ -455,9 +471,9 @@ public class CwProjectReportSignatureCallBackController {
                 //遍历该contractId对应的报告信息，将报告信息中的附件地址进行替换
 
                 //查询报告文件信息（电子章）
-                List<WorkAttachment> fileList = attachmentMapper.selectWorkAttachmentByReportId(projectReportData.getId());
+                List<WorkAttachmentInfo> fileList = attachmentMapper.selectWorkAttachmentByReportId(projectReportData.getId());
                 if(fileList.size()>0){
-                    for (WorkAttachment workattachment : fileList) {
+                    for (WorkAttachmentInfo workattachment : fileList) {
                         //根据url截取文件名成
                         String workattachmentName = workattachment.getUrl().substring(workattachment.getUrl().lastIndexOf("/")+1, workattachment.getUrl().length());
 
@@ -520,19 +536,19 @@ public class CwProjectReportSignatureCallBackController {
     @ResponseBody
     public void updateAllUser() {
         // 查询全部用户
-        Page<UserDTO> page = new Page<>();
-        page.setCurrent(1);
-        page.setSize(-1);
-        IPage<UserDTO> pageList = userService.findPage(page, new QueryWrapper<UserDTO>());
+//        Page<UserDTO> page = new Page<>();
+//        page.setCurrent(1);
+//        page.setSize(-1);
+        IPage<UserDTO> pageList = SpringUtil.getBean ( IUserApi.class ).findPage();
         // 将全部用户数据执行保存操作
         pageList.getRecords().stream().forEach(uuu -> {
             try {
-                UserDTO userDTO = userService.get ( uuu.getId() );
+                UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getById ( uuu.getId() );
                 if(StringUtils.isNotBlank(userDTO.getManageOfficeIds())){
                     //获取当前人管理的部门id
                     List<String> manageOfficeIdList=Arrays.asList(userDTO.getManageOfficeIds().split(","));
                     //查询这些部门信息
-                    List<String> officeNameList = officeService.getOfficeNameByIds(manageOfficeIdList);
+                    List<String> officeNameList = SpringUtil.getBean ( IOfficeApi.class ).getOfficeNameByIds(manageOfficeIdList);
                     userDTO.setManageOfficeNameList(officeNameList);
                 }
                 if(ObjectUtil.isNotEmpty(userDTO)) {
@@ -547,7 +563,7 @@ public class CwProjectReportSignatureCallBackController {
                 }
                 //根据office.id 查询部门的所有父节点信息
                 if(null != userDTO.getOfficeDTO() && StringUtils.isNotBlank(userDTO.getOfficeDTO().getId())){
-                    OfficeDTO office = officeService.getOfficeById(userDTO.getOfficeDTO().getId());
+                    OfficeDTO office = SpringUtil.getBean ( IOfficeApi.class ).getOfficeById(userDTO.getOfficeDTO().getId());
                     //将office的父节点信息进行分割并查询赋值
                     if(null != office){
                         List<String> officeIdList = Arrays.asList(office.getParentIds().split(","));
@@ -556,7 +572,7 @@ public class CwProjectReportSignatureCallBackController {
                             for (String officeId : officeIdList) {
                                 if(StringUtils.isNotBlank(officeId) && !"0".equals(officeId)){
                                     sort ++ ;
-                                    OfficeDTO officeChild = officeService.getOfficeById(officeId);
+                                    OfficeDTO officeChild = SpringUtil.getBean ( IOfficeApi.class ).getOfficeById(officeId);
                                     if(null != officeChild) {
                                         switch (sort){
                                             case 1:
@@ -576,7 +592,7 @@ public class CwProjectReportSignatureCallBackController {
                     }
 
                 }
-                userService.saveOrUpdate(userDTO);
+                SpringUtil.getBean ( IUserApi.class ).saveOrUpdate(userDTO);
             } catch (Exception e) {
                 e.printStackTrace();
             }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/domain/CwProjectReport.java

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.domain.BaseEntity;
 import com.jeeplus.core.query.Query;
 import com.jeeplus.finance.projectReport.service.dto.ProjectReportWorkAttachmentDTO;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import lombok.Data;
 
 import java.util.Date;
@@ -171,7 +171,7 @@ public class CwProjectReport extends BaseEntity {
      * 附件信息2
      */
     @TableField(exist = false)
-    List<WorkAttachmentDto> cwFileInfoList2;
+    List<WorkAttachmentInfo> cwFileInfoList2;
 
     /**
      * 被服务单位id

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/domain/CwProjectReportData.java

@@ -7,7 +7,7 @@ import com.jeeplus.core.query.Query;
 import com.jeeplus.core.service.dto.BaseDTO;
 import com.jeeplus.finance.common.flowable.dto.CommitParamDTO;
 import com.jeeplus.finance.projectReport.service.dto.ProjectReportWorkAttachmentDTO;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import lombok.Data;
 
 import java.util.Date;
@@ -236,7 +236,7 @@ public class CwProjectReportData extends BaseDTO {
     /**
      * 附件信息
      */
-    List<WorkAttachmentDto> cwFileInfoList2;
+    List<WorkAttachmentInfo> cwFileInfoList2;
 
     /**
      * 已签章附件信息

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/CwProjectReportMapper.java

@@ -9,8 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.finance.projectReport.domain.*;
 import com.jeeplus.finance.workClientInfo.domain.CwWorkClientBase;
 import com.jeeplus.finance.workClientInfo.service.dto.CwWorkClientBaseDTO;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import com.jeeplus.sys.service.dto.UserDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -34,7 +33,7 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
     IPage<CwProjectReportData> findList(Page<CwProjectReportData> page, @Param("currentUser") UserDTO currentUser, @Param("isBmzr") String isBmzr, @Param("officeIds") String officeIds, @Param(Constants.WRAPPER) QueryWrapper<CwProjectReportData> queryWrapper);
 
     @InterceptorIgnore(tenantLine = "true")
-    List<WorkAttachment> findFileList(@Param("id") String id);
+    List<WorkAttachmentInfo> findFileList(@Param("id") String id);
 
     Integer findIsExit(@Param("id") String id, @Param("name")String name);
 
@@ -152,7 +151,7 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
     List<ReviewUser> getReviewByPost(@Param("postName") String postName);
 
     @InterceptorIgnore(tenantLine = "true")
-    List<WorkAttachmentDto> findDtos(@Param("id") String id);
+    List<WorkAttachmentInfo> findDtos(@Param("id") String id);
 
     @InterceptorIgnore(tenantLine = "true")
     CwProjectReport getByNewLineId(String reportId);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/ProjectReportWorkAttachmentMapper.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.finance.projectReport.domain.CwProjectReportFile;
 import com.jeeplus.finance.projectReport.service.dto.ProjectReportWorkAttachmentDTO;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -43,12 +43,12 @@ public interface ProjectReportWorkAttachmentMapper extends BaseMapper<CwProjectR
      * @return
      */
     @InterceptorIgnore(tenantLine = "true")
-    List<WorkAttachment> selectWorkAttachmentByReportId(String id);
+    List<WorkAttachmentInfo> selectWorkAttachmentByReportId(String id);
 
     /**
      * 根据id修改文件信息（cw签章文件替换）
      * @param workattachment
      * @return
      */
-    Integer updateByIdOnSignature(WorkAttachment workattachment);
+    Integer updateByIdOnSignature(WorkAttachmentInfo workattachment);
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -427,7 +427,7 @@
         LEFT JOIN cw_project_report_signature cw_prs2 on cw_prs2.report_id = a.id and cw_prs2.type = '2' and cw_prs2.del_flag = '0'
         where a.project_id = #{projectId}
     </select>
-    <select id="findFileList" resultType="com.jeeplus.pubmodules.oss.domain.WorkAttachment">
+    <select id="findFileList" resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
         SELECT * FROM work_attachment a
         left join cw_project_report_file b on a.id = b.report_file_id
         WHERE a.del_flag = 0 AND a.attachment_id = #{id} and b.file_affiliation = 0
@@ -583,7 +583,7 @@
         left join sys_post c on b.post_id = c.id
         where c.name = #{postName} and a.del_flag = 0 ORDER BY a.name
     </select>
-    <select id="findDtos" resultType="com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto">
+    <select id="findDtos" resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
         SELECT
 			id,
 			url,

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/ProjectReportWorkAttachmentMapper.xml

@@ -21,7 +21,7 @@
 
 
     <select id="selectWorkAttachmentByReportId"
-            resultType="com.jeeplus.pubmodules.oss.domain.WorkAttachment">
+            resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
 
         select a.* from work_attachment a
         left join cw_project_report_file cf on cf.report_file_id = a.id

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportReviewService.java

@@ -1,7 +1,9 @@
 package com.jeeplus.finance.projectReport.service;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.finance.projectRecords.domain.CwProjectRecords;
 import com.jeeplus.finance.projectRecords.mapper.CwProjectRecordsMapper;
 import com.jeeplus.finance.projectReport.domain.*;
@@ -11,9 +13,11 @@ import com.jeeplus.finance.projectReport.mapper.CwProofreadDetailMapper;
 import com.jeeplus.finance.projectReportArchive.mapper.CwProjectReportArchiveMapper;
 import com.jeeplus.finance.reimbursementApproval.approvalInfo.service.dto.ReportNoDto;
 import com.jeeplus.flowable.feign.IFlowableApi;
-import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
+//import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
+import com.jeeplus.sys.feign.IUserApi;
+import com.jeeplus.sys.feign.IWorkAttachmentApi;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.sys.utils.UserUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.bpmn.model.FlowNode;
@@ -46,8 +50,8 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
     @Resource
     private CwProofreadDetailMapper detailMapper;
 
-    @Resource
-    private SerialnumTplService serialnumTplService;
+//    @Resource
+//    private SerialnumTplService serialnumTplService;
 
     @Resource
     private IFlowableApi flowTaskService;
@@ -78,7 +82,7 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
      */
     public String updateReviewStatysByReportId(CwProjectReportData data) {
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
         mapper.updateReviewStatysByReportId(data.getReviewStatus(),data.getId(),data.getNeedUpdate2(),data.getRemark2(),
         data.getNeedUpdate3(),data.getRemark3());
         //根据id找到报告id，然后根据报告id找到projectid，然后根据projectId修改状态
@@ -149,7 +153,7 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
     @Transactional(rollbackFor = Exception.class)
     public String update(CwProjectReportData reportData,CwProjectReview detail) throws Exception{
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
         CwProjectReview review = new CwProjectReview();
         BeanUtils.copyProperties(reportData, review);
         review.setCreateById(detail.getCreateById());
@@ -157,6 +161,7 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
         review.setUpdateById(userDTO.getId());
         review.setUpdateTime(new Date());
         review.setId(detail.getId());
+        String currentToken = TokenProvider.getCurrentToken();
         if (StringUtils.isNotEmpty(detail.getProcInsId())) {
             String currentTask = flowTaskService.getCurrentTaskName(detail.getProcInsId());
             if(StringUtils.isNotBlank(currentTask)) {
@@ -173,35 +178,35 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
                             switch (reportData.getReportType()) {
                                 case "1":   //基字
                                     do{
-                                        documentNo = serialnumTplService.genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.BIZ_CODE);
+                                        documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.BIZ_CODE,currentToken);
                                         //根据报告号查询诗剧苦中是否存在
                                         projectReportByNumber = mapper.getProjectReportByNumber(documentNo);
                                     }while (null != projectReportByNumber && StringUtils.isNotBlank(projectReportByNumber.getReportNo()));
                                     break;
                                 case "2":   //咨字
                                     do{
-                                        documentNo = serialnumTplService.genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.CONSULT_BIZ_CODE);
+                                        documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.CONSULT_BIZ_CODE,currentToken);
                                         //根据报告号查询诗剧苦中是否存在
                                         projectReportByNumber = mapper.getProjectReportByNumber(documentNo);
                                     }while (null != projectReportByNumber && StringUtils.isNotBlank(projectReportByNumber.getReportNo()));
                                     break;
                                 case "3":   //审字
                                     do{
-                                        documentNo = serialnumTplService.genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.EXAMINE_BIZ_CODE);
+                                        documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.EXAMINE_BIZ_CODE,currentToken);
                                         //根据报告号查询诗剧苦中是否存在
                                         projectReportByNumber = mapper.getProjectReportByNumber(documentNo);
                                     }while (null != projectReportByNumber && StringUtils.isNotBlank(projectReportByNumber.getReportNo()));
                                     break;
                                 case "4":   //验字
                                     do{
-                                        documentNo = serialnumTplService.genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.CHECK_BIZ_CODE);
+                                        documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.CHECK_BIZ_CODE,currentToken);
                                         //根据报告号查询诗剧苦中是否存在
                                         projectReportByNumber = mapper.getProjectReportByNumber(documentNo);
                                     }while (null != projectReportByNumber && StringUtils.isNotBlank(projectReportByNumber.getReportNo()));
                                     break;
                                 case "5":   //特字
                                     do{
-                                        documentNo = serialnumTplService.genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.SPECIAL_BIZ_CODE);
+                                        documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.SPECIAL_BIZ_CODE,currentToken);
                                         //根据报告号查询诗剧苦中是否存在
                                         projectReportByNumber = mapper.getProjectReportByNumber(documentNo);
                                     }while (null != projectReportByNumber && StringUtils.isNotBlank(projectReportByNumber.getReportNo()));
@@ -351,22 +356,23 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
         //生成主键id值
         String id = UUID.randomUUID().toString().replace("-", "");
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
         //保存基本信息
         CwProjectReview info = new CwProjectReview();
         BeanUtils.copyProperties(dto, info);
         //报告编号生成
         String documentNo = "";
+        String currentToken = TokenProvider.getCurrentToken();
         if (info.getReportType().equals("1")){
-            documentNo = serialnumTplService.genSerialReviewNum(userDTO.getCompanyDTO().getId(), CwProjectReview.BIZ_CODE1);
+            documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialReviewNum(userDTO.getCompanyDTO().getId(), CwProjectReview.BIZ_CODE1,currentToken);
         } else if (info.getReportType().equals("2")){
-            documentNo = serialnumTplService.genSerialReviewNum(userDTO.getCompanyDTO().getId(), CwProjectReview.BIZ_CODE2);
+            documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialReviewNum(userDTO.getCompanyDTO().getId(), CwProjectReview.BIZ_CODE2,currentToken);
         } else if (info.getReportType().equals("3")){
-            documentNo = serialnumTplService.genSerialReviewNum(userDTO.getCompanyDTO().getId(), CwProjectReview.BIZ_CODE3);
+            documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialReviewNum(userDTO.getCompanyDTO().getId(), CwProjectReview.BIZ_CODE3,currentToken);
         } else if (info.getReportType().equals("4")){
-            documentNo = serialnumTplService.genSerialReviewNum(userDTO.getCompanyDTO().getId(), CwProjectReview.BIZ_CODE4);
+            documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialReviewNum(userDTO.getCompanyDTO().getId(), CwProjectReview.BIZ_CODE4,currentToken);
         } else if (info.getReportType().equals("5")){
-            documentNo = serialnumTplService.genSerialReviewNum(userDTO.getCompanyDTO().getId(), CwProjectReview.BIZ_CODE5);
+            documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialReviewNum(userDTO.getCompanyDTO().getId(), CwProjectReview.BIZ_CODE5,currentToken);
         }
         info.setId(id);
         info.setReportReviewNo(documentNo);
@@ -423,7 +429,7 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
             // 根据reportId查询 new_line数据
             CwProjectInfoData byReportId = infoMapper.getByReportId(reportId);
             // 生成报告文号
-            documentNo = serialnumTplService.genSerialNumNoSort(UserUtils.getCurrentUserDTO().getCompanyDTO().getId(), CwProjectInfoData.BIZ_CODE);
+            documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( )).getCompanyDTO().getId(), CwProjectInfoData.BIZ_CODE,TokenProvider.getCurrentToken());
             if(documentNo.contains("{replacement}")){
                 if(StringUtils.isNotBlank(byReportId.getReportType())){
                     switch (byReportId.getReportType()){

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportService.java

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.finance.common.flowable.dto.CommitParamDTO;
 import com.jeeplus.finance.invoice.util.SignaturePostUtil;
@@ -31,21 +32,21 @@ import com.jeeplus.finance.workClientInfo.domain.CwWorkClientBase;
 import com.jeeplus.finance.workClientInfo.service.dto.CwWorkClientBaseDTO;
 import com.jeeplus.finance.workClientInfo.service.mapstruct.CwWorkClientBaseWrapper;
 import com.jeeplus.flowable.feign.IFlowableApi;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
-import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
-import com.jeeplus.pubmodules.oss.service.OSSClientService;
-import com.jeeplus.pubmodules.oss.service.OssService;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
-import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
+//import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
+//import com.jeeplus.pubmodules.oss.service.OSSClientService;
+//import com.jeeplus.pubmodules.oss.service.OssService;
+//import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
 import com.jeeplus.sys.domain.User;
 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.UserService;
-import com.jeeplus.sys.mapper.UserMapper;
+//import com.jeeplus.sys.service.UserService;
+//import com.jeeplus.sys.mapper.UserMapper;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.DictUtils;
-import com.jeeplus.sys.utils.Global;
-import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.sys.utils.DictUtils;
+//import com.jeeplus.sys.utils.Global;
+//import com.jeeplus.sys.utils.UserUtils;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import org.apache.commons.collections4.CollectionUtils;
@@ -99,25 +100,25 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
     @Resource
     private ProjectReportWorkAttachmentMapper attachmentMapper;
 
-    @Resource
-    private SerialnumTplService serialnumTplService;
-
-    @Resource
-    private OssService ossService;
+//    @Resource
+//    private SerialnumTplService serialnumTplService;
 
-    @Resource
-    private OssServiceMapper ossServiceMapper;
+//    @Resource
+//    private OssService ossService;
+//
+//    @Resource
+//    private OssServiceMapper ossServiceMapper;
 
     @Resource
     private CwProjectReportCancelMapper cancelMapper;
 
-    @Autowired
-    private UserService userService;
-    @Autowired
-    private OSSClientService ossClientService;
+//    @Autowired
+//    private UserService userService;
+//    @Autowired
+//    private OSSClientService ossClientService;
 
-    @Resource
-    private UserMapper userMapper;
+//    @Resource
+//    private UserMapper userMapper;
 
     @Resource
     private CwProjectReportSignatureMapper cwProjectReportSignatureMapper;
@@ -175,7 +176,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
     @Transactional(rollbackFor = Exception.class)
     public String update(CwProjectReportData reportData) throws Exception{
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
 
         CwProjectReport report = new CwProjectReport();
         BeanUtils.copyProperties(reportData, report);
@@ -190,16 +191,27 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         infoData.setOpinionType(report.getOpinionType());
         infoData.setSealType(report.getSealType());
         infoData.setServedUnitId(report.getServedUnitId());
-        infoData.setUpdateById(UserUtils.getCurrentUserDTO().getId());
+        infoData.setUpdateById(userDTO.getId());
+//        infoData.setUpdateById(UserUtils.getCurrentUserDTO().getId());
         infoData.setUpdateTime(new Date());
         infoMapper.updateCwProjectInfoDataById(infoData);
 
         //对上传的文件数据进行持久化操作
         List<ProjectReportWorkAttachmentDTO> cwFileInfoList = report.getCwFileInfoList();
-        List<WorkAttachmentDto> cwFileInfoList2 = report.getCwFileInfoList2();
+        List<WorkAttachmentInfo> cwFileInfoList2 = report.getCwFileInfoList2();
         if (CollectionUtils.isNotEmpty(cwFileInfoList2)) {
 //            updateFiles2(cwFileInfoList2, userDTO, report.getId());
-            ossService.saveOrUpdateFileList(cwFileInfoList2,report.getId(),"cwWorkContract");
+//            ossService.saveOrUpdateFileList(cwFileInfoList2,report.getId(),"cwWorkContract");
+
+            Map<String,String> map = new HashMap<>();
+            String fileList = JSON.toJSONString((cwFileInfoList2));
+            String attachmentId = report.getId();
+            String attachmentFlag = "cwWorkContract";
+            map.put("fileList",fileList);
+            map.put("attachmentId",attachmentId);
+            map.put("attachmentFlag",attachmentFlag);
+            map.put("currentToken",TokenProvider.getCurrentToken ( ));
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).saveOrUpdateFileList(map);
 
         } else if (CollectionUtils.isNotEmpty(cwFileInfoList)) {
             updateFiles(cwFileInfoList, userDTO, report.getId());
@@ -211,8 +223,8 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                 fileId.forEach(fidId->{
                     attachmentMapper.deleteById(fidId);
                 });
-
-                ossServiceMapper.deleteById(id);
+                SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteById(id);
+//                ossServiceMapper.deleteById(id);
             });
         }
 
@@ -245,17 +257,19 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
     @Transactional(rollbackFor = Exception.class)
     public String add(CwProjectReportData reportData) throws Exception{
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
         if(StringUtils.isBlank(reportData.getId())){
             //单据编号生成
-            String documentNo = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), CwProjectReportDTO.BIZ_CODE);
+            String documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), CwProjectReportDTO.BIZ_CODE,TokenProvider.getCurrentToken());
+//            String documentNo = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), CwProjectReportDTO.BIZ_CODE);
             reportData.setDocumentNo(documentNo);
         }
         CwProjectReport report = new CwProjectReport();
         BeanUtils.copyProperties(reportData, report);
         if (ObjectUtil.isNotEmpty(report)) {
             if (StringUtils.isBlank(report.getCreateById())) {
-                report.setCreateById(UserUtils.getCurrentUserDTO().getId());
+                report.setCreateById(userDTO.getId());
+//                report.setCreateById(UserUtils.getCurrentUserDTO().getId());
                 String id = UUID.randomUUID().toString().replace("-", "");
                 report.setId(id);
             }
@@ -263,9 +277,11 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         //对新增行数据进行持久化操作
         CwProjectInfoData infoData = new CwProjectInfoData();
 //        List<CwProjectInfoData> infoList = new ArrayList<>();
-        infoData.setCreateById(UserUtils.getCurrentUserDTO().getId());
+        infoData.setCreateById(userDTO.getId());
+//        infoData.setCreateById(UserUtils.getCurrentUserDTO().getId());
         infoData.setCreateTime(new Date());
-        infoData.setUpdateById(UserUtils.getCurrentUserDTO().getId());
+        infoData.setUpdateById(userDTO.getId());
+//        infoData.setUpdateById(UserUtils.getCurrentUserDTO().getId());
         infoData.setUpdateTime(new Date());
         infoData.setReportId(report.getId());
         String id = UUID.randomUUID().toString().replace("-", "");
@@ -317,20 +333,23 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         infoMapper.insert(infoData);
 
         //对上传的附件进行持久化操作
-        List<WorkAttachmentDto> fileInfoList2 = new ArrayList<>();
+        List<WorkAttachmentInfo> fileInfoList2 = new ArrayList<>();
         if ( null !=report.getCwFileInfoList2()){
             fileInfoList2 = report.getCwFileInfoList2();
         }
-        ossServiceMapper.delete(new QueryWrapper<WorkAttachment>().lambda().eq(WorkAttachment::getAttachmentId, report.getId()));
+//        ossServiceMapper.delete(new QueryWrapper<WorkAttachmentInfo>().lambda().eq(WorkAttachmentInfo::getAttachmentId, report.getId()));
+        SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteByAttachmentId(report.getId());
 
         AtomicInteger j2 = new AtomicInteger(1);
         if (fileInfoList2 != null){
             fileInfoList2.forEach(item -> {
-                WorkAttachment i = new WorkAttachment();
+                WorkAttachmentInfo i = new WorkAttachmentInfo();
                 //包含了url、size、name
                 i.setId(UUID.randomUUID().toString().replace("-", ""));
                 i.setCreateTime(new Date());
                 i.setUpdateTime(new Date());
+                i.setCreateById(userDTO.getId());
+                i.setUpdateById(userDTO.getId());
                 i.setDelFlag(0);
                 i.setUrl(item.getUrl());
                 //文件类型处理
@@ -343,7 +362,15 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                 i.setAttachmentFlag("cw_project_report");
                 i.setFileSize(item.getSize());
                 i.setSort(j2.get());
-                ossServiceMapper.insertWorkAttachment(i, userDTO);
+
+                Map<String,String> map = new HashMap<>();
+                String workAttachment = JSON.toJSONString((i));
+                String userDTOInfo = JSON.toJSONString((userDTO));
+                map.put("workAttachment",workAttachment);
+                map.put("userDTO",userDTOInfo);
+                SpringUtil.getBean ( IWorkAttachmentApi.class ).insertWorkAttachment(map);
+
+//                ossServiceMapper.insertWorkAttachment(i, userDTO);
             });
         }
 
@@ -352,11 +379,11 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         if ( null !=report.getCwFileInfoList()){
             fileInfoList = report.getCwFileInfoList();
         }
-//        ossServiceMapper.delete(new QueryWrapper<WorkAttachment>().lambda().eq(WorkAttachment::getAttachmentId, report.getId()));
+//        ossServiceMapper.delete(new QueryWrapper<WorkAttachmentInfo>().lambda().eq(WorkAttachmentInfo::getAttachmentId, report.getId()));
         AtomicInteger j = new AtomicInteger(1);
         if (fileInfoList != null){
             fileInfoList.forEach(item -> {
-                WorkAttachment i = new WorkAttachment();
+                WorkAttachmentInfo i = new WorkAttachmentInfo();
                 //包含了url、size、name
                 i.setId(UUID.randomUUID().toString().replace("-", ""));
                 i.setCreateTime(new Date());
@@ -373,7 +400,15 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                 i.setAttachmentFlag("cw_project_report_file");
                 i.setFileSize(item.getSize());
                 i.setSort(j.get());
-                ossServiceMapper.insertWorkAttachment(i, userDTO);
+
+                Map<String,String> map = new HashMap<>();
+                String workAttachment = JSON.toJSONString((i));
+                String userDTOInfo = JSON.toJSONString((userDTO));
+                map.put("workAttachment",workAttachment);
+                map.put("userDTO",userDTOInfo);
+                SpringUtil.getBean ( IWorkAttachmentApi.class ).insertWorkAttachment(map);
+
+//                ossServiceMapper.insertWorkAttachment(i, userDTO);
                 j.getAndIncrement();
                 CwProjectReportFile cwProjectReportFile = CwProjectReportFileWrapper.INSTANCE.toEntity(item);
                 cwProjectReportFile.setReportFileId(i.getId());
@@ -502,7 +537,8 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         }
         String isBmzr = "0";
         StringBuilder officeIds = new StringBuilder();
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
+//        UserDTO userDTO = UserUtils.getCurrentUserDTO();
         List<String> manageOfficeIdList= Lists.newArrayList();
 
 
@@ -597,11 +633,11 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
 
             //将附件信息查出
             // 查询附件信息
-            List<WorkAttachmentDto> fileInfo2 = reportMapper.findDtos(id);
-            List<WorkAttachmentDto> reportFileList = Lists.newArrayList();
+            List<WorkAttachmentInfo> fileInfo2 = reportMapper.findDtos(id);
+            List<WorkAttachmentInfo> reportFileList = Lists.newArrayList();
             if(CollectionUtils.isNotEmpty(dtos) && CollectionUtils.isNotEmpty(fileInfo2)){
                 for (ProjectReportWorkAttachmentDTO dto : dtos) {
-                    for (WorkAttachmentDto workAttachmentDto : fileInfo2) {
+                    for (WorkAttachmentInfo workAttachmentDto : fileInfo2) {
                         if(dto.getId().equals(workAttachmentDto.getId())){
                             reportFileList.add(workAttachmentDto);
                         }
@@ -610,8 +646,8 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             }
 
             if (CollectionUtils.isNotEmpty(dtos)) {
-                for (WorkAttachmentDto i : reportFileList) {
-                    i.setCreateBy(UserUtils.get(i.getBy()));
+                for (WorkAttachmentInfo i : reportFileList) {
+                    i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                 }
             }
             reportData.setCwFileInfoList2(reportFileList);
@@ -750,10 +786,10 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                         reportData.setSignatureFileList(signatureList);
                     }
                     // 查询附件信息
-                    List<WorkAttachmentDto> fileInfo2 = reportMapper.findDtos(reportData.getId());
+                    List<WorkAttachmentInfo> fileInfo2 = reportMapper.findDtos(reportData.getId());
                     if (CollectionUtils.isNotEmpty(dtos)) {
-                        for (WorkAttachmentDto i : fileInfo2) {
-                            i.setCreateBy(UserUtils.get(i.getBy()));
+                        for (WorkAttachmentInfo i : fileInfo2) {
+                            i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                         }
                     }
                     reportData.setCwFileInfoList2(fileInfo2);
@@ -935,10 +971,10 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             }
             //将附件信息查出
             // 查询附件信息
-            List<WorkAttachmentDto> fileInfo2 = reportMapper.findDtos(id);
+            List<WorkAttachmentInfo> fileInfo2 = reportMapper.findDtos(id);
             if (CollectionUtils.isNotEmpty(dtos)) {
-                for (WorkAttachmentDto i : fileInfo2) {
-                    i.setCreateBy(UserUtils.get(i.getBy()));
+                for (WorkAttachmentInfo i : fileInfo2) {
+                    i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                 }
             }
             reportData.setCwFileInfoList2(fileInfo2);
@@ -1084,10 +1120,10 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                         reportData.setSignatureFileList(signatureList);
                     }
                     // 查询附件信息
-                    List<WorkAttachmentDto> fileInfo2 = reportMapper.findDtos(reportData.getId());
+                    List<WorkAttachmentInfo> fileInfo2 = reportMapper.findDtos(reportData.getId());
                     if (CollectionUtils.isNotEmpty(dtos)) {
-                        for (WorkAttachmentDto i : fileInfo2) {
-                            i.setCreateBy(UserUtils.get(i.getBy()));
+                        for (WorkAttachmentInfo i : fileInfo2) {
+                            i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                         }
                     }
                     reportData.setCwFileInfoList2(fileInfo2);
@@ -1362,7 +1398,8 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
 //                    }
 //                }
                 //报告类型
-                String reportType = DictUtils.getDictLabel(reportData.getReportType(), "cw_report_title_type", "");
+                String reportType = SpringUtil.getBean ( IDictApi.class ).getDictLabel(reportData.getReportType(), "cw_report_title_type", "");
+//                String reportType = DictUtils.getDictLabel(reportData.getReportType(), "cw_report_title_type", "");
                 if(StringUtils.isNotBlank(reportType)){
                     data.put("type",reportType);
                 }else{
@@ -1850,7 +1887,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             //删除被服务单位信息
             infoMapper.deleteById(infoData.getId());
             //查询保存的附件信息
-            List<WorkAttachment> infoList = reportMapper.findFileList(ids);
+            List<WorkAttachmentInfo> infoList = reportMapper.findFileList(ids);
             //删除附件信息
             infoList.forEach(in->{
                 //删除新建行文件表id
@@ -1858,7 +1895,8 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                 fileId.forEach(fid->{
                     attachmentMapper.deleteById(fid);
                 });
-                ossServiceMapper.deleteById(in.getId());
+//                ossServiceMapper.deleteById(in.getId());
+                SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteById(in.getId());
             });
 
             /*idList.forEach(info->{
@@ -1918,7 +1956,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
     public Map<String,Object> createSignatureContractId(CwProjectReportData projectReportData){
         Map<String,Object> map = new HashMap<String,Object>();
         //查询报告文件信息（电子章）
-        //List<WorkAttachment> fileList = attachmentMapper.selectWorkAttachmentByReportId(projectReportData.getId());
+        //List<WorkAttachmentInfo> fileList = attachmentMapper.selectWorkAttachmentByReportId(projectReportData.getId());
         List<WorkAttachmentInfo> fileList = SpringUtil.getBean ( IWorkAttachmentApi.class ).selectWorkAttachmentByAttachmentId(projectReportData.getId());
         if(fileList.size()>0){
 
@@ -1956,7 +1994,8 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                         cons = aliDownloadUrl;
                     }
                     String ossKey = file.split(cons+"/")[1];
-                    ossClientService.downByStreamSaveLocal(ossKey,fileName,path+fileName);
+                    SpringUtil.getBean ( IWorkAttachmentApi.class ).downByStreamSaveLocal(ossKey,fileName,path+fileName);
+//                    ossClientService.downByStreamSaveLocal(ossKey,fileName,path+fileName);
                     //将下载下来的文件转换为file文件
                     File srcFile = new File(path+fileName);
                     deleteFile = path+fileName;
@@ -2084,10 +2123,11 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
 
         //根据角色信息录入签署方信息
         //负责人
-        List<UserDTO> userInfoByRoleNameList = userService.getUserInfoByEnName("qzglr");
+        List<UserDTO> userInfoByRoleNameList = SpringUtil.getBean(IUserApi.class).getUserInfoByEnName("qzglr");
+//        List<UserDTO> userInfoByRoleNameList = userService.getUserInfoByEnName("qzglr");
         if(userInfoByRoleNameList.size()>0){
 
-            UserDTO user = UserUtils.get(userInfoByRoleNameList.get(0).getId());
+            UserDTO user = SpringUtil.getBean ( IUserApi.class ).getById(userInfoByRoleNameList.get(0).getId());
 
             if(null != user){
                 //获取成员印章id信息
@@ -2139,7 +2179,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         if(StringUtils.isNotBlank(projectReportData.getSignatureType()) && "2".equals(projectReportData.getSignatureType())){
             //判定签字注师1参数是否为空
             if(StringUtils.isNotBlank(projectReportData.getSignatureAnnotator1())){
-                UserDTO signatureAnnotator1 = UserUtils.get(projectReportData.getSignatureAnnotator1());
+                UserDTO signatureAnnotator1 = SpringUtil.getBean ( IUserApi.class ).getById(projectReportData.getSignatureAnnotator1());
                 if(null != signatureAnnotator1){
 
                     //创建个人职业章参数（签字注师1）
@@ -2191,7 +2231,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
 
             //判定签字注师1参数是否为空
             if(StringUtils.isNotBlank(projectReportData.getSignatureAnnotator1())){
-                UserDTO signatureAnnotator2 = UserUtils.get(projectReportData.getSignatureAnnotator2());
+                UserDTO signatureAnnotator2 = SpringUtil.getBean ( IUserApi.class ).getById(projectReportData.getSignatureAnnotator2());
                 if(null != signatureAnnotator2){
 
                     //创建个人职业章参数（签字注师1）
@@ -2337,11 +2377,12 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             names = names + "," +dto.getUrl();
         }
         //查询保存的附件信息
-        List<WorkAttachment> infoList = reportMapper.findFileList(id);
+        List<WorkAttachmentInfo> infoList = reportMapper.findFileList(id);
         if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(infoList)) {
-            for (WorkAttachment i : infoList) {
+            for (WorkAttachmentInfo i : infoList) {
                 if (!names.contains(i.getUrl())) {
-                    ossServiceMapper.deleteById(i.getId());
+//                    ossServiceMapper.deleteById(i.getId());
+                    SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteById(i.getId());
                     List<String> fileId = attachmentMapper.getFileId(i.getId());
                     fileId.forEach(fid->{
                         attachmentMapper.deleteById(fid);
@@ -2355,12 +2396,12 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             //判断是否存在
             Integer isExit = reportMapper.findIsExit(id, dto.getName());
             if (isExit == 0) {
-                WorkAttachment i = new WorkAttachment();
+                WorkAttachmentInfo i = new WorkAttachmentInfo();
                 //包含了url、size、name
                 i.setId(UUID.randomUUID().toString().replace("-", ""));
-//                i.getCreateBy().setId(userDTO.getId());
+                i.setCreateById(userDTO.getId());
                 i.setCreateTime(new Date());
-//                i.getUpdateBy().setId(userDTO.getId());
+                i.setUpdateById(userDTO.getId());
                 i.setUpdateTime(new Date());
                 i.setDelFlag(0);
                 i.setUrl(dto.getUrl());
@@ -2374,7 +2415,15 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                 i.setAttachmentFlag("cwWorkContract");
                 i.setFileSize(dto.getSize());
                 i.setSort(j);
-                ossServiceMapper.insertWorkAttachment(i, userDTO);
+//                ossServiceMapper.insertWorkAttachment(i, userDTO);
+
+                Map<String,String> map = new HashMap<>();
+                String workAttachment = JSON.toJSONString((i));
+                String userDTOInfo = JSON.toJSONString((userDTO));
+                map.put("workAttachment",workAttachment);
+                map.put("userDTO",userDTOInfo);
+                SpringUtil.getBean ( IWorkAttachmentApi.class ).insertWorkAttachment(map);
+
                 CwProjectReportFile reportFile = new CwProjectReportFile();
                 BeanUtils.copyProperties(dto, reportFile);
                 reportFile.setReportFileId(i.getId());
@@ -2403,11 +2452,12 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             names = names + "," +dto.getUrl();
         }
         //查询保存的附件信息
-        List<WorkAttachment> infoList = reportMapper.findFileList(id);
+        List<WorkAttachmentInfo> infoList = reportMapper.findFileList(id);
         if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(infoList)) {
-            for (WorkAttachment i : infoList) {
+            for (WorkAttachmentInfo i : infoList) {
                 if (!names.contains(i.getUrl())) {
-                    ossServiceMapper.deleteById(i.getId());
+//                    ossServiceMapper.deleteById(i.getId());
+                    SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteById(i.getId());
                     List<String> fileId = attachmentMapper.getFileId(i.getId());
                     fileId.forEach(fid->{
                         attachmentMapper.deleteById(fid);
@@ -2419,11 +2469,11 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         reportMapper.deleteAttachement(id,"cwReportSignature");
         //保存信息
         for (ProjectReportWorkAttachmentDTO dto : list) {
-                WorkAttachment i = new WorkAttachment();
+            WorkAttachmentInfo i = new WorkAttachmentInfo();
                 //包含了url、size、name
                 i.setId(UUID.randomUUID().toString().replace("-", ""));
                 if(infoList.size()>0){
-                    userDTO = UserUtils.get(infoList.get(0).getCreateById());
+                    userDTO = SpringUtil.getBean ( IUserApi.class ).getById(infoList.get(0).getCreateById());
                     i.setCreateTime(infoList.get(0).getCreateTime());
                     i.setUpdateTime(infoList.get(0).getUpdateTime());
                 }else{
@@ -2444,7 +2494,15 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                 i.setAttachmentFlag("cwReportSignature");
                 i.setFileSize(dto.getSize());
                 i.setSort(j);
-                ossServiceMapper.insertWorkAttachment(i, userDTO);
+//                ossServiceMapper.insertWorkAttachment(i, userDTO);
+
+                Map<String,String> map = new HashMap<>();
+                String workAttachment = JSON.toJSONString((i));
+                String userDTOInfo = JSON.toJSONString((userDTO));
+                map.put("workAttachment",workAttachment);
+                map.put("userDTO",userDTOInfo);
+                SpringUtil.getBean ( IWorkAttachmentApi.class ).insertWorkAttachment(map);
+
                 CwProjectReportFile reportFile = new CwProjectReportFile();
                 BeanUtils.copyProperties(dto, reportFile);
                 reportFile.setReportFileId(i.getId());
@@ -2615,14 +2673,15 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
     }
 
     public void saveReportArchive (String reportId) throws Exception {
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
         CwProjectReport cwProjectReport = cwProjectReportService.getCwProjectReportById(reportId);
         CwProjectReportArchive cwProjectReportArchive = new CwProjectReportArchive();
         cwProjectReportArchive.setStatus("0");
         cwProjectReportArchive.setReportId(reportId);
         cwProjectReportArchive.setCreateById(cwProjectReport.getCreateById());
         cwProjectReportArchive.setProjectId(cwProjectReport.getProjectId());
-        String fileNumber = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), CwProjectReportArchiveDTO.BIZ_CODE);
+        String fileNumber = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), CwProjectReportArchiveDTO.BIZ_CODE,TokenProvider.getCurrentToken());
+//        String fileNumber = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), CwProjectReportArchiveDTO.BIZ_CODE);
         cwProjectReportArchive.setFileNumber(fileNumber);
         cwProjectReportArchiveMapper.insert(cwProjectReportArchive);
     }
@@ -2646,7 +2705,8 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         }
         // 删除已盖章的附件
         // 1. 查询到当前报告的附件
-        List<WorkAttachment> workAttachments = ossServiceMapper.selectList(new LambdaQueryWrapper<WorkAttachment>().eq(WorkAttachment::getAttachmentId, reportId));
+//        List<WorkAttachmentInfo> workAttachments = ossServiceMapper.selectList(new LambdaQueryWrapper<WorkAttachmentInfo>().eq(WorkAttachmentInfo::getAttachmentId, reportId));
+        List<WorkAttachmentInfo> workAttachments = SpringUtil.getBean(IWorkAttachmentApi.class).selectListByAttachmentId(reportId);
         // 2. 查询哪些附件是已盖章的
         List<String> delIds = new ArrayList<>();
         workAttachments.stream().forEach(item -> {
@@ -2661,7 +2721,8 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         });
         // 4. 删除已盖章的附件(附件表 work_attachment)
         if (CollectionUtil.isNotEmpty(delIds)) {
-            ossServiceMapper.deleteBatchIds(delIds);  // 逻辑删除
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteByIds(JSON.toJSONString(delIds));
+//            ossServiceMapper.deleteBatchIds(delIds);  // 逻辑删除
         }
         // 5. 根据报告id删除报告归档信息  // 逻辑删除
         cwProjectReportArchiveMapper.delete(new LambdaQueryWrapper<CwProjectReportArchive>().eq(CwProjectReportArchive::getReportId, reportId));
@@ -2749,11 +2810,11 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
 
             //将附件信息查出
             // 查询附件信息
-            List<WorkAttachmentDto> fileInfo2 = reportMapper.findDtos(id);
-            List<WorkAttachmentDto> reportFileList = Lists.newArrayList();
+            List<WorkAttachmentInfo> fileInfo2 = reportMapper.findDtos(id);
+            List<WorkAttachmentInfo> reportFileList = Lists.newArrayList();
             if(CollectionUtils.isNotEmpty(dtos) && CollectionUtils.isNotEmpty(fileInfo2)){
                 for (ProjectReportWorkAttachmentDTO dto : dtos) {
-                    for (WorkAttachmentDto workAttachmentDto : fileInfo2) {
+                    for (WorkAttachmentInfo workAttachmentDto : fileInfo2) {
                         if(dto.getId().equals(workAttachmentDto.getId())){
                             reportFileList.add(workAttachmentDto);
                         }
@@ -2762,8 +2823,8 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             }
 
             if (CollectionUtils.isNotEmpty(dtos)) {
-                for (WorkAttachmentDto i : reportFileList) {
-                    i.setCreateBy(UserUtils.get(i.getBy()));
+                for (WorkAttachmentInfo i : reportFileList) {
+                    i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                 }
             }
             reportData.setCwFileInfoList2(reportFileList);
@@ -2902,10 +2963,10 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                         reportData.setSignatureFileList(signatureList);
                     }
                     // 查询附件信息
-                    List<WorkAttachmentDto> fileInfo2 = reportMapper.findDtos(reportData.getId());
+                    List<WorkAttachmentInfo> fileInfo2 = reportMapper.findDtos(reportData.getId());
                     if (CollectionUtils.isNotEmpty(dtos)) {
-                        for (WorkAttachmentDto i : fileInfo2) {
-                            i.setCreateBy(UserUtils.get(i.getBy()));
+                        for (WorkAttachmentInfo i : fileInfo2) {
+                            i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                         }
                     }
                     reportData.setCwFileInfoList2(fileInfo2);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/controller/CwProjectReportArchiveController.java

@@ -1,5 +1,6 @@
 package com.jeeplus.finance.projectReportArchive.controller;
 
+import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.common.excel.ExcelOptions;
@@ -11,7 +12,8 @@ import com.jeeplus.finance.projectReportArchive.service.dto.CwProjectReportArchi
 import com.jeeplus.finance.projectReportArchive.service.dto.ReportDTO;
 import com.jeeplus.logging.annotation.ApiLog;
 import com.jeeplus.logging.constant.enums.LogTypeEnum;
-import com.jeeplus.sys.utils.DictUtils;
+//import com.jeeplus.sys.utils.DictUtils;
+import com.jeeplus.sys.feign.IDictApi;
 import com.sun.org.apache.xpath.internal.operations.Bool;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -169,7 +171,7 @@ public class CwProjectReportArchiveController {
         }
         result.stream().forEach(item -> {
             if (StringUtils.isNotBlank(item.getStatus())){
-                item.setStatus(DictUtils.getDictLabel(item.getStatus(),"cw_status",""));
+                item.setStatus(SpringUtil.getBean ( IDictApi.class ).getDictLabel(item.getStatus(),"cw_status",""));
             }
         });
         EasyPoiUtil.exportExcel ( result, sheetName,  sheetName, CwProjectReportArchiveDTO.class, fileName, response );

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/mapper/xml/CwProjectReportArchiveMapper.xml

@@ -40,7 +40,7 @@
             <result property="signatureAnnotator2Name" column="signature_annotator2_name" jdbcType="VARCHAR"/>
             <result property="taskId" column="task_id" jdbcType="VARCHAR"/>
         <association property="cwProjectRecordsDTO" column="project_id" select="getProject" javaType="com.jeeplus.finance.projectRecords.service.dto.CwProjectRecordsDTO"></association>
-        <collection property="workAttachmentDtoList" ofType="com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto" column="id" select="getFileList"></collection>
+        <collection property="workAttachmentDtoList" ofType="com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO" column="id" select="getFileList"></collection>
     </resultMap>
     <resultMap id="AttachmentMap" type="com.jeeplus.finance.projectReportArchive.service.dto.WorkAttachmentArchiveDto">
         <id property="id" column="id" jdbcType="VARCHAR"/>

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/service/CwProjectReportArchiveDetailService.java

@@ -17,7 +17,7 @@ import com.jeeplus.finance.projectReportArchive.mapper.CwProjectReportArchiveRep
 import com.jeeplus.finance.projectReportArchive.service.dto.CwProjectReportArchiveDetailDTO;
 import com.jeeplus.finance.projectReportArchive.service.mapstruct.CwProjectReportArchiveDetailWrapper;
 import com.jeeplus.sys.domain.User;
-import com.jeeplus.sys.mapper.UserMapper;
+//import com.jeeplus.sys.mapper.UserMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -36,8 +36,8 @@ public class CwProjectReportArchiveDetailService extends ServiceImpl<CwProjectRe
     private CwProjectReportArchiveReportMapper cwProjectReportArchiveReportMapper;
     @Resource
     private CwProjectRecordsMapper cwProjectRecordsMapper;
-    @Resource
-    private UserMapper userMapper;
+//    @Resource
+//    private UserMapper userMapper;
     @Resource
     private CwProjectInfoMapper cwProjectInfoMapper;
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/service/CwProjectReportArchiveService.java

@@ -3,7 +3,9 @@ package com.jeeplus.finance.projectReportArchive.service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsStatisticClause;
+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;
@@ -11,6 +13,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.finance.projectRecords.domain.CwProjectRecords;
 import com.jeeplus.finance.projectRecords.mapper.CwProjectRecordsMapper;
@@ -24,15 +27,18 @@ import com.jeeplus.finance.projectReportArchive.service.dto.CwProjectReportArchi
 import com.jeeplus.finance.projectReportArchive.service.dto.ReportDTO;
 import com.jeeplus.finance.projectReportArchive.service.mapstruct.CwProjectReportArchiveWrapper;
 import com.jeeplus.flowable.feign.IFlowableApi;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
-import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
-import com.jeeplus.pubmodules.oss.service.OssService;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
-import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
+//import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
+//import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
+//import com.jeeplus.pubmodules.oss.service.OssService;
+//import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+//import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
 import com.jeeplus.sys.domain.User;
-import com.jeeplus.sys.mapper.UserMapper;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
+import com.jeeplus.sys.feign.IUserApi;
+import com.jeeplus.sys.feign.IWorkAttachmentApi;
+//import com.jeeplus.sys.mapper.UserMapper;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.sys.utils.UserUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -41,7 +47,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
@@ -57,16 +65,16 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
     private CwProjectReportArchiveFileMapper cwProjectReportArchiveFileMapper;
     @Resource
     private CwProjectRecordsMapper cwProjectRecordsMapper;
-    @Resource
-    private OssService ossService;
-    @Resource
-    private OssServiceMapper ossServiceMapper;
-    @Resource
-    private UserMapper userMapper;
+//    @Resource
+//    private OssService ossService;
+//    @Resource
+//    private OssServiceMapper ossServiceMapper;
+//    @Resource
+//    private UserMapper userMapper;
     @Resource
     private CwProjectInfoMapper cwProjectInfoMapper;
-    @Resource
-    private SerialnumTplService serialnumTplService;
+//    @Resource
+//    private SerialnumTplService serialnumTplService;
     @Resource
     private IFlowableApi flowTaskService;
 
@@ -94,7 +102,7 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
                 }
                 // 项目经理1
                 if (StringUtils.isNotBlank(cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getProjectMasterName())){
-                    List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getProjectMasterName()));
+                    List<User> userList = SpringUtil.getBean ( IUserApi.class ).selectListByName(cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getProjectMasterName());
                     if (CollectionUtils.isNotEmpty(userList)){
                         List<String> userIdList = userList.stream().map(User::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
                         if (CollectionUtil.isNotEmpty(userIdList)){
@@ -121,7 +129,7 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
                 }
                 // 项目经理2
                 if (StringUtils.isNotBlank(cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getRealHeaderName())){
-                    List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getRealHeaderName()));
+                    List<User> userList = SpringUtil.getBean ( IUserApi.class ).selectListByName(cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getRealHeaderName());
                     if (CollectionUtils.isNotEmpty(userList)){
                         List<String> userIdList = userList.stream().map(User::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
                         if (CollectionUtil.isNotEmpty(userIdList)){
@@ -157,7 +165,7 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
                 // 创建人
                 if (ObjectUtil.isNotEmpty(cwProjectReportArchiveDTO.getCreateBy())){
                     if (StringUtils.isNotBlank(cwProjectReportArchiveDTO.getCreateBy().getName())){
-                        List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, cwProjectReportArchiveDTO.getCreateBy().getName()));
+                        List<User> userList = SpringUtil.getBean ( IUserApi.class ).selectListByName(cwProjectReportArchiveDTO.getCreateBy().getName());
                         List<String> ids = userList.stream().map(User::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
                         if (CollectionUtil.isNotEmpty(ids)){
                             queryWrapper.in("cw_pa.create_by_id",ids);
@@ -175,7 +183,7 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
         }
         String isBmzr = "0";
         StringBuilder officeIds = new StringBuilder();
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         List<String> manageOfficeIdList= Lists.newArrayList();
 
         if (StringUtils.isBlank(cwProjectReportArchiveDTO.getArchiveSta())) {
@@ -310,14 +318,15 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
      * @throws Exception
      */
     public String saveForm(CwProjectReportArchiveDTO cwProjectReportArchiveDTO) throws Exception{
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         CwProjectReportArchive cwProjectReportArchive = CwProjectReportArchiveWrapper.INSTANCE.toEntity(cwProjectReportArchiveDTO);
         if (ObjectUtil.isNotEmpty(cwProjectReportArchive)) {
             if (StringUtils.isBlank(cwProjectReportArchive.getCreateById())) {
-                cwProjectReportArchive.setCreateById(UserUtils.getCurrentUserDTO().getId());
+                cwProjectReportArchive.setCreateById(userDTO.getId());
             }
             if (StringUtils.isBlank(cwProjectReportArchive.getId())){
-                String fileNumber = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), CwProjectReportArchiveDTO.BIZ_CODE);
+                String fileNumber = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), CwProjectReportArchiveDTO.BIZ_CODE, TokenProvider.getCurrentToken());
+//                String fileNumber = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), CwProjectReportArchiveDTO.BIZ_CODE, TokenProvider.getCurrentToken());
                 cwProjectReportArchive.setFileNumber(fileNumber);
             }
         }
@@ -329,14 +338,29 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
         //this.saveOrUpdate(cwProjectReportArchive);
         if (ObjectUtil.isNotEmpty(cwProjectReportArchiveDTO)) {
             // 附件
-            ossServiceMapper.delete(new QueryWrapper<WorkAttachment>().lambda().eq(WorkAttachment::getAttachmentId, cwProjectReportArchive.getId()));
+//            ossServiceMapper.delete(new QueryWrapper<WorkAttachment>().lambda().eq(WorkAttachment::getAttachmentId, cwProjectReportArchive.getId()));
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteByAttachmentId(cwProjectReportArchive.getId());
             AtomicInteger sort = new AtomicInteger(1);
             cwProjectReportArchiveDTO.getWorkAttachmentDtoList().stream().forEach(item->{
-                WorkAttachmentDto workAttachmentDto = new WorkAttachmentDto();
+                WorkAttachmentInfo workAttachmentDto = new WorkAttachmentInfo();
                 workAttachmentDto.setName(item.getName());
                 workAttachmentDto.setSize(item.getSize());
                 workAttachmentDto.setUrl(item.getUrl());
-                String fileId = ossService.saveFile(workAttachmentDto,userDTO, cwProjectReportArchive.getId(),"cw_project_report_archive",sort.get());
+//                String fileId = ossService.saveFile(workAttachmentDto,userDTO, cwProjectReportArchive.getId(),"cw_project_report_archive",sort.get());
+
+                Map<String,String> map = new HashMap<>();
+                String workAttachmentDtoInfo = JSON.toJSONString(workAttachmentDto);
+                String userDTOInfo = JSON.toJSONString(userDTO);
+                String attachmentId = cwProjectReportArchive.getId();
+                String attachmentFlag = "cw_project_report_archive";
+                String sortInfo = Integer.toString(sort.get());
+                map.put("workAttachmentDtoInfo",workAttachmentDtoInfo);
+                map.put("userDTOInfo",userDTOInfo);
+                map.put("attachmentId",attachmentId);
+                map.put("attachmentFlag",attachmentFlag);
+                map.put("sortInfo",sortInfo);
+                String fileId = SpringUtil.getBean ( IWorkAttachmentApi.class ).saveFile(map);
+
                 sort.getAndIncrement();
                 CwProjectReportArchiveFile cwProjectReportArchiveFile = new CwProjectReportArchiveFile();
                 cwProjectReportArchiveFile.setWorkAttachmentId(fileId);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportAuditSheet/controller/AuditSheetTypeController.java

@@ -97,7 +97,7 @@ public class AuditSheetTypeController {
      */
     @ApiOperation(value = "初始化类型列表查询")
     @GetMapping("/prooList")
-    public ResponseEntity<List<CwProofreadDetail>> list(String type) {
+    public ResponseEntity<List<CwProofreadDetail>> list(@RequestParam(value="type") String type) {
         List<CwProofreadDetail> list = service.prooList(type);
         return ResponseEntity.ok(list);
     }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportAuditSheet/service/CwProofreadTypeService.java

@@ -1,13 +1,16 @@
 package com.jeeplus.finance.projectReportAuditSheet.service;
 
+import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.domain.BaseEntity;
 import com.jeeplus.core.service.TreeService;
 import com.jeeplus.finance.projectReport.domain.CwProofreadDetail;
 import com.jeeplus.finance.projectReportAuditSheet.domain.CwProofreadType;
 import com.jeeplus.finance.projectReportAuditSheet.mapper.CwProofreadTypeMapper;
+import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.sys.utils.UserUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -65,7 +68,7 @@ public class CwProofreadTypeService  extends TreeService<CwProofreadTypeMapper,
      */
     public String add(CwProofreadType type) {
         // 获取当前登录人信息
-        UserDTO userDto = UserUtils.getCurrentUserDTO();
+        UserDTO userDto = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         // 生成id值
         String id = UUID.randomUUID().toString().replace("-", "");
         type.setId(id);
@@ -87,7 +90,7 @@ public class CwProofreadTypeService  extends TreeService<CwProofreadTypeMapper,
      */
     public String update(CwProofreadType info) {
         // 获取当前登录人信息
-        UserDTO userDto = UserUtils.getCurrentUserDTO();
+        UserDTO userDto = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         info.setUpdateById(userDto.getId());
         info.setUpdateTime(new Date());
         mapper.updateById(info);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/mapper/CwReimbursementInfoMapper.java

@@ -9,7 +9,8 @@ import com.jeeplus.finance.reimbursementApproval.approvalInfo.domain.*;
 import com.jeeplus.finance.reimbursementApproval.approvalInfo.service.dto.ReportNoDto;
 import com.jeeplus.finance.reimbursementApproval.approvalInfo.service.dto.RetureListDto;
 import com.jeeplus.finance.reimbursementApproval.approvalInfo.service.dto.TreeUserDto;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+//import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -26,7 +27,7 @@ public interface CwReimbursementInfoMapper extends BaseMapper<CwReimbursementInf
 
     IPage<RetureListDto> findList (Page<RetureListDto> page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("officeIds")String officeIds);
 
-    List<WorkAttachmentDto> findFiles(@Param("id") String id);
+    List<WorkAttachmentInfo> findFiles(@Param("id") String id);
 
     void updateStatusById(@Param("id") String id, @Param("type") String type);
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/mapper/xml/CwReimbursementInfoMapper.xml

@@ -109,7 +109,7 @@
 			${ew.customSqlSegment}
 		ORDER BY a.update_time DESC
     </select>
-	<select id="findFiles" resultType="com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto">
+	<select id="findFiles" resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
 		SELECT
 			id,
 			url,

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/service/CwReimbursementInfoService.java

@@ -2,11 +2,13 @@ package com.jeeplus.finance.reimbursementApproval.approvalInfo.service;
 
 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.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.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.finance.contractRegistration.service.ContractInfoService;
 import com.jeeplus.finance.projectRecords.domain.CwProjectRecords;
@@ -14,15 +16,20 @@ import com.jeeplus.finance.projectRecords.service.CwProjectRecordsService;
 import com.jeeplus.finance.reimbursementApproval.approvalInfo.domain.*;
 import com.jeeplus.finance.reimbursementApproval.approvalInfo.mapper.*;
 import com.jeeplus.finance.reimbursementApproval.approvalInfo.service.dto.*;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
-import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
-import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
+//import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
+//import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
+//import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
 import com.jeeplus.sys.domain.Office;
-import com.jeeplus.sys.service.OfficeService;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
+import com.jeeplus.sys.feign.IDictApi;
+import com.jeeplus.sys.feign.IOfficeApi;
+import com.jeeplus.sys.feign.IUserApi;
+import com.jeeplus.sys.feign.IWorkAttachmentApi;
+//import com.jeeplus.sys.service.OfficeService;
+import com.jeeplus.sys.service.dto.OfficeDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.DictUtils;
-import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.sys.utils.DictUtils;
+//import com.jeeplus.sys.utils.UserUtils;
 import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -60,17 +67,17 @@ public class CwReimbursementInfoService {
     @Resource
     private CwReimbursementAmountInfoMapper amountInfoMapper;
 
-    @Resource
-    private OssServiceMapper ossServiceMapper;
+//    @Resource
+//    private OssServiceMapper ossServiceMapper;
 
-    @Resource
-    private SerialnumTplService serialnumTplService;
+//    @Resource
+//    private SerialnumTplService serialnumTplService;
 
     @Resource
     private ContractInfoService infoService;
 
-    @Resource
-    private OfficeService officeService;
+//    @Resource
+//    private OfficeService officeService;
 
     @Resource
     private CwProjectRecordsService cwProjectRecordsService;
@@ -185,7 +192,7 @@ public class CwReimbursementInfoService {
         // 如果当前用户是部门主任，则可以查看部门所有的项目、自己创建的项目以及所属项目组的项目
         // 如果当前用户是员工，则可以查看自己创建的项目以及所属项目组的项目
         StringBuilder officeIds = new StringBuilder();
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+//        UserDTO userDTO = UserUtils.getCurrentUserDTO();
         List<String> manageOfficeIdList= Lists.newArrayList();
         //判定是否为会计所长 或会计部门主任
         /*if(CommonUtils.haveRoleKjsz() || CommonUtils.haveRoleCwBmzr()){
@@ -217,7 +224,7 @@ public class CwReimbursementInfoService {
     public IPage<ProgramProjectListInfo> projectList(Page<ProgramProjectListInfo> page, ProgramProjectListInfo info, String tabType) throws Exception{
 
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
 
         QueryWrapper<ProgramProjectListInfo> wrapper = QueryWrapperGenerator.buildQueryCondition(info, ProgramProjectListInfo.class);
         wrapper.eq("a.del_flag", "0");
@@ -236,7 +243,7 @@ public class CwReimbursementInfoService {
 
     public CwReimbursementInfo save(SaveInfoDto dto) throws Exception{
         // 获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         if (StringUtils.isNotEmpty(dto.getId()) && !dto.getId().equals("false")) {
             return update(dto, userDTO);
         } else {
@@ -248,7 +255,7 @@ public class CwReimbursementInfoService {
         // 生成id
         String id = UUID.randomUUID().toString().replace("-", "");
         // 生成编号
-        String no = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), dto.BIZ_CODE);
+        String no = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), dto.BIZ_CODE, TokenProvider.getCurrentToken());
         // 保存基础信息表信息
         CwReimbursementInfo info = new CwReimbursementInfo();
         BeanUtils.copyProperties(dto, info);
@@ -452,9 +459,10 @@ public class CwReimbursementInfoService {
         amountInfoLambdaQueryWrapper.eq(CwReimbursementAmountInfo::getInfoId, id);
         amountInfoMapper.delete(amountInfoLambdaQueryWrapper);
         // 删除附件信息
-        LambdaQueryWrapper<WorkAttachment> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(WorkAttachment::getAttachmentId, id);
-        ossServiceMapper.delete(wrapper);
+//        LambdaQueryWrapper<WorkAttachmentInfo> wrapper = new LambdaQueryWrapper<>();
+//        wrapper.eq(WorkAttachmentInfo::getAttachmentId, id);
+//        ossServiceMapper.delete(wrapper);
+        SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteByAttachmentId(id);
         return "操作成功";
     }
 
@@ -465,7 +473,7 @@ public class CwReimbursementInfoService {
         if (ObjectUtil.isNotEmpty(info)){
             BeanUtils.copyProperties(info, dto);
             if(StringUtils.isNotBlank(info.getDepartment())) {
-                Office byId = officeService.getById(info.getDepartment());
+                OfficeDTO byId = SpringUtil.getBean ( IOfficeApi.class ).getOfficeById(info.getDepartment());
                 if (ObjectUtil.isNotEmpty(byId)) {
                     dto.setDepartmentName(byId.getName());
                 }
@@ -501,10 +509,10 @@ public class CwReimbursementInfoService {
             List<CwReimbursementAmountInfo> amountInfos = amountInfoMapper.selectList(amountInfoLambdaQueryWrapper);
             dto.setAmountInfos(amountInfos);
             // 查询附件信息
-            List<WorkAttachmentDto> files = infoMapper.findFiles(id);
+            List<WorkAttachmentInfo> files = infoMapper.findFiles(id);
             if (CollectionUtils.isNotEmpty(files)) {
-                for (WorkAttachmentDto i : files) {
-                    i.setCreateBy(UserUtils.get(i.getBy()));
+                for (WorkAttachmentInfo i : files) {
+                    i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                 }
             }
             dto.setFiles(files);
@@ -672,7 +680,7 @@ public class CwReimbursementInfoService {
                         retureListDto.setContractName(retureListDto.getProjectName());
                         retureListDto.setProjectName("");
                     }
-                    retureListDto.setSourceType(DictUtils.getDictLabel(retureListDto.getSourceType(),"cw_reimbursement_source_type",""));
+                    retureListDto.setSourceType(SpringUtil.getBean ( IDictApi.class ).getDictLabel(retureListDto.getSourceType(),"cw_reimbursement_source_type",""));
                 }
             }
         }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/service/dto/SaveInfoDto.java

@@ -3,7 +3,7 @@ package com.jeeplus.finance.reimbursementApproval.approvalInfo.service.dto;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.domain.BaseEntity;
 import com.jeeplus.finance.reimbursementApproval.approvalInfo.domain.*;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -71,7 +71,7 @@ public class SaveInfoDto extends BaseEntity {
 
     private List<CwReimbursementAmountInfo> amountInfos;
 
-    private List<WorkAttachmentDto> files;
+    private List<WorkAttachmentInfo> files;
 
     /**
      * 报销类型

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApply/service/ReportCancellApplyService.java

@@ -3,12 +3,14 @@ package com.jeeplus.finance.reportCancellApply.service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.extra.spring.SpringUtil;
 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.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.finance.projectReport.domain.CwProjectInfoData;
 import com.jeeplus.finance.projectReport.domain.CwProjectReportCancel;
@@ -23,8 +25,9 @@ import com.jeeplus.finance.reportCancellApply.mapper.ReportCancellApplyMapper;
 import com.jeeplus.finance.reportCancellApply.service.dto.ReportInfoDto;
 import com.jeeplus.flowable.feign.IFlowableApi;
 import com.jeeplus.sys.domain.User;
+import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.sys.utils.UserUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -108,7 +111,7 @@ public class ReportCancellApplyService extends ServiceImpl<ReportCancellApplyMap
         // 如果当前用户是部门主任，则可以查看部门所有的项目、自己创建的项目以及所属项目组的项目
         // 如果当前用户是员工，则可以查看自己创建的项目以及所属项目组的项目
         StringBuilder officeIds = new StringBuilder();
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+//        UserDTO userDTO = UserUtils.getCurrentUserDTO();
         List<String> manageOfficeIdList= Lists.newArrayList();
         IPage<ReportInfoDto> list = applyMapper.getList(page, queryWrapper,officeIds.toString());
         list.getRecords().stream().forEach(i -> {
@@ -171,7 +174,7 @@ public class ReportCancellApplyService extends ServiceImpl<ReportCancellApplyMap
     @Transactional(rollbackFor = Exception.class)
     public String update(ReportInfoDto reportData) throws Exception{
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         //修改
         ReportCancellApply report = new ReportCancellApply();
         BeanUtils.copyProperties(reportData, report);
@@ -228,13 +231,13 @@ public class ReportCancellApplyService extends ServiceImpl<ReportCancellApplyMap
     @Transactional(rollbackFor = Exception.class)
     public String add(ReportInfoDto reportData) throws Exception{
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+//        UserDTO userDTO = UserUtils.getCurrentUserDTO();
 
         ReportCancellApply report = new ReportCancellApply();
         BeanUtils.copyProperties(reportData, report);
         if (ObjectUtil.isNotEmpty(report)) {
             if (StringUtils.isBlank(report.getCreateById())) {
-                report.setCreateById(UserUtils.getCurrentUserDTO().getId());
+                report.setCreateById(SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken()).getId());
                 String id = UUID.randomUUID().toString().replace("-", "");
                 report.setId(id);
             }
@@ -288,7 +291,7 @@ public class ReportCancellApplyService extends ServiceImpl<ReportCancellApplyMap
             }
         }
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         queryWrapper.eq("a.create_by_id",userDTO.getId());
         queryWrapper.eq("a.del_flag","0");
         queryWrapper.eq("a.status","5");

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApplyArchived/controller/ReportCancellApplyArchivedController.java

@@ -11,7 +11,7 @@ import com.jeeplus.finance.reportCancellApplyArchived.service.dto.ApplyArchiveRe
 import com.jeeplus.finance.reportCancellApplyArchived.service.dto.ArchivedReportInfoDto;
 import com.jeeplus.logging.annotation.ApiLog;
 import com.jeeplus.logging.constant.enums.LogTypeEnum;
-import com.jeeplus.sys.utils.DictUtils;
+//import com.jeeplus.sys.utils.DictUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApplyArchived/mapper/ReportCancellApplyArchivedMapper.java

@@ -11,7 +11,7 @@ import com.jeeplus.finance.reportCancellApplyArchived.domain.CwProjectReportAppl
 import com.jeeplus.finance.reportCancellApplyArchived.service.dto.ApplyArchiveReportDTO;
 import com.jeeplus.finance.reportCancellApplyArchived.service.dto.ArchivedReportInfoDto;
 import com.jeeplus.finance.reportCancellApplyArchived.service.dto.CwWorkAttachmentArchiveDto;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import com.jeeplus.sys.service.dto.UserDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -44,7 +44,7 @@ public interface ReportCancellApplyArchivedMapper extends BaseMapper<CwProjectRe
     @InterceptorIgnore(tenantLine = "true")
     void deleteFileInfo(String attachmentId);
 
-    List<WorkAttachment> findList(@Param("id") String id);
+    List<WorkAttachmentInfo> findList(@Param("id") String id);
 
     Integer findIsExit(@Param("id") String id, @Param("name")String name);
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApplyArchived/mapper/xml/ReportCancellApplyArchivedMapper.xml

@@ -140,7 +140,7 @@
         select * from cw_project_report_cancell_apply_archived where archive_id = #{id}
     </select>
     <select id="findList"
-            resultType="com.jeeplus.pubmodules.oss.domain.WorkAttachment">
+            resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
         SELECT * FROM work_attachment WHERE del_flag = 0 AND attachment_id = #{id}
     </select>
     <select id="findIsExit" resultType="java.lang.Integer">

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApplyArchived/service/ReportCancellApplyArchivedService.java

@@ -1,12 +1,15 @@
 package com.jeeplus.finance.reportCancellApplyArchived.service;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.druid.sql.visitor.functions.If;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.finance.projectRecords.service.dto.CwProjectRecordsDTO;
 import com.jeeplus.finance.projectReport.domain.CwProjectInfoData;
@@ -21,12 +24,15 @@ import com.jeeplus.finance.reportCancellApplyArchived.service.dto.ApplyArchiveRe
 import com.jeeplus.finance.reportCancellApplyArchived.service.dto.ArchivedReportInfoDto;
 import com.jeeplus.finance.reportCancellApplyArchived.service.dto.CwWorkAttachmentArchiveDto;
 import com.jeeplus.flowable.feign.IFlowableApi;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
-import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
-import com.jeeplus.pubmodules.oss.service.OssService;
-import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
+//import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
+//import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
+//import com.jeeplus.pubmodules.oss.service.OssService;
+//import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
+import com.jeeplus.sys.feign.IUserApi;
+import com.jeeplus.sys.feign.IWorkAttachmentApi;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.sys.utils.UserUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.editor.language.json.converter.util.CollectionUtils;
 import org.springframework.beans.BeanUtils;
@@ -49,11 +55,11 @@ public class ReportCancellApplyArchivedService extends ServiceImpl<ReportCancell
     @Resource
     private ReportCancellApplyArchivedMapper applyMapper;
 
-    @Resource
-    private SerialnumTplService serialnumTplService;
+//    @Resource
+//    private SerialnumTplService serialnumTplService;
 
-    @Resource
-    private OssServiceMapper ossServiceMapper;
+//    @Resource
+//    private OssServiceMapper ossServiceMapper;
 
     @Resource
     private ReportCancellApplyMapper cancellApplyMapper;
@@ -64,8 +70,8 @@ public class ReportCancellApplyArchivedService extends ServiceImpl<ReportCancell
     @Resource
     private CwProjectReportMapper reportMapper;
 
-    @Resource
-    private OssService ossService;
+//    @Resource
+//    private OssService ossService;
 
     @Resource
     private IFlowableApi flowTaskService;
@@ -116,7 +122,7 @@ public class ReportCancellApplyArchivedService extends ServiceImpl<ReportCancell
         // 如果当前用户是部门主任，则可以查看部门所有的项目、自己创建的项目以及所属项目组的项目
         // 如果当前用户是员工，则可以查看自己创建的项目以及所属项目组的项目
         StringBuilder officeIds = new StringBuilder();
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+//        UserDTO userDTO = UserUtils.getCurrentUserDTO();
         List<String> manageOfficeIdList= Lists.newArrayList();
         IPage<ArchivedReportInfoDto> list = applyMapper.getList(page, queryWrapper,officeIds.toString());
         list.getRecords().stream().forEach(i -> {
@@ -253,7 +259,7 @@ public class ReportCancellApplyArchivedService extends ServiceImpl<ReportCancell
     @Transactional(rollbackFor = Exception.class)
     public String add(ApplyArchiveReportDTO reportDTO) throws Exception {
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         String id = UUID.randomUUID().toString().replace("-", "");
         CwProjectReportApplyArchive applyArchive = new CwProjectReportApplyArchive();
         BeanUtils.copyProperties(reportDTO, applyArchive);
@@ -284,7 +290,7 @@ public class ReportCancellApplyArchivedService extends ServiceImpl<ReportCancell
     @Transactional(rollbackFor = Exception.class)
     public String update(ApplyArchiveReportDTO reportData, String id,String archiveId,String procInsId,String defId) throws Exception {
         //获取当前登录人信息
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
 
         CwProjectReportApplyArchive cwProjectReportArchive = new CwProjectReportApplyArchive();
         BeanUtils.copyProperties(reportData, cwProjectReportArchive);
@@ -324,11 +330,11 @@ public class ReportCancellApplyArchivedService extends ServiceImpl<ReportCancell
             names = names + "," + dto.getUrl();
         }
         //查询保存的附件信息
-        List<WorkAttachment> infoList = applyMapper.findList(id);
+        List<WorkAttachmentInfo> infoList = applyMapper.findList(id);
         if (CollectionUtils.isNotEmpty(infoList)) {
-            for (WorkAttachment i : infoList) {
+            for (WorkAttachmentInfo i : infoList) {
                 if (!names.contains(i.getUrl())) {
-                    ossServiceMapper.deleteById(i.getId());
+                    SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteById(i.getId());
                 }
             }
         }
@@ -337,7 +343,7 @@ public class ReportCancellApplyArchivedService extends ServiceImpl<ReportCancell
             //判断是否存在
             Integer isExit = applyMapper.findIsExit(id, dto.getName());
             if (isExit == 0) {
-                WorkAttachment i = new WorkAttachment();
+                WorkAttachmentInfo i = new WorkAttachmentInfo();
                 //包含了url、size、name
                 i.setId(UUID.randomUUID().toString().replace("-", ""));
 //                i.getCreateBy().setId(userDTO.getId());
@@ -356,7 +362,13 @@ public class ReportCancellApplyArchivedService extends ServiceImpl<ReportCancell
                 i.setAttachmentFlag("cwWorkContract");
                 i.setFileSize(dto.getSize());
                 i.setSort(j);
-                ossServiceMapper.insertWorkAttachment(i, userDTO);
+                Map<String,String> map = new HashMap<>();
+                String workAttachment = JSON.toJSONString((i));
+                String userDTOInfo = JSON.toJSONString((userDTO));
+                map.put("workAttachment",workAttachment);
+                map.put("userDTO",userDTOInfo);
+                SpringUtil.getBean ( IWorkAttachmentApi.class ).insertWorkAttachment(map);
+//                ossServiceMapper.insertWorkAttachment(i, userDTO);
                 j++;
             }
         }
@@ -373,7 +385,7 @@ public class ReportCancellApplyArchivedService extends ServiceImpl<ReportCancell
     public void saveFiles(List<CwWorkAttachmentArchiveDto> list, UserDTO userDTO, String id) {
         int j = 1;
         for (CwWorkAttachmentArchiveDto dto : list) {
-            WorkAttachment i = new WorkAttachment();
+            WorkAttachmentInfo i = new WorkAttachmentInfo();
             //包含了url、size、name
             i.setId(UUID.randomUUID().toString().replace("-", ""));
 //            i.getCreateBy().setId(userDTO.getId());
@@ -392,7 +404,13 @@ public class ReportCancellApplyArchivedService extends ServiceImpl<ReportCancell
             i.setAttachmentFlag("cwWorkContract");
             i.setFileSize(dto.getSize());
             i.setSort(j);
-            ossServiceMapper.insertWorkAttachment(i, userDTO);
+            Map<String,String> map = new HashMap<>();
+            String workAttachment = JSON.toJSONString((i));
+            String userDTOInfo = JSON.toJSONString((userDTO));
+            map.put("workAttachment",workAttachment);
+            map.put("userDTO",userDTOInfo);
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).insertWorkAttachment(map);
+//            ossServiceMapper.insertWorkAttachment(i, userDTO);
             j++;
         }
     }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/controller/CwWorkClientController.java

@@ -2,6 +2,7 @@ package com.jeeplus.finance.workClientInfo.controller;
 
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.util.ObjectUtil;
+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.extension.plugins.pagination.Page;
@@ -19,7 +20,8 @@ import com.jeeplus.finance.workClientInfo.service.dto.CwWorkClientTempDTO;
 import com.jeeplus.flowable.feign.IFlowableApi;
 import com.jeeplus.logging.annotation.ApiLog;
 import com.jeeplus.logging.constant.enums.LogTypeEnum;
-import com.jeeplus.sys.utils.DictUtils;
+//import com.jeeplus.sys.utils.DictUtils;
+import com.jeeplus.sys.feign.IDictApi;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -199,25 +201,25 @@ public class CwWorkClientController {
         }
         result.stream().forEach(item -> {
             if (StringUtils.isNotBlank(item.getType())){
-                item.setType(DictUtils.getDictLabel(item.getType(),"cw_work_client_type",""));
+                item.setType(SpringUtil.getBean ( IDictApi.class ).getDictLabel(item.getType(),"cw_work_client_type",""));
             }
             if (StringUtils.isNotBlank(item.getIndustry())){
-                item.setIndustry(DictUtils.getDictLabel(item.getIndustry(),"cw_work_client_industry",""));
+                item.setIndustry(SpringUtil.getBean ( IDictApi.class ).getDictLabel(item.getIndustry(),"cw_work_client_industry",""));
             }
             if (StringUtils.isNotBlank(item.getIsListed())) {
-                item.setIsListed(DictUtils.getDictLabel(item.getIsListed(),"yes_no",""));
+                item.setIsListed(SpringUtil.getBean ( IDictApi.class ).getDictLabel(item.getIsListed(),"yes_no",""));
             }
             if (StringUtils.isNotBlank(item.getAffiliation())){
-                item.setAffiliation(DictUtils.getDictLabel(item.getAffiliation(),"cw_work_client_affiliation",""));
+                item.setAffiliation(SpringUtil.getBean ( IDictApi.class ).getDictLabel(item.getAffiliation(),"cw_work_client_affiliation",""));
             }
             if (StringUtils.isNotBlank(item.getOwnershipType())){
-                item.setOwnershipType(DictUtils.getDictLabel(item.getOwnershipType(),"cw_work_client_ownership_type",""));
+                item.setOwnershipType(SpringUtil.getBean ( IDictApi.class ).getDictLabel(item.getOwnershipType(),"cw_work_client_ownership_type",""));
             }
             if (StringUtils.isNotBlank(item.getReportType())){
-                item.setReportType(DictUtils.getDictLabel(item.getReportType(),"cw_work_client_report_type",""));
+                item.setReportType(SpringUtil.getBean ( IDictApi.class ).getDictLabel(item.getReportType(),"cw_work_client_report_type",""));
             }
             if (StringUtils.isNotBlank(item.getStatus())){
-                item.setStatus(DictUtils.getDictLabel(item.getStatus(),"cw_status",""));
+                item.setStatus(SpringUtil.getBean ( IDictApi.class ).getDictLabel(item.getStatus(),"cw_status",""));
             }
         });
         EasyPoiUtil.exportExcel ( result, sheetName,  sheetName, CwWorkClientBaseDTO.class, fileName, response );

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/mapper/xml/CwWorkClientBaseMapper.xml

@@ -54,12 +54,12 @@
             <result property="requestUserId" column="request_user_id" jdbcType="VARCHAR"/>
             <result property="taskId" column="task_id" jdbcType="VARCHAR"/>
             <association property="cwWorkClientTypeDTO" column="id" select="getType" javaType="com.jeeplus.finance.workClientInfo.service.dto.CwWorkClientTypeDTO"></association>
-            <collection property="workAttachmentDtoList" ofType="com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto" column="id" select="getFileList"></collection>
+            <collection property="workAttachmentDtoList" ofType="com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO" column="id" select="getFileList"></collection>
             <collection property="cwWorkClientBillingDTOList" ofType="com.jeeplus.finance.workClientInfo.service.dto.CwWorkClientBillingDTO" column="id" select="getBilling"></collection>
             <collection property="cwWorkClientContactDTOList" ofType="com.jeeplus.finance.workClientInfo.service.dto.CwWorkClientContactDTO" column="id" select="getContact"></collection>
     </resultMap>
 
-    <resultMap id="AttachmentMap" type="com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto">
+    <resultMap id="AttachmentMap" type="com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO">
         <id property="id" column="id" jdbcType="VARCHAR"/>
         <result property="createBy.id" column="create_by_id" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/service/CwWorkClientService.java

@@ -3,6 +3,7 @@ package com.jeeplus.finance.workClientInfo.service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
@@ -13,6 +14,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.finance.invoice.util.FlowTaskUtil;
 import com.jeeplus.finance.projectRecords.domain.CwProjectClientInfo;
@@ -28,12 +30,14 @@ import com.jeeplus.finance.workClientInfo.service.mapstruct.CwWorkClientBillingW
 import com.jeeplus.finance.workClientInfo.service.mapstruct.CwWorkClientContactWrapper;
 import com.jeeplus.finance.workClientInfo.service.mapstruct.CwWorkClientTypeWrapper;
 import com.jeeplus.flowable.feign.IFlowableApi;
-import com.jeeplus.pubmodules.oss.service.OssService;
-import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
+//import com.jeeplus.pubmodules.oss.service.OssService;
+//import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
 import com.jeeplus.sys.domain.User;
-import com.jeeplus.sys.mapper.UserMapper;
+import com.jeeplus.sys.feign.IUserApi;
+import com.jeeplus.sys.feign.IWorkAttachmentApi;
+//import com.jeeplus.sys.mapper.UserMapper;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.UserUtils;
+//import com.jeeplus.sys.utils.UserUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -64,16 +68,16 @@ public class CwWorkClientService extends ServiceImpl<CwWorkClientBaseMapper, CwW
     private CwManageLevelTypeService cwManageLevelTypeService;
     @Resource
     private CwOrganizationTypeService cwOrganizationTypeService;
-    @Resource
-    private SerialnumTplService serialnumTplService;
-    @Resource
-    private OssService ossService;
+//    @Resource
+//    private SerialnumTplService serialnumTplService;
+//    @Resource
+//    private OssService ossService;
     @Resource
     private CwProjectClientInfoMapper cwProjectClientInfoMapper;
     @Resource
     private CwWorkClientTempService cwWorkClientTempService;
-    @Resource
-    private UserMapper userMapper;
+//    @Resource
+//    private UserMapper userMapper;
 
     @Autowired
     private IFlowableApi iFlowableApi;
@@ -107,7 +111,7 @@ public class CwWorkClientService extends ServiceImpl<CwWorkClientBaseMapper, CwW
                 }
             }
             if (StringUtils.isNotBlank(cwWorkClientBaseDTO.getUpdateUserName())) {
-                List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, cwWorkClientBaseDTO.getUpdateUserName()));
+                List<User> userList = SpringUtil.getBean ( IUserApi.class ).selectListByName(cwWorkClientBaseDTO.getUpdateUserName());
                 if (CollectionUtil.isNotEmpty(userList)) {
                     List<String> userIds = userList.stream().distinct().map(User::getId).collect(Collectors.toList());
                     if (CollectionUtil.isNotEmpty(userIds)) {
@@ -123,8 +127,15 @@ public class CwWorkClientService extends ServiceImpl<CwWorkClientBaseMapper, CwW
         IPage<CwWorkClientBaseDTO> list = cwWorkClientBaseMapper.findList(page, queryWrapper);
         List<CwWorkClientBaseDTO> records = list.getRecords();
         //处理数据
+        Map<String,String> map = new HashMap<>();
         String data = JSON.toJSONString((records));
-        String datas = iFlowableApi.taskDispose(data);
+        String currentToken = TokenProvider.getCurrentToken();
+
+        map.put("data",data);
+        map.put("currentToken",currentToken);
+
+
+        String datas = iFlowableApi.taskDispose(map);
         List<CwWorkClientBaseDTO> cwWorkClientBaseDTOS = JSON.parseObject(datas, new TypeReference<List<CwWorkClientBaseDTO>>() {});
         list.setRecords(cwWorkClientBaseDTOS);
         return list;
@@ -221,8 +232,8 @@ public class CwWorkClientService extends ServiceImpl<CwWorkClientBaseMapper, CwW
         CwWorkClientBase cwWorkClientBase = CwWorkClientBaseWrapper.INSTANCE.toEntity(cwWorkClientBaseDTO);
         if(ObjectUtil.isNotEmpty(cwWorkClientBase)){
             if(StringUtils.isBlank(cwWorkClientBase.getId())){
-                UserDTO userDTO = UserUtils.getCurrentUserDTO();
-                String no = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), CwWorkClientBaseDTO.BIZ_CODE);
+                UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
+                String no = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), CwWorkClientBaseDTO.BIZ_CODE,TokenProvider.getCurrentToken());
                 cwWorkClientBase.setNo(no);
                 cwWorkClientBase.setUpdateUser(userDTO.getId());
                 cwWorkClientBase.setStatus("0");
@@ -231,7 +242,16 @@ public class CwWorkClientService extends ServiceImpl<CwWorkClientBaseMapper, CwW
         this.saveOrUpdate(cwWorkClientBase);
         if (ObjectUtil.isNotEmpty(cwWorkClientBaseDTO)) {
             // 附件
-            ossService.saveOrUpdateFileList(cwWorkClientBaseDTO.getWorkAttachmentDtoList(),cwWorkClientBase.getId(),"cw_work_client");
+//            ossService.saveOrUpdateFileList(cwWorkClientBaseDTO.getWorkAttachmentDtoList(),cwWorkClientBase.getId(),"cw_work_client");
+            Map<String,String> map = new HashMap<>();
+            String fileList = JSON.toJSONString((cwWorkClientBaseDTO.getWorkAttachmentDtoList()));
+            String attachmentId = cwWorkClientBase.getId();
+            String attachmentFlag = "cw_work_client";
+            map.put("fileList",fileList);
+            map.put("attachmentId",attachmentId);
+            map.put("attachmentFlag",attachmentFlag);
+            map.put("currentToken", TokenProvider.getCurrentToken ( ));
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).saveOrUpdateFileList(map);
             // 客户类型
             if (ObjectUtil.isNotEmpty(cwWorkClientBaseDTO.getCwWorkClientTypeDTO())){
                 CwWorkClientType cwWorkClientType = CwWorkClientTypeWrapper.INSTANCE.toEntity(cwWorkClientBaseDTO.getCwWorkClientTypeDTO());
@@ -416,7 +436,7 @@ public class CwWorkClientService extends ServiceImpl<CwWorkClientBaseMapper, CwW
 
     // 查询社会统一信用代码是否存在
     public ResponseEntity<Map<String,String>> queryUscCodeIsUse(String uscCode) {
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         Map<String,String> map = new HashMap<>();
         // 根据社会统一信用代码查询
         List<CwWorkClientBase> list = this.list(new QueryWrapper<CwWorkClientBase>().lambda().eq(CwWorkClientBase::getUscCode, uscCode).orderByDesc(CwWorkClientBase::getCreateTime).last("limit 1"));
@@ -447,7 +467,7 @@ public class CwWorkClientService extends ServiceImpl<CwWorkClientBaseMapper, CwW
 
     // 查询客户名称是否存在
     public ResponseEntity<Map<String,String>> queryNameIsUse(String name) {
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         Map<String,String> map = new HashMap<>();
         // 根据客户名称查询
         List<CwWorkClientBase> list = this.list(new QueryWrapper<CwWorkClientBase>().lambda().eq(CwWorkClientBase::getName, name).orderByDesc(CwWorkClientBase::getCreateTime).last("limit 1"));
@@ -508,7 +528,7 @@ public class CwWorkClientService extends ServiceImpl<CwWorkClientBaseMapper, CwW
                 queryWrapper.eq("temp.client_id", tempDto.getClientId());
             }
             if (StringUtils.isNotBlank(tempDto.getCreateName())) {
-                List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, tempDto.getCreateName()));
+                List<User> userList = SpringUtil.getBean ( IUserApi.class ).selectListByName(tempDto.getCreateName());
                 if (CollectionUtil.isNotEmpty(userList)) {
                     List<String> userIds = userList.stream().distinct().map(User::getId).collect(Collectors.toList());
                     if (CollectionUtil.isNotEmpty(userIds)) {

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/service/dto/CwWorkClientBaseDTO.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.domain.BaseEntity;
 import com.jeeplus.core.service.dto.BaseDTO;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -186,7 +186,7 @@ public class CwWorkClientBaseDTO extends BaseDTO {
     /**
      * 附件
      */
-    private List<WorkAttachmentDto> workAttachmentDtoList;
+    private List<WorkAttachmentInfo> workAttachmentDtoList;
 
     /**
      * 创建时间

jeeplus-modules/jeeplus-finance/src/main/resources/bootstrap.yml

@@ -116,7 +116,7 @@ company_round_seal_id_vertical: 2898043523878957918
 #公司方章
 company_parties_seal_id: 2894163220106129636
 #审定单用印流程id
-approval_category_id: 3032265972836684447
+approval_category_id: 3032139783803457567
 #报告用印流程id
 report_category_id: 2895618951099527314
 ##审定内用印流程id

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/common/handler/ExtUserTaskActivityBehavior.java

@@ -27,6 +27,8 @@ import org.flowable.task.api.history.HistoricTaskInstance;
 import org.flowable.task.service.TaskService;
 import org.flowable.task.service.impl.persistence.entity.TaskEntity;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 
 import java.util.*;
 
@@ -45,6 +47,7 @@ public class ExtUserTaskActivityBehavior extends UserTaskActivityBehavior {
      */
     @Override
     protected void handleAssignments(TaskService taskService, String assignee, String owner, List <String> candidateUsers, List <String> candidateGroups, TaskEntity task, ExpressionManager expressionManager, DelegateExecution execution, ProcessEngineConfigurationImpl processEngineConfiguration) {
+        String currentToken = TokenProvider.getCurrentToken();
 
         Process process = SpringUtil.getBean ( RepositoryService.class ).getBpmnModel ( task.getProcessDefinitionId ( ) ).getMainProcess ( );
         FlowElement flowElement = process.getFlowElement ( task.getTaskDefinitionKey ( ) );
@@ -122,8 +125,8 @@ public class ExtUserTaskActivityBehavior extends UserTaskActivityBehavior {
                         if(flowAssignee.getValue ().contains("currentUserSql:")){
                             //对应sql为：select su.* from sys_user_role a left join sys_role sr on sr.id = a.role_id left join sys_user su on su.id = a.user_id left join sys_office so on so.id = su.office_id where sr.en_name= 'bmzr' and so.id = (select office_id from sys_user where id = @currentUser.id)
                             //用于查询当前登录人的部门主任人员信息
-                            //获取当前登录人信息
-                            UserDTO currentUserDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
+
+                            UserDTO currentUserDTO = SpringUtil.getBean ( IUserApi.class ).getByToken (currentToken);
                             String sql = flowAssignee.getValue ();
                             if(sql.contains("@currentUser.id")){
                                 //将标志进行去除
@@ -140,7 +143,7 @@ public class ExtUserTaskActivityBehavior extends UserTaskActivityBehavior {
                         if(flowAssignee.getValue ().contains("cwCurrentUserSql:")){
                             //对应sql为：select su.* from sys_user_role a left join sys_role sr on sr.id = a.role_id left join sys_user su on su.id = a.user_id left join sys_office so on so.id = su.office_id where sr.en_name= 'bmzr' and so.id = (select office_id from sys_user where id = @currentUser.id)
                             //用于查询当前登录人的部门主任人员信息
-                            UserDTO currentUserDTO  = SpringUtil.getBean ( IUserApi.class ).getLoginUser ();
+                            UserDTO currentUserDTO  = SpringUtil.getBean ( IUserApi.class ).getByToken (currentToken);
                             String sql = flowAssignee.getValue ();
                             if(sql.contains("@currentUser.id")){
                                 //将标志进行去除
@@ -162,8 +165,7 @@ public class ExtUserTaskActivityBehavior extends UserTaskActivityBehavior {
                         if(flowAssignee.getValue ().contains("zsbxCurrentUserSql:")){
                             //对应sql为：select su.* from sys_user_role a left join sys_role sr on sr.id = a.role_id left join sys_user su on su.id = a.user_id left join sys_office so on so.id = su.office_id where sr.en_name= 'bmzr' and so.id = (select office_id from sys_user where id = @currentUser.id)
                             //用于查询当前登录人的部门主任人员信息
-                            //获取当前登录人信息
-                            UserDTO currentUserDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
+                            UserDTO currentUserDTO = SpringUtil.getBean ( IUserApi.class ).getByToken (currentToken);
                             String sql = flowAssignee.getValue ();
                             if(sql.contains("@currentUser.id")){
                                 //将标志进行去除

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/controller/FlowableTaskController.java

@@ -585,8 +585,8 @@ public class FlowableTaskController {
     }
 
     @ApiOperation(value = "新增")
-    @GetMapping("/add")
-    public String add(Map<String ,String > map) throws Exception{
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    public String add(@RequestBody Map<String ,String > map) throws Exception{
         String taskId = map.get("taskId");
         String title = map.get("title");
         String defId = map.get("defId");
@@ -595,11 +595,21 @@ public class FlowableTaskController {
         String createTime = map.get("createTime");
         String noticeName = map.get("noticeName");
         String noticeId = map.get("noticeId");
-        return noticeServicel.add(taskId, title, defId, taskName, createUser, createTime, noticeName, noticeId);
+        String createById = map.get("createById");
+        return noticeServicel.add(taskId, title, defId, taskName, createUser, createTime, noticeName, noticeId,createById);
     }
 
-    @RequestMapping(value = "/flowable/task/taskDispose", method = RequestMethod.POST)
-    public String taskDispose(@RequestBody String data) {
-        return flowTaskService.taskDispose(data);
+    @RequestMapping(value = "/taskDispose", method = RequestMethod.POST)
+    public String taskDispose(@RequestBody Map<String ,String > map) {
+        String data = map.get("data");
+        String currentToken = map.get("currentToken");
+        return flowTaskService.taskDispose(data,currentToken);
+    }
+
+    @GetMapping("/list")
+    @ApiOperation(value = "待办列表")
+    public ResponseEntity noticeList(Page<MyNoticeList> page, String type, String title, String taskName) {
+        Page<MyNoticeList> voPage = noticeServicel.noticeList(page, type, title, taskName);
+        return ResponseEntity.ok (voPage);
     }
 }

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/controller/MyNoticeController.java

@@ -0,0 +1,69 @@
+package com.jeeplus.flowable.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
+import com.jeeplus.flowable.model.MyNoticeList;
+import com.jeeplus.flowable.service.MyNoticeService;
+import com.jeeplus.logging.annotation.ApiLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@Api(value = "我的通知")
+@RequestMapping("/flowable/notice")
+public class MyNoticeController {
+
+    @Resource
+    private MyNoticeService service;
+
+    @GetMapping("/list")
+    @ApiOperation(value = "待办列表")
+    public ResponseEntity noticeList(Page<MyNoticeList> page, String type, String title, String taskName) {
+        Page<MyNoticeList> voPage = service.noticeList(page, type, title, taskName);
+        return ResponseEntity.ok (voPage);
+    }
+
+    @ApiOperation(value = "新增")
+    @GetMapping("/add")
+    public String add(String taskId, String title, String defId, String taskName, String createUser, String createTime, String noticeName, String noticeId) throws Exception{
+        return service.add(taskId, title, defId, taskName, createUser, createTime, noticeName, noticeId,"");
+    }
+
+    @ApiOperation(value = "修改已读状态")
+    @GetMapping("/update")
+    public String update(String taskId, String noticeId) {
+        return service.update(taskId, noticeId);
+    }
+
+    @ApiOperation(value = "库存提醒修改已读状态")
+    @GetMapping("/stockUpdate")
+    public String stockUpdate(MyNoticeList myNoticeList) {
+        return service.stockUpdate(myNoticeList);
+    }
+
+    /**
+     * 部分标记为已读
+     * @param ids
+     * @return
+     */
+    @ApiLog("部分标记为已读")
+    @PostMapping("portionRead")
+    public ResponseEntity portionRead(String ids) {
+        String idArray[] =ids.split(",");
+        service.portionRead (Lists.newArrayList (idArray));
+        return ResponseEntity.ok ("部分标记为已读成功");
+    }
+
+    @ApiOperation(value = "全部标记已读")
+    @PostMapping("/readAll")
+    public String readAll() {
+        return service.readAll();
+    }
+}