fix(config): 更新配置文件并优化数据库查询逻辑
parent
b40db77e67
commit
4549f18637
|
|
@ -4,6 +4,6 @@ spring:
|
|||
# - classpath:nacos.yml
|
||||
# - classpath:sdk.yml
|
||||
- classpath:nacos-prod.yml
|
||||
# - classpath:sdk-prod.yml
|
||||
- classpath:sdk-prod-gwj.yml
|
||||
- classpath:sdk-prod.yml
|
||||
# - classpath:sdk-prod-gwj.yml
|
||||
- classpath:swagger.yml
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ public class BusCalendarController {
|
|||
}
|
||||
|
||||
String decryptValue = EncryptAndDecryptUtil.decryptSm4(EncryptAndDecryptUtil.decryptSm2(key), value);
|
||||
log.info("接收数港安全月历审核结果成功,解密报文:{}", decryptValue);
|
||||
SgCalendarAuditDTO auditDTO = JSON.parseObject(decryptValue, SgCalendarAuditDTO.class);
|
||||
String validateMessage = validateAudit(auditDTO);
|
||||
if (validateMessage != null) {
|
||||
|
|
|
|||
|
|
@ -39,10 +39,10 @@
|
|||
AND duty_phone LIKE CONCAT('%', #{params.dutyPhone}, '%')
|
||||
</if>
|
||||
<if test="params.startDutyTime != null and params.startDutyTime != ''">
|
||||
AND TRIM(SUBSTRING_INDEX(CONCAT(duty_time, '~', duty_time), '~', -1)) >= #{params.startDutyTime}
|
||||
AND LEFT(TRIM(SUBSTRING_INDEX(CONCAT(duty_time, '~', duty_time), '~', -1)), 10) >= LEFT(#{params.startDutyTime}, 10)
|
||||
</if>
|
||||
<if test="params.endDutyTime != null and params.endDutyTime != ''">
|
||||
AND TRIM(SUBSTRING_INDEX(CONCAT(duty_time, '~', duty_time), '~', 1)) <= #{params.endDutyTime}
|
||||
AND LEFT(TRIM(SUBSTRING_INDEX(CONCAT(duty_time, '~', duty_time), '~', 1)), 10) <= LEFT(#{params.endDutyTime}, 10)
|
||||
</if>
|
||||
</where>
|
||||
ORDER BY create_time DESC
|
||||
|
|
|
|||
Loading…
Reference in New Issue