EDZ 3 years ago
parent
commit
f0583c5850

+ 7 - 6
src/main/java/net/chenlin/dp/common/openapi4j/examples/voucher/VoucherAdd.java

@@ -37,8 +37,9 @@ public class VoucherAdd {
 //        voucher.put("fiscal_year","2021");//凭证所属的会计年度,不填写取当前年
 //        voucher.put("accounting_period","1");//所属的会计期间,不填写取当前月份
         voucher.put("date", DateUtils.format(new Date()));//制单日期
-        voucher.put("enter","DingDing_"+map.get("申请人"));//制单人名称
-        voucher.put("cashier",map.get("出纳"));//出纳名称
+//        voucher.put("enter","DingDing_"+map.get("申请人"));//制单人名称
+        voucher.put("enter","autoDingDing");//制单人名称
+//        voucher.put("cashier",map.get("出纳"));//出纳名称
 
         Map<String,Object> credit = new HashMap<>();                     //voucher > credit
         List<Map<String,Object>> entryCredit = new ArrayList<>();        //voucher > credit > entryCredit
@@ -56,10 +57,10 @@ public class VoucherAdd {
 //        entryCreditMap.put("document_date","2021-09-18");
 //        entryCreditMap.put("document_id","321654");
 //        entryCreditMap.put("exchange_rate2","0");
-        entryCreditMap.put("abstract",map.get("事由"));
+        entryCreditMap.put("abstract",map.get("abstract"));
         entryCreditMap.put("account_code","1001");
 //        entryCreditMap.put("entry_id","0");//
-        entryCreditMap.put("natural_credit_currency",map.get("申请金额(元)"));//本币贷方发生额*与本币借方发生额不能同时为空
+        entryCreditMap.put("natural_credit_currency",map.get("naturalCurrency"));//本币贷方发生额*与本币借方发生额不能同时为空
 //        entryCreditMap.put("primary_credit_amount","0");//
         entryCredit.add(entryCreditMap);
         credit.put("entry",entryCredit);
@@ -78,14 +79,14 @@ public class VoucherAdd {
 //
 //        entryDebitMap.put("auxiliary",new HashMap<String,Object>());
 //        entryDebitMap.put("settlement","8");
-        entryDebitMap.put("abstract",map.get("事由"));
+        entryDebitMap.put("abstract",map.get("abstract"));
 //        entryDebitMap.put("debit_quantity","0");
 //        entryDebitMap.put("document_date","2021-09-18");
 //        entryDebitMap.put("document_id","123456");
 //        entryDebitMap.put("exchange_rate2","0");
         entryDebitMap.put("account_code","1001");
 //
-        entryDebitMap.put("natural_debit_currency",map.get("申请金额(元)"));//本币贷方发生额*与本币借方发生额不能同时为空
+        entryDebitMap.put("natural_debit_currency",map.get("naturalCurrency"));//本币贷方发生额*与本币借方发生额不能同时为空
 //        entryDebitMap.put("primary_debit_amount","0");//
 //        entryDebitMap.put("entry_id","0");//
         entryDebit.add(entryDebitMap);

+ 10 - 0
src/main/java/net/chenlin/dp/common/utils/DateUtils.java

@@ -92,7 +92,17 @@ public class DateUtils {
 		return t;
 	}
 
+	/**
+	 * 获取当前时间
+	 * @return
+	 */
+	public static String getNowTime(){
+		return format(new Date(),DATE_TIME_CHN_PATTERN);
+	}
+
 	public static void main(String[] args) {
+		String timeStamp1 = format(new Date(),DATE_TIME_CHN_PATTERN);
+		System.out.println(new Date());
 		String timeStamp = timeStamp();
 //		System.out.println("timeStamp="+timeStamp); //运行输出:timeStamp=1470278082
 //		System.out.println(System.currentTimeMillis());//运行输出:1470278082980

+ 26 - 5
src/main/java/net/chenlin/dp/modules/TaskDemo.java

@@ -1,20 +1,41 @@
 package net.chenlin.dp.modules;
 
+import net.chenlin.dp.common.utils.DateUtils;
 import net.chenlin.dp.modules.api.controller.DingdingOpenInterface;
+import net.chenlin.dp.modules.api.service.PettyCashService;
+import net.chenlin.dp.modules.api.service.ReimbursementService;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+
 @Component("TaskDemo")
 public class TaskDemo {
 
     /**
-     * 测试系统自带定时任务
+     * 定时任务 备用金 同步至 u8凭证
+     */
+    public static void autoUpdataPettyJob(){
+        PettyCashService pettyCashService = new PettyCashService();
+        pettyCashService.autoUpdataPetty();
+        System.out.println("==================================");
+        System.out.println("===========备用金定时任务执行 "+ DateUtils.getNowTime()+" ============" );
+        System.out.println("==================================");
+    }
+
+    /**
+     * 定时任务 报销申请 同步至 u8凭证
      */
-    public static void testJob(){
-        System.out.println("11111111111111111111111111111");
-        System.out.println("11111111111111111111111111111");
-        System.out.println("11111111111111111111111111111");
+    public static void autoReimbursementJob(){
+        ReimbursementService reimbursementService = new ReimbursementService();
+        reimbursementService.autoReimbursement();
+        System.out.println("==================================");
+        System.out.println("===========报销申请定时任务执行 "+ DateUtils.getNowTime()+" ============" );
+        System.out.println("==================================");
     }
 
+
+
+
     public static void main(String[] args) {
 
         DingdingOpenInterface dingdingOpenInterface = new DingdingOpenInterface();

+ 2 - 2
src/main/java/net/chenlin/dp/modules/api/controller/DingdingOpenInterface.java

@@ -76,7 +76,7 @@ public class DingdingOpenInterface {
 
             req.setProcessCode(processCode);
             Calendar nowTime = Calendar.getInstance();
-            nowTime.add(Calendar.MONTH, -1);
+            nowTime.add(Calendar.DAY_OF_YEAR, -1);
             Date date = nowTime.getTime();
             req.setStartTime(Long.valueOf(date.getTime()));//时间戳:例1586448000000
             OapiProcessinstanceListidsResponse rsp = client.execute(req, gettoken);//access_token
@@ -148,7 +148,7 @@ public class DingdingOpenInterface {
 //            }
         Calendar nowTime = Calendar.getInstance();
 //        nowTime.add(Calendar.MINUTE, 5);
-        nowTime.add(Calendar.MONTH, -1);
+        nowTime.add(Calendar.DAY_OF_YEAR, -1);
         Date date = nowTime.getTime();
         System.out.println(date.getTime());
         System.out.println(nowTime.getTime());

+ 12 - 9
src/main/java/net/chenlin/dp/modules/api/service/PettyCashService.java

@@ -17,7 +17,6 @@ import java.util.Properties;
  */
 public class PettyCashService {
 
-//    public static void autoUpdataPetty(){
     public static void autoUpdataPetty(){
 
         DingdingOpenInterface dingdingOpenInterface = new DingdingOpenInterface();
@@ -36,17 +35,21 @@ public class PettyCashService {
                 Map<String,Object> map1 = dingdingOpenInterface.tableToMap(map);
 
 //                System.out.println(map.get("business_id"));
-//                System.out.println(map1);
 //                System.out.println(map);
-                System.out.println(map1.get("申请事由"));
-                System.out.println(map1.get("申请金额(元)"));
-                System.out.println(map1.get("备注"));
-                System.out.println(map1.get("申请日期"));
-                System.out.println(map1.get("收款账户"));
-                System.out.println(map1.get("收款账号"));
+//                System.out.println(map1.get("申请事由"));
+//                System.out.println(map1.get("申请金额(元)"));
+//                System.out.println(map1.get("备注"));
+//                System.out.println(map1.get("申请日期"));
+//                System.out.println(map1.get("收款账户"));
+//                System.out.println(map1.get("收款账号"));
 //                System.out.println(map1.get("[\"使用日期\",\"归还日期\"]"));
 
-//                VoucherAdd.addVoucher(map1,map.get("business_id").toString());
+                map1.put("abstract",map1.get("申请事由"));
+                map1.put("naturalCurrency",map1.get("申请金额(元)"));
+//                map1.put("naturalCurrency",map1.get("申请金额(元)"));
+//                System.out.println(map1);
+//                System.out.println(map.get("business_id").toString());
+                VoucherAdd.addVoucher(map1,map.get("business_id").toString());
 
             }
 

+ 5 - 10
src/main/java/net/chenlin/dp/modules/api/service/ReimbursementService.java

@@ -29,17 +29,12 @@ public class ReimbursementService {
                 Map<String,Object> map1 = dingdingOpenInterface.tableToMap(map);
 
 //                System.out.println(map.get("business_id"));
-                System.out.println(map1);
-                System.out.println("============================");
-//                System.out.println(map1.get("部门"));
-//                System.out.println(map1.get("出纳"));
-//                System.out.println(map1.get("申请金额(元)"));
-//                System.out.println(map1.get("备注"));
-//                System.out.println(map1.get("申请人"));
-//                System.out.println(map1.get("事由"));
-//                System.out.println(map1.get("收款账号"));
-//                System.out.println(map1.get("[\"使用日期\",\"归还日期\"]"));
+//                System.out.println("============================");
+//                System.out.println(map1.get("总计金额"));
+                map1.put("abstract","报销");
+                map1.put("naturalCurrency",map1.get("总计金额"));
 
+                VoucherAdd.addVoucher(map1,map.get("business_id").toString());
 
             }