'commit'

src/main/java/com/dsideal/QingLong/Teacher/Controller/TeacherController.java

@@ -265,7 +265,6 @@ public class TeacherController extends Controller {
      * @param zc_id
      * @param org_id
      * @param id_card
-     * @param birthday
      * @param t_teaching_date
      * @param stage_id
      * @param subject_id
@@ -273,13 +272,13 @@ public class TeacherController extends Controller {
     @Before({POST.class})
     @IsLoginInterface({})
     @EmptyInterface({"person_id", "person_name", "org_id", "t_duty_charge", "xl_id", "zc_id", "xb", "mz", "zzmm"})
-    @IsNumericInterface({"sort_id", "stage_id", "subject_id"})
+    @IsNumericInterface({"stage_id", "subject_id"})
     @IsSysAdminInterface({"1", "2", "3", "4"})
     @LengthInterface({"person_name,2,64", "xl_id,2,2", "zc_id,2,2"})
     public void updateTeacher(String person_id, String person_name,
                               String t_duty_charge, String xl_id,
                               String xb, String mz, String zzmm,
-                              int sort_id, String zc_id, String org_id, String id_card, String birthday, String t_teaching_date,
+                              int sort_id, String zc_id, String org_id, String id_card, String t_teaching_date,
                               int stage_id, int subject_id) {
         JSONObject resultJson = new JSONObject();
 
@@ -313,15 +312,9 @@ public class TeacherController extends Controller {
             renderJson(resultJson);
             return;
         }
-        //如果出生日期不空就判断是否正确
-        if (!CommonUtil.getIsDateLegal(birthday)) {
-            resultJson.put("success", false);
-            resultJson.put("message", "出生日期格式不正确！");
-            renderJson(resultJson);
-            return;
-        }
+
         //判断是不是合法的任教年月日
-        if (!CommonUtil.getIsDateLegal(t_teaching_date)) {
+        if (!StrKit.isBlank(t_teaching_date) && !CommonUtil.getIsDateLegal(t_teaching_date)) {
             resultJson.put("success", false);
             resultJson.put("message", "任教年月日不正确！");
             renderJson(resultJson);
@@ -330,7 +323,7 @@ public class TeacherController extends Controller {
 
         if (!CommonUtil.isJsonArray(t_duty_charge)) {
             resultJson.put("success", false);
-            resultJson.put("message", "职务与分管工作不是标准的JSON格式！");
+            resultJson.put("message", "职务不是标准的JSON格式！");
             renderJson(resultJson);
             return;
         }
@@ -340,7 +333,7 @@ public class TeacherController extends Controller {
         //客户端ip_address
         String ip_address = IpUtil.getIpAddr(getRequest());
 
-        if (_teacherModel.updateTeacher(person_id, person_name, xb, mz, id_card, birthday, xl_id, stage_id, subject_id, zc_id, t_teaching_date, sort_id, t_duty_charge, org_id, zzmm, operator, ip_address)) {
+        if (_teacherModel.updateTeacher(person_id, person_name, xb, mz, id_card, xl_id, stage_id, subject_id, zc_id, t_teaching_date, sort_id, t_duty_charge, org_id, zzmm, operator, ip_address)) {
             resultJson.put("success", true);
             renderJson(resultJson);
         } else {

src/main/java/com/dsideal/QingLong/Teacher/Model/TeacherModel.java

@@ -60,7 +60,7 @@ public class TeacherModel {
         record.set("t_duty_charge", t_duty_charge);
 
         if (StrKit.isBlank(t_teaching_date)) {
-            t_teaching_date = "2000-01-01 00:00:00";
+            t_teaching_date = "1900-01-01";
         }
         record.set("t_teaching_date", DateUtil.parse(t_teaching_date));
         record.set("operator", operator);
@@ -104,10 +104,9 @@ public class TeacherModel {
      * @param xb
      * @param mz
      * @param id_card
-     * @param birthday
      * @return
      */
-    public boolean updateTeacher(String person_id, String person_name, String xb, String mz, String id_card, String birthday, String xl_id, int stage_id, int subject_id, String zc_id, String t_teaching_date, int sort_id, String t_duty_charge, String org_id, String zzmm, String operator, String ip_address) {
+    public boolean updateTeacher(String person_id, String person_name, String xb, String mz, String id_card, String xl_id, int stage_id, int subject_id, String zc_id, String t_teaching_date, int sort_id, String t_duty_charge, String org_id, String zzmm, String operator, String ip_address) {
         String city_id;
         String area_id;
         String main_school_id;
@@ -128,6 +127,7 @@ public class TeacherModel {
             record.set("xb", Integer.parseInt(xb));
             record.set("mz", mz);
             record.set("idcard_code", id_card);
+            String birthday = CommonUtil.extractFormattedBirthDate(id_card);
             record.set("birthday", DateUtil.parse(birthday));
             record.set("create_time", DateTime.now());
             record.set("sort_id", sort_id);
@@ -136,6 +136,7 @@ public class TeacherModel {
             record.set("t_stage_id", stage_id);
             record.set("t_subject_id", subject_id);
             record.set("t_zc_id", zc_id);
+            if (StrKit.isBlank(t_teaching_date)) t_teaching_date = "1900-01-01";
             record.set("t_teaching_date", DateUtil.parse(t_teaching_date));
             record.set("t_duty_charge", t_duty_charge);
             record.set("sort_id", sort_id);
@@ -236,11 +237,14 @@ public class TeacherModel {
      */
     public Record getTeacherInfoByTeacherId(String person_id) {
         String sql = Db.getSql("loginPerson.getLoginInfoByPersonId");
-        List<Record> list = Db.find(sql, person_id);
-        if (list.size() > 0) {
-            Record record = list.get(0);
-            //显示单个人员时，需要将身份证号进行还原出来
-            record.set("idcard_code", record.getStr("idcard_code"));
+        Record record = Db.findFirst(sql, person_id);
+        if (record != null) {
+            if (record.getStr("t_teaching_date").equals("1900-01-01 00:00:00.0")) {
+                record.set("t_teaching_date", "");
+            }
+            if (record.getInt("sort_id") == 0) {
+                record.set("sort_id", "");
+            }
             return record;
         } else {
             return null;