purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改财务模块

Browse Source
This commit is contained in:
季圣华
2017-10-09 00:09:41 +08:00
parent e7782312de
commit dcc72c440c
9 changed files with 521 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/jsh/action/materials/AccountHeadAction.java
View File

@@ -79,7 +79,7 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
accountHead.setBillNo(model.getBillNo());
try
{
accountHead.setBillTime(new Timestamp(Tools.parse(model.getBillTime(), "yyyy-MM-dd").getTime()));
accountHead.setBillTime(new Timestamp(Tools.parse(model.getBillTime(), "yyyy-MM-dd HH:mm:ss").getTime()));
}
catch (ParseException e)
{
@@ -165,7 +165,7 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
accountHead.setBillNo(model.getBillNo());
try
{
accountHead.setBillTime(new Timestamp(Tools.parse(model.getBillTime(), "yyyy-MM-dd").getTime()));
accountHead.setBillTime(new Timestamp(Tools.parse(model.getBillTime(), "yyyy-MM-dd HH:mm:ss").getTime()));
}
catch (ParseException e)
{
@@ -260,7 +260,7 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
item.put("AccountId", accountHead.getAccountId()==null?"":accountHead.getAccountId().getId());
item.put("AccountName", accountHead.getAccountId()==null?"":accountHead.getAccountId().getName());
item.put("BillNo", accountHead.getBillNo());
item.put("BillTime", Tools.getCurrentMonth(accountHead.getBillTime()));
item.put("BillTime", Tools.getCenternTime(accountHead.getBillTime()));
item.put("ChangeAmount", accountHead.getChangeAmount()==null?"":Math.abs(accountHead.getChangeAmount()));
item.put("TotalPrice", accountHead.getTotalPrice()==null?"":Math.abs(accountHead.getTotalPrice()));
item.put("Remark", accountHead.getRemark());