Merge remote-tracking branch 'origin/master'

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/TestBySlJob.java

@@ -1,25 +0,0 @@
-package org.jeecg.modules.quartz.job;
-
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.util.DateUtils;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-
-/**
- * ClassName: TestBySlJob
- * Package: org.jeecg.modules.quartz.job
- * Description:
- *
- * @Author sl
- * @Create 2024/1/11 11:13
- * @Version 1.0
- */
-@Slf4j
-public class TestBySlJob implements Job {
-
-    @Override
-    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        log.info(String.format(" sl测试 Jeecg-Boot 普通定时任务 SampleJob !  时间:" + DateUtils.getTimestamp()));
-    }
-}

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeep/entity/CmmsUpkeep.java

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

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeep/mapper/xml/CmmsUpkeepMapper.xml

@@ -31,7 +31,7 @@
         select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.remark, c.upkeepcode,
         c.upkeepplanid, c.upkeepprojid, c.projectname, c.planname, c.address, c.supplier, c.suppliertel,
         c.linker, c.linkertel, c.chargeruser, c.upkeepname, c.upkeepdesc, c.status, c.opinion
-        from ems_cmms_upkeep as c
+        from cmms_upkeep as c
         <where>
             <if test="upkeepcode != null and upkeepcode != ''"> and (c.upkeepcode like concat('%', #{upkeepcode}, '%') or c.upkeepname like concat('%', #{upkeepcode}, '%'))</if>
             <if test="chargeruser != null and chargeruser != ''"> and concat(chargeruser,',') like concat('%', #{chargeruser}, ',%')</if>

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepItem/entity/CmmsUpkeepItem.java

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

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepItem/mapper/xml/CmmsUpkeepItemMapper.xml

@@ -18,7 +18,7 @@
 
     <select id="getAllCmmsUpkeepItem" parameterType="org.jeecg.modules.cmmsUpkeepItem.entity.CmmsUpkeepItem" resultMap="CmmsUpkeepItemResult">
         select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.itemcode, c.itemname, c.equipdefid, c.itemcontent, c.remark, t.name as equiptypeName
-        from ems_cmms_upkeep_item as c left join ems_tpm_equipment_tree as t on c.equipdefid = t.id
+        from cmms_upkeep_item as c left join tpm_equipment_tree as t on c.equipdefid = t.id
         <where>
             <if test="cmmsUpkeepItem.itemcode != null  and cmmsUpkeepItem.itemcode != ''"> and (c.itemcode like concat('%', #{cmmsUpkeepItem.itemcode}, '%') or c.itemname like concat('%', #{cmmsUpkeepItem.itemcode}, '%'))</if>
             <if test="cmmsUpkeepItem.equipdefid != null  and cmmsUpkeepItem.equipdefid != ''"> and c.equipdefid = #{cmmsUpkeepItem.equipdefid}</if>
@@ -28,9 +28,9 @@
 
     <select id="getCmmsUpkeepItemByEqid" parameterType="String" resultMap="CmmsUpkeepItemResult">
         select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.itemcode, c.itemname, c.equipdefid, c.itemcontent, c.remark, t.name as equiptypeName
-        from ems_tpm_equipment as e
-        left join ems_tpm_equipment_tree as t on e.equipmenttreeid = t.id
-        left join ems_cmms_upkeep_item as c on t.id=c.equipdefid
+        from tpm_equipment as e
+        left join tpm_equipment_tree as t on e.equipmenttreeid = t.id
+        left join cmms_upkeep_item as c on t.id=c.equipdefid
         <where>
             <if test="eqid != null and eqid != ''"> and e.id = #{eqid}</if>
         </where>

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

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

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

@@ -34,7 +34,7 @@
 
     <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
-        from ems_cmms_upkeep_plan as p left join ems_tpm_equipment as e on p.equipmentid = e.id
+        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.plancode like concat('%', #{cmmsUpkeepPlan.plancode}, '%') or p.planname like concat('%', #{cmmsUpkeepPlan.planname}, '%'))</if>
             <if test="cmmsUpkeepPlan.chargeruser != null and cmmsUpkeepPlan.chargeruser != ''"> and concat(p.chargeruser,',') like concat('%', #{cmmsUpkeepPlan.chargeruser}, ',%')</if>
@@ -46,16 +46,16 @@
 
     <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
-        from ems_cmms_upkeep_plan as p left join ems_tpm_equipment as e on p.equipmentid = e.id
+        from cmms_upkeep_plan as p left join tpm_equipment as e on p.equipmentid = e.id
         where a.id = #{id}
     </select>
 
     <select id="getCmmsUpkeepPlanByStatus" parameterType="String" resultType="org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlan">
-        select * from ems_cmms_upkeep_plan where status=#{status}
+        select * from cmms_upkeep_plan where status=#{status}
     </select>
 
     <update id="updateCmmsUpkeepPlanContentById" parameterType="org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlanDto">
-        update ems_cmms_upkeep_plan
+        update cmms_upkeep_plan
         <trim prefix="SET" suffixOverrides=",">
             <if test="cmmsUpkeepPlanDto.updateBy != null">update_by = #{cmmsUpkeepPlanDto.updateBy},</if>
             <if test="cmmsUpkeepPlanDto.updateTime != null">update_time = #{cmmsUpkeepPlanDto.updateTime},</if>
@@ -87,13 +87,13 @@
 
     <!--修改计划状态-->
     <update id="updateCmmsUpkeepPlanStatusById" parameterType="org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlan">
-        update ems_cmms_upkeep_plan set status = #{cmmsUpkeepPlan.status} where id=#{cmmsUpkeepPlan.id}
+        update cmms_upkeep_plan set status = #{cmmsUpkeepPlan.status} where id=#{cmmsUpkeepPlan.id}
     </update>
 
     <!--修改下次生成工单时间及通知信息-->
     <update id="updateCmmsUpkeepCreateNoticeByIds" parameterType="org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlan">
         <foreach item="item" collection="cmmsUpkeepPlanList" index="index" open="(" separator="," close=")">
-            update ems_cmms_upkeep_plan set nexttime = #{item.nexttime}, ifnotice = #{item.ifnotice}, noticetime = #{item.noticetime}
+            update cmms_upkeep_plan set nexttime = #{item.nexttime}, ifnotice = #{item.ifnotice}, noticetime = #{item.noticetime}
             where id=#{item.id};
         </foreach>
     </update>
@@ -101,7 +101,7 @@
     <!--修改是否已发送通知信息-->
     <update id="updateCmmsUpkeepPlanIfnoticeByIds" parameterType="org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlan">
         <foreach item="item" collection="cmmsUpkeepPlanList">
-            update ems_cmms_upkeep_plan set ifnotice = #{item.ifnotice} where id=#{item.id}
+            update cmms_upkeep_plan set ifnotice = #{item.ifnotice} where id=#{item.id}
         </foreach>
     </update>
 

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlanItem/entity/CmmsUpkeepPlanItem.java

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

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlanItem/mapper/xml/CmmsUpkeepPlanItemMapper.xml

@@ -20,27 +20,23 @@
     <select id="getCmmsUpkeepPlanItemByPid" parameterType="String" resultMap="CmmsUpkeepPlanItemResult">
         select pi.id, pi.create_by, pi.create_time, pi.update_by, pi.update_time,
         pi.upkeepplanid, pi.upkeepitemid, i.itemcode, i.itemname, i.equipdefid, i.itemcontent, i.remark, t.name as equiptypeName
-        from ems_cmms_upkeep_plan_item as pi
-        left join ems_cmms_upkeep_item as i on pi.upkeepitemid = i.id
-        left join ems_tpm_equipment_tree as t on i.equipdefid = t.id
+        from cmms_upkeep_plan_item as pi
+        left join cmms_upkeep_item as i on pi.upkeepitemid = i.id
+        left join tpm_equipment_tree as t on i.equipdefid = t.id
         <where>
             <if test="upkeepplanid != null and upkeepplanid != ''"> and pi.upkeepplanid = #{upkeepplanid}</if>
         </where>
     </select>
 
     <delete id="delCmmsUpkeepPlanItemByPid" parameterType="String">
-        delete from ems_cmms_upkeep_plan_item where upkeepplanid = #{upkeepplanid}
+        delete from cmms_upkeep_plan_item where upkeepplanid = #{upkeepplanid}
     </delete>
 
     <delete id="delCmmsUpkeepPlanItemByPids" parameterType="String">
-        delete from ems_cmms_upkeep_plan_item where upkeepplanid in
+        delete from cmms_upkeep_plan_item where upkeepplanid in
         <foreach item="upkeepplanid" collection="upkeepplanids" index="index" open="(" separator="," close=")">
             #{upkeepplanid}
         </foreach>
     </delete>
 
-
-
-
-
 </mapper>

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlanItem/vue/CmmsUpkeepPlanItemList.vue

@@ -1,171 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('保养计划-保养项')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-
-    <cmms-upkeep-plan-item-modal ref="modalForm" @ok="modalFormOk"></cmms-upkeep-plan-item-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import CmmsUpkeepPlanItemModal from './modules/CmmsUpkeepPlanItemModal'
-
-  export default {
-    name: 'CmmsUpkeepPlanItemList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      CmmsUpkeepPlanItemModal
-    },
-    data () {
-      return {
-        description: '保养计划-保养项管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'保养项id',
-            align:"center",
-            dataIndex: 'upkeepitemid'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/cmmsUpkeepPlanItem/cmmsUpkeepPlanItem/list",
-          delete: "/cmmsUpkeepPlanItem/cmmsUpkeepPlanItem/delete",
-          deleteBatch: "/cmmsUpkeepPlanItem/cmmsUpkeepPlanItem/deleteBatch",
-          exportXlsUrl: "/cmmsUpkeepPlanItem/cmmsUpkeepPlanItem/exportXls",
-          importExcelUrl: "cmmsUpkeepPlanItem/cmmsUpkeepPlanItem/importExcel",
-          
-        },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-    },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'upkeepitemid',text:'保养项id',dictCode:''})
-        this.superFieldList = fieldList
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlanItem/vue/CmmsUpkeepPlanItem_menu_insert.sql

@@ -1,26 +0,0 @@
-
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) 
-VALUES ('2024011701372340070', NULL, '保养计划-保养项', '/cmmsUpkeepPlanItem/cmmsUpkeepPlanItemList', 'cmmsUpkeepPlanItem/CmmsUpkeepPlanItemList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 1, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-01-17 13:37:07', NULL, NULL, 0);
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011701372340071', '2024011701372340070', '添加保养计划-保养项', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_cmms_upkeep_plan_item:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-17 13:37:07', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011701372350072', '2024011701372340070', '编辑保养计划-保养项', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_cmms_upkeep_plan_item:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-17 13:37:07', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011701372350073', '2024011701372340070', '删除保养计划-保养项', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_cmms_upkeep_plan_item:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-17 13:37:07', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011701372350074', '2024011701372340070', '批量删除保养计划-保养项', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_cmms_upkeep_plan_item:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-17 13:37:07', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011701372350075', '2024011701372340070', '导出excel_保养计划-保养项', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_cmms_upkeep_plan_item:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-17 13:37:07', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024011701372350076', '2024011701372340070', '导入excel_保养计划-保养项', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:ems_cmms_upkeep_plan_item:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-01-17 13:37:07', NULL, NULL, 0, 0, '1', 0);

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlanItem/vue/modules/CmmsUpkeepPlanItemForm.vue

@@ -1,104 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="保养项id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upkeepitemid">
-              <a-input v-model="model.upkeepitemid" placeholder="请输入保养项id"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </j-form-container>
-  </a-spin>
-</template>
-
-<script>
-
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'CmmsUpkeepPlanItemForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-        },
-        url: {
-          add: "/cmmsUpkeepPlanItem/cmmsUpkeepPlanItem/add",
-          edit: "/cmmsUpkeepPlanItem/cmmsUpkeepPlanItem/edit",
-          queryById: "/cmmsUpkeepPlanItem/cmmsUpkeepPlanItem/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
-      },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        this.edit(this.modelDefault);
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
-         
-        })
-      },
-    }
-  }
-</script>

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlanItem/vue/modules/CmmsUpkeepPlanItemModal.Style#Drawer.vue

@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <cmms-upkeep-plan-item-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cmms-upkeep-plan-item-form>
-    <div class="drawer-footer">
-      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
-      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-
-  import CmmsUpkeepPlanItemForm from './CmmsUpkeepPlanItemForm'
-
-  export default {
-    name: 'CmmsUpkeepPlanItemModal',
-    components: {
-      CmmsUpkeepPlanItemForm
-    },
-    data () {
-      return {
-        title:"操作",
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-/** Button按钮间距 */
-  .ant-btn {
-    margin-left: 30px;
-    margin-bottom: 30px;
-    float: right;
-  }
-  .drawer-footer{
-    position: absolute;
-    bottom: -8px;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-</style>

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlanItem/vue/modules/CmmsUpkeepPlanItemModal.vue

@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <cmms-upkeep-plan-item-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cmms-upkeep-plan-item-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import CmmsUpkeepPlanItemForm from './CmmsUpkeepPlanItemForm'
-  export default {
-    name: 'CmmsUpkeepPlanItemModal',
-    components: {
-      CmmsUpkeepPlanItemForm
-    },
-    data () {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepProject/entity/CmmsUpkeepProject.java

@@ -25,10 +25,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("ems_cmms_upkeep_project")
+@TableName("cmms_upkeep_project")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ems_cmms_upkeep_project对象", description="保养工作项目")
+@ApiModel(value="cmms_upkeep_project对象", description="保养工作项目")
 public class CmmsUpkeepProject implements Serializable {
     private static final long serialVersionUID = 1L;