设备管理修改添加

hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsMobileController.java

@@ -83,6 +83,14 @@ public class DmsMobileController extends BaseController {
         List<DmsBaseOutsrcInfo> baseOutsrcInfos = dmsBaseOutsrcInfoService.selectDmsBaseOutsrcInfoList(queryBaseOutsrcInfo);
         return success(baseOutsrcInfos);
     }
+    /**
+     * 根据传参模糊查询设备名
+     */
+    @GetMapping("/likeDeviceName")
+    public AjaxResult likeDeviceName(String deviceName) {
+        List<DmsBaseDeviceLedger> deviceLedgerList = baseDeviceLedgerService.likeDeviceName(deviceName);
+        return success(deviceLedgerList);
+    }
 
 
     /**

hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBaseDeviceLedgerMapper.java

@@ -2,6 +2,7 @@ package com.hw.dms.mapper;
 
 import java.util.List;
 import com.hw.dms.domain.DmsBaseDeviceLedger;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 设备台账信息Mapper接口
@@ -69,4 +70,5 @@ public interface DmsBaseDeviceLedgerMapper
      */
     public DmsBaseDeviceLedger selectDmsBaseDeviceLedgerByDeviceCode(String deviceCode);
 
+    List<DmsBaseDeviceLedger> likeDeviceName(@Param("deviceName") String deviceName);
 }

hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBaseDeviceLedgerService.java

@@ -78,4 +78,6 @@ public interface IDmsBaseDeviceLedgerService
      * @return
      */
     public int printLabels(String[] deviceCodes);
+
+    List<DmsBaseDeviceLedger> likeDeviceName(String deviceName);
 }

hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceLedgerServiceImpl.java

@@ -140,6 +140,12 @@ public class DmsBaseDeviceLedgerServiceImpl implements IDmsBaseDeviceLedgerServi
     }
 
 
+    @Override
+    public List<DmsBaseDeviceLedger> likeDeviceName(String deviceName) {
+        List<DmsBaseDeviceLedger> list = dmsBaseDeviceLedgerMapper.likeDeviceName(deviceName);
+        return list;
+    }
+
     /**
      * 打印设备码
      *

hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java

@@ -116,7 +116,7 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
     @Override
     public int insertDmsBillsFaultInstance(DmsBillsFaultInstance dmsBillsFaultInstance) {
         Date curretnDate = new Date();
-        String userName = SecurityUtils.getUsername();
+        String userName = SecurityUtils.getNickname();
         dmsBillsFaultInstance.setWfProcessId(WfConstants.WF_BILLS_FAULT_INSTANCE_PROCESS_ID);
         dmsBillsFaultInstance.setApplyUser(userName);
         dmsBillsFaultInstance.setApplyTime(curretnDate);
@@ -158,7 +158,7 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
      */
     @Override
     public int updateDmsBillsFaultInstance(DmsBillsFaultInstance dmsBillsFaultInstance) {
-        String username = SecurityUtils.getUsername();
+        String username = SecurityUtils.getNickname();
         if (dmsBillsFaultInstance.getRepairConfirm()!=null){
             dmsBillsFaultInstance.setConfirmer(username);
         }

hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsFaultInstanceActivityServiceImpl.java

@@ -60,15 +60,25 @@ public class DmsFaultInstanceActivityServiceImpl implements IDmsFaultInstanceAct
         queryInstanceFile.setTargetId(dmsFaultInstanceActivity1.getInstanceActivityId());
         List<DmsInstanceFile> dmsInstanceFiles = dmsInstanceFileMapper.selectDmsInstanceFileConvertList(queryInstanceFile);
         dmsFaultInstanceActivity1.setDmsInstanceFileList(dmsInstanceFiles);
-        DmsFaultInstanceActivity dmsFaultInstanceActivity2 = dmsFaultInstanceActivities.get(1);
-        DmsInstanceFile queryInstanceFile1 = new DmsInstanceFile();
-        queryInstanceFile1.setTargetType("2");
-        queryInstanceFile1.setTargetId(dmsFaultInstanceActivity1.getInstanceActivityId());
-        List<DmsInstanceFile> dmsInstanceFiles2 = dmsInstanceFileMapper.selectDmsInstanceFileConvertList(queryInstanceFile1);
-        dmsFaultInstanceActivity2.setDmsInstanceFileList(dmsInstanceFiles2);
         List<DmsFaultInstanceActivity> dmsFaultInstanceActivities1 = new ArrayList<>();
+        if (dmsFaultInstanceActivities.size()>1){
+            DmsFaultInstanceActivity dmsFaultInstanceActivity2 = dmsFaultInstanceActivities.get(1);
+            DmsInstanceFile queryInstanceFile1 = new DmsInstanceFile();
+            queryInstanceFile1.setTargetType("2");
+            queryInstanceFile1.setTargetId(dmsFaultInstanceActivity1.getInstanceActivityId());
+            List<DmsInstanceFile> dmsInstanceFiles2 = dmsInstanceFileMapper.selectDmsInstanceFileConvertList(queryInstanceFile1);
+            dmsFaultInstanceActivity2.setDmsInstanceFileList(dmsInstanceFiles2);
+            dmsFaultInstanceActivities1.add(dmsFaultInstanceActivity2);
+        }
+//        DmsFaultInstanceActivity dmsFaultInstanceActivity2 = dmsFaultInstanceActivities.get(1);
+//        DmsInstanceFile queryInstanceFile1 = new DmsInstanceFile();
+//        queryInstanceFile1.setTargetType("2");
+//        queryInstanceFile1.setTargetId(dmsFaultInstanceActivity1.getInstanceActivityId());
+//        List<DmsInstanceFile> dmsInstanceFiles2 = dmsInstanceFileMapper.selectDmsInstanceFileConvertList(queryInstanceFile1);
+//        dmsFaultInstanceActivity2.setDmsInstanceFileList(dmsInstanceFiles2);
+//        List<DmsFaultInstanceActivity> dmsFaultInstanceActivities1 = new ArrayList<>();
         dmsFaultInstanceActivities1.add(dmsFaultInstanceActivity1);
-        dmsFaultInstanceActivities1.add(dmsFaultInstanceActivity2);
+//        dmsFaultInstanceActivities1.add(dmsFaultInstanceActivity2);
         return dmsFaultInstanceActivities1;
     }
 

hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseDeviceLedgerMapper.xml

@@ -130,4 +130,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectDmsBaseDeviceLedgerVo"/>
         where device_code = #{deviceCode}
     </select>
+    <select id="likeDeviceName" resultType="com.hw.dms.domain.DmsBaseDeviceLedger"
+            parameterType="java.lang.String">
+        select
+            x.*
+        from
+            `hwjy-cloud`.dms_base_device_ledger x
+        where
+            x.device_name like concat('%',#{deviceName},'%')
+    </select>
 </mapper>

hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml

@@ -78,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDmsBillsFaultInstanceList" parameterType="DmsBillsFaultInstance" resultMap="DmsBillsFaultInstanceResult">
         <include refid="selectDmsBillsFaultInstanceVo"/>
         <where>
+            approveStatus != '4'
             <if test="faultSourceType != null  and faultSourceType != ''"> and fault_source_type = #{faultSourceType}</if>
             <if test="faultSourceId != null "> and fault_source_id = #{faultSourceId}</if>
             <if test="repairInstanceId != null "> and repair_instance_id = #{repairInstanceId}</if>

hw-modules/hw-ems/src/main/java/com/hw/ems/report/service/IDataAnalysisService.java

@@ -1,6 +1,7 @@
 package com.hw.ems.report.service;
 
 import com.hw.ems.base.domain.BaseLineLoss;
+import com.hw.ems.record.domain.RecordDnbInstant;
 import com.hw.ems.report.domain.ExportReport;
 
 import java.util.List;
@@ -114,4 +115,6 @@ public interface IDataAnalysisService {
      */
 //    //@DS("#header.poolName")
     public List<Map<String, Object>> energyStatisticsDataObject(Map paramMap);
+
+    List<RecordDnbInstant> queryData(Map paramMap);
 }

hw-ui/src/api/ems/powerUse/HistoryElectricity.js

@@ -9,6 +9,13 @@ export function listUser(data) {
     data: data,
   })
 }
+export function listLine(data) {
+  return request({
+    url: '/ems/record/dnbInstant/listLine',
+    method: 'post',
+    data: data,
+  })
+}
 // 查询部门下拉树结构
 export function treeDat() {
   return request({

hw-ui/src/views/dms/dmsBaseInspectStandard/index.vue

@@ -154,7 +154,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="标准编号" prop="standardCode">
-          <el-input v-model="form.standardCode" placeholder="请输入标准编号,如a001" />
+          <el-input v-model="form.standardCode" placeholder="请输入标准编号,如jy-xjbz-001" />
         </el-form-item>
         <el-form-item label="标准名称" prop="standardName">
           <el-input v-model="form.standardName" placeholder="请输入标准名称,如巡检标准" />

hw-ui/src/views/dms/dmsBillsFaultInstance/index.vue

@@ -148,7 +148,7 @@
       </el-table-column>
       <el-table-column label="审批" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
+          <span v-if="scope.row.approveStatus!='2'"> <el-button
             size="mini"
             type="text"
             @click="handleUpadateApprove(scope.row.repairInstanceId,'2')"
@@ -158,6 +158,15 @@
             type="text"
             @click="handleUpadateApprove(scope.row.repairInstanceId,'3')"
           >审批失败</el-button>
+          </span>
+          <span v-if="scope.row.approveStatus=='3'">
+            <el-button
+              size="mini"
+              type="text"
+              @click="handleUpadateApprove(scope.row.repairInstanceId,'4')"
+            >关闭</el-button>
+          </span>
+<!--          <span v-if="scope.row.repairInstanceId==='2'">审批通过</span>-->
         </template>
       </el-table-column>
     </el-table>

hw-ui/src/views/dms/dmsBillsInstance/index.vue

@@ -56,28 +56,28 @@
       </el-form-item>
     </el-form>
 
-    <!--el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['dms:dmsBillsInstance:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['dms:dmsBillsInstance:edit']"
-        >修改</el-button>
-      </el-col>
+    <el-row :gutter="10" class="mb8">
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['dms:dmsBillsInstance:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['dms:dmsBillsInstance:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -100,7 +100,7 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row-->
+    </el-row>
 
     <el-table v-loading="loading" :data="dmsBillsInstanceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />

hw-ui/src/views/dms/dmsBillsMaintInstance/index.vue

@@ -33,28 +33,28 @@
       </el-form-item>
     </el-form>
 
-    <!--el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['dms:dmsBillsMaintInstance:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['dms:dmsBillsMaintInstance:edit']"
-        >修改</el-button>
-      </el-col>
+    <el-row :gutter="10" class="mb8">
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['dms:dmsBillsMaintInstance:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['dms:dmsBillsMaintInstance:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -77,7 +77,7 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row-->
+    </el-row>
 
     <el-table v-loading="loading" :data="dmsBillsMaintInstanceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />

hw-ui/src/views/dms/dmsPlanInspect/index.vue

@@ -303,8 +303,18 @@
 <!--            </template>-->
 <!--          </el-input>-->
 <!--        </el-form-item>-->
-        <el-form-item label="执行人员" prop="performer">
-          <el-input v-model="form.performer" placeholder="请输入执行人员" />
+<!--        <el-form-item label="执行人员" prop="performer">-->
+<!--          <el-input v-model="form.performer" placeholder="请输入执行人员" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="执行人员" prop="performer" >
+          <el-select v-model="form.performer" placeholder="请选择执行人">
+            <el-option
+              v-for="item in userList"
+              :key="item.userId.toString()"
+              :label="item.nickName"
+              :value="item.nickName">
+            </el-option>
+          </el-select>
         </el-form-item>
 <!--        <el-form-item label="是否标识：1-是；0-否" prop="isFlag">-->
 <!--          <el-input v-model="form.isFlag" placeholder="请输入是否标识：1-是；0-否" />-->
@@ -328,6 +338,7 @@
 import { listDmsPlanInspect, getDmsPlanInspect, delDmsPlanInspect, addDmsPlanInspect, updateDmsPlanInspect } from "@/api/dms/dmsPlanInspect";
 import {getdmsBaseInspectRouteList} from '@/api/dms/dmsBaseInspectRoute'
 import Crontab from '@/components/Crontab/index'
+import {findUserList} from "@/api/system/user";
 
 export default {
   components: { Crontab },
@@ -344,6 +355,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      userList: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -394,8 +406,15 @@ export default {
   created() {
     this.getList();
     this.getRoute();
+    this.getUser();
   },
   methods: {
+    getUser() {
+      findUserList(null).then(response => {
+        this.userList = response.data;
+        console.log(this.userList)
+      });
+    },
     /** cron表达式按钮操作 */
     handleShowCron() {
       this.expression = this.form.cronExpression;

hw-ui/src/views/dms/maint/index.vue

@@ -207,9 +207,19 @@
         <el-form-item label="保养组别" prop="maintGroup">
           <el-input v-model="form.maintGroup" placeholder="请输入保养组别,如A组" />
         </el-form-item>
-        <el-form-item label="保养负责人" prop="maintSupervisor">
-          <el-input v-model="form.maintSupervisor" placeholder="请输入保养负责人" />
+        <el-form-item label="保养负责人" prop="maintSupervisor" >
+          <el-select v-model="form.maintSupervisor" placeholder="请选择保养负责人">
+            <el-option
+              v-for="item in userList"
+              :key="item.userId.toString()"
+              :label="item.nickName"
+              :value="item.nickName">
+            </el-option>
+          </el-select>
         </el-form-item>
+<!--        <el-form-item label="保养负责人" prop="maintSupervisor">-->
+<!--          <el-input v-model="form.maintSupervisor" placeholder="请输入保养负责人" />-->
+<!--        </el-form-item>-->
 <!--        <el-form-item label="本次保养时间" prop="maintTime">-->
 <!--          <el-date-picker clearable-->
 <!--            v-model="form.maintTime"-->
@@ -294,7 +304,10 @@ import { listMaint, getMaint, delMaint, addMaint, updateMaint } from "@/api/dms/
 import { listLedger } from '@/api/dms/ledger'
 import { listStation } from '@/api/dms/station'
 import { listStandard } from '@/api/dms/standard'
+import {findUserList} from "@//api/system/user";
 import Crontab from '@/components/Crontab/index'
+import {listDmsBaseInspectStandard} from "@/api/dms/dmsBaseInspectStandard";
+import {listUser} from "@/api/system/user";
 export default {
   components: { Crontab },
   name: "Maint",
@@ -321,6 +334,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      userList: [],
       // 保养计划信息表格数据
       maintList: [],
       stationList:[],
@@ -373,8 +387,15 @@ export default {
     this.getDevice();
     this.getStation();
     this.getStandard();
+    this.getUser();
   },
   methods: {
+    getUser() {
+      findUserList(null).then(response => {
+        this.userList = response.data;
+        console.log(this.userList)
+      });
+    },
     /** cron表达式按钮操作 */
     handleShowCron() {
       this.expression = this.form.cronExpression;

hw-ui/src/views/dms/standard/index.vue

@@ -154,7 +154,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="标准编号" prop="maintStandardCode">
-          <el-input v-model="form.maintStandardCode" placeholder="请输入标准编号,如a001" />
+          <el-input v-model="form.maintStandardCode" placeholder="请输入标准编号,如jy-bybz-001" />
         </el-form-item>
 <!--        <el-form-item label="设备类型ID" prop="deviceTypeId">-->
 <!--          <el-input v-model="form.deviceTypeId" placeholder="请输入设备类型ID，关联dms_base_device_type的device_type_id" />-->