#

LSH

2023-12-16 920a4ebef6f4f70f097ee9d10c05a5481e2d43ab

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

@@ -13,6 +13,8 @@
import com.zy.asrs.entity.AdjDetl;
import com.zy.asrs.service.AdjDetlService;
import com.zy.common.web.BaseController;
import com.zy.system.entity.SaasLog;
import com.zy.system.service.SaasLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -26,6 +28,9 @@

    @Autowired
    private AdjDetlService adjDetlService;

    @Autowired
    private SaasLogService saasLogService;

    @RequestMapping(value = "/adjDetl/{id}/auth")
    @ManagerAuth
@@ -41,12 +46,14 @@
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        //以前是立库库存调整接口，后改为平库调整接口
        excludeTrash(param);
        EntityWrapper<AdjDetl> wrapper = new EntityWrapper<>();
        EntityWrapper<SaasLog> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        allLike(AdjDetl.class, param.keySet(), wrapper, condition);
        wrapper.eq("type",2);
        allLike(SaasLog.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(adjDetlService.selectPage(new Page<>(curr, limit), wrapper));
        return R.ok(saasLogService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){