1.增加查询TPM维修工单确认按钮权限的人员列表

2，维修反馈新增时查重，允许维修类型区分

src/main/java/com/xujie/sys/modules/pms/controller/EamController.java

@@ -2181,6 +2181,15 @@ public class EamController {
         return R.ok().put("rows", list);
     }
 
+    /**
+     * 获取维修工单确认按钮角色  人员列表
+     */
+    @PostMapping("/getConfirmButtonOperator")
+    public R getConfirmButtonOperator(){
+        List<EamAdminData> list = eamService.getConfirmButtonOperator();
+        return R.ok().put("rows", list);
+    }
+
     /**
      * 获取反馈单号
      */

src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java

@@ -499,4 +499,6 @@ public interface EamMapper {
     void updateEamDefectFeedBackPlanOperator(EamDefectFeedBackInData inData);
 
     void deleteCoreComponents(EamWorkOrderCoreComponentsData inData);
+
+    List<EamAdminData> getConfirmButtonOperator();
 }

src/main/java/com/xujie/sys/modules/pms/service/EamService.java

@@ -1192,4 +1192,6 @@ public interface EamService {
     void updateEamDefectFeedBackPlanOperator(EamDefectFeedBackInData inData);
 
     void deleteCoreComponents(EamWorkOrderCoreComponentsData inData);
+
+    List<EamAdminData> getConfirmButtonOperator();
 }

src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java

@@ -3042,6 +3042,7 @@ public class EamServiceImpl implements EamService {
             searchParam.setBuNo(inData.getBuNo());
             searchParam.setObjectInfo(inData.getObjectID());
             searchParam.setDefectInfo(inData.getDefectID());
+            searchParam.setRepairType(inData.getRepairType());
             List<EamDefectFeedBackData> eamGzData = eamMapper.getEamGzData(searchParam);
             if (!eamGzData.isEmpty() && !eamGzData.get(0).getPublicFacilitiesFlag().equals("Y") && ("已录入".equalsIgnoreCase(eamGzData.get(0).getStatus()) ||
                     "已下达".equalsIgnoreCase(eamGzData.get(0).getStatus()))){
@@ -3960,6 +3961,12 @@ public class EamServiceImpl implements EamService {
         eamMapper.deleteCoreComponents(inData);
     }
 
+    @Override
+    public List<EamAdminData> getConfirmButtonOperator() {
+        List<EamAdminData> list = eamMapper.getConfirmButtonOperator();
+        return list;
+    }
+
     /**
      * 员工考勤vs报工工时
      */

src/main/resources/mapper/pms/EamMapper.xml

@@ -2490,7 +2490,7 @@
         left join eam_defect b on a.DefectID = b.DefectID
         left join eam_object c on a.ObjectID = c.ObjectID and a.site = c.site and a.bu_no = c.bu_no
         <where>
-            a.site = #{site} and a.deleteFlag = 'N' and a.bu_no = #{buNo}
+            a.site = #{site} and a.deleteFlag = 'N' and a.bu_no = #{buNo} and a.repair_type = #{repairType}
             <if test="feedBackID != null and feedBackID != ''">
                 AND a.FeedBackID LIKE '%' + #{feedBackID}+'%'
             </if>
@@ -3769,4 +3769,12 @@
             rs.site = #{site} and rs.bu_no = #{buNo}
             and rs.resource_id = #{objectID} and rs.part_no = #{partNo} and ps.coreFlag = 'Y'
     </select>
+    <select id="getConfirmButtonOperator" resultType="com.xujie.sys.modules.pms.data.EamAdminData">
+        select sys_user.username as adminID,
+            sys_user.user_display as adminName
+        from sys_user
+        LEFT JOIN sys_user_role on sys_user.user_id = sys_user_role.user_id
+        LEFT JOIN sys_role ON sys_user_role.role_id = sys_role.role_id
+        WHERE sys_role.role_name = '维修工单确认按钮权限'
+    </select>
 </mapper>