Merge branch 'master' of http://106.15.38.8:3000/yaoyq/imcs-yj-be

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskServiceImpl.java

@@ -709,7 +709,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
     @Override
     public Map<String, Object> scheduleTaskByResource(Map<String, Object> map) {
         String taskBatchNo = map.get("taskBatchNo")==null?"":map.get("taskBatchNo").toString();
-        String draftFlag = map.get("draftFlag")==null?"":map.get("draftFlag").toString();
+        String draftFlag = map.get("draftFlag")==null?"0":map.get("draftFlag").toString();
         //参数放置位置处理
         getQueryMap(map);
         String planId = map.get("planId")==null?"":map.get("planId").toString();

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/BomProcedureVersionServiceImpl.java

@@ -155,7 +155,10 @@ public class BomProcedureVersionServiceImpl extends SuperServiceImpl<BomProcedur
                     //替换一下，避免字段名称重复
                     condition = custService.getCondBytablePri(" jtable"+j+".",condition);
 
-                    String joinSql = " left join "+prefix+joinTableName+" jtable"+j+" on a."+bean.getIdentifier() +" =jtable"+j+"."+field1 +" and "+condition;
+                    String joinSql = " left join "+prefix+joinTableName+" jtable"+j+" on a."+bean.getIdentifier() +" =jtable"+j+"."+field1;
+                    if(StringUtils.isNotEmpty(condition)){
+                        joinSql+=" and "+condition;
+                    }
                     joinSqlMap.put(bean.getIdentifier(),joinSql);
 
                     fields += "jtable"+j+"."+field2 +" as "+ bean.getIdentifier()+",";

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/TTaskTestUnqualifiedBomMapper.xml

@@ -35,7 +35,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_user,create_time,update_time,update_user,bom_num,no,
-        task_id, task_no, order_id, order_no, plan_id, plan_no, procedure_id, bom_id, bom_name, create_user_name, handle_time, handle_user, handle_user_name, test_result, add_order_id, add_order_no,handle_way, handle_status, unique_code
+        task_id, task_no, order_id, order_no,order_name, plan_id, plan_no, procedure_id, bom_id, bom_name, create_user_name, handle_time, handle_user, handle_user_name, test_result, add_order_id, add_order_no,handle_way, handle_status, unique_code,procedureNo,procedureName,addOrderName
     </sql>
 
     <!-- 分页 -->
@@ -43,7 +43,14 @@
         select
         <include refid="Base_Column_List"/>
         from (
-        select a.* from imcs_t_task_test_unqualified_bom a
+        SELECT
+        a.*, p. NO procedureNo,
+        p. NAME procedureName,
+        o.order_name addOrderName
+        FROM
+        imcs_t_task_test_unqualified_bom a
+        LEFT JOIN imcs_b_bom_procedure p ON a.procedure_id = p.id
+        LEFT JOIN imcs_o_order o ON a.add_order_id = o.id
         ) s ${ew.customSqlSegment}
     </select>
 

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionResourceCenter/ZZoneController.java

@@ -85,6 +85,22 @@ public class ZZoneController extends SuperController<ZZoneService, Long, ZZone,
         return success(baseService.list(queryWrapper));
     }
 
+    @ApiOperation(value = "查询区域管理", notes = "查询区域管理")
+    @GetMapping("/zoneListExceptBz")
+    public R<List<ZZone>> zoneListExceptBz() {
+        Long userId = BaseContextHandler.getUserId();
+        //获取用户权限访问机构
+        Map<String, Object> orgMap = userService.getDataScopeById(userId);
+        List<Long> orgIds = orgMap.containsKey("orgIds")? (List)orgMap.get("orgIds") : Lists.newArrayList();
+        QueryWrapper<ZZone> queryWrapper = new QueryWrapper();
+        if(CollectionUtil.isNotEmpty(orgIds)){
+            queryWrapper = new QueryWrapper<ZZone>().in("org_id", orgIds);
+        }
+        //取出掉保障
+        queryWrapper.notLike("name","保障");
+        return success(baseService.list(queryWrapper));
+    }
+
     @ApiOperation(value = "查询区域管理", notes = "查询区域管理")
     @GetMapping("/allSelect")
     public R<List<ZZone>> allSelect() {

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/entity/TTaskTestUnqualifiedBom.java

@@ -58,6 +58,15 @@ public class TTaskTestUnqualifiedBom extends Entity<Long> {
     @TableField(value = "no", condition = LIKE)
     @Excel(name = "编号")
     private String no;
+
+
+    @TableField(exist = false)
+    private String procedureNo;
+
+    @TableField(exist = false)
+    private String procedureName;
+
+
     /**
      * 订单ID
      */
@@ -96,6 +105,11 @@ public class TTaskTestUnqualifiedBom extends Entity<Long> {
     @Excel(name = "订单名称")
     private String orderName;
 
+
+    @TableField(exist = false)
+    private String addOrderName;
+
+
     /**
      * 计划ID
      */