add 普通项目 判断用户是否能操作所选年份数据
This commit is contained in:
+14
@@ -29,6 +29,7 @@ import com.jero.pack.entity.PayPackCompanyProject;
|
||||
import com.jero.pack.service.IPayPackCompanyProjectService;
|
||||
import com.jero.payment.service.IPayPaymentCheckService;
|
||||
import com.jero.project.common.PayProjectCommon;
|
||||
import com.jero.project.service.AnnualDataLockingService;
|
||||
import com.jero.project.service.IPayCommonProjectService;
|
||||
import com.jero.project.entity.PayCommonProject;
|
||||
import com.jero.project.mapper.PayCommonProjectMapper;
|
||||
@@ -85,6 +86,8 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
|
||||
private IPayPaymentCheckService payPaymentCheckService;
|
||||
@Resource
|
||||
private IPayMailBillService payMailBillService;
|
||||
@Resource
|
||||
private AnnualDataLockingService annualDataLockingService;
|
||||
|
||||
|
||||
|
||||
@@ -110,6 +113,9 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
|
||||
throw new JeroBootException("来款项目已存在!");
|
||||
}
|
||||
setPayCommonProjectAdd(payCommonProject);
|
||||
String year = payCommonProject.getYear();
|
||||
//判断用户是否能操作所选年份数据
|
||||
annualDataLockingService.judgeUserYear(year);
|
||||
payCommonProject.setInAccount(PayProjectCommon.IN_ACCOUNT0);
|
||||
payCommonProject.setMakeInvoice(PayProjectCommon.MAKE_INVOICE0);
|
||||
payCommonProject.setMail(PayProjectCommon.MAIL0);
|
||||
@@ -178,6 +184,10 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
|
||||
if(Objects.equals(payCommonProjectOld.getPack(),PayProjectCommon.PACKAGING1)){
|
||||
throw new JeroBootException("项目已打包,不可编辑!");
|
||||
}
|
||||
|
||||
String year = payCommonProjectOld.getYear();
|
||||
//判断用户是否能操作所选年份数据
|
||||
annualDataLockingService.judgeUserYear(year);
|
||||
// 项目为打包状态 || 到账!=0 || 开票!=0 || 邮寄!=0
|
||||
if(!Objects.equals(payCommonProject.getChargeCompanyId(),payCommonProjectOld.getChargeCompanyId())
|
||||
&& (Objects.equals(payCommonProject.getPack(),PayProjectCommon.PACKAGING1)
|
||||
@@ -330,6 +340,10 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
|
||||
if(!rolePermissionService.getRolePermission(perms) && !Objects.equals(payCommonProject.getPrincipalId(), sysUser.getId())){
|
||||
sb.append(payCommonProject.getChargeProject() + "项目不可操作!<br/>");
|
||||
}
|
||||
|
||||
String year = payCommonProject.getYear();
|
||||
//判断用户是否能操作所选年份数据
|
||||
annualDataLockingService.judgeUserYear(year);
|
||||
if(!StringUtils.isEmpty(sb)){
|
||||
return sb;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user