修改使用常量

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/constant/Constant.java

@@ -58,4 +58,6 @@ public class Constant {
     public static final String[] LEAVE_WAIT_CHECK= {"请假人","请假类型","请假时间","备注"};
     //请假审核通知
     public static final String[] LEAVE_CHECK= {"审核结果","审核人","请假时间","备注"};
+    
+    public static final Integer ZHE_ZHONG_COMPANY_ID=4811;
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.util.StringUtil;
 import com.management.platform.config.LimitRequest;
+import com.management.platform.constant.Constant;
 import com.management.platform.entity.*;
 import com.management.platform.entity.vo.MonthWorkingTimeVO;
 import com.management.platform.entity.vo.SysRichFunction;
@@ -1505,7 +1506,7 @@ public class ReportController {
                     //httpRespMsg.setError("每日工作时长不得超过"+comTimeType.getAllday()+"小时");
                     httpRespMsg.setError("每日工作时长不得少于" + comTimeType.getMinReportTime() + "小时");
                     return httpRespMsg;
-                } else if (company.getId() != 4811 && dailyWorktime > comTimeType.getMaxReportTime()) {//陕西柘中不做上限校验
+                } else if (company.getId() != Constant.ZHE_ZHONG_COMPANY_ID && dailyWorktime > comTimeType.getMaxReportTime()) {//陕西柘中不做上限校验
                     HttpRespMsg httpRespMsg = new HttpRespMsg();
                     //httpRespMsg.setError("每日工作时长不得超过"+comTimeType.getAllday()+"小时");
                     httpRespMsg.setError("每日工作时长不得超过" + comTimeType.getMaxReportTime() + "小时");
@@ -1515,7 +1516,7 @@ public class ReportController {
         }
 
         //校验填报工时
-        if (company.getId() != 4811) {
+        if (company.getId() != Constant.ZHE_ZHONG_COMPANY_ID) {
             List<Report> checkedUserDayList = new ArrayList<>();
             for (Report report : reportList) {
                 String creatorId = report.getCreatorId();

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/EquipmentOwnerServiceImpl.java

@@ -1,6 +1,7 @@
 package com.management.platform.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.management.platform.constant.Constant;
 import com.management.platform.entity.EquipmentOwner;
 import com.management.platform.entity.ExpenseSheet;
 import com.management.platform.entity.User;
@@ -41,7 +42,7 @@ public class EquipmentOwnerServiceImpl extends ServiceImpl<EquipmentOwnerMapper,
         HttpRespMsg msg = new HttpRespMsg();
         String token = request.getHeader("TOKEN");
         User user = userMapper.selectById(token);
-        if (user.getCompanyId()!=4811){
+        if (user.getCompanyId()!= Constant.ZHE_ZHONG_COMPANY_ID){
             msg.setError("该公司无需操作设备归属人");
             return msg;
         }
@@ -86,7 +87,7 @@ public class EquipmentOwnerServiceImpl extends ServiceImpl<EquipmentOwnerMapper,
         HttpRespMsg msg = new HttpRespMsg();
         String token = request.getHeader("TOKEN");
         User user = userMapper.selectById(token);
-        if (user.getCompanyId()!=4811){
+        if (user.getCompanyId()!=Constant.ZHE_ZHONG_COMPANY_ID){
             msg.setData(new ArrayList<EquipmentOwner>());
         }else {
             List<EquipmentOwner> selectedList = equipmentOwnerMapper.selectList(new QueryWrapper<EquipmentOwner>().eq("company_id", user.getCompanyId()));

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ExpenseSheetServiceImpl.java

@@ -116,7 +116,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
         boolean isNew = false;
         if (sheet.getId() == null) {
             //柘中公司
-            if (user.getCompanyId()==4811&&expenseMainType!=null&&sheet.getType().equals(expenseMainType.getId())){
+            if (user.getCompanyId()==Constant.ZHE_ZHONG_COMPANY_ID&&expenseMainType!=null&&sheet.getType().equals(expenseMainType.getId())){
                 sheet.setStatus(4);//未填写
                 sheet.setReviewProcess(3);//未提交
             }else {
@@ -146,7 +146,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                 return msg;
             }
         } else {
-            if(user.getCompanyId()==4811&&user.getId().equals(sheet.getOwnerId())&&expenseMainType!=null&&sheet.getType().equals(expenseMainType.getId())){
+            if(user.getCompanyId()==Constant.ZHE_ZHONG_COMPANY_ID&&user.getId().equals(sheet.getOwnerId())&&expenseMainType!=null&&sheet.getType().equals(expenseMainType.getId())){
                 //柘中公司
                 if (sheet.getTotalAmount() > 0) {
                     sheet.setStatus(1);//待审核
@@ -214,7 +214,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                     msg.setError("项目【"+p.getProjectName()+"】没有下拨"+settingName+"的预算");
                     return msg;
                 }
-                if (user.getCompanyId()!=4811){
+                if (user.getCompanyId()!=Constant.ZHE_ZHONG_COMPANY_ID){
                     //计算该项目当前已经填报的费用报销的金额
                     Double sumAmount = expenseItemMapper.selectSumAmountByProjectAndType(projectId, type);
                     if (amount + sumAmount > pCurCost.getBaseAmount()) {
@@ -564,7 +564,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                 return httpRespMsg;
             }
         }else {
-            if (user.getCompanyId()==4811&& org.apache.commons.lang3.StringUtils.isNotEmpty(user.getRoleName())&&user.getRoleName().equals("费用管理员")){
+            if (user.getCompanyId()==Constant.ZHE_ZHONG_COMPANY_ID&& org.apache.commons.lang3.StringUtils.isNotEmpty(user.getRoleName())&&user.getRoleName().equals("费用管理员")){
                 queryWrapper.eq("operator_id",user.getId());
             }
             IPage<ExpenseSheet> listIPager = expenseSheetMapper.selectPage(new Page<>(pageIndex, pageSize),
@@ -722,7 +722,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
             }else if(sheet.getReviewProcess()!=null&&sheet.getReviewProcess()==1){
                 sheet.setReviewProcess(2);
                 sheet.setStatus(0);
-            }else if(sheet.getReviewProcess()!=null&&sheet.getReviewProcess()==0&&user.getCompanyId()==4811){
+            }else if(sheet.getReviewProcess()!=null&&sheet.getReviewProcess()==0&&user.getCompanyId()==Constant.ZHE_ZHONG_COMPANY_ID){
                 sheet.setReviewProcess(2);
                 sheet.setStatus(0);
             }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.ImmutableMap;
+import com.management.platform.constant.Constant;
 import com.management.platform.entity.*;
 import com.management.platform.entity.vo.*;
 import com.management.platform.mapper.*;
@@ -1694,7 +1695,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         TimeType timeType = timeTypeMapper.selectById(user.getCompanyId());
         Company company = companyMapper.selectById(companyId);
         boolean isNew = true;
-        if (companyId==4811&&projectMainId==null){
+        if (companyId== Constant.ZHE_ZHONG_COMPANY_ID&&projectMainId==null){
             httpRespMsg.setError("请选择主项目");
             return httpRespMsg;
         }
@@ -3871,7 +3872,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         String[] statusNames = {"-",MessageUtils.message("excel.onGoing"),MessageUtils.message("excel.complete"),MessageUtils.message("excel.revoke"),MessageUtils.message("excel.pause")};
         List<List<String>> exportList = new ArrayList<>();
         List<ProjectMain> projectMainList=new ArrayList<>();
-        if (user.getCompanyId()==4811){
+        if (user.getCompanyId()==Constant.ZHE_ZHONG_COMPANY_ID){
             String[] titles = {MessageUtils.message("entry.projectId"),"主项目", MessageUtils.message("entry.projectName"),
                     MessageUtils.message("excel.charge"), MessageUtils.message("excel.projectAmount")+"(元)", MessageUtils.message("leave.status")
                     ,MessageUtils.message("excel.planStart"), MessageUtils.message("excel.planEnd"),
@@ -3891,7 +3892,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         for (Project project : projectList) {
             List<String> data = new ArrayList<>();
             data.add(project.getProjectCode() == null?"":project.getProjectCode());
-            if (user.getCompanyId()==4811){
+            if (user.getCompanyId()==Constant.ZHE_ZHONG_COMPANY_ID){
                 Optional<ProjectMain> first = projectMainList.stream().filter(pm -> project.getProjectMainId() != null && pm.getId().equals(project.getProjectMainId())).findFirst();
                 if (first.isPresent()){
                     data.add(org.apache.commons.lang3.StringUtils.isEmpty(first.get().getName())?"":first.get().getName());
@@ -4465,7 +4466,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         //获取表头
         List<ExpenseMainType> mainTypeList = expenseMainTypeMapper.selectList(new QueryWrapper<ExpenseMainType>().eq("company_id", companyId));
         List<Project> projectList=new ArrayList<>();
-        if (user.getCompanyId()==4811){
+        if (user.getCompanyId()==Constant.ZHE_ZHONG_COMPANY_ID){
             projectList = projectMapper.getProjectInAndOut(companyId, null, null, projectId,inchagerIds,projectMainId);
         }else {
             projectList = projectMapper.getProjectInAndOut(companyId, null, null, null,inchagerIds,null);
@@ -4481,7 +4482,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         }
 
         List<List<String>> exportList = new ArrayList<>();
-        if (user.getCompanyId()==4811){
+        if (user.getCompanyId()==Constant.ZHE_ZHONG_COMPANY_ID){
             String[] titles = {"项目编号","主项目","项目名称","合同金额(元)","总费用","利润","利润率","","人工成本"};
             ArrayList<String> strings = Lists.newArrayList(titles);
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -2704,7 +2704,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         HttpRespMsg msg = new HttpRespMsg();
         String token = request.getHeader("TOKEN");
         User user = userMapper.selectById(token);
-        if (user.getCompanyId()!=4811){
+        if (user.getCompanyId()!=Constant.ZHE_ZHONG_COMPANY_ID){
             msg.setError("该公司无需添加机械费用下发人员");
             return msg;
         }else {
@@ -2730,7 +2730,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         HttpRespMsg msg = new HttpRespMsg();
         String token = request.getHeader("TOKEN");
         User user = userMapper.selectById(token);
-        if (user.getCompanyId()!=4811){
+        if (user.getCompanyId()!=Constant.ZHE_ZHONG_COMPANY_ID){
             msg.setError("该公司无需删除机械费用下发人员");
             return msg;
         }else {
@@ -2754,7 +2754,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         HttpRespMsg msg = new HttpRespMsg();
         String token = request.getHeader("TOKEN");
         User user = userMapper.selectById(token);
-        if (user.getCompanyId()!=4811){
+        if (user.getCompanyId()!=Constant.ZHE_ZHONG_COMPANY_ID){
             msg.setData(new ArrayList<User>());
             return msg;
         }else {