修改

jinlin

2023-12-29 a4f932c6ca705feb3bee3b7d7bbe0ee5c0c85515

 modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java

@@ -14,13 +14,14 @@
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.project.dto.SoftwareTestOrderDto;
import com.zt.life.modules.project.model.SoftwareTestOrder;
import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
import com.zt.life.modules.project.service.ProjectService;
import com.zt.life.modules.project.service.SoftwareTestOrderDeliverableService;
import com.zt.life.modules.project.service.SoftwareTestOrderMeasuredService;
import com.zt.life.modules.project.service.SoftwareTestOrderService;
import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
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;
@@ -29,7 +30,13 @@
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;


/**
@@ -46,13 +53,10 @@
    private SoftwareTestOrderService softwareTestOrderService;

    @Autowired
    private ProjectService projectService;
    private SysCodeRuleService sysCodeRuleService;

    @Autowired
    private SoftwareTestOrderDeliverableService softwareTestOrderDeliverableService;
    @Autowired
    private SoftwareTestOrderMeasuredService softwareTestOrderMeasuredService;
    @Autowired
    private TestAgencyInfoService testAgencyInfoService;
    private SysOssConfigService sysOssConfigService;

    @GetMapping("page")
    @ApiOperation("分页")
@@ -61,47 +65,26 @@
            @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
            @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
            @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
            @ApiImplicitParam(name = "testBasis", value = "测试依据", dataType = Constant.QT.STRING, format = "test_basis^EQ"),
            @ApiImplicitParam(name = "testType", value = "测试类型", dataType = Constant.QT.STRING, format = "test_type^EQ"),
            @ApiImplicitParam(name = "testStandard", value = "测试标准", dataType = Constant.QT.STRING, format = "test_standard^EQ"),
            @ApiImplicitParam(name = "articleNature", value = "物品性质", dataType = Constant.QT.STRING, format = "article_nature^EQ")})
            @ApiImplicitParam(name = "softwareName", value = "软件名称", dataType = Constant.QT.STRING, format = "p.software_name^LK"),
            @ApiImplicitParam(name = "testBasis", value = "测试依据", dataType = Constant.QT.STRING, format = "a.test_basis^EQ"),
            @ApiImplicitParam(name = "testType", value = "测试类型", dataType = Constant.QT.STRING, format = "a.test_type^EQ"),
            @ApiImplicitParam(name = "testStandard", value = "测试标准", dataType = Constant.QT.STRING, format = "a.test_standard^EQ"),
            @ApiImplicitParam(name = "articleNature", value = "物品性质", dataType = Constant.QT.STRING, format = "a.article_nature^EQ")})
    public PageResult<SoftwareTestOrder> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
        return PageResult.ok(softwareTestOrderService.page(queryFilter));
        List<SoftwareTestOrder> list=softwareTestOrderService.page(queryFilter);
        return PageResult.ok(list);
    }

    @GetMapping("getDto")
    @ApiOperation("信息")
    public Result<SoftwareTestOrderDto> getDto(Long orderId, Long projectId) {
        SoftwareTestOrderDto data = new SoftwareTestOrderDto();

        if (orderId != null) {
            data.setId(orderId);
            SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(orderId);
            data.setSoftwareTestOrder(softwareTestOrder);

            if (projectId == null)
                projectId = softwareTestOrder.getProjectId();

            data.setTestAgencyInfo(testAgencyInfoService.get(orderId));
            List<SoftwareTestOrderDeliverable> deliverableList = softwareTestOrderDeliverableService.childrenTables(orderId);
            if (deliverableList.isEmpty()) {
                deliverableList = softwareTestOrderService.deliverableDict();
    public Result<SoftwareTestOrderDto> getDto(Long projectId,Long orderId) {
        SoftwareTestOrderDto data = softwareTestOrderService.getDto(projectId, orderId);
        if (orderId!=null) {
            OssDto ossDto = sysOssConfigService.getOssByBusiType(orderId, "test_order");
            if (ossDto != null) {
                data.setFiles(ossDto);
            }
            data.setSoftwareTestOrderDeliverableList(deliverableList);

            List<SoftwareTestOrderMeasured> measuredList = softwareTestOrderMeasuredService.childrenTables(orderId);
            if (measuredList.isEmpty()) {
                measuredList = softwareTestOrderService.MeasuredDict();
            }
            data.setSoftwareTestOrderMeasuredList(measuredList);} else {
            data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
        }
        if (projectId != null) {
            data.setProjectId(projectId);
            data.setProject(projectService.get(projectId));
        }


        return Result.ok(data);
    }

@@ -113,24 +96,25 @@
        //效验数据

        ValidatorUtils.validateEntity(softwareTestOrderDto.getSoftwareTestOrder(), AddGroup.class, DefaultGroup.class);

        Map<String, String> map = new HashMap<>();
        map.put("funCode", "software_test_order");
        map.put("projectId",softwareTestOrderDto.getProjectId().toString());
        softwareTestOrderDto.getSoftwareTestOrder().setCode(sysCodeRuleService.getNewCode(map));
        Boolean result = softwareTestOrderService.save(softwareTestOrderDto);


        return Result.ok();
    }

    @PutMapping
    @ApiOperation("修改")
    @LogOperation("修改")
    public Result update(@RequestBody SoftwareTestOrderDto softwareTestOrderDtor) {
    public Result update(@RequestBody SoftwareTestOrderDto softwareTestOrderDto) {
        //效验数据
        ValidatorUtils.validateEntity(softwareTestOrderDtor.getSoftwareTestOrder(), UpdateGroup.class, DefaultGroup.class);
        Boolean result = softwareTestOrderService.save(softwareTestOrderDtor);
        ValidatorUtils.validateEntity(softwareTestOrderDto.getSoftwareTestOrder(), UpdateGroup.class, DefaultGroup.class);
        Boolean result = softwareTestOrderService.save(softwareTestOrderDto);
        return Result.ok();
    }

    @DeleteMapping
    @DeleteMapping("deleteOrder")
    @ApiOperation("删除")
    @LogOperation("删除")
    public Result delete(@RequestBody Long[] ids) {
@@ -141,4 +125,10 @@
        return Result.ok();
    }

    @GetMapping("exportWord")
    @ApiOperation("打印测试委托单")
    @LogOperation("打印测试委托单")
    public void exportWord(Long id, HttpServletRequest request, HttpServletResponse response) {
        softwareTestOrderService.exportWord(id, request, response);
    }
}