bug修改

无关风月

2025-01-25 f9ec390d20bdb433e7a9dcf198988bb7fb505a43

bug修改

 manage/src/main/java/com/jilongda/manage/controller/TModelController.java

@@ -1,6 +1,7 @@
package com.jilongda.manage.controller;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.jilongda.common.basic.ApiResult;
import com.jilongda.common.basic.PageInfo;
@@ -94,7 +95,7 @@
        List<String> colorList = dto.getColorList();
        if (list.size()<colorList.size()){
            for (int i = 0; i < colorList.size(); i++) {
                if (i>list.size()){
                if (i>list.size()-1){
                    TModel model = new TModel();
                    BeanUtils.copyProperties(dto, model);
                    model.setId(null);
@@ -105,10 +106,19 @@
                }
            }
        }else if (list.size()>colorList.size()){
            list = list.subList(0, colorList.size());
            for (int i = 0; i < colorList.size(); i++) {
            List<TModel> removeList = new ArrayList<>();
            List<TModel> updateList = new ArrayList<>();
            for (int i = 0; i < list.size(); i++) {
                if (i<colorList.size()){
                    updateList.add(list.get(i));
                list.get(i).setColor(colorList.get(i));
                }else {
                    removeList.add(list.get(i));
            }
            }
            list = updateList;
            modelService.removeByIds(removeList.stream().map(TModel::getId)
                    .collect(Collectors.toList()));
        }else {
            for (int i = 0; i < list.size(); i++) {
                list.get(i).setColor(colorList.get(i));

 optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java

@@ -278,6 +278,7 @@
        String format = simpleDateFormat.format(new Date());
        dto.setTime(format);
        TTicket tTicket = tTicketService.lambdaQuery().eq(TTicket::getStoreId, lineUp.getStoreId())
                .eq(TTicket::getType,1)
                .eq(TTicket::getStatus, 1).list().stream().findFirst().orElse(null);
        if (tTicket==null){
            return ApiResult.failed("当前门店未绑定小票机");