Selaa lähdekoodia

修复Dao字段名错误

Airhead 6 vuotta sitten
vanhempi
commit
a780ffc55d

+ 1 - 17
pom.xml

@ -10,7 +10,6 @@
    </parent>
    <artifactId>svr-resource</artifactId>
    <!--<packaging>${packaging.type}</packaging>-->
    <packaging>war</packaging>
    <properties>
@ -28,17 +27,14 @@
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-feign</artifactId>
            <scope>${dependency.scope}</scope>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-config</artifactId>
            <scope>${dependency.scope}</scope>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-eureka</artifactId>
            <scope>${dependency.scope}</scope>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
@ -47,43 +43,35 @@
        <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>javax.servlet-api</artifactId>
            <scope>${dependency.scope}</scope>
        </dependency>
        <dependency>
            <groupId>com.yihu.ehr</groupId>
            <artifactId>commons-ehr-constants</artifactId>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.yihu.ehr</groupId>
            <artifactId>commons-util</artifactId>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.yihu.ehr</groupId>
            <artifactId>commons-data-mysql</artifactId>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.yihu.ehr</groupId>
            <artifactId>commons-rest-model</artifactId>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.yihu.ehr</groupId>
            <artifactId>commons-data-redis</artifactId>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.yihu.ehr</groupId>
            <artifactId>commons-ui-swagger</artifactId>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.yihu.ehr</groupId>
            <artifactId>commons-web</artifactId>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.yihu.ehr</groupId>
@ -92,22 +80,18 @@
        <dependency>
            <groupId>com.yihu.ehr</groupId>
            <artifactId>commons-profile-core</artifactId>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.yihu.ehr</groupId>
            <artifactId>commons-data-hbase</artifactId>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.yihu.ehr</groupId>
            <artifactId>commons-data-query</artifactId>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.yihu.ehr</groupId>
            <artifactId>commons-data-fastdfs</artifactId>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.yihu.ehr</groupId>
@ -116,7 +100,6 @@
        <dependency>
            <groupId>org.quartz-scheduler</groupId>
            <artifactId>quartz</artifactId>
            <scope>${dependency.scope}</scope>
        </dependency>
        <dependency>
            <groupId>com.alibaba</groupId>
@ -127,6 +110,7 @@
            <artifactId>commons-cat</artifactId>
        </dependency>
    </dependencies>
    <build>
        <plugins>
            <plugin>

+ 1 - 1
src/main/java/com/yihu/ehr/resource/dao/RsDictionaryEntryDao.java

@ -14,7 +14,7 @@ public interface RsDictionaryEntryDao extends PagingAndSortingRepository<RsDicti
    List<RsDictionaryEntry> findByDictCode(String code);
    RsDictionaryEntry findByDictcodeAndCode(String dict, String code);
    RsDictionaryEntry findByDictCodeAndCode(String dict, String code);
    @Query("SELECT count(e) FROM RsDictionaryEntry e WHERE e.dictId=?1")
    int countByDictId(int dictId);

+ 1 - 1
src/main/java/com/yihu/ehr/resource/service/RsDictionaryEntryService.java

@ -61,7 +61,7 @@ public class RsDictionaryEntryService extends BaseJpaService<RsDictionaryEntry,
        RsDictionaryEntry rsDictionaryEntry;
        if (rsDictionary.getDynamic() == 0) {
            rsDictionaryEntry = dictionaryEntryDao.findByDictcodeAndCode(dict, code);
            rsDictionaryEntry = dictionaryEntryDao.findByDictCodeAndCode(dict, code);
        } else {
            String sql = "select code, name from (" + rsDictionary.getSql() + ") a where a.code=?";
            rsDictionaryEntry = jdbcTemplate.queryForObject(