Merge remote-tracking branch 'origin/master'

zhoushihao

2024-09-24 bacec153f688bcee10795bd38f61b2406c20e488

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java

@@ -1,7 +1,6 @@
package com.mes.damage.controller;


import cn.hutool.core.date.DateTime;
import com.mes.damage.entity.Damage;
import com.mes.damage.entity.DamagePrint;
import com.mes.damage.service.DamageService;
@@ -11,7 +10,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.Date;
import java.util.List;
import java.util.Map;

@@ -29,7 +27,7 @@
@ResponseBody
public class DamageController {

    @Autowired
    @Autowired(required=true)
    private DamageService damageService;
    @ApiOperation("报工数据查询")
    @PostMapping("/selectDamage")
@@ -39,7 +37,7 @@
        int type =Integer.parseInt(map.get("type").toString());
        int status =Integer.parseInt(map.get("status").toString());
        String workingProcedure =map.get("workingProcedure").toString();
        return Result.build(200,"查询成功",damageService.selectDamage(startTime,endTime,type,status,workingProcedure));
        return Result.build(200,"查询成功",damageService.selectDamage(startTime,endTime,type,status, workingProcedure));
    }

    @ApiOperation("报工")
@@ -66,7 +64,7 @@
    @ApiOperation("拿走数据查询")
    @PostMapping("/selectDamagePrint")
    public Result selectDamagePrint(@RequestBody Damage damage) {
        List<Damage> damage2=damageService.selectDamagePrint(damage);
        List<DamagePrint> damage2=damageService.selectDamagePrint(damage);
        return Result.build(200,"查询成功",damage2);
    }
    @ApiOperation("拿走打印查询")