Bladeren bron

工时管家柘中需求(2)

yusm 3 maanden geleden
bovenliggende
commit
439677ce58

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

@@ -114,19 +114,25 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
         boolean isAuditor = functionDeptList.size() > 0;
         boolean isNew = false;
         if (sheet.getId() == null) {
-            if (auditSetting == null || auditSetting.getAuditType() == 0) {
-                //默认系统中设置的有审核权限的人审核
-                if (isAuditor) {
-                    sheet.setStatus(0);
-                } else {
+            //柘中公司
+            if (user.getCompanyId()==4811){
+                sheet.setStatus(4);//未填写
+                sheet.setReviewProcess(3);//未提交
+            }else {
+                if (auditSetting == null || auditSetting.getAuditType() == 0) {
+                    //默认系统中设置的有审核权限的人审核
+                    if (isAuditor) {
+                        sheet.setStatus(0);
+                    } else {
+                        sheet.setStatus(1);
+                    }
+                } else if (auditSetting.getAuditType() == 1) {
+                    //项目经理审核,默认为待审核状态
                     sheet.setStatus(1);
-                }
-            } else if (auditSetting.getAuditType() == 1) {
-                //项目经理审核,默认为待审核状态
-                sheet.setStatus(1);
-            }else if(auditSetting.getAuditType()==2){
-                if (sheet.getStatus() == null) {
-                    sheet.setStatus(1);//默认提交时为待审核状态
+                } else if (auditSetting.getAuditType() == 2) {
+                    if (sheet.getStatus() == null) {
+                        sheet.setStatus(1);//默认提交时为待审核状态
+                    }
                 }
             }
 
@@ -194,11 +200,13 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                     msg.setError("项目【"+p.getProjectName()+"】没有下拨"+settingName+"的预算");
                     return msg;
                 }
-                //计算该项目当前已经填报的费用报销的金额
-                Double sumAmount = expenseItemMapper.selectSumAmountByProjectAndType(projectId, type);
-                if (amount + sumAmount > pCurCost.getBaseAmount()) {
-                    msg.setError("项目【"+p.getProjectName()+"】的"+settingName+"费用预算不足,无法提交");
-                    return msg;
+                if (user.getCompanyId()!=4811){
+                    //计算该项目当前已经填报的费用报销的金额
+                    Double sumAmount = expenseItemMapper.selectSumAmountByProjectAndType(projectId, type);
+                    if (amount + sumAmount > pCurCost.getBaseAmount()) {
+                        msg.setError("项目【"+p.getProjectName()+"】的"+settingName+"费用预算不足,无法提交");
+                        return msg;
+                    }
                 }
             }
         }