|
|
@@ -37,6 +37,7 @@ import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.time.LocalDate;
|
|
|
import java.util.*;
|
|
|
|
|
|
/**
|
|
|
@@ -384,8 +385,11 @@ public class StaffService extends BaseService<Staff> {
|
|
|
moneyAccount.setMacCode(m.get("macCode").toString());
|
|
|
moneyAccount.setMacName(m.get("macName").toString());
|
|
|
moneyAccount.setMacType(m.get("macType").toString());
|
|
|
- moneyAccount.setBalance((BigDecimal) m.get("balance"));
|
|
|
+ moneyAccount.setAccDate(LocalDate.parse(m.get("accDate").toString()) );
|
|
|
+// moneyAccount.setBalance((BigDecimal) m.get("balance"));
|
|
|
+ moneyAccount.setBalance(new BigDecimal(m.get("balance").toString()) );
|
|
|
moneyAccount.setFlgDefault((Boolean) m.get("flgDefault"));
|
|
|
+ moneyAccount.setFlgNegative((Boolean) m.get("flgNegative"));
|
|
|
moneyAccount.setDisplayNo((Integer) m.get("displayNo"));
|
|
|
moneyAccount.setCpId(cpId);
|
|
|
listMa.add(moneyAccount);
|