From 7e052b7b71991914f523e71c924006a0fe72b56e Mon Sep 17 00:00:00 2001 From: TianyangZhang Date: Thu, 12 Mar 2026 08:48:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:hrm-=E4=BA=BA=E5=91=98=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/hrm/models.py | 2 +- apps/hrm/serializers.py | 4 ++-- apps/hrm/urls.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/hrm/models.py b/apps/hrm/models.py index 8ec6dc1b..19b52f0c 100755 --- a/apps/hrm/models.py +++ b/apps/hrm/models.py @@ -357,7 +357,7 @@ class EmpContract(CommonAModel): employee = models.OneToOneField(Employee, verbose_name='人员信息', on_delete=models.SET_NULL, null=True, blank=True) ticket = models.OneToOneField('wf.ticket', verbose_name='关联工单', on_delete=models.CASCADE, related_name='contract_ticket', null=True, blank=True) - counts = models.PositiveSmallIntegerField('合同变更次数', default=1) + counts = models.PositiveSmallIntegerField('合同变更次数', default=0) plan_renewal = models.DateField('应续签', null=True, blank=True) normal_renewal = models.DateField('正常续签', null=True, blank=True) change_date = models.IntegerField('续签/变更(年)', null=True, blank=True) diff --git a/apps/hrm/serializers.py b/apps/hrm/serializers.py index a3b1ca1d..03bc1153 100755 --- a/apps/hrm/serializers.py +++ b/apps/hrm/serializers.py @@ -421,8 +421,8 @@ class EmpContractSerializer(CustomModelSerializer): post_name = serializers.CharField(source="employee.post.name", read_only=True) dept_name = serializers.CharField(source='employee.belong_dept.name', read_only=True) gender = serializers.CharField(source="employee.gender", read_only=True) - join_date = serializers.CharField(source="employee.join_date", read_only=True) - end_contract = serializers.CharField(source="employee.end_contract_date", read_only=True) + join_date = serializers.CharField(source="employee.start_date", read_only=True) + end_contract = serializers.CharField(source="employee.contract_end_date", read_only=True) class Meta: model = EmpContract fields = '__all__' \ No newline at end of file diff --git a/apps/hrm/urls.py b/apps/hrm/urls.py index 368bcf62..b62f25f5 100755 --- a/apps/hrm/urls.py +++ b/apps/hrm/urls.py @@ -20,7 +20,7 @@ router.register('empperson', EmpPersonInfoViewSet, basename='empperson') router.register('leave', LeaveViewSet, basename='leave') router.register('transfer', TransferViewSet, basename='transfer') router.register('probation', ProbationViewSet, basename='probation') -router.register('contract', EmpContractViewSet, basename='emp_contract') +router.register('contract', EmpContractViewSet, basename='empcontract') urlpatterns = [ path(API_BASE_URL, include(router.urls)), ]