测试修改

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

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

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

@@ -107,6 +107,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
         HttpRespMsg msg = new HttpRespMsg();
         User user = userMapper.selectById(userId);
         ExpenseAuditSetting auditSetting = expenseAuditSettingMapper.selectById(user.getCompanyId());
+        ExpenseMainType expenseMainType = expenseMainTypeService.getOne(new QueryWrapper<ExpenseMainType>().eq("company_id", user.getCompanyId()).eq("name", "机械费用"));
 
 
         //管理员审核权限，有该权限则可以直接修改已审核通过的
@@ -115,7 +116,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
         boolean isNew = false;
         if (sheet.getId() == null) {
             //柘中公司
-            if (user.getCompanyId()==4811){
+            if (user.getCompanyId()==4811&&expenseMainType!=null&&sheet.getType().equals(expenseMainType.getId())){
                 sheet.setStatus(4);//未填写
                 sheet.setReviewProcess(3);//未提交
             }else {
@@ -145,7 +146,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                 return msg;
             }
         } else {
-            if(user.getCompanyId()==4811&&user.getId().equals(sheet.getOwnerId())){
+            if(user.getCompanyId()==4811&&user.getId().equals(sheet.getOwnerId())&&expenseMainType!=null&&sheet.getType().equals(expenseMainType.getId())){
                 //柘中公司
                 if (sheet.getTotalAmount() > 0) {
                     sheet.setStatus(1);//待审核
@@ -750,6 +751,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
         ExpenseSheet sheet = new ExpenseSheet();
         sheet.setId(id);
         sheet.setStatus(2);
+        sheet.setReviewProcess(4);
         sheet.setDenyReason(denyReason);
         expenseSheetMapper.updateById(sheet);