提交

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

@@ -121,6 +121,7 @@ public class BizStandardCompanyController extends BaseController {
                 BizWorkOrder workOrder = new BizWorkOrder();
                 workOrder.setNoContract(0);
                 workOrder.setType(2);
+                workOrder.setIsContinue(0);
                 workOrder.setTenantId(getTenantId());
                 workOrder.setTaskTypeId(detail.getTaskTypeId());
                 workOrder.setTaskTypeDetailId(process.getTaskTypeDetailId());
@@ -182,6 +183,7 @@ public class BizStandardCompanyController extends BaseController {
 
                     throw new RuntimeException("已有该期间工单");
                 }
+                workOrder.setIsContinue(0);
                 workOrder.setStartMonth(null);
                 workOrders = bizWorkOrderService.getList(workOrder);
                 workOrder.setStartMonth(order.getStartMonth());
@@ -227,7 +229,6 @@ public class BizStandardCompanyController extends BaseController {
                                 newCurrentMontn = date.getTime();
                                 daysBetween = newCurrentMontn - oldCurrentMontn;
                                 daysBetween = daysBetween / (24 * 60 * 60 * 1000);
-//                                if (daysBetween > (typeId == 1 ? 60 : 30)) {
 
                                 if (daysBetween >  30) {
                                     orders.setIsStop(1);

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

@@ -57,7 +57,7 @@ public class WorkOrderCurrentController extends BaseController {
         setTenantId(bizWorkOrder);
         startPage();
         startOrderBy();
-        bizWorkOrder.setIsStop(0);
+//        bizWorkOrder.setIsStop(0);
         List<BizWorkOrder> list = bizWorkOrderService.getList(bizWorkOrder);
         List<SysCurrentMonth> months = sysCurrentMonthService.query().eq("tenant_id", getTenantId()).eq("type", 0).list();
         if (months.isEmpty()) {
@@ -83,7 +83,7 @@ public class WorkOrderCurrentController extends BaseController {
     public TableDataInfo listForFactory(BizWorkOrder bizWorkOrder) throws NoSuchFieldException, IllegalAccessException {
         bizWorkOrder.setToTenantId(getTenantId());
         startPage();
-        bizWorkOrder.setIsStop(0);
+//        bizWorkOrder.setIsStop(0);
         List<BizWorkOrder> list = bizWorkOrderService.getList(bizWorkOrder);
         List<SysCurrentMonth> months = sysCurrentMonthService.query().eq("tenant_id", getTenantId()).eq("type", 0).list();
         if (months.isEmpty()) {
@@ -299,7 +299,7 @@ public class WorkOrderCurrentController extends BaseController {
         }
         startPage();
         startOrderBy();
-        bizWorkOrder.setIsStop(0);
+//        bizWorkOrder.setIsStop(0);
         List<BizWorkOrder> list = bizWorkOrderService.getList(bizWorkOrder);
         List<BizWorkOrderExport> listExport = new ArrayList<>();
 

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

@@ -59,7 +59,7 @@ public class WorkOrderOnceController extends BaseController {
         setTenantId(bizWorkOrder);
         startPage();
         startOrderBy();
-        bizWorkOrder.setIsStop(0);
+//        bizWorkOrder.setIsStop(0);
         List<BizWorkOrder> list = bizWorkOrderService.getList(bizWorkOrder);
 
         BizEntrust bizEntrust = new BizEntrust();
@@ -80,7 +80,7 @@ public class WorkOrderOnceController extends BaseController {
     {
         bizWorkOrder.setToTenantId(getTenantId());
         startPage();
-        bizWorkOrder.setIsStop(0);
+//        bizWorkOrder.setIsStop(0);
         List<BizWorkOrder> list = bizWorkOrderService.getList(bizWorkOrder);
         BizEntrust bizEntrust = new BizEntrust();
         bizEntrust.setWorkOrderIds(list.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));
@@ -197,7 +197,7 @@ public class WorkOrderOnceController extends BaseController {
         }
         startPage();
         startOrderBy();
-        bizWorkOrder.setIsStop(0);
+//        bizWorkOrder.setIsStop(0);
         //查询单次委托列表
         List<BizWorkOrder> list = bizWorkOrderService.getList(bizWorkOrder);
         //非工厂版实体类集合

src/main/java/cn/ezhizao/project/business/workOrder/domain/BizWorkOrder.java

@@ -52,6 +52,7 @@ public class BizWorkOrder extends BaseEntity
     @ApiModelProperty(value = "工单类型 1循环 2代办")
     private Integer type;
 
+
     @Excel(name = "工单类型")
     @TableField(exist = false)
     @ApiModelProperty(value = "工单类型 1循环 2代办")
@@ -75,7 +76,7 @@ public class BizWorkOrder extends BaseEntity
     @TableField(exist = false)
     private String taskTypeName;
 
-    @Excel(name = "是否延续")
+//    @Excel(name = "是否延续")
     @ApiModelProperty(value = "是否延续")
     private Integer isContinue;