修改结束时间字段，修改被覆盖文件

master/src/main/java/com/ruoyi/project/intact/controller/TApproveMaintenanceController.java

@@ -294,11 +294,11 @@ public class TApproveMaintenanceController extends BaseController
         if (devTask.getCondition().equals("1")) {
             devTask.setComment("通过" + symbol + devTask.getComment());
             tApproveMaintenance.setStatus(1L);
-            tApproveMaintenance.setEndtime(new Date());
+            tApproveMaintenance.setEnddate(new Date());
         }else if (devTask.getCondition().equals("0")) {
             devTask.setComment("未通过" + symbol + devTask.getComment());
             tApproveMaintenance.setStatus(2L);
-            tApproveMaintenance.setEndtime(new Date());
+            tApproveMaintenance.setEnddate(new Date());
         }
         String[] ids;
         ids = tApproveMaintenance.getDevId().split(",");

master/src/main/java/com/ruoyi/project/intact/domain/TApproveMaintenance.java

@@ -59,7 +59,7 @@ public class TApproveMaintenance extends BaseEntity
     /** 结束时间 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date endtime;
+    private Date enddate;
 
     /** 流程id */
     @Excel(name = "流程id")
@@ -198,14 +198,14 @@ public class TApproveMaintenance extends BaseEntity
     {
         return creattime;
     }
-    public void setEndtime(Date endtime)
+    public void setEnddate(Date enddate)
     {
-        this.endtime = endtime;
+        this.enddate = enddate;
     }
 
-    public Date getEndtime()
+    public Date getEnddate()
     {
-        return endtime;
+        return enddate;
     }
     public void setProcessId(String processId)
     {
@@ -274,7 +274,7 @@ public class TApproveMaintenance extends BaseEntity
             .append("fileUrls", getFileUrls())
             .append("status", getStatus())
             .append("creattime", getCreattime())
-            .append("endtime", getEndtime())
+            .append("enddate", getEnddate())
             .append("processId", getProcessId())
             .append("apNo", getApNo())
             .append("reportId", getReportId())

master/src/main/resources/mybatis/intact/TApproveMaintenanceMapper.xml

@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fileUrls"    column="file_urls"    />
         <result property="status"    column="status"    />
         <result property="creattime"    column="creattime"    />
-        <result property="endtime"    column="endtime"    />
+        <result property="enddate"    column="enddate"    />
         <result property="processId"    column="process_id"    />
         <result property="apNo"    column="ap_no"    />
         <result property="reportId"    column="report_id"    />
@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTApproveMaintenanceVo">
-        select d.id, d.user_id, d.dev_id, d.dev_type, d.approve_type, d.content, d.file_urls, d.status, d.creattime, d.endtime, d.process_id, d.ap_no, d.report_id, d.month_id, d.del_flag, d.dept_id ,s.dept_name from t_approve_maintenance d
+        select d.id, d.user_id, d.dev_id, d.dev_type, d.approve_type, d.content, d.file_urls, d.status, d.creattime, d.enddate, d.process_id, d.ap_no, d.report_id, d.month_id, d.del_flag, d.dept_id ,s.dept_name from t_approve_maintenance d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fileUrls != null  and fileUrls != ''"> and file_urls = #{fileUrls}</if>
             <if test="status != null "> and status = #{status}</if>
             <if test="creattime != null "> and creattime = #{creattime}</if>
-            <if test="endtime != null "> and endtime = #{endtime}</if>
+            <if test="enddate != null "> and enddate = #{enddate}</if>
             <if test="processId != null  and processId != ''"> and process_id = #{processId}</if>
             <if test="apNo != null  and apNo != ''"> and ap_no = #{apNo}</if>
             <if test="reportId != null  and reportId != ''"> and report_id = #{reportId}</if>
@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fileUrls != null">file_urls,</if>
             <if test="status != null">status,</if>
             <if test="creattime != null">creattime,</if>
-            <if test="endtime != null">endtime,</if>
+            <if test="enddate != null">enddate,</if>
             <if test="processId != null">process_id,</if>
             <if test="apNo != null">ap_no,</if>
             <if test="reportId != null">report_id,</if>
@@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fileUrls != null">#{fileUrls},</if>
             <if test="status != null">#{status},</if>
             <if test="creattime != null">#{creattime},</if>
-            <if test="endtime != null">#{endtime},</if>
+            <if test="enddate != null">#{enddate},</if>
             <if test="processId != null">#{processId},</if>
             <if test="apNo != null">#{apNo},</if>
             <if test="reportId != null">#{reportId},</if>
@@ -111,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fileUrls != null">file_urls = #{fileUrls},</if>
             <if test="status != null">status = #{status},</if>
             <if test="creattime != null">creattime = #{creattime},</if>
-            <if test="endtime != null">endtime = #{endtime},</if>
+            <if test="enddate != null">enddate = #{enddate},</if>
             <if test="processId != null">process_id = #{processId},</if>
             <if test="apNo != null">ap_no = #{apNo},</if>
             <if test="reportId != null">report_id = #{reportId},</if>

ui/src/views/approve/approveDetail/specMaintenance-detail.vue

@@ -615,7 +615,7 @@
         reUrls: null,
         status: 0,
         creattime: null,
-        endtime: null,
+        enddate: null,
         processId: null,
         govDate: null,
         delayDate: null,

ui/src/views/approve/pending/index.vue

@@ -126,6 +126,7 @@
     <spec-training-plan v-if="specTrainingPlanDealVisible" ref="specTrainingPlanDeal" @refreshDataList="getList"></spec-training-plan>
     <process-img v-if="processImgVisible" ref="processImg" @refreshDataList="getList"></process-img>
     <intact-resolve v-if="intactResolveVisible" ref="intactResolveDeal" @refreshDataList="getList"></intact-resolve>
+    <spec-maintenance v-if="specMaintenanceVisible" ref="specMaintenance" @refreshDataList="getList"></spec-maintenance>
   </div>
 </template>
 
@@ -141,6 +142,7 @@
   import {getToken} from "@/utils/auth";
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+  import SpecMaintenance from "@/views/approve/pending/specMaintenance-deal";
 
   export default {
     name: "Pending",
@@ -152,6 +154,7 @@
       SpecTrainingPlan,
       ProcessImg,
       IntactResolve,
+      SpecMaintenance
     },
     data() {
       return {
@@ -164,6 +167,7 @@
         specModifyDealVisible: false,
         specTrainingPlanDealVisible: false,
         intactResolveVisible:false,
+        specMaintenanceVisible: false,
         // 选中数组
         ids: [],
         // 非单个禁用
@@ -354,17 +358,17 @@
             this.$refs.specTrainingPlanDeal.init(row.approveObj.id, row.taskId, row.processId,row.taskName)
           })
         }else if (row.processName == "设备维修审批流程"){
-          this.specModifyDealVisible = true
+          this.specMaintenanceVisible = true
           this.$nextTick(() => {
             console.log(row.taskName)
-            this.$refs.specModifyDeal.init(row.approveObj.id, row.taskId, row.processId,row.taskName)
+            this.$refs.specMaintenance.init(row.approveObj.id, row.taskId, row.processId,row.taskName)
           })
         }else if (row.processName == "设备变更申请"){
           this.intactResolveVisible = true
           this.$nextTick(() => {
 
             console.log(row)
-           
+
             this.$refs.intactResolveDeal.init(row.approveObj.id, row.taskId, row.processId,row.taskName)
           })
         }else {

ui/src/views/approve/pending/specMaintenance-deal.vue

@@ -610,7 +610,7 @@
         reUrls: null,
         status: 0,
         creattime: null,
-        endtime: null,
+        enddate: null,
         processId: null,
         govDate: null,
         delayDate: null,

ui/src/views/intact/gyl/intactRecord.vue

@@ -112,9 +112,9 @@
             <span>{{ parseTime(scope.row.creattime, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('结束时间')" align="center" prop="endtime" width="100">
+        <el-table-column :label="$t('结束时间')" align="center" prop="enddate" width="100">
           <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.endtime, '{y}-{m}-{d}') }}</span>
+            <span>{{ parseTime(scope.row.enddate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
         <el-table-column :label="$t('操作')" align="center"  width="120" class-name="small-padding fixed-width">