diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectService.java index b4ebb44b..ef4df466 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectService.java @@ -18,6 +18,7 @@ import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.mapper.SysUserMapper; import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.PayCommonProject; +import com.jero.project.service.AnnualDataLockingService; import org.apache.commons.collections.CollectionUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -51,6 +52,8 @@ public class IPayMemberProjectService extends ServiceImpl0){ throw new JeroBootException("项目名称重复"); } + String year = payMemberProject.getParticularYear(); + //判断用户是否能操作所选年份数据 + annualDataLockingService.judgeUserYear(year); //判断联系人 String directorId = payMemberProject.getDirectorId(); SysUser sysUser = userMapper.selectById(directorId); @@ -83,6 +89,16 @@ public class IPayMemberProjectService extends ServiceImpl query = new LambdaQueryWrapper<>(); query.eq(PayMemberProjectSubitem::getProjectId, id); List listPayMemberProjectSubitem = memberProjectSubitemService.list(query); @@ -109,6 +130,12 @@ public class IPayMemberProjectService extends ServiceImpl ids) { + for (String id : ids) { + PayMemberProject memberProjectOld = this.getById(id); + String year1 = memberProjectOld.getParticularYear(); + //判断用户是否能操作所选年份数据 + annualDataLockingService.judgeUserYear(year1); + } LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.in(PayMemberProjectSubitem::getProjectId, ids); List listPayMemberProjectSubitem = memberProjectSubitemService.list(query); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java index 8da6e752..e8c24c38 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java @@ -30,6 +30,7 @@ import com.jero.member.service.IPayMemberProjectSubitemService; import com.jero.pack.entity.PayPackCompanyProject; import com.jero.pack.service.IPayPackCompanyProjectService; import com.jero.project.common.PayProjectCommon; +import com.jero.project.service.AnnualDataLockingService; import com.jero.temporary.entity.PayCompanyManagementTemporary; import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.service.IPayCompanyManagementTemporaryService; @@ -80,6 +81,8 @@ public class IPayMemberProjectSubitemService extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(PayMemberProjectSubitem::getProjectId,projectId); @@ -160,8 +166,16 @@ public class IPayMemberProjectSubitemService extends ServiceImpl