| core/src/main/java/com/zt/life/export/service/WordFileService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| modules/pom.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| web/src/views/modules/project/Project-AddOrUpdate.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| zt/core/src/main/java/com/zt/security/controller/LoginController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
core/src/main/java/com/zt/life/export/service/WordFileService.java
@@ -8,6 +8,7 @@ import com.deepoove.poi.policy.HackLoopTableRenderPolicy; import com.zt.life.export.dto.WordFile; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -19,16 +20,19 @@ @Service public class WordFileService { @Value("${zt.oss.local-path}") private String localPath; public void exportWordFile(HttpServletRequest request, Object dataObj, WordFile wordFile, HttpServletResponse response) throws UnsupportedEncodingException, FileNotFoundException { // 数据map集合 Map<String, Object> wordData = new HashMap<>(); //HackLoopTableRenderPolicy hackLoopTableRenderPolicy = new HackLoopTableRenderPolicy(); Configure config = null; ConfigureBuilder builder = Configure.newBuilder(); this.formatWordData(wordFile, wordData, builder); this.formatWordData(dataObj, wordData, builder); config = builder.build(); File fl = new File(wordFile.getModulePath()); File fl = new File(localPath+"/template/"+wordFile.getModulePath()); FileInputStream fs = new FileInputStream(fl); XWPFTemplate template; if (config != null) { modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
@@ -39,10 +39,10 @@ @ApiModelProperty(value = "测试依据") private String testBasis; @ApiModelProperty(value = "测试类型") @ApiModelProperty(value = "测试类型1") private String testType1; @ApiModelProperty(value = "测试类型") @ApiModelProperty(value = "测试类型2") private String testType2; @ApiModelProperty(value = "测试标准") modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
@@ -8,6 +8,7 @@ import com.zt.life.export.service.WordFileService; import com.zt.life.modules.project.dao.SoftwareTestOrderDao; import com.zt.life.modules.project.dto.SoftwareTestOrderDto; import com.zt.life.modules.project.model.Project; import com.zt.life.modules.project.model.SoftwareTestOrder; import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable; import com.zt.life.modules.project.model.SoftwareTestOrderMeasured; @@ -79,6 +80,7 @@ public Boolean save(SoftwareTestOrderDto softwareTestOrderDto) { Long softwareTestOrderId = softwareTestOrderDto.getSoftwareTestOrder().getId(); if (softwareTestOrderId != null) baseDao.updateById(softwareTestOrderDto.getSoftwareTestOrder()); else { Map<String, String> map = new HashMap<>(); @@ -124,6 +126,7 @@ data.setId(orderId); SoftwareTestOrder softwareTestOrder = this.get(orderId); data.setSoftwareTestOrder(softwareTestOrder); projectId = softwareTestOrder.getProjectId(); data.setTestAgencyInfo(testAgencyInfoService.get(orderId)); @@ -134,30 +137,31 @@ List<SoftwareTestOrderMeasured> measuredList = softwareTestOrderMeasuredService.childrenTables(orderId); data.setMeasuredList(measuredList); } else { List<?> testItemResult = baseDao.dictList("testItem_type"); Project project = projectService.get(projectId); String projectCode = project.getCode(); List<?> testItemResult = baseDao.dictList("testItem_type",projectCode); List<?> measuredList = testItemResult; data.setMeasuredList((List<SoftwareTestOrderMeasured>) measuredList); List<?> productLibraryResult = baseDao.dictList("product_library_file"); List<?> productLibraryResult = baseDao.dictList("product_library_file",projectCode); List<?> deliverableList = productLibraryResult; data.setDeliverableList((List<SoftwareTestOrderDeliverable>) deliverableList); } if (data.getTestAgencyInfo() == null) data.setTestAgencyInfo(testAgencyInfoService.get(10000L)); if (projectId != null) { data.setProjectId(projectId); data.setProject(projectService.get(projectId)); } if (data.getTestAgencyInfo() == null) data.setTestAgencyInfo(testAgencyInfoService.get(10000L)); return data; } public void exportWord(Long id, HttpServletRequest request, HttpServletResponse response) { WordFile wordFile = new WordFile(); wordFile.setModulePath("aaaa"); wordFile.setWordName("aaa"); SoftwareTestOrderDto dataObj = this.getDto(id, null); try { SoftwareTestOrderDto dataObj = this.getDto(null, id); List<DictDto> userDicts = sysDictTypeService.getUserDicts(); DictDto testType1Dict = userDicts.stream() @@ -198,9 +202,9 @@ dataObj.getSoftwareTestOrder().setTestType21(testType21); dataObj.getSoftwareTestOrder().setTestType22(testType22); List<Object> measuredList = new ArrayList<>(); try { WordFile wordFile = new WordFile(); wordFile.setModulePath("测试委托单.docx"); wordFile.setWordName(dataObj.getProject().getSoftwareName()+"_测试委托单"); wordFileService.exportWordFile(request, dataObj, wordFile, response); } catch (UnsupportedEncodingException e) { e.printStackTrace(); modules/pom.xml
@@ -21,11 +21,6 @@ <version>1.0</version> </dependency> <dependency> <groupId>com.deepoove</groupId> <artifactId>poi-tl</artifactId> <version>1.10.5</version> </dependency> <dependency> <groupId>com.googlecode.aviator</groupId> <artifactId>aviator</artifactId> <version>5.0.1</version> web/src/views/modules/project/Project-AddOrUpdate.vue
@@ -66,7 +66,7 @@ <el-input v-model="dataForm.softwareName" placeholder="请输入软件名称"></el-input> </zt-form-item> <!-- 联系人 --> <zt-form-item class="marginTopAndMarginBottom" label="软件标识" prop="identity" style="width: 49%" rules="required"> <zt-form-item class="marginTopAndMarginBottom" label="软件标识" prop="softwareIdentity" style="width: 49%" rules="required"> <el-input v-model="dataForm.softwareIdentity" placeholder="请输入软件标识"></el-input> </zt-form-item> <!-- 详细地址 --> @@ -115,60 +115,6 @@ </div> </div> </el-form> <!-- </div>--> <!-- <el-form :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="120px">--> <!-- <zt-form-item label="委托单位名称" prop="entrustUnitName" rules="required">--> <!-- <el-input v-model="dataForm.entrustUnitName"></el-input>--> <!-- </zt-form-item>--> <!-- <zt-form-item label="委托单位地址" prop="entrustUnitAddress" rules="required">--> <!-- <el-input v-model="dataForm.entrustUnitAddress"></el-input>--> <!-- </zt-form-item>--> <!-- <zt-form-item label="委托单位联系人" prop="entrustUnitContact" rules="required">--> <!-- <el-input v-model="dataForm.entrustUnitContact"></el-input>--> <!-- </zt-form-item>--> <!-- <zt-form-item label="委托单位联系方式" prop="entrustUnitContWay" rules="required">--> <!-- <el-input v-model="dataForm.entrustUnitContWay"></el-input>--> <!-- </zt-form-item>--> <!-- <zt-form-item label="开发单位名称" prop="developUnitName" rules="required">--> <!-- <el-input v-model="dataForm.developUnitName"></el-input>--> <!-- </zt-form-item>--> <!-- <zt-form-item label="开发单位地址" prop="developUnitAddress" rules="required">--> <!-- <el-input v-model="dataForm.developUnitAddress"></el-input>--> <!-- </zt-form-item>--> <!-- <zt-form-item label="开发单位联系人" prop="developUnitContact" rules="required">--> <!-- <el-input v-model="dataForm.developUnitContact"></el-input>--> <!-- </zt-form-item>--> <!-- <zt-form-item label="开发单位联系方式" prop="developUnitContWay" rules="required">--> <!-- <el-input v-model="dataForm.developUnitContWay"></el-input>--> <!-- </zt-form-item>--> <!-- <zt-form-item label="软件名称" prop="software" rules="required">--> <!-- <el-input v-model="dataForm.software"></el-input>--> <!-- </zt-form-item>--> <!-- <zt-form-item label="项目编号" prop="code" rules="required">--> <!-- <el-input v-model="dataForm.code"></el-input>--> <!-- </zt-form-item>--> <!-- <zt-form-item label="项目标识" prop="identity" rules="required">--> <!-- <el-input v-model="dataForm.identity"></el-input>--> <!-- </zt-form-item>--> <!-- <zt-form-item label="密级" prop="secretClass" rules="required">--> <!-- <zt-dict v-model="dataForm.secretClass" dict="secret_class"></zt-dict>--> <!-- </zt-form-item>--> <!-- <zt-form-item label="关键等级" prop="criticalLevel" rules="required">--> <!-- <zt-dict v-model="dataForm.criticalLevel" dict="critical_level"></zt-dict>--> <!-- </zt-form-item>--> <!-- <zt-form-item label="项目负责人" prop="projectLeader" rules="required">--> <!-- <el-input v-model="dataForm.projectLeader"></el-input>--> <!-- </zt-form-item>--> <!-- <zt-form-item label="项目测试人员" prop="projectTesters" rules="required">--> <!-- <el-input v-model="dataForm.projectTesters"></el-input>--> <!-- </zt-form-item>--> <!-- <zt-form-item label="项目审核人员" prop="projectReviewer" rules="required">--> <!-- <el-input v-model="dataForm.projectReviewer"></el-input>--> <!-- </zt-form-item>--> <!-- <zt-form-item label="是否签署合同" prop="isContract" rules="required">--> <!-- <zt-dict v-model="dataForm.isContract" dict="is_or_not"></zt-dict>--> <!-- </zt-form-item>--> <!-- </el-form>--> </zt-dialog> </template>
@@ -70,23 +70,12 @@ @Api(tags = "登录管理") public class LoginController { @Value("${data.unitid}") private Long unitid; @Value("${data.menuPos}") private String menuPos; @Value("${data.debug}") private Boolean debug; @Value("${data.test}") private Boolean test; @Value("${data.single-sign-url}") private String singleSignUrl; @Value("${data.loginbytoken}") private String loginbytoken; @Value("${zt.oss.local-server}") private String localServer; @Value("${data.testNewFun}") private Boolean testNewFun;
