楚江ERP：上传合同附件修改

@@ -63,6 +63,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.net.URLEncoder;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
@@ -536,11 +537,12 @@ public class ContractDistributorStandardController extends DefaultBaseController
                     dataMap.put("orderDate", data.getOrderDate().format(dateFormatter));
                     dataMap.put("supplierName", data.getSupplierName());
                     dataMap.put("buyerName", data.getBuyerName());
-                    dataMap.put("unitName", data.getUnitName());
+//                    dataMap.put("unitName", data.getUnitName());
+                    dataMap.put("unitName", "元、公斤、元/公斤");
 
-                    dataMap.put("totalQuantity", data.getTotalQuantity());
-                    dataMap.put("totalAmountExcludingTax", data.getTotalAmountExcludingTax());
-                    dataMap.put("totalAmountIncludingTax", data.getTotalAmountIncludingTax());
+                    dataMap.put("totalQuantity", data.getTotalQuantity().setScale(0, RoundingMode.HALF_UP).toString());
+                    dataMap.put("totalAmountExcludingTax", data.getTotalAmountExcludingTax().setScale(2, RoundingMode.HALF_UP).toString());
+                    dataMap.put("totalAmountIncludingTax", data.getTotalAmountIncludingTax().setScale(2, RoundingMode.HALF_UP).toString());
                     dataMap.put("totalAmountCapital", data.getTotalAmountCapital());
 
                     dataMap.put("depositInfo", data.getDepositInfo());

@@ -270,9 +270,12 @@ public class ContractDistributorStandardServiceImpl extends
                 .set(ContractDistributorStandard::getFormalFileId, vo.getFormalFileId())
                 .set(ContractDistributorStandard::getFormalFileName, vo.getFormalFileName())
                 .set(ContractDistributorStandard::getFormalStandardized, vo.getFormalStandardized())
-                .set(ContractDistributorStandard::getStatus, "FORMAL")
-                .set(ContractDistributorStandard::getFormalApproved, CustomerDevelopStatus.AUDIT.name())
-                .eq(ContractDistributorStandard::getId, vo.getId());
+                .set(ContractDistributorStandard::getFormalApproved, CustomerDevelopStatus.AUDIT.name());
+        if (data.getStatus().equals("DRAFT")) {
+            updateWrapper.set(ContractDistributorStandard::getStatus, "FORMAL");
+        }
+
+        updateWrapper.eq(ContractDistributorStandard::getId, vo.getId());
 
         getBaseMapper().update(updateWrapper);
 
@@ -301,9 +304,13 @@ public class ContractDistributorStandardServiceImpl extends
                 .set(ContractDistributorStandard::getStandardFileId, vo.getStandardFileId())
                 .set(ContractDistributorStandard::getStandardFileName, vo.getStandardFileName())
                 .set(ContractDistributorStandard::getStandardStandardized, vo.getStandardStandardized())
-                .set(ContractDistributorStandard::getStatus, "STANDARD")
-                .set(ContractDistributorStandard::getStandardApproved, CustomerDevelopStatus.AUDIT.name())
-                .eq(ContractDistributorStandard::getId, vo.getId());
+                .set(ContractDistributorStandard::getStandardApproved, CustomerDevelopStatus.AUDIT.name());
+        if (!data.getStatus().equals("STANDARD")) {
+            updateWrapper.set(ContractDistributorStandard::getStatus, "STANDARD");
+
+        }
+
+        updateWrapper.eq(ContractDistributorStandard::getId, vo.getId());
 
         getBaseMapper().update(updateWrapper);