huanghai
/
QingLong
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'commit'

Browse Source
main
黄海 2 years ago
parent de98b88d38
commit d0d8d8fe53
2 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File

51
src/main/java/com/dsideal/QingLong/Base/Controller/BaseController.java
Unescape View File

@ -28,17 +28,18 @@ public class BaseController extends Controller {
/**
* 获取当前登录人员的Session信息
* from:默认是0，表示从本地数据库中取，1：表示从第三方系统数据库中取
*/
@Before({GET.class,RepeatIntercetpor.class})
@Before({GET.class, RepeatIntercetpor.class})
@IsLoginInterface({})
public void getCurrentPersonInfo() {
Map<String,Object> map = new HashMap<>();
public void getCurrentPersonInfo(int from) {
Map<String, Object> map = new HashMap<>();
map.put("identity_id", SessionKit.get(getRequest(), getResponse(), "identity_id"));
map.put("person_id", SessionKit.get(getRequest(), getResponse(), "person_id"));
map.put("bureau_id", SessionKit.get(getRequest(), getResponse(), "bureau_id"));
map.put("city_id", SessionKit.get(getRequest(), getResponse(), "city_id"));
map.put("area_id", SessionKit.get(getRequest(), getResponse(), "area_id"));
Record record = bm.getPersonInfo(SessionKit.get(getRequest(), getResponse(), "person_id"));
Record record = bm.getPersonInfo(SessionKit.get(getRequest(), getResponse(), "person_id"),from);
map.put("person_name", record.getStr("person_name"));
map.put("bureau_name", record.getStr("bureau_name"));
renderJson(map);
@ -47,7 +48,7 @@ public class BaseController extends Controller {
/**
* 获取整个单位类型与职务+分管信息树数据
*/
@Before({GET.class,RepeatIntercetpor.class})
@Before({GET.class, RepeatIntercetpor.class})
@IsSysAdminInterface({"1"})
public void getOrgTypePrincipalshipTree() {
List<Record> dt = bm.getOrgTypePrincipalshipTree();
@ -75,7 +76,7 @@ public class BaseController extends Controller {
/**
* 获取单位类型与职务+分管信息树数据指定结点的信息
*/
@Before({GET.class,RepeatIntercetpor.class})
@Before({GET.class, RepeatIntercetpor.class})
@IsNumericInterface({"id"})
@IsSysAdminInterface({"1"})
public void getOrgTypePrincipalshipById(String id) {
@ -86,7 +87,7 @@ public class BaseController extends Controller {
/**
* 获取单位类型与职务+分管信息树数据指定结点下一级的数据ById
*/
@Before({GET.class,RepeatIntercetpor.class})
@Before({GET.class, RepeatIntercetpor.class})
@IsSysAdminInterface({"1", "2", "3", "4"})
public void getOrgTypePrincipalshipForTreeTable(int parent_id, int is_school, String bureau_id) {
List<Record> list = bm.getOrgTypePrincipalship(parent_id, is_school, bureau_id);
@ -139,7 +140,7 @@ public class BaseController extends Controller {
*
* @param parent_code
*/
@Before({GET.class,RepeatIntercetpor.class})
@Before({GET.class, RepeatIntercetpor.class})
@IsNumericInterface({"parent_code"})
@IsSysAdminInterface({"1"})
public void getOrgTypePrincipalshipByParentCode(String parent_code) {
@ -260,7 +261,7 @@ public class BaseController extends Controller {
*
* @param bureau_id
*/
@Before({GET.class,RepeatIntercetpor.class})
@Before({GET.class, RepeatIntercetpor.class})
@EmptyInterface({"bureau_id"})
@IsGuidInterface({"bureau_id"})
@IsSysAdminInterface({"1", "2", "3", "4"})
@ -272,7 +273,7 @@ public class BaseController extends Controller {
/**
* 输出打印职务与分管工作的数据，方便第三方系统接入时，提供填写EXCEL示例
*/
@Before({GET.class,RepeatIntercetpor.class})
@Before({GET.class, RepeatIntercetpor.class})
public void getPrincipalshipThirdParty() {
Page<Record> dt = bm.getPrincipalshipThirdParty(1, 10000);
renderJson(CommonUtil.renderJsonForLayUI(dt));
@ -281,7 +282,7 @@ public class BaseController extends Controller {
/**
* 输出打印职务与分管工作的数据
*/
@Before({GET.class,RepeatIntercetpor.class})
@Before({GET.class, RepeatIntercetpor.class})
public void getPrincipalshipThirdPartyForExcel() {
//模板文件
String excelPath = PathKit.getRootClassPath() + PropKit.get("excelExportTemplatePathSuffix").replace("\\", "/");
@ -302,7 +303,7 @@ public class BaseController extends Controller {
*
* @param ids
*/
@Before({GET.class,RepeatIntercetpor.class})
@Before({GET.class, RepeatIntercetpor.class})
public void isInDutyList(String ids) {
String person_id = SessionKit.get(getRequest(), getResponse(), "person_id");
boolean result = bm.isInDutyList(person_id, ids);
@ -312,7 +313,7 @@ public class BaseController extends Controller {
/**
* 获取所有的用户城市列表
*/
@Before({GET.class,RepeatIntercetpor.class})
@Before({GET.class, RepeatIntercetpor.class})
public void getAllUserCity() {
List<Record> list = bm.getAllUserCity();
renderJson(CommonUtil.renderJsonForLayUI(list, list.size()));
@ -323,7 +324,7 @@ public class BaseController extends Controller {
*
* @param bureau_id
*/
@Before({GET.class,RepeatIntercetpor.class})
@Before({GET.class, RepeatIntercetpor.class})
public void selectPersonsByBureauId(String bureau_id) {
//如果不传入单位ID,即当前操作人员的单位ID
if (StringUtils.isBlank(bureau_id)) {
@ -340,7 +341,7 @@ public class BaseController extends Controller {
*
* @return
*/
@Before({GET.class,RepeatIntercetpor.class})
@Before({GET.class, RepeatIntercetpor.class})
public void getTermList(String action_asc, int addOne) {
List<Record> list = bm.getTermList(action_asc, addOne);
renderJson(CommonUtil.renderJsonForLayUI(list, list.size()));
@ -353,7 +354,7 @@ public class BaseController extends Controller {
*
* @return
*/
@Before({GET.class,RepeatIntercetpor.class})
@Before({GET.class, RepeatIntercetpor.class})
public void getTermListByYear(int batch_year) {
List<Record> list = bm.getTermListByYear(batch_year);
renderJson(CommonUtil.renderJsonForLayUI(list, list.size()));
@ -364,7 +365,7 @@ public class BaseController extends Controller {
* 作者：黄海
* 时间：2019-10-30
*/
@Before({GET.class,RepeatIntercetpor.class})
@Before({GET.class, RepeatIntercetpor.class})
public void getCurrentTerm() {
Record record = bm.getCurrentTerm();
renderJson(record);
@ -375,7 +376,7 @@ public class BaseController extends Controller {
* 作者：黄海
* 时间：2021-08-17
*/
@Before({GET.class,RepeatIntercetpor.class})
@Before({GET.class, RepeatIntercetpor.class})
public void getCurrentPerson() {
String person_id = SessionKit.get(getRequest(), getResponse(), "person_id");
Record record = bm.getCurrentPerson(person_id);
@ -387,7 +388,7 @@ public class BaseController extends Controller {
* 作者：黄海
* 时间：2021-08-18
*/
@Before({GET.class,RepeatIntercetpor.class})
@Before({GET.class, RepeatIntercetpor.class})
public void getCurrentClass() {
String person_id = SessionKit.get(getRequest(), getResponse(), "person_id");
Record record = bm.getCurrentClass(person_id);
@ -400,7 +401,7 @@ public class BaseController extends Controller {
* 作者：黄海
* 时间：2019-10-18
*/
@Before({GET.class,RepeatIntercetpor.class})
@Before({GET.class, RepeatIntercetpor.class})
public void getSiteTypeList() {
List<Record> list = bm.getSiteTypeList();
renderJson(CommonUtil.renderJsonForLayUI(list, list.size()));
@ -413,7 +414,7 @@ public class BaseController extends Controller {
* @param xq_id
* @return
*/
@Before({GET.class,RepeatIntercetpor.class})
@Before({GET.class, RepeatIntercetpor.class})
public void getTermInfo(int xq_id) {
Record record = bm.getTermInfo(xq_id);
renderJson(record);
@ -425,7 +426,7 @@ public class BaseController extends Controller {
* @param teacher_id
* @return
*/
@Before({GET.class,RepeatIntercetpor.class})
@Before({GET.class, RepeatIntercetpor.class})
public void getPersonInfo(String teacher_id) {
if (StrKit.isBlank(teacher_id)) {
String personId = SessionKit.get(getRequest(), getResponse(), "person_id");
@ -444,7 +445,7 @@ public class BaseController extends Controller {
*
* @param xq_id
*/
@Before({POST.class,RepeatIntercetpor.class})
@Before({POST.class, RepeatIntercetpor.class})
public void saveTermId(String xq_id) {
bm.saveTermId(xq_id);
renderJson(CommonUtil.returnMessageJson(true, "保存成功"));
@ -462,7 +463,7 @@ public class BaseController extends Controller {
* @param ksrq
* @param jsrq
*/
@Before({POST.class,RepeatIntercetpor.class})
@Before({POST.class, RepeatIntercetpor.class})
@LengthInterface({"xn,4,4"})
public void updateXq(int xq_id, String xn, String xq_code, String ksrq, String jsrq) {
BaseModel.updateXq(xq_id, xn, xq_code, ksrq, jsrq);
@ -478,7 +479,7 @@ public class BaseController extends Controller {
* @return
*/
@IsLoginInterface({})
@Before({GET.class,RepeatIntercetpor.class})
@Before({GET.class, RepeatIntercetpor.class})
public void getPersonList(String org_id) {
List<Record> list = bm.getPersonList(org_id);
renderJson(CommonUtil.renderJsonForLayUI(list, list.size()));

9
src/main/java/com/dsideal/QingLong/Base/Model/BaseModel.java
Unescape View File

@ -337,9 +337,8 @@ public class BaseModel {
* @param person_id
* @return
*/
public Record getPersonInfo(String person_id) {
CollectModel cm = new CollectModel();
if (cm.THIRD_PARTY_BASE_DATA == 0) {
public Record getPersonInfo(String person_id, int from) {
if (from == 0) {
String sql = "select t1.*,t2.org_name as bureau_name from t_sys_loginperson as t1 left join t_base_organization as t2 on t1.bureau_id=t2.org_id where t1.person_id=?";
Record record = Db.findFirst(sql, person_id);
if (record.getStr("telephone") == null) record.set("telephone", "");
@ -355,6 +354,10 @@ public class BaseModel {
}
}
public Record getPersonInfo(String person_id) {
return getPersonInfo(person_id, 0);
}
/**
* 功能：保存当前学期
* 作者：黄海

Write Preview
Loading…
Cancel
Save