#

luxiaotao1123

2020-07-04 b1a9eacb3aecbfb44e6d4cc9468983b748fe4307

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

@@ -16,13 +16,13 @@
import com.zy.asrs.entity.MatCodePrint;
import com.zy.asrs.service.MatCodeService;
import com.zy.common.CodeRes;
import com.zy.common.config.AdminInterceptor;
import com.zy.common.utils.BarcodeUtils;
import com.zy.common.utils.QrCode;
import com.zy.common.utils.excel.matcode.MatCodeExcel;
import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@@ -45,28 +45,40 @@
        return R.ok(matCodeService.selectById(String.valueOf(id)));
    }

    @RequestMapping(value = "/matCode/auth")
    @ManagerAuth
    public R find(@RequestParam("id") String id) {
        return R.ok(matCodeService.selectById(String.valueOf(id)));
    }

    @RequestMapping(value = "/matCode/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        excludeTrash(param);
        EntityWrapper<MatCode> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        allLike(MatCode.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        else {
            wrapper.orderBy("modi_time", false);
        }
        return R.ok(matCodeService.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.like(entry.getKey(), val);
            }
        }
    }
@@ -121,7 +133,6 @@
            excel.setBarcode(matCode.getBarcode());
            excel.setMatName(matCode.getMatName());
            excel.setStr1(matCode.getStr1());
            excel.setStr2(matCode.getStr2());
            excels.add(excel);
            if (rowCount != null && excels.size() >= rowCount){
                break;
@@ -140,7 +151,6 @@
    // 导入
    @RequestMapping(value = "/matCode/import/auth")
    @ManagerAuth(memo = "物料编码数据导入")
    @Transactional
    public R matCodeImport(MultipartFile file) throws IOException, InterruptedException {
        MatCodeExcelListener listener = new MatCodeExcelListener(getUserId());
        EasyExcel.read(file.getInputStream(), MatCodeExcel.class, listener).sheet().doRead();
@@ -148,7 +158,7 @@
    }

    // 打印
    @RequestMapping(value = "/macCode/print/auth")
    @RequestMapping(value = "/matCode/print/auth")
    @ManagerAuth(memo = "物料编码打印")
    public R matCodePrint(@RequestParam(value = "param[]") String[] param) {
        if(Cools.isEmpty(param)) {
@@ -174,6 +184,7 @@
    public R matCodeBarcode(@RequestParam(defaultValue = "1") Integer type
                        , @RequestParam String param
                        , HttpServletResponse response) throws Exception {
        AdminInterceptor.cors(response);
        if (Cools.isEmpty(param)){
            return R.parse(BaseRes.EMPTY);
        }