blame | history | patch | commit | commitdiff | ignore whitespace
jyy
2021-03-16 2511686fa3bcc154dad551a4bc8ef6839037a8c7 
 zq-erp/src/main/java/com/matrix/system/app/action/AppOccupancyController.java


@@ -22,10 +22,7 @@


import io.swagger.annotations.ApiResponses;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Controller;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.ResponseBody;


import org.springframework.web.bind.annotation.RestController;


import org.springframework.web.bind.annotation.*;




import javax.annotation.Resource;


import java.util.ArrayList;


@@ -54,7 +51,7 @@


            @ApiResponse(code = 200, message = "ok", response = OccupancyController.OccupancySPan.class)


    })


    @GetMapping(value = "/getKanban/{timeStr}")


    AjaxResult showCwzyList(String timeStr) {


    AjaxResult showCwzyList(@PathVariable String timeStr) {


        //TODO app的用户获不能在session中，方案要改


        SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);


        return occupancyController.getCwzyList(timeStr,sysUsers.getShopId());