优化

platform-dao/src/main/java/com/platform/dao/vo/export/repair/ExportRepairApplicationFormVO.java

@@ -91,7 +91,7 @@ public class ExportRepairApplicationFormVO implements Serializable {
      * 检查处理过程
      */
     @Excel(name = "检查处理过程", orderNum = "16")
-    private String checkProcess;
+    private String otherChangeContent;
     /**
      * 原因分析
      */

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -19,6 +19,7 @@ import com.platform.dao.dto.check.CheckJobDTO;
 import com.platform.dao.dto.preparation.PreparationDTO;
 import com.platform.dao.dto.repair.RepairApplicationFormDTO;
 import com.platform.dao.dto.repair.RepairFeeDTO;
+import com.platform.dao.dto.repair.RepairRecordTemplateData;
 import com.platform.dao.dto.repair.RepairTicketTemplateData;
 import com.platform.dao.dto.sb.SbInfoDTO;
 import com.platform.dao.dto.store.InStoreFormDTO;
@@ -113,7 +114,6 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     private final SysUserDeptMapper sysUserDeptMapper;
     private final SbPositionMapper sbPositionMapper;
     private final PreparationMapper preparationMapper;
-    private final SysDeptMapper sysDeptMapper;
     private final SysDictService sysDictService;
     private final BigDecimal initNum= new BigDecimal(0);
 
@@ -1564,6 +1564,19 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                         String infoStr = info.toString();
                         repairApplicationForm.setRepairProfessor(infoStr.substring(0,infoStr.length()-1));
                     }
+                    // 维修描述
+                    Weekend<CustomFieldTemplateData> weekend = new Weekend<>(CustomFieldTemplateData.class);
+                    WeekendCriteria<CustomFieldTemplateData, Object> weekendCriteria = weekend.weekendCriteria();
+                    weekendCriteria = weekendCriteria.andEqualTo(CustomFieldTemplateData::getRemark,CommonConstants.REPAIR_RECORD)
+                            .andEqualTo(CustomFieldTemplateData::getObjId,repairApplicationForm.getId());
+                    if(StringUtils.isNotBlank(repairApplicationForm.getRepairUserId())){
+                        weekendCriteria.andEqualTo(CustomFieldTemplateData::getCreatedUserId,repairApplicationForm.getRepairUserId());
+                    }
+                    List<CustomFieldTemplateData> listCustomer = customFieldTemplateDataMapper.selectByExample(weekend);
+                    if(list != null || list.size() > 0){
+                        RepairRecordTemplateData dataInfo = JsonUtils.jsonToModel(listCustomer.get(0).getData(),RepairRecordTemplateData.class);
+                        repairApplicationForm.setOtherChangeContent(dataInfo.getRemark());
+                    }
                     detailList.add(repairApplicationForm);
                 }
             }