Преглед на файлове

feat:结算企业的截止时间

shc преди 1 година
родител
ревизия
0ad8c1e2b1

+ 11 - 0
hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/SysDept.java

@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -43,6 +44,16 @@ public class SysDept extends Model<SysDept> {
 	@NotNull(message = "排序值不能为空")
 	private Integer sort;
 
+	/**
+	 * 服务起始时间
+	 */
+	private LocalDate issueDate;
+
+	/**
+	 * 服务截止时间
+	 */
+	private LocalDate expiryDate;
+
 	/**
 	 * 创建时间
 	 */

+ 26 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysDeptController.java

@@ -16,12 +16,15 @@ import com.qunzhixinxi.hnqz.admin.service.WmDaDrugEntService;
 import com.qunzhixinxi.hnqz.admin.service.WmDeptRegulationsService;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
+import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.time.Duration;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -51,6 +54,29 @@ public class SysDeptController {
 
 	private final WmDeptRegulationsService wmDeptRegulationsService;
 
+	/**
+	 * 获取登录用户企业的有效期
+	 *
+	 * @return 有效期信息
+	 */
+	@GetMapping("/expiry")
+	public R<Map<String, Object>> checkDeptExpiryDate(){
+
+		HnqzUser user = SecurityUtils.getUser();
+
+		SysDept sysDept = sysDeptService.getById(user.getDeptId());
+
+		LocalDate expiryDate = (sysDept != null && sysDept.getExpiryDate() != null) ?  sysDept.getExpiryDate() : LocalDate.of(2099, 12, 31);
+		long remainDays = Duration.between(LocalDate.now(), expiryDate).toDays();
+
+		Map<String, Object> res = new HashMap<>(3);
+
+		res.put("expiryDate", expiryDate);
+		res.put("remainDays",remainDays);
+
+		return R.ok(res);
+	}
+
 	/**
 	 * 通过ID查询
 	 * @param id ID