下载内置算税明细

src/com/engine/salary/entity/taxdeclaration/param/DeclareTaxResultFeedbackQueryParam.java

@@ -0,0 +1,18 @@
+package com.engine.salary.entity.taxdeclaration.param;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+@Data
+@Builder
+@Accessors(chain = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class DeclareTaxResultFeedbackQueryParam {
+    Long id;
+
+    String requestId;
+}

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

@@ -62,6 +62,10 @@ public class TaxDeclareRecordPO implements Serializable {
      * 请求的requestId
      */
     private String requestId;
+    /**
+     * 申报的requestId，用于下载申报过程
+     */
+    private String declareRequestId;
     /**
      * 备注
      */

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

@@ -13,6 +13,7 @@
         <result column="tax_cycle" property="taxCycle"/>
         <result column="remark" property="remark"/>
         <result column="request_id" property="requestId"/>
+        <result column="declare_request_id" property="declareRequestId"/>
         <result column="tax_declare_type" property="taxDeclareType"/>
         <result column="tax_declare_status" property="taxDeclareStatus"/>
         <result column="display_update_icon" property="displayUpdateIcon"/>
@@ -38,6 +39,7 @@
         , t.tax_cycle
         , t.remark
         , t.request_id
+        , t.declare_request_id
         , t.tax_declare_type
         , t.tax_declare_status
         , t.display_update_icon
@@ -105,6 +107,9 @@
         <if test="requestId != null">
             AND request_id = #{requestId}
         </if>
+        <if test="declareRequestId != null">
+            AND declare_request_id = #{declareRequestId}
+        </if>
         <if test="taxDeclareType != null">
             AND tax_declare_type = #{taxDeclareType}
         </if>
@@ -189,6 +194,9 @@
             <if test="requestId != null">
                 request_id,
             </if>
+            <if test="declareRequestId != null">
+                declare_request_id,
+            </if>
             <if test="taxDeclareType != null">
                 tax_declare_type,
             </if>
@@ -248,6 +256,9 @@
             <if test="requestId != null">
                 #{requestId},
             </if>
+            <if test="declareRequestId != null">
+                #{declareRequestId},
+            </if>
             <if test="taxDeclareType != null">
                 #{taxDeclareType},
             </if>
@@ -291,6 +302,7 @@
         tax_cycle,
         remark,
         request_id,
+        declare_request_id,
         tax_declare_type,
         tax_declare_status,
         display_update_icon,
@@ -314,6 +326,7 @@
             #{item.taxCycle},
             #{item.remark},
             #{item.requestId},
+            #{item.declareRequestId},
             #{item.taxDeclareType},
             #{item.taxDeclareStatus},
             #{item.displayUpdateIcon},
@@ -340,6 +353,7 @@
         tax_cycle,
         remark,
         request_id,
+        declare_request_id,
         tax_declare_type,
         tax_declare_status,
         display_update_icon,
@@ -363,6 +377,7 @@
             #{item.taxCycle,jdbcType=DATE},
             #{item.remark,jdbcType=VARCHAR},
             #{item.requestId,jdbcType=DOUBLE},
+            #{item.declareRequestId,jdbcType=VARCHAR},
             #{item.taxDeclareType,jdbcType=INTEGER},
             #{item.taxDeclareStatus,jdbcType=INTEGER},
             #{item.displayUpdateIcon,jdbcType=INTEGER},
@@ -390,6 +405,7 @@
             tax_cycle,
             remark,
             request_id,
+            declare_request_id,
             tax_declare_type,
             tax_declare_status,
             display_update_icon,
@@ -412,6 +428,7 @@
             #{item.taxCycle},
             #{item.remark},
             #{item.requestId},
+            #{item.declareRequestId},
             #{item.taxDeclareType},
             #{item.taxDeclareStatus},
             #{item.displayUpdateIcon},
@@ -438,6 +455,7 @@
             tax_cycle=#{taxCycle},
             remark=#{remark},
             request_id=#{requestId},
+            declare_request_id=#{declareRequestId},
             tax_declare_type=#{taxDeclareType},
             tax_declare_status=#{taxDeclareStatus},
             display_update_icon=#{displayUpdateIcon},
@@ -485,6 +503,9 @@
             <if test="requestId != null">
                 request_id=#{requestId},
             </if>
+            <if test="declareRequestId != null">
+                declare_request_id=#{declareRequestId},
+            </if>
             <if test="taxDeclareType != null">
                 tax_declare_type=#{taxDeclareType},
             </if>

src/com/engine/salary/service/TaxDeclareRecordService.java

@@ -2,6 +2,7 @@ package com.engine.salary.service;
 
 import com.engine.salary.common.YearMonthRange;
 import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationRateDTO;
+import com.engine.salary.entity.taxdeclaration.param.DeclareTaxResultFeedbackQueryParam;
 import com.engine.salary.entity.taxdeclaration.param.TaxDeclarationListQueryParam;
 import com.engine.salary.entity.taxdeclaration.param.TaxDeclarationSaveParam;
 import com.engine.salary.entity.taxdeclaration.po.TaxDeclarationPO;
@@ -140,7 +141,7 @@ public interface TaxDeclareRecordService  {
      */
     Object getDeclareTaxResultFeedback(Long id);
 
-    XSSFWorkbook exportGetDeclareTaxResultFeedback(Long id,String requestId);
+    XSSFWorkbook exportGetDeclareTaxResultFeedback(DeclareTaxResultFeedbackQueryParam param);
     /**
      * 作废
      *

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

@@ -26,6 +26,7 @@ import com.engine.salary.entity.taxapiflow.po.TaxDeclarationApiFlowRecordPO;
 import com.engine.salary.entity.taxdeclaration.bo.*;
 import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationRateDTO;
 import com.engine.salary.entity.taxdeclaration.param.AbnormalEmployeeListQueryParam;
+import com.engine.salary.entity.taxdeclaration.param.DeclareTaxResultFeedbackQueryParam;
 import com.engine.salary.entity.taxdeclaration.param.TaxDeclarationListQueryParam;
 import com.engine.salary.entity.taxdeclaration.param.TaxDeclarationSaveParam;
 import com.engine.salary.entity.taxdeclaration.po.*;
@@ -772,6 +773,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe
         // 申报类型
         taxDeclareRecord.setTaxPayAmount(Util.null2String(declareTaxFeedbackResponse.getBody().get("ykjse")));
         taxDeclareRecord.setPersonNum(Integer.parseInt(Optional.ofNullable(declareTaxFeedbackResponse.getBody().get("nsrc")).orElse("0").toString()));
+        taxDeclareRecord.setDeclareRequestId(taxDeclareRecord.getRequestId());
         taxDeclareRecord.setRequestId("");
         taxDeclareRecord.setUpdateTime(new Date());
         BigDecimal purePaidAmount = SalaryEntityUtil.empty2Zero(taxDeclareRecord.getTaxPurePaidAmount());
@@ -936,16 +938,18 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe
         TaxDeclareRecordPO taxDeclareRecord = taxDeclareRequest.getTaxDeclareRecord();
 
         DeclareClient declareClient = new DeclareClient(taxDeclareRecord.getTaxAgentId());
-        return declareClient.getDeclareTaxResultFeedback(taxDeclareRecord.getRequestId());
+        return declareClient.getDeclareTaxResultFeedback(taxDeclareRecord.getDeclareRequestId());
     }
 
     @Override
-    public XSSFWorkbook exportGetDeclareTaxResultFeedback(Long id, String requestId) {
+    public XSSFWorkbook exportGetDeclareTaxResultFeedback(DeclareTaxResultFeedbackQueryParam param) {
+        Long id = param.getId();
+        String requestId = param.getRequestId();
         TaxDeclareRequest taxDeclareRequest = buildTaxDeclareRequest(id);
         TaxDeclareRecordPO taxDeclareRecord = taxDeclareRequest.getTaxDeclareRecord();
 
         DeclareClient declareClient = new DeclareClient(taxDeclareRecord.getTaxAgentId());
-        GetDeclareTaxResultFeedbackResponse declareTaxResultFeedbackResponse = declareClient.getDeclareTaxResultFeedback(StringUtils.isEmpty(requestId) ? taxDeclareRecord.getRequestId() : requestId);
+        GetDeclareTaxResultFeedbackResponse declareTaxResultFeedbackResponse = declareClient.getDeclareTaxResultFeedback(StringUtils.isEmpty(requestId) ? taxDeclareRecord.getDeclareRequestId() : requestId);
 
         Map<String, List<List<Object>>> map = new HashMap<>();
         List<TaxDeclarationPO> list = getTaxDeclarationService(user).listByTaxDeclareRecordId(id);

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

@@ -222,14 +222,14 @@ public class TaxDeclarationController {
      *
      * @return
      */
-    @GET
+    @POST
     @Path("/exportGetDeclareTaxResultFeedback")
     @Produces(MediaType.APPLICATION_OCTET_STREAM)
-    public Response exportGetDeclareTaxResultFeedback(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam(value = "id") Long id, @QueryParam(value = "requestId") String requestId) {
+    public Response exportGetDeclareTaxResultFeedback(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeclareTaxResultFeedbackQueryParam param) {
 
         try {
             User user = HrmUserVarify.getUser(request, response);
-            XSSFWorkbook workbook = getTaxDeclareRecordWrapper(user).exportGetDeclareTaxResultFeedback(id, requestId);
+            XSSFWorkbook workbook = getTaxDeclareRecordWrapper(user).exportGetDeclareTaxResultFeedback(param);
             String fileName = "申报内置算税结果-" + LocalDate.now();
             try {
                 fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8");

src/com/engine/salary/wrapper/TaxDeclareRecordWrapper.java

@@ -477,8 +477,8 @@ public class TaxDeclareRecordWrapper extends Service {
     }
 
 
-    public XSSFWorkbook exportGetDeclareTaxResultFeedback(Long id, String requestId) {
+    public XSSFWorkbook exportGetDeclareTaxResultFeedback(DeclareTaxResultFeedbackQueryParam param) {
-        return getTaxDeclareRecordService(user).exportGetDeclareTaxResultFeedback(id, requestId);
+        return getTaxDeclareRecordService(user).exportGetDeclareTaxResultFeedback(param);
     }
 
     /**