Merge branch 'release/3.0.2.2504.01' into release/个税&业务线

# Conflicts:
#	src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationListQueryParam.java
#	src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
#	src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
#	src/com/engine/salary/web/TaxDeclarationController.java

src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationListDTO.java

@@ -38,6 +38,10 @@ public class TaxDeclarationListDTO {
     @TableTitle(title = "薪资类型", dataIndex = "incomeCategory", key = "incomeCategory")
     private String incomeCategory;
 
+    @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
+    @TableTitle(title = "税款所属期", dataIndex = "taxCycle", key = "taxCycle")
+    private Date taxCycle;
+
     @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
     @TableTitle(title = "薪资所属月", dataIndex = "salaryMonth", key = "salaryMonth")
     private Date salaryMonth;
@@ -48,10 +52,6 @@ public class TaxDeclarationListDTO {
     @TableTitle(title = "个税扣缴义务人", dataIndex = "taxAgentName", key = "taxAgentName")
     private String taxAgentName;
 
-    @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
-    @TableTitle(title = "税款所属期", dataIndex = "taxCycle", key = "taxCycle")
-    private Date taxCycle;
-
     //@TableTitle(title = "操作人id", dataIndex = "operateEmployeeId", key = "operateEmployeeId")
     private Long operateEmployeeId;
 

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

@@ -110,6 +110,13 @@ public class TaxDeclarationPO {
     LocalDateRange taxMonths;
 
 
+    //"开始日期
+    private Date taxCycleFromDate;
+
+    //结束日期
+    private Date taxCycleEndDate;
+
+
 
     private Collection<Long> taxAgentIds;
     private Set<String> opts;

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

@@ -69,6 +69,12 @@
         <if test="taxMonths != null and taxMonths.endDate != null">
             AND tax_cycle <![CDATA[ <= ]]> #{taxMonths.endDate}
         </if>
+        <if test="taxCycleFromDate != null">
+            AND tax_cycle <![CDATA[ >= ]]> #{taxCycleFromDate}
+        </if>
+        <if test="taxCycleEndDate != null">
+            AND tax_cycle <![CDATA[ <= ]]> #{taxCycleEndDate}
+        </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

@@ -157,14 +157,12 @@ public class TaxDeclarationServiceImpl extends Service implements TaxDeclaration
     public PageInfo<TaxDeclarationPO> listPageByParam(TaxDeclarationListQueryParam queryParam) {
         // 分页参数
         TaxDeclarationPO po = TaxDeclarationPO.builder().build();
-        LocalDateRange localDateRange = new LocalDateRange();
         if (Objects.nonNull(queryParam.getFromSalaryMonth())) {
-            localDateRange.setFromDate(queryParam.getFromSalaryMonth());
+            po.setTaxCycleFromDate(queryParam.getFromSalaryMonth());
         }
         if (Objects.nonNull(queryParam.getEndSalaryMonth())) {
-            localDateRange.setEndDate(SalaryDateUtil.localDateToDate(SalaryDateUtil.localDate2YearMonth(queryParam.getEndSalaryMonth()).atEndOfMonth()));
+            po.setTaxCycleEndDate(queryParam.getEndSalaryMonth());
         }
-        po.setSalaryMonths(localDateRange);
 
         // 查询个税申报表
         List<TaxDeclarationPO> taxDeclarationPOS = getTaxDeclarationMapper().listSome(po);

src/com/engine/salary/web/TaxDeclarationController.java

@@ -72,7 +72,7 @@ public class TaxDeclarationController {
     @POST
     @Path("/list")
     @Produces(MediaType.APPLICATION_JSON)
-    public String listTaxDeclaration(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody TaxDeclarationListQueryParam queryParam) {
+    public String list(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody TaxDeclarationListQueryParam queryParam) {
         User user = HrmUserVarify.getUser(request, response);
         return new ResponseResult<TaxDeclarationListQueryParam, PageInfo>(user).run(getTaxDeclareRecordWrapper(user)::listPage, queryParam);
     }