From 448a85626c8c35af7b0f9ab2c9881f07c0e0118a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 16 May 2022 03:01:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xm-bootstrap/src/main/resources/logback-spring.xml             | 2 +-
 .../src/main/java/com/xm/core/ctrl/XmTaskSbillController.java  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/xm-bootstrap/src/main/resources/logback-spring.xml b/xm-bootstrap/src/main/resources/logback-spring.xml
index 69b6b48b..aca86b18 100644
--- a/xm-bootstrap/src/main/resources/logback-spring.xml
+++ b/xm-bootstrap/src/main/resources/logback-spring.xml
@@ -12,7 +12,7 @@
         class="ch.qos.logback.core.rolling.RollingFileAppender">
         <File>logs/xm.log</File>  
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">  
-            <FileNamePattern>logs/oa-%d{yyyy-MM-dd}%-i.log
+            <FileNamePattern>logs/oa-%d{yyyy-MM-dd}-%i.log
             </FileNamePattern>  
             <MaxHistory>10</MaxHistory>  
             <TimeBasedFileNamingAndTriggeringPolicy  
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java
index 20f317c9..0f8d8d09 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java
@@ -109,7 +109,8 @@ public class XmTaskSbillController {
 			xmTaskSbill.setCtime(new Date());
 			xmTaskSbill.setCuserid(user.getUserid());
 			xmTaskSbill.setCusername(user.getUsername());
-			xmTaskSbill.setBizDate(user.getBranchId());
+			xmTaskSbill.setBizDate(DateUtils.getDate("yyyy-MM-dd"));
+			xmTaskSbill.setBranchId(user.getBranchId());
 			xmTaskSbill.setDeptid(user.getDeptid());
 			xmTaskSbill.setWorkload(BigDecimal.ZERO);
 			xmTaskSbill.setBizFlowState("0");