Merge branch 'dev' of https://git.yingcaibx.com/tl/api into dev

src/main/java/com/xjrsoft/module/organization/entity/User.java

@@ -88,4 +88,10 @@ public class User extends AuditEntity implements Serializable {
 
     @ApiModelProperty("unionId")
     private String unionId;
+
+    @ApiModelProperty("证件类型(xjr_dictionary_item[credential_type])")
+    private String credentialType;
+
+    @ApiModelProperty("证件号码")
+    private String credentialNumber;
 }

src/main/java/com/xjrsoft/module/student/dto/AddBaseStudentDto.java

@@ -45,11 +45,6 @@ public class AddBaseStudentDto {
      */
     @ApiModelProperty("证件类型(xjr_dictionary_item[credential_type])")
     private String credentialType;
-    /**
-     * 证件号码
-     */
-    @ApiModelProperty("证件号码")
-    private String credentialNumber;
     /**
      * 出生日期
      */

src/main/java/com/xjrsoft/module/student/dto/AddBaseStudentUserDto.java

@@ -76,6 +76,16 @@ public class AddBaseStudentUserDto {
      */
     @ApiModelProperty("备注")
     private String remark;
+    /**
+     * 证件类型(xjr_dictionary_item[credential_type])
+     */
+    @ApiModelProperty("证件类型(xjr_dictionary_item[credential_type])")
+    private String credentialType;
+    /**
+     * 证件号码
+     */
+    @ApiModelProperty("证件号码")
+    private String credentialNumber;
 
     /**
      * baseStudent

src/main/java/com/xjrsoft/module/student/dto/UpdateBaseStudentDto.java

@@ -44,16 +44,6 @@ public class UpdateBaseStudentDto {
      */
     @ApiModelProperty("曾用名")
     private String formerName;
-    /**
-     * 证件类型(xjr_dictionary_item[credential_type])
-     */
-    @ApiModelProperty("证件类型(xjr_dictionary_item[credential_type])")
-    private String credentialType;
-    /**
-     * 证件号码
-     */
-    @ApiModelProperty("证件号码")
-    private String credentialNumber;
     /**
      * 出生日期
      */

src/main/java/com/xjrsoft/module/student/dto/UpdateBaseStudentUserDto.java

@@ -81,6 +81,16 @@ public class UpdateBaseStudentUserDto {
      */
     @ApiModelProperty("备注")
     private String remark;
+    /**
+     * 证件类型(xjr_dictionary_item[credential_type])
+     */
+    @ApiModelProperty("证件类型(xjr_dictionary_item[credential_type])")
+    private String credentialType;
+    /**
+     * 证件号码
+     */
+    @ApiModelProperty("证件号码")
+    private String credentialNumber;
 
     /**
      * baseStudent

src/main/java/com/xjrsoft/module/student/entity/BaseStudent.java

@@ -98,16 +98,6 @@ public class BaseStudent implements Serializable {
      */
     @ApiModelProperty("曾用名")
     private String formerName;
-    /**
-     * 证件类型(xjr_dictionary_item[credential_type])
-     */
-    @ApiModelProperty("证件类型(xjr_dictionary_item[credential_type])")
-    private String credentialType;
-    /**
-     * 证件号码
-     */
-    @ApiModelProperty("证件号码")
-    private String credentialNumber;
     /**
      * 出生日期
      */

src/main/java/com/xjrsoft/module/teacher/controller/TeacherbaseManagerController.java

@@ -60,7 +60,7 @@ public class TeacherbaseManagerController {
                 .select(XjrUser.class,x -> VoToColumnUtil.fieldsToColumns(XjrUserPageVo.class).contains(x.getProperty()))
                 .innerJoin(BaseTeacher.class,BaseTeacher::getUserId,XjrUser::getId)
                 .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode,BaseTeacher::getJobState,ext->ext.selectAs(DictionaryDetail::getName, XjrUserPageVo::getJobState))
-                .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode,BaseTeacher::getCredentialType,ext->ext.selectAs(DictionaryDetail::getName, XjrUserPageVo::getCredentialType))
+                .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode,XjrUser::getCredentialType,ext->ext.selectAs(DictionaryDetail::getName, XjrUserPageVo::getCredentialType))
                 .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode,BaseTeacher::getEmployWay,ext->ext.selectAs(DictionaryDetail::getName, XjrUserPageVo::getEmployWay))
                 .selectAsClass(BaseTeacher.class, XjrUserPageVo.class);
 

src/main/java/com/xjrsoft/module/teacher/dto/AddBaseTeacherDto.java

@@ -50,16 +50,6 @@ public class AddBaseTeacherDto implements Serializable {
     @ApiModelProperty("在职状态(xjr_dictionary_item[job_state])")
     private String jobState;
     /**
-    * 证件类型(xjr_dictionary_item[credential_type])
-    */
-    @ApiModelProperty("证件类型(xjr_dictionary_item[credential_type])")
-    private String credentialType;
-    /**
-    * 证件号码
-    */
-    @ApiModelProperty("证件号码")
-    private String credentialNumber;
-    /**
     * 出生日期
     */
     @ApiModelProperty("出生日期")

src/main/java/com/xjrsoft/module/teacher/dto/AddXjrUserDto.java

@@ -88,7 +88,16 @@ public class AddXjrUserDto implements Serializable {
     */
     @ApiModelProperty("备注")
     private String remark;
-
+    /**
+     * 证件类型(xjr_dictionary_item[credential_type])
+     */
+    @ApiModelProperty("证件类型(xjr_dictionary_item[credential_type])")
+    private String credentialType;
+    /**
+     * 证件号码
+     */
+    @ApiModelProperty("证件号码")
+    private String credentialNumber;
     /**
     * baseTeacher
     */

src/main/java/com/xjrsoft/module/teacher/dto/UpdateBaseTeacherDto.java

@@ -58,16 +58,6 @@ public class UpdateBaseTeacherDto implements Serializable {
     @ApiModelProperty("在职状态(xjr_dictionary_item[job_state])")
     private String jobState;
     /**
-    * 证件类型(xjr_dictionary_item[credential_type])
-    */
-    @ApiModelProperty("证件类型(xjr_dictionary_item[credential_type])")
-    private String credentialType;
-    /**
-    * 证件号码
-    */
-    @ApiModelProperty("证件号码")
-    private String credentialNumber;
-    /**
     * 出生日期
     */
     @ApiModelProperty("出生日期")

src/main/java/com/xjrsoft/module/teacher/dto/UpdateXjrUserDto.java

@@ -93,6 +93,16 @@ public class UpdateXjrUserDto implements Serializable {
     */
     @ApiModelProperty("备注")
     private String remark;
+    /**
+     * 证件类型(xjr_dictionary_item[credential_type])
+     */
+    @ApiModelProperty("证件类型(xjr_dictionary_item[credential_type])")
+    private String credentialType;
+    /**
+     * 证件号码
+     */
+    @ApiModelProperty("证件号码")
+    private String credentialNumber;
 
     /**
     * baseTeacher

src/main/java/com/xjrsoft/module/teacher/entity/BaseTeacher.java

@@ -101,16 +101,6 @@ public class BaseTeacher implements Serializable {
     @ApiModelProperty("在职状态(xjr_dictionary_item[job_state])")
     private String jobState;
     /**
-    * 证件类型(xjr_dictionary_item[credential_type])
-    */
-    @ApiModelProperty("证件类型(xjr_dictionary_item[credential_type])")
-    private String credentialType;
-    /**
-    * 证件号码
-    */
-    @ApiModelProperty("证件号码")
-    private String credentialNumber;
-    /**
     * 出生日期
     */
     @ApiModelProperty("出生日期")

src/main/java/com/xjrsoft/module/teacher/entity/XjrUser.java

@@ -103,6 +103,16 @@ public class XjrUser implements Serializable {
     */
     @ApiModelProperty("备注")
     private String remark;
+    /**
+     * 证件类型(xjr_dictionary_item[credential_type])
+     */
+    @ApiModelProperty("证件类型(xjr_dictionary_item[credential_type])")
+    private String credentialType;
+    /**
+     * 证件号码
+     */
+    @ApiModelProperty("证件号码")
+    private String credentialNumber;
     /**
     * 
     */