bug修复

src/main/java/com/zhgd/xmgl/modules/pressuretest/entity/PressureTestMachineManage.java

@@ -160,7 +160,12 @@ public class PressureTestMachineManage implements Serializable {
     @Excel(name = "项目sn", width = 15)
     @ApiModelProperty(value = "项目sn")
     private java.lang.String projectSn;
-
+    @TableField(exist = false)
+    @ApiModelProperty(value = "所属试验室")
+    private java.lang.String affiliatedLaboratory;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "设备名称")
+    private java.lang.String devName;
     @TableField(exist = false)
     @ApiModelProperty(value = "试块编号列表")
     private List<PressureTestMachineManageBlockNumber> blockNumbers;

src/main/java/com/zhgd/xmgl/modules/pressuretest/mapper/PressureTestMachineManageMapper.java

@@ -1,8 +1,15 @@
 package com.zhgd.xmgl.modules.pressuretest.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhgd.xmgl.modules.pressuretest.entity.PressureTestMachineManage;
 import org.apache.ibatis.annotations.Mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @Description: 试验检测管理
@@ -13,4 +20,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 @Mapper
 public interface PressureTestMachineManageMapper extends BaseMapper<PressureTestMachineManage> {
 
+    List<PressureTestMachineManage> queryList(@Param(Constants.WRAPPER) QueryWrapper<PressureTestMachineManage> queryWrapper);
+
+    IPage<PressureTestMachineManage> queryList(Page<PressureTestMachineManage> page, @Param(Constants.WRAPPER) QueryWrapper<PressureTestMachineManage> queryWrapper);
 }

src/main/java/com/zhgd/xmgl/modules/pressuretest/mapper/xml/PressureTestMachineManageMapper.xml

@@ -1,4 +1,9 @@
 <?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.zhgd.xmgl.modules.pressuretest.mapper.PressureTestMachineManageMapper">
+    <select id="queryList" resultType="com.zhgd.xmgl.modules.pressuretest.entity.PressureTestMachineManage">
+        select * from pressure_test_machine_manage ptmm
+        join pressure_test_machine_dev ptmd on ptmd.dev_sn=ptmm.dev_sn
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/pressuretest/service/impl/PressureTestMachineManageServiceImpl.java

@@ -1,6 +1,11 @@
 package com.zhgd.xmgl.modules.pressuretest.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhgd.jeecg.common.system.query.QueryGenerator;
 import com.zhgd.xmgl.modules.pressuretest.entity.PressureTestMachineManage;
 import com.zhgd.xmgl.modules.pressuretest.entity.PressureTestMachineManageBlockData;
 import com.zhgd.xmgl.modules.pressuretest.entity.PressureTestMachineManageBlockNumber;
@@ -8,21 +13,15 @@ import com.zhgd.xmgl.modules.pressuretest.mapper.PressureTestMachineManageBlockD
 import com.zhgd.xmgl.modules.pressuretest.mapper.PressureTestMachineManageBlockNumberMapper;
 import com.zhgd.xmgl.modules.pressuretest.mapper.PressureTestMachineManageMapper;
 import com.zhgd.xmgl.modules.pressuretest.service.IPressureTestMachineManageService;
+import com.zhgd.xmgl.util.PageUtil;
+import com.zhgd.xmgl.util.RefUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.transaction.annotation.Transactional;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhgd.jeecg.common.system.query.QueryGenerator;
-import com.zhgd.xmgl.util.PageUtil;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import java.util.HashMap;
 import java.util.List;
 
-import com.zhgd.xmgl.util.RefUtil;
-import org.springframework.transaction.annotation.Transactional;
-
 /**
  * @Description: 试验检测管理
  * @author： pds
@@ -41,7 +40,7 @@ public class PressureTestMachineManageServiceImpl extends ServiceImpl<PressureTe
     public IPage<PressureTestMachineManage> queryPageList(HashMap<String, Object> paramMap) {
         QueryWrapper<PressureTestMachineManage> queryWrapper = getQueryWrapper(paramMap);
         Page<PressureTestMachineManage> page = PageUtil.getPage(paramMap);
-        IPage<PressureTestMachineManage> pageList = this.page(page, queryWrapper);
+        IPage<PressureTestMachineManage> pageList = baseMapper.queryList(page, queryWrapper);
         pageList.setRecords(dealList(pageList.getRecords()));
         return pageList;
     }
@@ -49,7 +48,7 @@ public class PressureTestMachineManageServiceImpl extends ServiceImpl<PressureTe
     @Override
     public List<PressureTestMachineManage> queryList(HashMap<String, Object> paramMap) {
         QueryWrapper<PressureTestMachineManage> queryWrapper = getQueryWrapper(paramMap);
-        return dealList(this.list(queryWrapper));
+        return dealList(baseMapper.queryList(queryWrapper));
     }
 
     @Override
@@ -65,8 +64,9 @@ public class PressureTestMachineManageServiceImpl extends ServiceImpl<PressureTe
     }
 
     private QueryWrapper<PressureTestMachineManage> getQueryWrapper(HashMap<String, Object> paramMap) {
-        QueryWrapper<PressureTestMachineManage> queryWrapper = QueryGenerator.initPageQueryWrapper(PressureTestMachineManage.class, paramMap);
+        String alias = "ptmm.";
-        queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PressureTestMachineManage::getId));
+        QueryWrapper<PressureTestMachineManage> queryWrapper = QueryGenerator.initPageQueryWrapper(PressureTestMachineManage.class, paramMap, alias);
+        queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(PressureTestMachineManage::getId));
         return queryWrapper;
     }
 

src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java

@@ -504,9 +504,13 @@ public class TaskProgressServiceImpl extends ServiceImpl<TaskProgressMapper, Tas
     public TaskProgress queryById(String id) {
         HashMap<String, Object> map = new HashMap<>();
         map.put("id", id);
-        TaskProgress taskProgress = baseMapper.queryList(map).get(0);
+        List<TaskProgress> taskProgresses = baseMapper.queryList(map);
+        if (CollUtil.isNotEmpty(taskProgresses)) {
+            TaskProgress taskProgress = taskProgresses.get(0);
             setMppStatus(taskProgress);
             return taskProgress;
         }
+        return null;
+    }
 
 }

src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java

@@ -297,6 +297,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                     .antMatchers("/xmgl/aiAnalyseHardWareAlarmRecord/selectAiAnalyseHardWareAlarmList").permitAll()
                     .antMatchers("/xmgl/workerAttendance/list").permitAll()
                     .antMatchers("/xmgl/workerInfo/selectPersonTypeAndEduStatistics").permitAll()
+                    .antMatchers("/xmgl/taskProgressRt/queryById").permitAll()
                     .antMatchers(HttpMethod.OPTIONS, "/**").anonymous()
                     .anyRequest().authenticated()       // 剩下所有的验证都需要验证.
                     .and()