add 打包项目 判断用户是否能操作所选年份数据

jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java

@@ -155,6 +155,7 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 		if (!StringUtils.isBlank(payPackCompany.getEstimatedArrivalDate())) {
 			payPackCompany.setEstimatedArrivalDate(payPackCompany.getEstimatedArrivalDate() + "-01");
 		}
+
 		StringBuilder msg = ValidUtil.validateAll(payPackCompany);
 		if(!StringUtils.isBlank(msg)){
 			return Result.error(msg.toString());

jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java

@@ -63,28 +63,6 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
     private ISysBaseAPI sysBaseAPI;
     @Resource
     private Environment env;
-
-    /**
-     * 分页列表查询
-     *
-     * @param payPackCompanyProject
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-//	@ApiOperation(value="打包项目维护-分页列表查询", notes="打包项目维护-分页列表查询")
-//	@GetMapping(value = "/list")
-    public Result<?> queryPageList(PayPackCompanyProject payPackCompanyProject,
-                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                   HttpServletRequest req) {
-        QueryWrapper<PayPackCompanyProject> queryWrapper = QueryGenerator.initQueryWrapper(payPackCompanyProject, req.getParameterMap());
-        Page<PayPackCompanyProject> page = new Page<PayPackCompanyProject>(pageNo, pageSize);
-        IPage<PayPackCompanyProject> pageList = payPackCompanyProjectService.page(page, queryWrapper);
-        return Result.OK(pageList);
-    }
-
     /**
      * 列表查询
      *
@@ -223,61 +201,6 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
         return Result.OK("批量取消打包成功！");
     }
 
-    /**
-     * 编辑
-     *
-     * @param payPackCompanyProject
-     * @return
-     */
-//	@ApiOperation(value="pay_pack_company_project-编辑", notes="pay_pack_company_project-编辑")
-//	@PostMapping(value = "/edit")
-    public Result<?> edit(@RequestBody PayPackCompanyProject payPackCompanyProject) {
-        payPackCompanyProjectService.updateById(payPackCompanyProject);
-        return Result.OK("编辑成功!");
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-//	@ApiOperation(value="pay_pack_company_project-通过id删除", notes="pay_pack_company_project-通过id删除")
-//	@GetMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        payPackCompanyProjectService.removeById(id);
-        return Result.OK("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-//	@ApiOperation(value="pay_pack_company_project-批量删除", notes="pay_pack_company_project-批量删除")
-//	@GetMapping(value = "/deleteBatch")
-    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        this.payPackCompanyProjectService.removeByIds(Arrays.asList(ids.split(",")));
-        return Result.OK("批量删除成功!");
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-//	@ApiOperation(value="pay_pack_company_project-通过id查询", notes="pay_pack_company_project-通过id查询")
-//	@GetMapping(value = "/queryById")
-    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
-        PayPackCompanyProject payPackCompanyProject = payPackCompanyProjectService.getById(id);
-        if (payPackCompanyProject == null) {
-            return Result.error("未找到对应数据");
-        }
-        return Result.OK(payPackCompanyProject);
-    }
-
     /**
      * 导出excel
      *
@@ -336,18 +259,6 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
         return mv;
     }
 
-    /**
-     * 通过excel导入数据
-     *
-     * @param request
-     * @param response
-     * @return
-     */
-//    @PostMapping(value = "/importExcel")
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, PayPackCompanyProject.class);
-    }
-
     /**
      * 处理24年历史数据
      */

jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java

@@ -50,6 +50,7 @@ import com.jero.project.entity.PayWorkingGroupSubItem;
 import com.jero.project.mapper.PayCommonProjectMapper;
 import com.jero.project.mapper.PayWorkingGroupMapper;
 import com.jero.project.mapper.PayWorkingGroupSubItemMapper;
+import com.jero.project.service.AnnualDataLockingService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
@@ -114,6 +115,8 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
     private IPayMeetingService meetingService;
     @Resource
     private IPayMeetingSituationService meetingSituationService;
+    @Resource
+    private AnnualDataLockingService annualDataLockingService;
 
     @Override
     public List<PayCommonProject> queryListAll(PayPackCompanyProjectInput input) {
@@ -132,7 +135,8 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
         if(Objects.isNull(payPackCompany)){
             throw new JeroBootException("打包企业不存在");
         }
-
+        //判断用户是否能操作所选年份数据
+        annualDataLockingService.judgeUserYear(payPackCompany.getPackYear());
         if(StringUtils.isBlank(payPackCompanyProject.getProjectIds())){
             throw new JeroBootException("请选择项目");
         }
@@ -314,6 +318,10 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
             throw new JeroBootException("不存在打包项目！");
         }
         PayPackCompanyProject packCompanyProject = listPayPackCompanyProject.get(0);
+        String packId = packCompanyProject.getPackId();
+        PayPackCompany payPackCompany = payPackCompanyService.getById(packId);
+        //判断用户是否能操作所选年份数据
+        annualDataLockingService.judgeUserYear(payPackCompany.getPackYear());
         Integer projectType = packCompanyProject.getProjectType();
         if (Objects.equals(projectType, Integer.parseInt(PayProjectCommon.PROJECT_TYPE5))||
                 Objects.equals(projectType, Integer.parseInt(PayProjectCommon.PROJECT_TYPE6))){

jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java

@@ -21,6 +21,7 @@ import com.jero.pack.vo.PayPackCompanyProjectInput;
 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.AllMoney;
 import com.jero.temporary.entity.PayCompanyManagementTemporary;
 import com.jero.temporary.entity.PayContactsManagementTemporary;
@@ -63,6 +64,8 @@ public class PayPackCompanyServiceImpl extends ServiceImpl<PayPackCompanyMapper,
     private IPayMailBillProjectService payMailBillProjectService;
     @Resource
     private IPayMailBillService payMailBillService;
+    @Resource
+    private AnnualDataLockingService annualDataLockingService;
 
     @Override
     public IPage<PayPackCompany> queryPageList(Page<PayPackCompany> page, PayPackCompany payPackCompany) {
@@ -72,10 +75,13 @@ public class PayPackCompanyServiceImpl extends ServiceImpl<PayPackCompanyMapper,
     @Override
     @Transactional
     public PayPackCompany addPayPackCompany(PayPackCompany payPackCompany) {
+        String packYear = payPackCompany.getPackYear();
+        //判断用户是否能操作所选年份数据
+        annualDataLockingService.judgeUserYear(packYear);
         try {
             LambdaQueryWrapper<PayPackCompany> query = new LambdaQueryWrapper<>();
             query.eq(PayPackCompany::getCompanyId,payPackCompany.getCompanyId());
-            query.eq(PayPackCompany::getPackYear,payPackCompany.getPackYear());
+            query.eq(PayPackCompany::getPackYear, packYear);
             PayPackCompany payPackCompanyNew = payPackCompanyService.getOne(query);
             if(!Objects.isNull(payPackCompanyNew)){
                 throw new JeroBootException("该年份下已存在此打包企业！");
@@ -94,6 +100,11 @@ public class PayPackCompanyServiceImpl extends ServiceImpl<PayPackCompanyMapper,
     @Transactional
     public void editPayPackCompany(PayPackCompany payPackCompany) {
         PayPackCompany payPackCompanyOld = payPackCompanyService.getById(payPackCompany.getId());
+        //判断用户是否能操作所选年份数据
+        annualDataLockingService.judgeUserYear(payPackCompanyOld.getPackYear());
+        //判断用户是否能操作所选年份数据
+        annualDataLockingService.judgeUserYear(payPackCompany.getPackYear());
+
         if(Objects.isNull(payPackCompanyOld)){
             throw new JeroBootException("打包企业不存在！");
         }