From e4db7d4a3e03ec4767a57743aef01e54461bbe9a Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 18 十二月 2023 14:29:11 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dto/ItemCirculatOrderDto.java | 5
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dto/ConfigItemWarehouseDto.java | 5
modules/mainPart/src/main/java/com/zt/life/modules/contractReview/service/ContractReviewService.java | 36 ++------
modules/mainPart/src/main/java/com/zt/life/modules/contractReview/model/ContractReview.java | 5 +
modules/mainPart/src/main/java/com/zt/life/modules/contractReview/dto/ContractReviewDto.java | 9 +
web/src/views/modules/contractReview/ContractReview-AddOrUpdate.vue | 34 +++++---
core/src/main/java/com/zt/life/export/service/WordFileService.java | 8 +-
web/src/views/modules/contractReview/ContractReview.vue | 12 +--
modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/dto/ConfigItemChangeDto.java | 5
modules/mainPart/src/main/java/com/zt/life/modules/contractReview/controller/ContractReviewController.java | 22 ++++-
modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java | 4
web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue | 2
modules/mainPart/src/main/resources/mapper/contractReview/ContractReviewDao.xml | 6
modules/mainPart/src/main/java/com/zt/life/modules/project/dto/EnvironDto.java | 5
modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/dto/CheckOrderDto.java | 7 +
modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/dto/ConfigItemOutboundDto.java | 5
modules/mainPart/src/main/resources/mapper/contractReview/ContractReviewItemDao.xml | 2
modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java | 21 ++++
18 files changed, 111 insertions(+), 82 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 1d304c2..8b9208e 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
@@ -62,19 +62,19 @@
Object staticFieldValue = ReflectUtil.getFieldValue(dataObj, field.getName()); // 灞炴�у搴旂殑鏁版嵁
if (typeName.contains("com.zt.life.modules")) {
formatWordData(staticFieldValue, wordData, builder);
- }else {
+ } else {
if (field.getType().getName().equals("java.util.List")) {
builder.bind(fieldName, new HackLoopTableRenderPolicy());
} else if (staticFieldValue != null) {
if (typeName.contains("java.util.Date") && fieldName.contains("Date")) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- staticFieldValue=sdf.format(staticFieldValue);
+ staticFieldValue = sdf.format(staticFieldValue);
}
String valStr = staticFieldValue.toString();
if (valStr.contains("鏂囦欢鍥剧墖:")) {
valStr = localPath + valStr.replace("鏂囦欢鍥剧墖:", "");
File file = new File(valStr);
- if (file.exists()) {
+ if (file.exists() && !localPath.equals(valStr)) {
try (InputStream in = ossEncryptService.decrypt(file)) {
InputStream in2 = ossEncryptService.decrypt(file);
BufferedImage bufferedImage = ImageIO.read(in2);
@@ -86,7 +86,7 @@
e.printStackTrace();
}
} else {
- staticFieldValue = new PictureRenderData(100, 30, "template/noSign.png");
+ staticFieldValue = new PictureRenderData(100, 30, localPath+"template/noSign.png");
}
}
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/dto/ConfigItemChangeDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/dto/ConfigItemChangeDto.java
index c8e86ef..22c71fb 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/dto/ConfigItemChangeDto.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/dto/ConfigItemChangeDto.java
@@ -18,11 +18,10 @@
private Long projectId;
private Long warehouseId;
- @ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅")
- private Project project;
@ApiModelProperty(value = "閰嶇疆椤瑰彉鏇�")
private ConfigItemChange configItemChange;
-
+ @ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅")
+ private Project project;
private FlowInfoDto flowInfoDto;
@ApiModelProperty(value = "鍙樻洿閰嶇疆椤�")
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/dto/ConfigItemOutboundDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/dto/ConfigItemOutboundDto.java
index 2ab6474..a8bd7cf 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/dto/ConfigItemOutboundDto.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/dto/ConfigItemOutboundDto.java
@@ -16,10 +16,11 @@
private Long projectId;
private Long warehouseId;
- @ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅")
- private Project project;
@ApiModelProperty(value = "閰嶇疆椤瑰嚭搴�")
private ConfigItemOutbound configItemOutbound;
+ @ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅")
+ private Project project;
+
private FlowInfoDto flowInfoDto;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dto/ConfigItemWarehouseDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dto/ConfigItemWarehouseDto.java
index 7bad93b..d22cf30 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dto/ConfigItemWarehouseDto.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dto/ConfigItemWarehouseDto.java
@@ -22,10 +22,11 @@
private Long projectId;
private Long warehouseId;
- @ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅")
- private Project project;
@ApiModelProperty(value = "閰嶇疆椤瑰叆搴�")
private ConfigItemWarehouse configItemWarehouse;
+ @ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅")
+ private Project project;
+
private FlowInfoDto flowInfoDto;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/contractReview/controller/ContractReviewController.java b/modules/mainPart/src/main/java/com/zt/life/modules/contractReview/controller/ContractReviewController.java
index 9e7d246..9947ce9 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/contractReview/controller/ContractReviewController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/contractReview/controller/ContractReviewController.java
@@ -17,6 +17,8 @@
import com.zt.life.modules.contractReview.service.ContractReviewService;
import com.zt.life.modules.itemCirculatOrder.dto.ItemCirculatOrderDto;
import com.zt.life.modules.itemCirculatOrder.service.ItemCirculatOrderService;
+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;
@@ -49,6 +51,9 @@
@Autowired
private SysCodeRuleService sysCodeRuleService;
+ @Autowired
+ private SysOssConfigService sysOssConfigService;
+
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
@@ -56,10 +61,9 @@
@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 = "reviewPhase", value = "璇勫闃舵", dataType = Constant.QT.STRING, format = "a.review_phase^EQ"),
- @ApiImplicitParam(name = "softwareName", value = "鐗╁搧鍚嶇О", dataType = Constant.QT.STRING, format = "p.software_name^EQ"),
- @ApiImplicitParam(name = "softwareIdentity", value = "鐗╁搧缂栧彿", dataType = Constant.QT.STRING, format = "p.software_identity^EQ")
- })
+ @ApiImplicitParam(name = "reviewType", value = "璇勫闃舵", dataType = Constant.QT.STRING, format = "a.review_phase^EQ"),
+ @ApiImplicitParam(name = "orderCode", value = "濮旀墭鍗曠紪鍙�", dataType = Constant.QT.STRING, format = "s.code^EQ"),
+ })
public PageResult<ContractReview> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
return PageResult.ok(contractReviewService.page(queryFilter));
}
@@ -68,6 +72,12 @@
@ApiOperation("淇℃伅")
public Result<ContractReviewDto> getDto(Long projectId, Long reviewId) {
ContractReviewDto data = contractReviewService.getDto(projectId, reviewId);
+ if (reviewId!=null) {
+ OssDto ossDto = sysOssConfigService.getOssByBusiType(reviewId, "contract_review");
+ if (ossDto != null) {
+ data.setFiles(ossDto);
+ }
+ }
return Result.ok(data);
}
@@ -108,11 +118,11 @@
return Result.ok();
}
-/* @GetMapping("exportReview")
+ @GetMapping("exportReview")
@ApiOperation("鎵撳嵃鍚堝悓璇勫鍗�")
@LogOperation("鎵撳嵃鍚堝悓璇勫鍗�")
public void exportReview(Long id, HttpServletRequest request, HttpServletResponse response) {
contractReviewService.exportReview(id, request, response);
- }*/
+ }
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/contractReview/dto/ContractReviewDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/contractReview/dto/ContractReviewDto.java
index cb8fb4a..405652e 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/contractReview/dto/ContractReviewDto.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/contractReview/dto/ContractReviewDto.java
@@ -6,6 +6,7 @@
import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrderTechnical;
import com.zt.life.modules.project.model.Project;
import com.zt.life.modules.sysBaseInfo.model.TestAgencyInfo;
+import com.zt.life.sys.dto.OssDto;
import com.zt.modules.workflow.dto.FlowInfoDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -19,13 +20,17 @@
private Long projectId;
private Long reviewId;
- @ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅")
- private Project project;
@ApiModelProperty(value = "鍚堝悓璇勫琛�")
private ContractReview contractReview;
+ @ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅")
+ private Project project;
+
@ApiModelProperty(value = "娴嬭瘯鏈烘瀯淇℃伅")
private TestAgencyInfo TestAgencyInfo;
+ @ApiModelProperty(value = "闄勪欢")
+ private OssDto files;
+
@ApiModelProperty(value = "璇勫椤瑰垪琛�")
private List<ContractReviewItem> reviewItemList = new ArrayList<>();
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/contractReview/model/ContractReview.java b/modules/mainPart/src/main/java/com/zt/life/modules/contractReview/model/ContractReview.java
index 4e7c297..d328f15 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/contractReview/model/ContractReview.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/contractReview/model/ContractReview.java
@@ -1,5 +1,6 @@
package com.zt.life.modules.contractReview.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zt.common.entity.BusiEntity;
@@ -59,4 +60,8 @@
@ApiModelProperty(value = "骞翠唤")
private String year;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ private String agencyName;
+
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/contractReview/service/ContractReviewService.java b/modules/mainPart/src/main/java/com/zt/life/modules/contractReview/service/ContractReviewService.java
index e928147..d5d38cc 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/contractReview/service/ContractReviewService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/contractReview/service/ContractReviewService.java
@@ -161,45 +161,31 @@
data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
return data;
}
-/*
- public void exportCirculatOrder(Long id, HttpServletRequest request, HttpServletResponse response) {
+
+
+ public void exportReview(Long id, HttpServletRequest request, HttpServletResponse response) {
try {
ContractReviewDto dataObj = this.getDto(null, id);
- String acceptorPath = "鏂囦欢鍥剧墖:"+ getFilesPath.getSignPath(Convert.toLong(dataObj.getContractReview().getItemAcceptorId()));
- dataObj.getContractReview().setItemAcceptor(acceptorPath);
- String detectorPath = "鏂囦欢鍥剧墖:"+getFilesPath.getSignPath(Convert.toLong(dataObj.getContractReview().getCalibratDetectorId()));
- dataObj.getContractReview().setCalibratDetector(detectorPath);
- String issuerPath = "鏂囦欢鍥剧墖:"+getFilesPath.getSignPath(Convert.toLong(dataObj.getContractReview().getItemIssuerId()));
- dataObj.getContractReview().setItemIssuer(issuerPath);
//閫氱敤瀛楀吀鍒楄〃瀛楃涓茬敓鎴�
- String itemRequireStr = getShowDictList.getShowDictList(dataObj.getContractReview().getItemRequire(), "is_or_not", false);
- dataObj.getContractReview().setItemRequireStr(itemRequireStr);
-
- String acceptSituationStr = getShowDictList.getShowDictList(dataObj.getContractReview().getAcceptSituation(), "is_or_not", false);
- dataObj.getContractReview().setAcceptSituationStr(acceptSituationStr);
-
- String detectSituationStr = getShowDictList.getShowDictList(dataObj.getContractReview().getDetectSituation(), "is_or_not", false);
- dataObj.getContractReview().setDetectSituationStr(detectSituationStr);
-
- String issueSituationStr = getShowDictList.getShowDictList(dataObj.getContractReview().getIssueSituation(), "is_or_not", false);
- dataObj.getContractReview().setIssueSituationStr(issueSituationStr);
+ String reviewTypeStr = getShowDictList.getShowDictList(dataObj.getContractReview().getReviewType(), "review_type", false);
+ dataObj.getContractReview().setReviewType(reviewTypeStr);
for (ContractReviewItem reviewItem : dataObj.getReviewItemList()) {
- String value = reviewItem.getSecretClass();
- String secretClassStr = getShowDictList.getShowDictList(value, "secret_class", false);
- reviewItem.setSecretClass(secretClassStr);
+ String value = reviewItem.getResult();
+ String ResultStr = getShowDictList.getShowDictList(value, "tristate1", false);
+ reviewItem.setResult(ResultStr);
}
WordFile wordFile = new WordFile();
- wordFile.setModulePath("鐗╁搧娴佽浆鍗�.docx");
- wordFile.setWordName(dataObj.getProject().getSoftwareName() + "_鐗╁搧娴佽浆鍗�.docx");
+ wordFile.setModulePath("鍚堝悓璇勫琛�.docx");
+ wordFile.setWordName(dataObj.getProject().getSoftwareName() + "_鍚堝悓璇勫琛�.docx");
wordFileService.exportWordFile(request, dataObj, wordFile, response);
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
} catch (FileNotFoundException e) {
e.printStackTrace();
}
- }*/
+ }
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dto/ItemCirculatOrderDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dto/ItemCirculatOrderDto.java
index e12c1e4..e8418aa 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dto/ItemCirculatOrderDto.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dto/ItemCirculatOrderDto.java
@@ -20,10 +20,11 @@
private FlowInfoDto flowInfoDto;
- @ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅")
- private Project project;
@ApiModelProperty(value = "鐗╁搧娴佽浆鍗�")
private ItemCirculatOrder circulatOrder;
+ @ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅")
+ private Project project;
+
@ApiModelProperty(value = "娴嬭瘯鏈烘瀯淇℃伅")
private TestAgencyInfo TestAgencyInfo;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/EnvironDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/EnvironDto.java
index 4aecb73..e9d1d28 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/EnvironDto.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/EnvironDto.java
@@ -16,10 +16,11 @@
private Long projectId;
private Long environId;
- @ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅")
- private Project project;
@ApiModelProperty(value = "娴嬭瘯鐜寤虹珛纭")
private Environ environ;
+ @ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅")
+ private Project project;
+
@ApiModelProperty(value = "娴嬭瘯鏈烘瀯淇℃伅")
private TestAgencyInfo TestAgencyInfo;
@ApiModelProperty(value = "闄勪欢")
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java
index 1e31c25..03ca4f0 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java
@@ -110,8 +110,8 @@
}
@GetMapping("exportCheckOrder")
- @ApiOperation("鎵撳嵃娴嬭瘯鐜寤虹珛纭琛�")
- @LogOperation("鎵撳嵃娴嬭瘯鐜寤虹珛纭琛�")
+ @ApiOperation("鎵撳嵃妫�鏌ュ崟")
+ @LogOperation("鎵撳嵃妫�鏌ュ崟")
public void exportCheckOrder(Long id, String pageCode, HttpServletRequest request, HttpServletResponse response) {
testCheckOrderService.exportCheckOrder(id,pageCode, request, response);
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/dto/CheckOrderDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/dto/CheckOrderDto.java
index 65bed29..e721690 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/dto/CheckOrderDto.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/dto/CheckOrderDto.java
@@ -22,11 +22,12 @@
private String pageCode;//閰嶇疆椤圭被鍨�
private FlowInfoDto flowInfoDto;
-
- @ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅")
- private Project project;
+
@ApiModelProperty(value = "妫�鏌ュ崟")
private TestCheckOrder checkOrder;
+ @ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅")
+ private Project project;
+
@ApiModelProperty(value = "妫�鏌ュ崟鍒楄〃")
private List<TestCheckOrderList> checkOrderList = new ArrayList<>();
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java
index e67a2f2..a087e32 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java
@@ -167,7 +167,12 @@
//閫氱敤瀛楀吀鍒楄〃瀛楃涓茬敓鎴�
for (TestCheckOrderList checkOrderList : dataObj.getCheckOrderList()) {
String value = checkOrderList.getCheckResult();
- String checkResultStr = getShowDictList.getShowDictList(value, "tristate1", false);
+ String checkResultStr="";
+ if ("plan".equals(pageCode) || "report".equals(pageCode) || "record".equals(pageCode) || "explain".equals(pageCode)) {
+ checkResultStr = getShowDictList.getShowDictList(value, "tristate1", false);
+ }else{
+ checkResultStr = getShowDictList.getShowDictList(value, "tristate2", false);
+ }
checkOrderList.setCheckResult(checkResultStr);
}
@@ -176,11 +181,21 @@
map.put("report", "鎶ュ憡");
map.put("record", "璁板綍");
map.put("explain", "璇存槑");
+ map.put("contract", "鍚堝悓璇勫");
+ map.put("require", "娴嬭瘯闇�姹傚垎鏋愪笌绛栧垝");
+ map.put("execute", "娴嬭瘯璁捐銆佸疄鐜颁笌鎵ц");
+ map.put("summary", "娴嬭瘯鎬荤粨");
String type = map.get(pageCode);
dataObj.setPageCode(type);
WordFile wordFile = new WordFile();
- wordFile.setModulePath("杞欢娴嬭瘯妫�鏌ュ崟.docx");
- wordFile.setWordName(dataObj.getProject().getSoftwareName() + "_杞欢娴嬭瘯"+type+"妫�鏌ュ崟.docx");
+
+ if ("plan".equals(pageCode) || "report".equals(pageCode) || "record".equals(pageCode) || "explain".equals(pageCode)) {
+ wordFile.setModulePath("杞欢娴嬭瘯妫�鏌ュ崟.docx");
+ wordFile.setWordName(dataObj.getProject().getSoftwareName() + "_杞欢娴嬭瘯" + type + "妫�鏌ュ崟.docx");
+ } else {
+ wordFile.setModulePath("璐ㄩ噺淇濊瘉妫�鏌ュ崟.docx");
+ wordFile.setWordName(dataObj.getProject().getSoftwareName() + "_璐ㄩ噺淇濊瘉妫�鏌ュ崟(" + type + ").docx");
+ }
wordFileService.exportWordFile(request, dataObj, wordFile, response);
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
diff --git a/modules/mainPart/src/main/resources/mapper/contractReview/ContractReviewDao.xml b/modules/mainPart/src/main/resources/mapper/contractReview/ContractReviewDao.xml
index 399bbb6..cf7db67 100644
--- a/modules/mainPart/src/main/resources/mapper/contractReview/ContractReviewDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/contractReview/ContractReviewDao.xml
@@ -4,11 +4,11 @@
<mapper namespace="com.zt.life.modules.contractReview.dao.ContractReviewDao">
<select id="getList" resultType="com.zt.life.modules.contractReview.model.ContractReview">
- select a.*, p.software_name,p.software_identity
+ select a.*, s.code
from contract_review a
- INNER JOIN project p ON p.id = a.project_id
+ INNER JOIN software_test_order s ON s.project_id = a.project_id
<where>
- a.is_delete = 0 and p.is_delete = 0
+ a.is_delete = 0 and s.is_delete = 0
<if test="whereSql!=null">
and ${whereSql}
</if>
diff --git a/modules/mainPart/src/main/resources/mapper/contractReview/ContractReviewItemDao.xml b/modules/mainPart/src/main/resources/mapper/contractReview/ContractReviewItemDao.xml
index 80c8adf..28c0852 100644
--- a/modules/mainPart/src/main/resources/mapper/contractReview/ContractReviewItemDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/contractReview/ContractReviewItemDao.xml
@@ -9,7 +9,7 @@
<where>
a.is_delete = 0
<if test="reviewId!=null">
- and warehouse_id = ${reviewId}
+ and review_id = ${reviewId}
</if>
</where>
<if test="orderBySql!=null">
diff --git a/web/src/views/modules/contractReview/ContractReview-AddOrUpdate.vue b/web/src/views/modules/contractReview/ContractReview-AddOrUpdate.vue
index 0a462f8..1a169de 100644
--- a/web/src/views/modules/contractReview/ContractReview-AddOrUpdate.vue
+++ b/web/src/views/modules/contractReview/ContractReview-AddOrUpdate.vue
@@ -31,19 +31,20 @@
<el-table ref="tableConfigItemList" class="el-software el-margin-top-bot"
style="width: 99%;margin-left: 5px" border :data="dataForm.reviewItemList"
stripe>
- <el-table-column prop="no" align="center" width="60" label="搴忓彿">
+ <el-table-column prop="no" align="center" width="60" >
<template slot-scope="scope">
<span v-html="indexFormat(scope.$index)"></span>
</template>
</el-table-column>
- <el-table-column prop="item" min-width="400" label="閰嶇疆椤瑰悕绉�">
+ <el-table-column prop="item" min-width="400" >
<template v-slot="{ row }">
<el-input v-model="row.item" placeholder="璇勫椤�"></el-input>
</template>
</el-table-column>
- <el-table-column prop="result" label="瀵嗙骇" width="180" align="center">
+ <el-table-column prop="result" width="180" align="center">
<template v-slot="{ row }">
- <zt-dict v-model="row.result" placeholder="璇勫缁撴灉" dict="tristate1"></zt-dict>
+ <zt-dict v-model="row.result" placeholder="璇勫缁撴灉" dict="tristate1" :radio="true"
+ clearable></zt-dict>
</template>
</el-table-column>
</el-table>
@@ -112,7 +113,12 @@
</div>
</div>
</div>
- <add-or-update-check ref="addOrUpdate" @recall="setCheckId"/>
+ <div class="el-flex order-sc" style="height: 60px">
+ <el-form-item class="marginTopAndMarginBottom" style="width: 100%">
+ <config-uploader :lineHeight="true" busi-type="contract_review" model-name="dataForm" :dataForm="dataForm"
+ v-model="dataForm.files"/>
+ </el-form-item>
+ </div>
</el-form>
<template v-slot:footer>
<el-button v-if="dataForm.disabled" type="primary" @click="print()">鎵撳嵃</el-button>
@@ -130,6 +136,7 @@
return {
dataForm: {
id: '',
+ files:'',
contractReview: {
code: '',
orderCode: '',
@@ -177,21 +184,22 @@
...this.dataForm,
...res.data
}
+ if(this.dataForm.contractReview === null){
+ this.dataForm.contractReview={}
+ }
+ if(this.dataForm.testAgencyInfo === null){
+ this.dataForm.testAgencyInfo={}
+ }
console.log(this.dataForm, "getInfo this.dataForm")
},
-
- setCheckId(checkId, row) {
- console.log(checkId, row, "setCheckId(checkId, row)")
- this.$set(row, 'checkId', checkId)
- },
- /*async print(){
+ async print(){
var params = qs.stringify({
token: Cookies.get('token'),
id:this.dataForm.id
})
- let apiURL = `/contractReview/ContractReview/exportWarehouseOrder`
+ let apiURL = `/contractReview/ContractReview/exportReview`
window.location.href = `${window.SITE_CONFIG['apiURL']}${apiURL}?${params}`
- },*/
+ },
// 琛ㄥ崟鎻愪氦
async formSubmit(submitType) {
let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/contractReview/ContractReview/', this.dataForm)
diff --git a/web/src/views/modules/contractReview/ContractReview.vue b/web/src/views/modules/contractReview/ContractReview.vue
index 1fadbb7..0d18622 100644
--- a/web/src/views/modules/contractReview/ContractReview.vue
+++ b/web/src/views/modules/contractReview/ContractReview.vue
@@ -7,7 +7,7 @@
<zt-dict v-model="dataForm.reviewType" dict="review_type" placeholder="璇烽�夋嫨璇勫闃舵" clearable></zt-dict>
</el-form-item>
<el-form-item>
- <el-input v-model="dataForm.softwareName" placeholder="璇疯緭鍏ヨ蒋浠跺悕绉�" clearable></el-input>
+ <el-input v-model="dataForm.orderCode" placeholder="璇疯緭鍏ュ鎵樺崟缂栧彿" clearable></el-input>
</el-form-item>
<el-form-item>
<zt-button type="query" @click="table.query()"/>
@@ -18,10 +18,9 @@
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:70}" border @selection-change="table.selectionChangeHandle">
<el-table-column type="selection" width="40"/>
<el-table-column prop="code" label="缂栧彿"/>
- <el-table-column prop="reviewType" label="璇勫闃舵"/>
- <el-table-column prop="softwareName" width="250px" label="杞欢鍚嶇О"/>
- <el-table-column prop="softwareIdentity" width="150px" label="椤圭洰鏍囪瘑"/>
- <zt-table-column-handle :table="table" edit-perm="contractReview:update" delete-perm="contractReview::delete"/>
+ <zt-table-column-dict prop="reviewType" width="150px" label="璇勫闃舵" dict="review_type"/>
+ <el-table-column prop="orderCode" width="250px" label="濮旀墭鍗曠紪鍙�"/>
+ <zt-table-column-handle :table="table" edit-perm="contractReview:update" delete-perm="contractReview::delete"/>
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<add-or-update ref="addOrUpdate" @refreshDataList="table.query"/>
@@ -52,9 +51,6 @@
methods: {
add() {
this.$refs.projectSelect.$refs.dialog.init("contract_review")
- },
- isCheckbox(row,index){
- return !(row.flowInfo && row.flowInfo.bizId);
},
openAddWin(row) {
console.log(row.id, 'row.id')
diff --git a/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue b/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
index 9f4bc2f..8a13444 100644
--- a/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
@@ -140,7 +140,7 @@
subtitle: '',
pageName: {
plan: '杞欢娴嬭瘯璁″垝', explain: '杞欢娴嬭瘯璇存槑', record: '杞欢娴嬭瘯璁板綍', report: '杞欢娴嬭瘯鎶ュ憡',
- contract: '鍚堝悓璇勫闃舵', require: '娴嬭瘯闇�姹傚垎鏋愪笌绛栧垝'
+ contract: '鍚堝悓璇勫闃舵', require: '娴嬭瘯闇�姹傚垎鏋愪笌绛栧垝闃舵',execute:'娴嬭瘯璁捐涓庡疄鐜般�佹墽琛岄樁娈�',summary:'娴嬭瘯鎬荤粨闃舵'
},
dataForm: {
id: '',
--
Gitblit v1.9.1