From 242e7c9796675fb15fb45392889030de1fc58362 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 25 Jul 2024 17:08:57 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=99=AE=E9=80=9A=E9=A1=B9=E7=9B=AE=20?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=94=A8=E6=88=B7=E6=98=AF=E5=90=A6=E8=83=BD?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=89=80=E9=80=89=E5=B9=B4=E4=BB=BD=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayCommonProjectServiceImpl.java  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
index 22f2d62d..86db25df 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
@@ -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;
         }