XMTT 5 years ago
parent
commit
1fbed4f069

+ 2 - 1
src/main/java/com/ekexiu/project/msconsole/department/DepartmentDao.java

14
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
14
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
15
import org.jfw.apt.orm.annotation.dao.param.Like;
15
import org.jfw.apt.orm.annotation.dao.param.Like;
16
import org.jfw.apt.orm.annotation.dao.param.Set;
16
import org.jfw.apt.orm.annotation.dao.param.Set;
17
import org.jfw.apt.orm.annotation.dao.param.UnEquals;
17
import org.jfw.util.PageQueryResult;
18
import org.jfw.util.PageQueryResult;
18
19
19
import java.sql.Connection;
20
import java.sql.Connection;
48
49
49
    @Nullable
50
    @Nullable
50
    @SelectOne
51
    @SelectOne
51
    Department queryByName(Connection con,String hospital, String name) throws SQLException;
52
    Department queryByName(Connection con, @Nullable Boolean active, String hospital, String name, @Nullable @UnEquals String id) throws SQLException;
52
}
53
}

+ 2 - 2
src/main/java/com/ekexiu/project/msconsole/department/DepartmentService.java

77
77
78
    @Path("/checkName")
78
    @Path("/checkName")
79
    @Get
79
    @Get
80
    public Department queryByName(@JdbcConn Connection con, @LoginUser SessionUser user, String name) throws SQLException {
81
        return departmentDao.queryByName(con, user.getId(), name);
80
    public Department queryByName(@JdbcConn Connection con,@Nullable Boolean active, @LoginUser SessionUser user, String name,String id) throws SQLException {
81
        return departmentDao.queryByName(con,active, user.getId(), name,id);
82
    }
82
    }
83
83
84
    @Path("/name")
84
    @Path("/name")

+ 2 - 1
src/main/java/com/ekexiu/project/msconsole/doctor/DoctorDao.java

15
import org.jfw.apt.orm.annotation.dao.param.Like;
15
import org.jfw.apt.orm.annotation.dao.param.Like;
16
import org.jfw.apt.orm.annotation.dao.param.Set;
16
import org.jfw.apt.orm.annotation.dao.param.Set;
17
import org.jfw.apt.orm.annotation.dao.param.SqlColumn;
17
import org.jfw.apt.orm.annotation.dao.param.SqlColumn;
18
import org.jfw.apt.orm.annotation.dao.param.UnEquals;
18
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
19
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
19
import org.jfw.util.PageQueryResult;
20
import org.jfw.util.PageQueryResult;
20
21
50
51
51
    @Nullable
52
    @Nullable
52
    @SelectOne
53
    @SelectOne
53
    Doctor queryByAccount(Connection con, String account) throws SQLException;
54
    Doctor queryByAccount(Connection con, @Nullable Boolean active, String account, @Nullable @UnEquals String id) throws SQLException;
54
}
55
}

+ 2 - 2
src/main/java/com/ekexiu/project/msconsole/doctor/DoctorService.java

92
92
93
    @Get
93
    @Get
94
    @Path("/check")
94
    @Path("/check")
95
    public SessionDoctor queryByAccount(@JdbcConn Connection con,String account)throws SQLException {
96
        return makeSessionDoctor(doctorDao.queryByAccount(con, account));
95
    public SessionDoctor queryByAccount(@JdbcConn Connection con,@Nullable Boolean active, String account,@Nullable String id)throws SQLException {
96
        return makeSessionDoctor(doctorDao.queryByAccount(con,active,account,id));
97
    }
97
    }
98
98
99
    private static SessionDoctor makeSessionDoctor(Doctor doctor) {
99
    private static SessionDoctor makeSessionDoctor(Doctor doctor) {