From d363e8168a9d821a87ff75406aec9a87ed19722a Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 22 十一月 2023 17:20:09 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dto/ItemCirculatOrderDto.java | 32 +++
web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue | 111 ++++++----
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderTechnicalService.java | 49 ++++
web/src/views/modules/itemCirculatOrder/ItemCirculatOrder.vue | 2
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/controller/ItemCirculatOrderTechnicalController.java | 96 +++++++++
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/controller/ItemCirculatOrderController.java | 45 +++-
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java | 106 ++++++++++
modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml | 5
web/src/views/modules/project/Environ.vue | 3
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java | 3
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/model/ItemCirculatOrderTechnical.java | 54 +++++
modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderTechnicalDao.xml | 20 ++
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dao/ItemCirculatOrderTechnicalDao.java | 23 ++
13 files changed, 486 insertions(+), 63 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/controller/ItemCirculatOrderController.java b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/controller/ItemCirculatOrderController.java
index e4f716a..2a1cebe 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/controller/ItemCirculatOrderController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/controller/ItemCirculatOrderController.java
@@ -12,8 +12,13 @@
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.itemCirculatOrder.dto.ItemCirculatOrderDto;
import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder;
import com.zt.life.modules.itemCirculatOrder.service.ItemCirculatOrderService;
+import com.zt.life.modules.project.dto.SoftwareTestOrderDto;
+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;
import io.swagger.annotations.ApiImplicitParams;
@@ -23,7 +28,9 @@
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
@@ -39,6 +46,12 @@
@Autowired
private ItemCirculatOrderService itemCirculatOrderService;
+ @Autowired
+ private SysCodeRuleService sysCodeRuleService;
+
+ @Autowired
+ private SysOssConfigService sysOssConfigService;
+
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
@@ -52,37 +65,45 @@
return PageResult.ok(itemCirculatOrderService.page(queryFilter));
}
- @GetMapping("{id}")
+ @GetMapping("getDto")
@ApiOperation("淇℃伅")
- public Result<ItemCirculatOrder> get(@PathVariable("id") Long id){
- ItemCirculatOrder data = itemCirculatOrderService.get(id);
-
+ public Result<ItemCirculatOrderDto> getDto(Long projectId, Long circulatOrderid) {
+ ItemCirculatOrderDto data = itemCirculatOrderService.getDto(projectId, circulatOrderid);
+ if (circulatOrderid!=null) {
+ OssDto ossDto = sysOssConfigService.getOssByBusiType(circulatOrderid, "circulat_order");
+ if (ossDto != null) {
+ data.setFiles(ossDto);
+ }
+ }
return Result.ok(data);
}
@PostMapping
@ApiOperation("鏂板")
@LogOperation("鏂板")
- public Result insert(@RequestBody ItemCirculatOrder itemCirculatOrder){
+ public Result insert(@RequestBody ItemCirculatOrderDto itemCirculatOrderDto){
//鏁堥獙鏁版嵁
- ValidatorUtils.validateEntity(itemCirculatOrder, AddGroup.class, DefaultGroup.class);
- itemCirculatOrderService.insert(itemCirculatOrder);
-
+ ValidatorUtils.validateEntity(itemCirculatOrderDto.getCirculatOrder(), AddGroup.class, DefaultGroup.class);
+ Map<String, String> map = new HashMap<>();
+ map.put("funCode", "item_circulat_order");
+ map.put("projectId",itemCirculatOrderDto.getProjectId().toString());
+ itemCirculatOrderDto.getCirculatOrder().setCode(sysCodeRuleService.getNewCode(map));
+ Boolean result = itemCirculatOrderService.save(itemCirculatOrderDto);
return Result.ok();
}
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
- public Result update(@RequestBody ItemCirculatOrder itemCirculatOrder){
+ public Result update(@RequestBody ItemCirculatOrderDto itemCirculatOrderDto){
//鏁堥獙鏁版嵁
- ValidatorUtils.validateEntity(itemCirculatOrder, UpdateGroup.class, DefaultGroup.class);
- itemCirculatOrderService.update(itemCirculatOrder);
+ ValidatorUtils.validateEntity(itemCirculatOrderDto.getCirculatOrder(), UpdateGroup.class, DefaultGroup.class);
+ Boolean result = itemCirculatOrderService.save(itemCirculatOrderDto);
return Result.ok();
}
- @DeleteMapping
+ @DeleteMapping("deleteCirculat")
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
public Result delete(@RequestBody Long[] ids){
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/controller/ItemCirculatOrderTechnicalController.java b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/controller/ItemCirculatOrderTechnicalController.java
new file mode 100644
index 0000000..02fdd64
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/controller/ItemCirculatOrderTechnicalController.java
@@ -0,0 +1,96 @@
+package com.zt.life.modules.itemCirculatOrder.controller;
+
+
+import com.zt.common.annotation.LogOperation;
+import com.zt.common.constant.Constant;
+import com.zt.common.annotation.QueryParam;
+import com.zt.common.db.query.QueryFilter;
+import com.zt.common.servlet.Result;
+import com.zt.common.servlet.PageResult;
+import com.zt.common.validator.AssertUtils;
+import com.zt.common.validator.ValidatorUtils;
+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.itemCirculatOrder.model.ItemCirculatOrderTechnical;
+import com.zt.life.modules.itemCirculatOrder.service.ItemCirculatOrderTechnicalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+
+/**
+ * item_circulat_order_technical
+ *
+ * @author zt generator
+ * @since 1.0.0 2023-11-22
+ */
+@RestController
+@RequestMapping("/itemCirculatOrder/ItemCirculatOrderTechnical/")
+@Api(tags="item_circulat_order_technical")
+public class ItemCirculatOrderTechnicalController {
+ @Autowired
+ private ItemCirculatOrderTechnicalService itemCirculatOrderTechnicalService;
+
+ @GetMapping("page")
+ @ApiOperation("鍒嗛〉")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
+ @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),
+ })
+ public PageResult<ItemCirculatOrderTechnical> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
+
+ return PageResult.ok(itemCirculatOrderTechnicalService.page(queryFilter));
+ }
+
+ @GetMapping("{id}")
+ @ApiOperation("淇℃伅")
+ public Result<ItemCirculatOrderTechnical> get(@PathVariable("id") Long id){
+ ItemCirculatOrderTechnical data = itemCirculatOrderTechnicalService.get(id);
+
+ return Result.ok(data);
+ }
+
+ @PostMapping
+ @ApiOperation("鏂板")
+ @LogOperation("鏂板")
+ public Result insert(@RequestBody ItemCirculatOrderTechnical itemCirculatOrderTechnical){
+ //鏁堥獙鏁版嵁
+ ValidatorUtils.validateEntity(itemCirculatOrderTechnical, AddGroup.class, DefaultGroup.class);
+ itemCirculatOrderTechnicalService.insert(itemCirculatOrderTechnical);
+
+ return Result.ok();
+ }
+
+ @PutMapping
+ @ApiOperation("淇敼")
+ @LogOperation("淇敼")
+ public Result update(@RequestBody ItemCirculatOrderTechnical itemCirculatOrderTechnical){
+ //鏁堥獙鏁版嵁
+ ValidatorUtils.validateEntity(itemCirculatOrderTechnical, UpdateGroup.class, DefaultGroup.class);
+ itemCirculatOrderTechnicalService.update(itemCirculatOrderTechnical);
+
+ return Result.ok();
+ }
+
+ @DeleteMapping
+ @ApiOperation("鍒犻櫎")
+ @LogOperation("鍒犻櫎")
+ public Result delete(@RequestBody Long[] ids){
+ //鏁堥獙鏁版嵁
+ AssertUtils.isArrayEmpty(ids, "id");
+ itemCirculatOrderTechnicalService.delete(ids);
+
+ return Result.ok();
+ }
+
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dao/ItemCirculatOrderTechnicalDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dao/ItemCirculatOrderTechnicalDao.java
new file mode 100644
index 0000000..b5d4b51
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dao/ItemCirculatOrderTechnicalDao.java
@@ -0,0 +1,23 @@
+package com.zt.life.modules.itemCirculatOrder.dao;
+
+import com.zt.common.dao.BaseDao;
+import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrderTechnical;
+import org.apache.ibatis.annotations.Mapper;
+
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * item_circulat_order_technical
+ *
+ * @author zt generator
+ * @since 1.0.0 2023-11-22
+ */
+@Mapper
+public interface ItemCirculatOrderTechnicalDao extends BaseDao<ItemCirculatOrderTechnical> {
+
+ List<ItemCirculatOrderTechnical> getList(Map<String, Object> params);
+
+}
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
new file mode 100644
index 0000000..ebc9840
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dto/ItemCirculatOrderDto.java
@@ -0,0 +1,32 @@
+package com.zt.life.modules.itemCirculatOrder.dto;
+
+import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder;
+import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrderTechnical;
+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 ItemCirculatOrderDto {
+ private Long id;
+ private Long projectId;
+ private Long circulatOrderid;
+
+ @ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅")
+ private Project project;
+ @ApiModelProperty(value = "鐗╁搧娴佽浆鍗�")
+ private ItemCirculatOrder circulatOrder;
+ @ApiModelProperty(value = "娴嬭瘯鏈烘瀯淇℃伅")
+ private TestAgencyInfo TestAgencyInfo;
+ @ApiModelProperty(value = "闄勪欢")
+ private OssDto files;
+
+ @ApiModelProperty(value = "鎶�鏈祫鏂�")
+ private List<ItemCirculatOrderTechnical> technicalList = new ArrayList<>();
+}
+
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/model/ItemCirculatOrderTechnical.java b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/model/ItemCirculatOrderTechnical.java
new file mode 100644
index 0000000..ed8d8e9
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/model/ItemCirculatOrderTechnical.java
@@ -0,0 +1,54 @@
+package com.zt.life.modules.itemCirculatOrder.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.zt.common.entity.BusiEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * item_circulat_order_technical
+ *
+ * @author zt generator
+ * @since 1.0.0 2023-11-22
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("item_circulat_order_technical")
+public class ItemCirculatOrderTechnical extends BusiEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "鐗╁搧娴佽浆鍗旾D")
+ private Long circulatOrderId;
+
+ @ApiModelProperty(value = "搴忓彿")
+ private Integer no;
+
+ @ApiModelProperty(value = "鎶�鏈祫鏂欏悕绉�")
+ private String infoName;
+
+ @ApiModelProperty(value = "鏍囪瘑")
+ private String identify;
+
+ @ApiModelProperty(value = "鐗堟湰")
+ private String version;
+
+ @ApiModelProperty(value = "瀵嗙骇")
+ private String secretClass;
+
+ @ApiModelProperty(value = "浠嬭川")
+ private String medium;
+
+ @ApiModelProperty(value = "鏁伴噺")
+ private String amount;
+
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+
+ @ApiModelProperty(value = "鏂囦欢")
+ private String file;
+
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
index f49494d..5a53691 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
@@ -1,12 +1,35 @@
package com.zt.life.modules.itemCirculatOrder.service;
import com.zt.common.service.BaseService;
+import com.zt.core.sys.dto.DictDto;
+import com.zt.core.sys.dto.DictItemDto;
+import com.zt.core.sys.dto.DictLeafDto;
+import com.zt.life.export.dto.WordFile;
import com.zt.life.modules.itemCirculatOrder.dao.ItemCirculatOrderDao;
+import com.zt.life.modules.itemCirculatOrder.dto.ItemCirculatOrderDto;
import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder;
+import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrderTechnical;
+import com.zt.life.modules.project.dto.SoftwareTestOrderDto;
+import com.zt.life.modules.project.model.*;
+import com.zt.life.modules.project.service.ProjectService;
+import com.zt.life.modules.project.service.SoftwareTestOrderService;
+import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
+import com.zt.life.sys.service.SysOssConfigService;
+import com.zt.modules.coderule.service.SysCodeRuleService;
+import com.zt.modules.oss.service.SysOssService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.FileNotFoundException;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
@@ -17,7 +40,26 @@
*/
@Service
public class ItemCirculatOrderService extends BaseService<ItemCirculatOrderDao, ItemCirculatOrder> {
+ @Autowired
+ private SysOssConfigService sysOssConfigService;
+ @Autowired
+ private SysOssService sysOssService;
+
+ @Autowired
+ private TestAgencyInfoService testAgencyInfoService;
+
+ @Autowired
+ private SysCodeRuleService sysCodeRuleService;
+
+ @Autowired
+ private ProjectService projectService;
+
+ @Autowired
+ private ItemCirculatOrderTechnicalService technicalService;
+
+ @Autowired
+ private SoftwareTestOrderService softwareTestOrderService;
/**
* 鍒嗛〉鏌ヨ
*
@@ -37,4 +79,68 @@
super.deleteLogic(ids);
}
+ public Boolean save(ItemCirculatOrderDto itemCirculatOrderDto) {
+ Long circulatOrderid = itemCirculatOrderDto.getCirculatOrder().getId();
+ if (circulatOrderid != null)
+ baseDao.updateById(itemCirculatOrderDto.getCirculatOrder());
+ else {
+ Map<String, String> map = new HashMap<>();
+ map.put("funCode", "item_circulat_order");
+ map.put("projectId",itemCirculatOrderDto.getProjectId().toString());
+ itemCirculatOrderDto.getCirculatOrder().setProjectId(itemCirculatOrderDto.getProjectId());
+ itemCirculatOrderDto.getCirculatOrder().setCode(sysCodeRuleService.getNewCode(map));
+ baseDao.insert(itemCirculatOrderDto.getCirculatOrder());
+ circulatOrderid = itemCirculatOrderDto.getCirculatOrder().getId();
+ }
+
+ for (ItemCirculatOrderTechnical circulatOrderTechnical : itemCirculatOrderDto.getTechnicalList()) {
+ circulatOrderTechnical.setCirculatOrderId(circulatOrderid);
+ if (circulatOrderTechnical.getId() != null) {
+ technicalService.update(circulatOrderTechnical);
+ } else {
+ circulatOrderTechnical.setCirculatOrderId(circulatOrderid);
+ technicalService.insert(circulatOrderTechnical);
+ }
+ }
+
+ if (itemCirculatOrderDto.getTestAgencyInfo().getId() == 10000) {
+ itemCirculatOrderDto.getTestAgencyInfo().setId(circulatOrderid);
+ testAgencyInfoService.insert(itemCirculatOrderDto.getTestAgencyInfo());
+ } else {
+ testAgencyInfoService.update(itemCirculatOrderDto.getTestAgencyInfo());
+ }
+ sysOssConfigService.updateOss(itemCirculatOrderDto.getId(), itemCirculatOrderDto.getFiles());// 淇濆瓨闄勪欢
+ return true;
+ }
+
+ public ItemCirculatOrderDto getDto(Long projectId, Long circulatOrderid) {
+ ItemCirculatOrderDto data = new ItemCirculatOrderDto();
+ if (circulatOrderid != null) {
+ data.setId(circulatOrderid);
+ ItemCirculatOrder itemCirculatOrder = this.get(circulatOrderid);
+ data.setCirculatOrder(itemCirculatOrder);
+
+ projectId = itemCirculatOrder.getProjectId();
+
+ data.setTestAgencyInfo(testAgencyInfoService.get(circulatOrderid));
+
+ List<ItemCirculatOrderTechnical> technicalList = technicalService.getList(circulatOrderid);
+ data.setTechnicalList(technicalList);
+
+ } else {
+ ItemCirculatOrder itemCirculatOrder =new ItemCirculatOrder();
+ data.setCirculatOrder(itemCirculatOrder);
+ }
+
+ if (projectId != null) {
+ data.setProjectId(projectId);
+ data.setProject(projectService.get(projectId));
+ }
+
+ if (data.getTestAgencyInfo() == null)
+ data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
+
+ return data;
+ }
+
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderTechnicalService.java b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderTechnicalService.java
new file mode 100644
index 0000000..99914bb
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderTechnicalService.java
@@ -0,0 +1,49 @@
+package com.zt.life.modules.itemCirculatOrder.service;
+
+import com.zt.common.service.BaseService;
+import com.zt.life.modules.itemCirculatOrder.dao.ItemCirculatOrderTechnicalDao;
+import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrderTechnical;
+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;
+
+
+/**
+ * item_circulat_order_technical
+ *
+ * @author zt generator
+ * @since 1.0.0 2023-11-22
+ */
+@Service
+public class ItemCirculatOrderTechnicalService extends BaseService<ItemCirculatOrderTechnicalDao, ItemCirculatOrderTechnical> {
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param queryFilter
+ * @return
+ */
+ public List<ItemCirculatOrderTechnical> page(QueryFilter queryFilter) {
+ return baseDao.getList(queryFilter.getQueryParams());
+ }
+
+ /**
+ * 鍒犻櫎
+ *
+ * @param ids
+ */
+ public void delete(Long[] ids) {
+ super.deleteLogic(ids);
+ }
+
+ public List<ItemCirculatOrderTechnical> getList(Long circulatOrderid) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("circulatOrderid",circulatOrderid);
+ return baseDao.getList(params);
+ }
+
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
index d0c3dd8..2b8895c 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
@@ -67,7 +67,8 @@
@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 = "code", value = "缂栧彿", dataType = Constant.QT.STRING, format = "CODE^LK")})
+ @ApiImplicitParam(name = "code", value = "缂栧彿", dataType = Constant.QT.STRING, format = "CODE^LK"),
+ @ApiImplicitParam(name = "softwareName", value = "杞欢鍚嶇О", dataType = Constant.QT.STRING, format = "software_name^EQ"),})
public PageResult<Environ> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
return PageResult.ok(environService.page(queryFilter));
diff --git a/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml b/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml
index 99d2c51..f4ce68d 100644
--- a/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml
@@ -4,10 +4,11 @@
<mapper namespace="com.zt.life.modules.itemCirculatOrder.dao.ItemCirculatOrderDao">
<select id="getList" resultType="com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder">
- select a.*
+ select a.*, p.*
from item_circulat_order a
+ INNER JOIN project p ON p.id = a.project_id
<where>
- a.is_delete = 0
+ a.is_delete = 0 and p.is_delete = 0
<if test="whereSql!=null">
and ${whereSql}
</if>
diff --git a/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderTechnicalDao.xml b/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderTechnicalDao.xml
new file mode 100644
index 0000000..a97e622
--- /dev/null
+++ b/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderTechnicalDao.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.zt.life.modules.itemCirculatOrder.dao.ItemCirculatOrderTechnicalDao">
+
+ <select id="getList" resultType="com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrderTechnical">
+ select a.*
+ from item_circulat_order_technical a
+ <where>
+ a.is_delete = 0
+ <if test="circulatOrderid!=null">
+ and circulat_order_id = ${circulatOrderid}
+ </if>
+ </where>
+ <if test="orderBySql!=null">
+ ORDER BY ${orderBySql}
+ </if>
+ </select>
+
+</mapper>
diff --git a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
index 8d78aa6..c5eb523 100644
--- a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
@@ -3,7 +3,7 @@
<el-form :model="dataForm" :inline="true" ref="dataForm" style="padding-top: 0" :disabled="dataForm.disabled" label-width="120px" class="circulationFormAuto">
<div class="">
<el-form-item label-width="60px" label="缂栧彿:" style="width:100%;margin-bottom: -5px">
- <span>{{dataForm.environ.code}}</span>
+ <span>{{dataForm.circulatOrder.code}}</span>
</el-form-item>
</div>
<div style="border: 1px solid rgba(0,0,0,.2);width: 99%" >
@@ -12,16 +12,16 @@
<el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="涓撲笟瀹為獙瀹�"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom" label="浠诲姟缂栧彿" style="width: 32%">
- <el-input v-model="dataForm.testAgencyInfo.site" placeholder="浠诲姟缂栧彿"></el-input>
+ <el-input v-model="dataForm.project.softwareIdentity" placeholder="浠诲姟缂栧彿"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom" label="鐗╁搧鍚嶇О" style="width: 32%">
<el-input v-model="dataForm.project.softwareName" placeholder="鐗╁搧鍚嶇О"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom3" label="鍨嬪彿" style="width: 32%">
- <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="鍨嬪彿"></el-input>
+ <zt-dict v-model="dataForm.project.softwareType" dict="is_embed_software" :radio="true"></zt-dict>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom3" label="鐗╁搧缂栧彿" style="width: 32%">
- <el-input v-model="dataForm.testAgencyInfo.site" placeholder="鐗╁搧缂栧彿"></el-input>
+ <el-input v-model="dataForm.project.softwareIdentity" placeholder="鐗╁搧缂栧彿"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom3" label="鏁� 閲�" style="width: 32%">
<el-input v-model="dataForm.project.softwareName" placeholder="鏁伴噺"></el-input>
@@ -38,24 +38,39 @@
<span v-html="indexFormat(scope.$index)"></span>
</template>
</el-table-column>
- <el-table-column prop="name" min-width="300" label="杞欢椤瑰悕绉�">
+ <el-table-column prop="infoName" min-width="300" label="鎶�鏈祫鏂欏悕绉�">
<template v-slot="{ row }">
- <el-input v-model="row.itemName" placeholder="杞欢椤瑰悕绉�/鐗堟湰"></el-input>
+ <el-input v-model="row.infoName" placeholder="鎶�鏈祫鏂欏悕绉�"></el-input>
</template>
</el-table-column>
- <el-table-column prop="versions" align="center" width="180" label="鐗堟湰">
+ <el-table-column prop="identify" align="center" width="180" label="鏍囪瘑">
+ <template v-slot="{ row }">
+ <el-input v-model="row.identify" placeholder="鏍囪瘑"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="version" align="center" width="180" label="鐗堟湰">
<template v-slot="{ row }">
<el-input v-model="row.version" placeholder="鐗堟湰"></el-input>
</template>
</el-table-column>
- <el-table-column prop="purposes" align="center" width="180" label="鐢ㄩ��">
+ <el-table-column prop="secretClass" label="瀵嗙骇" width="180" align="center">
<template v-slot="{ row }">
- <el-input v-model="row.purposes" placeholder="鐢ㄩ��"></el-input>
+ <el-input v-model="row.secretClass" placeholder="瀵嗙骇"></el-input>
</template>
</el-table-column>
- <el-table-column prop="unit" label="鎻愪緵鍗曚綅" width="180" align="center">
+ <el-table-column prop="medium" label="浠嬭川" width="180" align="center">
<template v-slot="{ row }">
- <el-input v-model="row.provideUnit" placeholder="鎻愪緵鍗曚綅"></el-input>
+ <el-input v-model="row.medium" placeholder="浠嬭川"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="amount" label="鏁伴噺" width="180" align="center">
+ <template v-slot="{ row }">
+ <el-input v-model="row.amount" placeholder="鏁伴噺"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="remark" label="澶囨敞" width="180" align="center">
+ <template v-slot="{ row }">
+ <el-input v-model="row.remark" placeholder="澶囨敞"></el-input>
</template>
</el-table-column>
</el-table>
@@ -73,54 +88,54 @@
<div style="width: calc(100% - 120px);">
<div class="el-border-left">
<el-form-item label="鐗╁搧鏄惁闇�瑕佽繑杩�" label-width="150px" style="width:100%;padding-left:5%;margin-bottom:0">
- <zt-dict v-model="dataForm.softwareTestOrder.otherRequire" :radio="true"
+ <zt-dict v-model="dataForm.circulatOrder.itemRequire" :radio="true"
dict="is_or_not"></zt-dict>
</el-form-item>
<el-form-item label="鐗╁搧鐨勫叾浠栬姹傦細" label-width="150px" style="width:100%;padding-left:5%;margin-bottom:0">
- <el-input v-model="dataForm.softwareTestOrder.requireOther"></el-input>
+ <el-input v-model="dataForm.circulatOrder.itemOther"></el-input>
</el-form-item>
</div>
</div>
</div>
<div class="circulationContentWidth">
<el-form-item class="marginTopAndMarginBottom" label="鐗╁搧鎺ユ敹浜�" style="width: 32%">
- <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="鐗╁搧鎺ユ敹浜�"></el-input>
+ <el-input v-model="dataForm.circulatOrder.itemAccept" placeholder="鐗╁搧鎺ユ敹浜�"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom" label="鏃堕棿" style="width: 32%">
- <el-input v-model="dataForm.testAgencyInfo.site" placeholder="鏃堕棿"></el-input>
+ <el-input v-model="dataForm.circulatOrder.acceptDate" placeholder="鏃堕棿"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom" label="鎯呭喌璇存槑" style="width: 32%">
- <el-input v-model="dataForm.project.softwareName" placeholder="鎯呭喌璇存槑"></el-input>
+ <el-input v-model="dataForm.circulatOrder.acceptSituation" placeholder="鎯呭喌璇存槑"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom3" label="鏍″噯妫�娴嬩汉" style="width: 32%">
- <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="鏍″噯妫�娴嬩汉"></el-input>
+ <el-input v-model="dataForm.circulatOrder.calibratDetect" placeholder="鏍″噯妫�娴嬩汉"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom3" label="鏃堕棿" style="width: 32%">
- <el-input v-model="dataForm.testAgencyInfo.site" placeholder="鏃堕棿"></el-input>
+ <el-input v-model="dataForm.circulatOrder.detectDate" placeholder="鏃堕棿"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom3" label="鎯呭喌璇存槑" style="width: 32%">
- <el-input v-model="dataForm.project.softwareName" placeholder="鎯呭喌璇存槑"></el-input>
+ <el-input v-model="dataForm.circulatOrder.detectSituation" placeholder="鎯呭喌璇存槑"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom2" label="鐗╁搧鍏ュ簱浜�" style="width: 32%">
- <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="鐗╁搧鍏ュ簱浜�"></el-input>
+ <el-input v-model="dataForm.circulatOrder.warehouse" placeholder="鐗╁搧鍏ュ簱浜�"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom2" label="鏃堕棿" style="width: 32%">
- <el-input v-model="dataForm.testAgencyInfo.site" placeholder="鏃堕棿"></el-input>
+ <el-input v-model="dataForm.circulatOrder.warehouseDate" placeholder="鏃堕棿"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom2" label="鎯呭喌璇存槑" style="width: 32%">
- <el-input v-model="dataForm.project.softwareName" placeholder="鎯呭喌璇存槑"></el-input>
+ <el-input v-model="dataForm.circulatOrder.warehouseSituation" placeholder="鎯呭喌璇存槑"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom2" label="鐗╁搧鍙戞斁浜�" style="width: 32%">
- <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="鐗╁搧鍙戞斁浜�"></el-input>
+ <el-input v-model="dataForm.circulatOrder.itemIssue" placeholder="鐗╁搧鍙戞斁浜�"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom2" label="鏃堕棿" style="width: 32%">
- <el-input v-model="dataForm.testAgencyInfo.site" placeholder="鏃堕棿"></el-input>
+ <el-input v-model="dataForm.circulatOrder.issueDate" placeholder="鏃堕棿"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom2" label="鎯呭喌璇存槑" style="width: 32%">
- <el-input v-model="dataForm.project.softwareName" placeholder="鎯呭喌璇存槑"></el-input>
+ <el-input v-model="dataForm.circulatOrder.issueSituation" placeholder="鎯呭喌璇存槑"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom2 lastChild" label="澶囨敞" style="width: 100%">
- <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="澶囨敞"></el-input>
+ <el-input v-model="dataForm.circulatOrder.remark" placeholder="澶囨敞"></el-input>
</el-form-item>
</div>
</div>
@@ -134,20 +149,23 @@
return {
dataForm: {
id: '',
- url:'',
- environ:{
+ circulatOrder:{
code: '1',
- hardSoftwareRes: '',
- testEnvirontDiagram: '',
- establishStaff:'',
- establishDate:'',
- environAnalysis: '',
- environEstablish: '',
- environConfirmat: '',
- confirmatStaff: '',
- confirmatDate: '',
- isVirusScan: '',
- virusDatabaseVersion: '',
+ itemAccept: '',
+ itemRequire: '',
+ itemOther:'',
+ acceptSituation:'',
+ acceptDate: '',
+ calibratDetect: '',
+ detectDate: '',
+ detectSituation: '',
+ warehouse: '',
+ warehouseDate: '',
+ warehouseSituation: '',
+ itemIssue: '',
+ issueDate: '',
+ issueSituation: '',
+ remark: '',
},
project: {
softwareIdentity: '',
@@ -155,14 +173,8 @@
},
testAgencyInfo: {
agencyName:'',
- site:'',
},
- softwareTestOrder:{
- requireOther:'',
- },
- softwareResourcesList:[],
- hardwareResourcesList:[],
- environAnalysisList:[]
+ technicalList:[]
}
}
},
@@ -176,11 +188,16 @@
},
// 鑾峰彇淇℃伅
async getInfo() {
- let res = await this.$http.get(`/itemCirculatOrder/ItemCirculatOrder/${this.dataForm.id}`)
+ let params = {
+ circulatOrderid: this.dataForm.id,
+ projectId: this.dataForm.projectId
+ }
+ let res = await this.$http.get(`/itemCirculatOrder/ItemCirculatOrder/getDto`,{params: params})
this.dataForm = {
...this.dataForm,
...res.data
}
+ console.log(this.dataForm,"this.dataForm")
},
// 琛ㄥ崟鎻愪氦
async formSubmit() {
diff --git a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder.vue b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder.vue
index 72874d4..d9aeac5 100644
--- a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder.vue
+++ b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder.vue
@@ -1,7 +1,7 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-itemCirculatOrder-itemCirculatOrder}">
- <zt-table-wraper query-url="/itemCirculatOrder/ItemCirculatOrder/page" delete-url="/itemCirculatOrder/ItemCirculatOrder" v-slot="{ table }">
+ <zt-table-wraper query-url="/itemCirculatOrder/ItemCirculatOrder/page" delete-url="/itemCirculatOrder/ItemCirculatOrder/deleteCirculat" v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
<el-input v-model="dataForm.code" placeholder="璇疯緭鍏ョ墿鍝佹祦杞崟缂栧彿" clearable></el-input>
diff --git a/web/src/views/modules/project/Environ.vue b/web/src/views/modules/project/Environ.vue
index 89676ed..05dc14b 100644
--- a/web/src/views/modules/project/Environ.vue
+++ b/web/src/views/modules/project/Environ.vue
@@ -7,6 +7,9 @@
<el-input v-model="dataForm.code" placeholder="璇疯緭鍏ョ紪鍙�" clearable></el-input>
</el-form-item>
<el-form-item>
+ <el-input v-model="dataForm.softwareName" placeholder="璇疯緭鍏ヨ蒋浠跺悕绉�" clearable></el-input>
+ </el-form-item>
+ <el-form-item>
<zt-button type="query" @click="table.query()"/>
<zt-button type="primary" class="el-icon-edit" perm="project:add" @click="add()">鏂板</zt-button>
<!--<zt-button type="add" perm="project:add" @click="table.editHandle()"/>-->
--
Gitblit v1.9.1