modules/mainPart/src/main/java/com/zt/life/modules/mainPart/utils/GetShowDictList.java
@@ -39,4 +39,6 @@ } return result; } } modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
@@ -12,7 +12,7 @@ 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.project.dto.SoftwareTestOrderDto; import com.zt.life.modules.project.dto.EnvironDto; import com.zt.life.modules.project.model.Environ; import com.zt.life.modules.project.service.EnvironService; import com.zt.life.sys.dto.OssDto; @@ -69,8 +69,8 @@ @GetMapping("getDto") @ApiOperation("信息") public Result<SoftwareTestOrderDto> getDto(Long environId, Long projectId) { SoftwareTestOrderDto data = environService.getDto(environId, projectId); public Result<EnvironDto> getDto(Long environId, Long projectId) { EnvironDto data = environService.getDto(environId, projectId); if (environId != null) { OssDto ossDto = sysOssConfigService.getOssByBusiType(environId, "test_environt_diagram"); if (ossDto != null) { @@ -83,17 +83,14 @@ @PostMapping @ApiOperation("新增") @LogOperation("新增") public Result insert(@RequestBody SoftwareTestOrderDto softwareTestOrderDto) { public Result insert(@RequestBody EnvironDto environDto) { //效验数据 ValidatorUtils.validateEntity(softwareTestOrderDto, AddGroup.class, DefaultGroup.class); SimpleDateFormat sdf = new SimpleDateFormat("yyyy"); String year = sdf.format(new Date()); ValidatorUtils.validateEntity(environDto, AddGroup.class, DefaultGroup.class); Map<String, String> map = new HashMap<>(); map.put("funCode", "environ"); map.put("year",year); softwareTestOrderDto.getEnviron().setYear(year); softwareTestOrderDto.getEnviron().setCode(sysCodeRuleService.getNewCode(map)); Boolean result = environService.save(softwareTestOrderDto); map.put("projectId",environDto.getProjectId().toString()); environDto.getEnviron().setCode(sysCodeRuleService.getNewCode(map)); Boolean result = environService.save(environDto); return Result.ok(); } @@ -102,10 +99,10 @@ @PutMapping @ApiOperation("修改") @LogOperation("修改") public Result update(@RequestBody SoftwareTestOrderDto softwareTestOrderDto) { public Result update(@RequestBody EnvironDto environDto) { //效验数据 ValidatorUtils.validateEntity(softwareTestOrderDto, UpdateGroup.class, DefaultGroup.class); Boolean result = environService.save(softwareTestOrderDto); ValidatorUtils.validateEntity(environDto, UpdateGroup.class, DefaultGroup.class); Boolean result = environService.save(environDto); return Result.ok(); } modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
@@ -94,12 +94,9 @@ //效验数据 ValidatorUtils.validateEntity(softwareTestOrderDto.getSoftwareTestOrder(), AddGroup.class, DefaultGroup.class); SimpleDateFormat sdf = new SimpleDateFormat("yyyy"); String year = sdf.format(new Date()); Map<String, String> map = new HashMap<>(); map.put("funCode", "software_test_order"); map.put("year",year); softwareTestOrderDto.getSoftwareTestOrder().setYear(year); map.put("projectId",softwareTestOrderDto.getProjectId().toString()); softwareTestOrderDto.getSoftwareTestOrder().setCode(sysCodeRuleService.getNewCode(map)); Boolean result = softwareTestOrderService.save(softwareTestOrderDto); return Result.ok(); modules/mainPart/src/main/java/com/zt/life/modules/project/dto/EnvironDto.java
New file @@ -0,0 +1,35 @@ package com.zt.life.modules.project.dto; import com.zt.life.modules.project.model.*; import com.zt.life.modules.sysBaseInfo.model.TestAgencyInfo; import com.zt.life.sys.dto.OssDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.ArrayList; import java.util.List; @Data public class EnvironDto { private Long id; private Long projectId; private Long environId; @ApiModelProperty(value = "测试项目基本信息") private Project project; @ApiModelProperty(value = "测试环境建立确认") private Environ environ; @ApiModelProperty(value = "测试机构信息") private TestAgencyInfo TestAgencyInfo; @ApiModelProperty(value = "附件") private OssDto files; @ApiModelProperty(value = "软件资源") private List<EnvironSoftwareResources> softwareResourcesList = new ArrayList<>(); @ApiModelProperty(value = "硬件资源") private List<EnvironHardwareResources> hardwareResourcesList = new ArrayList<>(); @ApiModelProperty(value = "环境差异性分析") private List<EnvironAnalysis> environAnalysisList = new ArrayList<>(); }
@@ -19,8 +19,6 @@ private SoftwareTestOrder softwareTestOrder; @ApiModelProperty(value = "测试项目基本信息") private Project project; @ApiModelProperty(value = "测试环境建立确认") private Environ environ; @ApiModelProperty(value = "测试机构信息") private TestAgencyInfo TestAgencyInfo; @ApiModelProperty(value = "附件") @@ -30,12 +28,6 @@ private List<SoftwareTestOrderMeasured> measuredList = new ArrayList<>(); @ApiModelProperty(value = "交付件") private List<SoftwareTestOrderDeliverable> deliverableList = new ArrayList<>(); @ApiModelProperty(value = "软件资源") private List<EnvironSoftwareResources> softwareResourcesList = new ArrayList<>(); @ApiModelProperty(value = "硬件资源") private List<EnvironHardwareResources> hardwareResourcesList = new ArrayList<>(); @ApiModelProperty(value = "环境差异性分析") private List<EnvironAnalysis> environAnalysisList = new ArrayList<>(); }
@@ -40,6 +40,9 @@ @ApiModelProperty(value = "测试依据") private String testBasis; @ApiModelProperty(value = "测试依据其他：") private String otherBasis; @ApiModelProperty(value = "测试类型1") private String testType1; @@ -48,6 +51,9 @@ @ApiModelProperty(value = "测试标准") private String testStandard; @ApiModelProperty(value = "测试标准其他") private String otherStandard; @ApiModelProperty(value = "开始日期") @JsonFormat(pattern = "yyyy-MM-dd") @@ -63,6 +69,9 @@ @ApiModelProperty(value = "其他要求") private String otherRequire; @ApiModelProperty(value = "其他要求其他") private String requireOther; @ApiModelProperty(value = "测试日期") @JsonFormat(pattern = "yyyy-MM-dd") private Date testDate; @@ -77,6 +86,9 @@ @ApiModelProperty(value = "物品性质") private String articleNature; @ApiModelProperty(value = "物品性质其他") private String otherNature; @ApiModelProperty(value = "样品状态") private String sampleStatus;
@@ -2,7 +2,7 @@ import com.zt.common.service.BaseService; import com.zt.life.modules.project.dao.EnvironDao; import com.zt.life.modules.project.dto.SoftwareTestOrderDto; import com.zt.life.modules.project.dto.EnvironDto; import com.zt.life.modules.project.model.*; import com.zt.life.modules.sysBaseInfo.model.TestAgencyInfo; import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService; @@ -51,8 +51,8 @@ private TestAgencyInfoService testAgencyInfoService; public SoftwareTestOrderDto getDto(Long environId, Long projectId) { SoftwareTestOrderDto data = new SoftwareTestOrderDto(); public EnvironDto getDto(Long environId, Long projectId) { EnvironDto data = new EnvironDto(); if (environId != null) { Environ environ = this.get(environId); data.setEnviron(environ); @@ -100,25 +100,25 @@ super.deleteLogic(ids); } public Boolean save(SoftwareTestOrderDto softwareTestOrderDto) { Long environId = softwareTestOrderDto.getEnviron().getId(); public Boolean save(EnvironDto environDto) { Long environId = environDto.getEnviron().getId(); if (environId != null) baseDao.updateById(softwareTestOrderDto.getEnviron()); baseDao.updateById(environDto.getEnviron()); else { SimpleDateFormat sdf = new SimpleDateFormat("yyyy"); String year = sdf.format(new Date()); Map<String, String> map = new HashMap<>(); map.put("funCode", "environ"); map.put("year",year); softwareTestOrderDto.getEnviron().setYear(year); softwareTestOrderDto.getEnviron().setProjectId(softwareTestOrderDto.getProjectId()); softwareTestOrderDto.getEnviron().setCode(sysCodeRuleService.getNewCode(map)); baseDao.insert(softwareTestOrderDto.getEnviron()); environId = softwareTestOrderDto.getEnviron().getId(); map.put("projectId",environDto.getProjectId().toString()); environDto.getEnviron().setYear(year); environDto.getEnviron().setProjectId(environDto.getProjectId()); environDto.getEnviron().setCode(sysCodeRuleService.getNewCode(map)); baseDao.insert(environDto.getEnviron()); environId = environDto.getEnviron().getId(); } int i = 0; for (EnvironSoftwareResources environSoftwareResources : softwareTestOrderDto.getSoftwareResourcesList()) { for (EnvironSoftwareResources environSoftwareResources : environDto.getSoftwareResourcesList()) { environSoftwareResources.setEnvironId(environId); if (environSoftwareResources.getId() != null) { environSoftwareResourcesService.update(environSoftwareResources); @@ -130,7 +130,7 @@ } } i = 0; for (EnvironHardwareResources environHardwareResources : softwareTestOrderDto.getHardwareResourcesList()) { for (EnvironHardwareResources environHardwareResources : environDto.getHardwareResourcesList()) { environHardwareResources.setEnvironId(environId); if (environHardwareResources.getId() != null) { environHardwareResourcesService.update(environHardwareResources); @@ -143,7 +143,7 @@ } i = 0; for (EnvironAnalysis environAnalysis : softwareTestOrderDto.getEnvironAnalysisList()) { for (EnvironAnalysis environAnalysis : environDto.getEnvironAnalysisList()) { environAnalysis.setEnvironId(environId); if (environAnalysis.getId() != null) { environAnalysisService.update(environAnalysis); @@ -154,13 +154,13 @@ environAnalysisService.insert(environAnalysis); } } if (softwareTestOrderDto.getTestAgencyInfo().getId() == 10000) { softwareTestOrderDto.getTestAgencyInfo().setId(environId); testAgencyInfoService.insert(softwareTestOrderDto.getTestAgencyInfo()); if (environDto.getTestAgencyInfo().getId() == 10000) { environDto.getTestAgencyInfo().setId(environId); testAgencyInfoService.insert(environDto.getTestAgencyInfo()); } else { testAgencyInfoService.update(softwareTestOrderDto.getTestAgencyInfo()); testAgencyInfoService.update(environDto.getTestAgencyInfo()); } sysOssConfigService.updateOss(softwareTestOrderDto.getEnviron().getId(), softwareTestOrderDto.getFiles());// 保存附件 sysOssConfigService.updateOss(environDto.getEnviron().getId(), environDto.getFiles());// 保存附件 return true; } } modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
@@ -94,12 +94,9 @@ if (softwareTestOrderId != null) baseDao.updateById(softwareTestOrderDto.getSoftwareTestOrder()); else { SimpleDateFormat sdf = new SimpleDateFormat("yyyy"); String year = sdf.format(new Date()); Map<String, String> map = new HashMap<>(); map.put("funCode", "software_test_order"); map.put("year",year); softwareTestOrderDto.getSoftwareTestOrder().setYear(year); map.put("projectId",softwareTestOrderDto.getProjectId().toString()); softwareTestOrderDto.getSoftwareTestOrder().setProjectId(softwareTestOrderDto.getProjectId()); softwareTestOrderDto.getSoftwareTestOrder().setCode(sysCodeRuleService.getNewCode(map)); baseDao.insert(softwareTestOrderDto.getSoftwareTestOrder()); zt/core/src/main/java/com/zt/modules/coderule/dao/SysCodeRuleDao.java
@@ -2,6 +2,7 @@ import com.zt.common.dao.BaseDao; import com.zt.modules.coderule.model.SysCodeRule; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper;
@@ -49,7 +49,7 @@ String year = map.get("year"); if (map.get("projectId")!=null){ Map<String, String> mapProject = baseDao.getMapProjectIdentity(map.get("projectId")); newCodeTemplet = newCodeTemplet.replace("[项目编号]",mapProject.get("identity")); newCodeTemplet = newCodeTemplet.replace("[项目编号]",mapProject.get("software_identity")); year = mapProject.get("year"); } newCodeTemplet = newCodeTemplet.replace("[年份]",year); zt/core/src/main/resources/mapper/coderule/SysCodeRuleDao.xml
@@ -20,7 +20,7 @@ select * from sys_code_rule where fun_code = #{funCode} </select> <select id="getProjectIdentity" resultType="java.lang.String"> select IDENTITY from project where id = ${projectId} select software_identity from project where id = ${projectId} </select> <select id="getMaxCode" resultType="java.lang.String"> select max(code) from ${tableName} where code like '${newCodeTemplet}' @@ -29,7 +29,7 @@ </select> <select id="getMapProjectIdentity" resultType="java.util.Map"> select identity,year from project where id = ${projectId} select software_identity,year from project where id = ${projectId} </select>
