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

共享模块问题处理

This commit is contained in:
zhangzhiguo 2025-07-10 13:51:58 +08:00
parent 8a588d1ad0
commit a6e469197d
3 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/TaskApproveFormCkPlugin.java
View File

@ -71,9 +71,14 @@ public class TaskApproveFormCkPlugin extends AbstractFormPlugin {
log.info("TaskApproveFormCkPlugin：sscid "+customParams.get("sscid"));
log.info("TaskApproveFormCkPlugin：billnumber "+customParams.get("billnumber"));
log.info("TaskApproveFormCkPlugin：billid "+customParams.get("billid"));
billtypeid = (Long)customParams.get("billtypeid");//单据类型id
//billtypeid = (Long)customParams.get("billtypeid");//单据类型id
tasktypeid = (Long)customParams.get("tasktypeid");//任务类型id
Object sscidObj = customParams.get("sscid");
if(sscidObj instanceof Long) {
sscid = (Long)sscidObj;
}else if(sscidObj instanceof String) {
sscid = Long.valueOf((String)customParams.get("sscid"));//任务类型id
}
billnumber = (String)customParams.get("billnumber");//单据编码（单据标识 entityName）
billid = (String)customParams.get("billid");//业务单据id
billNo = VoucherUtil.getTaskBillNo(billid);//业务单据编号

12
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/TriprAutoCalWorkingDaysPlugin.java
View File

@ -235,11 +235,16 @@ public class TriprAutoCalWorkingDaysPlugin extends AbstractBillPlugIn implements
}
public static Set<LocalDate> getWorkingDays(LocalDate startDate, LocalDate endDate) {
Set<LocalDate> workingDays = new HashSet<>();
if (startDate.equals(endDate)) {
if (!isWeekend(startDate)) {
workingDays.add(startDate);
}
return workingDays;
}else{
if (startDate.isAfter(endDate)) {
throw new IllegalArgumentException("开始日期不能晚于结束日期");
}
Set<LocalDate> workingDays = new HashSet<>();
LocalDate currentDate = startDate;
while (!currentDate.isAfter(endDate)) {
@ -248,10 +253,11 @@ public class TriprAutoCalWorkingDaysPlugin extends AbstractBillPlugIn implements
}
currentDate = currentDate.plusDays(1);
}
return workingDays;
}
}
private static boolean isWeekend(LocalDate date) {
return date.getDayOfWeek() == DayOfWeek.SATURDAY || date.getDayOfWeek() == DayOfWeek.SUNDAY;
}

2
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/TripreimbursebillUpOp.java
View File

@ -65,6 +65,7 @@ public class TripreimbursebillUpOp extends AbstractOperationServicePlugIn {
DynamicObjectCollection dynamicObjectCollection = dynamicObject.getDynamicObjectCollection("entryentity");
for (DynamicObject dy : dynamicObjectCollection) {
DynamicObject expenseObj = dy.getDynamicObject("expenseitem");
if(expenseObj!=null){
String expenseitem = expenseObj.getString("number");
if(zskey.equals(expenseitem)){
BigDecimal orientryamount = dy.getBigDecimal("orientryamount");//报销金额
@ -84,6 +85,7 @@ public class TripreimbursebillUpOp extends AbstractOperationServicePlugIn {
}
}
}
}
trip++;
}
}