瀏覽代碼

更新组织人员优化

zhouger 6 月之前
父節點
當前提交
04cfa1b63c
共有 2 個文件被更改,包括 18 次插入27 次删除
  1. 2 18
      src/main/java/sys/sc/formplugin/TestPlugin.java
  2. 16 9
      src/main/java/sys/sc/task/UpdateDataDailyTask.java

+ 2 - 18
src/main/java/sys/sc/formplugin/TestPlugin.java

@@ -764,14 +764,12 @@ public class TestPlugin  extends AbstractListPlugin {
                         .load(dynamicObjectType.getName()
                                 , String.join(",", selector)+",enable,nckd_datasource",
                                 new QFilter[]{new QFilter("nckd_datasource", QCP.equals, "1")});
-                for (int i=0;i< autoData.length;i++)
-                {
+                for (int i=0;i< autoData.length;i++) {
                     //如果导入的数据在系统中没有则禁用
                     if (!processeddubilidSet.contains(autoData[i].getString("number"))) {
                         //设置禁用
                         autoData[i].set("enable","0");
                     }
-
                 }
                 SaveServiceHelper.save(autoData);
                 //查找更新数据
@@ -808,22 +806,8 @@ public class TestPlugin  extends AbstractListPlugin {
         //
         if("testaaa".equals(e.getOperateKey()))
         {
-            DynamicObject roogorg=BusinessDataServiceHelper
-                    .loadSingle("bos_adminorg",new QFilter[]{new QFilter("number","=","1233")});
-            DynamicObject xingtaiinfo=BusinessDataServiceHelper
-                    .loadSingle("bos_org_pattern",new QFilter[]{new QFilter("number","=","Orgform02")});
-            DynamicObject xe=BusinessDataServiceHelper
-                    .loadSingle("bos_adminorg",new QFilter[]{new QFilter("number","=","2012")});
 
-            DynamicObject data=BusinessDataServiceHelper.newDynamicObject("bos_adminorg");
-//            data.set("number","2012");
-//            data.set("name","测试2");
-//            data.set("parent",roogorg);
-//            data.set("orgpattern",xingtaiinfo);
-//            data.set("status","C");
-//            data.set("enable","1");
-//            SaveServiceHelper.save(new DynamicObject[]{data});
-//            this.getView().showMessage("成功");
+
         }
 
     }

+ 16 - 9
src/main/java/sys/sc/task/UpdateDataDailyTask.java

@@ -11,11 +11,13 @@ import kd.bos.entity.operate.result.OperationResult;
 import kd.bos.exception.KDException;
 import kd.bos.form.IFormView;
 import kd.bos.orm.ORM;
+import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
 import kd.bos.schedule.api.MessageHandler;
 import kd.bos.schedule.executor.AbstractTask;
 import kd.bos.sec.user.utils.UserOperationUtils;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
+import kd.bos.servicehelper.operation.DeleteServiceHelper;
 import kd.bos.servicehelper.operation.SaveServiceHelper;
 import sys.sc.formplugin.ABillServiceHelper;
 import sys.sc.opplugin.utils.InterFaceImgUtils;
@@ -217,6 +219,10 @@ public class UpdateDataDailyTask extends AbstractTask {
                 OperationResult operationResult = ABillServiceHelper.saveOperate(orgview);
                 //保存不成功
                 if (!operationResult.isSuccess()) {
+                    //清除编码为org开头的数据
+                    QFilter filter=new QFilter("number", QCP.equals,"Org%");
+                    DeleteServiceHelper.delete("bos_adminorg",new QFilter[]{filter});
+                    ABillServiceHelper.saveOperate(orgview);
                 }
                 org = orgview.getModel().getDataEntity();
                 //如果存在单位则检查单位名是否一致,不一致则更新
@@ -246,7 +252,10 @@ public class UpdateDataDailyTask extends AbstractTask {
                 yjjgView.getModel().setValue("enable", "1");
                 OperationResult yjjgOperationResult = ABillServiceHelper.saveOperate(yjjgView);
                 if (!yjjgOperationResult.isSuccess()) {
-
+                    //清除编码为org开头的数据
+                    QFilter filter=new QFilter("number", QCP.equals,"Org%");
+                    DeleteServiceHelper.delete("bos_adminorg",new QFilter[]{filter});
+                    ABillServiceHelper.saveOperate(yjjgView);
                 }
                 yjjg = yjjgView.getModel().getDataEntity();
             } else if (!yjjg.getString("name").equals(yjjgmc)) {
@@ -273,9 +282,10 @@ public class UpdateDataDailyTask extends AbstractTask {
                 // 保存操作
                 OperationResult szbmOperationResult = ABillServiceHelper.saveOperate(szbmView);
                 if (!szbmOperationResult.isSuccess()) {
-                    // 如果保存失败,可以在这里处理错误
-                    log.info("保存部门失败!");
-                    return;
+                    //清除编码为org开头的数据
+                    QFilter filter=new QFilter("number", QCP.equals,"Org%");
+                    DeleteServiceHelper.delete("bos_adminorg",new QFilter[]{filter});
+                    ABillServiceHelper.saveOperate(szbmView);
                 }
                 if (szbmView.getModel() != null) {
                     szbm = szbmView.getModel().getDataEntity();
@@ -430,11 +440,8 @@ public class UpdateDataDailyTask extends AbstractTask {
                 String simplePinyin = UserOperationUtils.getFirstSpellByName(name);
                 userinfo.set("fullpinyin", fullPinyin);
                 userinfo.set("simplepinyin", simplePinyin);
-                // 设置用户名
-                String username = UserOperationUtils.getUserNameByFormatedFullPinyin(
-                        (long) userinfo.getPkValue(), fullPinyin, null
-                );
-                userinfo.set("username", username);
+                // 设置用户名为工号
+                userinfo.set("username", gonghao);
                 // 创建部门分录
                 DynamicObjectCollection bmflList = userinfo.getDynamicObjectCollection("entryentity");
                 DynamicObject bumeninfo = bmflList.addNew();