add 会员项目 判断用户是否能操作所选年份数据
This commit is contained in:
+27
@@ -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 ServiceImpl<PayMemberProjectMapper
|
||||
private IPayIncomeContractService payIncomeContractService;
|
||||
@Resource
|
||||
private RolePermissionService rolePermissionService;
|
||||
@Resource
|
||||
private AnnualDataLockingService annualDataLockingService;
|
||||
/**
|
||||
* 保存
|
||||
*
|
||||
@@ -66,6 +69,9 @@ public class IPayMemberProjectService extends ServiceImpl<PayMemberProjectMapper
|
||||
if (integer>0){
|
||||
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<PayMemberProjectMapper
|
||||
* @return
|
||||
*/
|
||||
public void editById(PayMemberProject payMemberProject) {
|
||||
String year = payMemberProject.getParticularYear();
|
||||
//判断用户是否能操作所选年份数据
|
||||
annualDataLockingService.judgeUserYear(year);
|
||||
|
||||
String id = payMemberProject.getId();
|
||||
PayMemberProject memberProjectOld = this.getById(id);
|
||||
String year1 = memberProjectOld.getParticularYear();
|
||||
//判断用户是否能操作所选年份数据
|
||||
annualDataLockingService.judgeUserYear(year1);
|
||||
|
||||
saveOrUpdate(payMemberProject);
|
||||
}
|
||||
|
||||
@@ -93,6 +109,11 @@ public class IPayMemberProjectService extends ServiceImpl<PayMemberProjectMapper
|
||||
* @return
|
||||
*/
|
||||
public void deleteById(String id) {
|
||||
PayMemberProject memberProjectOld = this.getById(id);
|
||||
String year1 = memberProjectOld.getParticularYear();
|
||||
//判断用户是否能操作所选年份数据
|
||||
annualDataLockingService.judgeUserYear(year1);
|
||||
|
||||
LambdaQueryWrapper<PayMemberProjectSubitem> query = new LambdaQueryWrapper<>();
|
||||
query.eq(PayMemberProjectSubitem::getProjectId, id);
|
||||
List<PayMemberProjectSubitem> listPayMemberProjectSubitem = memberProjectSubitemService.list(query);
|
||||
@@ -109,6 +130,12 @@ public class IPayMemberProjectService extends ServiceImpl<PayMemberProjectMapper
|
||||
* @return
|
||||
*/
|
||||
public void deleteByIds(List<String> ids) {
|
||||
for (String id : ids) {
|
||||
PayMemberProject memberProjectOld = this.getById(id);
|
||||
String year1 = memberProjectOld.getParticularYear();
|
||||
//判断用户是否能操作所选年份数据
|
||||
annualDataLockingService.judgeUserYear(year1);
|
||||
}
|
||||
LambdaQueryWrapper<PayMemberProjectSubitem> query = new LambdaQueryWrapper<>();
|
||||
query.in(PayMemberProjectSubitem::getProjectId, ids);
|
||||
List<PayMemberProjectSubitem> listPayMemberProjectSubitem = memberProjectSubitemService.list(query);
|
||||
|
||||
+20
@@ -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<PayMemberProjec
|
||||
private PayMemberProjectMapper payMemberProjectMapper;
|
||||
@Resource
|
||||
private IPayMailBillService payMailBillService;
|
||||
@Resource
|
||||
private AnnualDataLockingService annualDataLockingService;
|
||||
/**
|
||||
* 保存
|
||||
*/
|
||||
@@ -89,6 +92,9 @@ public class IPayMemberProjectSubitemService extends ServiceImpl<PayMemberProjec
|
||||
if (memberProject == null){
|
||||
throw new JeroBootException("会员项目不存在");
|
||||
}
|
||||
String year = memberProject.getParticularYear();
|
||||
//判断用户是否能操作所选年份数据
|
||||
annualDataLockingService.judgeUserYear(year);
|
||||
String companyId = payMemberProjectSubitem.getCompanyId();
|
||||
LambdaQueryWrapper<PayMemberProjectSubitem> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.eq(PayMemberProjectSubitem::getProjectId,projectId);
|
||||
@@ -160,8 +166,16 @@ public class IPayMemberProjectSubitemService extends ServiceImpl<PayMemberProjec
|
||||
String id = payMemberProjectSubitem.getId();
|
||||
PayMemberProjectSubitem payMemberProjectSubitem1 = getById(id);
|
||||
if (payMemberProjectSubitem1 == null){
|
||||
throw new JeroBootException("项目成员不存在");
|
||||
}
|
||||
PayMemberProject memberProject = memberProjectService.getById(payMemberProjectSubitem1.getProjectId());
|
||||
if (memberProject == null){
|
||||
throw new JeroBootException("会员项目不存在");
|
||||
}
|
||||
String year = memberProject.getParticularYear();
|
||||
//判断用户是否能操作所选年份数据
|
||||
annualDataLockingService.judgeUserYear(year);
|
||||
|
||||
// 项目为打包状态 || 到账!=0 || 开票!=0 || 邮寄!=0
|
||||
if(!Objects.equals(payMemberProjectSubitem.getCompanyId(),payMemberProjectSubitem1.getCompanyId())
|
||||
&& (Objects.equals(payMemberProjectSubitem.getPack(),PayProjectCommon.PACKAGING1)
|
||||
@@ -452,6 +466,12 @@ public class IPayMemberProjectSubitemService extends ServiceImpl<PayMemberProjec
|
||||
* @Exception
|
||||
*/
|
||||
private void deleteProject(String id){
|
||||
PayMemberProjectSubitem projectSubitem = this.getById(id);
|
||||
PayMemberProject memberProject = memberProjectService.getById(projectSubitem.getProjectId());
|
||||
String year = memberProject.getParticularYear();
|
||||
//判断用户是否能操作所选年份数据
|
||||
annualDataLockingService.judgeUserYear(year);
|
||||
|
||||
PayMemberProjectSubitem payMemberProjectSubitem = memberProjectSubitemService.getById(id);
|
||||
// 到账!=0 || 开票!=0 || 邮寄!=0
|
||||
if(!Objects.equals(payMemberProjectSubitem.getInAccount(), PayProjectCommon.IN_ACCOUNT0)
|
||||
|
||||
Reference in New Issue
Block a user