工时管家柘中需求(3)

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/ExpenseSheet.java

@@ -77,7 +77,7 @@ public class ExpenseSheet extends Model<ExpenseSheet> {
     private Integer type;
 
     /**
-     * 0-审核通过，1-待审核，2-驳回,3-已撤回
+     * 0-审核通过，1-待审核，2-驳回,3-已撤回 4-未填写
      */
     @TableField("status")
     private Integer status;
@@ -125,7 +125,7 @@ public class ExpenseSheet extends Model<ExpenseSheet> {
     private String secondCheckerId;
 
     /**
-     * 0-待第一审核人审核 1-待第二审核人审核 2-审核完成
+     * 0-待第一审核人审核 1-待第二审核人审核 2-审核完成 3-未提交
      */
     @TableField("review_process")
     private Integer reviewProcess;

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

@@ -145,20 +145,28 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                 return msg;
             }
         } else {
-            //如果是驳回状态，改成待审核，否则不变
-            if (sheet.getStatus() == 2) {
-                if (auditSetting == null || auditSetting.getAuditType() == 0) {
-                    //默认系统中设置的有审核权限的人审核
-                    if (isAuditor) {
-                        sheet.setStatus(0);
-                    } else {
+            if(user.getCompanyId()==4811&&user.getId().equals(sheet.getOwnerId())){
+                //柘中公司
+                if (sheet.getTotalAmount() > 0) {
+                    sheet.setStatus(1);//待审核
+                    sheet.setReviewProcess(0);//待第一审核人审核
+                }
+            }else {
+                //如果是驳回状态，改成待审核，否则不变
+                if (sheet.getStatus() == 2) {
+                    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() == 2) {
+                        sheet.setStatus(1);//修改为待审核状态
                     }
-                } else if (auditSetting.getAuditType() == 1) {
-                    //项目经理审核，默认为待审核状态
-                    sheet.setStatus(1);
-                }else if (auditSetting.getAuditType() == 2) {
-                    sheet.setStatus(1);//修改为待审核状态
                 }
             }
         }
@@ -650,7 +658,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
         ExpenseSheet sheet = expenseSheetMapper.selectById(id);
         ExpenseAuditSetting expenseAuditSetting = expenseAuditSettingMapper.selectById(user.getCompanyId());
         if(expenseAuditSetting!=null&&expenseAuditSetting.getAuditType()==2){
-            if(sheet.getReviewProcess()!=null&&sheet.getReviewProcess()==0){
+            if(sheet.getReviewProcess()!=null&&sheet.getReviewProcess()==0&& org.apache.commons.lang3.StringUtils.isNotEmpty(sheet.getSecondCheckerId())){
                 sheet.setReviewProcess(1);
                 sheet.setStatus(1);
                 //发送审核消息给第二审核人
@@ -705,6 +713,9 @@ 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){
+                sheet.setReviewProcess(2);
+                sheet.setStatus(0);
             }
         }else {
             sheet.setStatus(0);