Sfoglia il codice sorgente

日常物耗申请小数点
考核评审单15,16,17五个字段

fyz 1 settimana fa
parent
commit
8b2404d06f

+ 1 - 1
mjava-lanyun/src/main/java/com/malk/lanyun/service/impl/TimerServiceImpl.java

@@ -1351,7 +1351,7 @@ public class TimerServiceImpl implements TimerService {
                                     sum[1] = sum[1] + scbqr * unitPrice * 1.1;
                                     sum[3] = sum[3] + scbqr * unitPrice;
                                 }
-                                e.put("numberField_lv1qokdk",String.format("%.2f", unitPrice/(1+fax/100)));
+                                e.put("numberField_lv1qokdk",String.format("%.8f", unitPrice/(1+fax/100)));
                                 e.put("numberField_lxd0y352",unitPrice * kcjyl);
 //                                if (!ObjectUtil.isNotNull(e.get("textField_ludqgh1u"))){
                                 e.put("textField_ludqgh1u",code+ "_6038646631836291_"+LocalDateTimeUtil.format(LocalDateTime.now(), "yyyyMMddHHmmssS"));

+ 6 - 3
mjava-lanyun/src/main/java/com/malk/lanyun/service/impl/WorkServiceImpl.java

@@ -735,7 +735,7 @@ public class WorkServiceImpl implements WorkService {
                                             .mapToDouble(map -> ((Number) Double.parseDouble(!map.get("numberField_765hruk_value").toString().isEmpty() ? map.get("numberField_765hruk_value").toString() : "0.0")).doubleValue())
                                             .sum();
                                     //人事扣款执行
-                                    double rskkzx = list.stream()
+                                    double rskkzx = 0 - list.stream()
                                             .mapToDouble(map -> ((Number) (UtilMap.getDouble(map,"numberField_rbnagms")//缺勤扣款
                                                     + UtilMap.getDouble(map,"numberField_qp5294m")//考勤扣款
                                                     + UtilMap.getDouble(map,"numberField_apnua9m")//处罚
@@ -1686,7 +1686,8 @@ public class WorkServiceImpl implements WorkService {
             Map<String, Object> map1 = UtilMap.map("associationFormField_mfo3dvqa, textField_mgojzrla, employeeField_mfo3dvpt, employeeField_mfo3dvq2, " +
                             "numberField_mfo3dvqi, numberField_mfenmelq, numberField_mfenmelr, numberField_mfenmels, numberField_mfo5c8jj, " +
                             "numberField_mfenmelu, numberField_mfenmej6, numberField_mfenmekv, numberField_mfo5qddy, associationFormField_mfo5c8je, " +
-                            "numberField_mfo5qde1, numberField_mfo5qdf8, numberField_mfo5qdfb, numberField_mfo3dvt9",
+                            "numberField_mfo5qde1, numberField_mfo5qdf8, numberField_mfo5qdfb, numberField_mfo3dvt9, numberField_mm0b51nb, " +
+                            "numberField_mm0b51ng, textField_mm0b51nq, numberField_mm0b51nl, numberField_mm0b51nd",
                     jsonArray, q.get("textField_mfenmegp"), q.get("textField_mgoljmhh"), q.get("textField_mgolu3w2"),
                     q.get("numberField_mfo3dvqi"), q.get("numberField_mfenmelq"), q.get("numberField_mfenmelr"), q.get("numberField_mfenmels"), q.get("numberField_mfenmelt"),
                     q.get("numberField_mfenmelu"), q.get("numberField_mfenmej6"),
@@ -1705,7 +1706,9 @@ public class WorkServiceImpl implements WorkService {
                     UtilMap.getDouble(q,"numberField_mfenmele")
                             +UtilMap.getDouble(q,"numberField_mfenmelf")
                     //14
-                    , q.get("numberField_mfenmell"), q.get("numberField_mfo3dvqi"), q.get("numberField_mfo3dvt9"));
+                    , q.get("numberField_mfenmell"), q.get("numberField_mfo3dvqi"), q.get("numberField_mfo3dvt9")
+                    //15,16,17
+                    ,q.get("numberField_mm0b51nb"), q.get("numberField_mm0b51ng"),q.get("textField_mm0b51nq"),q.get("numberField_mm0b51nl"),q.get("numberField_mm0b51nd"));
 
             list1.add(map1);
         });