diff --git a/src/main/java/com/bonus/aqgqj/basis/entity/vo/ConfigMainDevVo.java b/src/main/java/com/bonus/aqgqj/basis/entity/vo/ConfigMainDevVo.java index 3c0303e..014395d 100644 --- a/src/main/java/com/bonus/aqgqj/basis/entity/vo/ConfigMainDevVo.java +++ b/src/main/java/com/bonus/aqgqj/basis/entity/vo/ConfigMainDevVo.java @@ -47,14 +47,6 @@ public class ConfigMainDevVo { @Pattern(regexp = "\\d{4}(\\-|\\/|\\.)\\d{1,2}\\1\\d{1,2}", message = "合同生效日期格式不正确", groups = {Query.class}) private String devContractDate; - /** - * 试验周期 - */ -// @NotNull(message = "试验周期不能为空", groups = {Query.class}) - @Min(value = 1,message = "周期格式不正确（范围为正整数）", groups = {Query.class}) -// @Pattern(regexp = "^\\+?[1-9][0-9]*$", message = "周期格式不正确（范围为正整数）", groups = {Query.class}) - private Integer times; - /** * 查询条件限制 */ diff --git a/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperConfigVo.java b/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperConfigVo.java index 0b673b9..45ec20a 100644 --- a/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperConfigVo.java +++ b/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperConfigVo.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; import java.util.Date; @@ -114,6 +115,14 @@ public class ExperConfigVo { @Pattern(regexp = "^(?:0(?:\\.\\d{0,2})?|[1-9]\\d{0,7}(?:\\.\\d{0,2})?)$", message = "金额格式不正确（范围0-1000000000并且最多保留两位小数）", groups = {ConfigItemsVo.Query.class}) private String amountAll; + /** + * 试验周期 + */ +// @NotNull(message = "试验周期不能为空", groups = {Query.class}) + @Min(value = 1,message = "周期格式不正确（范围为正整数）", groups = {ConfigMainDevVo.Query.class}) +// @Pattern(regexp = "^\\+?[1-9][0-9]*$", message = "周期格式不正确（范围为正整数）", groups = {Query.class}) + private Integer times; + /** * 查询条件限制 */ diff --git a/src/main/resources/mappers/basis/ExperimentStandardMapper.xml b/src/main/resources/mappers/basis/ExperimentStandardMapper.xml index a08dd86..4c02791 100644 --- a/src/main/resources/mappers/basis/ExperimentStandardMapper.xml +++ b/src/main/resources/mappers/basis/ExperimentStandardMapper.xml @@ -11,6 +11,7 @@ dev_module, exper_local_code, exper_local, + times, del_flag, create_user, create_time, @@ -24,6 +25,7 @@ #{devModule}, #{experLocalCode}, #{experLocal}, + #{times}, 0, #{createUser}, #{createTime}, @@ -52,10 +54,10 @@ - INSERT INTO tb_config_man_dev(id,config_id,dev_type_code,dev_type_name,exper_id,exper_dev_name,exper_dev_module,exper_dev_code,dev_contract_date,times) VALUES + INSERT INTO tb_config_man_dev(id,config_id,dev_type_code,dev_type_name,exper_id,exper_dev_name,exper_dev_module,exper_dev_code,dev_contract_date) VALUES ( - null,#{item.configId},#{item.devTypeCode},#{item.devTypeName},#{item.experId},#{item.experDevName},#{item.experDevModule},#{item.experDevCode},#{item.devContractDate},#{item.times} + null,#{item.configId},#{item.devTypeCode},#{item.devTypeName},#{item.experId},#{item.experDevName},#{item.experDevModule},#{item.experDevCode},#{item.devContractDate} ) @@ -108,7 +110,7 @@ - UPDATE tb_exper_config SET dev_type_code = #{devTypeCode},dev_type_name = #{devTypeName},dev_module = #{devModule}, + UPDATE tb_exper_config SET dev_type_code = #{devTypeCode},dev_type_name = #{devTypeName},dev_module = #{devModule},times = #{times}, exper_local_code = #{experLocalCode},exper_local = #{experLocal},update_user = #{updateUser},update_time = #{updateTime} WHERE id = #{id} @@ -178,7 +180,8 @@ dev_type_name AS devTypeName, dev_module AS devModule, exper_local_code AS experLocalCode, - exper_local AS experLocal + exper_local AS experLocal, + times FROM tb_exper_config WHERE id = #{id} @@ -210,8 +213,7 @@ exper_dev_name AS experDevName, exper_dev_module AS experDevModule, exper_dev_code AS experDevCode, - DATE_FORMAT(dev_contract_date, '%Y-%m-%d') AS devContractDate, - times + DATE_FORMAT(dev_contract_date, '%Y-%m-%d') AS devContractDate FROM tb_config_man_dev WHERE config_id = #{id} diff --git a/src/main/resources/mappers/basis/ExperimentalMapper.xml b/src/main/resources/mappers/basis/ExperimentalMapper.xml index 43d4991..c93d2a1 100644 --- a/src/main/resources/mappers/basis/ExperimentalMapper.xml +++ b/src/main/resources/mappers/basis/ExperimentalMapper.xml @@ -373,6 +373,7 @@ diff --git a/src/main/resources/static/js/basis/tools/child/addTestStandards.js b/src/main/resources/static/js/basis/tools/child/addTestStandards.js index e9562c7..ac652cd 100644 --- a/src/main/resources/static/js/basis/tools/child/addTestStandards.js +++ b/src/main/resources/static/js/basis/tools/child/addTestStandards.js @@ -364,7 +364,6 @@ function saveData(data) { "experDevCode": data.field["experDevCode"], "devContractDate": data.field["devContractDate"], "experId": null, - "times":data.field["times"], }]; //获取试验项内容列表 @@ -389,6 +388,7 @@ function saveData(data) { 'devTypeCode': value, 'devTypeName': text, 'amountAll':data.field["amountAll"], + 'times':data.field["times"], 'devModule': data.field["devModule"], 'experLocalCode':'', 'experLocal': data.field["experLocal"], @@ -534,6 +534,9 @@ function setFormData(data) { //设备规格 $('#devModule').val(data.devModule) + //实验周期 + $('#times').val(data.times) + //总金额 $('#amountAll').val(data.amountAll) @@ -558,8 +561,6 @@ function setFormData(data) { $('#experDevCode').val(data.mainDeviceVos[0].experDevCode) //合同生效日期 $('#devContractDate').val(data.mainDeviceVos[0].devContractDate) - //实验周期 - $('#times').val(data.mainDeviceVos[0].times) //试验依据 for (let i = 0; i < data.basisVos.length; i++) { var k = i+1; diff --git a/src/main/resources/static/js/basis/tools/child/checkTestStandards.js b/src/main/resources/static/js/basis/tools/child/checkTestStandards.js index 3646e4b..1bd5d70 100644 --- a/src/main/resources/static/js/basis/tools/child/checkTestStandards.js +++ b/src/main/resources/static/js/basis/tools/child/checkTestStandards.js @@ -364,7 +364,6 @@ function saveData(data) { "experDevCode": data.field["experDevCode"], "devContractDate": data.field["devContractDate"], "experId": null, - "times":data.field["times"], }]; //获取试验项内容列表 @@ -389,6 +388,7 @@ function saveData(data) { 'devTypeCode': value, 'devTypeName': text, 'amountAll':data.field["amountAll"], + 'times':data.field["times"], 'devModule': data.field["devModule"], 'experLocalCode':'', 'experLocal': data.field["experLocal"], @@ -534,6 +534,9 @@ function setFormData(data) { //设备规格 $('#devModule').val(data.devModule) + //实验周期 + $('#times').val(data.times) + //总金额 $('#amountAll').val(data.amountAll) @@ -558,8 +561,6 @@ function setFormData(data) { $('#experDevCode').val(data.mainDeviceVos[0].experDevCode) //合同生效日期 $('#devContractDate').val(data.mainDeviceVos[0].devContractDate) - //实验周期 - $('#times').val(data.mainDeviceVos[0].times) //试验依据 for (let i = 0; i < data.basisVos.length; i++) { var k = i+1; diff --git a/src/main/resources/static/js/primaryData/primary.js b/src/main/resources/static/js/primaryData/primary.js index 322797a..be6059f 100644 --- a/src/main/resources/static/js/primaryData/primary.js +++ b/src/main/resources/static/js/primaryData/primary.js @@ -290,4 +290,42 @@ function batchDownLoad() { }; // xhr.send(params); xhr.send(); +} + +/**批量下载基础数据excel文件*/ +function batchDownLoadTwo() { + const size = temp_all_list.length + if (size === 0) { + return layer.msg('未选择数据', {icon: 7}); + } + let idArr = []; + $.each(temp_all_list, function (index, item) { + idArr.push(item.id) + }) + let obj = { + 'ids': idArr + } + console.log(idArr) + let loadingMsg = layer.msg("数据导出中,请稍候...", {icon: 16, scrollbar: false, time: 0,}); + let url = dataUrl + "/download/downLoadZipsTwo?token=" + tokens + "&encryptedData=" + encodeURIComponent(encryptCBC(JSON.stringify(obj))); + let xhr = new XMLHttpRequest(); + xhr.open("post", url, true); + xhr.responseType = "blob"; // 转换流 + xhr.setRequestHeader('Content-Type','application/json;charset=UTF-8') + xhr.onload = function () { + layer.close(loadingMsg); + if (this.status === 200) { + let blob = this.response; + var a = document.createElement("a"); + var url = window.URL.createObjectURL(blob); + a.href = url; + a.download = "基础数据记录" + ".zip"; // 文件名 + } else { + layer.msg("数据导出发生异常,请稍后重试", {icon: 16, scrollbar: false, time: 2000}); + } + a.click(); + window.URL.revokeObjectURL(url); + }; + // xhr.send(params); + xhr.send(); } \ No newline at end of file diff --git a/src/main/resources/static/pages/basic/tools/child/addTestStandards.html b/src/main/resources/static/pages/basic/tools/child/addTestStandards.html index 087a44d..3b554bb 100644 --- a/src/main/resources/static/pages/basic/tools/child/addTestStandards.html +++ b/src/main/resources/static/pages/basic/tools/child/addTestStandards.html @@ -135,9 +135,13 @@
-
- -
+
+ +
+ +
+
+ 年
@@ -146,13 +150,9 @@
-
- -
- -
-
- 年 +
+ +
diff --git a/src/main/resources/static/pages/basic/tools/child/checkTestStandards.html b/src/main/resources/static/pages/basic/tools/child/checkTestStandards.html index db68035..cd43e6a 100644 --- a/src/main/resources/static/pages/basic/tools/child/checkTestStandards.html +++ b/src/main/resources/static/pages/basic/tools/child/checkTestStandards.html @@ -133,9 +133,13 @@
-
- -
+
+ +
+ +
+
+ 年
@@ -148,13 +152,9 @@
-
- -
- -
-
- 年 +
+ +
diff --git a/src/main/resources/static/pages/primaryData/child/viewOriginalRecord.html b/src/main/resources/static/pages/primaryData/child/viewOriginalRecord.html index e4b3190..9feb0fb 100644 --- a/src/main/resources/static/pages/primaryData/child/viewOriginalRecord.html +++ b/src/main/resources/static/pages/primaryData/child/viewOriginalRecord.html @@ -84,6 +84,7 @@
diff --git a/src/main/resources/static/pages/primaryData/primary.html b/src/main/resources/static/pages/primaryData/primary.html index 0f996e5..088bce8 100644 --- a/src/main/resources/static/pages/primaryData/primary.html +++ b/src/main/resources/static/pages/primaryData/primary.html @@ -53,6 +53,8 @@ +