实施三个阶段复核数据展示修改

src/main/java/com/jeeplus/modules/projectVisa/web/ProjectClaimController.java

@@ -28,6 +28,7 @@ import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.dao.WorkClientAttachmentDao;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
+import com.jeeplus.modules.workcontent.entity.WorkScheduleInfo;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workreceiptsregister.entity.ResponseEntity;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -303,6 +304,13 @@ public class ProjectClaimController extends BaseController {
                 }
             }
         }
+        if(list.size()>0){
+            Set set = new HashSet<>();
+            for (ProjectVisa info: list) {
+                set.add(info.getType());
+            }
+            signList = new ArrayList<>(set);
+        }
         model.addAttribute("signList", signList);
         model.addAttribute("investmentCostList", list);
         String viewPath = "modules/workcontent/workClaimList";
@@ -345,6 +353,14 @@ public class ProjectClaimController extends BaseController {
                 }
             }
         }
+        if(list.size()>0){
+            Set set = new HashSet<>();
+            for (ProjectVisa info: list) {
+                set.add(info.getType());
+            }
+            signList = new ArrayList<>(set);
+        }
+
         model.addAttribute("signList", signList);
         model.addAttribute("investmentCostList", list);
         String viewPath = "modules/workcontent/workProjectClaimListView";

src/main/java/com/jeeplus/modules/projectVisa/web/ProjectDesignController.java

@@ -163,6 +163,13 @@ public class ProjectDesignController extends BaseController {
                 }
             }
         }
+        if(list.size()>0){
+            Set set = new HashSet<>();
+            for (ProjectVisa info: list) {
+                set.add(info.getType());
+            }
+            signList = new ArrayList<>(set);
+        }
         model.addAttribute("signList", signList);
         model.addAttribute("investmentCostList", list);
         String viewPath = "modules/workcontent/workDesignChangeList";
@@ -205,6 +212,13 @@ public class ProjectDesignController extends BaseController {
                 }
             }
         }
+        if(list.size()>0){
+            Set set = new HashSet<>();
+            for (ProjectVisa info: list) {
+                set.add(info.getType());
+            }
+            signList = new ArrayList<>(set);
+        }
         model.addAttribute("signList", signList);
         model.addAttribute("investmentCostList", list);
         String viewPath = "modules/workcontent/workProjectDesignListView";

src/main/java/com/jeeplus/modules/projectVisa/web/ProjectVisaController.java

@@ -172,6 +172,13 @@ public class ProjectVisaController extends BaseController {
                 }
             }
         }
+        if(list.size()>0){
+            Set set = new HashSet<>();
+            for (ProjectVisa info: list) {
+                set.add(info.getType());
+            }
+            signList = new ArrayList<>(set);
+        }
         model.addAttribute("signList", signList);
         model.addAttribute("investmentCostList", list);
         String viewPath = "modules/workcontent/workSiteVisaList";
@@ -214,6 +221,13 @@ public class ProjectVisaController extends BaseController {
                 }
             }
         }
+        if(list.size()>0){
+            Set set = new HashSet<>();
+            for (ProjectVisa info: list) {
+                set.add(info.getType());
+            }
+            signList = new ArrayList<>(set);
+        }
         model.addAttribute("signList", signList);
         model.addAttribute("investmentCostList", list);
         String viewPath = "modules/workcontent/workProjectVisaListView";

src/main/java/com/jeeplus/modules/projectrecord/web/check/ChechDesignController.java

@@ -163,6 +163,13 @@ public class ChechDesignController extends BaseController {
                 }
             }
         }
+        if(list.size()>0){
+            Set set = new HashSet<>();
+            for (ProjectVisa info: list) {
+                set.add(info.getType());
+            }
+            signList = new ArrayList<>(set);
+        }
         model.addAttribute("signList", signList);
         model.addAttribute("investmentCostList", list);
         String viewPath = "modules/workcontent/workDesignChangeList";

src/main/java/com/jeeplus/modules/projectrecord/web/check/CheckClaimController.java

@@ -308,6 +308,13 @@ public class CheckClaimController extends BaseController {
                 }
             }
         }
+        if(list.size()>0){
+            Set set = new HashSet<>();
+            for (ProjectVisa info: list) {
+                set.add(info.getType());
+            }
+            signList = new ArrayList<>(set);
+        }
         model.addAttribute("signList", signList);
         model.addAttribute("investmentCostList", list);
         String viewPath = "modules/workcontent/workClaimList";

src/main/java/com/jeeplus/modules/projectrecord/web/check/CheckVisaController.java

@@ -166,6 +166,13 @@ public class CheckVisaController extends BaseController {
                 }
             }
         }
+        if(list.size()>0){
+            Set set = new HashSet<>();
+            for (ProjectVisa info: list) {
+                set.add(info.getType());
+            }
+            signList = new ArrayList<>(set);
+        }
         model.addAttribute("signList", signList);
         model.addAttribute("investmentCostList", list);
         String viewPath = "modules/workcontent/workSiteVisaList";

src/main/java/com/jeeplus/modules/workcontent/web/WorkConcealProjectController.java

@@ -10,6 +10,7 @@ import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
+import com.jeeplus.modules.projectVisa.entity.ProjectVisa;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.workcontent.entity.WorkConcealProject;
@@ -26,9 +27,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 /**
  * 工程费用Controller
@@ -69,6 +68,13 @@ public class WorkConcealProjectController extends BaseController {
         if(StringUtils.isNotBlank(workConcealProject.getContentId())){
             list = workConcealProjectService.findList(workConcealProject);
         }
+		if(list.size()>0){
+			Set set = new HashSet<>();
+			for (WorkConcealProject info: list) {
+				set.add(info.getType());
+			}
+			signList = new ArrayList<>(set);
+		}
         model.addAttribute("signList", signList);
         model.addAttribute("workConcealProject", list);
         String viewPath = "modules/workcontent/workConcealProjectList";
@@ -99,6 +105,14 @@ public class WorkConcealProjectController extends BaseController {
 		if(StringUtils.isNotBlank(workConcealProject.getProjectId())){
 			list = workConcealProjectService.findListByProjectId(workConcealProject);
 		}
+
+		if(list.size()>0){
+			Set set = new HashSet<>();
+			for (WorkConcealProject info: list) {
+				set.add(info.getType());
+			}
+			signList = new ArrayList<>(set);
+		}
 		model.addAttribute("signList", signList);
 		model.addAttribute("workConcealProject", list);
 		return "modules/workcontent/workProjectConcealListView";
@@ -181,5 +195,5 @@ public class WorkConcealProjectController extends BaseController {
 		//return "redirect:"+Global.getAdminPath()+"/workConcealProject/workConcealProject/?repage";
 		return null;
     }
-	
-}
+
+}

src/main/java/com/jeeplus/modules/workcontent/web/WorkContentBranchAccountController.java

@@ -13,8 +13,10 @@ import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.projectVisa.entity.ProjectVisa;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.utils.DictUtils;
+import com.jeeplus.modules.workcontent.entity.WorkConcealProject;
 import com.jeeplus.modules.workcontent.entity.WorkContentBranchAccount;
 import com.jeeplus.modules.workcontent.entity.WorkContentInvestmentCost;
+import com.jeeplus.modules.workcontent.entity.WorkScheduleInfo;
 import com.jeeplus.modules.workcontent.service.WorkContentBranchAccountService;
 import com.jeeplus.modules.workcontent.service.WorkContentInvestmentCostService;
 import com.jeeplus.modules.workreceiptsregister.entity.ResponseEntity;
@@ -27,9 +29,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 /**
  * 工程分部结算Controller
@@ -43,7 +43,7 @@ public class WorkContentBranchAccountController extends BaseController {
 	@Autowired
 	private WorkContentBranchAccountService workContentBranchAccountService;
 
-	
+
 	@ModelAttribute
 	public WorkContentBranchAccount get(@RequestParam(required=false) String id) {
 		WorkContentBranchAccount entity = null;
@@ -55,7 +55,7 @@ public class WorkContentBranchAccountController extends BaseController {
 		}
 		return entity;
 	}
-	
+
 	/**
 	 * 工程分部结算页面
 	 */
@@ -71,6 +71,14 @@ public class WorkContentBranchAccountController extends BaseController {
         if(StringUtils.isNotBlank(workContentBranchAccount.getContentId())){
             list = workContentBranchAccountService.findList(workContentBranchAccount);
         }
+		if(list.size()>0){
+			Set set = new HashSet<>();
+			for (WorkContentBranchAccount info: list) {
+				set.add(info.getType());
+			}
+			signList = new ArrayList<>(set);
+		}
+
         model.addAttribute("signList", signList);
         model.addAttribute("investmentCostList", list);
         String viewPath = "modules/workcontent/workContentBranchAccountList";
@@ -100,6 +108,14 @@ public class WorkContentBranchAccountController extends BaseController {
 		if(StringUtils.isNotBlank(workContentBranchAccount.getProjectId())){
 			list = workContentBranchAccountService.findListByProjectId(workContentBranchAccount);
 		}
+
+		if(list.size()>0){
+			Set set = new HashSet<>();
+			for (WorkContentBranchAccount info: list) {
+				set.add(info.getType());
+			}
+			signList = new ArrayList<>(set);
+		}
 		model.addAttribute("signList", signList);
 		model.addAttribute("investmentCostList", list);
 		String viewPath = "modules/workcontent/workProjectBranchListView";
@@ -130,7 +146,7 @@ public class WorkContentBranchAccountController extends BaseController {
 		}
 		return responseEntity;
     }
-	
+
 	/**
 	 * 下载导入工程费用数据模板
 	 */
@@ -162,5 +178,5 @@ public class WorkContentBranchAccountController extends BaseController {
 		List<String> tableType = workContentBranchAccountService.getTableType(contentId);
 		return tableType;
 	}
-	
-}
+
+}

src/main/java/com/jeeplus/modules/workcontent/web/WorkContentCtrlpriceController.java

@@ -13,6 +13,7 @@ import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.workcontent.entity.WorkContentCtrlprice;
+import com.jeeplus.modules.workcontent.entity.WorkContentInvestmentCost;
 import com.jeeplus.modules.workcontent.service.WorkContentCtrlpriceService;
 import com.jeeplus.modules.workreceiptsregister.entity.ResponseEntity;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,9 +25,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 /**
  *   清单及控制价编审Controller
@@ -39,7 +38,7 @@ public class WorkContentCtrlpriceController extends BaseController {
 
 	@Autowired
 	private WorkContentCtrlpriceService workContentCtrlpriceService;
-	
+
 	@ModelAttribute
 	public WorkContentCtrlprice get(@RequestParam(required=false) String id) {
 		WorkContentCtrlprice entity = null;
@@ -51,7 +50,7 @@ public class WorkContentCtrlpriceController extends BaseController {
 		}
 		return entity;
 	}
-	
+
 	/**
 	 *   清单及控制价编审列表页面
 	 */
@@ -72,11 +71,19 @@ public class WorkContentCtrlpriceController extends BaseController {
 		if (StringUtils.isNotBlank(sign)){
 			signList = Arrays.asList(sign.split(","));
 		}
-		model.addAttribute("signList", signList);
         List<WorkContentCtrlprice> ctrlpricelist = new ArrayList<>();
         if(StringUtils.isNotBlank(workContentCtrlprice.getContentId())){
             ctrlpricelist = workContentCtrlpriceService.findList(workContentCtrlprice);
         }
+
+		if(ctrlpricelist.size()>0){
+			Set set = new HashSet<>();
+			for (WorkContentCtrlprice info: ctrlpricelist) {
+				set.add(info.getType());
+			}
+			signList = new ArrayList<>(set);
+		}
+		model.addAttribute("signList", signList);
         model.addAttribute("ctrlpricelist", ctrlpricelist);
         String viewPath = "modules/workcontent/workContentCtrlpriceList";
         if("view".equals(view)){
@@ -96,7 +103,7 @@ public class WorkContentCtrlpriceController extends BaseController {
 		addMessage(redirectAttributes, "删除  清单及控制价编审成功");
 		return "redirect:"+Global.getAdminPath()+"/workcontentctrlprice/workContentCtrlprice/?repage";
 	}
-	
+
 	/**
 	 * 批量删除  清单及控制价编审
 	 */
@@ -109,7 +116,7 @@ public class WorkContentCtrlpriceController extends BaseController {
 		addMessage(redirectAttributes, "删除  清单及控制价编审成功");
 		return "redirect:"+Global.getAdminPath()+"/workcontentctrlprice/workContentCtrlprice/?repage";
 	}
-	
+
 	/**
 	 * 导入Excel数据
 	 */
@@ -134,7 +141,7 @@ public class WorkContentCtrlpriceController extends BaseController {
 		}
 		return responseEntity;
     }
-	
+
 	/**
 	 * 下载导入  清单及控制价编审数据模板
 	 */
@@ -148,7 +155,7 @@ public class WorkContentCtrlpriceController extends BaseController {
 		}
     	/*try {
             String fileName = "  清单及控制价编审数据导入模板.xlsx";
-    		List<WorkContentCtrlprice> list = Lists.newArrayList(); 
+    		List<WorkContentCtrlprice> list = Lists.newArrayList();
     		new ExportExcel("  清单及控制价编审数据", WorkContentCtrlprice.class, 1).setDataList(list).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {
@@ -169,4 +176,4 @@ public class WorkContentCtrlpriceController extends BaseController {
 	}
 
 
-}
+}

src/main/java/com/jeeplus/modules/workcontent/web/WorkContentInvestmentCostController.java

@@ -14,6 +14,7 @@ import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.workcontent.entity.WorkContentInvestmentCost;
+import com.jeeplus.modules.workcontent.entity.WorkFiveDirectionsAffirm;
 import com.jeeplus.modules.workcontent.service.WorkContentInvestmentCostService;
 import com.jeeplus.modules.workreceiptsregister.entity.ResponseEntity;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,9 +26,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 /**
  * 工程费用Controller
@@ -40,7 +39,7 @@ public class WorkContentInvestmentCostController extends BaseController {
 
 	@Autowired
 	private WorkContentInvestmentCostService workContentInvestmentCostService;
-	
+
 	@ModelAttribute
 	public WorkContentInvestmentCost get(@RequestParam(required=false) String id) {
 		WorkContentInvestmentCost entity = null;
@@ -52,7 +51,7 @@ public class WorkContentInvestmentCostController extends BaseController {
 		}
 		return entity;
 	}
-	
+
 	/**
 	 * 工程费用列表页面
 	 */
@@ -68,6 +67,14 @@ public class WorkContentInvestmentCostController extends BaseController {
         if(StringUtils.isNotBlank(workContentInvestmentCost.getContentId())){
             list = workContentInvestmentCostService.findList(workContentInvestmentCost);
         }
+
+		if(list.size()>0){
+			Set set = new HashSet<>();
+			for (WorkContentInvestmentCost info: list) {
+				set.add(info.getType());
+			}
+			signList = new ArrayList<>(set);
+		}
         model.addAttribute("signList", signList);
         model.addAttribute("investmentCostList", list);
         String viewPath = "modules/workcontent/workContentInvestmentCostList";
@@ -107,7 +114,7 @@ public class WorkContentInvestmentCostController extends BaseController {
 		}
 		return responseEntity;
     }
-	
+
 	/**
 	 * 下载导入工程费用数据模板
 	 */
@@ -121,7 +128,7 @@ public class WorkContentInvestmentCostController extends BaseController {
 		}
     	/*try {
             String fileName = "工程费用数据导入模板.xlsx";
-    		List<WorkContentInvestmentCost> list = Lists.newArrayList(); 
+    		List<WorkContentInvestmentCost> list = Lists.newArrayList();
     		new ExportExcel("工程费用数据", WorkContentInvestmentCost.class, 1).setDataList(list).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {
@@ -140,5 +147,5 @@ public class WorkContentInvestmentCostController extends BaseController {
 		List<String> tableType = workContentInvestmentCostService.getTableType(contentId);
 		return tableType;
 	}
-	
-}
+
+}

src/main/java/com/jeeplus/modules/workcontent/web/WorkFiveDirectionsAffirmController.java

@@ -29,10 +29,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * 甲供物资五方确认表Controller
@@ -45,7 +42,7 @@ public class WorkFiveDirectionsAffirmController extends BaseController {
 
 	@Autowired
 	private WorkFiveDirectionsAffirmService workFiveDirectionsAffirmService;
-	
+
 	@ModelAttribute
 	public WorkFiveDirectionsAffirm get(@RequestParam(required=false) String id) {
 		WorkFiveDirectionsAffirm entity = null;
@@ -57,7 +54,7 @@ public class WorkFiveDirectionsAffirmController extends BaseController {
 		}
 		return entity;
 	}
-	
+
 	/**
 	 * 工程费用列表页面
 	 */
@@ -73,6 +70,14 @@ public class WorkFiveDirectionsAffirmController extends BaseController {
         if(StringUtils.isNotBlank(workFiveDirectionsAffirm.getContentId())){
             list = workFiveDirectionsAffirmService.findList(workFiveDirectionsAffirm);
         }
+
+		if(list.size()>0){
+			Set set = new HashSet<>();
+			for (WorkFiveDirectionsAffirm info: list) {
+				set.add(info.getType());
+			}
+			signList = new ArrayList<>(set);
+		}
 		for ( WorkFiveDirectionsAffirm affirm:list) {
 			affirm.setRoadworkDemandDateStr(getNowDate(affirm.getRoadworkDemandDate()));
 		}
@@ -106,6 +111,14 @@ public class WorkFiveDirectionsAffirmController extends BaseController {
 		if(StringUtils.isNotBlank(workFiveDirectionsAffirm.getProjectId())){
 			list = workFiveDirectionsAffirmService.findListByProjectId(workFiveDirectionsAffirm);
 		}
+
+		if(list.size()>0){
+			Set set = new HashSet<>();
+			for (WorkFiveDirectionsAffirm info: list) {
+				set.add(info.getType());
+			}
+			signList = new ArrayList<>(set);
+		}
 		model.addAttribute("signList", signList);
 		model.addAttribute("fiveDirectionsAffirmList", list);
 		return "modules/workcontent/workProjectArmorListView";
@@ -164,7 +177,7 @@ public class WorkFiveDirectionsAffirmController extends BaseController {
 		}
 		return responseEntity;
     }
-	
+
 	/**
 	 * 下载导入设计概算编制审核调整数据模板
 	 */
@@ -186,5 +199,5 @@ public class WorkFiveDirectionsAffirmController extends BaseController {
 		}*/
 		return "redirect:"+Global.getAdminPath()+"/fiveDirectionsAffirm/workFiveDirectionsAffirmList/?repage";
     }
-	
-}
+
+}

src/main/java/com/jeeplus/modules/workcontent/web/WorkMaterialsPriceController.java

@@ -27,9 +27,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 /**
  * 工程费用Controller
@@ -42,7 +40,7 @@ public class WorkMaterialsPriceController extends BaseController {
 
 	@Autowired
 	private WorkMaterialsPriceService workMaterialsPriceService;
-	
+
 	@ModelAttribute
 	public WorkMaterialsPrice get(@RequestParam(required=false) String id) {
 		WorkMaterialsPrice entity = null;
@@ -54,7 +52,7 @@ public class WorkMaterialsPriceController extends BaseController {
 		}
 		return entity;
 	}
-	
+
 	/**
 	 * 工程费用列表页面
 	 */
@@ -69,6 +67,13 @@ public class WorkMaterialsPriceController extends BaseController {
         if(StringUtils.isNotBlank(workScheduleInfo.getContentId())){
             list = workMaterialsPriceService.findList(workScheduleInfo);
         }
+		if(list.size()>0){
+			Set set = new HashSet<>();
+			for (WorkMaterialsPrice info: list) {
+				set.add(info.getType());
+			}
+			signList = new ArrayList<>(set);
+		}
         model.addAttribute("signList", signList);
         model.addAttribute("workScheduleList", list);
         String viewPath = "modules/workcontent/workMaterialsPriceList";
@@ -100,6 +105,13 @@ public class WorkMaterialsPriceController extends BaseController {
 		if(StringUtils.isNotBlank(workMaterialsPrice.getProjectId())){
 			list = workMaterialsPriceService.findListByProjectId(workMaterialsPrice);
 		}
+		if(list.size()>0){
+			Set set = new HashSet<>();
+			for (WorkMaterialsPrice info: list) {
+				set.add(info.getType());
+			}
+			signList = new ArrayList<>(set);
+		}
 		model.addAttribute("signList", signList);
 		model.addAttribute("workScheduleList", list);
 		return "modules/workcontent/workProjectMaterialListView";
@@ -141,7 +153,7 @@ public class WorkMaterialsPriceController extends BaseController {
 		}
 		return responseEntity;
     }
-	
+
 	/**
 	 * 下载导入设计概算编制审核调整数据模板
 	 */
@@ -163,5 +175,5 @@ public class WorkMaterialsPriceController extends BaseController {
 		}*/
 		return "redirect:"+Global.getAdminPath()+"/workMaterialsPrice/workMaterialsPrice/?repage";
     }
-	
-}
+
+}

src/main/java/com/jeeplus/modules/workcontent/web/WorkPreliminaryDesignEstimateController.java

@@ -15,6 +15,7 @@ import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.workcontent.entity.WorkContentInvestmentCost;
 import com.jeeplus.modules.workcontent.entity.WorkPreliminaryDesignEstimate;
+import com.jeeplus.modules.workcontent.entity.WorkScheduleInfo;
 import com.jeeplus.modules.workcontent.service.WorkContentInvestmentCostService;
 import com.jeeplus.modules.workcontent.service.WorkPreliminaryDesignEstimateService;
 import com.jeeplus.modules.workreceiptsregister.entity.ResponseEntity;
@@ -28,9 +29,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 /**
  * 工程费用Controller
@@ -43,7 +42,7 @@ public class WorkPreliminaryDesignEstimateController extends BaseController {
 
 	@Autowired
 	private WorkPreliminaryDesignEstimateService workPreliminaryDesignEstimateService;
-	
+
 	@ModelAttribute
 	public WorkPreliminaryDesignEstimate get(@RequestParam(required=false) String id) {
 		WorkPreliminaryDesignEstimate entity = null;
@@ -55,7 +54,7 @@ public class WorkPreliminaryDesignEstimateController extends BaseController {
 		}
 		return entity;
 	}
-	
+
 	/**
 	 * 工程费用列表页面
 	 */
@@ -71,6 +70,13 @@ public class WorkPreliminaryDesignEstimateController extends BaseController {
         if(StringUtils.isNotBlank(workPreliminaryDesignEstimate.getContentId())){
             list = workPreliminaryDesignEstimateService.findList(workPreliminaryDesignEstimate);
         }
+		if(list.size()>0){
+			Set set = new HashSet<>();
+			for (WorkPreliminaryDesignEstimate info: list) {
+				set.add(info.getType());
+			}
+			signList = new ArrayList<>(set);
+		}
         model.addAttribute("signList", signList);
         model.addAttribute("preliminaryList", list);
         String viewPath = "modules/workcontent/workPreliminaryDesignEstimateList";
@@ -122,7 +128,7 @@ public class WorkPreliminaryDesignEstimateController extends BaseController {
 		}
 		return responseEntity;
     }
-	
+
 	/**
 	 * 下载导入设计概算编制审核调整数据模板
 	 */
@@ -144,5 +150,5 @@ public class WorkPreliminaryDesignEstimateController extends BaseController {
 		}*/
 		return "redirect:"+Global.getAdminPath()+"/workPreliminary/workPreliminaryDesignEstimate/?repage";
     }
-	
-}
+
+}

src/main/java/com/jeeplus/modules/workcontent/web/WorkScheduleController.java

@@ -12,12 +12,14 @@ import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.utils.DictUtils;
+import com.jeeplus.modules.workcontent.entity.WorkContentBranchAccount;
 import com.jeeplus.modules.workcontent.entity.WorkMaterialsPrice;
 import com.jeeplus.modules.workcontent.entity.WorkPreliminaryDesignEstimate;
 import com.jeeplus.modules.workcontent.entity.WorkScheduleInfo;
 import com.jeeplus.modules.workcontent.service.WorkPreliminaryDesignEstimateService;
 import com.jeeplus.modules.workcontent.service.WorkScheduleService;
 import com.jeeplus.modules.workreceiptsregister.entity.ResponseEntity;
+import org.jcodings.util.Hash;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -27,9 +29,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 /**
  * 工程费用Controller
@@ -69,6 +69,13 @@ public class WorkScheduleController extends BaseController {
         if(StringUtils.isNotBlank(workScheduleInfo.getContentId())){
             list = workScheduleService.findList(workScheduleInfo);
         }
+        if(list.size()>0){
+        	Set set = new HashSet<>();
+			for (WorkScheduleInfo info: list) {
+				set.add(info.getType());
+			}
+			signList = new ArrayList<>(set);
+		}
         model.addAttribute("signList", signList);
         model.addAttribute("workScheduleList", list);
         String viewPath = "modules/workcontent/workScheduleList";
@@ -100,6 +107,13 @@ public class WorkScheduleController extends BaseController {
 		if(StringUtils.isNotBlank(workScheduleInfo.getProjectId())){
 			list = workScheduleService.findListByProjectId(workScheduleInfo);
 		}
+		if(list.size()>0){
+			Set set = new HashSet<>();
+			for (WorkScheduleInfo info: list) {
+				set.add(info.getType());
+			}
+			signList = new ArrayList<>(set);
+		}
 		model.addAttribute("signList", signList);
 		model.addAttribute("workScheduleList", list);
 		String viewPath = "modules/workcontent/workProjectScheduleListView";

src/main/webapp/webpage/modules/projectrecord/check/checkClaimList.jsp

@@ -292,7 +292,7 @@
                             }else if(d.condition ==2){
                                 return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.contractId +"','95%', '95%')\">" + d.contractName + "</a>";
                             }else{
-                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=claim&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
+                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=claim&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"&reportId="+d.reportId+"','95%', '95%')\">" + d.contractName + "</a>";
                             }
                         }},
                     {field: 'reportName', align:'center', title: '成果文件名称',templet:function(d){
@@ -575,4 +575,4 @@
     }
 </script>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/projectrecord/check/checkDesignList.jsp

@@ -294,7 +294,7 @@
                             }else if(d.condition ==2){
                                 return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.contractId +"','95%', '95%')\">" + d.contractName + "</a>";
                             }else{
-                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=design&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
+                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=design&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"&reportId="+d.reportId+"','95%', '95%')\">" + d.contractName + "</a>";
                             }
                         }},
                     {field: 'reportName', align:'center', title: '成果文件名称',templet:function(d){
@@ -574,4 +574,4 @@
     }
 </script>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/projectrecord/check/checkDistributionSettlementList.jsp

@@ -292,7 +292,7 @@
                             }else if(d.condition ==2){
                                 return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.contractId +"','95%', '95%')\">" + d.contractName + "</a>";
                             }else{
-                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=distribution&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
+                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=distribution&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"&reportId="+d.reportId+"','95%', '95%')\">" + d.contractName + "</a>";
                             }
                         }},
                     {field: 'reportName', align:'center', title: '成果文件名称',templet:function(d){
@@ -573,4 +573,4 @@
     }
 </script>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/projectrecord/check/checkInterimPayment.jsp

@@ -331,7 +331,7 @@
 							}else if(d.condition ==2){
 								return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.contractId +"','95%', '95%')\">" + d.contractName + "</a>";
 							}else{
-								return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
+								return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"&reportId="+d.reportId+"','95%', '95%')\">" + d.contractName + "</a>";
 							}
 						}},
 					{field: 'reportName', align:'center', title: '成果文件名称',templet:function(d){
@@ -611,4 +611,4 @@
 	}
 </script>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/projectrecord/check/checkVisaList.jsp

@@ -294,7 +294,7 @@
                             }else if(d.condition ==2){
                                 return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.contractId +"','95%', '95%')\">" + d.contractName + "</a>";
                             }else{
-                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=visa&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
+                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=visa&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"&reportId="+d.reportId+"','95%', '95%')\">" + d.contractName + "</a>";
                             }
                         }},
                     {field: 'reportName', align:'center', title: '成果文件名称',templet:function(d){
@@ -575,4 +575,4 @@
     }
 </script>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/projectrecord/check/reportForm.jsp

@@ -968,13 +968,13 @@
 				</div>
 			</div>
 		</div>
-			<%--<div class="form-group layui-row">
+			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>内容详情</h2></div>
 				<div style="padding: 0 15px;">
 					<div id="contentDetail"></div>
 				</div>
-			</div>--%>
-			<div class="form-group layui-row first lw12">
+			</div>
+			<%--<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>项目信息</h2></div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">送审价(元)：</label>
@@ -1024,7 +1024,7 @@
 							<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input number"/>
 						</div>
 					</div>
-				</div>
+				</div>--%>
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>依据性资料明细</h2></div>
 				<%--<div class="layui-item nav-btns">

src/main/webapp/webpage/modules/projectrecord/implementCompletion/projectCompletionReviewList.jsp

@@ -305,7 +305,7 @@
                     	if(0 == d.pid){
 							return "<a class=\"attention-info pid\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/project/projectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projectName + "</a>";
 						}else{
-							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作内容', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=completion&dictType=&id="+d.contentPId+"&parentIds="+d.parentIds+"&infoId="+d.id+"','95%', '95%')\">" + d.projectName + "</a>";
+							return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作内容', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=completion&dictType=&id="+d.contentPId+"&parentIds="+d.parentIds+"&infoId="+d.id+"&reportId="+d.reportId+"','95%', '95%')\">" + d.projectName + "</a>";
 						}
 						}},
                     {field: 'reportName', align:'center', title: '成果文件名称',templet:function(d){
@@ -601,4 +601,4 @@
 	}
 </script>
 </body>
-</html>
+</html>