bug修改

src/main/java/com/zhgd/xmgl/modules/universaltest/entity/UniversalTestDev.java

@@ -63,12 +63,10 @@ public class UniversalTestDev implements Serializable {
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	@ApiModelProperty(value = "进场时间")
 	private java.util.Date entryTime;
-	/**
-	 * 负责人
-	 */
-	@Excel(name = "负责人", width = 15)
 	@ApiModelProperty(value = "负责人")
-	private java.lang.String personInCharge;
+	private java.lang.Long dutyUserId;
+	@ApiModelProperty(value = "负责人名称")
+	private java.lang.String dutyUserName;
 	/**
 	 * 所属试验室
 	 */

src/main/java/com/zhgd/xmgl/modules/universaltest/entity/UniversalTestManage.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -44,10 +45,10 @@ public class UniversalTestManage implements Serializable {
 	@ApiModelProperty(value = "试验编号")
 	private java.lang.String testNumber;
 	/**
-	 * 试验类型
+	 * 试验类型:1混凝土试件抗压强度试验,2钢筋试验,3钢筋焊接接头试验,4钢筋机械连接接头试验,5水泥砂浆立方体抗压强度试验,6水泥砂浆立方体抗压强度试验(建筑),7水泥净浆物理性能试验,8水泥胶砂强度试验,9水泥胶砂抗折试验,10水泥净浆抗折试验,11水泥混凝土圆柱体轴心抗压强度试验,12后张预应力孔道压浆抗压强度试验,13后张预应力孔道压浆抗折强度试验,14无机结合料稳定材料无侧限抗压强度试验,15复检钢筋焊接接头试验,16复检钢筋机械连接接头试验
 	 */
-	@Excel(name = "试验类型", width = 15)
+	@Excel(name = "试验类型:1混凝土试件抗压强度试验,2钢筋试验,3钢筋焊接接头试验,4钢筋机械连接接头试验,5水泥砂浆立方体抗压强度试验,6水泥砂浆立方体抗压强度试验(建筑),7水泥净浆物理性能试验,8水泥胶砂强度试验,9水泥胶砂抗折试验,10水泥净浆抗折试验,11水泥混凝土圆柱体轴心抗压强度试验,12后张预应力孔道压浆抗压强度试验,13后张预应力孔道压浆抗折强度试验,14无机结合料稳定材料无侧限抗压强度试验,15复检钢筋焊接接头试验,16复检钢筋机械连接接头试验", width = 15)
-	@ApiModelProperty(value = "试验类型")
+	@ApiModelProperty(value = "试验类型:1混凝土试件抗压强度试验,2钢筋试验,3钢筋焊接接头试验,4钢筋机械连接接头试验,5水泥砂浆立方体抗压强度试验,6水泥砂浆立方体抗压强度试验(建筑),7水泥净浆物理性能试验,8水泥胶砂强度试验,9水泥胶砂抗折试验,10水泥净浆抗折试验,11水泥混凝土圆柱体轴心抗压强度试验,12后张预应力孔道压浆抗压强度试验,13后张预应力孔道压浆抗折强度试验,14无机结合料稳定材料无侧限抗压强度试验,15复检钢筋焊接接头试验,16复检钢筋机械连接接头试验")
 	private java.lang.Integer testType;
 	/**
 	 * 试件数量
@@ -129,4 +130,12 @@ public class UniversalTestManage implements Serializable {
 	@Excel(name = "项目sn", width = 15)
 	@ApiModelProperty(value = "项目sn")
 	private java.lang.String projectSn;
+	@ApiModelProperty(value = "上传附件")
+	private java.lang.String uploadAttachment;
+	@TableField(exist = false)
+	@ApiModelProperty(value = "设备名称")
+	private java.lang.String deviceName;
+	@TableField(exist = false)
+	@ApiModelProperty(value = "所属试验室")
+	private java.lang.String affiliatedLaboratory;
 }

src/main/java/com/zhgd/xmgl/modules/universaltest/mapper/UniversalTestManageMapper.java

@@ -1,8 +1,15 @@
 package com.zhgd.xmgl.modules.universaltest.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.universaltest.entity.UniversalTestManage;
 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 UniversalTestManageMapper extends BaseMapper<UniversalTestManage> {
 
+    List<UniversalTestManage> queryList(@Param(Constants.WRAPPER) QueryWrapper<UniversalTestManage> queryWrapper);
+
+    IPage<UniversalTestManage> queryList(Page<UniversalTestManage> page, @Param(Constants.WRAPPER) QueryWrapper<UniversalTestManage> queryWrapper);
 }

src/main/java/com/zhgd/xmgl/modules/universaltest/mapper/xml/UniversalTestManageMapper.xml

@@ -1,4 +1,10 @@
 <?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.universaltest.mapper.UniversalTestManageMapper">
+    <select id="queryList" resultType="com.zhgd.xmgl.modules.universaltest.entity.UniversalTestManage">
+        select utm.*,utd.device_name,utd.affiliated_laboratory
+        from universal_test_manage utm
+        join universal_test_dev utd on utd.dev_sn=utm.dev_sn
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/universaltest/service/impl/UniversalTestManageServiceImpl.java

@@ -1,21 +1,20 @@
 package com.zhgd.xmgl.modules.universaltest.service.impl;
 
-import com.zhgd.xmgl.modules.universaltest.entity.UniversalTestManage;
-import com.zhgd.xmgl.modules.universaltest.mapper.UniversalTestManageMapper;
-import com.zhgd.xmgl.modules.universaltest.service.IUniversalTestManageService;
-import org.springframework.stereotype.Service;
 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.zhgd.jeecg.common.system.query.QueryGenerator;
-import com.zhgd.xmgl.util.PageUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhgd.jeecg.common.system.query.QueryGenerator;
+import com.zhgd.xmgl.modules.universaltest.entity.UniversalTestManage;
+import com.zhgd.xmgl.modules.universaltest.mapper.UniversalTestManageMapper;
+import com.zhgd.xmgl.modules.universaltest.service.IUniversalTestManageService;
+import com.zhgd.xmgl.util.PageUtil;
+import com.zhgd.xmgl.util.RefUtil;
+import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
 import java.util.List;
 
-import com.zhgd.xmgl.util.RefUtil;
-
 /**
  * @Description: 万能试验机管理
  * @author： pds
@@ -28,7 +27,7 @@ public class UniversalTestManageServiceImpl extends ServiceImpl<UniversalTestMan
     public IPage<UniversalTestManage> queryPageList(HashMap<String, Object> paramMap) {
         QueryWrapper<UniversalTestManage> queryWrapper = getQueryWrapper(paramMap);
         Page<UniversalTestManage> page = PageUtil.getPage(paramMap);
-        IPage<UniversalTestManage> pageList = this.page(page, queryWrapper);
+        IPage<UniversalTestManage> pageList = baseMapper.queryList(page, queryWrapper);
         pageList.setRecords(dealList(pageList.getRecords()));
         return pageList;
     }
@@ -36,12 +35,13 @@ public class UniversalTestManageServiceImpl extends ServiceImpl<UniversalTestMan
     @Override
     public List<UniversalTestManage> queryList(HashMap<String, Object> paramMap) {
         QueryWrapper<UniversalTestManage> queryWrapper = getQueryWrapper(paramMap);
-        return dealList(this.list(queryWrapper));
+        return dealList(baseMapper.queryList(queryWrapper));
     }
 
     private QueryWrapper<UniversalTestManage> getQueryWrapper(HashMap<String, Object> paramMap) {
-        QueryWrapper<UniversalTestManage> queryWrapper = QueryGenerator.initPageQueryWrapper(UniversalTestManage.class, paramMap);
+        String alias = "utm.";
-        queryWrapper.orderByDesc(RefUtil.fieldNameUlc(UniversalTestManage::getId));
+        QueryWrapper<UniversalTestManage> queryWrapper = QueryGenerator.initPageQueryWrapper(UniversalTestManage.class, paramMap, alias);
+        queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(UniversalTestManage::getId));
         return queryWrapper;
     }