设备维修模块修改

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

@@ -3,9 +3,10 @@ package com.hw.dms.controller;
 import java.text.SimpleDateFormat;
 import java.util.HashMap;
 import java.util.List;
-import java.io.IOException;
 import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
+
+import com.hw.dms.domain.DmsFaultCompentsParts;
 import com.hw.dms.domain.DmsFaultInstanceActivity;
 import com.hw.dms.utils.TemplateExcelUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +52,21 @@ public class DmsBillsFaultInstanceController extends BaseController
         List<DmsBillsFaultInstance> list = dmsBillsFaultInstanceService.selectDmsBillsFaultInstanceList(dmsBillsFaultInstance);
         return getDataTable(list);
     }
+    @GetMapping("/getDmsPartsList")
+    public TableDataInfo getDmsPartsList(DmsBillsFaultInstance dmsBillsFaultInstance)
+    {
+        startPage();
+        List<DmsFaultCompentsParts> list = dmsBillsFaultInstanceService.getDmsPartsList(dmsBillsFaultInstance.getRepairInstanceId());
+        return getDataTable(list);
+    }
+
+    @GetMapping("/list/completed")
+    public TableDataInfo completed(DmsBillsFaultInstance dmsBillsFaultInstance)
+    {
+        startPage();
+        List<DmsBillsFaultInstance> list = dmsBillsFaultInstanceService.selectDmsBillsFaultInstanceCompletedList(dmsBillsFaultInstance);
+        return getDataTable(list);
+    }
 
     /**
      * 导出检修工单列表
@@ -124,8 +140,8 @@ public class DmsBillsFaultInstanceController extends BaseController
         if (faulsts.getRealEndTime()!=null){
             beanParams.put("realBeginTime",format.format(faulsts.getRealBeginTime()));
         }
-        if (faulsts.getConfirmTime()!=null){
-            beanParams.put("confirmTime",format.format(faulsts.getConfirmTime()));
+        if (faulsts.getUpdateTime()!=null){
+            beanParams.put("confirmTime",format.format(faulsts.getUpdateTime()));
         }
 //        beanParams.put("realEndTime",format.format(faulsts.getRealEndTime()));
         beanParams.put("faultDescription",faulsts.getFaultDescription());
@@ -134,8 +150,8 @@ public class DmsBillsFaultInstanceController extends BaseController
         beanParams.put("protectedMethod",faulsts.getProtectedMethod());
         beanParams.put("repairer",faulsts.getRepairer());
         String repairConfirm;
-        if (faulsts.getRepairConfirm()==2){
-            repairConfirm = "确认完成";
+        if (faulsts.getConfirmer()!=null){
+            repairConfirm = faulsts.getConfirmer();
         }else {
             repairConfirm = "未完成";
         }

hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsFaultInstance.java

@@ -28,6 +28,7 @@ public class DmsBillsFaultInstance extends BaseEntity
     /** 报修来源类型(1检修，2点检，3巡检，9其他) */
     @Excel(name = "报修来源类型(1检修，2点检，3巡检，9其他)")
     private String faultSourceType;
+    private String confirmer;
 
     /** 报修来源ID，根据报修来源类型关联来源主键 */
     @Excel(name = "报修来源ID，根据报修来源类型关联来源主键")

hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsFaultCompentsParts.java

@@ -9,4 +9,5 @@ public class DmsFaultCompentsParts {
     private String partName;
     private String partSpecifications;
     private Integer amount;
+    private String billsFaultCode;
 }

hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsFaultInstanceActivity.java

@@ -86,6 +86,7 @@ public class DmsFaultInstanceActivity extends BaseEntity
     /** 处理人 */
     @Excel(name = "处理人")
     private String handleBy;
+    private String confirmer;
 
     /** 处理时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")

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

@@ -105,6 +105,10 @@ public interface DmsBillsFaultInstanceMapper
     List<DmsFaultInstanceActivity> selectFaults(@Param("repairInstanceId") Long repairInstanceId);
 
     List<DmsFaultCompentsParts> selectParts(@Param("repairInstanceId")Long repairInstanceId);
+
+    List<DmsBillsFaultInstance> selectDmsBillsFaultInstanceCompletedList(DmsBillsFaultInstance dmsBillsFaultInstance);
+
+    List<DmsFaultCompentsParts> getDmsPartsList(@Param("repairInstanceId") Long repairInstanceId);
 }
 
 

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

@@ -2,6 +2,7 @@ package com.hw.dms.service;
 
 import java.util.List;
 import com.hw.dms.domain.DmsBillsFaultInstance;
+import com.hw.dms.domain.DmsFaultCompentsParts;
 import com.hw.dms.domain.DmsFaultInstanceActivity;
 import com.hw.dms.domain.vo.DmsBillsFaultInstanceScanVo;
 import org.springframework.transaction.annotation.Transactional;
@@ -111,4 +112,8 @@ public interface IDmsBillsFaultInstanceService
     public int completeRepair(DmsFaultInstanceActivity dmsFaultInstanceActivity);
 
     DmsFaultInstanceActivity selectFaults(Long repairInstanceId);
+
+    List<DmsBillsFaultInstance> selectDmsBillsFaultInstanceCompletedList(DmsBillsFaultInstance dmsBillsFaultInstance);
+
+    List<DmsFaultCompentsParts> getDmsPartsList(Long repairInstanceId);
 }

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

@@ -139,7 +139,10 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
      */
     @Override
     public int updateDmsBillsFaultInstance(DmsBillsFaultInstance dmsBillsFaultInstance) {
-
+        String username = SecurityUtils.getUsername();
+        if (dmsBillsFaultInstance.getRepairConfirm()!=null){
+            dmsBillsFaultInstance.setConfirmer(username);
+        }
         dmsBillsFaultInstance.setUpdateTime(DateUtils.getNowDate());
         dmsInstanceFileMapper.deleteDmsInstanceFileByUpdate(dmsBillsFaultInstance.getRepairInstanceId());
         int i = dmsBillsFaultInstanceMapper.updateDmsBillsFaultInstance(dmsBillsFaultInstance);
@@ -253,13 +256,14 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
 
         DmsInstanceFile queryInstanceFile = new DmsInstanceFile();
 //        queryInstanceFile.setTargetType(DmsConstants.DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY);
-        queryInstanceFile.setTargetId(firstStepActivity.getInstanceActivityId());
+        queryInstanceFile.setTargetId(dmsBillsFaultInstanceActivityList.get(0).getInstanceActivityId());
         queryInstanceFile.setTargetType("1");
         List<DmsInstanceFile> dmsInstanceFiles = dmsInstanceFileMapper.selectDmsInstanceFileList(queryInstanceFile);
-        queryInstanceFile.setTargetType("2");
-        List<DmsInstanceFile> dmsInstanceFiles1 = dmsInstanceFileMapper.selectDmsInstanceFileList(queryInstanceFile);
+//        queryInstanceFile.setTargetId(dmsBillsFaultInstanceActivityList.get(1).getInstanceActivityId());
+//        queryInstanceFile.setTargetType("2");
+//        List<DmsInstanceFile> dmsInstanceFiles1 = dmsInstanceFileMapper.selectDmsInstanceFileList(queryInstanceFile);
         dmsBillsFaultInstance.setDmsInstanceFiles(dmsInstanceFiles);
-        dmsBillsFaultInstance.setDmsInstanceFiles1(dmsInstanceFiles1);
+//        dmsBillsFaultInstance.setDmsInstanceFiles1(dmsInstanceFiles1);
         return dmsBillsFaultInstance;
     }
 
@@ -358,6 +362,16 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
     }
 
 
+    @Override
+    public List<DmsFaultCompentsParts> getDmsPartsList(Long repairInstanceId) {
+        return dmsBillsFaultInstanceMapper.getDmsPartsList(repairInstanceId);
+    }
+
+    @Override
+    public List<DmsBillsFaultInstance> selectDmsBillsFaultInstanceCompletedList(DmsBillsFaultInstance dmsBillsFaultInstance) {
+        return dmsBillsFaultInstanceMapper.selectDmsBillsFaultInstanceCompletedList(dmsBillsFaultInstance);
+    }
+
     @Override
     public DmsFaultInstanceActivity selectFaults(Long repairInstanceId) {
         List<DmsFaultInstanceActivity> list = dmsBillsFaultInstanceMapper.selectFaults(repairInstanceId);
@@ -409,6 +423,7 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
 
         dmsFaultInstanceActivity.setProcessHandleStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_ACTIVITY_HANDLE_STATUS_FINISH);
         dmsFaultInstanceActivity.setEndTime(currentDate);
+        dmsFaultInstanceActivity.setRepairer(userName);
 
         dmsFaultInstanceActivityMapper.updateDmsFaultInstanceActivity(dmsFaultInstanceActivity);
 

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

@@ -1,5 +1,6 @@
 package com.hw.dms.service.impl;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -53,15 +54,22 @@ public class DmsFaultInstanceActivityServiceImpl implements IDmsFaultInstanceAct
     public List<DmsFaultInstanceActivity> selectDmsFaultInstanceActivityList(DmsFaultInstanceActivity dmsFaultInstanceActivity)
     {
         List<DmsFaultInstanceActivity> dmsFaultInstanceActivities = dmsFaultInstanceActivityMapper.selectDmsFaultInstanceActivityList(dmsFaultInstanceActivity);
-        for(DmsFaultInstanceActivity dfia:dmsFaultInstanceActivities){
-            DmsInstanceFile queryInstanceFile = new DmsInstanceFile();
-            queryInstanceFile.setTargetType(DmsConstants.DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY);
-            queryInstanceFile.setTargetId(dfia.getInstanceActivityId());
-            List<DmsInstanceFile> dmsInstanceFiles = dmsInstanceFileMapper.selectDmsInstanceFileConvertList(queryInstanceFile);
-            dfia.setDmsInstanceFileList(dmsInstanceFiles);
-        }
-
-        return dmsFaultInstanceActivities;
+        DmsFaultInstanceActivity dmsFaultInstanceActivity1 = dmsFaultInstanceActivities.get(0);
+        DmsInstanceFile queryInstanceFile = new DmsInstanceFile();
+        queryInstanceFile.setTargetType(DmsConstants.DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY);
+        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(dmsFaultInstanceActivity2.getInstanceActivityId());
+        List<DmsInstanceFile> dmsInstanceFiles2 = dmsInstanceFileMapper.selectDmsInstanceFileConvertList(queryInstanceFile1);
+        dmsFaultInstanceActivity2.setDmsInstanceFileList(dmsInstanceFiles2);
+        List<DmsFaultInstanceActivity> dmsFaultInstanceActivities1 = new ArrayList<>();
+        dmsFaultInstanceActivities1.add(dmsFaultInstanceActivity1);
+        dmsFaultInstanceActivities1.add(dmsFaultInstanceActivity2);
+        return dmsFaultInstanceActivities1;
     }
 
     /**

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

@@ -93,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isFlag != null  and isFlag != ''"> and is_flag = #{isFlag}</if>
             <if test="deviceId != null  and deviceId != ''"> and device_id = #{deviceId}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectDmsBillsFaultInstanceByRepairInstanceId" parameterType="Long" resultMap="DmsBillsFaultInstanceResult">
@@ -167,6 +168,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="deviceId != null">device_id = #{deviceId},</if>
             <if test="approveStatus != null">approveStatus = #{approveStatus},</if>
+            <if test="repairConfirm != null">repair_confirm = #{repairConfirm},</if>
+            <if test="confirmer != null">confirmer = #{confirmer},</if>
         </trim>
         where repair_instance_id = #{repairInstanceId}
     </update>
@@ -267,7 +270,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectFaults" resultType="com.hw.dms.domain.DmsFaultInstanceActivity"
             parameterType="java.lang.Long">
         select
-            x.*,a.device_name ,a.device_code,a.device_location ,b.apply_user ,b.apply_time ,b.real_begin_time ,b.real_end_time
+            x.fault_description ,
+            x.checked_fault ,
+            x.repair_content ,
+            x.protected_method ,
+            x.repairer ,
+            a.device_name ,
+            a.device_code,
+            a.device_location ,
+            b.apply_user ,
+            b.apply_time ,
+            b.real_begin_time ,
+            b.real_end_time,
+            b.repair_confirm,
+            b.update_time,
+            b.confirmer
         from
             `hwjy-cloud`.dms_fault_instance_activity x left join dms_base_device_ledger a on x.device_id = a.device_id
                                                        left join dms_bills_fault_instance b on x.repair_instance_id = b.repair_instance_id   where x.repair_instance_id = #{repairInstanceId}
@@ -276,6 +293,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             parameterType="java.lang.Long">
         SELECT x.* FROM `hwjy-cloud`.dms_fault_compents_parts x where x.fault_id = #{repairInstanceId}
     </select>
+    <select id="selectDmsBillsFaultInstanceCompletedList" resultType="com.hw.dms.domain.DmsBillsFaultInstance"
+            parameterType="com.hw.dms.domain.DmsBillsFaultInstance">
+        select repair_instance_id, fault_source_type, fault_source_id, wf_process_id, bills_fault_code, bills_status, apply_user, apply_time, real_begin_time, real_end_time, require_end_time, instance_type, is_flag, remark, create_by, create_time, update_by, update_time,device_id,approveStatus,repair_confirm from dms_bills_fault_instance
+        <where>
+            bills_status = 2
+            <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>
+            <if test="wfProcessId != null "> and wf_process_id = #{wfProcessId}</if>
+            <if test="billsFaultCode != null  and billsFaultCode != ''"> and bills_fault_code = #{billsFaultCode}</if>
+            <if test="billsStatus != null  and billsStatus != ''"> and bills_status = #{billsStatus}</if>
+            <if test="applyUser != null  and applyUser != ''"> and apply_user = #{applyUser}</if>
+            <if test="applyTime != null "> and apply_time = #{applyTime}</if>
+            <if test="realBeginTime != null "> and real_begin_time = #{realBeginTime}</if>
+            <if test="realEndTime != null "> and real_end_time = #{realEndTime}</if>
+            <if test="requireEndTime != null "> and require_end_time = #{requireEndTime}</if>
+            <if test="instanceType != null  and instanceType != ''"> and instance_type = #{instanceType}</if>
+            <if test="isFlag != null  and isFlag != ''"> and is_flag = #{isFlag}</if>
+            <if test="deviceId != null  and deviceId != ''"> and device_id = #{deviceId}</if>
+        </where>
+        order by create_time desc
+    </select>
+    <select id="getDmsPartsList" resultType="com.hw.dms.domain.DmsFaultCompentsParts"
+            parameterType="java.lang.Long">
+        select
+            x.*,a.bills_fault_code
+        from
+            `hwjy-cloud`.dms_fault_compents_parts x
+                left join dms_bills_fault_instance a on
+                x.fault_id = a.repair_instance_id where x.fault_id = #{repairInstanceId}
+    </select>
+
 
 
 </mapper>

hw-ui/src/api/dms/devicetype.js

@@ -9,6 +9,14 @@ export function listDevicetype(query) {
   })
 }
 
+export function listQualification(query) {
+  return request({
+    url: '/mes/mesProductionQualified',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询设备类型信息详细
 export function getDevicetype(deviceTypeId) {
   return request({
@@ -16,6 +24,13 @@ export function getDevicetype(deviceTypeId) {
     method: 'get'
   })
 }
+// 查询设备类型信息详细
+export function getQualifiedById(qualifiedId) {
+  return request({
+    url: '/mes/mesProductionQualified/' + qualifiedId,
+    method: 'get'
+  })
+}
 
 // 新增设备类型信息
 export function addDevicetype(data) {
@@ -25,6 +40,13 @@ export function addDevicetype(data) {
     data: data
   })
 }
+export function addQualification(data) {
+  return request({
+    url: '/mes/mesProductionQualified',
+    method: 'post',
+    data: data
+  })
+}
 
 // 修改设备类型信息
 export function updateDevicetype(data) {
@@ -34,6 +56,13 @@ export function updateDevicetype(data) {
     data: data
   })
 }
+export function updateQualification(data) {
+  return request({
+    url: '/mes/mesProductionQualified',
+    method: 'put',
+    data: data
+  })
+}
 
 // 删除设备类型信息
 export function delDevicetype(deviceTypeId) {

hw-ui/src/api/dms/dmsBillsFaultInstance.js

@@ -8,6 +8,20 @@ export function listDmsBillsFaultInstance(query) {
     params: query
   })
 }
+export function getDmsPartsList(query) {
+  return request({
+    url: '/dms/dmsBillsFaultInstance/getDmsPartsList',
+    method: 'get',
+    params: query
+  })
+}
+export function listDmsBillsFaultInstancecompleted(query) {
+  return request({
+    url: '/dms/dmsBillsFaultInstance/list/completed',
+    method: 'get',
+    params: query
+  })
+}
 // // 检修工单记录导出
 // export function handleFaultExport(repairInstanceId) {
 //   return request({