bug相关修改

assistMg/src/main/java/com/hotent/baseInfo/manager/impl/CostDocumentTemplateManagerImpl.java

@@ -99,7 +99,9 @@ public class CostDocumentTemplateManagerImpl extends BaseManagerImpl<CostDocumen
 
 		CostDocumentTemplate entity = BeanUtil.copyProperties(entityReq, CostDocumentTemplate.class);
 		if(costDocumentTemplate== null ){
-
+			entity.setIsDeleted(BaseConstant.NORMAL_STATUS);
+			entity.setCreateBy(user.getAccount());
+			entity.setCreateTime(LocalDateTime.now());
 			super.save(entity);
 			List<CostDocumentTemplateFile> costDocumentTemplateFiles = entityReq.getCostDocumentTemplateFiles();
 			if (costDocumentTemplateFiles != null){

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

@@ -6,6 +6,7 @@ import com.hotent.base.constants.ApiGroupConsts;
 import com.hotent.common.CrudService;
 import com.hotent.project.model.CostProjectDocument;
 import com.hotent.project.req.CostProjectBasePageReq;
+import com.hotent.project.req.CostProjectMemoUpdateReq;
 import com.hotent.req.PageReq;
 import com.hotent.resp.PageResp;
 import io.swagger.annotations.Api;
@@ -57,4 +58,17 @@ public class CostProjectMaterialController extends BaseController<CostProjectMat
 		return CommonResult.<PageResp<CostProjectMaterial>>ok().value(crudService.pageQuery(req, baseService::pageList));
 	}
 
+	/**
+	 * 取报送资料要求数据新增或者修改
+	 * @return
+	 * @throws Exception
+	 * ModelAndView
+	 */
+	@PostMapping(value = "/update")
+	@ApiOperation(value = "取报送资料要求数据新增或者修改", httpMethod = "POST", notes = "取报送资料要求数据新增或者修改")
+	public CommonResult update(@RequestBody CostProjectMaterial req) throws Exception {
+		int result = baseService.createOrUpdate(req);
+		return CommonResult.ok().value(result > 0 ? "更新成功" : "更新失败");
+	}
+
 }

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

@@ -27,7 +27,7 @@ public interface CostProjectMaterialManager extends BaseManager<CostProjectMater
 	 * @param costProjectMaterial
 	 * @return
 	 */
-	void createOrUpdate(CostProjectMaterial costProjectMaterial);
+	 int createOrUpdate(CostProjectMaterial costProjectMaterial);
 
 	/**
 	 * 分页查询

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

@@ -63,9 +63,9 @@ public class CostProjectMaterialManagerImpl extends BaseManagerImpl<CostProjectM
 
     @Override
     @Transactional
-    public void createOrUpdate(CostProjectMaterial costProjectMaterial) {
+    public int createOrUpdate(CostProjectMaterial costProjectMaterial) {
         //新建或更新
-        this.saveOrUpdate(costProjectMaterial);
+       return this.saveOrUpdate(costProjectMaterial)?1:0;
     }
 
     @Override