*

L

18 小时以前 9d7bfe8cf15f1b34a87351560f39662d9e141cce

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

@@ -38,8 +38,12 @@
                  @RequestParam Map<String, Object> param){
        try{
            Integer wrkNo = null;
            Integer taskNo = null;
            String taskNo = null;
            Integer status = null;
            String barcode = null;
            String startPoint = null;
            String targetPoint = null;
            String allField = null;
            Date modiTimeStart = null, modiTimeEnd = null;
            for (Map.Entry<String, Object> entry : param.entrySet()) {
                String val = String.valueOf(entry.getValue());
@@ -53,14 +57,26 @@
                } else if (entry.getKey().equals("wrk_no")) {
                    wrkNo = Integer.parseInt(val);
                } else if (entry.getKey().equals("task_no")) {
                    taskNo = Integer.parseInt(val);
                    taskNo = val;
                } else if (entry.getKey().equals("status")) {
                    status = Integer.parseInt(val);
                } else if (entry.getKey().equals("barcode")) {
                    barcode = val;
                } else if (entry.getKey().equals("startPoint")) {
                    startPoint = val;
                } else if (entry.getKey().equals("targetPoint")) {
                    targetPoint = val;
                } else if (entry.getKey().equals("allField")) {
                    allField = val;
                }
            }
            List<TaskWrkLog> taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, curr, limit);
            List<TaskWrkLog> taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd, curr, limit);
            Page<TaskWrkLog> page = new Page<TaskWrkLog>(curr, limit).setRecords(taskWrkList);
            page.setTotal(taskWrkLogService.selectTaskWrkLogListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd));
            if (page.getRecords().size()==0){
                taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd, 1, limit);
                page = new Page<TaskWrkLog>(1, limit).setRecords(taskWrkList);
            }
            page.setTotal(taskWrkLogService.selectTaskWrkLogListTotal(wrkNo,taskNo,status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd));
            return R.ok(page);

        } catch (Exception e) {
@@ -98,6 +114,29 @@
        return R.ok();
    }

    @RequestMapping(value = "/taskWrkLog/updatePoint/auth")
    @ManagerAuth
    public R updatePoint(TaskWrkLog taskWrkLog){
        if (Cools.isEmpty(taskWrkLog) || null == taskWrkLog.getTaskNo()) {
            return R.error();
        }
        TaskWrkLog taskWrkLog1 = taskWrkLogService.selectOne(new EntityWrapper<TaskWrkLog>().eq("TASK_NO", taskWrkLog.getTaskNo()).eq("WRK_NO", taskWrkLog.getWrkNo()).orderBy("MODI_TIME",false));
        Date modiTime = taskWrkLog1.getModiTime();
        if (taskWrkLog1 == null) {
            return R.error();
        }
        taskWrkLog1.setStartPoint(taskWrkLog.getStartPoint());
        taskWrkLog1.setTargetPoint(taskWrkLog.getTargetPoint());
        taskWrkLog1.setModiTime(taskWrkLog.getModiTime());//修改时间
//        taskWrkLog1.setCancelTime(taskWrkLog.getCancelTime());//取消时间
        taskWrkLog1.setAssignTime(taskWrkLog.getAssignTime());//派发时间
        taskWrkLog1.setCompleteTime(taskWrkLog.getCompleteTime());//完结时间
        taskWrkLog1.setExecuteTime(taskWrkLog.getExecuteTime());//执行时间
        taskWrkLog1.setCreateTime(taskWrkLog.getCreateTime());//执行时间
        taskWrkLogService.update(taskWrkLog1,new EntityWrapper<TaskWrkLog>().eq("TASK_NO", taskWrkLog.getTaskNo()).eq("WRK_NO", taskWrkLog.getWrkNo()).eq("MODI_TIME",modiTime));
        return R.ok();
    }

    @RequestMapping(value = "/taskWrkLog/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){