#

Junjie

昨天 aa710969e00e9d7e56a276066a239f74d5c49310

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

@@ -17,12 +17,22 @@
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;

@RestController
public class WrkMastLogController extends BaseController {

    private static final Set<String> EXACT_SEARCH_COLUMNS = new HashSet<>(Arrays.asList(
            "wrk_sts",
            "io_type",
            "sta_no",
            "source_sta_no"
    ));

    @Autowired
    private WrkMastLogService wrkMastLogService;
@@ -59,15 +69,16 @@
    private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());
            String column = humpToLine(entry.getKey());
            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]));
                wrapper.ge(column, DateUtils.convert(dates[0]));
                wrapper.le(column, DateUtils.convert(dates[1]));
            } else {
                if (entry.getKey().equals("manu_type")) {
                    wrapper.like(entry.getKey(), val);
                if (EXACT_SEARCH_COLUMNS.contains(column)) {
                    wrapper.eq(column, val);
                } else {
                    wrapper.eq(entry.getKey(), val);
                    wrapper.like(column, val);
                }
            }
        }