Browse Source

同步管理报表新增年份选择

wzy 5 months ago
parent
commit
b0f209ab6c

+ 3 - 3
mjava-zhixingtongde/src/main/java/com/malk/zhixingtongde/controller/ZxtdReportConroller.java

@@ -93,9 +93,9 @@ public class ZxtdReportConroller {
 
     //上传文件至钉盘
     @PostMapping("/uploadToDingTalk")
-    public McR uploadToDingTalk(HttpServletResponse response,String userId) {
+    public McR uploadToDingTalk(HttpServletResponse response,String userId,String year) {
         try {
-            zxtdReportService.uploadToDingTalk(response,userId);
+            zxtdReportService.uploadToDingTalk(response,userId,year);
         }catch (Exception e){
             return McR.error(McREnum.UNKNOWN_EXCEPTION.toString(),"上传文件至钉盘失败");
         }
@@ -105,7 +105,7 @@ public class ZxtdReportConroller {
 
     //现金流量表上传文件至钉盘
     @PostMapping("/uploadToDingTalk2")
-    public McR uploadToDingTalk(HttpServletResponse response,String userId,String month) {
+    public McR uploadToDingTalk2(HttpServletResponse response,String userId,String month) {
         try {
             zxtdReportService.uploadToDingTalk2(response,userId,month);
             System.out.println("");

+ 1 - 1
mjava-zhixingtongde/src/main/java/com/malk/zhixingtongde/service/ZxtdReportService.java

@@ -56,7 +56,7 @@ public interface ZxtdReportService {
      * @param userId
      */
     @Async
-    void uploadToDingTalk(HttpServletResponse response,String userId);
+    void uploadToDingTalk(HttpServletResponse response,String userId,String year);
 
     /**
      * 导出应付账款明细表

+ 2 - 2
mjava-zhixingtongde/src/main/java/com/malk/zhixingtongde/service/impl/ZxtdReportServiceImpl.java

@@ -448,14 +448,14 @@ public class ZxtdReportServiceImpl implements ZxtdReportService {
 
     @Override
     @Async
-    public void uploadToDingTalk(HttpServletResponse response,String userId) {
+    public void uploadToDingTalk(HttpServletResponse response,String userId,String year) {
         //获取当前时间戳
         long beginTimestamp = System.currentTimeMillis();
         System.out.println("开始上传管理报表:" + DateUtil.format(new Date(beginTimestamp), "yyyy-MM-dd HH:mm:ss"));
 
         //父节点dentryUuid
         String parentDentryUuid = "ZX6GRezwJlRgBQmQCGE54DMQWdqbropQ";//知行同德
-        String year = DateUtil.year(new Date()) + "";
+//        String year = DateUtil.year(new Date()) + "";
 
         exportAll(response, year);