0701v1.3

tall/src/main/java/com/ccsens/tall/bean/vo/DeliverVo.java

@@ -30,7 +30,7 @@ public class DeliverVo {
         @ApiModelProperty("文件ID")
         private Long fileId;
         @ApiModelProperty("交付物上传的记录id")
-        private Long postLogId;
+        private Long deliverLogId;
         @JsonIgnore
         private Date updateTime;
         @ApiModelProperty("交付物详情（备注）")

tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java

@@ -453,7 +453,7 @@ public class TaskDeliverService implements ITaskDeliverService {
 
                 checkerList = new ArrayList<>();
                 ProTaskDeliverPostLogCheckerExample checkerExample = new ProTaskDeliverPostLogCheckerExample();
-                checkerExample.createCriteria().andDeliverPostLogIdEqualTo(filePath.getPostLogId());
+                checkerExample.createCriteria().andDeliverPostLogIdEqualTo(filePath.getDeliverLogId());
                 List<ProTaskDeliverPostLogChecker> postLogCheckerList = postLogCheckerDao.selectByExample(checkerExample);
                 if (CollectionUtil.isNotEmpty(postLogCheckerList)) {
                     for (ProTaskDeliverPostLogChecker postLogChecker : postLogCheckerList) {

tall/src/main/java/com/ccsens/tall/web/DeliverController.java

@@ -133,14 +133,14 @@ public class DeliverController {
     @OperateType(value = 8)
     @ApiOperation(value = "删除交付物",notes = "")
     @ApiImplicitParams({
-            @ApiImplicitParam(name="deliverId",value = "交付物Id",required = true,paramType = "query",dataType="String"),
+            @ApiImplicitParam(name="deliverId",value = "交付物上传Id",required = true,paramType = "query",dataType="String"),
             @ApiImplicitParam(name="taskId",value = "任务Id",required = true,paramType = "query",dataType="String")
     })
     @RequestMapping(value = "", method = RequestMethod.DELETE, produces = {"application/json;charset=UTF-8"})
     public JsonResponse deleteDeliver(HttpServletRequest request,
-                                      @RequestParam(required = true)Long deliverId, Long taskId) throws Exception {
+                                      @RequestParam(required = true)Long deliverLogId, Long taskId) throws Exception {
         Long currentUserId =  Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
-        deliverService.deleteDeliver(currentUserId,deliverId,taskId);
+        deliverService.deleteDeliver(currentUserId,deliverLogId,taskId);
         return JsonResponse.newInstance().ok();
     }
 

tall/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: test
-    include: util-test,common
+    active: dev
+    include: util-dev,common

tall/src/main/resources/mapper_dao/DeliverDao.xml

@@ -150,6 +150,8 @@
         FROM
           `t_pro_task_deliver_post_log` l LEFT JOIN t_sys_commited_file f on l.file_id = f.id
         WHERE
+          l.rec_status = 0
+          and
           l.task_sub_time_id = #{subTimeId}
           ORDER BY l.time DESC
     </select>