调整定额数据表部分取值

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

@@ -744,13 +744,13 @@ public class WorkServiceImpl implements WorkService {
                                             ).doubleValue())
                                             .sum();
                                     return new HashMap<String, Object>() {{
-                                        put("numberField_mfenmehu", sbgjj);
+                                        put("numberField_mfenmehu", sbgjj);//社保公积金补贴
                                         put("numberField_mfenmehv", xyzfy);
-                                        put("numberField_mfenmehx", yfgzA);
+                                        put("numberField_mfenmehx", yfgzA);//应发工资A
                                         put("numberField_mfenmehz", jfjl);
 //                                        put("numberField_mfenmei1", wpgz);
-                                        put("numberField_mfenmehy", wpgz);
-                                        put("numberField_mfenmei3", jxgz);
+                                        put("numberField_mfenmehy", wpgz);//外派工资
+                                        put("numberField_mfenmei3", jxgz);//其他费用
                                         put("numberField_mfenmehw", sbgjj + xyzfy);//定额工资(未加人工定额)
                                         put("numberField_mfenmei5", yfgzA - jfjl + wpgz + jxgz);//调整后应发工资(未加生产成本-业务外包费)
                                         put("rgzbfz", yfgzA + wpgz + jxgz + sbgjj);//人工占比分子
@@ -1611,10 +1611,12 @@ public class WorkServiceImpl implements WorkService {
 
             Map<String, Object> map3 = UtilMap.map("associationFormField_mfp5husq, textField_mfp5husp, employeeField_mfp5huso, employeeField_mfp5husn, " +
                             "textField_mfenmejo, textField_mfenmejq, numberField_mfenmejp, numberField_mfenmejr, numberField_mfenmejs, " +
-                            "numberField_mfenmels, textField_mgm3bkiz, numberField_mfenmelt, numberField_mfenmek8, numberField_mfenmek9",
+                            "numberField_mfenmels, textField_mgm3bkiz, numberField_mfenmelt, numberField_mfenmek8, numberField_mfenmek9, " +
+                            "numberField_mfenmelu",
                     jsonArray, q.get("textField_mfenmegp"), q.get("textField_mgoljmhh"), q.get("textField_mgolu3w2"),
                     q.get("textField_mfenmejo"), q.get("textField_mfenmejq"), q.get("numberField_mfenmejp"), q.get("numberField_mfenmejr"), q.get("numberField_mfenmejs"),
-                    q.get("numberField_mfenmels"), q.get("textField_mgohy54u"), q.get("numberField_mfenmelt"), q.get("numberField_mfenmek8"), q.get("numberField_mfenmek9"));
+                    q.get("numberField_mfenmels"), q.get("textField_mgohy54u"), q.get("numberField_mfenmelt"), q.get("numberField_mfenmek8"), q.get("numberField_mfenmek9"),
+                    q.get("numberField_mfenmelu"));
 
             list3.add(map3);