|
@@ -27,6 +27,7 @@ import javax.servlet.http.HttpServletResponse;
|
|
|
import java.sql.Connection;
|
|
|
import java.sql.DriverManager;
|
|
|
import java.sql.PreparedStatement;
|
|
|
+import java.text.DecimalFormat;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.util.*;
|
|
|
|
|
@@ -565,6 +566,7 @@ public class TimerServiceImpl implements TimerService {
|
|
|
"`net_margin`, `format`, `customer_system`, `profit_loss`, `approach_date`, `level`, `notes`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?);";
|
|
|
|
|
|
ps = connection.prepareStatement(sql);
|
|
|
+ DecimalFormat df = new DecimalFormat("#.0000");
|
|
|
for (int i = 0; i < dataList.size(); i++) {
|
|
|
ps.setObject(1,dataList.get(i).get("textField_dliiyul"));
|
|
|
ps.setObject(2,dataList.get(i).get("textField_bheotm5"));
|
|
@@ -580,14 +582,24 @@ public class TimerServiceImpl implements TimerService {
|
|
|
ps.setObject(12,dataList.get(i).get("numberField_gub2ul5"));
|
|
|
ps.setObject(13,dataList.get(i).get("numberField_hqiac12"));
|
|
|
ps.setObject(14,dataList.get(i).get("numberField_lz6mt3xq"));
|
|
|
- ps.setObject(15,dataList.get(i).get("numberField_lz9n3fm9"));
|
|
|
+ double grossProfit = Double.parseDouble(dataList.get(i).get("numberField_lz6mt3xq").toString());
|
|
|
+ double income = Double.parseDouble(dataList.get(i).get("numberField_zjdki9k").toString());
|
|
|
+ grossProfit = grossProfit/income;
|
|
|
+ if (income == 0f){
|
|
|
+ grossProfit = 0f;
|
|
|
+ }
|
|
|
+ ps.setObject(15,df.format(grossProfit));
|
|
|
ps.setObject(16,dataList.get(i).get("numberField_ln701sy"));
|
|
|
ps.setObject(17,dataList.get(i).get("numberField_fmhzxdr"));
|
|
|
ps.setObject(18,dataList.get(i).get("numberField_lz6mt3xr"));
|
|
|
- ps.setObject(19,dataList.get(i).get("numberField_lz9n3fma"));
|
|
|
+ double net = Double.parseDouble(dataList.get(i).get("numberField_lz6mt3xr").toString());
|
|
|
+ double net_margin = net/income;
|
|
|
+ if (income == 0f){
|
|
|
+ net_margin = 0f;
|
|
|
+ }
|
|
|
+ ps.setObject(19,df.format(net_margin));
|
|
|
ps.setObject(20,dataList.get(i).get("textField_tpb3m2f"));
|
|
|
ps.setObject(21,dataList.get(i).get("textField_2adicsn"));
|
|
|
- double net_margin = Double.parseDouble(dataList.get(i).get("numberField_lz9n3fma").toString());
|
|
|
String profit_loss = "";
|
|
|
if (net_margin < 0){
|
|
|
profit_loss = "亏损";
|