Merge remote-tracking branch 'origin/master'

src/main/java/bamp/basedata/opplugin/SupplierBankChangeOpPlugin.java

@@ -52,7 +52,7 @@ public class SupplierBankChangeOpPlugin  extends AbstractOperationServicePlugIn
             DynamicObject supplier = BusinessDataServiceHelper.loadSingle(
                     bill.getDynamicObject("nckd_supplierfield").getLong("id"), "bd_supplier");
             DynamicObjectCollection supplierBankCol = supplier.getDynamicObjectCollection("entry_bank");
-            supplierBankCol.clear();
+//            supplierBankCol.clear();
             DynamicObjectCollection entryCol = bill.getDynamicObjectCollection("nckd_entry_bank");
             for (DynamicObject entry : entryCol) {
                 DynamicObject supplierEntryInfo = supplierBankCol.addNew();

src/main/java/fi/em/formPlugin/SalaryDistributeEditPlugin.java

@@ -1,5 +1,6 @@
 package fi.em.formPlugin;
 
+import kd.bos.context.RequestContext;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.entity.datamodel.events.ChangeData;
@@ -15,6 +16,7 @@ import kd.bos.form.operate.FormOperate;
 import kd.bos.list.plugin.AbstractListPlugin;
 import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
+import kd.bos.url.UrlService;
 import kd.sdk.plugin.Plugin;
 
 import java.util.ArrayList;
@@ -154,6 +156,10 @@ public class SalaryDistributeEditPlugin extends AbstractListPlugin implements Pl
                 }else {
                     this.setVieeVisible(nckd_generalemployees);
                 }
+                RequestContext ctx = RequestContext.get();
+                String clientPath = UrlService.getDomainContextUrlByTenantCode(ctx.getTenantCode());//拿到完整的客户端网址
+                String jspath = clientPath+"/public/thirdjs/salaryupload.js";
+                this.getView().executeClientCommand("loadThirdPartyJS",jspath);
             }
             //分录类型为薪酬明细（内退）
             if (entrytype.equals("B")) {
@@ -164,6 +170,10 @@ public class SalaryDistributeEditPlugin extends AbstractListPlugin implements Pl
                 }else {
                     this.setVieeVisible(nckd_earlyretired);
                 }
+                RequestContext ctx = RequestContext.get();
+                String clientPath = UrlService.getDomainContextUrlByTenantCode(ctx.getTenantCode());//拿到完整的客户端网址
+                String jspath = clientPath+"/public/thirdjs/salaryupload.js";
+                this.getView().executeClientCommand("loadThirdPartyJS",jspath);
             }
             //分录类型为薪酬明细退休
             if (entrytype.equals("C")) {
@@ -174,6 +184,10 @@ public class SalaryDistributeEditPlugin extends AbstractListPlugin implements Pl
                 }else {
                     this.setVieeVisible(nckd_retired);
                 }
+                RequestContext ctx = RequestContext.get();
+                String clientPath = UrlService.getDomainContextUrlByTenantCode(ctx.getTenantCode());//拿到完整的客户端网址
+                String jspath = clientPath+"/public/thirdjs/salaryupload.js";
+                this.getView().executeClientCommand("loadThirdPartyJS",jspath);
             }
             //分录类型为人力薪酬
             if (entrytype.equals("D")) {
@@ -184,6 +198,10 @@ public class SalaryDistributeEditPlugin extends AbstractListPlugin implements Pl
                 }else {
                     this.setVieeVisible(nckd_pay);
                 }
+                RequestContext ctx = RequestContext.get();
+                String clientPath = UrlService.getDomainContextUrlByTenantCode(ctx.getTenantCode());//拿到完整的客户端网址
+                String jspath = clientPath+"/public/thirdjs/salaryupload.js";
+                this.getView().executeClientCommand("loadThirdPartyJS",jspath);
             }
             //分录类型为人力薪酬（内退）
             if (entrytype.equals("E")) {
@@ -195,6 +213,11 @@ public class SalaryDistributeEditPlugin extends AbstractListPlugin implements Pl
                     this.setVieeVisible(nckd_payretird);
                 }
             }
+
+            RequestContext ctx = RequestContext.get();
+            String clientPath = UrlService.getDomainContextUrlByTenantCode(ctx.getTenantCode());//拿到完整的客户端网址
+            String jspath = clientPath+"/public/thirdjs/salaryupload.js";
+            this.getView().executeClientCommand("loadThirdPartyJS",jspath);
         }
     }
 

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

@@ -1,6 +1,8 @@
 package sys.sc.formplugin;
 
+import kd.bos.context.RequestContext;
 import kd.bos.dataentity.entity.DynamicObject;
+import kd.bos.dataentity.entity.LocaleString;
 import kd.bos.entity.datamodel.events.ChangeData;
 import kd.bos.entity.datamodel.events.PropertyChangedArgs;
 import kd.bos.form.events.BeforeDoOperationEventArgs;
@@ -9,6 +11,9 @@ import kd.bos.form.plugin.AbstractFormPlugin;
 import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
+import kd.bos.servicehelper.user.UserServiceHelper;
+
+import java.util.EventObject;
 
 /**
  * @author cjz
@@ -22,6 +27,21 @@ public class PayInformationPlugin extends AbstractFormPlugin {
     private static String bos_user="bos_user";//人员表标识
 
 
+    @Override
+    public void afterBindData(EventObject e) {
+        super.afterBindData(e);
+        long userID = UserServiceHelper.getCurrentUserId();
+        DynamicObject user=BusinessDataServiceHelper
+                .loadSingle("bos_user","id,name",new QFilter[]{new QFilter("id",QCP.equals,userID)});
+        //设置管理员工号为当前用户
+        this.getModel().setValue("nckd_adminnum",user);
+        String name= user.getLocaleString("name").getLocaleValue();
+        //管理员姓名
+        this.getModel().setValue("nckd_adminname",name);
+
+    }
+
+
     @Override
     public void propertyChanged(PropertyChangedArgs e) {
         super.beforePropertyChanged(e);
@@ -29,65 +49,18 @@ public class PayInformationPlugin extends AbstractFormPlugin {
         //获取当前单据
         DynamicObject dynamicObject=this.getModel().getDataEntity(true);
         //选择收款人工号后自动带出收款人姓名
-        if (nckd_payeenum.equals(name))
-        {
+        if (nckd_payeenum.equals(name)) {
             ChangeData[] changeSet = e.getChangeSet();//获取值
             ChangeData changeData = changeSet[0];
             DynamicObject payObj= (DynamicObject) changeData.getNewValue();
             QFilter filter=new QFilter("number", QCP.equals,payObj.get("number"));
             DynamicObject payeeuser= BusinessDataServiceHelper.loadSingle(bos_user,QCP.equals,new QFilter[]{filter});
+            String payname= payeeuser.getLocaleString("name").getLocaleValue();
             //设置收款人姓名
-            this.getModel().setValue("nckd_payeename",payeeuser);
+            this.getModel().setValue("nckd_payeename",payname);
         }
-        //选择管理员工号后自动带出管理人姓名
-        if (nckd_adminnum.equals(name))
-        {
-            ChangeData[] changeSet = e.getChangeSet();//获取值
-            ChangeData changeData = changeSet[0];
-            DynamicObject payObj= (DynamicObject) changeData.getNewValue();
-            QFilter filter=new QFilter("number", QCP.equals,payObj.get("number"));
-            DynamicObject adminuser= BusinessDataServiceHelper.loadSingle(bos_user,QCP.equals,new QFilter[]{filter});
-            //设置收款人姓名
-            this.getModel().setValue("nckd_adminname",adminuser);
-        }
-
     }
 
-    //保存前校验
-    public void beforeDoOperation(BeforeDoOperationEventArgs args) {
-        super.beforeDoOperation(args);
-        AbstractOperate op = (AbstractOperate)args.getSource();
-        String operateKey = op.getOperateKey();
-        //获取当前单据
-        DynamicObject dynamicObject=this.getModel().getDataEntity(true);
-        //获取工号
-        DynamicObject payeenumDy=dynamicObject.getDynamicObject("nckd_payeenum");
-        String payeenum=payeenumDy.getString("number");
-        //数据状态
-        String nckd_datastatus=dynamicObject.getString("nckd_datastatus");
-        //银行账号
-        String nckd_payaccount=dynamicObject.getString("nckd_payaccount");
-        //保存前加校验，每个工号只有一个启用数据
-        if ("bar_save".equals(operateKey)) {
-            //工号启用校验
-            QFilter qFilter=new QFilter("nckd_payeenum.number",QCP.equals,payeenum);
-            qFilter.and("nckd_datastatus",QCP.equals,nckd_datastatus);
-            DynamicObject[] dynamicObjects=BusinessDataServiceHelper
-                    .load("nckd_payinformation","id",new QFilter[]{qFilter});
-            if (dynamicObjects.length>0) {
-                this.getView().showMessage("同一个工号存在多个已启用的数据，工号为:"+payeenum);
-                //取消保存操作
-                args.setCancel(true);
-            }
-            //银行账号校验
-            QFilter filter=new QFilter("nckd_payaccount",QCP.equals,nckd_payaccount);
-            DynamicObject[] dylist=BusinessDataServiceHelper
-                    .load("nckd_payinformation","id",new QFilter[]{filter});
-            if (dylist.length>0) {
-                this.getView().showMessage("存在相同的银行账号："+nckd_payaccount);
-                //取消保存操作
-                args.setCancel(true);
-            }
-        }
-    }
+
+
 }

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

@@ -4,6 +4,8 @@ import com.jcraft.jsch.*;
 import com.tongtech.jms.ra.core.Options;
 import kd.bos.base.utils.msg.BaseMessage;
 import kd.bos.base.utils.msg.OrgMessage;
+import kd.bos.base.utils.user.UserUtils;
+import kd.bos.context.RequestContext;
 import kd.bos.dataentity.entity.CloneUtils;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
@@ -26,6 +28,7 @@ import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.bos.servicehelper.operation.DeleteServiceHelper;
 import kd.bos.servicehelper.operation.OperationServiceHelper;
 import kd.bos.servicehelper.operation.SaveServiceHelper;
+import kd.bos.url.UrlService;
 import kd.epm.eb.common.model.DynamicInfoCollection;
 import kd.imc.bdm.common.constant.BotpCallBackLogConstant;
 import sys.sc.opplugin.utils.InterFaceImgUtils;
@@ -267,6 +270,8 @@ public class TestPlugin  extends AbstractListPlugin {
         }
         //更新人员
         else if ("gxry".equals(e.getOperateKey())) {
+            //新增人员list
+            List<DynamicObject> userlist=new ArrayList<>();
             //更新人员
             // 从 nckd_basicdata 表中获取所有人员数据，假设通过某个条件查找
             DynamicObject[] personDataArray = BusinessDataServiceHelper.load(
@@ -459,6 +464,9 @@ public class TestPlugin  extends AbstractListPlugin {
                     }else {
                         bumeninfo.set("post", positionnumber);
                     }
+
+                    //新增人员头像
+                    UserUtils.createAvatar(new DynamicObject[]{userinfo});
                     // 保存新用户信息
                     SaveServiceHelper.save(new DynamicObject[]{userinfo});
                     msg+="工号为 " + gonghao + " 的用户已创建！";
@@ -474,8 +482,10 @@ public class TestPlugin  extends AbstractListPlugin {
                     String sql ="insert into t_sec_usertypes(fpkid,fid,fbasedataid) values(?,?,?)";
                     //刷新新增人员的类型
                     DB.update(dbRoute,sql,new Object[]{Long.valueOf(fpkid.substring(1)), userid,Long.valueOf("1")});
+                    userlist.add(userinfo);
                 }
             }
+
             if("".equals(msg)){
                 this.getView().showMessage("没有需要更新或新增的人员");
             }else{
@@ -838,17 +848,20 @@ public class TestPlugin  extends AbstractListPlugin {
         //获取linux服务器连接
         if ("connect".equals(e.getOperateKey()))
         {
-            generateDataFile(filePath);
+            //先删除头像url在赋值
+            DynamicObject[] userinfo=BusinessDataServiceHelper
+                    .load("bos_user","id,gender,fullpinyin,picturefield",null);
+            for (DynamicObject item:userinfo) {
+                item.set("picturefield","");
+            }
+            SaveServiceHelper.save(userinfo);
         }
-        //
-        if("testaaa".equals(e.getOperateKey()))
-        {
-//            QFilter filter=new QFilter("number",QCP.equals,"12");
-//            DynamicObject dynamicObject=BusinessDataServiceHelper
-//                    .loadSingle("bos_user",new QFilter[]{filter});
-            DynamicObject dynamicObject = BusinessDataServiceHelper.newDynamicObject("");
-
 
+        if("testaaa".equals(e.getOperateKey())) {
+            DynamicObject[] userinfo=BusinessDataServiceHelper
+                    .load("bos_user","id,gender,fullpinyin,picturefield",null);
+            UserUtils.createAvatar(userinfo);
+            SaveServiceHelper.save(userinfo);
         }
 
     }

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

@@ -2,6 +2,7 @@ package sys.sc.task;
 
 import com.alibaba.druid.support.logging.Log;
 import com.alibaba.druid.support.logging.LogFactory;
+import kd.bos.base.utils.user.UserUtils;
 import kd.bos.context.RequestContext;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
@@ -508,6 +509,8 @@ public class UpdateDataDailyTask extends AbstractTask {
                 }else {
                     bumeninfo.set("post", positionnumber);
                 }
+                //新增人员头像
+                UserUtils.createAvatar(new DynamicObject[]{userinfo});
                 // 保存新用户信息
                 SaveServiceHelper.save(new DynamicObject[]{userinfo});
                 msg+="工号为 " + gonghao + " 的用户已创建！";