fix:工单匹配时不匹配停止的

src/main/java/cn/ezhizao/project/business/upgrade/controller/BizArchiveInputTempController.java

@@ -271,7 +271,7 @@ public class BizArchiveInputTempController extends BaseController
      * 删除档案入库
      */
 
-    @PreAuthorize("@ss.hasPermi('business:temp:remove')")
+    @PreAuthorize("@ss.hasPermi('business:upgrade:order:edit')")
     @Log(title = "档案入库", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids)

src/main/java/cn/ezhizao/project/business/upgrade/service/impl/BizArchiveInputTempServiceImpl.java

@@ -552,12 +552,12 @@ public class BizArchiveInputTempServiceImpl extends ServiceImpl<BizArchiveInputT
                 // 如果没查到， 新建
                 BizWorkOrder workOrder = null;
                 BizWorkOrderUpdate workOrderUpdate = null;
-
                 // 最后一条
                 if (i == subGroupList.size() - 1) {
                     List<BizWorkOrder> workOrders = workOrderService.query()
                             .eq("company_id", groupModel.getCompanyId())
                             .eq("task_type_id", groupModel.getTaskTypeId())
+                            .eq("is_stop",0)
                             .list(); // 根据company_id + task_type_id + start_month包含在group_start...end
                     if (!workOrders.isEmpty()) {
                         workOrder = workOrders.get(0);

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

@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tenantId != null "> AND t1.tenant_id = #{tenantId}</if>
             <if test="companyId != null "> AND t1.company_id = #{companyId}</if>
             <if test="type != null ">AND t1.type = #{type}</if>
-            <if test=" serviceId != null">AND t1.service_id = #{serviceId}</if>
+            <if test="serviceId != null">AND t1.service_id = #{serviceId}</if>
             <if test="noContract != null ">AND t1.no_contract = #{noContract}</if>
             <if test="workOrderNo != null  and workOrderNo != ''">AND t1.work_order_no = #{workOrderNo}</if>
             <if test="startMonth != null ">AND t1.start_month = #{startMonth}</if>