1

assistMg/src/main/java/com/hotent/project/controller/CostProjectTaskMaterialController.java

@@ -6,6 +6,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import java.util.List;
 import com.hotent.base.model.CommonResult;
 import com.hotent.base.util.StringUtil;
 import io.swagger.annotations.ApiOperation;
@@ -27,16 +28,15 @@ import com.hotent.project.manager.CostProjectTaskMaterialManager;
 public class CostProjectTaskMaterialController extends BaseController<CostProjectTaskMaterialManager, CostProjectTaskMaterial> {
 
 	/**
-	 * 根据id获取任务定制-报送资料要求数据详情
-	 * @param id
+	 * 根据taskId获取任务定制-报送资料要求数据列表
+	 * @param taskId 任务ID
 	 * @return
 	 * @throws Exception 
-	 * ModelAndView
 	 */
-	@GetMapping(value="/getDetail")
-	@ApiOperation(value="根据id获取任务定制-报送资料要求数据详情",httpMethod = "GET",notes = "根据id获取任务定制-报送资料要求数据详情")
-	public CommonResult<CostProjectTaskMaterial> getDetail(@ApiParam(name="id",value="业务对象主键", required = true)@RequestParam(required=true) String id) throws Exception{
-		return CommonResult.<CostProjectTaskMaterial>ok().value(baseService.getDetail(id));
+	@GetMapping(value="/listByTaskId")
+	@ApiOperation(value="根据taskId获取任务定制-报送资料要求数据列表",httpMethod = "GET",notes = "根据taskId获取任务定制-报送资料要求数据列表")
+	public CommonResult<List<CostProjectTaskMaterial>> listByTaskId(@ApiParam(name="taskId",value="任务ID", required = true)@RequestParam(required=true) String taskId) throws Exception{
+		return CommonResult.<List<CostProjectTaskMaterial>>ok().value(baseService.listByTaskId(taskId));
 	}
     /**
 	 * 新增,更新任务定制-报送资料要求

assistMg/src/main/java/com/hotent/project/manager/CostProjectTaskMaterialManager.java

@@ -1,7 +1,10 @@
 package com.hotent.project.manager;
 
+import java.util.List;
 import com.hotent.project.model.CostProjectTaskMaterial;
 import com.hotent.base.manager.BaseManager;
+import com.hotent.base.query.QueryFilter;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
  * 任务定制-报送资料要求 服务类
@@ -17,10 +20,31 @@ public interface CostProjectTaskMaterialManager extends BaseManager<CostProjectT
 	 * @return
 	 */
 	CostProjectTaskMaterial getDetail(String id);
+	
 	/**
 	 * 新建、更新任务定制-报送资料要求
 	 * @param costProjectTaskMaterial
 	 * @return
 	 */
 	void createOrUpdate(CostProjectTaskMaterial costProjectTaskMaterial);
+	
+	/**
+	 * 删除任务定制-报送资料要求
+	 * @param id
+	 */
+	void deleteById(String id);
+	
+	/**
+	 * 批量删除任务定制-报送资料要求
+	 * @param ids
+	 */
+	void batchDelete(String[] ids);
+	
+	
+	/**
+	 * 根据任务ID获取任务定制-报送资料要求列表
+	 * @param taskId
+	 * @return
+	 */
+	List<CostProjectTaskMaterial> listByTaskId(String taskId);
 }

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectTaskMaterialManagerImpl.java

@@ -1,15 +1,18 @@
 package com.hotent.project.manager.impl;
 
-import com.hotent.project.model.CostProjectTaskMaterial;
-import com.hotent.project.dao.CostProjectTaskMaterialDao;
-import com.hotent.project.manager.CostProjectTaskMaterialManager;
-import com.hotent.base.manager.impl.BaseManagerImpl;
+import java.util.Arrays;
+import java.util.List;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import java.util.List;
-import javax.annotation.Resource;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hotent.base.manager.impl.BaseManagerImpl;
+import com.hotent.base.query.QueryFilter;
 import com.hotent.base.util.BeanUtils;
+import com.hotent.project.dao.CostProjectTaskMaterialDao;
+import com.hotent.project.manager.CostProjectTaskMaterialManager;
+import com.hotent.project.model.CostProjectTaskMaterial;
+import javax.annotation.Resource;
 
 
 /**
@@ -25,14 +28,37 @@ public class CostProjectTaskMaterialManagerImpl extends BaseManagerImpl<CostProj
 	@Override
 	public CostProjectTaskMaterial getDetail(String id) {
     	CostProjectTaskMaterial costProjectTaskMaterial = this.get(id);
-    	
-
+    	if (BeanUtils.isEmpty(costProjectTaskMaterial)) {
+    		throw new RuntimeException("任务定制-报送资料要求不存在");
+    	}
 		return costProjectTaskMaterial;
 	}
+	
 	@Override
 	@Transactional
 	public void createOrUpdate(CostProjectTaskMaterial costProjectTaskMaterial) {
 		//新建或更新
 		this.saveOrUpdate(costProjectTaskMaterial);
 	}
+	
+	@Override
+	@Transactional
+	public void deleteById(String id) {
+		this.removeById(id);
+	}
+	
+	@Override
+	@Transactional
+	public void batchDelete(String[] ids) {
+		this.removeByIds(Arrays.asList(ids));
+	}
+	
+	@Override
+	public List<CostProjectTaskMaterial> listByTaskId(String taskId) {
+		QueryWrapper<CostProjectTaskMaterial> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("task_id", taskId);
+		queryWrapper.orderByAsc("order_num");
+		return this.list(queryWrapper);
+	}
+
 }

assistMg/src/main/java/com/hotent/project/model/CostProjectTaskMaterial.java

@@ -106,6 +106,10 @@ public class CostProjectTaskMaterial extends BaseModel<CostProjectTaskMaterial>
     @JsonProperty("updateTime")
     private LocalDateTime updateTime;
     
+    @ApiModelProperty(value = "是否上传 0:未上传，1:已上传")
+    @JsonProperty("isUploaded")
+    private boolean isUploaded;
+    
 
     public String getId() {
         return id;
@@ -226,7 +230,14 @@ public class CostProjectTaskMaterial extends BaseModel<CostProjectTaskMaterial>
     public void setUpdateTime(LocalDateTime updateTime) {
         this.updateTime = updateTime;
     }
-
+    
+    public boolean getIsUploaded() {
+        return isUploaded;
+    }
+    
+    public void setIsUploaded(boolean isUploaded) {
+        this.isUploaded = isUploaded;
+    }
 
     @Override
     protected Serializable pkVal() {
@@ -253,6 +264,7 @@ public class CostProjectTaskMaterial extends BaseModel<CostProjectTaskMaterial>
             ", updateBy=" + updateBy +
             ", formatRequired=" + formatRequired +
             ", updateTime=" + updateTime +
+            ", isUploaded=" + isUploaded +  
         "}";
     }
-}
+}