diff --git a/baseServiceJava/WebRoot/html/pages/eduunit/eduList.html b/baseServiceJava/WebRoot/html/pages/eduunit/eduList.html
index 903f6da..348eb45 100644
--- a/baseServiceJava/WebRoot/html/pages/eduunit/eduList.html
+++ b/baseServiceJava/WebRoot/html/pages/eduunit/eduList.html
@@ -111,7 +111,7 @@
编辑
删除
部门维护
- 教师信息管理
+ 教师信息管理
@@ -264,7 +267,7 @@
, {field: 'org_name', title: '部门', align: 'center'}
, {field: 'login_name', title: '登录名', align: 'center'}
, {field: 'original_pwd', title: '初始密码', align: 'center'}
- , {fixed: 'right', title: '操作', toolbar: '#barDemo', align: 'center', width: 360, fixed: 'right'}
+ , {fixed: 'right', title: '操作', toolbar: '#barDemo', align: 'center', width: 480, fixed: 'right'}
]]
, page: true
, done: function () {
@@ -288,6 +291,25 @@
window.location.href = document.referrer;
return false;
}
+ //设置身份
+ window.setIdentity = function (person_id, identity_id) {
+ $.ajax({
+ type: "GET",
+ async: false,
+ url: '/baseService/teacher/setIdentity?person_id=' + person_id + "&identity_id=" + identity_id,
+ dataType: "json",
+ success: function (data) {
+ if (data.success) {
+ layer.msg("更改身份成功", {icon: 1, time: 1000, shade: [0.5, '#000', true]}, function () {
+ layui.table.reload('idTest', {page: {curr: 1}});
+ });
+ } else {
+ layer.alert(data.message, {icon: 0})
+ return;
+ }
+ }
+ });
+ }
table.on('tool(demo)', function (obj) {
var data = obj.data;
@@ -302,20 +324,19 @@
layer.confirm('确定重置 ' + data.person_name + ' 密码吗？', {icon: 0}, function (index) {
resetPwd(data.person_id);
});
- } else if (obj.event == 'personDep') {
- WeAdminShow('辅部门管理', '../dep/personDep.html?person_id=' + data.person_id, 800, 520);
- } else if (obj.event === 'transferApply') {
- var info = getcookie();
- if (info.identity_id == 1) {
- WeAdminShow('调转申请', './superTransferApply.html?person_id=' + data.person_id + '&bureau_id=' + org_id, 800, 630);
- } else {
-
- WeAdminShow('调转申请', './transferApply.html?person_id=' + data.person_id + '&bureau_id=' + org_id, 800, 630);
- }
- } else if (obj.event === 'changeStatus') {
- WeAdminShow('异动处理', './changeStatus.html?person_id=' + data.person_id + '&bureau_id=' + org_id, 450, 330);
+ } else if (obj.event === 'setIdentity') {
+ layer.confirm('确定将 ' + data.person_name + ' 设置为申报员身份吗？', {icon: 0}, function (index) {
+ setIdentity(data.person_id, 2);
+ });
+ } else if (obj.event === 'setIdentityI') {
+ layer.confirm('确定将 ' + data.person_name + ' 设置为一级审核员身份吗？', {icon: 0}, function (index) {
+ setIdentity(data.person_id, 3);
+ });
+ } else if (obj.event === 'setIdentityII') {
+ layer.confirm('确定将 ' + data.person_name + ' 设置为二级审核员身份吗？', {icon: 0}, function (index) {
+ setIdentity(data.person_id, 4);
+ });
}
-
});
form.on('select(sel1)', function (data) {
diff --git a/baseServiceJava/src/main/java/com/dsideal/baseService/Teacher/controller/TeacherController.java b/baseServiceJava/src/main/java/com/dsideal/baseService/Teacher/controller/TeacherController.java
index 81e6c10..1ce17de 100644
--- a/baseServiceJava/src/main/java/com/dsideal/baseService/Teacher/controller/TeacherController.java
+++ b/baseServiceJava/src/main/java/com/dsideal/baseService/Teacher/controller/TeacherController.java
@@ -12,6 +12,7 @@ import com.jfinal.aop.Before;
import com.jfinal.core.Controller;
import com.jfinal.ext.interceptor.GET;
import com.jfinal.ext.interceptor.POST;
+import com.jfinal.kit.Kv;
import com.jfinal.kit.PathKit;
import com.jfinal.kit.PropKit;
import com.jfinal.plugin.activerecord.Page;
@@ -36,12 +37,12 @@ public class TeacherController extends Controller {
*/
@Before({POST.class})
@IsGuidInterface({"org_id"})
- @EmptyInterface({"org_id", "person_name","mz","t_duty_charge", "zzmm","zc_id"})
+ @EmptyInterface({"org_id", "person_name", "mz", "t_duty_charge", "zzmm", "zc_id"})
@IsSysAdminInterface({"1", "4"})
@AuthorityInterface({})
@LengthInterface({"person_name,1,64"})
public void addTeacher(String org_id, String person_name,
- String xb, String mz, String t_duty_charge,String zzmm,String id_card,int sort_id,String zc_id) {
+ String xb, String mz, String t_duty_charge, String zzmm, String id_card, int sort_id, String zc_id) {
JSONObject resultJson = new JSONObject();
try {
//判断姓名长度
@@ -102,13 +103,13 @@ public class TeacherController extends Controller {
//将明文密码加密
String pwd = CommonUtil.getLdapPassword(originalPwd);
//对身份证号进行一次加密
- id_card= MysqlAesUtil.Encrypt(id_card);
+ id_card = MysqlAesUtil.Encrypt(id_card);
//操作人
String operator = getCookie("person_id");
//客户端ip_address
String ip_address = IpUtil.getIpAddr(getRequest());
- if (_teacherModel.addTeacherInfo(pwd, person_name, org_id, xb, mz, id_card, originalPwd, cityId, areaId, mainSchoolId, bureauId,sort_id,t_duty_charge,zzmm,zc_id, operator, ip_address)) {
+ if (_teacherModel.addTeacherInfo(pwd, person_name, org_id, xb, mz, id_card, originalPwd, cityId, areaId, mainSchoolId, bureauId, sort_id, t_duty_charge, zzmm, zc_id, operator, ip_address)) {
resultJson.put("success", true);
renderJson(resultJson);
return;
@@ -164,6 +165,7 @@ public class TeacherController extends Controller {
return;
}
}
+
/**
* 功能：获取教师列表：通过单位ID
* 作者：黄海
@@ -315,14 +317,14 @@ public class TeacherController extends Controller {
* 日期：2018-12-08
*/
@Before({POST.class})
- @EmptyInterface({"person_id", "person_name", "org_id", "t_duty_charge","xb", "mz", "zzmm","zc_id"})
+ @EmptyInterface({"person_id", "person_name", "org_id", "t_duty_charge", "xb", "mz", "zzmm", "zc_id"})
@IsSysAdminInterface({"1", "4"})
@AuthorityInterface({})
@LengthInterface({"person_name,1,64"})
public void updateTeacher(String person_id, String person_name,
String t_duty_charge,
String xb, String mz, String zzmm,
- String org_id,String id_card,String zc_id,int sort_id){
+ String org_id, String id_card, String zc_id, int sort_id) {
JSONObject resultJson = new JSONObject();
try {
@@ -367,9 +369,9 @@ public class TeacherController extends Controller {
//客户端ip_address
String ip_address = IpUtil.getIpAddr(getRequest());
//对身份证号进行一次加密
- id_card= MysqlAesUtil.Encrypt(id_card);
+ id_card = MysqlAesUtil.Encrypt(id_card);
- if (_teacherModel.updateTeacher(person_id, person_name, xb, mz,t_duty_charge, org_id, zzmm, operator, ip_address,id_card,zc_id,sort_id)) {
+ if (_teacherModel.updateTeacher(person_id, person_name, xb, mz, t_duty_charge, org_id, zzmm, operator, ip_address, id_card, zc_id, sort_id)) {
resultJson.put("success", true);
renderJson(resultJson);
return;
@@ -597,4 +599,20 @@ public class TeacherController extends Controller {
renderJson(map);
return;
}
+
+ /**
+ * 功能：将指定人员设置为指定的身份, 申报员：2，一级审核员：3，二级审核员：4
+ * 作者：黄海
+ * 时间：2020-11-23
+ *
+ * @param person_id
+ * @param identity_id
+ */
+ public void setIdentity(String person_id, int identity_id) {
+ _teacherModel.setIdentity(person_id, identity_id);
+ Kv kv = Kv.create();
+ kv.set("success", true);
+ kv.set("message", "保存成功！");
+ renderJson(kv);
+ }
}
diff --git a/baseServiceJava/src/main/java/com/dsideal/baseService/Teacher/model/TeacherModel.java b/baseServiceJava/src/main/java/com/dsideal/baseService/Teacher/model/TeacherModel.java
index f452b2a..0b78ccd 100644
--- a/baseServiceJava/src/main/java/com/dsideal/baseService/Teacher/model/TeacherModel.java
+++ b/baseServiceJava/src/main/java/com/dsideal/baseService/Teacher/model/TeacherModel.java
@@ -99,7 +99,7 @@ public class TeacherModel {
* @param mz
* @return
*/
- public boolean updateTeacher(String person_id, String person_name, String xb, String mz, String t_duty_charge, String org_id, String zzmm, String operator, String ip_address, String id_card,String zc_id, int sort_id) {
+ public boolean updateTeacher(String person_id, String person_name, String xb, String mz, String t_duty_charge, String org_id, String zzmm, String operator, String ip_address, String id_card, String zc_id, int sort_id) {
boolean flag = false;
try {
@@ -131,7 +131,7 @@ public class TeacherModel {
record.set("operator", operator);
record.set("ip_address", IpUtil.ipToLong(ip_address));
record.set("idcard_code", id_card);
- record.set("t_zc_id",zc_id);
+ record.set("t_zc_id", zc_id);
record.remove("update_ts");
Db.update("t_sys_loginperson", "person_id", record);
//继续保存人员职务与分管工作
@@ -195,6 +195,7 @@ public class TeacherModel {
return null;
}
}
+
/**
* 功能：获取教师列表：通过单位ID
* 作者：黄海
@@ -362,4 +363,17 @@ public class TeacherModel {
re.set("ip_address", IpUtil.ipToLong(ip_address));
Db.save("t_person_duty_charge", re);
}
+
+ /**
+ * 功能：将指定人员设置为指定的身份, 申报员：2，一级审核员：3，二级审核员：4
+ * 作者：黄海
+ * 时间：2020-11-23
+ *
+ * @param person_id
+ * @param identity_id
+ */
+ public void setIdentity(String person_id, int identity_id) {
+ String sql = "update t_sys_loginperson set identity_id=? where person_id=?";
+ Db.update(sql, identity_id, person_id);
+ }
}
\ No newline at end of file