Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal

src/main/java/cn/timer/api/controller/yggl/YgglController.java

@@ -45,6 +45,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.BetweenFormater.Level;
 import cn.hutool.core.date.BetweenFormater.Level;
+import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.lang.tree.Tree;
@@ -1697,7 +1698,7 @@ public class YgglController {
 		Integer orgCode = userBean.getOrgCode();
 		Integer orgCode = userBean.getOrgCode();
 		LoginInfoDto loginInfo = LoginInfoDto.builder().build();
 		LoginInfoDto loginInfo = LoginInfoDto.builder().build();
 		YgglMainEmp ygglMainEmp = new LambdaQueryChainWrapper<YgglMainEmp>(ygglMainEmpMapper)
 		YgglMainEmp ygglMainEmp = new LambdaQueryChainWrapper<YgglMainEmp>(ygglMainEmpMapper)
-				.select(YgglMainEmp::getBmgwId, YgglMainEmp::getName, YgglMainEmp::getRzTime, YgglMainEmp::getZzTime,
+				.select(YgglMainEmp::getBmgwId, YgglMainEmp::getName, YgglMainEmp::getRzTime, YgglMainEmp::getZzTime,YgglMainEmp::getSyq,
 						YgglMainEmp::getEmpNum)
 						YgglMainEmp::getEmpNum)
 				.eq(YgglMainEmp::getEmpNum, empNum).eq(YgglMainEmp::getOrgCode, orgCode).one();
 				.eq(YgglMainEmp::getEmpNum, empNum).eq(YgglMainEmp::getOrgCode, orgCode).one();
 		if (ygglMainEmp != null) {
 		if (ygglMainEmp != null) {
@@ -1720,7 +1721,15 @@ public class YgglController {
 			loginInfo.setGwId(gw);
 			loginInfo.setGwId(gw);
 			loginInfo.setGwName(gwObj != null ? gwObj.getName() : "");
 			loginInfo.setGwName(gwObj != null ? gwObj.getName() : "");
 			loginInfo.setEntryTime(ygglMainEmp.getRzTime());
 			loginInfo.setEntryTime(ygglMainEmp.getRzTime());
-			loginInfo.setRegularTime(ygglMainEmp.getRzTime());
+			
+			if(ygglMainEmp.getSyq()!=null) {
+				System.out.println(ygglMainEmp.getSyq());
+				Date expireDate = DateUtil.offsetMonth(ygglMainEmp.getRzTime(), ygglMainEmp.getSyq()); // 时间偏移
+				loginInfo.setRegularTime(expireDate);	
+			}else {
+				loginInfo.setRegularTime(new Date());	
+			}
+			
 		}
 		}
 		return ResultUtil.data(loginInfo);
 		return ResultUtil.data(loginInfo);
 	}
 	}

src/main/java/cn/timer/api/dto/spmk/SpmkCustomApprovalDto.java

@@ -69,7 +69,7 @@ public class SpmkCustomApprovalDto {
 	private Integer assoType;
 	private Integer assoType;
 	
 	
 	@NotNull(message = "isAllvisible为空")
 	@NotNull(message = "isAllvisible为空")
-	@DecimalMax(value = "1",message = "isAllvisible 只能为 0部分可见 1所有可见 2禁用")
+	@DecimalMax(value = "2",message = "isAllvisible 只能为 0部分可见 1所有可见 2禁用")
 	@DecimalMin(value = "0",message = "isAllvisible 只能为 0部分可见 1所有可见 2禁用")
 	@DecimalMin(value = "0",message = "isAllvisible 只能为 0部分可见 1所有可见 2禁用")
 	@ApiModelProperty(value = "可见范围 0部分可见 1所有可见 2禁用", example = "1")
 	@ApiModelProperty(value = "可见范围 0部分可见 1所有可见 2禁用", example = "1")
 	private Integer isAllvisible;
 	private Integer isAllvisible;