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 2024-12-17 09:34:35 +08:00
parent d1aa5e8c5b ed0f24659b
commit e04585a124
5 changed files with 69 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/BudgetActuRptQueryPlugin.java
View File

@ -432,12 +432,23 @@ public class BudgetActuRptQueryPlugin extends AbstractReportListDataPlugin {
private DataSet getDailyreimbursebillDataSet(Long userId, Integer year,Boolean isBusinessForeign) {
LocalDate firstDay = getFirstDayOfYear(year);
LocalDate lastDay = getLastDayOfYear(year);
List<String> billStatuslist = new ArrayList<>();
//billStatuslist.add("A"); //暂存
//billStatuslist.add("B"); //已提交
//billStatuslist.add("C"); //审核中
//billStatuslist.add("D"); //审核未通过
billStatuslist.add("E"); //审核通过
billStatuslist.add("F"); //等待付款
billStatuslist.add("G"); //已付款
//billStatuslist.add("H"); //废弃
billStatuslist.add("I"); //关闭
List<QFilter> searchFilterList = new ArrayList<>();
//searchFilterList.add(new QFilter(DEV_KEY+"_year", QCP.equals, getFirstDayOfYear(year)));
searchFilterList.add(new QFilter("applier", QCP.equals, userId));
searchFilterList.add(new QFilter("expenseentryentity.happendate", QCP.large_equals, firstDay));
searchFilterList.add(new QFilter("expenseentryentity.happendate", QCP.less_equals, lastDay));
searchFilterList.add(new QFilter(DEV_KEY+"_is_business_foreign", QCP.equals, isBusinessForeign));
searchFilterList.add(new QFilter("billstatus", QCP.in, billStatuslist));//增加过滤
DataSet bdMaterialDataSet = QueryServiceHelper.queryDataSet(this.getClass().getName(),
"er_dailyreimbursebill",
"id,description," +
@ -457,13 +468,23 @@ public class BudgetActuRptQueryPlugin extends AbstractReportListDataPlugin {
private DataSet getTripreimburseDataSet(Long userId, Integer year,Boolean isBusinessForeign) {
LocalDate firstDay = getFirstDayOfYear(year);
LocalDate lastDay = getLastDayOfYear(year);
List<String> billStatuslist = new ArrayList<>();
//billStatuslist.add("A"); //暂存
//billStatuslist.add("B"); //已提交
//billStatuslist.add("C"); //审核中
//billStatuslist.add("D"); //审核未通过
billStatuslist.add("E"); //审核通过
billStatuslist.add("F"); //等待付款
billStatuslist.add("G"); //已付款
//billStatuslist.add("H"); //废弃
billStatuslist.add("I"); //关闭
List<QFilter> searchFilterList = new ArrayList<>();
//searchFilterList.add(new QFilter(DEV_KEY+"_year", QCP.equals, getFirstDayOfYear(year)));
searchFilterList.add(new QFilter("applier", QCP.equals, userId));
searchFilterList.add(new QFilter("tripentry.startdate", QCP.large_equals, firstDay));
searchFilterList.add(new QFilter("tripentry.startdate", QCP.less_equals, lastDay));
searchFilterList.add(new QFilter(DEV_KEY+"_is_business_foreign", QCP.equals, isBusinessForeign));
searchFilterList.add(new QFilter("billstatus", QCP.in, billStatuslist));//增加过滤
DataSet bdMaterialDataSet = QueryServiceHelper.queryDataSet(
this.getClass().getName(),
"er_tripreimbursebill",

12
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/FeeDeductionRptQueryPlugin.java
View File

@ -93,7 +93,17 @@ public class FeeDeductionRptQueryPlugin extends AbstractReportListDataPlugin {
searchFilterList.add(new QFilter("tripentry.startdate", QCP.large_equals, firstDay));
searchFilterList.add(new QFilter("tripentry.startdate", QCP.less_equals, lastDay));
}
List<String> billStatuslist = new ArrayList<>();
//billStatuslist.add("A"); //暂存
//billStatuslist.add("B"); //已提交
//billStatuslist.add("C"); //审核中
//billStatuslist.add("D"); //审核未通过
billStatuslist.add("E"); //审核通过
billStatuslist.add("F"); //等待付款
billStatuslist.add("G"); //已付款
//billStatuslist.add("H"); //废弃
billStatuslist.add("I"); //关闭
searchFilterList.add(new QFilter("billstatus", QCP.in, billStatuslist));//增加过滤
DataSet bdMaterialDataSet = QueryServiceHelper.queryDataSet(
this.getClass().getName(),

31
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/PositionFeesRptQueryPlugin.java
View File

@ -313,10 +313,21 @@ public class PositionFeesRptQueryPlugin extends AbstractReportListDataPlugin {
public DynamicObject[] getDailyreimbursebillDataSet(Long userId, Integer year){
LocalDate firstDay = getFirstDayOfYear(year);
LocalDate lastDay = getLastDayOfYear(year);
List<String> billStatuslist = new ArrayList<>();
//billStatuslist.add("A"); //暂存
//billStatuslist.add("B"); //已提交
//billStatuslist.add("C"); //审核中
//billStatuslist.add("D"); //审核未通过
billStatuslist.add("E"); //审核通过
billStatuslist.add("F"); //等待付款
billStatuslist.add("G"); //已付款
//billStatuslist.add("H"); //废弃
billStatuslist.add("I"); //关闭
List<QFilter> searchFilterList = new ArrayList<>();
searchFilterList.add(new QFilter("applier", QCP.equals, userId));
searchFilterList.add(new QFilter("expenseentryentity.happendate", QCP.large_equals, firstDay));
searchFilterList.add(new QFilter("expenseentryentity.happendate", QCP.less_equals, lastDay));
searchFilterList.add(new QFilter("billstatus", QCP.in, billStatuslist));//增加过滤
DynamicObject[] load = BusinessDataServiceHelper.load("er_dailyreimbursebill",
"id,description,billno,expenseentryentity," +
DEV_KEY+"_is_business_foreign,"+
@ -335,19 +346,21 @@ public class PositionFeesRptQueryPlugin extends AbstractReportListDataPlugin {
private DynamicObject[] getTripreimburseDataSet(Long userId, Integer year) {
LocalDate firstDay = getFirstDayOfYear(year);
LocalDate lastDay = getLastDayOfYear(year);
List<String> billStatuslist = new ArrayList<>();
//billStatuslist.add("A"); //暂存
//billStatuslist.add("B"); //已提交
//billStatuslist.add("C"); //审核中
//billStatuslist.add("D"); //审核未通过
billStatuslist.add("E"); //审核通过
billStatuslist.add("F"); //等待付款
billStatuslist.add("G"); //已付款
//billStatuslist.add("H"); //废弃
billStatuslist.add("I"); //关闭
List<QFilter> searchFilterList = new ArrayList<>();
//searchFilterList.add(new QFilter(DEV_KEY+"_year", QCP.equals, getFirstDayOfYear(year)));
searchFilterList.add(new QFilter("applier", QCP.equals, userId));
searchFilterList.add(new QFilter("tripentry.startdate", QCP.large_equals, firstDay));
searchFilterList.add(new QFilter("tripentry.startdate", QCP.less_equals, lastDay));
//searchFilterList.add(new QFilter(DEV_KEY+"_is_business_foreign", QCP.equals, isBusinessForeign));
/*DataSet bdMaterialDataSet = QueryServiceHelper.queryDataSet(
this.getClass().getName(),
"er_tripreimbursebill",
"id,applier,billno,tripentry.startdate as startdate," +
"tripentry.entryentity.orientryamount as orientryamount" ,
searchFilterList.toArray(new QFilter [] {}), null
).orderBy(new String[]{"applier", "startdate"});*/
searchFilterList.add(new QFilter("billstatus", QCP.in, billStatuslist));//增加过滤
DynamicObject[] load = BusinessDataServiceHelper.load("er_tripreimbursebill",
"id,description,billno,expenseentryentity," +
DEV_KEY+"_is_business_foreign,"+

11
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/VisitRptQueryPlugin.java
View File

@ -98,6 +98,17 @@ public class VisitRptQueryPlugin extends AbstractReportListDataPlugin {
searchFilterList.add(new QFilter("zcgj_holiday_start_time", QCP.large_equals, firstDay));
searchFilterList.add(new QFilter("zcgj_holiday_start_time", QCP.less_equals, lastDay));
}
List<String> billStatuslist = new ArrayList<>();
//billStatuslist.add("A"); //暂存
//billStatuslist.add("B"); //已提交
//billStatuslist.add("C"); //审核中
//billStatuslist.add("D"); //审核未通过
billStatuslist.add("E"); //审核通过
billStatuslist.add("F"); //等待付款
billStatuslist.add("G"); //已付款
//billStatuslist.add("H"); //废弃
billStatuslist.add("I"); //关闭
searchFilterList.add(new QFilter("billstatus", QCP.in, billStatuslist));//增加过滤
DataSet bdMaterialDataSet = QueryServiceHelper.queryDataSet(
this.getClass().getName(),
"er_dailyreimbursebill",

6
gradle.properties
View File

@ -3,13 +3,13 @@
### If there are any issues during the use process, you can provide feedback to the kingdee developer community website.
### Website: https://developer.kingdee.com/developer?productLineId=29
### Author: liebin.zheng
### Generate Date: 2024-11-22 11:26:47
### Generate Date: 2024-12-15 21:22:07
### ----------------------------
systemProp.kddt_version=2.2.0-Beta
systemProp.template_type=app
systemProp.groupId=zcgj.cosmic
systemProp.artifactId=zcgj-cosmic
systemProp.version=1.0.0
#systemProp.version=1.0.0
systemProp.ci_version=2.0
systemProp.jdk.version=1.8
systemProp.new_cosmic_project=true
@ -18,7 +18,7 @@ systemProp.developer_flag=zcgj
#--This is the project flag
systemProp.project_flag=zcdev
#--This is the project dir
systemProp.project_dir=E:/Code/zhongcaidev
systemProp.project_dir=E:/code/zcdev
#--This is the dir for cosmic project libs and static resouces
systemProp.cosmic_home=D:/comsic/home
#--Performance configuration for gradle build