2023-08-14，设备和质量修改

src/main/java/com/xujie/sys/modules/pms/data/EamDefectFeedBackInData.java

@@ -20,6 +20,16 @@ public class EamDefectFeedBackInData extends EamDefectFeedBackData{
     private String planOperatorName;
 
     private String actualOperatorName;
+    // 反馈人员名称
+    private String feedbackBy;
+
+    public String getFeedbackBy() {
+        return feedbackBy;
+    }
+
+    public void setFeedbackBy(String feedbackBy) {
+        this.feedbackBy = feedbackBy;
+    }
 
     public Date getStartDate() {
         return startDate;

src/main/java/com/xujie/sys/modules/pms/data/GetParamInData.java

@@ -20,6 +20,7 @@ public class GetParamInData {
     private String num;// 编码
     private String orderRef1;
     private String orderRef2;
+    private String orderRef3;
 
     public GetParamInData() {
         // TODO Auto-generated constructor stub
@@ -41,6 +42,14 @@ public class GetParamInData {
         this.orderRef2 = orderRef2;
     }
 
+    public String getOrderRef3() {
+        return orderRef3;
+    }
+
+    public void setOrderRef3(String orderRef3) {
+        this.orderRef3 = orderRef3;
+    }
+
     public String getNum() {
         return num;
     }

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

@@ -1850,11 +1850,11 @@ public class EamServiceImpl implements EamService {
     @Override
     @Transactional
     public void saveDefectOrder(EamDefectFeedBackInData inData){
-        EamAdminData checkData=new EamAdminData();
+        EamAdminData checkData = new EamAdminData();
         checkData.setAdminID(inData.getPlanOperator());
         checkData.setSite(inData.getSite());
-        List<EamAdminData> checkEamAdmin=eamDao.checkEamAdmin(checkData);
-        if(checkEamAdmin.size()==0){
+        List<EamAdminData> checkEamAdmin = eamDao.checkEamAdmin(checkData);
+        if(checkEamAdmin.size() == 0){
             throw new RuntimeException("该机修人员编码不存在!");
         }
         eamMapper.updateFeedBack(inData);

src/main/java/com/xujie/sys/modules/sys/service/impl/SysFileServiceImpl.java

@@ -84,8 +84,10 @@ public class SysFileServiceImpl implements SysFileService {
         ossEntity.setOrderRef2(inData.getObjectID());
         if (inData.getFolder().equals("reportFault") || inData.getFolder().equals("reportSparPart")){
             ossEntity.setOrderRef3(inData.getFolder());
-        }else if (inData.getFolder().equals("DJItemImageFile") || inData.getFolder().equals("WBItemImageFile")) { // 点检和维保的项目图片上传
+        } else if (inData.getFolder().equals("DJItemImageFile") || inData.getFolder().equals("WBItemImageFile")) { // 点检和维保的项目图片上传
             ossEntity.setOrderRef3(inData.getOrderRef1());
+        } else if (inData.getFolder().equals("eamObject")) {
+            ossEntity.setOrderRef3(inData.getOrderRef3());
         } else {
             ossEntity.setOrderRef3(inData.getRemark());
         }

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

@@ -566,7 +566,7 @@ b.MinValue,b.ItemRemark,b.ItemType
             a.ActualDate,
             a.FunctionType,
             a.CreateDate,
-            a.CreateBy,
+            d.operator_name as createBy,
             a.Remark,
             a.StartTime,
             a.EndTime,
@@ -585,6 +585,7 @@ b.MinValue,b.ItemRemark,b.ItemType
         FROM eam_workOrder a
         LEFT JOIN eam_defect_feedBack b on a.site = b.site and a.PlanID = b.feedBackID
         LEFT JOIN eam_defect c on b.DefectID = c.DefectID
+        LEFT JOIN operator as d on a.site = d.site and a.CreateBy = d.operator_id and d.active = 'Y'
         <where>
             and a.Site = #{query.site}
             <if test="query.orderNo != null and query.orderNo != ''">
@@ -639,7 +640,7 @@ b.MinValue,b.ItemRemark,b.ItemType
             a.ActualDate,
             a.FunctionType,
             a.CreateDate,
-            a.CreateBy,
+            d.operator_name as createBy,
             a.Remark,
             a.StartTime,
             a.EndTime,
@@ -657,6 +658,7 @@ b.MinValue,b.ItemRemark,b.ItemType
         FROM eam_workOrder a
         left join eam_defect_feedBack b on a.site = b.site and a.PlanID = b.feedBackID
         left join eam_defect c on b.DefectID = c.DefectID
+        left join operator as d on a.site = d.site and a.CreateBy = d.operator_id and d.active = 'Y'
         <where>
             and  a.Site = #{query.site}
             <if test="query.orderNo != null and query.orderNo != ''">
@@ -1152,6 +1154,7 @@ b.MinValue,b.ItemRemark,b.ItemType
             a.deleteFlag,
             a.CreatedDate,
             a.CreatedBy,
+            c.operator_name as feedbackBy,
             a.UpdateDate,
             a.UpdateBy,
             a.Version,
@@ -1161,8 +1164,8 @@ b.MinValue,b.ItemRemark,b.ItemType
             dbo.eam_Get_eamObjectDesc(a.Site,a.ObjectID) ObjectDesc,
             FinishDate
         from eam_defect_feedBack a
-        left join eam_defect b
-        on a.DefectID = b.DefectID
+        left join eam_defect b on a.DefectID = b.DefectID
+        left join operator as c on a.site = c.site and a.CreatedBy = c.operator_id and c.active = 'Y'
         <where>
             and a.Site = #{query.site}
             <if test="query.feedBackID != null and query.feedBackID != ''">