core/src/main/java/com/zt/life/export/service/WordFileService.java
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/utils/WordUtils.java
File was deleted modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
@@ -13,10 +13,7 @@ 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.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; import com.zt.life.modules.project.service.ProjectService; import com.zt.life.modules.project.service.SoftwareTestOrderDeliverableService; import com.zt.life.modules.project.service.SoftwareTestOrderMeasuredService; @@ -27,18 +24,14 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; /** modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDeliverableDao.java
@@ -19,6 +19,5 @@ public interface SoftwareTestOrderDeliverableDao extends BaseDao<SoftwareTestOrderDeliverable> { List<SoftwareTestOrderDeliverable> getList(Map<String, Object> params); List<SoftwareTestOrderDeliverable> childrenTables(Long id); } modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderMeasuredDao.java
@@ -1,7 +1,6 @@ package com.zt.life.modules.project.dao; import com.zt.common.dao.BaseDao; import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable; import com.zt.life.modules.project.model.SoftwareTestOrderMeasured; import org.apache.ibatis.annotations.Mapper; @@ -20,5 +19,4 @@ public interface SoftwareTestOrderMeasuredDao extends BaseDao<SoftwareTestOrderMeasured> { List<SoftwareTestOrderMeasured> getList(Map<String, Object> params); List<SoftwareTestOrderMeasured> childrenTables(Long id); } modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
@@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode; import java.util.Date; import java.util.HashMap; import java.util.List; /** @@ -198,15 +199,15 @@ @TableField(exist = false) @ApiModelProperty(value = "测试类型1第1列") List<String> testType11; List<HashMap<String, Object>> testType11; @TableField(exist = false) @ApiModelProperty(value = "测试类型1第2列") List<String> testType12; List<HashMap<String, Object>> testType12; @TableField(exist = false) @ApiModelProperty(value = "测试类型2第1列") List<String> testType21; List<HashMap<String, Object>> testType21; @TableField(exist = false) @ApiModelProperty(value = "测试类型2第2列") List<String> testType22; List<HashMap<String, Object>> testType22; } modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderDeliverableService.java
@@ -6,7 +6,9 @@ import org.springframework.stereotype.Service; import com.zt.common.db.query.QueryFilter; import javax.annotation.Resource; import java.util.HashMap; import java.util.List; import java.util.Map; /** @@ -32,8 +34,10 @@ * 子表查询 * */ public List<SoftwareTestOrderDeliverable> childrenTables(Long orderId) { return baseDao.childrenTables(orderId); public List<SoftwareTestOrderDeliverable> getList(Long orderId) { Map<String, Object> params = new HashMap<>(); params.put("orderId",orderId); return baseDao.getList(params); } /** modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderMeasuredService.java
@@ -2,12 +2,13 @@ import com.zt.common.service.BaseService; import com.zt.life.modules.project.dao.SoftwareTestOrderMeasuredDao; import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable; import com.zt.life.modules.project.model.SoftwareTestOrderMeasured; import org.springframework.stereotype.Service; import com.zt.common.db.query.QueryFilter; import javax.annotation.Resource; import java.util.HashMap; import java.util.List; import java.util.Map; /** @@ -33,8 +34,10 @@ * 子表查询 * */ public List<SoftwareTestOrderMeasured> childrenTables(Long orderId) { return baseDao.childrenTables(orderId); public List<SoftwareTestOrderMeasured> getList(Long orderId) { Map<String, Object> params = new HashMap<>(); params.put("orderId",orderId); return baseDao.getList(params); } /** modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
@@ -80,7 +80,6 @@ public Boolean save(SoftwareTestOrderDto softwareTestOrderDto) { Long softwareTestOrderId = softwareTestOrderDto.getSoftwareTestOrder().getId(); if (softwareTestOrderId != null) baseDao.updateById(softwareTestOrderDto.getSoftwareTestOrder()); else { Map<String, String> map = new HashMap<>(); @@ -131,10 +130,10 @@ data.setTestAgencyInfo(testAgencyInfoService.get(orderId)); List<SoftwareTestOrderDeliverable> deliverableList = softwareTestOrderDeliverableService.childrenTables(orderId); List<SoftwareTestOrderDeliverable> deliverableList = softwareTestOrderDeliverableService.getList(orderId); data.setDeliverableList(deliverableList); List<SoftwareTestOrderMeasured> measuredList = softwareTestOrderMeasuredService.childrenTables(orderId); List<SoftwareTestOrderMeasured> measuredList = softwareTestOrderMeasuredService.getList(orderId); data.setMeasuredList(measuredList); } else { Project project = projectService.get(projectId); @@ -168,20 +167,22 @@ .filter(c -> c.getDictType().equals("test_type1")) .collect(Collectors.toList()).get(0); List<String> testType11 = new ArrayList<>(); List<String> testType12 = new ArrayList<>(); List<String> testType21 = new ArrayList<>(); List<String> testType22 = new ArrayList<>(); List<HashMap<String, Object>> testType11 = new ArrayList<>(); List<HashMap<String, Object>> testType12 = new ArrayList<>(); List<HashMap<String, Object>> testType21 = new ArrayList<>(); List<HashMap<String, Object>> testType22 = new ArrayList<>(); int i = 0; String testType = "," + dataObj.getSoftwareTestOrder().getTestType1() + ","; for (DictItemDto dictItemDto : ((DictLeafDto) testType1Dict).getDataList()) { String value = dictItemDto.getDictValue(); String desc = (testType.contains("," + value + ",") ? "☑" : "□") + dictItemDto.getDictLabel(); HashMap<String, Object> stateItem = new HashMap<>(); stateItem.put("item",desc); if ((i++) % 2 == 0) { testType12.add(desc); testType12.add(stateItem); } else { testType11.add(desc); testType11.add(stateItem); } } @@ -190,10 +191,12 @@ for (DictItemDto dictItemDto : ((DictLeafDto) testType1Dict).getDataList()) { String value = dictItemDto.getDictValue(); String desc = (testType.contains("," + value + ",") ? "☑" : "□") + dictItemDto.getDictLabel(); HashMap<String, Object> stateItem = new HashMap<>(); stateItem.put("item",desc); if ((i++) % 2 == 0) { testType22.add(desc); testType22.add(stateItem); } else { testType21.add(desc); testType21.add(stateItem); } } @@ -204,7 +207,7 @@ WordFile wordFile = new WordFile(); wordFile.setModulePath("测试委托单.docx"); wordFile.setWordName(dataObj.getProject().getSoftwareName()+"_测试委托单"); wordFile.setWordName(dataObj.getProject().getSoftwareName()+"_测试委托单.docx"); wordFileService.exportWordFile(request, dataObj, wordFile, response); } catch (UnsupportedEncodingException e) { e.printStackTrace(); modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDeliverableDao.xml
@@ -8,6 +8,9 @@ from software_test_order_deliverable a <where> a.is_delete = 0 <if test="orderId!=null"> and order_id = ${orderId} </if> <if test="whereSql!=null"> and ${whereSql} </if> @@ -15,15 +18,5 @@ <if test="orderBySql!=null"> ORDER BY ${orderBySql} </if> </select> <select id="childrenTables" resultType="com.zt.life.modules.project.model.SoftwareTestOrderDeliverable"> SELECT a.* FROM software_test_order_deliverable a INNER JOIN software_test_order p ON p.id = a.order_id <where> a.is_delete = 0 and p.is_delete = 0 </where> </select> </mapper> modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderMeasuredDao.xml
@@ -8,6 +8,9 @@ from software_test_order_measured a <where> a.is_delete = 0 <if test="orderId!=null"> and order_id = ${orderId} </if> <if test="whereSql!=null"> and ${whereSql} </if> @@ -16,19 +19,4 @@ ORDER BY ${orderBySql} </if> </select> <select id="childrenTables" resultType="com.zt.life.modules.project.model.SoftwareTestOrderMeasured"> SELECT a.* FROM software_test_order_measured a INNER JOIN software_test_order p ON p.id = a.order_id <where> a.is_delete = 0 <if test="whereSql!=null"> and ${whereSql} </if> </where> </select> </mapper>
