能否销假逻辑修改

common/src/main/java/com/jpsoft/shinestar/modules/workflow/service/impl/ProcinstActUserServiceImpl.java

@@ -297,10 +297,19 @@ public class ProcinstActUserServiceImpl implements ProcinstActUserService {
                                             if(StringUtils.isNotEmpty(requestForLeaveInfo.getDays())) {
                                                 days = Double.parseDouble(requestForLeaveInfo.getDays());
                                             }
-                                            if (("1".equals(requestForLeaveInfo.getLeaveType())&&days>=4) ||"2".equals(requestForLeaveInfo.getLeaveType()) || "5".equals(requestForLeaveInfo.getLeaveType()) || "6".equals(requestForLeaveInfo.getLeaveType())){
+
+                                            if (days>=4){
                                                 requestForLeaveInfo.setEnableCancel(true);
+                                            }else {
+                                                if ("2".equals(requestForLeaveInfo.getLeaveType()) || "5".equals(requestForLeaveInfo.getLeaveType()) || "6".equals(requestForLeaveInfo.getLeaveType())) {
+                                                    requestForLeaveInfo.setEnableCancel(true);
+                                                }
                                             }
 
+                                           /* if (("1".equals(requestForLeaveInfo.getLeaveType())&&days>=4) ||"2".equals(requestForLeaveInfo.getLeaveType()) || "5".equals(requestForLeaveInfo.getLeaveType()) || "6".equals(requestForLeaveInfo.getLeaveType())){
+                                                requestForLeaveInfo.setEnableCancel(true);
+                                            }*/
+
                                         }
                                         else {
                                             //销假审核
@@ -735,9 +744,16 @@ public class ProcinstActUserServiceImpl implements ProcinstActUserService {
                                             days = Double.parseDouble(requestForLeaveInfo.getDays());
                                         }
 
-                                        if (("1".equals(requestForLeaveInfo.getLeaveType())&&days>=4) ||"2".equals(requestForLeaveInfo.getLeaveType()) || "5".equals(requestForLeaveInfo.getLeaveType()) || "6".equals(requestForLeaveInfo.getLeaveType())){
+                                        if (days>=4){
                                             requestForLeaveInfo.setEnableCancel(true);
+                                        }else {
+                                            if ("2".equals(requestForLeaveInfo.getLeaveType()) || "5".equals(requestForLeaveInfo.getLeaveType()) || "6".equals(requestForLeaveInfo.getLeaveType())) {
+                                                requestForLeaveInfo.setEnableCancel(true);
+                                            }
                                         }
+                                        /*if (("1".equals(requestForLeaveInfo.getLeaveType())&&days>=4) ||"2".equals(requestForLeaveInfo.getLeaveType()) || "5".equals(requestForLeaveInfo.getLeaveType()) || "6".equals(requestForLeaveInfo.getLeaveType())){
+                                            requestForLeaveInfo.setEnableCancel(true);
+                                        }*/
                                     }
                                     else {
                                         //销假审核