素材审批消息

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/clerktask/ClerkTaskController.java

@@ -12,6 +12,7 @@ import com.gic.haoban.manage.web.controller.MaterialController;
 import com.gic.haoban.manage.web.qo.clerktask.*;
 import com.gic.haoban.manage.web.vo.clerktask.*;
 import com.gic.marketing.pro.api.dto.clerktask.*;
+import com.gic.marketing.pro.api.enums.clerktask.ClerkTaskTypeEnum;
 import com.gic.marketing.pro.api.qdto.clerktask.ClerkAwardQDTO;
 import com.gic.marketing.pro.api.qdto.clerktask.ClerkRankQDTO;
 import com.gic.marketing.pro.api.qdto.clerktask.ClerkTaskContentPageQDTO;
@@ -108,6 +109,9 @@ public class ClerkTaskController {
     @RequestMapping("task-detail")
     @ResponseBody
     public RestResponse<TaskPlanDetailVO> taskDetail(String enterpriseId , Long planId , String clerkId) {
+        if(StringUtils.isAnyBlank(""+planId,clerkId)) {
+            return  RestResponse.failure("9999","必传参数为空") ;
+        }
         ServiceResponse<ClerkTaskPlanDTO> resp = this.clerkTaskApiService.getDetail(enterpriseId, planId,0) ;
         if(!resp.isSuccess()) {
             return RestResponse.failure("9999",resp.getMessage()) ;
@@ -117,6 +121,12 @@ public class ClerkTaskController {
         vo = EntityUtil.changeEntityByJSON(TaskPlanDetailVO.class,resp.getResult());
         vo.setStatus(map.get(vo.getPlanId()));
         vo.setOrderChannelNames(this.channelName(enterpriseId,vo.getOrderChannels()));
+        ClerkAwardInfoDTO awardInfoDTO = this.clerkTaskApiService.getClerkFinishInfo(planId,clerkId) ;
+        ClerkAwardInfoVO  awardInfoVO = new ClerkAwardInfoVO();
+        if(null != awardInfoVO) {
+            awardInfoVO = EntityUtil.changeEntityByJSON(ClerkAwardInfoVO.class,awardInfoDTO) ;
+        }
+        vo.setClerkAwardInfo(awardInfoVO);
         return RestResponse.successResult(vo) ;
     }