|
@@ -34,6 +34,8 @@ import org.springframework.mock.web.MockMultipartFile;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
+
|
|
|
+import javax.xml.crypto.Data;
|
|
|
import java.io.*;
|
|
|
import java.net.HttpURLConnection;
|
|
|
import java.net.URL;
|
|
@@ -685,7 +687,9 @@ public class OwnMessageController extends BaseController {
|
|
|
//已生效
|
|
|
finance.setZfiStatus("02");
|
|
|
//修改时间
|
|
|
- finance.setUpdateTime(DateUtils.getNowDate());
|
|
|
+ finance.setUpdateTime(date);
|
|
|
+ //签收日期
|
|
|
+ financeInf.setZfiSignDate(date);
|
|
|
//修改人
|
|
|
finance.setUpdateBy(userId);
|
|
|
financeInfService.updateById(finance);
|
|
@@ -731,9 +735,7 @@ public class OwnMessageController extends BaseController {
|
|
|
//已生效
|
|
|
finance.setZfiStatus("02");
|
|
|
//签收日期
|
|
|
- //获取当前时间
|
|
|
- Date currentTime = DateUtils.getNowDate();
|
|
|
- financeInf.setZfiSignDate(currentTime);
|
|
|
+ financeInf.setZfiSignDate(date);
|
|
|
//修改时间
|
|
|
finance.setUpdateTime(DateUtils.getNowDate());
|
|
|
//修改人
|
|
@@ -755,6 +757,8 @@ public class OwnMessageController extends BaseController {
|
|
|
finance.setZfiId(zfiId);
|
|
|
//已生效
|
|
|
finance.setZfiStatus("02");
|
|
|
+ //签收日期
|
|
|
+ financeInf.setZfiSignDate(date);
|
|
|
//修改时间
|
|
|
finance.setUpdateTime(DateUtils.getNowDate());
|
|
|
//修改人
|