代码修改

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/dao/SQLGeneralDAO.java

@@ -49,14 +49,9 @@ import java.util.*;
public class SQLGeneralDAO implements XSQLGeneralDAO {
    static private final Logger logger = LoggerFactory.getLogger(SQLGeneralDAO.class);
//    @Autowired
//    protected LocalSessionFactoryBean localSessionFactoryBean;
    @Autowired
    protected ObjectMapper objectMapper;
    @Resource(
            name = "jdbcTemplate"
    )
    @Autowired
    protected JdbcTemplate jdbcTemplate;
    @PersistenceContext
    protected EntityManager entityManager;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StandardService.java

@@ -15,11 +15,13 @@ import com.yihu.jw.basic.standard.model.standard.StandardVersionModel;
import com.yihu.jw.basic.standard.model.standard.resultModel.StandardParamResultModel;
import com.yihu.jw.basic.standard.model.standard.resultModel.StandardResultDetailModel;
import com.yihu.jw.util.sql.SqlConstants;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -356,10 +358,8 @@ public class StandardService extends SQLGeneralDAO {
        }
        List<StandardVersionModel> versionModelList = new ArrayList<>();
        if (!CollectionUtils.isEmpty(idList)) {
            String versionHql = "FROM StandardVersionModel WHERE standardId IN :idList";
            Query query = getCurrentSession().createQuery(versionHql);
            query.setParameterList("idList", idList);
            versionModelList = query.list();
            String versionHql = "select * from std_version  WHERE std_id in ("+ StringUtils.join(idList,",") +")";
            versionModelList = jdbcTemplate.query(versionHql,new BeanPropertyRowMapper<>(StandardVersionModel.class));
        }
        List<StandardResultDetailModel> resultDetailModelList = getStandardListFormat(publisherModelList,