瀏覽代碼

修改表名

丁治程 1 年之前
父節點
當前提交
770991d2a7
共有 29 個文件被更改,包括 70 次插入70 次删除
  1. 2 2
      module_base/src/main/java/org/jeecg/modules/sysAutoCodePart/entity/SysAutoCodePart.java
  2. 1 1
      module_base/src/main/java/org/jeecg/modules/sysAutoCodePart/mapper/xml/SysAutoCodePartMapper.xml
  3. 3 3
      module_base/src/main/java/org/jeecg/modules/sysAutoCodeResult/entity/SysAutoCodeResult.java
  4. 1 1
      module_base/src/main/java/org/jeecg/modules/sysAutoCodeResult/mapper/xml/SysAutoCodeResultMapper.xml
  5. 2 2
      module_base/src/main/java/org/jeecg/modules/sysAutoCodeRule/entity/SysAutoCodeRule.java
  6. 1 1
      module_base/src/main/java/org/jeecg/modules/sysAutoCodeRule/mapper/xml/SysAutoCodeRuleMapper.xml
  7. 2 2
      module_base/src/main/java/org/jeecg/modules/sysUploadFile/entity/SysUploadFile.java
  8. 8 8
      module_base/src/main/java/org/jeecg/modules/sysUploadFile/mapper/xml/SysUploadFileMapper.xml
  9. 3 3
      module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/controller/CmmsInspectContentController.java
  10. 2 2
      module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/entity/CmmsInspectContent.java
  11. 8 8
      module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/mapper/xml/CmmsInspectContentMapper.xml
  12. 2 2
      module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContentItem/entity/CmmsInspectContentItem.java
  13. 3 3
      module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContentItem/mapper/xml/CmmsInspectContentItemMapper.xml
  14. 2 2
      module_cmms/src/main/java/org/jeecg/modules/cmmsInspectItem/entity/CmmsInspectItem.java
  15. 4 4
      module_cmms/src/main/java/org/jeecg/modules/cmmsInspectItem/mapper/xml/CmmsInspectItemMapper.xml
  16. 2 2
      module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLine/entity/CmmsInspectLine.java
  17. 2 2
      module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLineDetail/entity/CmmsInspectLineDetail.java
  18. 2 2
      module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/entity/CmmsInspectPlan.java
  19. 1 1
      module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/mapper/xml/CmmsInspectPlanMapper.xml
  20. 2 2
      module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlanTask/entity/CmmsInspectPlanTask.java
  21. 2 2
      module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/entity/CmmsInspectSpot.java
  22. 2 2
      module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/mapper/xml/CmmsInspectSpotMapper.xml
  23. 2 2
      module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpotEquip/entity/CmmsInspectSpotEquip.java
  24. 1 1
      module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpotEquip/mapper/xml/CmmsInspectSpotEquipMapper.xml
  25. 2 2
      module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpotItem/entity/CmmsInspectSpotItem.java
  26. 2 2
      module_cmms/src/main/java/org/jeecg/modules/cmmsOrderNode/entity/CmmsOrderNode.java
  27. 1 1
      module_cmms/src/main/java/org/jeecg/modules/cmmsOrderNode/mapper/xml/CmmsOrderNodeMapper.xml
  28. 2 2
      module_cmms/src/main/java/org/jeecg/modules/cmmsRepair/entity/CmmsRepair.java
  29. 3 3
      module_cmms/src/main/java/org/jeecg/modules/cmmsRepair/mapper/xml/CmmsRepairMapper.xml

+ 2 - 2
module_base/src/main/java/org/jeecg/modules/sysAutoCodePart/entity/SysAutoCodePart.java

@@ -25,10 +25,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_sys_auto_code_part")
+@TableName("base_auto_code_part")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ems_sys_auto_code_part对象", description="ems_sys_auto_code_part")
+@ApiModel(value="base_auto_code_part对象", description="base_auto_code_part")
 public class SysAutoCodePart implements Serializable {
     private static final long serialVersionUID = 1L;
 

+ 1 - 1
module_base/src/main/java/org/jeecg/modules/sysAutoCodePart/mapper/xml/SysAutoCodePartMapper.xml

@@ -31,7 +31,7 @@
                d.part_length, d.date_format,d.input_character,d.fix_character,d.seria_start_no,
                d.seria_step,d.seria_now_no,d.cycle_flag,d.cycle_method,d.remark,d.create_by,
                d.create_time,d.update_by,d.update_time
-        from ems_sys_auto_code_part d
+        from base_auto_code_part d
     </sql>
 
     <select id="listPart" parameterType="org.jeecg.modules.sysAutoCodePart.entity.SysAutoCodePart" resultMap="SysAutoCodePartResult">

+ 3 - 3
module_base/src/main/java/org/jeecg/modules/sysAutoCodeResult/entity/SysAutoCodeResult.java

@@ -19,16 +19,16 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: ems_sys_auto_code_result
+ * @Description: base_auto_code_result
  * @Author: jeecg-boot
  * @Date:   2024-01-10
  * @Version: V1.0
  */
 @Data
-@TableName("ems_sys_auto_code_result")
+@TableName("base_auto_code_result")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ems_sys_auto_code_result对象", description="ems_sys_auto_code_result")
+@ApiModel(value="base_auto_code_result对象", description="base_auto_code_result")
 public class SysAutoCodeResult implements Serializable {
     private static final long serialVersionUID = 1L;
 

+ 1 - 1
module_base/src/main/java/org/jeecg/modules/sysAutoCodeResult/mapper/xml/SysAutoCodeResultMapper.xml

@@ -20,7 +20,7 @@
 
     <sql id="selectSysAutoCodeResultVo">
         select d.id, d.rule_id, d.gen_date, d.gen_index, d.last_result, d.last_serial_no, d.last_input_char
-        from ems_sys_auto_code_result d
+        from base_auto_code_result d
     </sql>
 
     <select id="selectByAutoCodeResult" parameterType="org.jeecg.modules.sysAutoCodeResult.entity.SysAutoCodeResult" resultMap="SysAutoCodeResultResult">

+ 2 - 2
module_base/src/main/java/org/jeecg/modules/sysAutoCodeRule/entity/SysAutoCodeRule.java

@@ -25,10 +25,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_sys_auto_code_rule")
+@TableName("base_auto_code_rule")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ems_sys_auto_code_rule对象", description="ems_sys_auto_code_rule")
+@ApiModel(value="base_auto_code_rule对象", description="base_auto_code_rule")
 public class SysAutoCodeRule implements Serializable {
     private static final long serialVersionUID = 1L;
 

+ 1 - 1
module_base/src/main/java/org/jeecg/modules/sysAutoCodeRule/mapper/xml/SysAutoCodeRuleMapper.xml

@@ -22,7 +22,7 @@
     <sql id="selectSysAutoCodeRuleVo">
         select d.id, d.rule_code, d.rule_name, d.rule_desc, d.max_length,
                is_padded,padded_char,padded_method,enable_flag,remark,create_by,create_time
-        from ems_sys_auto_code_rule d
+        from base_auto_code_rule d
     </sql>
 
     <select id="selectSysAutoCodeResultList" parameterType="org.jeecg.modules.sysAutoCodeRule.entity.SysAutoCodeRule" resultMap="SysAutoCodeRuleResult">

+ 2 - 2
module_base/src/main/java/org/jeecg/modules/sysUploadFile/entity/SysUploadFile.java

@@ -25,10 +25,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_sys_upload_file")
+@TableName("base_upload_file")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ems_sys_upload_file对象", description="ems_sys_upload_file")
+@ApiModel(value="base_upload_file对象", description="base_upload_file")
 public class SysUploadFile implements Serializable {
     private static final long serialVersionUID = 1L;
 

+ 8 - 8
module_base/src/main/java/org/jeecg/modules/sysUploadFile/mapper/xml/SysUploadFileMapper.xml

@@ -18,7 +18,7 @@
 
     <sql id="selectFileVo">
         select fileId, relId, url, filename, extname, filesize, create_by, create_time, update_by, update_time, remark
-        from ems_sys_upload_file
+        from base_upload_file
     </sql>
 
     <select id="selectFileById" parameterType="Long" resultMap="SysUploadFileResult">
@@ -42,7 +42,7 @@
     </select>
 
     <insert id="insertFile" parameterType="org.jeecg.modules.sysUploadFile.entity.SysUploadFile">
-        insert into ems_sys_upload_file (
+        insert into base_upload_file (
         <if test="fileid != null">fileId, </if>
         <if test="relid != null">relId, </if>
         <if test="url != null and url != '' ">url, </if>
@@ -66,7 +66,7 @@
     </insert>
 
     <update id="updateFile" parameterType="org.jeecg.modules.sysUploadFile.entity.SysUploadFile">
-        update ems_sys_upload_file
+        update base_upload_file
         <set>
             <if test="relid != null">relId = #{relid}, </if>
             <if test="url != null and url != ''">url = #{url}, </if>
@@ -81,26 +81,26 @@
     </update>
 
     <delete id="deleteFileById" parameterType="Long">
-        delete from ems_sys_upload_file where fileId = #{fileId}
+        delete from base_upload_file where fileId = #{fileId}
     </delete>
 
     <delete id="deleteFileByRelId" parameterType="Long">
-        delete from ems_sys_upload_file where relId = #{relId}
+        delete from base_upload_file where relId = #{relId}
     </delete>
 
     <delete id="deleteFile" parameterType="org.jeecg.modules.sysUploadFile.entity.SysUploadFile">
-        delete from ems_sys_upload_file where relId = #{relid} and ifnull(remark,'') = ifnull(#{remark},'')
+        delete from base_upload_file where relId = #{relid} and ifnull(remark,'') = ifnull(#{remark},'')
     </delete>
 
     <delete id="deleteFileByIds" parameterType="Long">
-        delete from ems_sys_upload_file where fileId in
+        delete from base_upload_file where fileId in
         <foreach item="fileId" collection="array" open="(" separator="," close=")">
             #{fileId}
         </foreach>
     </delete>
 
     <delete id="deleteFileByRelIds" parameterType="Long">
-        delete from ems_sys_upload_filee where relid in
+        delete from base_upload_file where relid in
         <foreach item="relid" collection="array" open="(" separator="," close=")">
             #{relid}
         </foreach>

+ 3 - 3
module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/controller/CmmsInspectContentController.java

@@ -54,9 +54,9 @@ public class CmmsInspectContentController extends JeecgController<CmmsInspectCon
 	@Autowired
 	@SuppressWarnings("all")
 	private ICmmsInspectContentService cmmsInspectContentService;
-	 @Autowired
-	 @SuppressWarnings("all")
-	 private ICmmsInspectContentItemService iCmmsInspectContentItemService;
+ 	@Autowired
+ 	@SuppressWarnings("all")
+ 	private ICmmsInspectContentItemService iCmmsInspectContentItemService;
 	
 	/**
 	 * 分页列表查询

+ 2 - 2
module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/entity/CmmsInspectContent.java

@@ -25,10 +25,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_cmms_inspect_content")
+@TableName("cmms_inspect_content")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ems_cmms_inspect_content对象", description="巡检内容")
+@ApiModel(value="cmms_inspect_content对象", description="巡检内容")
 public class CmmsInspectContent implements Serializable {
     private static final long serialVersionUID = 1L;
 

+ 8 - 8
module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/mapper/xml/CmmsInspectContentMapper.xml

@@ -21,14 +21,14 @@
     <sql id="selectCmmsSpotcheckContentVo">
         select id, create_by, create_time, update_by, update_time, remark,
                contentcode, contentname, equipmentid, status,sys_org_code
-        from ems_cmms_inspect_content
+        from cmms_inspect_content
     </sql>
 
     <select id="getCmmsInspectContent" parameterType="org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContent" resultMap="CmmsSpotcheckContentResult">
         select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.remark,
         c.contentcode, c.contentname, c.equipmentid, c.status, c.sys_org_code, e.equipmentname
-        from ems_cmms_inspect_content as c
-        left join ems_tpm_equipment as e on c.equipmentid = e.id
+        from cmms_inspect_content as c
+        left join tpm_equipment as e on c.equipmentid = e.id
         <where>
             <if test="cmmsInspectContent.contentname != null  and cmmsInspectContent.contentname != ''"> and (c.contentcode like concat('%', #{cmmsInspectContent.contentname}, '%') or c.contentname like concat('%', #{cmmsInspectContent.contentname}, '%'))</if>
             <if test="cmmsInspectContent.equipmentid != null "> and c.equipmentid = #{cmmsInspectContent.equipmentid}</if>
@@ -39,14 +39,14 @@
     <select id="getCmmsInspectContentById" parameterType="String" resultMap="CmmsSpotcheckContentResult">
         select a.id, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
                a.contentcode, a.contentname, a.equipmentid, a.status, a.sys_org_code, e.equipmentname
-        from ems_cmms_inspect_content a
-        left join ems_tpm_equipment as e on a.equipmentid = e.id
+        from cmms_inspect_content a
+        left join tpm_equipment as e on a.equipmentid = e.id
         where a.id = #{id}
     </select>
 
     <!--修改状态-->
     <update id="updateStatua">
-        update ems_cmms_inspect_content
+        update cmms_inspect_content
         set status = #{status}
         where id = #{id}
     </update>
@@ -55,8 +55,8 @@
     <select id="getCmmsInspectContentByEqId" parameterType="String" resultMap="CmmsSpotcheckContentResult">
         select a.id, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
                a.contentcode, a.contentname, a.equipmentid, a.status, a.sys_org_code, e.equipmentname
-        from ems_cmms_inspect_content a
-        left join ems_tpm_equipment as e on a.equipmentid = e.id
+        from cmms_inspect_content a
+        left join tpm_equipment as e on a.equipmentid = e.id
         where a.equipmentid = #{eqid}
     </select>
 </mapper>

+ 2 - 2
module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContentItem/entity/CmmsInspectContentItem.java

@@ -25,10 +25,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_cmms_inspect_content_item")
+@TableName("cmms_inspect_content_item")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ems_cmms_inspect_content_item对象", description="巡检内容-巡检项")
+@ApiModel(value="cmms_inspect_content_item对象", description="巡检内容-巡检项")
 public class CmmsInspectContentItem implements Serializable {
     private static final long serialVersionUID = 1L;
 

+ 3 - 3
module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContentItem/mapper/xml/CmmsInspectContentItemMapper.xml

@@ -20,9 +20,9 @@
     <select id="getCmmsInspectContentItemListByCountId" parameterType="String" resultMap="CmmsSpotcheckContentItemResult">
         select b.id, b.inspectcheckcontid, b.inspectcheckitemid, i.itemcode, i.itemname,
         i.equipdefid, i.conditions, i.refervalue, i.tag, i.sys_org_code, i.inspectionstandards, i.classification, t.name as equipdefname
-        from ems_cmms_inspect_content_item as b
-        left join ems_cmms_inspect_item as i on b.inspectcheckitemid = i.id
-        left join ems_tpm_equipment_tree as t on i.equipdefid = t.id
+        from cmms_inspect_content_item as b
+        left join cmms_inspect_item as i on b.inspectcheckitemid = i.id
+        left join tpm_equipment_tree as t on i.equipdefid = t.id
         <where>
             <if test="inspectcheckcontid != null "> and b.inspectcheckcontid = #{inspectcheckcontid}</if>
         </where>

+ 2 - 2
module_cmms/src/main/java/org/jeecg/modules/cmmsInspectItem/entity/CmmsInspectItem.java

@@ -25,10 +25,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_cmms_inspect_item")
+@TableName("cmms_inspect_item")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ems_cmms_inspect_item对象", description="巡检项")
+@ApiModel(value="cmms_inspect_item对象", description="巡检项")
 public class CmmsInspectItem implements Serializable {
     private static final long serialVersionUID = 1L;
 

+ 4 - 4
module_cmms/src/main/java/org/jeecg/modules/cmmsInspectItem/mapper/xml/CmmsInspectItemMapper.xml

@@ -24,14 +24,14 @@
     <sql id="selectCmmsInspectItemVo">
         select id, create_by, create_time, update_by, update_time, remark,
                itemcode, itemname, equipdefid, conditions, refervalue, tag, sys_org_code, inspectionstandards, classification
-        from ems_cmms_inspect_item
+        from cmms_inspect_item
     </sql>
 
     <select id="getCmmsInspectItems" parameterType="org.jeecg.modules.cmmsInspectItem.entity.CmmsInspectItem" resultMap="CmmsInspectItemResult">
         select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.remark,
         c.itemcode, c.itemname, c.equipdefid, c.conditions, c.refervalue, c.tag,c.sys_org_code, c.inspectionstandards, c.classification, t.name as equipdefname
-        from ems_cmms_inspect_item as c
-        left join ems_tpm_equipment_tree as t
+        from cmms_inspect_item as c
+        left join tpm_equipment_tree as t
         on c.equipdefid = t.id
         <where>
             <if test="cmmsInspectItem.itemcode != null  and cmmsInspectItem.itemcode != ''"> and (c.itemcode like concat('%', #{cmmsInspectItem.itemcode}, '%') or c.itemname like concat('%', #{cmmsInspectItem.itemcode}, '%'))</if>
@@ -42,7 +42,7 @@
 
     <select id="getCmmsInspectItemsByEqid" resultType="org.jeecg.modules.cmmsInspectItem.entity.CmmsInspectItem">
         <include refid="selectCmmsInspectItemVo" />
-        where equipdefid = (select equipmenttreeid from ems_tpm_equipment where id = #{eqid})  or equipdefid is null
+        where equipdefid = (select equipmenttreeid from tpm_equipment where id = #{eqid})  or equipdefid is null
     </select>
 
 </mapper>

+ 2 - 2
module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLine/entity/CmmsInspectLine.java

@@ -25,10 +25,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_cmms_inspect_line")
+@TableName("cmms_inspect_line")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ems_cmms_inspect_line对象", description="巡检路线")
+@ApiModel(value="cmms_inspect_line对象", description="巡检路线")
 public class CmmsInspectLine implements Serializable {
     private static final long serialVersionUID = 1L;
 

+ 2 - 2
module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLineDetail/entity/CmmsInspectLineDetail.java

@@ -25,10 +25,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_cmms_inspect_line_detail")
+@TableName("cmms_inspect_line_detail")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ems_cmms_inspect_line_detail对象", description="巡检路线详情")
+@ApiModel(value="cmms_inspect_line_detail对象", description="巡检路线详情")
 public class CmmsInspectLineDetail implements Serializable {
     private static final long serialVersionUID = 1L;
 

+ 2 - 2
module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/entity/CmmsInspectPlan.java

@@ -25,10 +25,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_cmms_inspect_plan")
+@TableName("cmms_inspect_plan")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ems_cmms_inspect_plan对象", description="巡检计划")
+@ApiModel(value="cmms_inspect_plan对象", description="巡检计划")
 public class CmmsInspectPlan implements Serializable {
     private static final long serialVersionUID = 1L;
 

+ 1 - 1
module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/mapper/xml/CmmsInspectPlanMapper.xml

@@ -29,7 +29,7 @@
         select id, create_by, create_time, update_by, update_time, remark, plancode,
                planname, iftimeset, begintime, repeatnum, repeattype, noticenum, noticetype, status,
                chargeruser, nexttime, tasknum, ifnotice, noticetime
-        from ems_cmms_inspect_plan
+        from cmms_inspect_plan
     </sql>
 
     <select id="selectCmmsInspectPlanList" parameterType="org.jeecg.modules.cmmsInspectPlan.entity.CmmsInspectPlan" resultMap="CmmsInspectPlanResult">

+ 2 - 2
module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlanTask/entity/CmmsInspectPlanTask.java

@@ -25,10 +25,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_cmms_inspect_plan_task")
+@TableName("cmms_inspect_plan_task")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ems_cmms_inspect_plan_task对象", description="巡检计划-任务")
+@ApiModel(value="cmms_inspect_plan_task对象", description="巡检计划-任务")
 public class CmmsInspectPlanTask implements Serializable {
     private static final long serialVersionUID = 1L;
 

+ 2 - 2
module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/entity/CmmsInspectSpot.java

@@ -25,10 +25,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_cmms_inspect_spot")
+@TableName("cmms_inspect_spot")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ems_cmms_inspect_spot对象", description="巡检点")
+@ApiModel(value="cmms_inspect_spot对象", description="巡检点")
 public class CmmsInspectSpot implements Serializable {
     private static final long serialVersionUID = 1L;
 

+ 2 - 2
module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/mapper/xml/CmmsInspectSpotMapper.xml

@@ -19,8 +19,8 @@
     <select id="getCmmsInspectSpotList" parameterType="org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpot" resultMap="CmmsInspectContentResult">
         select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.remark,
         c.contentcode, c.contentname, c.equipdefid, c.sys_org_code, t.name as equipdefname
-        from ems_cmms_inspect_spot as c
-        left join ems_tpm_equipment_tree as t
+        from cmms_inspect_spot as c
+        left join tpm_equipment_tree as t
         on c.equipdefid = t.id
         <where>
             <if test="cmmsInspectSpot.contentcode != null  and cmmsInspectSpot.contentcode != ''"> and (c.contentcode like concat('%', #{cmmsInspectSpot.contentcode}, '%') or c.contentname like concat('%', #{cmmsInspectSpot.contentcode}, '%'))</if>

+ 2 - 2
module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpotEquip/entity/CmmsInspectSpotEquip.java

@@ -25,10 +25,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_cmms_inspect_spot_equip")
+@TableName("cmms_inspect_spot_equip")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ems_cmms_inspect_spot_equip对象", description="巡检点-设备")
+@ApiModel(value="cmms_inspect_spot_equip对象", description="巡检点-设备")
 public class CmmsInspectSpotEquip implements Serializable {
     private static final long serialVersionUID = 1L;
 

+ 1 - 1
module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpotEquip/mapper/xml/CmmsInspectSpotEquipMapper.xml

@@ -11,7 +11,7 @@
     </resultMap>
 
     <select id="getInspectSpotEquipBySprtId" parameterType="String" resultMap="CmmsInspectContentEquipResult">
-        select * from ems_cmms_inspect_spot_equip where inspectspotid = #{id}
+        select * from cmms_inspect_spot_equip where inspectspotid = #{id}
     </select>
 
 

+ 2 - 2
module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpotItem/entity/CmmsInspectSpotItem.java

@@ -25,10 +25,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_cmms_inspect_spot_item")
+@TableName("cmms_inspect_spot_item")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ems_cmms_inspect_spot_item对象", description="巡检点-巡检项")
+@ApiModel(value="cmms_inspect_spot_item对象", description="巡检点-巡检项")
 public class CmmsInspectSpotItem implements Serializable {
     private static final long serialVersionUID = 1L;
 

+ 2 - 2
module_cmms/src/main/java/org/jeecg/modules/cmmsOrderNode/entity/CmmsOrderNode.java

@@ -25,10 +25,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_cmms_order_node")
+@TableName("cmms_order_node")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ems_cmms_order_node对象", description="工单操作记录表")
+@ApiModel(value="cmms_order_node对象", description="工单操作记录表")
 public class CmmsOrderNode implements Serializable {
     private static final long serialVersionUID = 1L;
 

+ 1 - 1
module_cmms/src/main/java/org/jeecg/modules/cmmsOrderNode/mapper/xml/CmmsOrderNodeMapper.xml

@@ -17,7 +17,7 @@
 
     <sql id="selectCmmsOrderNodeVo">
         select id, create_by, create_time, update_by, update_time, remark, nodename, relid, opinion, handledate
-        from ems_cmms_order_node
+        from cmms_order_node
     </sql>
 
     <select id="selectCmmsOrderNodeList" parameterType="org.jeecg.modules.cmmsOrderNode.entity.CmmsOrderNode" resultMap="CmmsOrderNodeResult">

+ 2 - 2
module_cmms/src/main/java/org/jeecg/modules/cmmsRepair/entity/CmmsRepair.java

@@ -29,10 +29,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_cmms_repair")
+@TableName("cmms_repair")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ems_cmms_repair对象", description="维修工单")
+@ApiModel(value="cmms_repair对象", description="维修工单")
 public class CmmsRepair implements Serializable {
     private static final long serialVersionUID = 1L;
 

+ 3 - 3
module_cmms/src/main/java/org/jeecg/modules/cmmsRepair/mapper/xml/CmmsRepairMapper.xml

@@ -31,7 +31,7 @@
     <select id="selectListByObj" parameterType="org.jeecg.modules.cmmsRepair.entity.CmmsRepair" resultMap="cmmsRepairResult">
         select id,create_by,create_time,update_by,update_time,remark,repaircode,repairname,equipmentid,
         equipmentcode,equipmentname,priority,faultdate,faultdesc,repairuser,repairdate,feedback,result,status,relid,repairstatus
-        from ems_cmms_repair
+        from cmms_repair
         <where>
             <if test="cmmsRepair.repaircode !=null and cmmsRepair.repaircode !=''">
                 AND (repaircode like CONCAT('%', #{cmmsRepair.repaircode}, '%') or repairname like CONCAT('%', #{cmmsRepair.repaircode}, '%'))
@@ -54,7 +54,7 @@
 
     <!--    根据Id修改客户列表-->
     <update id="updateCmmsRepair" parameterType="org.jeecg.modules.cmmsRepair.entity.CmmsRepair">
-        update ems_cmms_repair
+        update cmms_repair
         <set>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="remark != null">remark=#{remark},</if>
@@ -79,7 +79,7 @@
 
 
     <update id="updateRepairStatus">
-        update ems_cmms_repair set repairstatus = #{repairstatus} where id = #{id}
+        update cmms_repair set repairstatus = #{repairstatus} where id = #{id}
     </update>
 
 </mapper>