1

ZY

2024-09-26 ddb9678030a8391fe63e6eb0775a77d12f1023ca

 src/main/java/com/zy/asrs/controller/PlaController.java

@@ -11,7 +11,6 @@
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.microsoft.sqlserver.jdbc.SQLServerException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.GlobleParameter;
import com.zy.asrs.entity.result.KeyValueVo;
@@ -366,9 +365,14 @@
                .andNew().like("batch", condition)
                .groupBy("batch")
                .orderBy("batch", false);
        List<Pla> plas = plaService.selectPage(new Page<Pla>(1, 30), wrapper).getRecords();
        Page<Pla> plaPage = new Page<>(1, 30);
        plaPage.setSearchCount(false);
        Page<Pla> plaPage1 = plaService.selectPage(plaPage, wrapper);
        // 重新查询然后给page设置Total
        plaPage.setTotal(this.plaService.selectCount(new EntityWrapper<Pla>().setSqlSelect("batch")
                .andNew().like("batch", condition)));
        List<KeyValueVo> valueVos = new ArrayList<>();
        for (Pla pla : plas) {
        for (Pla pla : plaPage1.getRecords()) {
            KeyValueVo vo = new KeyValueVo();
            vo.setName(pla.getBatch());
            vo.setValue(pla.getBatch());