xignzi006 发布系统代码

app_PIM/src/interface/entity/hreducation.ts

@@ -69,4 +69,116 @@ export interface HREducation {
      * @memberof HREducation
      */
     hremployeename?: any;
+
+    /**
+     * 学历
+     *
+     * @returns {*}
+     * @memberof HREducation
+     */
+    degree?: any;
+
+    /**
+     * 入学时间
+     *
+     * @returns {*}
+     * @memberof HREducation
+     */
+    begintime?: any;
+
+    /**
+     * 毕业时间
+     *
+     * @returns {*}
+     * @memberof HREducation
+     */
+    endtime?: any;
+
+    /**
+     * 毕业院校
+     *
+     * @returns {*}
+     * @memberof HREducation
+     */
+    school?: any;
+
+    /**
+     * 一级学科
+     *
+     * @returns {*}
+     * @memberof HREducation
+     */
+    subject?: any;
+
+    /**
+     * 专业
+     *
+     * @returns {*}
+     * @memberof HREducation
+     */
+    major?: any;
+
+    /**
+     * 学习形式
+     *
+     * @returns {*}
+     * @memberof HREducation
+     */
+    learnmodality?: any;
+
+    /**
+     * 学校性质
+     *
+     * @returns {*}
+     * @memberof HREducation
+     */
+    schooltype?: any;
+
+    /**
+     * 是否最高学历
+     *
+     * @returns {*}
+     * @memberof HREducation
+     */
+    highdegreeflag?: any;
+
+    /**
+     * 是否第一学历
+     *
+     * @returns {*}
+     * @memberof HREducation
+     */
+    firstdegreeflag?: any;
+
+    /**
+     * 其他附件
+     *
+     * @returns {*}
+     * @memberof HREducation
+     */
+    attachment?: any;
+
+    /**
+     * 毕业证
+     *
+     * @returns {*}
+     * @memberof HREducation
+     */
+    attachment1?: any;
+
+    /**
+     * 学位证
+     *
+     * @returns {*}
+     * @memberof HREducation
+     */
+    attachment2?: any;
+
+    /**
+     * 学历验证
+     *
+     * @returns {*}
+     * @memberof HREducation
+     */
+    attachment3?: any;
 }
\ No newline at end of file

app_PIM/src/locale/lanres/entities/hreducation/hreducation_en_US.ts

@@ -9,6 +9,20 @@ export default {
     updatedate: "更新时间",
     hremployeeid: "员工标识",
     hremployeename: "员工姓名",
+    degree: "学历",
+    begintime: "入学时间",
+    endtime: "毕业时间",
+    school: "毕业院校",
+    subject: "一级学科",
+    major: "专业",
+    learnmodality: "学习形式",
+    schooltype: "学校性质",
+    highdegreeflag: "是否最高学历",
+    firstdegreeflag: "是否第一学历",
+    attachment: "其他附件",
+    attachment1: "毕业证",
+    attachment2: "学位证",
+    attachment3: "学历验证",
   },
 	views: {
 		editview: {

app_PIM/src/locale/lanres/entities/hreducation/hreducation_zh_CN.ts

@@ -8,6 +8,20 @@ export default {
     updatedate: "更新时间",
     hremployeeid: "员工标识",
     hremployeename: "员工姓名",
+    degree: "学历",
+    begintime: "入学时间",
+    endtime: "毕业时间",
+    school: "毕业院校",
+    subject: "一级学科",
+    major: "专业",
+    learnmodality: "学习形式",
+    schooltype: "学校性质",
+    highdegreeflag: "是否最高学历",
+    firstdegreeflag: "是否第一学历",
+    attachment: "其他附件",
+    attachment1: "毕业证",
+    attachment2: "学位证",
+    attachment3: "学历验证",
   },
 	views: {
 		editview: {

config.xml

@@ -37,11 +37,6 @@
 	  git clone -b master $para2 ibizhumanresources/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibizhumanresources/
-      mvn clean package -Ppim
-      cd humanresource-app/humanresource-app-pim
-      mvn -Ppim docker:build
-      mvn -Ppim docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-app-pim.yaml iBizEE --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

humanresource-app/humanresource-app-pim/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-app-pim.jar
 
-EXPOSE 10327
+EXPOSE 8080
 
 ADD humanresource-app-pim.jar /humanresource-app-pim.jar

humanresource-app/humanresource-app-pim/src/main/docker/humanresource-app-pim.yaml

@@ -3,25 +3,9 @@ services:
   humanresource-app-pim:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
     ports:
-      - "10327:10327"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=10327
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
-      - SPRING_DATASOURCE_PASSWORD=b1@@@772
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:8848
-      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-      - SEATA_ENABLED=true
     deploy:
       resources:
            limits:

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/domain/HREducation.java

@@ -103,6 +103,106 @@ public class HREducation extends EntityMP implements Serializable {
     @JSONField(name = "hremployeename")
     @JsonProperty("hremployeename")
     private String hremployeename;
+    /**
+     * 学历
+     */
+    @TableField(value = "degree")
+    @JSONField(name = "degree")
+    @JsonProperty("degree")
+    private String degree;
+    /**
+     * 入学时间
+     */
+    @TableField(value = "begintime")
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "begintime" , format="yyyy-MM-dd")
+    @JsonProperty("begintime")
+    private Timestamp begintime;
+    /**
+     * 毕业时间
+     */
+    @TableField(value = "endtime")
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "endtime" , format="yyyy-MM-dd")
+    @JsonProperty("endtime")
+    private Timestamp endtime;
+    /**
+     * 毕业院校
+     */
+    @TableField(value = "school")
+    @JSONField(name = "school")
+    @JsonProperty("school")
+    private String school;
+    /**
+     * 一级学科
+     */
+    @TableField(value = "subject")
+    @JSONField(name = "subject")
+    @JsonProperty("subject")
+    private String subject;
+    /**
+     * 专业
+     */
+    @TableField(value = "major")
+    @JSONField(name = "major")
+    @JsonProperty("major")
+    private String major;
+    /**
+     * 学习形式
+     */
+    @TableField(value = "learnmodality")
+    @JSONField(name = "learnmodality")
+    @JsonProperty("learnmodality")
+    private String learnmodality;
+    /**
+     * 学校性质
+     */
+    @TableField(value = "schooltype")
+    @JSONField(name = "schooltype")
+    @JsonProperty("schooltype")
+    private String schooltype;
+    /**
+     * 是否最高学历
+     */
+    @TableField(value = "highdegreeflag")
+    @JSONField(name = "highdegreeflag")
+    @JsonProperty("highdegreeflag")
+    private Integer highdegreeflag;
+    /**
+     * 是否第一学历
+     */
+    @TableField(value = "firstdegreeflag")
+    @JSONField(name = "firstdegreeflag")
+    @JsonProperty("firstdegreeflag")
+    private Integer firstdegreeflag;
+    /**
+     * 其他附件
+     */
+    @TableField(value = "attachment")
+    @JSONField(name = "attachment")
+    @JsonProperty("attachment")
+    private String attachment;
+    /**
+     * 毕业证
+     */
+    @TableField(value = "attachment1")
+    @JSONField(name = "attachment1")
+    @JsonProperty("attachment1")
+    private String attachment1;
+    /**
+     * 学位证
+     */
+    @TableField(value = "attachment2")
+    @JSONField(name = "attachment2")
+    @JsonProperty("attachment2")
+    private String attachment2;
+    /**
+     * 学历验证
+     */
+    @TableField(value = "attachment3")
+    @JSONField(name = "attachment3")
+    @JsonProperty("attachment3")
+    private String attachment3;
 
     /**
      * 员工
@@ -130,6 +230,138 @@ public class HREducation extends EntityMP implements Serializable {
         this.modify("hremployeeid",hremployeeid);
     }
 
+    /**
+     * 设置 [学历]
+     */
+    public void setDegree(String degree){
+        this.degree = degree ;
+        this.modify("degree",degree);
+    }
+
+    /**
+     * 设置 [入学时间]
+     */
+    public void setBegintime(Timestamp begintime){
+        this.begintime = begintime ;
+        this.modify("begintime",begintime);
+    }
+
+    /**
+     * 格式化日期 [入学时间]
+     */
+    public String formatBegintime(){
+        if (this.begintime == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(begintime);
+    }
+    /**
+     * 设置 [毕业时间]
+     */
+    public void setEndtime(Timestamp endtime){
+        this.endtime = endtime ;
+        this.modify("endtime",endtime);
+    }
+
+    /**
+     * 格式化日期 [毕业时间]
+     */
+    public String formatEndtime(){
+        if (this.endtime == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(endtime);
+    }
+    /**
+     * 设置 [毕业院校]
+     */
+    public void setSchool(String school){
+        this.school = school ;
+        this.modify("school",school);
+    }
+
+    /**
+     * 设置 [一级学科]
+     */
+    public void setSubject(String subject){
+        this.subject = subject ;
+        this.modify("subject",subject);
+    }
+
+    /**
+     * 设置 [专业]
+     */
+    public void setMajor(String major){
+        this.major = major ;
+        this.modify("major",major);
+    }
+
+    /**
+     * 设置 [学习形式]
+     */
+    public void setLearnmodality(String learnmodality){
+        this.learnmodality = learnmodality ;
+        this.modify("learnmodality",learnmodality);
+    }
+
+    /**
+     * 设置 [学校性质]
+     */
+    public void setSchooltype(String schooltype){
+        this.schooltype = schooltype ;
+        this.modify("schooltype",schooltype);
+    }
+
+    /**
+     * 设置 [是否最高学历]
+     */
+    public void setHighdegreeflag(Integer highdegreeflag){
+        this.highdegreeflag = highdegreeflag ;
+        this.modify("highdegreeflag",highdegreeflag);
+    }
+
+    /**
+     * 设置 [是否第一学历]
+     */
+    public void setFirstdegreeflag(Integer firstdegreeflag){
+        this.firstdegreeflag = firstdegreeflag ;
+        this.modify("firstdegreeflag",firstdegreeflag);
+    }
+
+    /**
+     * 设置 [其他附件]
+     */
+    public void setAttachment(String attachment){
+        this.attachment = attachment ;
+        this.modify("attachment",attachment);
+    }
+
+    /**
+     * 设置 [毕业证]
+     */
+    public void setAttachment1(String attachment1){
+        this.attachment1 = attachment1 ;
+        this.modify("attachment1",attachment1);
+    }
+
+    /**
+     * 设置 [学位证]
+     */
+    public void setAttachment2(String attachment2){
+        this.attachment2 = attachment2 ;
+        this.modify("attachment2",attachment2);
+    }
+
+    /**
+     * 设置 [学历验证]
+     */
+    public void setAttachment3(String attachment3){
+        this.attachment3 = attachment3 ;
+        this.modify("attachment3",attachment3);
+    }
+
 
 }
 

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/filter/HREducationSearchContext.java

@@ -55,6 +55,27 @@ public class HREducationSearchContext extends QueryWrapperContext<HREducation> {
             this.getSearchCond().like("hremployeename", n_hremployeename_like);
         }
     }
+	private String n_degree_eq;//[学历]
+	public void setN_degree_eq(String n_degree_eq) {
+        this.n_degree_eq = n_degree_eq;
+        if(!ObjectUtils.isEmpty(this.n_degree_eq)){
+            this.getSearchCond().eq("degree", n_degree_eq);
+        }
+    }
+	private String n_learnmodality_eq;//[学习形式]
+	public void setN_learnmodality_eq(String n_learnmodality_eq) {
+        this.n_learnmodality_eq = n_learnmodality_eq;
+        if(!ObjectUtils.isEmpty(this.n_learnmodality_eq)){
+            this.getSearchCond().eq("learnmodality", n_learnmodality_eq);
+        }
+    }
+	private String n_schooltype_eq;//[学校性质]
+	public void setN_schooltype_eq(String n_schooltype_eq) {
+        this.n_schooltype_eq = n_schooltype_eq;
+        if(!ObjectUtils.isEmpty(this.n_schooltype_eq)){
+            this.getSearchCond().eq("schooltype", n_schooltype_eq);
+        }
+    }
 
     /**
 	 * 启用快速搜索

humanresource-core/src/main/resources/liquibase/h2_table.xml

@@ -220,7 +220,7 @@
 
 
     <!--输出实体[HREDUCATION]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hreducation-8-10">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hreducation-27-10">
         <createTable tableName="T_HREDUCATION">
                 <column name="HREDUCATIONID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_HREDUCATION_HREDUCATIONID"/>
@@ -237,6 +237,34 @@
                 </column>
                 <column name="HREMPLOYEEID" remarks="" type="VARCHAR(100)">
                 </column>
+                <column name="DEGREE" remarks="" type="VARCHAR(60)">
+                </column>
+                <column name="BEGINTIME" remarks="" type="DATETIME">
+                </column>
+                <column name="ENDTIME" remarks="" type="DATETIME">
+                </column>
+                <column name="SCHOOL" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="SUBJECT" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="MAJOR" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="LEARNMODALITY" remarks="" type="VARCHAR(60)">
+                </column>
+                <column name="SCHOOLTYPE" remarks="" type="VARCHAR(60)">
+                </column>
+                <column name="HIGHDEGREEFLAG" remarks="" type="INT">
+                </column>
+                <column name="FIRSTDEGREEFLAG" remarks="" type="INT">
+                </column>
+                <column name="ATTACHMENT" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="ATTACHMENT1" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="ATTACHMENT2" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="ATTACHMENT3" remarks="" type="VARCHAR(100)">
+                </column>
         </createTable>
     </changeSet>
 
@@ -892,7 +920,7 @@
        <addForeignKeyConstraint baseColumnNames="HRDUTYID" baseTableName="T_HRDUTYSKILL" constraintName="DER1N_HRDUTYSKILL_HRDUTY_HRDUT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRDUTYID" referencedTableName="T_HRDUTY" validate="true"/>
     </changeSet>
         <!--输出实体[HREDUCATION]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hreducation-8-42">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hreducation-27-42">
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HREDUCATION" constraintName="DER1N_HREDUCATION_HREMPLOYEE_H" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
     </changeSet>
         <!--输出实体[HREMPSTATE]外键关系 -->

humanresource-core/src/main/resources/mapper/humanresource/hreducation/HREducationMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="HREducationResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREDUCATIONID`, t1.`HREDUCATIONNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HREDUCATION` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  ) t1 where hreducationid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ATTACHMENT`, t1.`ATTACHMENT1`, t1.`ATTACHMENT2`, t1.`ATTACHMENT3`, t1.`BEGINTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEGREE`, t1.`ENDTIME`, t1.`FIRSTDEGREEFLAG`, t1.`HIGHDEGREEFLAG`, t1.`HREDUCATIONID`, t1.`HREDUCATIONNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`LEARNMODALITY`, t1.`MAJOR`, t1.`SCHOOL`, t1.`SCHOOLTYPE`, t1.`SUBJECT`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HREDUCATION` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  ) t1 where hreducationid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -37,12 +37,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREDUCATIONID`, t1.`HREDUCATIONNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HREDUCATION` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
+		<![CDATA[ SELECT t1.`ATTACHMENT`, t1.`ATTACHMENT1`, t1.`ATTACHMENT2`, t1.`ATTACHMENT3`, t1.`BEGINTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEGREE`, t1.`ENDTIME`, t1.`FIRSTDEGREEFLAG`, t1.`HIGHDEGREEFLAG`, t1.`HREDUCATIONID`, t1.`HREDUCATIONNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`LEARNMODALITY`, t1.`MAJOR`, t1.`SCHOOL`, t1.`SCHOOLTYPE`, t1.`SUBJECT`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HREDUCATION` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREDUCATIONID`, t1.`HREDUCATIONNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HREDUCATION` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
+		<![CDATA[ SELECT t1.`ATTACHMENT`, t1.`ATTACHMENT1`, t1.`ATTACHMENT2`, t1.`ATTACHMENT3`, t1.`BEGINTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEGREE`, t1.`ENDTIME`, t1.`FIRSTDEGREEFLAG`, t1.`HIGHDEGREEFLAG`, t1.`HREDUCATIONID`, t1.`HREDUCATIONNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`LEARNMODALITY`, t1.`MAJOR`, t1.`SCHOOL`, t1.`SCHOOLTYPE`, t1.`SUBJECT`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HREDUCATION` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
 			]]>
     </sql>
 </mapper>

humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HREducationDTO.java

@@ -90,6 +90,120 @@ public class HREducationDTO extends DTOBase implements Serializable {
     @JsonProperty("hremployeename")
     private String hremployeename;
 
+    /**
+     * 属性 [DEGREE]
+     *
+     */
+    @JSONField(name = "degree")
+    @JsonProperty("degree")
+    private String degree;
+
+    /**
+     * 属性 [BEGINTIME]
+     *
+     */
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "begintime" , format="yyyy-MM-dd")
+    @JsonProperty("begintime")
+    private Timestamp begintime;
+
+    /**
+     * 属性 [ENDTIME]
+     *
+     */
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "endtime" , format="yyyy-MM-dd")
+    @JsonProperty("endtime")
+    private Timestamp endtime;
+
+    /**
+     * 属性 [SCHOOL]
+     *
+     */
+    @JSONField(name = "school")
+    @JsonProperty("school")
+    private String school;
+
+    /**
+     * 属性 [SUBJECT]
+     *
+     */
+    @JSONField(name = "subject")
+    @JsonProperty("subject")
+    private String subject;
+
+    /**
+     * 属性 [MAJOR]
+     *
+     */
+    @JSONField(name = "major")
+    @JsonProperty("major")
+    private String major;
+
+    /**
+     * 属性 [LEARNMODALITY]
+     *
+     */
+    @JSONField(name = "learnmodality")
+    @JsonProperty("learnmodality")
+    private String learnmodality;
+
+    /**
+     * 属性 [SCHOOLTYPE]
+     *
+     */
+    @JSONField(name = "schooltype")
+    @JsonProperty("schooltype")
+    private String schooltype;
+
+    /**
+     * 属性 [HIGHDEGREEFLAG]
+     *
+     */
+    @JSONField(name = "highdegreeflag")
+    @JsonProperty("highdegreeflag")
+    private Integer highdegreeflag;
+
+    /**
+     * 属性 [FIRSTDEGREEFLAG]
+     *
+     */
+    @JSONField(name = "firstdegreeflag")
+    @JsonProperty("firstdegreeflag")
+    private Integer firstdegreeflag;
+
+    /**
+     * 属性 [ATTACHMENT]
+     *
+     */
+    @JSONField(name = "attachment")
+    @JsonProperty("attachment")
+    private String attachment;
+
+    /**
+     * 属性 [ATTACHMENT1]
+     *
+     */
+    @JSONField(name = "attachment1")
+    @JsonProperty("attachment1")
+    private String attachment1;
+
+    /**
+     * 属性 [ATTACHMENT2]
+     *
+     */
+    @JSONField(name = "attachment2")
+    @JsonProperty("attachment2")
+    private String attachment2;
+
+    /**
+     * 属性 [ATTACHMENT3]
+     *
+     */
+    @JSONField(name = "attachment3")
+    @JsonProperty("attachment3")
+    private String attachment3;
+
 
     /**
      * 设置 [HREDUCATIONNAME]
@@ -107,6 +221,118 @@ public class HREducationDTO extends DTOBase implements Serializable {
         this.modify("hremployeeid",hremployeeid);
     }
 
+    /**
+     * 设置 [DEGREE]
+     */
+    public void setDegree(String  degree){
+        this.degree = degree ;
+        this.modify("degree",degree);
+    }
+
+    /**
+     * 设置 [BEGINTIME]
+     */
+    public void setBegintime(Timestamp  begintime){
+        this.begintime = begintime ;
+        this.modify("begintime",begintime);
+    }
+
+    /**
+     * 设置 [ENDTIME]
+     */
+    public void setEndtime(Timestamp  endtime){
+        this.endtime = endtime ;
+        this.modify("endtime",endtime);
+    }
+
+    /**
+     * 设置 [SCHOOL]
+     */
+    public void setSchool(String  school){
+        this.school = school ;
+        this.modify("school",school);
+    }
+
+    /**
+     * 设置 [SUBJECT]
+     */
+    public void setSubject(String  subject){
+        this.subject = subject ;
+        this.modify("subject",subject);
+    }
+
+    /**
+     * 设置 [MAJOR]
+     */
+    public void setMajor(String  major){
+        this.major = major ;
+        this.modify("major",major);
+    }
+
+    /**
+     * 设置 [LEARNMODALITY]
+     */
+    public void setLearnmodality(String  learnmodality){
+        this.learnmodality = learnmodality ;
+        this.modify("learnmodality",learnmodality);
+    }
+
+    /**
+     * 设置 [SCHOOLTYPE]
+     */
+    public void setSchooltype(String  schooltype){
+        this.schooltype = schooltype ;
+        this.modify("schooltype",schooltype);
+    }
+
+    /**
+     * 设置 [HIGHDEGREEFLAG]
+     */
+    public void setHighdegreeflag(Integer  highdegreeflag){
+        this.highdegreeflag = highdegreeflag ;
+        this.modify("highdegreeflag",highdegreeflag);
+    }
+
+    /**
+     * 设置 [FIRSTDEGREEFLAG]
+     */
+    public void setFirstdegreeflag(Integer  firstdegreeflag){
+        this.firstdegreeflag = firstdegreeflag ;
+        this.modify("firstdegreeflag",firstdegreeflag);
+    }
+
+    /**
+     * 设置 [ATTACHMENT]
+     */
+    public void setAttachment(String  attachment){
+        this.attachment = attachment ;
+        this.modify("attachment",attachment);
+    }
+
+    /**
+     * 设置 [ATTACHMENT1]
+     */
+    public void setAttachment1(String  attachment1){
+        this.attachment1 = attachment1 ;
+        this.modify("attachment1",attachment1);
+    }
+
+    /**
+     * 设置 [ATTACHMENT2]
+     */
+    public void setAttachment2(String  attachment2){
+        this.attachment2 = attachment2 ;
+        this.modify("attachment2",attachment2);
+    }
+
+    /**
+     * 设置 [ATTACHMENT3]
+     */
+    public void setAttachment3(String  attachment3){
+        this.attachment3 = attachment3 ;
+        this.modify("attachment3",attachment3);
+    }
+
 
 }
 

humanresource-util/src/main/java/cn/ibizlab/humanresource/util/domain/DTOClient.java

@@ -4,9 +4,9 @@ public class DTOClient extends DTOBase {
 
     @Override
     public void modify(String field,Object val) {
+        getExtensionparams().put("dirtyflagenable",true);
         if(val==null){
             this.getFocusNull().add(field.toLowerCase());
-            getExtensionparams().put("dirtyflagenable",true);
             getExtensionparams().put(field.toLowerCase()+"dirtyflag",true);
         }
         else{

humanresource-util/src/main/java/cn/ibizlab/humanresource/util/job/PermissionSyncJob.java

@@ -29,6 +29,9 @@ public class PermissionSyncJob implements ApplicationRunner {
 
     @Value("${ibiz.systemid:iBizHumanResources}")
     private String systemId;
+    
+    @Value("${ibiz.systemid:iBiz人力资源}")
+    private String systemName;
 
 
     @Override
@@ -39,7 +42,7 @@ public class PermissionSyncJob implements ApplicationRunner {
             String permissionResult = IOUtils.toString(permission,"UTF-8");
             JSONObject system= new JSONObject();
             system.put("pssystemid",systemId);
-            system.put("pssystemname",systemId);
+            system.put("pssystemname",systemName);
             system.put("sysstructure",JSONObject.parseObject(permissionResult));
             system.put("md5check",DigestUtils.md5DigestAsHex(permissionResult.getBytes()));
             if(client.syncSysAuthority(system)){