优化代码

java110-bean/src/main/java/com/java110/dto/work/WorkTaskItemDto.java

@@ -30,6 +30,8 @@ public class WorkTaskItemDto extends WorkPoolContentDto implements Serializable
 
     private String remark;
 
+    private String pathUrl;
+
 
     private Date createTime;
 
@@ -164,4 +166,12 @@ public class WorkTaskItemDto extends WorkPoolContentDto implements Serializable
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+    public String getPathUrl() {
+        return pathUrl;
+    }
+
+    public void setPathUrl(String pathUrl) {
+        this.pathUrl = pathUrl;
+    }
 }

java110-db/src/main/resources/mapper/oa/WorkTaskItemV1ServiceDaoImplMapper.xml

@@ -21,10 +21,12 @@
         select t.deduction_person_id deductionPersonId,t.finish_time finishTime,t.deduction_person_name
         deductionPersonName,t.deduction_money deductionMoney,t.content_id contentId,t.status_cd statusCd,t.store_id
         storeId,t.work_id workId,t.deduction_reason deductionReason,t.item_id itemId,t.state,t.community_id
-        communityId,t.task_id taskId,wpc.content,we.staff_name staffName,we.remark
+        communityId,t.task_id taskId,wpc.content,we.staff_name staffName,we.remark,t.create_time createTime,
+        wpf.path_url pathUrl
         from work_task_item t
         left join work_pool_content wpc on t.content_id = wpc.content_id and wpc.status_cd = '0'
         left join work_event we on t.item_id = we.item_id and we.status_cd = '0' and we.event_type = '1001'
+        left join work_pool_file wpf on t.item_id = wpf.item_id and wpf.status_cd = '0'
         where 1 =1
         <if test="deductionPersonId !=null and deductionPersonId != ''">
             and t.deduction_person_id= #{deductionPersonId}

service-oa/src/main/java/com/java110/oa/cmd/work/ListWorkTaskItemCmd.java

@@ -20,9 +20,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.work.WorkPoolFileDto;
 import com.java110.intf.oa.IWorkTaskItemV1InnerServiceSMO;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.java110.dto.work.WorkTaskItemDto;
@@ -67,6 +71,15 @@ public class ListWorkTaskItemCmd extends Cmd {
 
            if (count > 0) {
                workTaskItemDtos = workTaskItemV1InnerServiceSMOImpl.queryWorkTaskItems(workTaskItemDto);
+               String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN, "IMG_PATH");
+
+               for (WorkTaskItemDto tmpWorkTaskItemDto : workTaskItemDtos) {
+                   if(StringUtil.isEmpty(tmpWorkTaskItemDto.getPathUrl())){
+                       continue;
+                   }
+                   tmpWorkTaskItemDto.setPathUrl(imgUrl + tmpWorkTaskItemDto.getPathUrl());
+               }
+
            } else {
                workTaskItemDtos = new ArrayList<>();
            }