jackwang 部署微服务应用

app_PIM/src/pages/human-resource/hrarchives-grid-view/hrarchives-grid-view-base.tsx

@@ -561,7 +561,12 @@ export class HRArchivesGridViewBase extends GridViewBase {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.hremployee && true){
+            deResParameters = [
+            { pathName: 'hremployees', parameterName: 'hremployee' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'hrarchives', parameterName: 'hrarchives' },
             { pathName: 'editview', parameterName: 'editview' },
@@ -595,7 +600,12 @@ export class HRArchivesGridViewBase extends GridViewBase {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.hremployee && true){
+            deResParameters = [
+            { pathName: 'hremployees', parameterName: 'hremployee' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'hrarchives', parameterName: 'hrarchives' },
             { pathName: 'editview', parameterName: 'editview' },

app_PIM/src/pages/human-resource/hrcertificate-grid-view/hrcertificate-grid-view-base.tsx

@@ -561,7 +561,12 @@ export class HRCertificateGridViewBase extends GridViewBase {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.hremployee && true){
+            deResParameters = [
+            { pathName: 'hremployees', parameterName: 'hremployee' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'hrcertificates', parameterName: 'hrcertificate' },
             { pathName: 'editview', parameterName: 'editview' },
@@ -595,7 +600,12 @@ export class HRCertificateGridViewBase extends GridViewBase {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.hremployee && true){
+            deResParameters = [
+            { pathName: 'hremployees', parameterName: 'hremployee' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'hrcertificates', parameterName: 'hrcertificate' },
             { pathName: 'editview', parameterName: 'editview' },

app_PIM/src/pages/human-resource/hrfamily-grid-view/hrfamily-grid-view-base.tsx

@@ -561,7 +561,12 @@ export class HRFamilyGridViewBase extends GridViewBase {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.hremployee && true){
+            deResParameters = [
+            { pathName: 'hremployees', parameterName: 'hremployee' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'hrfamilies', parameterName: 'hrfamily' },
             { pathName: 'editview', parameterName: 'editview' },
@@ -595,7 +600,12 @@ export class HRFamilyGridViewBase extends GridViewBase {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.hremployee && true){
+            deResParameters = [
+            { pathName: 'hremployees', parameterName: 'hremployee' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'hrfamilies', parameterName: 'hrfamily' },
             { pathName: 'editview', parameterName: 'editview' },

app_PIM/src/pages/human-resource/hrlanguage-ability-grid-view/hrlanguage-ability-grid-view-base.tsx

@@ -561,7 +561,12 @@ export class HRLanguageAbilityGridViewBase extends GridViewBase {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.hremployee && true){
+            deResParameters = [
+            { pathName: 'hremployees', parameterName: 'hremployee' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'hrlanguageabilities', parameterName: 'hrlanguageability' },
             { pathName: 'editview', parameterName: 'editview' },
@@ -595,7 +600,12 @@ export class HRLanguageAbilityGridViewBase extends GridViewBase {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.hremployee && true){
+            deResParameters = [
+            { pathName: 'hremployees', parameterName: 'hremployee' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'hrlanguageabilities', parameterName: 'hrlanguageability' },
             { pathName: 'editview', parameterName: 'editview' },

app_PIM/src/pages/ungroup/pim/router.ts

@@ -57,6 +57,21 @@ const router = new Router({
                     },
                     component: () => import('@pages/human-resource/hrreward-grid-view/hrreward-grid-view.vue'),
                 },
+                {
+                    path: 'hremployees/:hremployee?/hrcertificates/:hrcertificate?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.hrcertificate.views.editview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hremployees', parameterName: 'hremployee' },
+                            { pathName: 'hrcertificates', parameterName: 'hrcertificate' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/human-resource/hrcertificate-edit-view/hrcertificate-edit-view.vue'),
+                },
                 {
                     path: 'hrcertificates/:hrcertificate?/editview/:editview?',
                     meta: {
@@ -113,6 +128,21 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/hromhierarchy-cat-tab-exp-view/hromhierarchy-cat-tab-exp-view.vue'),
                 },
+                {
+                    path: 'hremployees/:hremployee?/hrlanguageabilities/:hrlanguageability?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.hrlanguageability.views.editview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hremployees', parameterName: 'hremployee' },
+                            { pathName: 'hrlanguageabilities', parameterName: 'hrlanguageability' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/human-resource/hrlanguage-ability-edit-view/hrlanguage-ability-edit-view.vue'),
+                },
                 {
                     path: 'hrlanguageabilities/:hrlanguageability?/editview/:editview?',
                     meta: {
@@ -382,6 +412,21 @@ const router = new Router({
                     },
                     component: () => import('@pages/human-resource/hrduty-edu-v-001/hrduty-edu-v-001.vue'),
                 },
+                {
+                    path: 'hremployees/:hremployee?/hrarchives/:hrarchives?/gridview/:gridview?',
+                    meta: {
+                        caption: 'entities.hrarchives.views.gridview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hremployees', parameterName: 'hremployee' },
+                            { pathName: 'hrarchives', parameterName: 'hrarchives' },
+                            { pathName: 'gridview', parameterName: 'gridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/human-resource/hrarchives-grid-view/hrarchives-grid-view.vue'),
+                },
                 {
                     path: 'hrarchives/:hrarchives?/gridview/:gridview?',
                     meta: {
@@ -1209,6 +1254,21 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/hrorganization-pickup-view/hrorganization-pickup-view.vue'),
                 },
+                {
+                    path: 'hremployees/:hremployee?/hrlanguageabilities/:hrlanguageability?/gridview/:gridview?',
+                    meta: {
+                        caption: 'entities.hrlanguageability.views.gridview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hremployees', parameterName: 'hremployee' },
+                            { pathName: 'hrlanguageabilities', parameterName: 'hrlanguageability' },
+                            { pathName: 'gridview', parameterName: 'gridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/human-resource/hrlanguage-ability-grid-view/hrlanguage-ability-grid-view.vue'),
+                },
                 {
                     path: 'hrlanguageabilities/:hrlanguageability?/gridview/:gridview?',
                     meta: {
@@ -1496,6 +1556,21 @@ const router = new Router({
                     },
                     component: () => import('@pages/human-resource/hrduty-skill-v-001/hrduty-skill-v-001.vue'),
                 },
+                {
+                    path: 'hremployees/:hremployee?/hrfamilies/:hrfamily?/gridview/:gridview?',
+                    meta: {
+                        caption: 'entities.hrfamily.views.gridview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hremployees', parameterName: 'hremployee' },
+                            { pathName: 'hrfamilies', parameterName: 'hrfamily' },
+                            { pathName: 'gridview', parameterName: 'gridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/human-resource/hrfamily-grid-view/hrfamily-grid-view.vue'),
+                },
                 {
                     path: 'hrfamilies/:hrfamily?/gridview/:gridview?',
                     meta: {
@@ -1553,6 +1628,21 @@ const router = new Router({
                     },
                     component: () => import('@pages/human-resource/hrdistribution-v-002/hrdistribution-v-002.vue'),
                 },
+                {
+                    path: 'hremployees/:hremployee?/hrcertificates/:hrcertificate?/gridview/:gridview?',
+                    meta: {
+                        caption: 'entities.hrcertificate.views.gridview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hremployees', parameterName: 'hremployee' },
+                            { pathName: 'hrcertificates', parameterName: 'hrcertificate' },
+                            { pathName: 'gridview', parameterName: 'gridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/human-resource/hrcertificate-grid-view/hrcertificate-grid-view.vue'),
+                },
                 {
                     path: 'hrcertificates/:hrcertificate?/gridview/:gridview?',
                     meta: {
@@ -1796,6 +1886,21 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/hrorg-contact-edit-view/hrorg-contact-edit-view.vue'),
                 },
+                {
+                    path: 'hremployees/:hremployee?/hrfamilies/:hrfamily?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.hrfamily.views.editview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hremployees', parameterName: 'hremployee' },
+                            { pathName: 'hrfamilies', parameterName: 'hrfamily' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/human-resource/hrfamily-edit-view/hrfamily-edit-view.vue'),
+                },
                 {
                     path: 'hrfamilies/:hrfamily?/editview/:editview?',
                     meta: {
@@ -1853,6 +1958,21 @@ const router = new Router({
                     },
                     component: () => import('@pages/human-resource/hrdistribution-grid-view/hrdistribution-grid-view.vue'),
                 },
+                {
+                    path: 'hremployees/:hremployee?/hrarchives/:hrarchives?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.hrarchives.views.editview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hremployees', parameterName: 'hremployee' },
+                            { pathName: 'hrarchives', parameterName: 'hrarchives' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/human-resource/hrarchives-edit-view/hrarchives-edit-view.vue'),
+                },
                 {
                     path: 'hrarchives/:hrarchives?/editview/:editview?',
                     meta: {

app_PIM/src/service/hrarchives/hrarchives-service-base.ts

@@ -48,6 +48,11 @@ export default class HRArchivesServiceBase extends EntityService {
      * @memberof HRArchivesServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && context.hrarchives){
+            let res:any = Http.getInstance().get(`/hremployees/${context.hremployee}/hrarchives/${context.hrarchives}/select`,isloading);
+            
+            return res;
+        }
             let res:any = Http.getInstance().get(`/hrarchives/${context.hrarchives}/select`,isloading);
             
             return res;
@@ -63,6 +68,20 @@ export default class HRArchivesServiceBase extends EntityService {
      * @memberof HRArchivesServiceBase
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && true){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/hremployees/${context.hremployee}/hrarchives`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
@@ -87,6 +106,13 @@ export default class HRArchivesServiceBase extends EntityService {
      * @memberof HRArchivesServiceBase
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && context.hrarchives){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/hremployees/${context.hremployee}/hrarchives/${context.hrarchives}`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/hrarchives/${context.hrarchives}`,data,isloading);
@@ -104,6 +130,10 @@ export default class HRArchivesServiceBase extends EntityService {
      * @memberof HRArchivesServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && context.hrarchives){
+            let res:any = Http.getInstance().delete(`/hremployees/${context.hremployee}/hrarchives/${context.hrarchives}`,isloading);
+            return res;
+        }
             let res:any = Http.getInstance().delete(`/hrarchives/${context.hrarchives}`,isloading);
             return res;
     }
@@ -118,6 +148,11 @@ export default class HRArchivesServiceBase extends EntityService {
      * @memberof HRArchivesServiceBase
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && context.hrarchives){
+            let res:any = await Http.getInstance().get(`/hremployees/${context.hremployee}/hrarchives/${context.hrarchives}`,isloading);
+            
+            return res;
+        }
             let res:any = await Http.getInstance().get(`/hrarchives/${context.hrarchives}`,isloading);
             
             return res;
@@ -133,6 +168,12 @@ export default class HRArchivesServiceBase extends EntityService {
      * @memberof HRArchivesServiceBase
      */
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && true){
+            let res:any = await Http.getInstance().get(`/hremployees/${context.hremployee}/hrarchives/getdraft`,isloading);
+            res.data.hrarchives = data.hrarchives;
+            
+            return res;
+        }
         let res:any = await  Http.getInstance().get(`/hrarchives/getdraft`,isloading);
         res.data.hrarchives = data.hrarchives;
         
@@ -149,6 +190,13 @@ export default class HRArchivesServiceBase extends EntityService {
      * @memberof HRArchivesServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && context.hrarchives){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/hremployees/${context.hremployee}/hrarchives/${context.hrarchives}/checkkey`,data,isloading);
+            
+            return res;
+        }
             let res:any = Http.getInstance().post(`/hrarchives/${context.hrarchives}/checkkey`,data,isloading);
             return res;
     }
@@ -163,6 +211,13 @@ export default class HRArchivesServiceBase extends EntityService {
      * @memberof HRArchivesServiceBase
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && context.hrarchives){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/hremployees/${context.hremployee}/hrarchives/${context.hrarchives}/save`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/hrarchives/${context.hrarchives}/save`,data,isloading);
@@ -180,6 +235,11 @@ export default class HRArchivesServiceBase extends EntityService {
      * @memberof HRArchivesServiceBase
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            let res:any = Http.getInstance().get(`/hremployees/${context.hremployee}/hrarchives/fetchdefault`,tempData,isloading);
+            return res;
+        }
         let tempData:any = JSON.parse(JSON.stringify(data));
         let res:any = Http.getInstance().get(`/hrarchives/fetchdefault`,tempData,isloading);
         return res;

app_PIM/src/service/hrcertificate/hrcertificate-service-base.ts

@@ -48,6 +48,11 @@ export default class HRCertificateServiceBase extends EntityService {
      * @memberof HRCertificateServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && context.hrcertificate){
+            let res:any = Http.getInstance().get(`/hremployees/${context.hremployee}/hrcertificates/${context.hrcertificate}/select`,isloading);
+            
+            return res;
+        }
             let res:any = Http.getInstance().get(`/hrcertificates/${context.hrcertificate}/select`,isloading);
             
             return res;
@@ -63,6 +68,20 @@ export default class HRCertificateServiceBase extends EntityService {
      * @memberof HRCertificateServiceBase
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && true){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/hremployees/${context.hremployee}/hrcertificates`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
@@ -87,6 +106,13 @@ export default class HRCertificateServiceBase extends EntityService {
      * @memberof HRCertificateServiceBase
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && context.hrcertificate){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/hremployees/${context.hremployee}/hrcertificates/${context.hrcertificate}`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/hrcertificates/${context.hrcertificate}`,data,isloading);
@@ -104,6 +130,10 @@ export default class HRCertificateServiceBase extends EntityService {
      * @memberof HRCertificateServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && context.hrcertificate){
+            let res:any = Http.getInstance().delete(`/hremployees/${context.hremployee}/hrcertificates/${context.hrcertificate}`,isloading);
+            return res;
+        }
             let res:any = Http.getInstance().delete(`/hrcertificates/${context.hrcertificate}`,isloading);
             return res;
     }
@@ -118,6 +148,11 @@ export default class HRCertificateServiceBase extends EntityService {
      * @memberof HRCertificateServiceBase
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && context.hrcertificate){
+            let res:any = await Http.getInstance().get(`/hremployees/${context.hremployee}/hrcertificates/${context.hrcertificate}`,isloading);
+            
+            return res;
+        }
             let res:any = await Http.getInstance().get(`/hrcertificates/${context.hrcertificate}`,isloading);
             
             return res;
@@ -133,6 +168,12 @@ export default class HRCertificateServiceBase extends EntityService {
      * @memberof HRCertificateServiceBase
      */
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && true){
+            let res:any = await Http.getInstance().get(`/hremployees/${context.hremployee}/hrcertificates/getdraft`,isloading);
+            res.data.hrcertificate = data.hrcertificate;
+            
+            return res;
+        }
         let res:any = await  Http.getInstance().get(`/hrcertificates/getdraft`,isloading);
         res.data.hrcertificate = data.hrcertificate;
         
@@ -149,6 +190,13 @@ export default class HRCertificateServiceBase extends EntityService {
      * @memberof HRCertificateServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && context.hrcertificate){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/hremployees/${context.hremployee}/hrcertificates/${context.hrcertificate}/checkkey`,data,isloading);
+            
+            return res;
+        }
             let res:any = Http.getInstance().post(`/hrcertificates/${context.hrcertificate}/checkkey`,data,isloading);
             return res;
     }
@@ -163,6 +211,13 @@ export default class HRCertificateServiceBase extends EntityService {
      * @memberof HRCertificateServiceBase
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && context.hrcertificate){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/hremployees/${context.hremployee}/hrcertificates/${context.hrcertificate}/save`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/hrcertificates/${context.hrcertificate}/save`,data,isloading);
@@ -180,6 +235,11 @@ export default class HRCertificateServiceBase extends EntityService {
      * @memberof HRCertificateServiceBase
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            let res:any = Http.getInstance().get(`/hremployees/${context.hremployee}/hrcertificates/fetchdefault`,tempData,isloading);
+            return res;
+        }
         let tempData:any = JSON.parse(JSON.stringify(data));
         let res:any = Http.getInstance().get(`/hrcertificates/fetchdefault`,tempData,isloading);
         return res;

app_PIM/src/service/hremployee/hremployee-service-base.ts

@@ -73,6 +73,10 @@ export default class HREmployeeServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/hremployees`,data,isloading);
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_hrarchives',JSON.stringify(res.data.hrarchives?res.data.hrarchives:[]));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_hrcertificates',JSON.stringify(res.data.hrcertificates?res.data.hrcertificates:[]));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_hrfamilies',JSON.stringify(res.data.hrfamilies?res.data.hrfamilies:[]));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_hrlanguageabilities',JSON.stringify(res.data.hrlanguageabilities?res.data.hrlanguageabilities:[]));
         
         return res;
     }

app_PIM/src/service/hrfamily/hrfamily-service-base.ts

@@ -48,6 +48,11 @@ export default class HRFamilyServiceBase extends EntityService {
      * @memberof HRFamilyServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && context.hrfamily){
+            let res:any = Http.getInstance().get(`/hremployees/${context.hremployee}/hrfamilies/${context.hrfamily}/select`,isloading);
+            
+            return res;
+        }
             let res:any = Http.getInstance().get(`/hrfamilies/${context.hrfamily}/select`,isloading);
             
             return res;
@@ -63,6 +68,20 @@ export default class HRFamilyServiceBase extends EntityService {
      * @memberof HRFamilyServiceBase
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && true){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/hremployees/${context.hremployee}/hrfamilies`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
@@ -87,6 +106,13 @@ export default class HRFamilyServiceBase extends EntityService {
      * @memberof HRFamilyServiceBase
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && context.hrfamily){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/hremployees/${context.hremployee}/hrfamilies/${context.hrfamily}`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/hrfamilies/${context.hrfamily}`,data,isloading);
@@ -104,6 +130,10 @@ export default class HRFamilyServiceBase extends EntityService {
      * @memberof HRFamilyServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && context.hrfamily){
+            let res:any = Http.getInstance().delete(`/hremployees/${context.hremployee}/hrfamilies/${context.hrfamily}`,isloading);
+            return res;
+        }
             let res:any = Http.getInstance().delete(`/hrfamilies/${context.hrfamily}`,isloading);
             return res;
     }
@@ -118,6 +148,11 @@ export default class HRFamilyServiceBase extends EntityService {
      * @memberof HRFamilyServiceBase
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && context.hrfamily){
+            let res:any = await Http.getInstance().get(`/hremployees/${context.hremployee}/hrfamilies/${context.hrfamily}`,isloading);
+            
+            return res;
+        }
             let res:any = await Http.getInstance().get(`/hrfamilies/${context.hrfamily}`,isloading);
             
             return res;
@@ -133,6 +168,12 @@ export default class HRFamilyServiceBase extends EntityService {
      * @memberof HRFamilyServiceBase
      */
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && true){
+            let res:any = await Http.getInstance().get(`/hremployees/${context.hremployee}/hrfamilies/getdraft`,isloading);
+            res.data.hrfamily = data.hrfamily;
+            
+            return res;
+        }
         let res:any = await  Http.getInstance().get(`/hrfamilies/getdraft`,isloading);
         res.data.hrfamily = data.hrfamily;
         
@@ -149,6 +190,13 @@ export default class HRFamilyServiceBase extends EntityService {
      * @memberof HRFamilyServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && context.hrfamily){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/hremployees/${context.hremployee}/hrfamilies/${context.hrfamily}/checkkey`,data,isloading);
+            
+            return res;
+        }
             let res:any = Http.getInstance().post(`/hrfamilies/${context.hrfamily}/checkkey`,data,isloading);
             return res;
     }
@@ -163,6 +211,13 @@ export default class HRFamilyServiceBase extends EntityService {
      * @memberof HRFamilyServiceBase
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && context.hrfamily){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/hremployees/${context.hremployee}/hrfamilies/${context.hrfamily}/save`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/hrfamilies/${context.hrfamily}/save`,data,isloading);
@@ -180,6 +235,11 @@ export default class HRFamilyServiceBase extends EntityService {
      * @memberof HRFamilyServiceBase
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            let res:any = Http.getInstance().get(`/hremployees/${context.hremployee}/hrfamilies/fetchdefault`,tempData,isloading);
+            return res;
+        }
         let tempData:any = JSON.parse(JSON.stringify(data));
         let res:any = Http.getInstance().get(`/hrfamilies/fetchdefault`,tempData,isloading);
         return res;

app_PIM/src/service/hrlanguage-ability/hrlanguage-ability-service-base.ts

@@ -48,6 +48,11 @@ export default class HRLanguageAbilityServiceBase extends EntityService {
      * @memberof HRLanguageAbilityServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && context.hrlanguageability){
+            let res:any = Http.getInstance().get(`/hremployees/${context.hremployee}/hrlanguageabilities/${context.hrlanguageability}/select`,isloading);
+            
+            return res;
+        }
             let res:any = Http.getInstance().get(`/hrlanguageabilities/${context.hrlanguageability}/select`,isloading);
             
             return res;
@@ -63,6 +68,20 @@ export default class HRLanguageAbilityServiceBase extends EntityService {
      * @memberof HRLanguageAbilityServiceBase
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && true){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/hremployees/${context.hremployee}/hrlanguageabilities`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
@@ -87,6 +106,13 @@ export default class HRLanguageAbilityServiceBase extends EntityService {
      * @memberof HRLanguageAbilityServiceBase
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && context.hrlanguageability){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/hremployees/${context.hremployee}/hrlanguageabilities/${context.hrlanguageability}`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/hrlanguageabilities/${context.hrlanguageability}`,data,isloading);
@@ -104,6 +130,10 @@ export default class HRLanguageAbilityServiceBase extends EntityService {
      * @memberof HRLanguageAbilityServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && context.hrlanguageability){
+            let res:any = Http.getInstance().delete(`/hremployees/${context.hremployee}/hrlanguageabilities/${context.hrlanguageability}`,isloading);
+            return res;
+        }
             let res:any = Http.getInstance().delete(`/hrlanguageabilities/${context.hrlanguageability}`,isloading);
             return res;
     }
@@ -118,6 +148,11 @@ export default class HRLanguageAbilityServiceBase extends EntityService {
      * @memberof HRLanguageAbilityServiceBase
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && context.hrlanguageability){
+            let res:any = await Http.getInstance().get(`/hremployees/${context.hremployee}/hrlanguageabilities/${context.hrlanguageability}`,isloading);
+            
+            return res;
+        }
             let res:any = await Http.getInstance().get(`/hrlanguageabilities/${context.hrlanguageability}`,isloading);
             
             return res;
@@ -133,6 +168,12 @@ export default class HRLanguageAbilityServiceBase extends EntityService {
      * @memberof HRLanguageAbilityServiceBase
      */
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && true){
+            let res:any = await Http.getInstance().get(`/hremployees/${context.hremployee}/hrlanguageabilities/getdraft`,isloading);
+            res.data.hrlanguageability = data.hrlanguageability;
+            
+            return res;
+        }
         let res:any = await  Http.getInstance().get(`/hrlanguageabilities/getdraft`,isloading);
         res.data.hrlanguageability = data.hrlanguageability;
         
@@ -149,6 +190,13 @@ export default class HRLanguageAbilityServiceBase extends EntityService {
      * @memberof HRLanguageAbilityServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && context.hrlanguageability){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/hremployees/${context.hremployee}/hrlanguageabilities/${context.hrlanguageability}/checkkey`,data,isloading);
+            
+            return res;
+        }
             let res:any = Http.getInstance().post(`/hrlanguageabilities/${context.hrlanguageability}/checkkey`,data,isloading);
             return res;
     }
@@ -163,6 +211,13 @@ export default class HRLanguageAbilityServiceBase extends EntityService {
      * @memberof HRLanguageAbilityServiceBase
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && context.hrlanguageability){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/hremployees/${context.hremployee}/hrlanguageabilities/${context.hrlanguageability}/save`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/hrlanguageabilities/${context.hrlanguageability}/save`,data,isloading);
@@ -180,6 +235,11 @@ export default class HRLanguageAbilityServiceBase extends EntityService {
      * @memberof HRLanguageAbilityServiceBase
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hremployee && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            let res:any = Http.getInstance().get(`/hremployees/${context.hremployee}/hrlanguageabilities/fetchdefault`,tempData,isloading);
+            return res;
+        }
         let tempData:any = JSON.parse(JSON.stringify(data));
         let res:any = Http.getInstance().get(`/hrlanguageabilities/fetchdefault`,tempData,isloading);
         return res;

config.xml

@@ -37,11 +37,11 @@
 	  git clone -b master $para2 ibizhumanresources/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibizhumanresources/
-      mvn clean package -Phrapi
-      cd humanresource-provider/humanresource-provider-hrapi
-      mvn -Phrapi docker:build
-      mvn -Phrapi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-provider-hrapi.yaml iBizEE --with-registry-auth      
+      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 8080
+EXPOSE 10327
 
 ADD humanresource-app-pim.jar /humanresource-app-pim.jar

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

@@ -3,9 +3,25 @@ services:
   humanresource-app-pim:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
     ports:
-      - "8080:8080"
+      - "10327:10327"
     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-provider/humanresource-provider-hrapi/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-provider-hrapi.jar
 
-EXPOSE 10317
+EXPOSE 8081
 
 ADD humanresource-provider-hrapi.jar /humanresource-provider-hrapi.jar

humanresource-provider/humanresource-provider-hrapi/src/main/docker/humanresource-provider-hrapi.yaml

@@ -3,25 +3,9 @@ services:
   humanresource-provider-hrapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-provider-hrapi:latest
     ports:
-      - "10317:10317"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=10317
-      - 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: