Browse Source

fix: 添加 注解 和 添加 查询方法

32197351@qq.com 2 years ago
parent
commit
f948fece9b

+ 4 - 0
itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanDetail/entity/ItdmGongdanDetail.java

@@ -43,6 +43,8 @@ public class ItdmGongdanDetail implements Serializable {
 	/**实绩设备id*/
 	/**实绩设备id*/
 	@Excel(name = "实绩设备id", width = 15)
 	@Excel(name = "实绩设备id", width = 15)
     @ApiModelProperty(value = "实绩设备id")
     @ApiModelProperty(value = "实绩设备id")
+    @Dict(dictTable = "itdm_device", dicText = "device_name", dicCode = "id")
+
     private java.lang.String shijiShebeiId;
     private java.lang.String shijiShebeiId;
 	/**实绩试验类型*/
 	/**实绩试验类型*/
 	@Excel(name = "实绩试验类型", width = 15, dicCode = "shiyan_type")
 	@Excel(name = "实绩试验类型", width = 15, dicCode = "shiyan_type")
@@ -102,5 +104,7 @@ public class ItdmGongdanDetail implements Serializable {
     private java.lang.String sysOrgCode;/**传感器*/
     private java.lang.String sysOrgCode;/**传感器*/
     @Excel(name = "传感器", width = 20)
     @Excel(name = "传感器", width = 20)
     @ApiModelProperty(value = "传感器")
     @ApiModelProperty(value = "传感器")
+    @Dict(dictTable = "itdm_chuanganqi", dicText = "xuliehao", dicCode = "id")
+
     private java.lang.String chuanganqi;
     private java.lang.String chuanganqi;
 }
 }

+ 14 - 0
itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/mapper/ItdmTestPlanMapper.java

@@ -1,8 +1,11 @@
 package org.jeecg.modules.itdmTestPlan.mapper;
 package org.jeecg.modules.itdmTestPlan.mapper;
 
 
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.itdmTestPlan.entity.ItdmTestPlan;
 import org.jeecg.modules.itdmTestPlan.entity.ItdmTestPlan;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
+import java.util.List;
+
 /**
 /**
  * @Description: 试验计划
  * @Description: 试验计划
  * @Author: jeecg-boot
  * @Author: jeecg-boot
@@ -10,4 +13,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @Version: V1.0
  * @Version: V1.0
  */
  */
 public interface ItdmTestPlanMapper extends BaseMapper<ItdmTestPlan> {
 public interface ItdmTestPlanMapper extends BaseMapper<ItdmTestPlan> {
+
+
+    public List<String> geChuanganqitByShiyanid(@Param("list") List<String> list);
+
+
+    public List<String> geSBByShiyanid(@Param("list") List<String> list);
+
+
+
+
+
 }
 }

+ 36 - 0
itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/mapper/xml/ItdmTestPlanMapper.xml

@@ -2,4 +2,40 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.itdmTestPlan.mapper.ItdmTestPlanMapper">
 <mapper namespace="org.jeecg.modules.itdmTestPlan.mapper.ItdmTestPlanMapper">
 
 
+    <select id="geChuanganqitByShiyanid" resultType="java.lang.String">
+
+        select c.chuanganqi
+        from itdm_gongdan_master as b
+
+                 inner join itdm_gongdan_detail c on b.id = c.wo_id
+
+
+        where b.test_items_id in
+
+
+        <foreach item="item" collection="list" separator="," open="(" close=")" index="">
+                   #{item}
+        </foreach>
+
+
+
+    </select>
+    <select id="geSBByShiyanid" resultType="java.lang.String">
+
+
+        select c.shiji_shebei_id
+        from itdm_gongdan_master as b
+
+        inner join itdm_gongdan_detail c on b.id = c.wo_id
+
+
+        where b.test_items_id in
+
+
+        <foreach item="item" collection="list" separator="," open="(" close=")" index="">
+            #{item}
+        </foreach>
+
+
+    </select>
 </mapper>
 </mapper>