add 标协会员项目 判断用户是否能操作所选年份数据
This commit is contained in:
+1
@@ -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;
|
||||
|
||||
+26
-1
@@ -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<TbMemberProjectMapper,
|
||||
private RolePermissionService rolePermissionService;
|
||||
@Resource
|
||||
private IPayMeetingService meetingService;
|
||||
@Resource
|
||||
private AnnualDataLockingService annualDataLockingService;
|
||||
/**
|
||||
* 保存
|
||||
*/
|
||||
public void add(TbMemberProject tbMemberProject) {
|
||||
//一年只能有一个项目
|
||||
String year = tbMemberProject.getYear();
|
||||
//判断用户是否能操作所选年份数据
|
||||
annualDataLockingService.judgeUserYear(year);
|
||||
check(year, null);
|
||||
save(tbMemberProject);
|
||||
}
|
||||
@@ -80,10 +85,19 @@ public class ITbMemberProjectService extends ServiceImpl<TbMemberProjectMapper,
|
||||
* 更新
|
||||
*/
|
||||
public void editById(TbMemberProject tbMemberProject) {
|
||||
//一年只能有一个项目
|
||||
String year = tbMemberProject.getYear();
|
||||
|
||||
//判断用户是否能操作所选年份数据
|
||||
annualDataLockingService.judgeUserYear(year);
|
||||
String id = tbMemberProject.getId();
|
||||
//一年只能有一个项目
|
||||
check(year, id);
|
||||
|
||||
TbMemberProject memberProjectOld = this.getById(id);
|
||||
String oldYear = memberProjectOld.getYear();
|
||||
//判断用户是否能操作所选年份数据
|
||||
annualDataLockingService.judgeUserYear(oldYear);
|
||||
|
||||
saveOrUpdate(tbMemberProject);
|
||||
}
|
||||
|
||||
@@ -91,6 +105,11 @@ public class ITbMemberProjectService extends ServiceImpl<TbMemberProjectMapper,
|
||||
* 通过id删除
|
||||
*/
|
||||
public void deleteById(String id) {
|
||||
TbMemberProject memberProjectOld = this.getById(id);
|
||||
String oldYear = memberProjectOld.getYear();
|
||||
//判断用户是否能操作所选年份数据
|
||||
annualDataLockingService.judgeUserYear(oldYear);
|
||||
|
||||
LambdaQueryWrapper<TbMemberProjectSubitem> query = new LambdaQueryWrapper<>();
|
||||
query.eq(TbMemberProjectSubitem::getProjectId, id);
|
||||
List<TbMemberProjectSubitem> listTbMemberProjectSubitem = tbMemberProjectSubitemService.list(query);
|
||||
@@ -111,6 +130,12 @@ public class ITbMemberProjectService extends ServiceImpl<TbMemberProjectMapper,
|
||||
* 批量删除
|
||||
*/
|
||||
public void deleteByIds(List<String> ids) {
|
||||
List<TbMemberProject> tbMemberProjects = this.listByIds(ids);
|
||||
for (TbMemberProject memberProjectOld : tbMemberProjects) {
|
||||
String oldYear = memberProjectOld.getYear();
|
||||
//判断用户是否能操作所选年份数据
|
||||
annualDataLockingService.judgeUserYear(oldYear);
|
||||
}
|
||||
LambdaQueryWrapper<TbMemberProjectSubitem> query = new LambdaQueryWrapper<>();
|
||||
query.in(TbMemberProjectSubitem::getProjectId, ids);
|
||||
List<TbMemberProjectSubitem> listTbMemberProjectSubitem = tbMemberProjectSubitemService.list(query);
|
||||
|
||||
+29
-1
@@ -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<TbMemberProjectS
|
||||
private ISysBaseAPI sysBaseAPI;
|
||||
@Resource
|
||||
private PayMeetingSituationMapper payMeetingSituationMapper;
|
||||
@Resource
|
||||
private AnnualDataLockingService annualDataLockingService;
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*/
|
||||
public void add(TbMemberProjectSubitem tbMemberProjectSubitem) {
|
||||
String projectId = tbMemberProjectSubitem.getProjectId();
|
||||
TbMemberProject memberProject = tbMemberProjectService.getById(projectId);
|
||||
String oldYear = memberProject.getYear();
|
||||
//判断用户是否能操作所选年份数据
|
||||
annualDataLockingService.judgeUserYear(oldYear);
|
||||
|
||||
setDefaultCreateValue(tbMemberProjectSubitem);
|
||||
|
||||
String companyId = tbMemberProjectSubitem.getCompanyId();
|
||||
@@ -137,7 +146,6 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
|
||||
throw new JeroBootException("邮寄联系人不存在");
|
||||
}
|
||||
|
||||
String projectId = tbMemberProjectSubitem.getProjectId();
|
||||
LambdaQueryWrapper<TbMemberProjectSubitem> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.eq(TbMemberProjectSubitem::getProjectId, projectId);
|
||||
wrapper.eq(TbMemberProjectSubitem::getCompanyId, companyId);
|
||||
@@ -200,6 +208,10 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
|
||||
}
|
||||
}
|
||||
public void addExcel(String projectId, List<Object> excelData) {
|
||||
TbMemberProject memberProject = tbMemberProjectService.getById(projectId);
|
||||
String oldYear = memberProject.getYear();
|
||||
//判断用户是否能操作所选年份数据
|
||||
annualDataLockingService.judgeUserYear(oldYear);
|
||||
int errorRowNum = 2;
|
||||
List<TbMemberProjectSubitem> insertList = new ArrayList<>();
|
||||
List<String> errorMessage = new ArrayList<>();
|
||||
@@ -423,6 +435,11 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
|
||||
public void editById(TbMemberProjectSubitem tbMemberProjectSubitem) {
|
||||
String subitemId = tbMemberProjectSubitem.getId();
|
||||
TbMemberProjectSubitem subitemOld = getById(subitemId);
|
||||
TbMemberProject memberProject = tbMemberProjectService.getById(subitemOld.getProjectId());
|
||||
String oldYear = memberProject.getYear();
|
||||
//判断用户是否能操作所选年份数据
|
||||
annualDataLockingService.judgeUserYear(oldYear);
|
||||
|
||||
String companyId = tbMemberProjectSubitem.getCompanyId();
|
||||
String companyIdOld = subitemOld.getCompanyId();
|
||||
if (!Objects.equals(companyId,companyIdOld)){
|
||||
@@ -490,6 +507,11 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
|
||||
* @Exception
|
||||
*/
|
||||
public void deleteProject(String id){
|
||||
TbMemberProjectSubitem subitemOld = getById(id);
|
||||
TbMemberProject memberProject = tbMemberProjectService.getById(subitemOld.getProjectId());
|
||||
String oldYear = memberProject.getYear();
|
||||
//判断用户是否能操作所选年份数据
|
||||
annualDataLockingService.judgeUserYear(oldYear);
|
||||
//删除到账
|
||||
LambdaQueryWrapper<PayPaymentRecord> wrapper1 = new LambdaQueryWrapper<>();
|
||||
wrapper1.eq(PayPaymentRecord::getProjectId,id);
|
||||
@@ -695,6 +717,9 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
|
||||
String projectId = copyMemberVO.getProjectId();
|
||||
String id = copyMemberVO.getId();
|
||||
TbMemberProject memberProject = tbMemberProjectService.getById(projectId);
|
||||
String oldYear = memberProject.getYear();
|
||||
//判断用户是否能操作所选年份数据
|
||||
annualDataLockingService.judgeUserYear(oldYear);
|
||||
copyOperation(memberProject, id);
|
||||
}
|
||||
|
||||
@@ -725,6 +750,9 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
|
||||
String projectId = copyMemberVO.getProjectId();
|
||||
String ids = copyMemberVO.getIds();
|
||||
TbMemberProject memberProject = tbMemberProjectService.getById(projectId);
|
||||
String oldYear = memberProject.getYear();
|
||||
//判断用户是否能操作所选年份数据
|
||||
annualDataLockingService.judgeUserYear(oldYear);
|
||||
for (String id : ids.split(",")) {
|
||||
copyOperation(memberProject, id);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user