保养计划通过id查询保养计划具体内容接口修改

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/entity/CmmsUpkeepPlan.java

@@ -145,6 +145,7 @@ public class CmmsUpkeepPlan implements Serializable {
     private java.lang.String ifnotice;
     /**设备id（根据设备id查找保养项内容）*/
     @Excel(name = "设备id（根据设备id查找保养项内容）", width = 15)
+    @Dict(dicCode = "id", dictTable = "tpm_equipment", dicText = "equipmentname")
     @ApiModelProperty(value = "设备id（根据设备id查找保养项内容）")
     private java.lang.String equipmentid;
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/mapper/xml/CmmsUpkeepPlanMapper.xml

@@ -33,7 +33,7 @@
     </resultMap>
 
     <select id="getAllCmmsUpkeepPlan" parameterType="org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlan" resultMap="CmmsUpkeepPlanResult">
-        select p.id, p.create_by, p.create_time, p.update_by, p.update_time, p.remark, p.plancode, p.planname, p.upkeepprojid, p.projectname, p.address, p.supplier, p.suppliertel, p.linker, p.linkertel, p.chargeruser, p.plandesc, p.begintime, p.repeatnum, p.repeattype, p.noticenum, p.noticetype, p.status, p.nexttime, p.ifnotice, p.noticetime, e.equipmentname as equipmentName
+        select p.id, p.create_by, p.create_time, p.update_by, p.update_time, p.remark, p.plancode, p.planname, p.upkeepprojid, p.projectname, p.address, p.supplier, p.suppliertel, p.linker, p.linkertel, p.chargeruser, p.plandesc, p.begintime, p.repeatnum, p.repeattype, p.noticenum, p.noticetype, p.status, p.nexttime, p.ifnotice, p.noticetime,e.id as equipmentid, e.equipmentname as equipmentName
         from cmms_upkeep_plan as p left join tpm_equipment as e on p.equipmentid = e.id
         <where>
             <if test="cmmsUpkeepPlan.planname != null and cmmsUpkeepPlan.planname != ''"> and p.planname like concat('%', #{cmmsUpkeepPlan.planname}, '%')</if>
@@ -46,7 +46,7 @@
     </select>
 
     <select id="getCmmsUpkeepPlanContentById" parameterType="String" resultMap="CmmsUpkeepPlanResult">
-        select p.id, p.create_by, p.create_time, p.update_by, p.update_time, p.remark, p.plancode, p.planname, p.upkeepprojid, p.projectname, p.address, p.supplier, p.suppliertel, p.linker, p.linkertel, p.chargeruser, p.plandesc, p.begintime, p.repeatnum, p.repeattype, p.noticenum, p.noticetype, p.status, p.nexttime, p.ifnotice, p.noticetime, e.equipmentname as equipmentName
+        select p.id, p.create_by, p.create_time, p.update_by, p.update_time, p.remark, p.plancode, p.planname, p.upkeepprojid, p.projectname, p.address, p.supplier, p.suppliertel, p.linker, p.linkertel, p.chargeruser, p.plandesc, p.begintime, p.repeatnum, p.repeattype, p.noticenum, p.noticetype, p.status, p.nexttime, p.ifnotice, p.noticetime, e.id as equipmentid, e.equipmentname as equipmentName
         from cmms_upkeep_plan as p left join tpm_equipment as e on p.equipmentid = e.id
         where p.id = #{id}
     </select>