diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java index 3269762a..c1ec582f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java @@ -20,6 +20,7 @@ import com.jero.company.entity.PayCompanyManagement; import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; +import com.jero.member.entity.TbMemberProject; import com.jero.member.entity.TbMemberProjectSubitem; import com.jero.member.service.ITbMemberProjectSubitemService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectService.java index b872bdee..f54653d0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectService.java @@ -18,6 +18,7 @@ import com.jero.member.entity.TbMemberProjectSubitem; import com.jero.member.mapper.TbMemberProjectMapper; import com.jero.member.service.ITbMemberProjectService; import com.jero.member.service.ITbMemberProjectSubitemService; +import com.jero.project.service.AnnualDataLockingService; import org.apache.commons.collections.CollectionUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -53,12 +54,16 @@ public class ITbMemberProjectService extends ServiceImpl query = new LambdaQueryWrapper<>(); query.eq(TbMemberProjectSubitem::getProjectId, id); List listTbMemberProjectSubitem = tbMemberProjectSubitemService.list(query); @@ -111,6 +130,12 @@ public class ITbMemberProjectService extends ServiceImpl ids) { + List tbMemberProjects = this.listByIds(ids); + for (TbMemberProject memberProjectOld : tbMemberProjects) { + String oldYear = memberProjectOld.getYear(); + //判断用户是否能操作所选年份数据 + annualDataLockingService.judgeUserYear(oldYear); + } LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.in(TbMemberProjectSubitem::getProjectId, ids); List listTbMemberProjectSubitem = tbMemberProjectSubitemService.list(query); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java index 40a6afab..8badfc76 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java @@ -51,6 +51,7 @@ import com.jero.payment.service.impl.PayConfirmPaymentRecordService; import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.PayCommonProject; import com.jero.project.entity.PayWorkingGroupSubItem; +import com.jero.project.service.AnnualDataLockingService; import com.jero.statistics.entity.MemberLineChartMap; import com.jero.statistics.entity.MemberLineChartVO; import com.jero.statistics.entity.MemberPieChartVO; @@ -113,11 +114,19 @@ public class ITbMemberProjectSubitemService extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(TbMemberProjectSubitem::getProjectId, projectId); wrapper.eq(TbMemberProjectSubitem::getCompanyId, companyId); @@ -200,6 +208,10 @@ public class ITbMemberProjectSubitemService extends ServiceImpl excelData) { + TbMemberProject memberProject = tbMemberProjectService.getById(projectId); + String oldYear = memberProject.getYear(); + //判断用户是否能操作所选年份数据 + annualDataLockingService.judgeUserYear(oldYear); int errorRowNum = 2; List insertList = new ArrayList<>(); List errorMessage = new ArrayList<>(); @@ -423,6 +435,11 @@ public class ITbMemberProjectSubitemService extends ServiceImpl wrapper1 = new LambdaQueryWrapper<>(); wrapper1.eq(PayPaymentRecord::getProjectId,id); @@ -695,6 +717,9 @@ public class ITbMemberProjectSubitemService extends ServiceImpl