必传项修改

assistMg/src/main/java/com/hotent/project/dao/CostProjectMemoDao.java

@@ -24,7 +24,7 @@ public interface CostProjectMemoDao extends BaseMapper<CostProjectMemo> {
             , @Param("provinceCode") String provinceCode
             , @Param("cityCode") String cityCode
             , @Param("countyCode") String countyCode
-            , @Param("projectId") Integer projectId
+            , @Param("projectId") Long projectId
             , @Param("year") String year
             , @Param("content") String content
             , @Param("memoDate") LocalDate memoDate

assistMg/src/main/java/com/hotent/project/req/CostProjectMemoQueryReq.java

@@ -24,7 +24,7 @@ public class CostProjectMemoQueryReq extends PageBean {
 
 
     @ApiModelProperty(value = "关联的成本监审项目ID")
-    private Integer projectId;
+    private Long projectId;
 
     @ApiModelProperty(value = "年度")
     private String year;

assistMg/src/main/java/com/hotent/surveyinfo/controller/CostSurveyTemplateController.java

@@ -232,7 +232,7 @@ public class CostSurveyTemplateController extends BaseController<CostSurveyTempl
 			@ApiParam(name="templateId", value="模板ID", required = true)
 			@RequestParam String templateId,@ApiParam(name="templatename", value="模板名称", required = true)
 	@RequestParam String templatename,@ApiParam(name="catalogId", value="监审id", required = true)
-	@RequestParam String taskId,@ApiParam(name="taskId", value="任务id", required = false)
+	 String taskId,@ApiParam(name="taskId", value="任务id", required = false)
 	@RequestParam String catalogId ) throws Exception {
 
 		CostSurveyTemplate queryCondition = new CostSurveyTemplate();

assistMg/src/main/java/com/hotent/surveyinfo/controller/CostVerifyTemplateController.java

@@ -111,8 +111,8 @@ public class CostVerifyTemplateController extends BaseController<CostVerifyTempl
 			@ApiParam(name="templateId", value="模板ID", required = true)
 			@RequestParam String templateId,
 			@ApiParam(name="templatename", value="模板名称", required = true)
-			@RequestParam String templatename,@ApiParam(name="catalogId", value="监审id", required = true)
-			@RequestParam String taskId,@ApiParam(name="taskId", value="任务id", required = false)
+			 String templatename,@ApiParam(name="catalogId", value="监审id", required = true)
+			 String taskId,@ApiParam(name="taskId", value="任务id", required = false)
 			@RequestParam String catalogId) throws Exception {
 
 

assistMg/src/main/java/com/hotent/surveyinfo/controller/CostVerifyTemplateItemsController.java

@@ -94,7 +94,7 @@ public class CostVerifyTemplateItemsController extends BaseController<CostVerify
 	@ApiOperation(value = "根据成本核定表ID获取指标项数据列表（带key-value拼接）", httpMethod = "GET", notes = "根据成本核定表ID和版本号获取指标项数据列表（带key-value拼接）")
 	public CommonResult<CostItemData> listByTemplateIdAndVersion(
 			@ApiParam(name = "surveyTemplateId", value = "关联的成本核定表ID", required = true)
-			@RequestParam(required = true) String surveyTemplateId,
+			@RequestParam(required = false) String surveyTemplateId,
 			@RequestParam(required = false) String taskId
 			) throws Exception {
 
@@ -116,7 +116,7 @@ public class CostVerifyTemplateItemsController extends BaseController<CostVerify
 			// 主项（可以取第一个）
 		//	CostVerifyTemplateItems mainItem = group.get(0);
 			CostVerifyTemplateItems mainItem = group.stream()
-					.filter(item -> item.getParentid() != null)
+					.filter(item -> item.getParentid() != null )
 					.findFirst()
 					.orElse(null);