Browse Source

调度计划修改

zhouger 6 tháng trước cách đây
mục cha
commit
f074c13cf8

+ 6 - 6
src/main/java/fi/ar/formplugin/AcctagerptPlugin.java

@@ -24,16 +24,16 @@ public class AcctagerptPlugin extends AbstractReportFormPlugin implements Plugin
     @Override
     public void afterCreateNewData(EventObject e) {
         super.afterCreateNewData(e);
-
         // 获取自定义参数
         FormShowParameter formShowParameter = this.getView().getFormShowParameter();
         Object text = formShowParameter.getCustomParam("parentid");
-        Object qAsstacttype = formShowParameter.getCustomParam("q_asstacttype");
-        if (!("").equals(qAsstacttype)) {
-            this.getModel().setValue("q_asstacttype",qAsstacttype);
+        Object flag = formShowParameter.getCustomParam("flag");
+        if (flag.equals("1")) {
+            Object qAsstacttype = formShowParameter.getCustomParam("q_asstacttype");
+            if (!("").equals(qAsstacttype)) {
+                this.getModel().setValue("q_asstacttype",qAsstacttype);
+            }
         }
-        //应收挂账单
-        DynamicObject dynamicObject= BusinessDataServiceHelper.loadSingle(text,"ar_finarbill");
 
     }
 

+ 1 - 0
src/main/java/fi/ar/formplugin/FinarbillFormPlugin.java

@@ -39,6 +39,7 @@ public class FinarbillFormPlugin extends AbstractFormPlugin implements Plugin {
             ReportShowParameter showParameter = new ReportShowParameter();
             //设置参数传给子界面
             showParameter.setCustomParam("parentid",id);
+            showParameter.setCustomParam("flag","1");
             showParameter.setCustomParam("q_asstacttype","bd_supplier");
             showParameter.setFormId("ar_acctagerpt_n");
             showParameter.setCaption("账龄分析表");

+ 22 - 12
src/main/java/sys/sc/formplugin/TestPlugin.java

@@ -70,10 +70,6 @@ public class TestPlugin  extends AbstractListPlugin {
         //转换日期格式
         SimpleDateFormat sf=new SimpleDateFormat("yyyyMMdd");
         String datestr=sf.format(newDate);
-        //真实路径
-        if (nckd_url.equals("/var/appstatic/")) {
-            nckd_url="/home/kingdee/cosmic/nginx-appstatic/store/appstatic/";
-        }
         //文件完整路径
         String realPath = nckd_url+datestr+File.separator+nckd_filename;
         return realPath;
@@ -88,7 +84,7 @@ public class TestPlugin  extends AbstractListPlugin {
                     "nckd_employeeid", "nckd_name", "nckd_gender", "nckd_nl", "nckd_zzmm",
                     "nckd_zgxl", "nckd_szdwname", "nckd_szdwcode", "nckd_orgidname", "nckd_orgidcode",
                     "nckd_yjbmname", "nckd_yjbmcode", "nckd_posidname", "nckd_posidcode", "nckd_yggxlb",
-                    "nckd_status", "nckd_sjh"
+                    "nckd_status","nckd_sjh"
             );
             List<DynamicObject> createdataList = new ArrayList<>();
             List<DynamicObject> updatedataList = new ArrayList<>();
@@ -107,10 +103,6 @@ public class TestPlugin  extends AbstractListPlugin {
                     line = line.replace("|$|", "");
                     //空格符号,根据这个符号分割
                     String[] fields = line.split("\u0001",-1);
-                    //如果获取的数据行不等于预设字段的行,则跳过这行数据
-//                    if (fields.length != selector.size()) {
-//                        continue;
-//                    }
                     //获取工号
                     String gonghao = fields[0];
                     boolean isUpdated = false;
@@ -584,7 +576,7 @@ public class TestPlugin  extends AbstractListPlugin {
         }
         //生成数据
         else if ("scsj".equals(e.getOperateKey())) {//从文件读取数据插入基础资料
-            generateDataFile(filePath);
+            generateDataFile("D:/test.dat");
 //            try {
 //                generateDataFile(getFileUrl("organduserurl"));
 //
@@ -806,7 +798,25 @@ public class TestPlugin  extends AbstractListPlugin {
         //
         if("testaaa".equals(e.getOperateKey()))
         {
-
+            //组织人员接口配置信息获取
+            DynamicObject nckd_jkpzxx= BusinessDataServiceHelper
+                    .loadSingle("nckd_jkpzxx", new QFilter[]{new QFilter("number", "=", "organduserurl")});
+            //取文件名
+            String nckd_filename=nckd_jkpzxx.getString("nckd_filename");
+            //获取文件路径
+            String nckd_url=nckd_jkpzxx.getString("nckd_url");
+            //当前日期
+            Date currentDate=new Date();
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(currentDate);
+            calendar.add(Calendar.DATE, -1); // 将日期减少一天
+            //日期减少一天
+            Date newDate = calendar.getTime();
+            //转换日期格式
+            SimpleDateFormat sf=new SimpleDateFormat("yyyyMMdd");
+            String datestr=sf.format(newDate);
+            //文件完整路径
+            String realPath = nckd_url+datestr+"/"+nckd_filename+"_"+datestr+".dat";
 
         }
 
@@ -874,7 +884,7 @@ public class TestPlugin  extends AbstractListPlugin {
                 //客户号
                 data.set("number",dataList.getString("nckd_cust_id"));
                 //客户名
-                data.set("name",dataList.getString("nckd_cust_id"));
+                data.set("name",dataList.getString("nckd_cust_name"));
                 //设置状态为可用
                 data.set("enable","1");
                 //设置状态为已审核

+ 9 - 5
src/main/java/sys/sc/task/UpdateBankDailyTask.java

@@ -67,7 +67,7 @@ public class UpdateBankDailyTask extends AbstractTask {
             List<DynamicObject> createdataList = new ArrayList<>();
             List<DynamicObject> updatedataList = new ArrayList<>();
             //文件路径
-            String fileurl = getFileUrl();
+            String fileurl = getFileUrl("hmhhurl");
             //基础资料
             DynamicObjectType dynamicObjectType = EntityMetadataCache.getDataEntityType(bd_bebank);
             //国家基础资料(中国)
@@ -186,12 +186,15 @@ public class UpdateBankDailyTask extends AbstractTask {
     }
 
     //根据接口配置信息获取组织人员,拼接服务器文件路径url,参数为urlcode接口配置信息编码
-    public String getFileUrl()
+    public String getFileUrl(String urlcode)
     {
+        //组织人员接口配置信息获取
+        DynamicObject nckd_jkpzxx= BusinessDataServiceHelper
+                .loadSingle("nckd_jkpzxx", new QFilter[]{new QFilter("number", "=", urlcode)});
         //取文件名
-        String nckd_filename=interFaceImgUtils.getFileName();
+        String nckd_filename= nckd_jkpzxx.getString("nkcd_filename");
         //获取文件路径
-        String nckd_url=interFaceImgUtils.getServerUrl();
+        String nckd_url=nckd_jkpzxx.getString("nckd_url");
         //当前日期
         Date currentDate=new Date();
         Calendar calendar = Calendar.getInstance();
@@ -203,7 +206,8 @@ public class UpdateBankDailyTask extends AbstractTask {
         SimpleDateFormat sf=new SimpleDateFormat("yyyyMMdd");
         String datestr=sf.format(newDate);
         //文件路径拼接
-        String realPath = nckd_url+datestr+"/"+nckd_filename;
+        //文件完整路径
+        String realPath = nckd_url+datestr+"/"+nckd_filename+"_"+datestr+".dat";
         return realPath;
     }
 }

+ 4 - 1
src/main/java/sys/sc/task/UpdateDataDailyTask.java

@@ -433,6 +433,9 @@ public class UpdateDataDailyTask extends AbstractTask {
                 userinfo.set("pswstrategy", "338333884850648064");
                 userinfo.set("psweffectivedate", new Date());
                 userinfo.set("useenddate", c.getTime());
+                userinfo.set("creator","1");
+                userinfo.set("modifier","1");
+                userinfo.set("usertype","1");
                 // 设置姓名和拼音
                 String name = personData.getString("nckd_name");
                 userinfo.set("name", name);
@@ -512,7 +515,7 @@ public class UpdateDataDailyTask extends AbstractTask {
         String datestr=sf.format(newDate);
         //文件路径拼接
         //真实路径
-        String realPath = nckd_url+datestr+File.separator+nckd_filename;
+        String realPath = nckd_url+datestr+"/"+nckd_filename+"_"+datestr+".dat";
         return realPath;
     }
     @Override

+ 7 - 4
src/main/java/sys/sc/task/UpdateImpairmentDailyTask.java

@@ -18,6 +18,7 @@ import sys.sc.opplugin.utils.InterFaceImgUtils;
 import sys.sc.opplugin.utils.SftpClient;
 
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -72,7 +73,9 @@ public class UpdateImpairmentDailyTask extends AbstractTask {
             DynamicObject[] existingData = BusinessDataServiceHelper
                     .load(dynamicObjectType.getName(), String.join(",", selector) + ",nckd_isdelete", new QFilter[]{filter});
             Set<String> processeddubilidSet = new HashSet<>();
-            try (BufferedReader reader = new BufferedReader(new InputStreamReader(sftpClient.fileInputStream(filelocation)))) {
+            //设置编码格式
+            InputStreamReader isr=new InputStreamReader(sftpClient.fileInputStream(filelocation),StandardCharsets.UTF_8);
+            try (BufferedReader reader = new BufferedReader(isr)) {
                 String line;
                 while ((line = reader.readLine()) != null) {
                     //去掉换行符|$|
@@ -101,13 +104,13 @@ public class UpdateImpairmentDailyTask extends AbstractTask {
             sftpClient.disconnect();
             //读取的文件数据转化成DynamicObject
             DynamicObject[] dynamicObjectlist=createdataList.toArray(new DynamicObject[0]);
+            //删除所有的数据,再新增
+            DeleteServiceHelper.delete(dynamicObjectType.getName(),null);
             //新增数据不为空则更新到数据库中
             if (!createdataList.isEmpty()) {
                 //转换list为DynamicObject类型
                 SaveServiceHelper.save(dynamicObjectType,dynamicObjectlist);
             }
-            //删除所有的数据,再新增
-            DeleteServiceHelper.delete(dynamicObjectType.getName(),null);
             log.info("-----------------------减值数据已成功保存---------------------");
             custSave(dynamicObjectlist);
             log.info("------------------------客户数据已成功保存----------------------");
@@ -143,7 +146,7 @@ public class UpdateImpairmentDailyTask extends AbstractTask {
         SimpleDateFormat sf=new SimpleDateFormat("yyyyMMdd");
         String datestr=sf.format(newDate);
         //文件完整路径
-        String realPath = nckd_url+datestr+ File.separator+nckd_filename;
+        String realPath = nckd_url+datestr+"/"+nckd_filename+"_"+datestr+".dat";
         return realPath;
     }