Merge branch 'feature/sql采用mybatis执行' into custom/万德隆

This commit is contained in:
Harryxzy 2025-06-25 15:28:17 +08:00
commit f0f90bce9e
1 changed files with 12 additions and 12 deletions

View File

@ -1,5 +1,6 @@
package com.engine.salary.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.engine.core.impl.Service;
import com.engine.salary.encrypt.AESEncryptUtil;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
@ -20,7 +21,6 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.springframework.util.StopWatch;
import weaver.conn.RecordSet;
import weaver.conn.RecordSetDataSource;
import weaver.general.BaseBean;
import weaver.general.Util;
@ -43,7 +43,7 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService
QlExpress express = new QlExpress();
private SQLMapper getSQLMapper(){
private SQLMapper getSQLMapper() {
return MapperProxyFactory.getProxy(SQLMapper.class);
}
@ -129,17 +129,17 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService
}
} else {
// List<Map> list = getSQLMapper().runSQL(sql);
// if(CollectionUtil.isNotEmpty(list)){
// result = Util.null2String(list.get(0).get(sqlReturnKey));
// }
RecordSet rs = new RecordSet();
if (rs.execute(sql)) {
if (rs.next()) {
result = rs.getString(sqlReturnKey);
}
List<Map> list = getSQLMapper().runSQL(sql);
if (CollectionUtil.isNotEmpty(list)) {
result = list.get(0) != null ? Util.null2String(list.get(0).get(sqlReturnKey)) : "";
}
//
// RecordSet rs = new RecordSet();
// if (rs.execute(sql)) {
// if (rs.next()) {
// result = rs.getString(sqlReturnKey);
// }
// }
}
if (OpenEnum.OPEN.getValue().equals(openDecrypt)) {