785834757 1 жил өмнө
parent
commit
8dcd2d8a2c

+ 2 - 2
src/main/java/com/ydtech/modules/protocol/service/impl/PtlAgreementServiceImpl.java

@@ -165,8 +165,8 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         if (flag) {
             //新逻辑从协议组授权获取
             if (StringUtils.isNotBlank(deptId)) {
-                DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-                String dateNow = localDate.format(df);
+                DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                String dateNow = LocalDateTime.now().format(df);
                 agreementCompany = ptlAgreementGroupLinkDeptMapper.getAgreementCompany(dateNow, deptId);
             }
         } else {

+ 1 - 1
src/main/resources/mapper/modules/protocol/PtlAgreementGroupLinkDeptMapper.xml

@@ -48,7 +48,7 @@
         left join ptl_agreement as pa on pa.insurance_company_id = eic.id
         left join ptl_agreement_attribution as paa on paa.id = pa.id
         where
-            (#{localDate} between pa.start_date and DATE_SUB(pa.end_date, INTERVAL 1 DAY))
+            (#{localDate} between pa.start_date and pa.end_date)
         and pa.valid_status = 1
         and pa.deleted = 0
         and pa.id in (