Sfoglia il codice sorgente

try to fix the onpack expiry date setting

production
Fai Luk 2 settimane fa
parent
commit
bf5fc537fe
2 ha cambiato i file con 5 aggiunte e 3 eliminazioni
  1. +4
    -2
      src/main/java/com/ffii/core/support/JdbcDao.java
  2. +1
    -1
      src/main/java/com/ffii/fpsms/modules/jobOrder/service/OnPackTemplateFileService.kt

+ 4
- 2
src/main/java/com/ffii/core/support/JdbcDao.java Vedi File

@@ -46,7 +46,8 @@ public class JdbcDao {
*/
public String queryForString(String sql, Map<String, ?> paramMap) {
try {
return this.template.queryForObject(sql, paramMap, String.class);
String value = this.template.queryForObject(sql, paramMap, String.class);
return value != null ? value : StringUtils.EMPTY;
} catch (EmptyResultDataAccessException e) {
return StringUtils.EMPTY;
}
@@ -60,7 +61,8 @@ public class JdbcDao {
*/
public String queryForString(String sql, Object paramObj) {
try {
return this.template.queryForObject(sql, new BeanPropertySqlParameterSource(paramObj), String.class);
String value = this.template.queryForObject(sql, new BeanPropertySqlParameterSource(paramObj), String.class);
return value != null ? value : StringUtils.EMPTY;
} catch (EmptyResultDataAccessException e) {
return StringUtils.EMPTY;
}


+ 1
- 1
src/main/java/com/ffii/fpsms/modules/jobOrder/service/OnPackTemplateFileService.kt Vedi File

@@ -347,7 +347,7 @@ open class OnPackTemplateFileService(
LIMIT 1
""".trimIndent(),
mapOf("machine" to machine, "code" to itemCode),
).trim().takeIf { it.isNotEmpty() }
).orEmpty().trim().takeIf { it.isNotEmpty() }
} catch (_: DataAccessException) {
null
}


Caricamento…
Annulla
Salva