diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java index 7922769d..925a1fde 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java @@ -7,6 +7,7 @@ import java.util.*; import javax.annotation.Resource; +import com.dxhy.common.utils.DateUtils; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -241,19 +242,31 @@ public class ExtIndexController extends AbstractController { log.info("任务提醒入参为{}",pramsMap); log.info("首页-任务提醒,params {}", pramsMap); - pramsMap.put("dbName", getUserInfo().getDbName()); - List taxno = getTaxno(); - if (taxno != null && taxno.size() > 0) { - pramsMap.put("taxno", taxno); + + + try { + if (pramsMap.get("kpksrq") != null && !"".equals(pramsMap.get("kpksrq"))) { + pramsMap.put("kpksrq", DateUtils.getMorning(DateUtils.strToDate(pramsMap.get("kpksrq").toString()))); + } else { + throw new RuntimeException("开票开始日期不能为空!"); + } + if (pramsMap.get("kpjsrq") != null && !"".equals(pramsMap.get("kpjsrq"))) { + pramsMap.put("kpjsrq", DateUtils.getNight(DateUtils.strToDate(pramsMap.get("kpjsrq").toString()))); + } else { + throw new RuntimeException("开票开始日期不能为空!"); + } Map map = new HashMap<>(16); List listVO = indexStatisticsService.getInvoiceTaskReminding(pramsMap); for (ExtIndexInvoiceTaskRemindingModel vo : listVO) { map.put(vo.getWarningType(), vo.getCountNum()); } return ResponseEntity.ok(R.ok().put("data", map)); - } else { - return ResponseEntity.ok(R.ok().put("data", "")); + }catch (Exception e) { + log.error("首页任务提醒错误信息 :{}",e); + return ResponseEntity.ok(R.ok().put("data","")); } + + } /** diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml index b0349a1d..e026a10e 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml @@ -222,10 +222,10 @@ and t.qs_status = #{qszt} - + and t.rzh_yesorno = #{rzzt} - + and (t.rzh_yesorno = '2' OR t.rzh_yesorno = '1') diff --git a/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml b/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml index 8700e249..194712ef 100644 --- a/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml @@ -1622,11 +1622,7 @@ and period_add(tdtc.current_tax_period, 1) >= date_format (date_add(invoice_date, interval 360 day), '%Y%m') and date_format(invoice_date, '%Y%m%d') >= tdtc.select_start_date - AND t.gf_tax_no IN - - #{item} - + AND t.gf_tax_no = #{paramsData.gfsh}