Revert "fix:基础版本月工单（循环）需要停用工单选项，并且生成循环委托时需要启用该工单"

This reverts commit 40143e4d0c77201a62e182e8a81292a024d07225.

src/main/java/cn/ezhizao/project/business/order/service/IBizArchiveInputService.java

@@ -32,7 +32,7 @@ public interface IBizArchiveInputService extends IService<BizArchiveInput> {
     boolean verify(BizArchiveInput bizArchiveInput);
 
     boolean removeBatchByIds(List<Long> ids);
-    boolean updateTasks(BizWorkOrder workOrder);
+
     boolean addLoopTasks(BizWorkOrder workOrder);
 
     boolean stopLoopTasks(BizWorkOrder workOrder);

src/main/java/cn/ezhizao/project/business/order/service/impl/BizArchiveInputServiceImpl.java

@@ -409,50 +409,6 @@ public class BizArchiveInputServiceImpl extends ServiceImpl<BizArchiveInputMappe
         }
         return true;
     }
-    // 更新循环任务
-    @Override
-    public boolean updateTasks(BizWorkOrder workOrder) {
-        if (workOrder.getTaskTypeId() == 1L) {
-            return updateReportTask(workOrder);
-        } else if (workOrder.getTaskTypeId() == 2L) {
-            return updateSocialSecurity(workOrder);
-        } else if (workOrder.getTaskTypeId() == 3L) {
-            return updateHousingFund(workOrder);
-        }
-        return true;
-    }
-    private boolean updateHousingFund(BizWorkOrder workOrder) {
-        List<Map<String, Object>> maps = Arrays.stream(housingFundTaskTableNames).map(v -> {
-            Map<String, Object> map = new HashMap<>();
-            map.put("tableName", v);
-            map.put("workOrderId", workOrder.getId());
-            return map;
-        }).collect(Collectors.toList());
-        workOrderService.updateTasks(maps);
-        return true;
-    }
-
-    private boolean updateSocialSecurity(BizWorkOrder workOrder) {
-        List<Map<String, Object>> maps = Arrays.stream(socialSecurityTaskTableNames).map(v -> {
-            Map<String, Object> map = new HashMap<>();
-            map.put("tableName", v);
-            map.put("workOrderId", workOrder.getId());
-            return map;
-        }).collect(Collectors.toList());
-        workOrderService.updateTasks(maps);
-        return true;
-    }
-
-    private boolean updateReportTask(BizWorkOrder workOrder) {
-        List<Map<String, Object>> maps = Arrays.stream(reportTaskTableNames).map(v -> {
-            Map<String, Object> map = new HashMap<>();
-            map.put("tableName", v);
-            map.put("workOrderId", workOrder.getId());
-            return map;
-        }).collect(Collectors.toList());
-        workOrderService.updateTasks(maps);
-        return true;
-    }
 
     private boolean stopHousingFund(BizWorkOrder workOrder) {
         List<Map<String, Object>> maps = Arrays.stream(housingFundTaskTableNames).map(v -> {

src/main/java/cn/ezhizao/project/business/standardCpmpany/controller/BizStandardCompanyController.java

@@ -181,12 +181,6 @@ public class BizStandardCompanyController extends BaseController {
                 //查询是否存在该期间工单
                 List<BizWorkOrder> workOrders = bizWorkOrderService.selectStarMonthList(workOrder);
                 if (workOrders.size() > 0) {
-                    workOrders.forEach(workOrder1 -> {
-                        workOrder1.setIsStop(0);
-                        workOrder1.setIsContinue(1);
-                        bizWorkOrderService.updateById(workOrder1);
-                        bizArchiveInputService.updateTasks(workOrder1);
-                    });
                     continue;
                 }
                 workOrder.setIsContinue(0);

src/main/java/cn/ezhizao/project/business/workOrder/controller/WorkOrderCurrentController.java

@@ -18,7 +18,6 @@ import cn.ezhizao.project.business.entrust.domain.BizEntrust;
 import cn.ezhizao.project.business.entrust.service.IBizEntrustService;
 import cn.ezhizao.project.business.entrustExamine.domain.BizEntrustExamine;
 import cn.ezhizao.project.business.entrustExamine.service.IBizEntrustExamineService;
-import cn.ezhizao.project.business.order.service.IBizArchiveInputService;
 import cn.ezhizao.project.business.workOrder.domain.BizWorkOrder;
 import cn.ezhizao.project.business.workOrder.domain.BizWorkOrderExport;
 import cn.ezhizao.project.business.workOrder.domain.vo.Condition;
@@ -83,8 +82,6 @@ public class WorkOrderCurrentController extends BaseController {
 
     @Resource
     private IBizEntrustExamineService entrustExamineService;
-    @Resource
-    private IBizArchiveInputService bizArchiveInputService;
     /**
      * 查询工单信息列表
      */
@@ -964,14 +961,4 @@ public class WorkOrderCurrentController extends BaseController {
         List<Tenant> tenants = tenantService.getFactoriesId(getTenantId());
         return success(tenants);
     }
-    @PreAuthorize("@ss.hasAnyPermi('business:entrust:workOrder:base:edit')")
-    @RequestMapping("stopWorkOrder")
-    public void stopWorkOrder(@RequestBody List<BizWorkOrder> workOrderList) {
-        workOrderList.forEach(workOrder -> {
-            workOrder.setIsStop(1);
-            workOrder.setIsContinue(0);
-            bizWorkOrderService.updateById(workOrder);
-            bizArchiveInputService.stopLoopTasks(workOrder);
-        });
-    }
 }

src/main/java/cn/ezhizao/project/business/workOrder/mapper/BizWorkOrderMapper.java

@@ -32,7 +32,6 @@ public interface BizWorkOrderMapper extends BaseMapper<BizWorkOrder>
     public int physicalDelete(BizWorkOrder bizWorkOrder);
 
     public int insertTasks(List<Map<String, Object>> tableValues);
-    public int updateTasks(List<Map<String, Object>> tableValues);
 
     public int addReportTask(Long companyId, List<Map<String, Object>> tableValues);
 

src/main/java/cn/ezhizao/project/business/workOrder/service/IBizWorkOrderService.java

@@ -39,7 +39,7 @@ public interface IBizWorkOrderService extends IService<BizWorkOrder>
     public int insertTasks(List<Map<String, Object>> tableValues);
 
     public int stopTasks(List<Map<String, Object>>tableValues);
-    public int updateTasks(List<Map<String, Object>> tableValues);
+
 
 
     /**

src/main/java/cn/ezhizao/project/business/workOrder/service/impl/BizWorkOrderServiceImpl.java

@@ -53,10 +53,6 @@ public class BizWorkOrderServiceImpl  extends ServiceImpl<BizWorkOrderMapper, Bi
     public int stopTasks(List<Map<String, Object>> tableValues) {
         return bizWorkOrderMapper.stopTasks(tableValues);
     }
-    @Override
-    public int updateTasks(List<Map<String, Object>> tableValues) {
-        return bizWorkOrderMapper.updateTasks(tableValues);
-    }
 
     @Override
     public List<BizWorkOrder> selectStarMonthList(BizWorkOrder workOrder) {

src/main/resources/mybatis/business/BizWorkOrderMapper.xml

@@ -216,12 +216,8 @@
 
     <update id="stopTasks">
         <foreach collection="tableValues" item="item" index="index" separator=";">
-            update ${item.tableName} set is_stop = 1,deleted = 1 where work_order_id = #{item.workOrderId}
-        </foreach>
-    </update>
-    <update id="updateTasks">
-        <foreach collection="tableValues" item="item" index="index" separator=";">
-            update ${item.tableName} set is_stop = 0,deleted = 0 where work_order_id = #{item.workOrderId}
+            update ${item.tableName} set is_stop = 1 where work_order_id = #{item.workOrderId}
         </foreach>
     </update>
+
 </mapper>