zhangzhiguo
/
zhongcaiguoji
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
xiaoshi 2025-01-13 09:50:24 +08:00
parent 97416d354f 1feb440837
commit fb487fb726
5 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/CostcompanyDefaultPlugin.java
View File

@ -4,6 +4,7 @@ import kd.bos.bill.AbstractBillPlugIn;
import kd.bos.context.RequestContext;
import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.dataentity.entity.DynamicObjectCollection;
import kd.bos.entity.datamodel.IDataModel;
import kd.bos.entity.datamodel.events.PropertyChangedArgs;
import kd.bos.form.control.events.ItemClickEvent;
import kd.bos.orm.query.QCP;
@ -11,6 +12,7 @@ import kd.bos.orm.query.QFilter;
import kd.bos.servicehelper.BusinessDataServiceHelper;
import kd.bos.servicehelper.user.UserServiceHelper;
import kd.sdk.plugin.Plugin;
import sinoma.cus.common.autoinfo.CommonUtils;
import zcgj.zcdev.zcdev.fs.utils.OrgCheckUtils;
import java.util.EventObject;
@ -21,12 +23,20 @@ import java.util.EventObject;
public class CostcompanyDefaultPlugin extends AbstractBillPlugIn implements Plugin {
@Override
/*@Override
public void afterCreateNewData(EventObject e) {
super.afterCreateNewData(e);
setCostValue();
}
}*/
@Override
public void afterBindData(EventObject e) {
super.afterBindData(e);
IDataModel model = this.getModel();
if (CommonUtils.isNewData(model)) {
this.setCostValue();
}
}
@Override
public void propertyChanged(PropertyChangedArgs e) {

3
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/DailyreimbursExpAccPlugin.java
View File

@ -94,6 +94,9 @@ public class DailyreimbursExpAccPlugin extends AbstractBillPlugIn implements Plu
if(id!=null){
QFilter nameQFilter = new QFilter(prefix+"_account_item",QCP.equals,id);
QFilter billTypeQFilter = new QFilter(prefix+"_entryentity.zcgj_rim_expense_type.number",QCP.equals,BILL_TYPE);
DynamicObject costcompany = (DynamicObject)this.getModel().getValue("costcompany");
String number = costcompany.getString("number");
QFilter createorg = new QFilter("createorg",QCP.equals,number);
DynamicObject dynamicObject1 = BusinessDataServiceHelper.loadSingle(MAP_TABLE, "createorg,zcgj_entryentity,zcgj_entryentity.zcgj_entity_items", new QFilter[]{nameQFilter,billTypeQFilter});
DynamicObject dynamicObject2 = this.getModel().getDataEntity(true).getDynamicObjectCollection(EXPENSE_ENTRY_ENTITY).get(selectRow);
boolean isEx = false;

14
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/TriprCostcompanyDefaultPlugin.java
View File

@ -4,6 +4,7 @@ import kd.bos.bill.AbstractBillPlugIn;
import kd.bos.context.RequestContext;
import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.dataentity.entity.DynamicObjectCollection;
import kd.bos.entity.datamodel.IDataModel;
import kd.bos.entity.datamodel.events.PropertyChangedArgs;
import kd.bos.form.control.events.ItemClickEvent;
import kd.bos.orm.query.QCP;
@ -11,6 +12,7 @@ import kd.bos.orm.query.QFilter;
import kd.bos.servicehelper.BusinessDataServiceHelper;
import kd.bos.servicehelper.user.UserServiceHelper;
import kd.sdk.plugin.Plugin;
import sinoma.cus.common.autoinfo.CommonUtils;
import zcgj.zcdev.zcdev.fs.utils.OrgCheckUtils;
import java.util.EventObject;
@ -21,11 +23,19 @@ import java.util.EventObject;
public class TriprCostcompanyDefaultPlugin extends AbstractBillPlugIn implements Plugin {
@Override
/* @Override
public void afterCreateNewData(EventObject e) {
super.afterCreateNewData(e);
setCostValue();
}
}*/
@Override
public void afterBindData(EventObject e) {
super.afterBindData(e);
IDataModel model = this.getModel();
if (CommonUtils.isNewData(model)) {
this.setCostValue();
}
}
@Override
public void propertyChanged(PropertyChangedArgs e) {

4
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyreimbursHomeCheckOp.java
View File

@ -83,6 +83,10 @@ public class DailyreimbursHomeCheckOp extends AbstractOperationServicePlugIn {
"id,zcgj_month_times as monthTime",
visitSetFilterArray, null
);
if(homeDataSet == null || homeDataSet.isEmpty()){
String message = String.format("提交人没有往来居家配置。");
this.addFatalErrorMessage(extendedDataEntity, message);
}
int monthTime = 0;
for (Row row : homeDataSet) {
monthTime = row.getInteger("monthTime");

7
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/TripreimbursebillIsHomeCheckOp.java
View File

@ -83,15 +83,20 @@ public class TripreimbursebillIsHomeCheckOp extends AbstractOperationServicePlug
"id,zcgj_month_times as monthTime",
visitSetFilterArray, null
);
if(homeDataSet == null || homeDataSet.isEmpty()){
String message = String.format("提交人没有往来居家配置。");
this.addFatalErrorMessage(extendedDataEntity, message);
}
int monthTime = 0;
for (Row row : homeDataSet) {
monthTime = row.getInteger("monthTime");
}
if(monthTime != 0){
DynamicObjectCollection tripentry = dataEntity.getDynamicObjectCollection("zcgj_homeentity");//oa流程分录
boolean isOk=true;
Map<String,Integer> homeentityCountMap = new HashMap<>();
int i = 1;
boolean isOk=true;
for (DynamicObject dynamicObject : tripentry) {
Date bxmonth = dynamicObject.getDate("zcgj_bxmonth");
String yearMonth = dateFormat.format(bxmonth);