From 0117a966938d2f689e90eee907bd12bc9e123a18 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期四, 16 十一月 2023 09:32:37 +0800
Subject: [PATCH] 编号
---
core/src/main/java/com/zt/life/export/service/WordFileService.java | 2
/dev/null | 88 ----------------------
modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderMeasuredDao.xml | 18 ---
modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java | 9 +-
modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDeliverableDao.xml | 13 --
modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDeliverableDao.java | 1
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 27 +++---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderDeliverableService.java | 8 +
modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderMeasuredDao.java | 2
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderMeasuredService.java | 11 +-
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java | 7 -
11 files changed, 40 insertions(+), 146 deletions(-)
diff --git a/core/src/main/java/com/zt/life/export/service/WordFileService.java b/core/src/main/java/com/zt/life/export/service/WordFileService.java
index 006db00..2329e9e 100644
--- a/core/src/main/java/com/zt/life/export/service/WordFileService.java
+++ b/core/src/main/java/com/zt/life/export/service/WordFileService.java
@@ -55,7 +55,7 @@
formatWordData(staticFieldValue, wordData, builder);
} else {
if (field.getType().getName().equals("java.util.List")) {
- builder.bind(fieldName, new HackLoopTableRenderPolicy());
+ builder.bind(fieldName, new HackLoopTableRenderPolicy());
} else if (staticFieldValue != null) {
String valStr = staticFieldValue.toString();
if (valStr.contains("绛惧悕鍥剧墖:")) {
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/utils/WordUtils.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/utils/WordUtils.java
deleted file mode 100644
index bcc826b..0000000
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/utils/WordUtils.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.zt.life.modules.mainPart.utils;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.Validator;
-import cn.hutool.core.util.IdUtil;
-import com.deepoove.poi.XWPFTemplate;
-import com.deepoove.poi.config.Configure;
-import com.deepoove.poi.data.PictureRenderData;
-import com.deepoove.poi.data.Pictures;
-import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-
-public class WordUtils {
- public static void main(String[] args) {
-// generateByNetWork();
- generateByFile();
- }
- /**
- * 鏍规嵁鏈湴鏂囦欢娴佺敓鎴恮ord
- **/
- public static void generateByFile() {
- // 姝ゅ鐩存帴鏄湰鍦版枃浠剁殑缁濆璺緞
- String pictureUrl = "C:\\Users\\admin\\Desktop\\W\\妯℃澘.png";
- HashMap<String, Object> finalMap = new HashMap<>();
- finalMap.put("濮撳悕", "寮犱笁");
- finalMap.put("韬唤璇佸彿", "511232XXXXXXX");
- finalMap.put("鎵嬫満鍙�", "1328292xxxx");
- finalMap.put("鍛樺伐绛惧瓧", "寮犱笁");
- finalMap.put("鏃ユ湡", "2023-05-16");
- // 浠庢湰鍦拌鍙栧浘鐗囷紝缃叆word妯℃澘锛岀瓑寰呯紪璇�
- if (Validator.isNotEmpty(pictureUrl)) {
- PictureRenderData picture = Pictures.ofLocal(pictureUrl).size(60, 50).create();
- finalMap.put("鍛樺伐绛惧瓧鍥剧墖", picture);
- }
- ArrayList<Object> workList = CollUtil.newArrayList();
- finalMap.put("宸ヤ綔缁忓巻鍒楄〃", workList);
- for (int i = 0; i < 3; i++) {
- // 妯℃嫙浠巑ysql鏌ヨ鍒楄〃鏁版嵁
- HashMap<String, Object> workItem = new HashMap<>();
- workItem.put("搴忓彿", i + 1);
- workItem.put("鍏徃鍚�", "鎴愰兘鏈夐檺鍏徃" + i);
- workItem.put("宸ヤ綔鏃堕暱", i + 5 + "灏忔椂");
- workItem.put("salary", "1000" + i);
- workItem.put("鑱旂郴", "鑱旂郴浜�" + i);
- workItem.put("宀椾綅", "宀椾綅" + i);
- workList.add(workItem);
- }
- // 娉ㄦ剰锛氭澶勭敤鐨勬槸 <鍖哄潡瀵�> key鏄瓧绗︿覆锛寁alue鍒欐斁缃竴涓泦鍚堬紝绫讳技浜庢ā鏉垮紩鎿庣殑foreach鏍囩
- ArrayList<Object> stateList = CollUtil.newArrayList();
- finalMap.put("鐢虫槑椤瑰垪琛�", stateList);
- // 妯℃嫙浠巑ysql鏌ヨ鏁版嵁锛屾敼閫犱负word妯℃澘鎵�闇�鐨勬暟鎹粨鏋�
- List<String> stateListFromMySQL = Arrays.asList("鏈汉鎵�閫掍氦鐨勬墍鏈夊姙鐞嗕汉鎵嶅紩杩涙潗鏂欏強濉啓鐨勬儏鍐靛潎灞炲疄锛�"
- , "鎴戝凡璁ょ湡闃呰浠ヤ笂鍐呭骞剁‘璁わ紱"
- , "鑻ュ湪鐢宠鏈熼棿淇℃伅鍙樻洿涓嶅仛鍙樻洿銆傝嫢杩濆弽锛屾湰浜烘効鎰忔壙鎷呯敱姝や骇鐢熺殑鍚庢灉銆�");
- for (int i = 0; i < stateListFromMySQL.size(); i++) {
- HashMap<String, Object> stateItem = new HashMap<>();
- stateItem.put("item", stateListFromMySQL.get(i) + "");
- stateList.add(stateItem);
- }
- // 浠庣綉缁渦rl 涓嬭浇word妯℃澘鍒版寚瀹氭枃浠跺す
- File wordTemplate = new File("C:\\Users\\admin\\Desktop\\W\\talentsTemplate.docx");
- // 姝ゅ浣跨敤浜唒oi-tl鐨�<琛ㄦ牸琛屽惊鐜彃浠�>锛屾澶勪竴瀹氳杩涜鍙傛暟bind锛屾柟渚縲ord妯℃澘鍙傛暟鏇挎崲
- LoopRowTableRenderPolicy policy = new LoopRowTableRenderPolicy();
- Configure build = Configure.builder().bind(policy, "宸ヤ綔缁忓巻鍒楄〃").build();
- // 杩涜缂栬瘧
- String absolutePath = wordTemplate.getAbsolutePath();
- XWPFTemplate render = XWPFTemplate.compile(absolutePath, build).render(finalMap);
- // 姝ゅ鏄埄鐢‵ile锛岀洿鎺ュ湪鏈湴鍒涘缓鏂囦欢锛屽皢鍙傛暟鏇挎崲鍚庣殑鏂囦欢娴佸啓鍏ュ埌璇ユ枃浠讹紝word灏辨槸鏈�缁堢殑缁撴灉
- File word = new File("C:\\Users\\admin\\Desktop\\W\\" + File.separator + IdUtil.getSnowflake(10000001,10000001).nextId() + ".docx");
- try {
- render.writeToFile(word.getAbsolutePath());
- } catch (IOException e) {
- e.printStackTrace();
- }
- // 涓嬮潰鐨勬柟娉曞彲浠ユ牴鎹笟鍔¤皟鏁达紝鎴戣繖閲屾槸灏嗗弬鏁版浛鎹㈠悗鐨剋ord涓婁紶鍒伴」鐩搴旂殑鏂囦欢鏈嶅姟鍣紝鎷垮埌鐨剈rl杩涜瀛樺叆鏁版嵁搴�
-// FileUtil.del(word);
-// List<String> list = JSONUtil.parseArray(json).toList(String.class);
-
-
- }
-
-}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
index dcaf91c..89b512c 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
+++ b/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;
/**
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDeliverableDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDeliverableDao.java
index 1a50920..be8b493 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDeliverableDao.java
+++ b/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);
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderMeasuredDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderMeasuredDao.java
index bdc1dd3..70d3c5b 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderMeasuredDao.java
+++ b/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);
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
index 131c9cc..0a795de 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
+++ b/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;
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderDeliverableService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderDeliverableService.java
index 97d70af..b980703 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderDeliverableService.java
+++ b/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);
}
/**
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderMeasuredService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderMeasuredService.java
index 2d3fac2..c8bce29 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderMeasuredService.java
+++ b/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);
}
/**
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
index 9b28ab3..55097bb 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
+++ b/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();
diff --git a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDeliverableDao.xml b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDeliverableDao.xml
index b48dd83..5ecb2b1 100644
--- a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDeliverableDao.xml
+++ b/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>
diff --git a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderMeasuredDao.xml b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderMeasuredDao.xml
index d9f1633..4888338 100644
--- a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderMeasuredDao.xml
+++ b/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>
--
Gitblit v1.9.1