解决冲突

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/OrderMainReq.java

@@ -125,3 +125,5 @@ public class OrderMainReq extends BaseRequest {
     private List<OrderDetailReq> detailList;
 
 }
+
+

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventorySummaryServiceImpl.java

@@ -102,12 +102,12 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
         long size = list(wp).size();
 
             //对该装备typeId进行排序
-        Collections.sort(list, new Comparator<InventorySummary>() {
-            @Override
-            public int compare(InventorySummary o1, InventorySummary o2) {
-                return o1.getTypeId().compareTo(o2.getTypeId());
-            }
-        });
+//        Collections.sort(list, new Comparator<InventorySummary>() {
+//            @Override
+//            public int compare(InventorySummary o1, InventorySummary o2) {
+//                return o1.getTypeId().compareTo(o2.getTypeId());
+//            }
+//        });
 
         Page<InventorySummary> page1 = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
         page1.setRecords(list);
@@ -407,10 +407,6 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
         }
         //根据组织机构号查询
         wrapper.eq(ObjectUtil.isNotEmpty(req.getOrgId()), InventorySummary::getOrgId, req.getOrgId());
-//        wrapper.and(qw -> {
-//            qw.eq(ObjectUtil.isNotEmpty(req.getOrgId()), InventorySummary::getOrgId, req.getOrgId());
-//            // 其他条件...
-//        });
         //根据组织机构名模糊查询
         wrapper.like(ObjectUtil.isNotEmpty(req.getOrgName()), InventorySummary::getOrgName, req.getOrgName());
         //位置id（单警柜/仓库）
@@ -419,8 +415,6 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
         wrapper.eq(ObjectUtil.isNotEmpty(req.getLocationType()),InventorySummary::getLocationType,req.getLocationType());
         //位置信息
         wrapper.like(ObjectUtil.isNotEmpty(req.getLocationName()), InventorySummary::getLocationName, req.getLocationName());
-        //装备类别名称
-//        wrapper.like(ObjectUtil.isNotEmpty(req.getTypeName()), InventorySummary::getTypeName, req.getTypeName());
         //根据类别
         if (ObjectUtil.isNotEmpty(req.typeIds) && req.typeIds.size()>0) {
             wrapper.and(qw -> req.typeIds.forEach(typeId -> qw.or().eq(InventorySummary::getTypeId, typeId)));
@@ -429,14 +423,14 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
         if (ObjectUtil.isNotEmpty(req.getSizeNames()) && req.getSizeNames().size()>0) {
             wrapper.and(qw -> req.getSizeNames().forEach(sizeName -> qw.or().eq(InventorySummary::getSizeName, sizeName)));
         }
-        //型号名称
-//        wrapper.like(ObjectUtil.isNotEmpty(req.getSizeName()), InventorySummary::getSizeName, req.getSizeName());
-        //号型
-//        wrapper.eq(ObjectUtil.isNotEmpty(req.getSizeId()), InventorySummary::getSizeId, req.getSizeId());
-        if (ObjectUtil.isNotEmpty(req.getColumn()))
+        if (ObjectUtil.isNotEmpty(req.getColumn())&&!req.getColumn().equals("create_time"))
         {
             wrapper.last("order by " + req.getColumn() + " " + req.getOrder());
         }
+        else
+        {
+            wrapper.last("order by type_id");
+        }
 
 
         return wrapper;

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java

@@ -24,6 +24,7 @@ import com.junmp.jyzb.service.*;
 import com.junmp.jyzb.utils.DateTimeUtil;
 import com.junmp.jyzb.utils.RabbitMQSendMsg;
 import com.junmp.jyzb.utils.RedisUtils;
+import com.junmp.v2.auth.api.context.LoginContext;
 import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.common.exception.base.ServiceException;
 import com.junmp.v2.common.exception.enums.DefaultBizExceptionEnum;
@@ -36,8 +37,14 @@ import com.junmp.v2.dict.entity.SysDict;
 import com.junmp.v2.dict.entity.SysDictItem;
 import com.junmp.v2.dict.service.SysDictItemService;
 import com.junmp.v2.dict.service.SysDictService;
+import com.junmp.v2.message.api.MessageApi;
+import com.junmp.v2.message.api.bean.req.MessageReq;
+import com.junmp.v2.message.api.bean.res.MessageRes;
+import com.junmp.v2.message.api.enums.MsgReadStateEnum;
 import com.junmp.v2.office.api.OfficeExcelApi;
 import com.junmp.v2.office.api.bean.ExcelExportParam;
+import com.junmp.v2.sys.user.entity.SysUser;
+import com.junmp.v2.sys.user.service.SysUserService;
 import org.flowable.engine.TaskService;
 import org.flowable.task.api.Task;
 import org.springframework.amqp.core.Queue;
@@ -73,8 +80,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
     @Resource
     private OrderNumService orderNumService;
 
-    @Resource
-    private PubOrgService pubOrgService;
+
 
     @Resource
     private OrderMainMapper orderMainMapper;
@@ -94,7 +100,8 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
 
     @Resource
     private InventoryService inventoryService;
-
+    @Resource
+    private MessageApi messageApi;
     @Resource
     private WarehouseService warehouseService;
     @Resource
@@ -1050,11 +1057,37 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
      */
     @Override
     public ProcessOrderDto GetByProcessId(OrderMainReq req) {
+        String receiveUser="";
+        if (req.getReceiveUserId()!=null)//
+        {
+            receiveUser = req.getReceiveUserId();
+        }
+        else
+        {
+            receiveUser= LoginContext.getContext().getLoginUser().getUserId().toString();
+        }
+
         ProcessOrderDto processOrderDto = new ProcessOrderDto();
         System.out.println("req = " + req.getOrderType());
         if (req.getOrderType().equals("null")|| ObjectUtil.isNull(req.getOrderType())) {
             return processOrderDto;
         }
+
+//        //点击后消除已读消息,暂时不用，依赖前端处理
+//        MessageReq reqmsg=new MessageReq();
+//        reqmsg.setBizId(Long.valueOf(req.getProcessInstanceId()));
+//        reqmsg.setReceiveUserId(Long.valueOf(receiveUser));
+//        reqmsg.setReadFlag(0);
+//        List<MessageRes> msgRes= messageApi.queryList(reqmsg);
+//        if (msgRes.size()>0)
+//        {
+//            // 使用流将 id 取出，并用逗号拼接成字符串
+//            String ids = msgRes.stream()
+//                    .map(MessageRes::getMsgId)
+//                    .map(String::valueOf) // 将 id 转换为字符串
+//                    .collect(Collectors.joining(","));
+//            messageApi.batchReadFlagByMessageIds(ids, MsgReadStateEnum.READ);
+//        }
         if (req.getOrderType().equals("workOrder")){
             OrderDto orderDto = new OrderDto();
             OrderMain one = getOne(new LambdaQueryWrapper<OrderMain>()