瀏覽代碼

fix:报税零申报,新填时,获取上一个月数据

ly 10 月之前
父節點
當前提交
61f38d354a

+ 23 - 2
src/main/java/cn/ezhizao/project/business/reportTax/controller/BizFinancialReportTaxNonZeroController.java

@@ -2,6 +2,7 @@ package cn.ezhizao.project.business.reportTax.controller;
 
 import cn.ezhizao.common.exception.ServiceException;
 import cn.ezhizao.common.utils.poi.ExcelUtil;
+import cn.ezhizao.common.utils.uuid.SnowflakeIdWorker;
 import cn.ezhizao.framework.aspectj.lang.annotation.Log;
 import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
 import cn.ezhizao.framework.lock.DistributionLock;
@@ -50,6 +51,8 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -68,7 +71,8 @@ public class BizFinancialReportTaxNonZeroController extends BaseController {
 
     @Resource
     IBizFinancialReportTaxDetailService financialReportTaxDetaiIsZerolService;
-
+    @Resource
+    SnowflakeIdWorker snowflakeIdWorker;
     @Resource
     private SysUserMapper sysUserMapper;
 
@@ -302,7 +306,24 @@ public class BizFinancialReportTaxNonZeroController extends BaseController {
 
         return getDataTable(list);
     }
-
+@RequestMapping("getLastMonthLoess")
+public BigDecimal getLastMonthLoess(@RequestBody BizFinancialReportTaxDetail financialReportTax) throws ParseException {
+    String dateStr = financialReportTax.getYear() + "-" + financialReportTax.getMonth()+"-"+"01";
+    String dateFormat = "yyyy-MM-dd";
+    SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
+    Date lastMonth = sdf.parse(dateStr);
+    Calendar calendar = Calendar.getInstance();
+    calendar.setTime(lastMonth);
+    int nowYear = LocalDate.now().getYear();
+    int nowMonth = LocalDate.now().getMonthValue()-1;
+    String formattedMonth = String.format("%02d", nowMonth);
+    BizFinancialReportTaxDetailNonZero taxDetailNonZero = financialReportTaxDetailService
+            .getByLastMonth(calendar.get(calendar.YEAR), calendar.get(calendar.MONTH),financialReportTax.getFinancialReportTaxId());
+        if(null != taxDetailNonZero) {
+            return taxDetailNonZero.getPreviousAnnualLosses();
+        }
+        return BigDecimal.ZERO;
+}
     @ApiOperation(value = "带条件List 分页查询", notes = "带条件List 分页查询")
     @PostMapping("/getDetailList")
     @ResponseBody

+ 1 - 0
src/main/java/cn/ezhizao/project/business/reportTax/mapper/BizFinancialReportTaxDetailNonZeroMapper.java

@@ -22,4 +22,5 @@ public interface BizFinancialReportTaxDetailNonZeroMapper extends BaseMapper<Biz
      * @return int 查询总数量
      */
     Integer getTotal(Map<String,Object> conditions);
+    public BizFinancialReportTaxDetailNonZero getByLastMonth(int year, int month, Long reportTaxId);
 }

+ 5 - 0
src/main/java/cn/ezhizao/project/business/reportTax/service/impl/BizFinancialReportTaxDetailServiceNonZeroImpl.java

@@ -24,4 +24,9 @@ public class BizFinancialReportTaxDetailServiceNonZeroImpl extends ServiceImpl<B
     public Integer getTotal(Map<String, Object> conditions) {
         return financialReportTaxDetailDao.getTotal(conditions);
     }
+
+    @Override
+    public BizFinancialReportTaxDetailNonZero getByLastMonth(int year, int month, Long reportTaxId) {
+       return financialReportTaxDetailDao.getByLastMonth(year,month,reportTaxId);
+    }
 }

+ 6 - 0
src/main/resources/mybatis/business/BizFinancialReportTaxDetailNonZeroMapper.xml

@@ -60,4 +60,10 @@
             </foreach>
         </if>
     </sql>
+    <select id="getByLastMonth" resultType="cn.ezhizao.project.business.reportTax.domain.BizFinancialReportTaxDetailNonZero">
+        select * from biz_financial_report_tax_detail where
+            financial_report_tax_id = #{reportTaxId}
+        and year = #{year}
+        and month = #{month}
+    </select>
 </mapper>