1.TPM红牌下达时，能够重新选择计划执行人员

2.换线专家组维修执行功能：转单：增加发送信息功能

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

@@ -1846,6 +1846,11 @@ public class EamController {
         PageUtils page = eamService.eamFeedBackSearch(inData);
         return R.ok().put("page", page);
     }
+    @PostMapping("/updateEamDefectFeedBackPlanOperator")
+    public R updateEamDefectFeedBackPlanOperator(@RequestBody EamDefectFeedBackInData inData){
+        eamService.updateEamDefectFeedBackPlanOperator(inData);
+        return R.ok();
+    }
 
     /**
      * @Description 取消反馈单

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

@@ -495,4 +495,6 @@ public interface EamMapper {
     void updateIsReturn(EamWorkOrderInData data);
 
     void reportWorkOrderForIsReturn(EamWorkOrderInData inData);
+
+    void updateEamDefectFeedBackPlanOperator(EamDefectFeedBackInData inData);
 }

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

@@ -1188,4 +1188,6 @@ public interface EamService {
     void goDownItem(EamPropertiesModelDetailData inData);
 
     void sendLoraRedLight();
+
+    void updateEamDefectFeedBackPlanOperator(EamDefectFeedBackInData inData);
 }

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

@@ -3790,14 +3790,82 @@ public class EamServiceImpl implements EamService {
     }
 
     @Override
+    @Transactional
     public void updateRepairTypes(List<EamWorkOrderInData> list) {
         if (list == null || list.isEmpty()) {
             throw new IllegalArgumentException("数据列表为空");
         }
-        String repairType = list.get(0).getRepairType();
+        EamWorkOrderInData eamWorkOrderInData = list.get(0);
+        String repairType = eamWorkOrderInData.getRepairType();
+        //新建维修反馈模型
+        EamDefectFeedBackInData inData = new EamDefectFeedBackInData();
+        inData.setSite(eamWorkOrderInData.getSite());
+        inData.setBu(inData.getBu());
+        inData.setBuNo(eamWorkOrderInData.getBuNo());
+        inData.setRepairType("设备维修组");
+        //遍历参数传入集合
         list.forEach(data -> {
+            //更新维修工单的维修类型
             data.setRepairType(repairType);
             eamMapper.updateRepairTypes(data);
+            //设置参数
+            inData.setOrderNo(data.getOrderNo());
+            inData.setObjectID(data.getObjectID());
+            inData.setRepairReportingType(data.getRepairReportingType());
+            inData.setFeedBackDesc(data.getFeedBackDesc());
+            inData.setDefectID(data.getDefectID());
+            System.out.println("******************"+data.getCreatedBy());
+            inData.setCreatedBy(data.getCreatedBy());
+            inData.setFeedBackID(data.getPlanID());
+            // 根据设备查所属部门
+            List<EamObjectAdminData> deptData = eamMapper.queryDepartmentByObjectId(inData);
+            // 角色
+            deptData.get(0).setRoleNo("R021");
+            // 根据部门ID查机修人员电话
+            List<EamObjectAdminData> phoneList = eamMapper.queryPhoneByDepartmentId(deptData.get(0));
+            if (!phoneList.isEmpty()) {
+                StringBuilder phoneNumber = new StringBuilder();
+                // 拼接所有人员的手机号/姓名
+                for (EamObjectAdminData data1 : phoneList) {
+                    if(StringUtils.isNotBlank(data1.getPhone())){
+                        phoneNumber.append(data1.getPhone()).append(",");
+                    }
+                }
+                String mobile = "";
+                if (StringUtils.isNotBlank(phoneNumber)) {
+                    mobile = phoneNumber.substring(0, phoneNumber.length() - 1);
+                }
+                // 拼接短信内容
+                String content =inData.getRepairReportingType() + ":" + inData.getObjectID() + "-" + deptData.get(0).getObjectDesc() + " 在 " + deptData.get(0).getLocationName() + " 发生了 " + inData.getFeedBackDesc() +" 故障，请及时处理！【齐克庞德】";
+                try {
+                    // 发送短信
+                    int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, "");
+                    //int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, "");
+                    if (code <= 0) {
+                        throw new RuntimeException("短信发送失败,code = " + code + " !");
+                    }
+                    // 保存短信记录
+                    MessageRecordData recordData = new MessageRecordData();
+                    recordData.setSite(inData.getSite());
+                    recordData.setBuNo(inData.getBuNo());
+                    recordData.setPlanId(inData.getFeedBackID());
+                    recordData.setObjectId(inData.getObjectID());
+                    recordData.setDefectId(inData.getDefectID());
+                    recordData.setFeedBackDesc(inData.getFeedBackDesc());
+                    recordData.setSender(inData.getCreatedBy());
+                    for (EamObjectAdminData data2 : phoneList) {
+                        if (data2.getPhone() != null) {
+                            recordData.setPhone(data2.getPhone());
+                        }
+                        if (data2.getAdminName() != null) {
+                            recordData.setRecipient(data2.getAdminName());
+                        }
+                        eamMapper.saveMessageRecord(recordData);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
         });
     }
 
@@ -3882,6 +3950,11 @@ public class EamServiceImpl implements EamService {
 
     }
 
+    @Override
+    public void updateEamDefectFeedBackPlanOperator(EamDefectFeedBackInData inData) {
+        eamMapper.updateEamDefectFeedBackPlanOperator(inData);
+    }
+
     /**
      * 员工考勤vs报工工时
      */

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

@@ -1638,7 +1638,7 @@
             a.FunctionType,
             a.PlanOperator,
             a.ActualOperator,
-            (CASE WHEN a.Status = '已下达' and a.matter_tracking_flag is not null then a.matter_tracking_flag else a.Status end) as Status,
+            DBO.GET_EAM_Status (A.site,a.bu_no,a.FeedBackID) AS status,
             a.PlanDate,
             a.Remark,
             a.urgency,
@@ -3691,6 +3691,11 @@
             status = '待审核'
         where site = #{site} and orderNo = #{orderNo} and FunctionType = #{functionType} and bu_no = #{buNo}
     </update>
+    <update id="updateEamDefectFeedBackPlanOperator">
+        update eam_defect_feedBack
+        set PlanOperator = #{planOperator}
+        where site = #{site} and bu_no = #{buNo} and feedBackID = #{feedBackID}
+    </update>
     <select id="getUpItemdataEam" resultType="com.xujie.sys.modules.pms.data.EamPropertiesModelDetailData">
         select
             top 1