diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseFpcjController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseFpcjController.java index dde37999..f6422611 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseFpcjController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseFpcjController.java @@ -4,6 +4,7 @@ import java.util.*; import javax.annotation.Resource; +import com.dxhy.common.utils.DateUtils; import org.apache.commons.lang.StringUtils; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; @@ -127,6 +128,7 @@ public class BaseFpcjController extends AbstractController { return ResponseEntity.ok(R.error("购方信息不能为空!")); } if (StringUtils.isNotBlank(cjrq)) { + cjrq = DateUtils.getNight(DateUtils.strToDate(cjrq)); pramsMap.put("cjrq", cjrq); } else { return ResponseEntity.ok(R.error("采集日期不能为空!")); diff --git a/dxhy-base/src/main/resources/mapper/BaseFpcjmxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpcjmxMapper.xml index e0af8d38..bd304d10 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpcjmxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpcjmxMapper.xml @@ -55,7 +55,7 @@ from t_dx_record_invoice t where t.gf_tax_no = #{gfsh} and (invoice_type in('01','03','08','14','31','283','161','183','185') or (invoice_type ='32' and lq_tdyslxDm='08')) - and DATE_FORMAT(t.create_date,'%Y-%m-%d') = #{cjrq} + and t.create_date = #{cjrq} and t.invoice_status !='0' @@ -71,7 +71,7 @@ from t_dx_record_invoice t where t.gf_tax_no = #{gfsh} and (invoice_type in('01','03','08','14','31','283','161','183','185') or (invoice_type ='32' and lq_tdyslxDm='08')) - and to_char(t.create_date,'yyyy-mm-dd') between #{cjrq} and #{cjrq} + and t.create_date between #{cjrq} and #{cjrq} and t.invoice_status !='0' @@ -135,7 +135,7 @@ and t.source_system = '0' and t.detail_yesorno = '0' - and to_char(t.create_date,'yyyy-mm-dd') between #{cjksrq} and #{cjjsrq} + and t.create_date between #{cjksrq} and #{cjjsrq} order by t.create_date desc,t.invoice_date desc