核算时核算校验bug

src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java

@@ -94,10 +94,18 @@ public class TaxDeclarationPO {
      */
     private Integer controlView;
 
-    //税款所属期
+    /**
+     * 薪资所属月
+     */
     LocalDateRange salaryMonths;
 
 
+    /**
+     * 税款所属期
+     */
+    LocalDateRange taxMonths;
+
+
 
     private Collection<Long> taxAgentIds;
 }

src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml

@@ -63,6 +63,12 @@
         <if test="salaryMonths != null and salaryMonths.endDate != null">
             AND salary_month <![CDATA[ <= ]]> #{salaryMonths.endDate}
         </if>
+        <if test="taxMonths != null and taxMonths.fromDate != null">
+            AND tax_cycle <![CDATA[ >= ]]> #{taxMonths.fromDate}
+        </if>
+        <if test="taxMonths != null and taxMonths.endDate != null">
+            AND tax_cycle <![CDATA[ <= ]]> #{taxMonths.endDate}
+        </if>
         <if test="taxAgentIds != null and taxAgentIds.size()>0">
             AND tax_agent_id IN
             <foreach collection="taxAgentIds" open="(" item="id" separator="," close=")">

src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java

@@ -400,7 +400,7 @@ public class TaxDeclarationServiceImpl extends Service implements TaxDeclaration
     @Override
     public List<TaxDeclarationPO> listByTaxCycleRange(YearMonthRange yearMonthRange) {
         return getTaxDeclarationMapper().listSome(TaxDeclarationPO.builder()
-                .salaryMonths(LocalDateRange.builder().fromDate(yearMonthRange.getStartMonth()).endDate(yearMonthRange.getEndMonth()).build())
+                .taxMonths(LocalDateRange.builder().fromDate(yearMonthRange.getStartMonth()).endDate(yearMonthRange.getEndMonth()).build())
                 .build());
     }