Merge remote-tracking branch 'origin/master'

src/main/java/fi/er/opplugin/FinapbillBeforeF7SelectSample.java

@@ -65,6 +65,7 @@ public class FinapbillBeforeF7SelectSample extends AbstractFormPlugin implements
             QFilter qFilter = new QFilter("nckd_orgfield.id", QCP.equals, assetorg.getLong("id"));
             // 表过滤条件
             ListShowParameter showParameter = (ListShowParameter)arg0.getFormShowParameter();
+            showParameter.setShowApproved(false);
             showParameter.getListFilterParameter().setFilter(qFilter);
         }
     }
@@ -90,9 +91,11 @@ public class FinapbillBeforeF7SelectSample extends AbstractFormPlugin implements
                     String nckd_use_name = cardInfo.getString("nckd_use_name");//使用人
                     String nckd_local = cardInfo.getString("nckd_local");//存放地点
                     String nckd_card_model = cardInfo.getString("nckd_card_model");//型号
+                    Date nckd_start_date = cardInfo.getDate("nckd_start_date");//开始使用日期
                     //资产信息分录赋值
                     this.getModel().setValue("asset_name", name, parentIndex);
-                    //资产类别赋值
+                    //资产发生日期
+                    this.getModel().setValue("asset_happendate", nckd_start_date, parentIndex);
                     //规格型号
                     this.getModel().setValue("asset_model",nckd_card_model, parentIndex);
                     //使用部门

src/main/java/kd/bos/newdevportal/table/TableListPlugin.java

@@ -1,5 +1,7 @@
 package kd.bos.newdevportal.table;
 
+import cfca.org.slf4j.Logger;
+import cfca.org.slf4j.LoggerFactory;
 import kd.bos.dataentity.utils.StringUtils;
 import kd.bos.db.DB;
 import kd.bos.db.DBRoute;
@@ -22,6 +24,7 @@ import java.util.stream.Collectors;
  * @version 1.0
  */
 public class TableListPlugin extends TableManagerListPlugin {
+    public static final Logger log = LoggerFactory.getLogger(TableListPlugin.class);
     public void registerListener(EventObject e) {
         super.registerListener(e);
         this.addItemClickListeners(new String[]{"toolbarap"});
@@ -36,21 +39,26 @@ public class TableListPlugin extends TableManagerListPlugin {
             // 统计成功和失败的次数
             int successCount = 0;
             int failureCount = 0;
-            for (ListSelectedRow detail : list) {
-                Object pk = detail.getPrimaryKeyValue();
+            for (int i = 0; i < list.size(); i++) {
+                Object pk = list.get(i).getPrimaryKeyValue();
                 String pkStr = String.valueOf(pk);
                 String[] info = pkStr.split("@@");
                 if (info.length < 2) {
                     failureCount++; // 如果数据不正确，增加失败计数
                     continue; // 跳过此条记录，继续处理下一条
                 }
-                //获取数据字典明细
-                String tablename = info[0];//表名称
-                String entityId = info[1];//id
-                String dbroute = EntityMetadataCache.getDataEntityType(MetadataDao.getEntityNumberById(info[1])).getDBRouteKey();
-                // 根据 dbroute 将数据分组
-                entityIdGroups.computeIfAbsent(dbroute, k -> new ArrayList<>()).add(pkStr);
+                try {
+                    //获取数据字典明细
+                    String tablename = info[0];//表名称
+                    String entityId = info[1];//id
+                    String dbroute = EntityMetadataCache.getDataEntityType(MetadataDao.getEntityNumberById(info[1])).getDBRouteKey();
+                    // 根据 dbroute 将数据分组
+                    entityIdGroups.computeIfAbsent(dbroute, k -> new ArrayList<>()).add(pkStr);
+                } catch (Exception e) {
+                    log.info(info[0] + "添加注释失败，错误原因:"+e.toString());
+                }
             }
+
             // 打印每个分组的 tablename
             for (Map.Entry<String, List<String >> entry : entityIdGroups.entrySet()) {
                 String dbroute = entry.getKey();
@@ -100,8 +108,7 @@ public class TableListPlugin extends TableManagerListPlugin {
                             DB.execute(route, sqlContent);
                             successCount++; // 增加成功计数
                         } catch (Exception e) {
-                            // 处理执行过程中可能出现的异常
-                            e.printStackTrace(); // 可以替换为日志记录
+                            log.info(tablename + "执行sql失败，错误原因:"+e.toString());
                             failureCount++; // 增加失败计数
                         }
                     }else {

src/main/java/sys/sc/formplugin/TestPlugin.java

@@ -234,7 +234,7 @@ public class TestPlugin  extends AbstractListPlugin {
     @Override
     public void afterDoOperation(AfterDoOperationEventArgs e) {
         super.afterDoOperation(e);
-        String filePath = "C:/filepath/test.dat";
+        String filePath = "C:/Users/test.dat";
         //生成data文件
         if ("scdatwj".equals(e.getOperateKey())) {//生成data文件
             try {

src/main/java/sys/sc/opplugin/utils/InterFaceImgUtils.java

@@ -22,7 +22,7 @@ public class InterFaceImgUtils {
                 .loadSingle(nckd_jkpzxx,new QFilter[]{new QFilter("number","=",URL)});
     }
     //端口号
-    public int getProt() {
+    public int getPort() {
         return jkpzxx.getInt("nckd_port");
     }
     //服务器地址

src/main/java/sys/sc/task/CreatDatDailyTask.java

@@ -84,7 +84,7 @@ public class CreatDatDailyTask extends AbstractTask {
                 String password=interFaceImgUtils.getServerPassword();
                 //服务器路径
                 //服务器端口号
-                int port= interFaceImgUtils.getProt();
+                int port= interFaceImgUtils.getPort();
                 try {
                     //上传文件到服务器中
                     SftpClient sftpClient=new SftpClient(host,username,password,port);

src/main/java/sys/sc/task/UpdateBankDailyTask.java

@@ -60,7 +60,7 @@ public class UpdateBankDailyTask extends AbstractTask {
             String splitsign=interFaceImgUtils.getServerSplit();
             //结尾符
             String endsign=interFaceImgUtils.getServerEndsign();
-            int port= interFaceImgUtils.getProt();
+            int port= interFaceImgUtils.getPort();
             //获取服务器连接
             SftpClient sftpClient=new SftpClient(host,username,password,port);
             sftpClient.connect();

src/main/java/sys/sc/task/UpdateDataDailyTask.java

@@ -43,7 +43,7 @@ public class UpdateDataDailyTask extends AbstractTask {
     public String splitsign=interFaceImgUtils.getServerSplit();
     //结尾符
     public String endsign=interFaceImgUtils.getServerEndsign();
-    public int port= interFaceImgUtils.getProt();
+    public int port= interFaceImgUtils.getPort();
 
 
 
@@ -426,6 +426,11 @@ public class UpdateDataDailyTask extends AbstractTask {
                 userinfo.set("number", gonghao);
                 // 设置其他字段
                 userinfo.set("gender", personData.get("nckd_gender"));
+                if (("").equals(personData.get("nckd_gender"))) {
+                    userinfo.set("gender","0");
+                }else {
+                    userinfo.set("gender", personData.get("nckd_gender"));
+                }
                 //人员手机号
                 userinfo.set("phone", personData.get("nckd_sjh"));
                 // 设置其他固定字段
@@ -479,10 +484,18 @@ public class UpdateDataDailyTask extends AbstractTask {
                     }
                 }
                 String postName = personData.getString("nckd_posidname");;
-                bumeninfo.set("position", postName);
+                if (("").equals(postName)) {
+                    bumeninfo.set("position", "无");
+                }else {
+                    bumeninfo.set("position", postName);
+                }
                 //所在岗位名称
-                String positionnumber = personData.getString("nckd_posidname");;
-                bumeninfo.set("post", positionnumber);
+                String positionnumber = personData.getString("nckd_posidname");
+                if (("").equals(positionnumber)) {
+                    bumeninfo.set("post", "无");
+                }else {
+                    bumeninfo.set("post", positionnumber);
+                }
                 // 保存新用户信息
                 SaveServiceHelper.save(new DynamicObject[]{userinfo});
                 msg+="工号为 " + gonghao + " 的用户已创建！";
@@ -516,7 +529,7 @@ public class UpdateDataDailyTask extends AbstractTask {
         String datestr=sf.format(newDate);
         //文件路径拼接
         //真实路径
-        String realPath = nckd_url+datestr+"/"+nckd_filename;
+        String realPath = nckd_url+datestr+File.separator+nckd_filename;
         return realPath;
     }
     @Override

src/main/java/sys/sc/task/UpdateImpairmentDailyTask.java

@@ -39,7 +39,7 @@ public class UpdateImpairmentDailyTask extends AbstractTask {
     public String splitsign=interFaceImgUtils.getServerSplit();
     //结尾符
     public String endsign=interFaceImgUtils.getServerEndsign();
-    public int port= interFaceImgUtils.getProt();
+    public int port= interFaceImgUtils.getPort();