重置流程逻辑

pro-base/src/main/java/com/idea/oa/apply/controller/ApplyBuyingMoreController.java

@@ -102,7 +102,7 @@ public class ApplyBuyingMoreController extends BaseController {
             //添加判断条件
             HashMap<String, Object> feeMoneyTotalMap = null;//new HashMap<>();
 
-            isOkString = flowMainService.doConfirmResult(addConfirmResult, ConstantFlowType.BUYING_MORE_DEPLOYMENTID, ConstantFlowType.BUYING_MORE, flowMainPush, feeMoneyTotalMap);
+            isOkString = flowMainService.doConfirmResult(addConfirmResult, ConstantFlowType.BUYING_MORE_DEPLOYMENTID, ConstantFlowType.BUYING_MORE, flowMainPush, feeMoneyTotalMap,null);
             if (!"ok_end".equals(isOkString) && !"ok_noEnd".equals(isOkString)) {
                 return AjaxResult.error(isOkString);
             }

pro-base/src/main/java/com/idea/oa/apply/controller/ApplyCheckInController.java

@@ -101,7 +101,7 @@ public class ApplyCheckInController extends BaseController {
             //添加判断条件
             HashMap<String, Object> feeMoneyTotalMap = null;//new HashMap<>();
 
-            isOkString = flowMainService.doConfirmResult(addConfirmResult, ConstantFlowType.CHECK_IN_DEPLOYMENTID, ConstantFlowType.CHECK_IN, flowMainPush, feeMoneyTotalMap);
+            isOkString = flowMainService.doConfirmResult(addConfirmResult, ConstantFlowType.CHECK_IN_DEPLOYMENTID, ConstantFlowType.CHECK_IN, flowMainPush, feeMoneyTotalMap,null);
             if (!"ok_end".equals(isOkString) && !"ok_noEnd".equals(isOkString)) {
                 return AjaxResult.error(isOkString);
             }

pro-base/src/main/java/com/idea/oa/apply/controller/ApplyContractController.java

@@ -101,7 +101,7 @@ public class ApplyContractController extends BaseController {
             //添加判断条件
             HashMap<String, Object> feeMoneyTotalMap = null;//new HashMap<>();
 
-            isOkString = flowMainService.doConfirmResult(addConfirmResult, ConstantFlowType.CONTRACT_DEPLOYMENTID, ConstantFlowType.CONTRACT, flowMainPush, feeMoneyTotalMap);
+            isOkString = flowMainService.doConfirmResult(addConfirmResult, ConstantFlowType.CONTRACT_DEPLOYMENTID, ConstantFlowType.CONTRACT, flowMainPush, feeMoneyTotalMap,null);
             if (!"ok_end".equals(isOkString) && !"ok_noEnd".equals(isOkString)) {
                 return AjaxResult.error(isOkString);
             }

pro-base/src/main/java/com/idea/oa/apply/controller/ApplyFinanceController.java

@@ -104,7 +104,7 @@ public class ApplyFinanceController extends BaseController {
             //添加判断条件
             HashMap<String, Object> feeMoneyTotalMap = null;//new HashMap<>();
 
-            isOkString = flowMainService.doConfirmResult(addConfirmResult, ConstantFlowType.FINANCE_DEPLOYMENTID, ConstantFlowType.FINANCE, flowMainPush, feeMoneyTotalMap);
+            isOkString = flowMainService.doConfirmResult(addConfirmResult, ConstantFlowType.FINANCE_DEPLOYMENTID, ConstantFlowType.FINANCE, flowMainPush, feeMoneyTotalMap,null);
             if (!"ok_end".equals(isOkString) && !"ok_noEnd".equals(isOkString)) {
                 return AjaxResult.error(isOkString);
             }

pro-base/src/main/java/com/idea/oa/apply/controller/ApplyInvoiceRedController.java

@@ -103,7 +103,7 @@ public class ApplyInvoiceRedController extends BaseController {
             //添加判断条件
             HashMap<String, Object> feeMoneyTotalMap = null;//new HashMap<>();
 
-            isOkString = flowMainService.doConfirmResult(addConfirmResult, ConstantFlowType.INVOICE_RED_DEPLOYMENTID, ConstantFlowType.INVOICE_RED, flowMainPush, feeMoneyTotalMap);
+            isOkString = flowMainService.doConfirmResult(addConfirmResult, ConstantFlowType.INVOICE_RED_DEPLOYMENTID, ConstantFlowType.INVOICE_RED, flowMainPush, feeMoneyTotalMap,null);
             if (!"ok_end".equals(isOkString) && !"ok_noEnd".equals(isOkString)) {
                 return AjaxResult.error(isOkString);
             }

pro-base/src/main/java/com/idea/oa/apply/controller/ApplyPaymentSettleController.java

@@ -120,7 +120,7 @@ public class ApplyPaymentSettleController extends BaseController {
             //添加判断条件
             HashMap<String, Object> feeMoneyTotalMap = null;//new HashMap<>();
 
-            isOkString = flowMainService.doConfirmResult(addConfirmResult, ConstantFlowType.PAYMENT_DEPLOYMENTID, ConstantFlowType.PAYMENT, flowMainPush, feeMoneyTotalMap);
+            isOkString = flowMainService.doConfirmResult(addConfirmResult, ConstantFlowType.PAYMENT_DEPLOYMENTID, ConstantFlowType.PAYMENT, flowMainPush, feeMoneyTotalMap,null);
             if (!"ok_end".equals(isOkString) && !"ok_noEnd".equals(isOkString)) {
                 return AjaxResult.error(isOkString);
             }

pro-base/src/main/java/com/idea/oa/apply/controller/ApplyReceivablesAdjustController.java

@@ -104,7 +104,7 @@ public class ApplyReceivablesAdjustController extends BaseController {
             //添加判断条件
             HashMap<String, Object> feeMoneyTotalMap = null;//new HashMap<>();
 
-            isOkString = flowMainService.doConfirmResult(addConfirmResult, ConstantFlowType.RECEIVABLES_ADJUST_DEPLOYMENTID, ConstantFlowType.RECEIVABLES_ADJUST, flowMainPush, feeMoneyTotalMap);
+            isOkString = flowMainService.doConfirmResult(addConfirmResult, ConstantFlowType.RECEIVABLES_ADJUST_DEPLOYMENTID, ConstantFlowType.RECEIVABLES_ADJUST, flowMainPush, feeMoneyTotalMap,null);
             if (!"ok_end".equals(isOkString) && !"ok_noEnd".equals(isOkString)) {
                 return AjaxResult.error(isOkString);
             }

pro-base/src/main/java/com/idea/oa/flow2/controller/FlowMainController.java

@@ -16,8 +16,7 @@ import com.idea.oa.flow2.model.out.IMGFlowHistoryInfo;
 import com.idea.oa.flow2.service.FlowMainLogService;
 import com.idea.oa.flow2.service.FlowMainPushService;
 import com.idea.oa.flow2.service.FlowMainService;
-import com.idea.oa.holidayManagement.model.HolidayManagement;
-import com.idea.oa.holidayManagement.service.HolidayManagementService;
+
 import com.rockstar.common.base.BaseController;
 import com.rockstar.common.domain.AjaxResult;
 import com.rockstar.flow.exception.FlowException;
@@ -55,12 +54,7 @@ import java.util.List;
 public class FlowMainController extends BaseController {
 
 
-    @Autowired
-    private HolidayManagementService holidayManagementService;
-
 
-//    @Autowired
-//    private ApplyAddWorkTimeService applyAddWorkTimeService;
 
     //上面是业务中的信息,嵌入的业务信息了,以后可以考虑搬离
 
@@ -802,52 +796,7 @@ public class FlowMainController extends BaseController {
 
             FlowMainLog flowMainLog = flowMainLogService.selectByPrimaryKey(flowMain.getLastMainLogId());
             if (flowMainLog.getAuditResult().equals("1")) {//最后的操作是同意操作
-                 if (flowMain.getFlowType().equals(ConstantFlowType.ADD_WORK)) {
-                    //加班进行回滚
-//                    ApplyAddWorkTimeExample example = new ApplyAddWorkTimeExample();
-//                    example.createCriteria().andAddWorkIdEqualTo(flowMain.getFormId());
-//                    List<ApplyAddWorkTime> applyOffWorkTimeList = applyAddWorkTimeService.selectByExample(example);
-                    //获取所有的加班时间
-                    BigDecimal totaluseTime = new BigDecimal(0);
-                    //2========================================================
-                    {  //获取总共加班时间
-//                        for (ApplyAddWorkTime applyAddWorkTime : applyOffWorkTimeList) {
-//                            totaluseTime = totaluseTime.add(applyAddWorkTime.getUseTime(), MathContext.DECIMAL32);
-//                        }
-
-                    }
-
-                    HolidayManagement hoidayManagement = holidayManagementService.selectOneByUserId(flowMain.getApplyUser());
-                    {//进行判断
-                        if (hoidayManagement == null) {
-                            return AjaxResult.error("没有找到用户:" + flowMain.getApplyUser() + "假期信息");
-                        }
-                        if (!hoidayManagement.getStatus().equals(0)) {
-                            return AjaxResult.error("用户:" + flowMain.getApplyUser() + "已经删除,请重新确认");
-                        }
-                    }
-//                    剩余调休假小时(要减去冻结的小时)',
-                    Double restExchangeTime = hoidayManagement.getRestExchangeTime();
-
-                    if (totaluseTime.doubleValue() > restExchangeTime) {
-                        return AjaxResult.error("剩余调休假不够抵扣退回的加班时间,请退回调休时间后再操作");
-                    }
 
-                    BigDecimal restExchangeTimeDecimal = new BigDecimal(restExchangeTime).subtract(totaluseTime, MathContext.DECIMAL32);
-                    {//修改假期信息
-                        HolidayManagement updatehoidayManagement = new HolidayManagement();
-                        //restExchangeTimeDecimal放到
-                        updatehoidayManagement.setId(hoidayManagement.getId());
-                        updatehoidayManagement.setRestExchangeTime(restExchangeTimeDecimal.doubleValue());
-                        holidayManagementService.updateByPrimaryKeySelective(updatehoidayManagement);
-                    }
-
-//                    for (ApplyAddWorkTime applyAddWorkTime : applyOffWorkTimeList) {
-//                        //删除对应的考勤日志
-//                        workAttendanceLogService.deleteListByTableNameAndTableId("apply_add_work_time", applyAddWorkTime.getId());
-//
-//                    }
-                }
             }
         }
 

pro-base/src/main/java/com/idea/oa/flow2/mapper/FlowMainExtendMapper.java

@@ -17,7 +17,7 @@ import java.util.List;
 public interface FlowMainExtendMapper {
     /**
      * 通过用户id获取用户的FrameRoleData数据
-     * todo 判断是否需要确定集团审核    ===========================================这里,要特别定制(只对三资,解决集团分管领导不知道选哪个的问题)
+     // todo 判断是否需要确定集团审核    ===========================================这里,要特别定制(只对三资,解决集团分管领导不知道选哪个的问题)
      * @param userId
      * @return
      */