零时薪资单9-本期实领

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java

@@ -445,7 +445,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
             payScaleInfo.setMonDtlAmount(salary.getPayableAmount().doubleValue());
             payScaleInfo.setMonDtlAmount(salary.getPayableAmount().doubleValue());
             payScaleInfo.setMonDtlRAmount(salary.getNetAmount().doubleValue());
             payScaleInfo.setMonDtlRAmount(salary.getNetAmount().doubleValue());
             if ("1".equals(salary.getIsBasic())) {
             if ("1".equals(salary.getIsBasic())) {
-                payScaleInfo.setIsBasic(1);
+                payScaleInfo.setIsBasic("1");
             }
             }
             time = payScaleInfo.getMonDtlPeriod();
             time = payScaleInfo.getMonDtlPeriod();
             if (StringUtils.isNotBlank(time)) {
             if (StringUtils.isNotBlank(time)) {
@@ -655,6 +655,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
             payScaleInfo.setMonDtlPeriod(salary.getYearMonth());
             payScaleInfo.setMonDtlPeriod(salary.getYearMonth());
             payScaleInfo.setMonDtlAmount(salary.getPayableAmount().doubleValue());
             payScaleInfo.setMonDtlAmount(salary.getPayableAmount().doubleValue());
             payScaleInfo.setMonDtlRAmount(salary.getNetAmount().doubleValue());
             payScaleInfo.setMonDtlRAmount(salary.getNetAmount().doubleValue());
+            payScaleInfo.setIsBasic(salary.getIsBasic());
 
 
             resultList.add(payScaleInfo);
             resultList.add(payScaleInfo);
         }
         }
@@ -805,6 +806,8 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
             }
             }
             responseVO.setAbc(abc.toString());
             responseVO.setAbc(abc.toString());
             responseVO.setD(d.toString());
             responseVO.setD(d.toString());
+            // 本期实领
+            BigDecimal abc_d = abc.subtract(d);
             // list
             // list
             List<SalaryDetail> list = new ArrayList<>();
             List<SalaryDetail> list = new ArrayList<>();
             for (AgAclSalary item : newSalaryList) {
             for (AgAclSalary item : newSalaryList) {
@@ -813,6 +816,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                 target.setCommission(item.getAmount().doubleValue());
                 target.setCommission(item.getAmount().doubleValue());
                 target.setSalaryType(item.getSalaryType());
                 target.setSalaryType(item.getSalaryType());
                 target.setSalaryCode(item.getSalaryCode());
                 target.setSalaryCode(item.getSalaryCode());
+                target.setAfter_tax_comis(abc_d.doubleValue());
                 list.add(target);
                 list.add(target);
             }
             }
             responseVO.setList(list);
             responseVO.setList(list);

yd-api/src/main/java/com/yd/api/practitioner/vo/payscale/PayScaleInfo.java

@@ -15,7 +15,7 @@ public class PayScaleInfo {
     private String loginName;
     private String loginName;
     private String years;
     private String years;
     private String month;
     private String month;
-    private Integer isBasic;
+    private String isBasic;
 
 
     public Long getMonShId() {
     public Long getMonShId() {
         return monShId;
         return monShId;
@@ -149,11 +149,11 @@ public class PayScaleInfo {
                 '}';
                 '}';
     }
     }
 
 
-    public Integer getIsBasic() {
+    public String getIsBasic() {
         return isBasic;
         return isBasic;
     }
     }
 
 
-    public void setIsBasic(Integer isBasic) {
+    public void setIsBasic(String isBasic) {
         this.isBasic = isBasic;
         this.isBasic = isBasic;
     }
     }
 }
 }