成本核定模版推送

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

@@ -5,7 +5,6 @@ import com.hotent.project.model.CostProjectSurvey;
 import com.hotent.base.manager.BaseManager;
 import com.hotent.project.req.CostProjectBasePageReq;
 import com.hotent.req.PageReq;
-import javafx.scene.control.ListCell;
 
 import java.util.List;
 

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

@@ -232,7 +232,8 @@ 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 catalogId) throws Exception {
+	@RequestParam String taskId,@ApiParam(name="taskId", value="任务id", required = false)
+	@RequestParam String catalogId ) throws Exception {
 
 		CostSurveyTemplate queryCondition = new CostSurveyTemplate();
 		queryCondition.setSurveyTemplateId(templateId);
@@ -266,6 +267,7 @@ public class CostSurveyTemplateController extends BaseController<CostSurveyTempl
 			costVerifyTemplate.setCreateTime( LocalDateTime.now());
 			costVerifyTemplate.setType(sourceTemplate.getType());
 			costVerifyTemplate.setIsDelete("0");
+			costVerifyTemplate.setTaskId(taskId);
 
 //			costVerifyTemplate.setCatalogId(sourceTemplate.getCatalogId());
 

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

@@ -112,6 +112,7 @@ public class CostVerifyTemplateController extends BaseController<CostVerifyTempl
 			@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)
 			@RequestParam String catalogId) throws Exception {
 
 
@@ -130,7 +131,7 @@ public class CostVerifyTemplateController extends BaseController<CostVerifyTempl
 		template.setCreatetemplateid(templateId);
 		//新增修改后的模板数据
 		costSurveyTemplateDao.insert(template);
-		List<CostVerifyTemplateItems> itemsList = costVerifyTemplateItemsDao.selectByVerifyTemplateId(templateId);
+		List<CostVerifyTemplateItems> itemsList = costVerifyTemplateItemsDao.selectByVerifyTemplateId(templateId,taskId);
 		List<CostVerifyTemplateItems> updateitemsList=new ArrayList<>();
 		// 从成本核定表获取启用状态的表头和数据项
 		List<CostVerifyTemplateHeaders> headersList = costVerifyTemplateHeadersDao.selectBySurveyTemplateId(templateId);
@@ -291,6 +292,7 @@ public class CostVerifyTemplateController extends BaseController<CostVerifyTempl
 	public void exportExcelTemplate(
 			@ApiParam(name="templateId", value="成本核定模板ID", required = true)
 			@RequestParam String templateId,
+			@RequestParam String taskId,
 			HttpServletResponse response) throws Exception {
 
 		// 获取成本核定模板
@@ -305,7 +307,7 @@ public class CostVerifyTemplateController extends BaseController<CostVerifyTempl
 		List<CostVerifyTemplateHeaders> headersList = costVerifyTemplateHeadersDao.selectBySurveyTemplateId(templateId);
 
 		// 获取数据项信息
-		List<CostVerifyTemplateItems> itemsList = costVerifyTemplateItemsDao.selectByVerifyTemplateId(templateId);
+		List<CostVerifyTemplateItems> itemsList = costVerifyTemplateItemsDao.selectByVerifyTemplateId(templateId,taskId);
 
 		// 创建Excel工作簿
 		Workbook workbook = new XSSFWorkbook();

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

@@ -94,10 +94,11 @@ 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 = true) String surveyTemplateId,
+			@RequestParam(required = false) String taskId
 			) throws Exception {
 
-		List<CostVerifyTemplateItems> items = costSurveyTemplateItemsDao.selectByVerifyTemplateId(surveyTemplateId);
+		List<CostVerifyTemplateItems> items = costSurveyTemplateItemsDao.selectByVerifyTemplateId(surveyTemplateId,taskId);
 		List<CostVerifyTemplateHeaders> heardlist = costSurveyTemplateheadManager.listVisibleBySurveyTemplateId(surveyTemplateId);
 		String filename = heardlist.stream().map(CostVerifyTemplateHeaders::getFieldName).collect(Collectors.joining(","));
 		String fileids = heardlist.stream().map(CostVerifyTemplateHeaders::getId).collect(Collectors.joining(","));
@@ -113,7 +114,11 @@ public class CostVerifyTemplateItemsController extends BaseController<CostVerify
 			if (group.isEmpty()) continue;
 
 			// 主项（可以取第一个）
-			CostVerifyTemplateItems mainItem = group.get(0);
+		//	CostVerifyTemplateItems mainItem = group.get(0);
+			CostVerifyTemplateItems mainItem = group.stream()
+					.filter(item -> item.getParentid() != null)
+					.findFirst()
+					.orElse(null);
 
 			String headersIds = "";
 			String itemIds="";
@@ -221,12 +226,13 @@ public class CostVerifyTemplateItemsController extends BaseController<CostVerify
 	@GetMapping(value = "/listByCurrentTemplateId")
 	@ApiOperation(value = "根据成本核定表现行模板id获取指标项数据列表", httpMethod = "GET", notes = "根据成本核定表现行模板id获取指标项数据列表")
 	public CommonResult<CostItemData> listByCurrentTemplateId(
-			@ApiParam(name = "surveyTemplateId", value = "关联的成本核定表ID", required = true)
-			@RequestParam(required = true) String surveyTemplateId) throws Exception {
+			@ApiParam(name = "surveyTemplateId", value = "关联的成本核定表ID", required = false)
+			@RequestParam(value = "surveyTemplateId" ,required = false) String surveyTemplateId,
+			@RequestParam(required = false) String taskId) throws Exception {
 
 
 		// 查询当前模板的所有指标项数据
-		List<CostVerifyTemplateItems> items = costSurveyTemplateItemsDao.selectByVerifyTemplateId(surveyTemplateId);
+		List<CostVerifyTemplateItems> items = costSurveyTemplateItemsDao.selectByVerifyTemplateId(surveyTemplateId,taskId);
 
 		// 查询当前模板的所有表头信息
 		List<CostVerifyTemplateHeaders> heardlist = costSurveyTemplateheadManager.listVisibleBySurveyTemplateId(surveyTemplateId);
@@ -327,9 +333,11 @@ public class CostVerifyTemplateItemsController extends BaseController<CostVerify
 	@ApiOperation(value = "根据核定模板ID获取指标数据信息", httpMethod = "GET", notes = "根据核定模板ID获取指标数据信息")
 	public CommonResult<List<CostVerifyTemplateItems>> listByVerifyTemplateId(
 			@ApiParam(name = "verifyTemplateId", value = "核定模板ID", required = true)
-			@RequestParam(required = true) String verifyTemplateId) throws Exception {
+			@RequestParam(required = true) String verifyTemplateId,
+			@RequestParam(required = false) String taskId
+			) throws Exception {
 
-		List<CostVerifyTemplateItems> items = costSurveyTemplateItemsDao.selectByVerifyTemplateId(verifyTemplateId);
+		List<CostVerifyTemplateItems> items = costSurveyTemplateItemsDao.selectByVerifyTemplateId(verifyTemplateId,taskId);
 		//CostVerifyTemplateItems orderunm 去重
 
 		return CommonResult.<List<CostVerifyTemplateItems>>ok().value(items);

assistMg/src/main/java/com/hotent/surveyinfo/dao/CostVerifyTemplateItemsDao.java

@@ -18,7 +18,7 @@ public interface CostVerifyTemplateItemsDao extends BaseMapper<CostVerifyTemplat
 
 
 
-  public List<CostVerifyTemplateItems> selectByVerifyTemplateId(@Param("surveyTemplateId") String surveyTemplateId);
+  public List<CostVerifyTemplateItems> selectByVerifyTemplateId(@Param("surveyTemplateId") String surveyTemplateId,@Param("taskId") String taskId);
   /**
    * 根据成本核定表id和版本号获取指标项数据列表
    * @param surveyTemplateId 成本核定表id

assistMg/src/main/java/com/hotent/surveyinfo/model/CostVerifyTemplate.java

@@ -91,6 +91,11 @@ public class CostVerifyTemplate extends BaseModel<CostVerifyTemplate> {
     @JsonProperty("remarks")
     private String remarks;
 
+    @ApiModelProperty(value = "任务id")
+    @TableField("task_id")
+    @JsonProperty("taskId")
+    private String taskId;
+
     public String getIsDelete() {
         return isDelete;
     }
@@ -181,7 +186,13 @@ public class CostVerifyTemplate extends BaseModel<CostVerifyTemplate> {
     @JsonProperty("areaLevel")
     private String areaLevel;
 
+    public String getTaskId() {
+        return taskId;
+    }
 
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
 
     public String getAreaCode() {
         return areaCode;

assistMg/src/main/resources/mapper/CostVerifyTemplateItemsMapper.xml

@@ -67,11 +67,39 @@ version_id, rkey, rvalue, json_str, cell_code, calculation_formula, unit, create
 
 	<select id="selectByVerifyTemplateId" resultType="com.hotent.surveyinfo.model.CostVerifyTemplateItems">
 		SELECT
-		    <include refid="Base_Column_List"/>
-
+		cvti.id,
+		cvti.survey_template_id,
+		cvti.order_text,
+		cvti.cell_code,
+		cvti.calculation_formula, cvti.unit,
+		cvti.order_num,
+		cvti.headers_id,
+		cvti.version_id,
+		cvti.rkey,
+		cvti.rvalue,
+		cvti.json_str,
+		cvti.cell_code,
+		cvti.calculation_formula,
+		cvti.unit,
+		cvti.create_time,
+		cvti.update_time,
+		cvti.create_by,
+		cvti.update_by,
+		cvti.project_id,
+		cvti.calculation_template_id,
+		cvti.rowid,
+		cvti.parentid
 		FROM
-		    cost_verify_template_items
-		WHERE survey_template_id = #{surveyTemplateId}
+		cost_verify_template_items cvti
+		LEFT JOIN cost_verify_template cvt ON cvt.survey_template_id = cvti.survey_template_id
+		where
+		<if test="surveyTemplateId != null">
+			cvti.survey_template_id = #{surveyTemplateId}
+		</if>
+		<if test="taskId != null">
+			 cvt.task_id = #{taskId}
+		</if>
+
 		ORDER BY order_num ASC
 	</select>
 	<select id="selectBySurveyTemplateIdAndVersion" resultType="com.hotent.surveyinfo.model.CostVerifyTemplateItems">