return fee comment

java110-bean/src/main/java/com/java110/vo/api/machineRecord/ApiMachineRecordDataVo.java

@@ -16,6 +16,8 @@ public class ApiMachineRecordDataVo implements Serializable {
     private String recordTypeCd;
     private String createTime;
 
+    private String faceUrl;
+
 
     public String getMachineRecordId() {
         return machineRecordId;
@@ -96,4 +98,12 @@ public class ApiMachineRecordDataVo implements Serializable {
     public void setCreateTime(String createTime) {
         this.createTime = createTime;
     }
+
+    public String getFaceUrl() {
+        return faceUrl;
+    }
+
+    public void setFaceUrl(String faceUrl) {
+        this.faceUrl = faceUrl;
+    }
 }

service-common/src/main/java/com/java110/common/cmd/machineRecord/ListMachineRecordsCmd.java

@@ -5,8 +5,13 @@ import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.file.FileRelDto;
 import com.java110.dto.machine.MachineRecordDto;
+import com.java110.dto.owner.OwnerDto;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
 import com.java110.intf.common.IMachineRecordInnerServiceSMO;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -25,6 +30,9 @@ public class ListMachineRecordsCmd extends Cmd {
     @Autowired
     private IMachineRecordInnerServiceSMO machineRecordInnerServiceSMOImpl;
 
+    @Autowired
+    private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         super.validatePageInfo(reqJson);
@@ -41,6 +49,7 @@ public class ListMachineRecordsCmd extends Cmd {
 
         if (count > 0) {
             machineRecords = BeanConvertUtil.covertBeanList(machineRecordInnerServiceSMOImpl.queryMachineRecords(machineRecordDto), ApiMachineRecordDataVo.class);
+            freshFaceUrl(machineRecords);
         } else {
             machineRecords = new ArrayList<>();
         }
@@ -55,4 +64,38 @@ public class ListMachineRecordsCmd extends Cmd {
 
         context.setResponseEntity(responseEntity);
     }
+
+    private void freshFaceUrl(List<ApiMachineRecordDataVo> machineRecords) {
+
+        List<String> recordIds = new ArrayList<>();
+
+        for (ApiMachineRecordDataVo tmpOwnerDto : machineRecords) {
+            recordIds.add(tmpOwnerDto.getMachineRecordId());
+        }
+
+        FileRelDto fileRelDto = new FileRelDto();
+        //fileRelDto.setObjId(owners.get(0).getMemberId());
+        fileRelDto.setObjIds(recordIds.toArray(new String[recordIds.size()]));
+        List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+
+        if (fileRelDtos == null || fileRelDtos.size() < 1) {
+            return ;
+        }
+
+        String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN,"IMG_PATH");
+
+        for (ApiMachineRecordDataVo tmpOwnerDto : machineRecords) {
+            for (FileRelDto tmpFileRelDto : fileRelDtos) {
+                if (!tmpOwnerDto.getMachineRecordId().equals(tmpFileRelDto.getObjId())) {
+                    continue;
+                }
+
+                if (tmpFileRelDto.getFileSaveName().startsWith("http")) {
+                    tmpOwnerDto.setFaceUrl(tmpFileRelDto.getFileSaveName());
+                } else {
+                    tmpOwnerDto.setFaceUrl(imgUrl + tmpFileRelDto.getFileSaveName());
+                }
+            }
+        }
+    }
 }