零时薪资单12

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

@@ -801,12 +801,18 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                 if (null != item.getAmount()) {
                 if (null != item.getAmount()) {
                     abc = abc.add(item.getAmount());
                     abc = abc.add(item.getAmount());
                 }
                 }
-                if (null != item.getTax()) {
-                    d = d.add(item.getTax());
-                }
+
             }
             }
             responseVO.setAbc(abc.toString());
             responseVO.setAbc(abc.toString());
-            responseVO.setD(d.toString());
+            // 税额
+            AgAclLifePractitionerSalary lifePractitionerSalary = new AgAclLifePractitionerSalary();
+            lifePractitionerSalary.setPractitionerId(practitionerId);
+            lifePractitionerSalary.setYearMonth(payoutYearmonth);
+            List<AgAclLifePractitionerSalary> agAclLifePractitionerSalarylist = practitionerSalaryMapper.queryByRecord(lifePractitionerSalary);
+            if (CollectionUtils.isNotEmpty(agAclLifePractitionerSalarylist)) {
+                responseVO.setD(agAclLifePractitionerSalarylist.get(0).getTaxoutAmount().toString());
+            }
+
             // 本期实领
             // 本期实领
             BigDecimal abc_d = abc.subtract(d);
             BigDecimal abc_d = abc.subtract(d);
             // list
             // list

yd-api/src/main/java/com/yd/dal/mapper/practitioner/AgAclLifePractitionerSalaryMapper.java

@@ -21,4 +21,6 @@ public interface AgAclLifePractitionerSalaryMapper {
     List<AgAclLifePractitionerSalary> queryListByPractitionerId(Long practitionerId);
     List<AgAclLifePractitionerSalary> queryListByPractitionerId(Long practitionerId);
 
 
     List<AgAclLifePractitionerSalary> queryListByPractitionerIdAndIsbasic(@Param("practitionerId") Long practitionerId, @Param("isBasic") Integer isBasic);
     List<AgAclLifePractitionerSalary> queryListByPractitionerIdAndIsbasic(@Param("practitionerId") Long practitionerId, @Param("isBasic") Integer isBasic);
+
+    List<AgAclLifePractitionerSalary> queryByRecord(AgAclLifePractitionerSalary lifePractitionerSalary);
 }
 }
\ No newline at end of file

yd-api/src/main/resources/mapper/practitioner/AgAclLifePractitionerSalaryMapper.xml

@@ -134,4 +134,18 @@
     where practitioner_id = #{practitionerId,jdbcType=BIGINT}
     where practitioner_id = #{practitionerId,jdbcType=BIGINT}
       and is_basic = #{isBasic,jdbcType=BIGINT}
       and is_basic = #{isBasic,jdbcType=BIGINT}
   </select>
   </select>
+
+    <select id="queryByRecord" resultMap="BaseResultMap">
+        select * from   ag_acl_life_practitioner_salary
+    where is_basic=1
+      <if test="practitionerId != null">
+        and practitioner_id = #{practitionerId,jdbcType=BIGINT},
+      </if>
+      <if test="practitionerCode != null">
+        and practitioner_code = #{practitionerCode,jdbcType=VARCHAR},
+      </if>
+      <if test="yearMonth != null">
+        and `year_month` = #{yearMonth,jdbcType=VARCHAR},
+      </if>
+    </select>
 </mapper>
 </mapper>
\ No newline at end of file