Merge remote-tracking branch 'origin/dev2' into dev2

# Conflicts:
#	PCS/src/main/java/cn/cslg/permission/controller/PersonnelController.java

PCS/src/main/java/cn/cslg/permission/common/model/vo/PersonnelUpdateVO.java

@@ -0,0 +1,16 @@
+package cn.cslg.permission.common.model.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author xiexiang
+ * @Date 2024/12/16
+ */
+@Data
+public class PersonnelUpdateVO {
+    private Integer id;
+
+    private Date expitrTime;
+}

PCS/src/main/java/cn/cslg/permission/controller/PersonnelController.java

@@ -2,7 +2,6 @@ package cn.cslg.permission.controller;
 
 import cn.cslg.permission.common.core.base.Constants;
 import cn.cslg.permission.common.model.personnel.UploadPersonnelConfigDTO;
-import cn.cslg.permission.common.model.qiaobi.GetQiaoBiPersonDTO;
 import cn.cslg.permission.common.model.vo.PersonnelVO;
 import cn.cslg.permission.common.utils.Response;
 import cn.cslg.permission.common.utils.auth.checkAuth;
@@ -164,5 +163,15 @@ public class PersonnelController {
 
     }
 
+    @PostMapping("/updateExpitrTime")
+    @Operation(summary = "更新到期时间")
+    public String updateExpitrTime(@RequestBody PersonnelUpdateVO personnelUpdateVO) {
+        Boolean isSuccess = assoPersonVipTypeService.updateExpitrTime(personnelUpdateVO);
+        if (isSuccess) {
+            return Response.success();
+        } else {
+            return Response.error();
+        }
+    }
 
 }

PCS/src/main/java/cn/cslg/permission/service/PersonnelService.java

@@ -959,7 +959,7 @@ public class PersonnelService extends ServiceImpl<PersonnelMapper, Personnel> {
         Personnel personnel = this.getById(id);
         if (personnel != null) {
             personnel.setPersonnelStatus(state);
-            boolean updated = this.updateById(personnel);
+            boolean updated = personnel.updateById();
             return updated;
         } else {
             return false;

PCS/src/main/java/cn/cslg/permission/service/qiaobi/AssoPersonVipTypeService.java

@@ -1,6 +1,7 @@
 package cn.cslg.permission.service.qiaobi;
 
 import cn.cslg.permission.common.model.qiaobi.PersonVipMessVO;
+import cn.cslg.permission.common.model.vo.PersonnelUpdateVO;
 import cn.cslg.permission.common.utils.DateUtils;
 import cn.cslg.permission.domain.TenantVipType;
 import cn.cslg.permission.domain.qiaobi.AppVipType;
@@ -138,6 +139,19 @@ public class AssoPersonVipTypeService extends ServiceImpl<AssoPersonVipTypeMappe
         return  personVipMessVO;
     }
 
+
+    public Boolean updateExpitrTime(PersonnelUpdateVO personnelUpdateVO) {
+        LambdaQueryWrapper<AssoPersonVipType> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AssoPersonVipType::getPersonId, personnelUpdateVO.getId());
+        AssoPersonVipType assoPersonVipType = this.getOne(queryWrapper, false);
+        if (assoPersonVipType != null) {
+            assoPersonVipType.setExpitrTime(personnelUpdateVO.getExpitrTime());
+            assoPersonVipType.updateById();
+            return true;
+        } else {
+            return false;
+        }
+    }
 }