Merge remote-tracking branch 'origin/master'

src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java

@@ -63,12 +63,12 @@ public class ExperimentalServiceImpl implements ExperimentalService {
             list = mapper.getDetailList(dto);
             if (CollectionUtils.isNotEmpty(list)) {
                 for (ExperimentalDetailVo detailVo : list) {
-                    // 判断提交审查前是否添加了试验设备
+                    /*// 判断提交审查前是否添加了试验设备
                     Integer hasAddDevs = mapper.getHasAddDevs(detailVo);
                     if(!Objects.equals(detailVo.getStatus(),Constants.DSY) && hasAddDevs > 0){
                         mapper.updateExperStatus2(detailVo);
                         detailVo.setStatus(Constants.DSY);
-                    }
+                    }*/
                     // 样品试验结果、样品数量、送样总数
                     List<ExperimentalDetailVo.Sample> sampleList = new ArrayList<>();
                     if (detailVo.getExperId() != null) {

src/main/resources/mappers/basis/ExperimentalMapper.xml

@@ -368,7 +368,7 @@
                 </if>
                 GROUP BY tsd.dev_type_code
         )a
-        ORDER BY FIELD(a.status, '审阅不通过','审核不通过','审批不通过','待提交','待审阅','待重新审阅','待审核','待审批','试验完成') ,a.testTime DESC
+        ORDER BY FIELD(a.status, '审阅不通过','审核不通过','审批不通过','待试验','待提交','待审阅','待重新审阅','待审核','待审批','试验完成') ,a.testTime DESC
     </select>
     <!--查询试验模板数据、基础数据-->
     <select id="getTestBasicInfo" resultType="com.bonus.aqgqj.basis.entity.vo.TestVo">
@@ -568,7 +568,8 @@
         SELECT tsd.id,
                tsd.dev_code AS devCode,
                tsd.dev_module AS devModule,
-               tsd.department_id AS departmentId
+               tsd.department_id AS departmentId,
+               tsd.id AS devId
         FROM tb_sample_device tsd
         LEFT JOIN tb_exper_dev ted ON tsd.id = ted.dev_id AND ted.exper_id = #{id}
         WHERE tsd.sample_id = #{sampleId} AND tsd.dev_type_code = #{devTypeCode} AND tsd.del_falg = 0 AND ted.id IS NULL

src/main/resources/static/js/basis/standard/child/testForm.js

@@ -420,7 +420,6 @@ function saveData(data) {
         //
         'paramsData':paramsData
     }
-    debugger;
     console.log(obj)
 
     let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0});
@@ -560,7 +559,6 @@ function convertToItems(obj){
     // 填充 itemName 数据
     Object.keys(dataField).forEach(key => {
         if (key.startsWith('itemName-')) {
-            debugger
 
             const parts = key.split('-');
             const experTypeIndex = parts[1];
@@ -616,7 +614,6 @@ function convertToItemsUpdate(obj){
     // 填充 itemName 数据
     Object.keys(dataField).forEach(key => {
         if (key.startsWith('itemName-')) {
-            debugger
 
             const parts = key.split('-');
             const experTypeIndex = parts[1];

src/main/resources/static/js/basis/standard/child/testList.js

@@ -149,11 +149,11 @@ function initTable(dataList, limit, page) {
                         var sampleId = d.sampleId;
                         var devTypeCode = d.devTypeCode;
 
-                        if(d.status != "待试验"){
+                        if(d.status !== "待试验"){
                             search = buttonCheck(experId,sampleId,devTypeCode, "", pers);
                             // search="<a class=\"layui-icon layui-icon-search\"    title='查看' style=\"color: blue;\" onclick=\"checkData('" + d.experId + "','" + d.sampleId + "','"+ d.devTypeCode+"')\"></a>";
                         }
-                        if (d.status == "待试验" || d.status == "待提交" || d.status == "审阅不通过" || d.status == "审核不通过" || d.status == "审批不通过") {
+                        if (d.status === "待试验" || d.status === "待提交" || d.status === "审阅不通过" || d.status === "审核不通过" || d.status === "审批不通过" || d.status === '待审核' || d.status === '待审阅' || d.status === '待审批') {
                             // edit="<a class=\"layui-icon layui-icon-edit\"   title='编制' style=\"color: blue;\"  onclick=\"addData('" + d.experId + "','" + d.sampleId + "','"+ d.devTypeCode+"')\"></a>";
                             if (experId!=null && experId!='null') {
                                 edit=buttonEditTest(experId,sampleId,devTypeCode, "sys:experimentalTest:edit", pers);

src/main/resources/static/js/basis/standard/child/testUpdateForm.js

@@ -177,9 +177,11 @@ function setTableData(data){
         $(`#amounts-${rowNumber}`).val(item.amount);
         $(`#remarks-${rowNumber}`).val(item.remarks);
         // devData 是一个字符串，需要解析为数组
+        if(item.devData){
             const devDataArray = JSON.parse(item.devData);
             for (let i = 0; i < devDataArray.length; i++) {
                 $(`#devData-${rowNumber}-${i + 1}`).val(devDataArray[i]);
             }
+        }
     });
 }