ccsens_wiki
/
ccsenscloud
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

修改查看交付物历史记录接口

recovery
ma 4 years ago
parent
9f3c7bfac6
commit
d9fb4623c6
2 changed files with 30 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 52
      tall/src/main/java/com/ccsens/tall/service/InputDocService.java
  2. 6
      tall/src/main/resources/mapper_dao/ProDeliverHistoryRecordDao.xml

52
tall/src/main/java/com/ccsens/tall/service/InputDocService.java
View File

@ -685,19 +685,19 @@ public class InputDocService implements IInputDocService {
deliverHistory.setFileList(fileList); deliverHistory.setFileList(fileList);
} }
} }
} }else{
}else{ if (StrUtil.isNotBlank(deliverHistory.getFileIds())){
if (StrUtil.isNotBlank(deliverHistory.getFileIds())){ List<String> idList = new ArrayList<>();
List<String> idList = new ArrayList<>(); idList.add(deliverHistory.getFileIds());
idList.add(deliverHistory.getFileIds()); //获取文件项目的路径
//获取文件项目的路径 String requestUrl = PropUtil.filedeal;
String requestUrl = PropUtil.filedeal; //通过文件id查询文件信息
//通过文件id查询文件信息 String c = RestTemplateUtil.postBody1(requestUrl, idList);
String c = RestTemplateUtil.postBody1(requestUrl, idList); JsonResponse<List<FileVo.FilePosition>> a = JSONObject.parseObject(c, JsonResponse.class);
JsonResponse<List<FileVo.FilePosition>> a = JSONObject.parseObject(c, JsonResponse.class); if (ObjectUtil.isNotNull(a) && ObjectUtil.isNotNull(a.getData())) {
if (ObjectUtil.isNotNull(a) && ObjectUtil.isNotNull(a.getData())) { List<FileVo.FilePosition> fileList = a.getData();
List<FileVo.FilePosition> fileList = a.getData(); deliverHistory.setFileList(fileList);
deliverHistory.setFileList(fileList); }
} }
} }
} }
@ -725,19 +725,19 @@ public class InputDocService implements IInputDocService {
deliverHistory.setFileList(fileList); deliverHistory.setFileList(fileList);
} }
} }
} }else {
}else{ if (StrUtil.isNotBlank(deliverHistory.getFileIds())){
if (StrUtil.isNotBlank(deliverHistory.getFileIds())){ List<String> idList = new ArrayList<>();
List<String> idList = new ArrayList<>(); idList.add(deliverHistory.getFileIds());
idList.add(deliverHistory.getFileIds()); //获取文件项目的路径
//获取文件项目的路径 String requestUrl = PropUtil.filedeal;
String requestUrl = PropUtil.filedeal; //通过文件id查询文件信息
//通过文件id查询文件信息 String c = RestTemplateUtil.postBody1(requestUrl, idList);
String c = RestTemplateUtil.postBody1(requestUrl, idList); JsonResponse<List<FileVo.FilePosition>> a = JSONObject.parseObject(c, JsonResponse.class);
JsonResponse<List<FileVo.FilePosition>> a = JSONObject.parseObject(c, JsonResponse.class); if (ObjectUtil.isNotNull(a) && ObjectUtil.isNotNull(a.getData())) {
if (ObjectUtil.isNotNull(a) && ObjectUtil.isNotNull(a.getData())) { List<FileVo.FilePosition> fileList = a.getData();
List<FileVo.FilePosition> fileList = a.getData(); deliverHistory.setFileList(fileList);
deliverHistory.setFileList(fileList); }
} }
} }
} }

6
tall/src/main/resources/mapper_dao/ProDeliverHistoryRecordDao.xml
View File

@ -18,11 +18,12 @@
FROM FROM
t_pro_deliver_history_record AS pdhr t_pro_deliver_history_record AS pdhr
LEFT JOIN t_pro_role AS pr ON pdhr.role_id = pr.id and pr.rec_status = 0 LEFT JOIN t_pro_role AS pr ON pdhr.role_id = pr.id and pr.rec_status = 0
LEFT JOIN t_pro_task_input_record AS ptir ON ptir.id = pdhr.deliver_record_id and ptir.rec_status = 0 LEFT JOIN t_pro_task_input_record AS ptir ON ptir.id = pdhr.deliver_record_id
LEFT JOIN t_pro_member AS pm ON pm.id = pdhr.member_id and pm.rec_status = 0 LEFT JOIN t_pro_member AS pm ON pm.id = pdhr.member_id and pm.rec_status = 0
WHERE WHERE
pdhr.deliver_id = #{deliverId} pdhr.deliver_id = #{deliverId}
and pdhr.rec_status = 0 and pdhr.rec_status = 0
ORDER BY pdhr.created_at DESC
</select> </select>
<select id="finOutPutHistory" resultType="com.ccsens.tall.bean.vo.InputDocVo$DeliverHistory"> <select id="finOutPutHistory" resultType="com.ccsens.tall.bean.vo.InputDocVo$DeliverHistory">
@ -40,11 +41,12 @@
FROM FROM
t_pro_deliver_history_record AS pdhr t_pro_deliver_history_record AS pdhr
LEFT JOIN t_pro_role AS pr ON pdhr.role_id = pr.id and pr.rec_status = 0 LEFT JOIN t_pro_role AS pr ON pdhr.role_id = pr.id and pr.rec_status = 0
LEFT JOIN t_pro_task_deliver_post_log AS ptdpl ON ptdpl.id = pdhr.deliver_record_id and ptdpl.rec_status = 0 LEFT JOIN t_pro_task_deliver_post_log AS ptdpl ON ptdpl.id = pdhr.deliver_record_id
LEFT JOIN t_pro_member AS pm ON pm.id = pdhr.member_id and pm.rec_status = 0 LEFT JOIN t_pro_member AS pm ON pm.id = pdhr.member_id and pm.rec_status = 0
WHERE WHERE
pdhr.deliver_id = #{deliverId} pdhr.deliver_id = #{deliverId}
and pdhr.rec_status = 0 and pdhr.rec_status = 0
ORDER BY pdhr.created_at DESC
</select> </select>
</mapper> </mapper>
Write Preview
Loading…
Cancel
Save