jackwang 部署微服务应用

app_PIM/src/interface/entity/hremployee.ts

@@ -61,4 +61,12 @@ export interface HREmployee {
      * @memberof HREmployee
      */
     organizationid?: any;
+
+    /**
+     * 员工编号
+     *
+     * @returns {*}
+     * @memberof HREmployee
+     */
+    employeecode?: any;
 }
\ No newline at end of file

app_PIM/src/locale/lanres/entities/hremployee/hremployee_en_US.ts

@@ -8,6 +8,7 @@ export default {
     updatedate: "更新时间",
     createdate: "建立时间",
     organizationid: "组织",
+    employeecode: "员工编号",
   },
 	views: {
 		pickupgridview: {

app_PIM/src/locale/lanres/entities/hremployee/hremployee_zh_CN.ts

@@ -7,6 +7,7 @@ export default {
     updatedate: "更新时间",
     createdate: "建立时间",
     organizationid: "组织",
+    employeecode: "员工编号",
   },
 	views: {
 		pickupgridview: {

app_PIM/src/widgets/hremployee/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -36,6 +36,9 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'organizationid',
       },
+      {
+        name: 'employeecode',
+      },
     ]
   }
 

app_PIM/src/widgets/hromhierarchy-cat/ef-001-form/ef-001-form.html

@@ -35,7 +35,7 @@
     <app-form-group :model="detailsModel.grouppanel1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hromhierarchycat.ef_001_form.details.grouppanel1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="1" :isInfoGroupMode="true" >    
     <app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.grouppanel1" :data="data" :context="context" :viewparams="viewparams"/>
     <row>
-        <i-col class="form-layout-container" v-show="detailsModel.druipart1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+        <i-col class="form-layout-container" v-show="detailsModel.druipart1.visible" :style="{'height': '600px !important',}"  :lg="{ span: 24, offset: 0 }">
     <app-form-druipart
     
     :formState="formState"
@@ -57,7 +57,7 @@
     viewname='hromhierarchy-tree-exp-view' 
     :data="JSON.stringify(this.data)" 
     @drdatasaved="drdatasaved($event)"
-    style="overflow: auto;">
+    style="height:600px;overflow: auto;">
 </app-form-druipart>
 
 </i-col>

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

@@ -96,6 +96,13 @@ public class HREmployee extends EntityMP implements Serializable {
     @JSONField(name = "organizationid")
     @JsonProperty("organizationid")
     private String organizationid;
+    /**
+     * 员工编号
+     */
+    @TableField(value = "employeecode")
+    @JSONField(name = "employeecode")
+    @JsonProperty("employeecode")
+    private String employeecode;
 
     /**
      * 
@@ -123,6 +130,14 @@ public class HREmployee extends EntityMP implements Serializable {
         this.modify("organizationid",organizationid);
     }
 
+    /**
+     * 设置 [员工编号]
+     */
+    public void setEmployeecode(String employeecode){
+        this.employeecode = employeecode ;
+        this.modify("employeecode",employeecode);
+    }
+
 
 }
 

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

@@ -169,6 +169,8 @@
                 </column>
                 <column name="ORGANIZATIONID" remarks="" type="VARCHAR(60)">
                 </column>
+                <column name="EMPLOYEECODE" remarks="" type="VARCHAR(100)">
+                </column>
         </createTable>
     </changeSet>
 

humanresource-core/src/main/resources/mapper/humanresource/hremployee/HREmployeeMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="HREmployeeResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`ORGANIZATIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1  ) t1 where employeeid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`ORGANIZATIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1  ) t1 where employeeid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -37,12 +37,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`ORGANIZATIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`ORGANIZATIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`ORGANIZATIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`ORGANIZATIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1  
 			]]>
     </sql>
 </mapper>

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

@@ -82,6 +82,14 @@ public class HREmployeeDTO extends DTOBase implements Serializable {
     @JsonProperty("organizationid")
     private String organizationid;
 
+    /**
+     * 属性 [EMPLOYEECODE]
+     *
+     */
+    @JSONField(name = "employeecode")
+    @JsonProperty("employeecode")
+    private String employeecode;
+
 
     /**
      * 设置 [EMPLOYEENAME]
@@ -99,6 +107,14 @@ public class HREmployeeDTO extends DTOBase implements Serializable {
         this.modify("organizationid",organizationid);
     }
 
+    /**
+     * 设置 [EMPLOYEECODE]
+     */
+    public void setEmployeecode(String  employeecode){
+        this.employeecode = employeecode ;
+        this.modify("employeecode",employeecode);
+    }
+
 
 }