Changes

jinlin

2023-11-22 d363e8168a9d821a87ff75406aec9a87ed19722a

 modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/controller/ItemCirculatOrderController.java

@@ -12,8 +12,13 @@
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.itemCirculatOrder.dto.ItemCirculatOrderDto;
import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder;
import com.zt.life.modules.itemCirculatOrder.service.ItemCirculatOrderService;
import com.zt.life.modules.project.dto.SoftwareTestOrderDto;
import com.zt.life.sys.dto.OssDto;
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -23,7 +28,9 @@
import springfox.documentation.annotations.ApiIgnore;

import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List;
import java.util.Map;


/**
@@ -39,6 +46,12 @@
    @Autowired
    private ItemCirculatOrderService itemCirculatOrderService;

    @Autowired
    private SysCodeRuleService sysCodeRuleService;

    @Autowired
    private SysOssConfigService sysOssConfigService;

    @GetMapping("page")
    @ApiOperation("分页")
    @ApiImplicitParams({
@@ -52,37 +65,45 @@
        return PageResult.ok(itemCirculatOrderService.page(queryFilter));
    }

    @GetMapping("{id}")
    @GetMapping("getDto")
    @ApiOperation("信息")
    public Result<ItemCirculatOrder> get(@PathVariable("id") Long id){
        ItemCirculatOrder data = itemCirculatOrderService.get(id);

    public Result<ItemCirculatOrderDto> getDto(Long projectId, Long circulatOrderid) {
        ItemCirculatOrderDto data = itemCirculatOrderService.getDto(projectId, circulatOrderid);
        if (circulatOrderid!=null) {
            OssDto ossDto = sysOssConfigService.getOssByBusiType(circulatOrderid, "circulat_order");
            if (ossDto != null) {
                data.setFiles(ossDto);
            }
        }
        return Result.ok(data);
    }

    @PostMapping
    @ApiOperation("新增")
    @LogOperation("新增")
    public Result insert(@RequestBody ItemCirculatOrder itemCirculatOrder){
    public Result insert(@RequestBody ItemCirculatOrderDto itemCirculatOrderDto){
        //效验数据
        ValidatorUtils.validateEntity(itemCirculatOrder, AddGroup.class, DefaultGroup.class);
        itemCirculatOrderService.insert(itemCirculatOrder);

        ValidatorUtils.validateEntity(itemCirculatOrderDto.getCirculatOrder(), AddGroup.class, DefaultGroup.class);
        Map<String, String> map = new HashMap<>();
        map.put("funCode", "item_circulat_order");
        map.put("projectId",itemCirculatOrderDto.getProjectId().toString());
        itemCirculatOrderDto.getCirculatOrder().setCode(sysCodeRuleService.getNewCode(map));
        Boolean result = itemCirculatOrderService.save(itemCirculatOrderDto);
        return Result.ok();
    }

    @PutMapping
    @ApiOperation("修改")
    @LogOperation("修改")
    public Result update(@RequestBody ItemCirculatOrder itemCirculatOrder){
    public Result update(@RequestBody ItemCirculatOrderDto itemCirculatOrderDto){
        //效验数据
        ValidatorUtils.validateEntity(itemCirculatOrder, UpdateGroup.class, DefaultGroup.class);
        itemCirculatOrderService.update(itemCirculatOrder);
        ValidatorUtils.validateEntity(itemCirculatOrderDto.getCirculatOrder(), UpdateGroup.class, DefaultGroup.class);
        Boolean result = itemCirculatOrderService.save(itemCirculatOrderDto);

        return Result.ok();
    }

    @DeleteMapping
    @DeleteMapping("deleteCirculat")
    @ApiOperation("删除")
    @LogOperation("删除")
    public Result delete(@RequestBody Long[] ids){