#

lsh

2024-10-26 e75cbe96a8bfcf5535ec8cc6adb4ad51cd034760

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

@@ -10,6 +10,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.BasWrkStatus;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.web.BaseController;
@@ -53,14 +54,15 @@
        return R.ok(wrkMastService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private void convert(Map<String, Object> map, EntityWrapper wrapper){
    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            if (entry.getKey().endsWith(">")) {
                wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
            } else if (entry.getKey().endsWith("<")) {
                wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
                wrapper.eq(entry.getKey(), val);
            }
        }
    }
@@ -127,6 +129,20 @@
        }
        return R.ok(result);
    }
    @RequestMapping(value = "/sheetWrkMastQuery/auth")
    @ManagerAuth
    public R querySheet(String condition) {
        List<Map<String, Object>> result = new ArrayList<>();
        for (int i = 0;i<6;i++){
            WrkMast wrkMast = new WrkMast();
            wrkMast.setSheetNo(String.valueOf(i));
            Map<String, Object> map = new HashMap<>();
            map.put("id", wrkMast.getSheetNo());
            map.put("value", wrkMast.getSheetNo$());
            result.add(map);
        }
        return R.ok(result);
    }

    @RequestMapping(value = "/wrkMast/check/column/auth")
    @ManagerAuth