添加注释

src/main/java/com/jeeplus/modules/projectConstruction/dao/ContractDao.java

@@ -37,5 +37,10 @@ public interface ContractDao extends CrudDao<ConstructionContract> {
      */
     List<ConstructionContract> getConstructionContractList(ConstructionContract constructionContract);
 
+    /**
+     * 根据项目id查询项目信息
+     * @param projectId
+     * @return
+     */
     ProjectRecords getRecords(String projectId);
 }

src/main/java/com/jeeplus/modules/projectConstruction/service/ContractService.java

@@ -82,12 +82,19 @@ public class ContractService extends CrudService<ContractDao,ConstructionContrac
         page.setCount(count);
         page.setCountFlag(false);
         constructionContract.setPage(page);
+        //查询实施阶段合同集合
         List<ConstructionContract> list = findList(constructionContract);
         page.setList(list);
         return page;
     }
 
+    /**
+     * 获取施工合同信息
+     * @param constructionContract
+     * @return
+     */
     public List<ConstructionContract> getConstructionContractList(ConstructionContract constructionContract){
+        //获取合同信息
         List<ConstructionContract> list = dao.getConstructionContractList(constructionContract);
         return list;
     }
@@ -103,9 +110,11 @@ public class ContractService extends CrudService<ContractDao,ConstructionContrac
         Integer count = null;
         //判断是否为修改信息
         if (constructionContract.getIsNewRecord()){
+            //进行新增操作
             constructionContract.preInsert();
             count = dao.insert(constructionContract);
         }else{
+            //进行修改操作
             constructionContract.preUpdate();
             count = dao.update(constructionContract);
         }
@@ -123,13 +132,16 @@ public class ContractService extends CrudService<ContractDao,ConstructionContrac
                     workClientAttachment.setAttachmentFlag("134");
                     workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
                     if (StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())) {
+                        //新增操作
                         workClientAttachment.preInsert();
                         workClientAttachmentDao.insert(workClientAttachment);
                     } else {
+                        //修改操作
                         workClientAttachment.preUpdate();
                         workClientAttachmentDao.update(workClientAttachment);
                     }
                 } else {
+                    //删除操作
                     workClientAttachmentDao.delete(workClientAttachment);
                 }
             }
@@ -145,6 +157,7 @@ public class ContractService extends CrudService<ContractDao,ConstructionContrac
      */
     @Transactional(readOnly = true)
     public List<ConstructionContract> find(String id) {
+        //判断id是否为空 查询施工合同集合
         if(StringUtils.isNotEmpty(id)){
             return  contractDao.find(id);
         }else{
@@ -152,6 +165,11 @@ public class ContractService extends CrudService<ContractDao,ConstructionContrac
         }
     }
 
+    /**
+     * 根据项目id查询项目信息
+     * @param projectId
+     * @return
+     */
     public ProjectRecords getRecords(String projectId) {
         return contractDao.getRecords(projectId);
     }

src/main/java/com/jeeplus/modules/projectConstruction/web/ContractController.java

@@ -132,6 +132,7 @@ public class ContractController extends BaseController {
         if (UserUtils.isManager()) {
             model.addAttribute("flag", "1");
         }
+        //获取已审核的项目信息
         Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
         List<ProjectImplementEarly> list = page.getList();
@@ -148,6 +149,7 @@ public class ContractController extends BaseController {
         if (UserUtils.isManager()) {
             model.addAttribute("flag", "1");
         }
+        //获取已审核的项目信息
         Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
         List<ProjectImplementEarly> list = page.getList();
@@ -248,17 +250,26 @@ public class ContractController extends BaseController {
      */
     @RequestMapping(value = "form")
     public String form(ConstructionContract constructionContract, Model model) {
+        //判断是否是新增 还是修改
         if (constructionContract != null && StringUtils.isNotBlank(constructionContract.getId())) {
+            //修改
+            //获取实施阶段合同信息
             constructionContract = contractService.get(constructionContract.getId());
+            //获取项目信息
             ProjectRecords projectRecords = projectRecordsService.get(constructionContract.getProjectId());
+            //填入项目名称
             constructionContract.setProjectName(projectRecords.getProjectName());
 
+            //获取附件信息  并放入实施阶段合同信息中
             WorkClientAttachment attchment = new WorkClientAttachment();
             attchment.setAttachmentId(constructionContract.getId());
             List<WorkClientAttachment> attachments = workClientAttachmentDao.findList(attchment);
             constructionContract.setWorkAttachments(attachments);
         } else {
+            //新增
+            //获取项目信息
             ProjectRecords records = contractService.getRecords(constructionContract.getProjectId());
+            //填入创建人信息、创建时间、项目名称等
             constructionContract.setCreateBy(UserUtils.getUser());
             constructionContract.setCreateDate(new Date());
             constructionContract.setProjectName(records.getProjectName());
@@ -278,10 +289,13 @@ public class ContractController extends BaseController {
     /*@RequiresPermissions(value={"project:constructionContract:view"})*/
     @RequestMapping(value = "view")
     public String view(ConstructionContract constructionContract, Model model) {
+        //获取实施阶段合同信息
         constructionContract = contractService.get(constructionContract.getId());
+        //获取项目信息
         ProjectRecords projectRecords = projectRecordsService.get(constructionContract.getProjectId());
+        //填入项目名称
         constructionContract.setProjectName(projectRecords.getProjectName());
-
+        //获取附件信息
         WorkClientAttachment attchment = new WorkClientAttachment();
         attchment.setAttachmentId(constructionContract.getId());
         List<WorkClientAttachment> attachments = workClientAttachmentDao.findList(attchment);
@@ -296,14 +310,24 @@ public class ContractController extends BaseController {
     /*@RequiresPermissions(value={"project:constructionContract:add","project:constructionContract:edit"})*/
     @RequestMapping(value = "save")
     public String save(ConstructionContract constructionContract, Model model, RedirectAttributes redirectAttributes) {
+        //String转double处理
         constructionContract.setTrueAmt(shiftDouble(constructionContract.getTrueAmtStr()));
+        //String转double处理
         constructionContract.setPayAmt(shiftDouble(constructionContract.getPayAmtStr()));
+        //String转double处理
         constructionContract.setTitularAmt(shiftDouble(constructionContract.getTitularAmtStr()));
+        //String转double处理
         constructionContract.setStopAmt(shiftDouble(constructionContract.getStopAmtStr()));
+        //新增操作
         contractService.insertContract(constructionContract);
         return "redirect:" + Global.getAdminPath() + "/project/constructionContract/?repage";
     }
 
+    /**
+     * String转double处理
+     * @param moneyStr
+     * @return
+     */
     private static Double shiftDouble(String moneyStr) {
         if (StringUtils.isNotBlank(moneyStr)) {
             moneyStr = moneyStr.replaceAll(",", "");
@@ -342,6 +366,7 @@ public class ContractController extends BaseController {
     public Map<String, Object> delete(ConstructionContract constructionContract, RedirectAttributes redirectAttributes) {
         Map<String, Object> j = new HashMap<>();
         try {
+            //删除操作
             contractService.delete(constructionContract);
             j.put("status", true);
             j.put("msg", "删除成功");
@@ -364,6 +389,7 @@ public class ContractController extends BaseController {
         if (UserUtils.isManager()) {
             model.addAttribute("flag", "1");
         }
+        //获取审核通过项目信息
         Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
         List<ProjectImplementEarly> list = page.getList();
@@ -378,7 +404,7 @@ public class ContractController extends BaseController {
     @RequestMapping(value = "getProjectFollowList")
     @ResponseBody
     public Map<String, List> getProjectFollowList(ProjectFollowReport projectFollowReport, HttpServletRequest request, HttpServletResponse response, Model model, ProjectImplementEarly projectRecords) {
-        //查询所有项目信息
+        //查询审核通过的所有项目信息
         Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
         List<ProjectImplementEarly> list = page.getList();
@@ -480,9 +506,20 @@ public class ContractController extends BaseController {
         return map;
     }
 
+    /**
+     * 跳转新增页
+     * @param projectFollowReport
+     * @param request
+     * @param response
+     * @param model
+     * @param attr
+     * @return
+     */
     @RequestMapping(value = "followForm")
     public String followForm(ProjectFollowReport projectFollowReport, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
+        //获取id
         String id = projectFollowReport.getId();
+        //获取项目信息
         ProjectRecords records = projectRecordsService.getQueryProjectUsers(projectFollowReport.getProject().getId());
         if (null != id && !"".equals(id)) {
             //通过id获取跟踪咨询报告信息
@@ -518,21 +555,39 @@ public class ContractController extends BaseController {
         return "modules/projectrecord/workContentFromAndView/workFollowForm";
     }
 
+    /**
+     * 新增操作
+     * @param projectFollowReport
+     * @param model
+     * @param redirectAttributes
+     * @return
+     * @throws Exception
+     */
     @RequestMapping(value = "saveFollow")
     public String saveFollow(ProjectFollowReport projectFollowReport, Model model, RedirectAttributes redirectAttributes) throws Exception {
+        //查询项目信息
         ProjectRecords records = projectRecordsService.getQueryProjectUsers(projectFollowReport.getProject().getId());
+        //将项目信息放入跟踪咨询报告中
         projectFollowReport.setProject(records);
+        //判断咨询报告id是否为空
         if (null != projectFollowReport.getId() && !"".equals(projectFollowReport.getId())) {
+            //修改
+            //获取跟踪咨询报告信息
             ProjectFollowReport followReport = projectImplementEarlyService.getFollow(projectFollowReport);
+            //添加流程id
             projectFollowReport.setProcessInstanceId(followReport.getProcessInstanceId());
+            //添加创建人等信息
             projectFollowReport.setCreateBy(followReport.getCreateBy());
             projectFollowReport.setCreateDate(followReport.getCreateDate());
             projectFollowReport.setUpdateBy(followReport.getUpdateBy());
             projectFollowReport.setUpdateDate(followReport.getUpdateDate());
             projectFollowReport.setStatus(followReport.getStatus());
+            //添加项目信息
             projectFollowReport.setProject(records);
+            //进行修改操作
             projectImplementEarlyService.updateFollow(projectFollowReport);
         } else {
+            //进行新增操作
             projectImplementEarlyService.insertFollow(projectFollowReport);
         }
         return "redirect:" + Global.getAdminPath() + "/project/constructionContract/projectFollow";
@@ -547,7 +602,9 @@ public class ContractController extends BaseController {
     @RequestMapping("saveAudit")
     public String saveAudit(ProjectFollowReport projectFollowReport, Model model,
                             RedirectAttributes redirectAttributes) throws Exception {
+        //获取项目信息
         ProjectRecords records = projectRecordsService.getQueryProjectUsers(projectFollowReport.getProject().getId());
+        //获取跟踪咨询报告信息
         ProjectFollowReport followReport = projectImplementEarlyService.getFollow(projectFollowReport);
         projectFollowReport.setProcessInstanceId(followReport.getProcessInstanceId());
         projectFollowReport.setCreateBy(followReport.getCreateBy());
@@ -568,6 +625,7 @@ public class ContractController extends BaseController {
             if ("yes".equals(flag) && (users==null || users.size()==0)){
                 addMessage(redirectAttributes, "审批失败,审批人为空,请联系管理员！");
             }else {
+                //进行审核操作
                 String str = projectImplementEarlyService.auditSave(projectFollowReport,users);
                 addMessage(redirectAttributes, str);
             }
@@ -587,11 +645,16 @@ public class ContractController extends BaseController {
      */
     @RequestMapping(value = "modify")
     public String modify(ProjectFollowReport projectFollowReport, Model model,RedirectAttributes redirectAttributes) {
+        //获取跟踪咨询报告信息
         projectFollowReport = projectImplementEarlyService.getFollow(projectFollowReport);
+        //获取项目信息
         ProjectRecords records = projectRecordsService.getQueryProjectUsers(projectFollowReport.getProjectId());
+        //项目信息添加到跟踪咨询报告信息中
         projectFollowReport.setProject(records);
+        //查询工作流信息
         ProcessInstance processInstance = actTaskService.getProcIns(projectFollowReport.getProcessInstanceId());
         if (processInstance!=null) {
+            //获取当前节点信息
             Task taskInfok = actTaskService.getCurrentTaskInfo(processInstance);
             Act act = new Act();
             act.setTaskId(taskInfok.getId());
@@ -608,7 +671,13 @@ public class ContractController extends BaseController {
     }
 
 
-
+    /**
+     * 获取跟踪咨询报告信息
+     * @param projectFollowReport
+     * @param model
+     * @param request
+     * @return
+     */
     @RequestMapping(value = "getProcess")
     public String getProcess(ProjectFollowReport projectFollowReport, Model model,HttpServletRequest request){
         projectFollowReport = projectImplementEarlyService.getFollow(projectFollowReport);
@@ -616,17 +685,25 @@ public class ContractController extends BaseController {
         return "modules/projectrecord/projectRecordsTask";
     }
 
+    /**
+     * 撤回操作
+     * @param request
+     * @param redirectAttributes
+     * @return
+     * @throws Exception
+     */
     @RequestMapping(value = "revoke")
     public String revoke(HttpServletRequest request, RedirectAttributes redirectAttributes) throws Exception {
         HashMap<String, String> requestMap = findRequestMap(request);
-        String processInstanceId = requestMap.get("processInstanceId");
         String id = requestMap.get("id");
         /*try {*/
+            //获取跟踪咨询报告信息
             ProjectFollowReport projectFollowReport = projectImplementEarlyService.getFollowById(id);
             if(5==projectFollowReport.getStatus()){
                 addMessage(redirectAttributes, "跟踪咨询报告已审批通过，无法撤回");
                 return "redirect:" + Global.getAdminPath() + "/project/constructionContract/projectFollow";
             }
+            //撤回操作
             projectImplementEarlyService.cancelProcess(projectFollowReport);
             addMessage(redirectAttributes, "撤回跟踪咨询报告成功");
         /*}catch (Exception e){
@@ -645,6 +722,7 @@ public class ContractController extends BaseController {
     public Map<String, Object> deleteFollow(ProjectFollowReport projectFollowReport, RedirectAttributes redirectAttributes) {
         Map<String, Object> j = new HashMap<>();
         try {
+            //删除操作
             projectImplementEarlyService.deleteFollow(projectFollowReport);
             j.put("status", true);
             j.put("msg", "删除成功");

src/main/java/com/jeeplus/modules/projectType/service/ProjectResultsFileTemplateService.java

@@ -137,10 +137,14 @@ public class ProjectResultsFileTemplateService  extends CrudService<ProjectResul
         return dao.getProjectTypeByTypeIdList(typeId);
     }
 
-
+    /**
+     * 根据父节点查询对应的附件信息
+     * @param typeId
+     * @return
+     */
     @Transactional(readOnly = false)
     public List<WorkClientAttachment> getWorkClientAttachmentList(String typeId) {
-
+        //根据父节点查询对应的附件信息
         return dao.getWorkClientAttachmentList(typeId);
     }
 

src/main/java/com/jeeplus/modules/projectType/service/ProjectTypeService.java

@@ -43,10 +43,16 @@ public class ProjectTypeService extends CrudService<ProjectTypeDao, ProjectType>
         return list;
     }
 
+    /**
+     * 根据名称查询集合信息
+     * @param typeName
+     * @return
+     */
     @Transactional(readOnly = false)
     public List<ProjectReportTreeData> getProjectTypeList(String typeName) {
         ProjectType projectType = new ProjectType();
         projectType.setTypeName(typeName);
+        //查询集合
         List<ProjectReportTreeData> list = dao.getProjectTypeList(projectType);
         return list;
     }
@@ -61,6 +67,7 @@ public class ProjectTypeService extends CrudService<ProjectTypeDao, ProjectType>
 
     @Transactional(readOnly = false)
     public void save(ProjectType projectType) {
+        //判断有没有父级节点信息
         if(StringUtils.isBlank(projectType.getParentId())){
             //获取该父类id为0的（parent_id=0）的该类型的(type_id)的类型id
             String newIdStr = dao.getNewParentId();
@@ -68,14 +75,19 @@ public class ProjectTypeService extends CrudService<ProjectTypeDao, ProjectType>
             if(StringUtils.isNotBlank(newIdStr)){
                 newIdInt = Integer.valueOf(newIdStr)+1;
             }
+            //对数据进行基础数据添加
             projectType.preInsert();
             projectType.setId(newIdInt.toString());
             projectType.setParentId("0");
             projectType.setParentIds("0");
+            //保存数据
             dao.insert(projectType);
+            //将type_id修改为id一样的数据
             dao.updateTypeId(projectType);
         }else{
+            //如果没有父级节点信息 则新增当前父级节点信息
             projectType.setParentIds("0,"+projectType.getParentId());
+            //判断是不是已存数据进行修改
             if(StringUtils.isNotBlank(projectType.getId())){
                 projectType.preUpdate();
                 dao.update(projectType);
@@ -83,14 +95,14 @@ public class ProjectTypeService extends CrudService<ProjectTypeDao, ProjectType>
                 projectType.preInsert();
                 //查询已知该父节点下的数据的最大值的typeId并递增1
                 String typeId = dao.getNewTypeId(projectType.getParentId());
-               /* //根据该父类的id获取该父类的类型，插入到该对像的父类parentId中
-                String parentTypeId=dao.getParentTypeId(projectType.getParentId());
-                projectType.setParentId(parentTypeId);*/
+                //判断typeId是否为空 若为空则将数据中的父级节点后面添加1
+                //不为空则直接添加进入
                 if(StringUtils.isBlank(typeId)){
                     projectType.setTypeId(projectType.getParentId()+"1");
                 }else{
                     projectType.setTypeId(typeId);
                 }
+                //判断TypeId是否为空，如果不为空 将id更改为typeId相同的数据，用于后期调用
                 if(StringUtils.isNotBlank(projectType.getTypeId())){
                     projectType.setId(projectType.getTypeId());
                     ProjectTemplateType templateProjectType = new ProjectTemplateType();
@@ -107,6 +119,7 @@ public class ProjectTypeService extends CrudService<ProjectTypeDao, ProjectType>
                         Integer parentTier = templateDao.getTierByParentId(templateProjectType.getParentId());
                         templateProjectType.setTier(parentTier+1);
                     }
+                    //判断数据的节点是不是在4级以下  如果是 则将成果文件模板进行新增操作
                     if(templateProjectType.getTier() <4){
                         templateDao.insert(templateProjectType);
                     }
@@ -119,6 +132,7 @@ public class ProjectTypeService extends CrudService<ProjectTypeDao, ProjectType>
 
     @Transactional(readOnly = false)
     public Integer deleteProjectTypeById(ProjectType projectType) {
+        //根据id进行删除操作
         Integer result = dao.deleteProjectTypeById(projectType.getId());
         return result;
     }
@@ -141,6 +155,11 @@ public class ProjectTypeService extends CrudService<ProjectTypeDao, ProjectType>
         return projectTypeDao.getDataByTypeId(typeId);
     }
 
+    /**
+     * 查询依据性文件信息
+     * @param typeId
+     * @return
+     */
     public List<ProjectBasedData> getAccrdingDataList(String typeId){
         return dao.getAccrdingDataList(typeId);
     }

src/main/java/com/jeeplus/modules/projectType/web/ProjectAccordingTypeController.java

@@ -83,14 +83,16 @@ public class ProjectAccordingTypeController extends BaseController {
 	@RequestMapping(value = "form")
 	public String form(ProjectType projectType, Model model) {
 		if(StringUtils.isNotBlank(projectType.getView())){
+			//判断是否为查询
 			if("view".equals(projectType.getView())){
+				//判断是否为必填标识
 				if("1".equals(projectType.getChooseCondition())){
 					projectType.setChooseCondition("是");
 				}else{
 					projectType.setChooseCondition("否");
 				}
 				return "modules/project/type/accrding/projectAccrdingTypeView";
-			}else if("saveSubordinateInfo".equals(projectType.getView())){
+			}else if("saveSubordinateInfo".equals(projectType.getView())){//如果是新增修改标签 则添加基本参数
 				projectType.setParentName(projectType.getTypeName());
 				projectType.setParentId(projectType.getId());
 				projectType.setTypeName("");
@@ -139,6 +141,7 @@ public class ProjectAccordingTypeController extends BaseController {
 			map.put("msg","数据错误");
 			return map;
 		}
+		//添加第四级节点信息
 		projectType.setTier(4);
 		if(!projectType.getIsNewRecord()){//编辑表单保存
 			ProjectType t = projectTypeService.get(projectType.getId());//从数据库取出记录的值

src/main/java/com/jeeplus/modules/projectType/web/ProjectTypeController.java

@@ -59,6 +59,7 @@ public class ProjectTypeController extends BaseController {
 
 	/**
 	 * 工作内容类型列表页面
+	 * 跳转页面
 	 */
 	@RequiresPermissions("project:projectType:list")
 	@RequestMapping(value = {"list", ""})
@@ -94,6 +95,8 @@ public class ProjectTypeController extends BaseController {
 	@RequestMapping(value = "form")
 	public String form(ProjectType projectType, Model model) {
 		if(StringUtils.isNotBlank(projectType.getView())){
+			//如果是查看跳转查看页面
+			//如果是保存 添加基本数据
 			if("view".equals(projectType.getView())){
 				return "modules/project/type/projectTypeView";
 			}else if("saveSubordinateInfo".equals(projectType.getView())){
@@ -168,6 +171,7 @@ public class ProjectTypeController extends BaseController {
 	@ResponseBody
 	public Map<String,Object> delete(ProjectType projectType, RedirectAttributes redirectAttributes) {
 		Map<String,Object> map = new HashMap<>();
+		//删除操作
 		Integer result = projectTypeService.deleteProjectTypeById(projectType);
 		if (result ==1){
 			addMessage(redirectAttributes, "删除工作内容类型成功");
@@ -198,6 +202,7 @@ public class ProjectTypeController extends BaseController {
 	@ResponseBody
 	public Map<String,Object> getHintContent(ProjectType projectType) {
 		Map<String,Object> map = new HashMap<>();
+		//获取信息
 		ProjectType projectTypeInfo = projectTypeService.get(projectType.getId());
 		map.put("code",1);
 		if(StringUtils.isNotBlank(projectTypeInfo.getHintContent())){

src/main/java/com/jeeplus/modules/projectVisa/dao/ProjectVisaDao.java

@@ -25,6 +25,11 @@ public interface ProjectVisaDao extends CrudDao<ProjectVisa> {
 
     List<ProjectVisa> getDesignList(String id);
 
+    /**
+     * 根据id查询获取表格对象
+     * @param projectVisa
+     * @return
+     */
     ProjectVisa getDesign(ProjectVisa projectVisa);
 
 

src/main/java/com/jeeplus/modules/projectVisa/service/ProjectVisaService.java

@@ -61,6 +61,7 @@ public class ProjectVisaService extends CrudService<ProjectVisaDao,ProjectVisa>
      */
     @Transactional(readOnly = true)
     public List<ProjectContentData> getVisaList(String id,String type) {
+        //根据条件查询签证信息
         List<ProjectContentData> projectVisaList=projectVisaDao.getVisaList(id,type);
         return projectVisaList;
     }
@@ -71,24 +72,41 @@ public class ProjectVisaService extends CrudService<ProjectVisaDao,ProjectVisa>
      */
     @Transactional(readOnly = true)
     public List<ProjectVisa> getDesignList(String id) {
+        //根据id获取设计变更的信息
         List<ProjectVisa> projectVisaList=projectVisaDao.getDesignList(id);
         return projectVisaList;
     }
 
-
+    /**
+     * 查询集合
+     * @param projectVisa
+     * @return
+     */
     public List<ProjectVisa> findList(ProjectVisa projectVisa) {
         return super.findList(projectVisa);
     }
 
 
+    /**
+     * 根据项目id 查询集合
+     * @param projectVisa
+     * @return
+     */
     public List<ProjectVisa> findListByProjectId(ProjectVisa projectVisa) {
         return dao.findListByProjectId(projectVisa);
     }
 
 
-
+    /**
+     * 获取签证基本信息
+     * @param id
+     * @return
+     */
     public ProjectContentData getProjectContentData(String id) {
+        //根据id获取获取签证基本信息
         ProjectContentData projectContentData = dao.getContractVisaInfo(id);
+        //判断获取签证基本信息是否为空
+        // 不为空则查询对应的附件信息并添加
         if(projectContentData!=null){
             Workattachment workattachment = new Workattachment();
             workattachment.setAttachmentId(id);
@@ -120,10 +138,13 @@ public class ProjectVisaService extends CrudService<ProjectVisaDao,ProjectVisa>
         projectContentData.setCompanyId(contentinfo.getCompanyId());
         projectContentData.setOfficeId(contentinfo.getOfficeId());
         projectContentData.setContractId(concealProjectInfo.getContract().getId());
+        //判断是否是修改
         if(com.jeeplus.common.utils.StringUtils.isNotBlank(projectContentData.getId())){
+            //调用修改方法
             projectContentData.preUpdate();
             dao.upodateContractVisaInfo(projectContentData);
         }else{
+            //调用新增方法
             projectContentData.preInsert();
             dao.saveContractVisaInfo(projectContentData);
         }
@@ -158,13 +179,16 @@ public class ProjectVisaService extends CrudService<ProjectVisaDao,ProjectVisa>
                     workClientAttachment.setAttachmentFlag("136");
                     workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
                     if (com.jeeplus.common.utils.StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())) {
+                        //新增
                         workClientAttachment.preInsert();
                         workClientAttachmentDao.insert(workClientAttachment);
                     } else {
+                        //修改
                         workClientAttachment.preUpdate();
                         workClientAttachmentDao.update(workClientAttachment);
                     }
                 } else {
+                    //删除
                     workClientAttachmentDao.delete(workClientAttachment);
                 }
             }
@@ -183,11 +207,17 @@ public class ProjectVisaService extends CrudService<ProjectVisaDao,ProjectVisa>
         ProjectVisa projectVisa=new ProjectVisa();
         projectVisa.setType(type);
         projectVisa.setId(id);
+        //调用删除方法
         projectVisaDao.deleteByLogic(projectVisa);
 
     }
 
 
+    /**
+     * 根据id查询获取表格对象
+     * @param projectVisa
+     * @return
+     */
     @Transactional(readOnly = true)
     public ProjectVisa getDesign(ProjectVisa projectVisa) {
         return projectVisaDao.getDesign(projectVisa);

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

@@ -72,7 +72,12 @@ public class ProjectClaimController extends BaseController {
     }
 
     /**
-     * 签证汇总表列表页面
+     * 索赔管理跳转
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequiresPermissions("project:projectClaim:list")
     @RequestMapping(value = {"list", ""})
@@ -80,12 +85,20 @@ public class ProjectClaimController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //查询施工合同列表信息
         Page<ConstructionContract> page = contractService.findPage(new Page<ConstructionContract>(request, response), constructionContract);
         model.addAttribute("page", page);
         return "modules/projectrecord/claim/projectClaimList";
     }
 
-    //获取树状图
+    /**
+     * 获取索赔管理树状图信息
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "getVisaList")
     @ResponseBody
     public Map<String,List> getTreeList(ConstructionContract constructionContract, HttpServletRequest request, HttpServletResponse response, Model model){
@@ -220,18 +233,26 @@ public class ProjectClaimController extends BaseController {
         return map;
     }
 
-    //添加签证汇总页面
+    /**
+     * 添加索赔管理页面
+     * @param concealProjectInfo
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "form")
     public String form(ConcealProjectInfo concealProjectInfo, Model model) {
 
         ProjectContentData projectContentData = new ProjectContentData();
         projectContentData.setType("");
+        //判断infoid是否为空来获取对应的工作内容详情信息
         if (StringUtils.isNotBlank(concealProjectInfo.getInfoId())){
             projectContentData = projectVisaService.getProjectContentData(concealProjectInfo.getInfoId());
         }else if (concealProjectInfo.getProjectContentData()!=null && StringUtils.isNotBlank(concealProjectInfo.getProjectContentData().getId())) {
             projectContentData = projectVisaService.getProjectContentData(concealProjectInfo.getProjectContentData().getId());
         }
+        //添加负责人信息
         projectContentData.setMaster(UserUtils.getUser());
+        //获取过程控制表信息
         if(StringUtils.isNotBlank(projectContentData.getId())){
             List<ProjectControlTable> controlData = projectControlTableService.getControlData(projectContentData.getId(),"");
             projectContentData.setProjectControlTableList(controlData);
@@ -244,6 +265,7 @@ public class ProjectClaimController extends BaseController {
         concealProjectInfo.setCondition("claim");
         concealProjectInfo.setProjectContentData(projectContentData);
         model.addAttribute("concealProjectInfo", concealProjectInfo);
+        //判断是否为查看页面 是则跳转查看页面
         if("view".equals(concealProjectInfo.getView())){
             return "modules/projectrecord/claim/projectClaimView";
         }
@@ -255,18 +277,22 @@ public class ProjectClaimController extends BaseController {
      */
     @RequestMapping(value = {"visaList"})
     public String visaList(ProjectVisa projectVisa, String view, HttpServletRequest request, Model model) {
+        //获取前端返回的sign结果
         String sign = request.getParameter("sign");
         List<String> signList = new ArrayList();
         if (StringUtils.isNotBlank(sign)){
+            //根据，进行分割
             signList = Arrays.asList(sign.split(","));
         }
         List<ProjectVisa> list = new ArrayList<>();
+        //判断projectId是否为空 获取签证信息集合
         if(StringUtils.isNotBlank(projectVisa.getContentId())){
             list = projectVisaService.findList(projectVisa);
         }
         if(null != list){
             for (ProjectVisa visa: list) {
                 if(null != visa.getDate()){
+                    //签证时间转换
                     visa.setDateStr(StringUtils.getDateStr(visa.getDate()));
                 }
             }
@@ -274,6 +300,7 @@ public class ProjectClaimController extends BaseController {
         model.addAttribute("signList", signList);
         model.addAttribute("investmentCostList", list);
         String viewPath = "modules/workcontent/workClaimList";
+        //判断是否为查看方法，是则跳转查看页面
         if("view".equals(view)){
             viewPath+="View";
         }
@@ -291,19 +318,23 @@ public class ProjectClaimController extends BaseController {
      */
     @RequestMapping(value = {"listByProjectId"})
     public String listByProjectId(ProjectVisa projectVisa, String view, HttpServletRequest request, Model model) {
+        //获取前端返回的sign结果
         String sign = request.getParameter("sign");
         List<String> signList = new ArrayList();
+        //根据，进行分割
         if (StringUtils.isNotBlank(sign)){
             signList = Arrays.asList(sign.split(","));
         }
         projectVisa.setType("3");
         List<ProjectVisa> list = new ArrayList<>();
+        //判断projectId是否为空 获取签证信息集合
         if(StringUtils.isNotBlank(projectVisa.getProjectId())){
             list = projectVisaService.findListByProjectId(projectVisa);
         }
         if(null != list){
             for (ProjectVisa visa: list) {
                 if(null != visa.getDate()){
+                    //签证时间转换
                     visa.setDateStr(StringUtils.getDateStr(visa.getDate()));
                 }
             }
@@ -319,7 +350,7 @@ public class ProjectClaimController extends BaseController {
      */
     @RequestMapping(value = "save")
     public String save(ConcealProjectInfo concealProjectInfo, RedirectAttributes redirectAttributes) throws Exception {
-
+        //保存索赔信息
         String str = projectVisaService.saveData(concealProjectInfo);
         addMessage(redirectAttributes, "保存索赔信息"+(str.equals("true")?"成功":"失败"));
         return "redirect:"+Global.getAdminPath()+"/project/projectClaim/?repage";
@@ -336,6 +367,7 @@ public class ProjectClaimController extends BaseController {
     public Map<String,Object> delete(ProjectVisa projectVisa, RedirectAttributes redirectAttributes) {
         Map<String,Object> j= new HashMap<>();
         try {
+            //获取索赔信息
             projectVisaService.deleteByLogic(projectVisa.getId(),projectVisa.getType());
             j.put("status",true);
             j.put("msg","删除成功");
@@ -360,6 +392,7 @@ public class ProjectClaimController extends BaseController {
             List<ProjectVisa> list = ei.getDataList(ProjectVisa.class);
             List<ProjectVisa> listAll = new ArrayList<>();
             for (ProjectVisa ctrlprice : list) {
+                //判断 将没数据得行删除
                 if(StringUtils.isNotBlank(ctrlprice.getNumber()) && StringUtils.isNotBlank(ctrlprice.getDateStr()) && null != ctrlprice.getSendMoney() && null != ctrlprice.getConfirmMoney()){
                     listAll.add(ctrlprice);
                 }

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

@@ -77,7 +77,12 @@ public class ProjectDesignController extends BaseController {
     }
 
     /**
-     * 签证汇总表列表页面
+     * 跳转设计变更汇总页面
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequiresPermissions("project:projectDesignChange:list")
     @RequestMapping(value = {"list", ""})
@@ -85,23 +90,32 @@ public class ProjectDesignController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //查询施工合同列表信息
         Page<ConstructionContract> page = contractService.findPage(new Page<ConstructionContract>(request, response), constructionContract);
         model.addAttribute("page", page);
         return "modules/projectrecord/implementStage/projectDesignList";
     }
 
-    //添加签证汇总页面
+    /**
+     * 添加设计变更汇总页面
+     * @param concealProjectInfo
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "form")
     public String form(ConcealProjectInfo concealProjectInfo, Model model) {
 
         ProjectContentData projectContentData = new ProjectContentData();
         projectContentData.setType("");
+        //判断infoid是否为空来获取对应的工作内容详情信息
         if (StringUtils.isNotBlank(concealProjectInfo.getInfoId())){
             projectContentData = projectVisaService.getProjectContentData(concealProjectInfo.getInfoId());
         }else if (concealProjectInfo.getProjectContentData()!=null && StringUtils.isNotBlank(concealProjectInfo.getProjectContentData().getId())) {
             projectContentData = projectVisaService.getProjectContentData(concealProjectInfo.getProjectContentData().getId());
         }
+        //添加负责人信息
         projectContentData.setMaster(UserUtils.getUser());
+        //获取过程控制表信息
         if(StringUtils.isNotBlank(projectContentData.getId())){
             List<ProjectControlTable> controlData = projectControlTableService.getControlData(projectContentData.getId(),"");
             projectContentData.setProjectControlTableList(controlData);
@@ -113,6 +127,7 @@ public class ProjectDesignController extends BaseController {
         concealProjectInfo.setCondition("design");
         concealProjectInfo.setProjectContentData(projectContentData);
         model.addAttribute("concealProjectInfo", concealProjectInfo);
+        //判断是否为查看页面 是则跳转查看页面
         if("view".equals(concealProjectInfo.getView())){
             return "modules/projectrecord/design/projectDesignView";
         }
@@ -124,11 +139,14 @@ public class ProjectDesignController extends BaseController {
      */
     @RequestMapping(value = {"visaList"})
     public String visaList(ProjectVisa projectVisa, String view, HttpServletRequest request, Model model) {
+        //获取前端返回的sign结果
         String sign = request.getParameter("sign");
         List<String> signList = new ArrayList();
         if (StringUtils.isNotBlank(sign)){
+            //根据，进行分割
             signList = Arrays.asList(sign.split(","));
         }
+        //判断projectId是否为空 获取签证信息集合
         List<ProjectVisa> list = new ArrayList<>();
         if(StringUtils.isNotBlank(projectVisa.getContentId())){
             list = projectVisaService.findList(projectVisa);
@@ -136,6 +154,7 @@ public class ProjectDesignController extends BaseController {
         if(null != list){
             for (ProjectVisa visa: list) {
                 if(null != visa.getDate()){
+                    //签证时间转换
                     visa.setDateStr(StringUtils.getDateStr(visa.getDate()));
                 }
             }
@@ -143,6 +162,7 @@ public class ProjectDesignController extends BaseController {
         model.addAttribute("signList", signList);
         model.addAttribute("investmentCostList", list);
         String viewPath = "modules/workcontent/workDesignChangeList";
+        //判断是否为查看方法，若是则跳转View页面
         if("view".equals(view)){
             viewPath+="View";
         }
@@ -160,19 +180,23 @@ public class ProjectDesignController extends BaseController {
      */
     @RequestMapping(value = {"listByProjectId"})
     public String listByProjectId(ProjectVisa projectVisa, String view, HttpServletRequest request, Model model) {
+        //获取前端返回的sign结果
         String sign = request.getParameter("sign");
         List<String> signList = new ArrayList();
         if (StringUtils.isNotBlank(sign)){
+            //根据，进行分割
             signList = Arrays.asList(sign.split(","));
         }
         projectVisa.setType("2");
         List<ProjectVisa> list = new ArrayList<>();
+        //判断projectId是否为空 获取签证信息集合
         if(StringUtils.isNotBlank(projectVisa.getProjectId())){
             list = projectVisaService.findListByProjectId(projectVisa);
         }
         if(null != list){
             for (ProjectVisa visa: list) {
                 if(null != visa.getDate()){
+                    //签证时间转换
                     visa.setDateStr(StringUtils.getDateStr(visa.getDate()));
                 }
             }
@@ -186,11 +210,12 @@ public class ProjectDesignController extends BaseController {
     //编辑签证汇总页面
     @RequestMapping(value = "updateTable")
     public String updateTable(ProjectVisa projectVisa, Model model) {
-
+        //判断id是否为空 获取基本信息
         if(StringUtils.isNotEmpty(projectVisa.getId())){
             ProjectVisa visa=projectVisaService.getDesign(projectVisa);
             WorkClientAttachment attchment = new WorkClientAttachment();
             attchment.setAttachmentId(projectVisa.getId());
+            //获取附件信息
             List<WorkClientAttachment> attachments = workClientAttachmentDao.findList(attchment);
             visa.setWorkAttachments(attachments);
             model.addAttribute("projectVisa", visa);
@@ -205,11 +230,13 @@ public class ProjectDesignController extends BaseController {
     @RequestMapping(value = "view")
     public String view(ProjectVisa projectVisa, Model model) {
 
+        //判断id是否为空 获取基本信息
         if(StringUtils.isNotEmpty(projectVisa.getId())){
 
             ProjectVisa visa=projectVisaService.getDesign(projectVisa);
             WorkClientAttachment attchment = new WorkClientAttachment();
             attchment.setAttachmentId(projectVisa.getId());
+            //获取附件信息
             List<WorkClientAttachment> attachments = workClientAttachmentDao.findList(attchment);
             visa.setWorkAttachments(attachments);
             model.addAttribute("projectVisa", visa);
@@ -222,11 +249,16 @@ public class ProjectDesignController extends BaseController {
 
 
     /**
-     * 保存客户管理
+     * 保存设计变更信息（已作废）
+     * @param concealProjectInfo
+     * @param redirectAttributes
+     * @return
+     * @throws Exception
      */
     @RequestMapping(value = "save")
     public String save(ConcealProjectInfo concealProjectInfo, RedirectAttributes redirectAttributes) throws Exception {
 
+        //保存设计变更信息
         String str = projectVisaService.saveData(concealProjectInfo);
         addMessage(redirectAttributes, "保存设计变更信息"+(str.equals("true")?"成功":"失败"));
         return "redirect:"+Global.getAdminPath()+"/project/projectDesignChange/?repage";
@@ -377,6 +409,7 @@ public class ProjectDesignController extends BaseController {
     public Map<String,Object> delete(ProjectVisa projectVisa, RedirectAttributes redirectAttributes) {
         Map<String,Object> j= new HashMap<>();
         try {
+            //调用删除方法
             projectVisaService.deleteByLogic(projectVisa.getId(),projectVisa.getType());
             j.put("status",true);
             j.put("msg","删除成功");
@@ -401,6 +434,7 @@ public class ProjectDesignController extends BaseController {
             List<ProjectVisa> list = ei.getDataList(ProjectVisa.class);
             List<ProjectVisa> listAll = new ArrayList<>();
             for (ProjectVisa ctrlprice : list) {
+                //判断 将没数据得行删除
                 if(StringUtils.isNotBlank(ctrlprice.getNumber()) && StringUtils.isNotBlank(ctrlprice.getDateStr()) && null != ctrlprice.getSendMoney() && null != ctrlprice.getConfirmMoney()){
                     listAll.add(ctrlprice);
                 }

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

@@ -87,6 +87,11 @@ public class ProjectVisaController extends BaseController {
 
     /**
      * 签证汇总表列表页面
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequiresPermissions("project:projectVisa:list")
     @RequestMapping(value = {"list", ""})
@@ -94,23 +99,32 @@ public class ProjectVisaController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //查询施工合同列表信息
         Page<ConstructionContract> page = contractService.findPage(new Page<ConstructionContract>(request, response), constructionContract);
         model.addAttribute("page", page);
         return "modules/projectrecord/implementStage/projectVisaList";
     }
 
-    //添加签证汇总页面
+    /**
+     * 添加签证汇总页面
+     * @param concealProjectInfo
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "form")
     public String form(ConcealProjectInfo concealProjectInfo, Model model) {
 
         ProjectContentData projectContentData = new ProjectContentData();
         projectContentData.setType("");
+        //判断infoid是否为空来获取对应的工作内容详情信息
         if (StringUtils.isNotBlank(concealProjectInfo.getInfoId())){
             projectContentData = projectVisaService.getProjectContentData(concealProjectInfo.getInfoId());
         }else if (concealProjectInfo.getProjectContentData()!=null && StringUtils.isNotBlank(concealProjectInfo.getProjectContentData().getId())) {
             projectContentData = projectVisaService.getProjectContentData(concealProjectInfo.getProjectContentData().getId());
         }
+        //添加负责人信息
         projectContentData.setMaster(UserUtils.getUser());
+        //获取过程控制表信息
         if(StringUtils.isNotBlank(projectContentData.getId())){
             List<ProjectControlTable> controlData = projectControlTableService.getControlData(projectContentData.getId(),"");
             projectContentData.setProjectControlTableList(controlData);
@@ -123,6 +137,7 @@ public class ProjectVisaController extends BaseController {
         concealProjectInfo.setCondition("visa");
         concealProjectInfo.setProjectContentData(projectContentData);
         model.addAttribute("concealProjectInfo", concealProjectInfo);
+        //判断是否为查看页面 是则跳转查看页面
         if("view".equals(concealProjectInfo.getView())){
             return "modules/projectrecord/visa/projectVisaView";
         }
@@ -134,18 +149,22 @@ public class ProjectVisaController extends BaseController {
      */
     @RequestMapping(value = {"visaList"})
     public String visaList(ProjectVisa projectVisa, String view, HttpServletRequest request, Model model) {
+        //获取前端返回的sign结果
         String sign = request.getParameter("sign");
         List<String> signList = new ArrayList();
         if (StringUtils.isNotBlank(sign)){
+            //根据，进行分割
             signList = Arrays.asList(sign.split(","));
         }
         List<ProjectVisa> list = new ArrayList<>();
+        //判断projectId是否为空 获取签证信息集合
         if(StringUtils.isNotBlank(projectVisa.getContentId())){
             list = projectVisaService.findList(projectVisa);
         }
         if(null != list){
             for (ProjectVisa visa: list) {
                 if(null != visa.getDate()){
+                    //签证时间转换
                     visa.setDateStr(StringUtils.getDateStr(visa.getDate()));
                 }
             }
@@ -153,6 +172,7 @@ public class ProjectVisaController extends BaseController {
         model.addAttribute("signList", signList);
         model.addAttribute("investmentCostList", list);
         String viewPath = "modules/workcontent/workSiteVisaList";
+        //判断是否为查看方法，是则跳转查看页面
         if("view".equals(view)){
             viewPath+="View";
         }
@@ -170,19 +190,23 @@ public class ProjectVisaController extends BaseController {
      */
     @RequestMapping(value = {"listByProjectId"})
     public String listByProjectId(ProjectVisa projectVisa, String view, HttpServletRequest request, Model model) {
+        //获取前端返回的sign结果
         String sign = request.getParameter("sign");
         List<String> signList = new ArrayList();
+        //根据，进行分割
         if (StringUtils.isNotBlank(sign)){
             signList = Arrays.asList(sign.split(","));
         }
         List<ProjectVisa> list = new ArrayList<>();
         projectVisa.setType("1");
+        //判断projectId是否为空 获取签证信息集合
         if(StringUtils.isNotBlank(projectVisa.getProjectId())){
             list = projectVisaService.findListByProjectId(projectVisa);
         }
         if(null != list){
             for (ProjectVisa visa: list) {
                 if(null != visa.getDate()){
+                    //签证时间转换
                     visa.setDateStr(StringUtils.getDateStr(visa.getDate()));
                 }
             }
@@ -196,11 +220,12 @@ public class ProjectVisaController extends BaseController {
     //编辑签证汇总页面
     @RequestMapping(value = "updateTable")
     public String updateTable(ProjectVisa projectVisa, Model model) {
-
+        //判断id是否为空 获取基本信息
         if(StringUtils.isNotEmpty(projectVisa.getId())){
             ProjectVisa visa=projectVisaService.getVisa(projectVisa);
             WorkClientAttachment attchment = new WorkClientAttachment();
             attchment.setAttachmentId(projectVisa.getId());
+            //获取附件信息
             List<WorkClientAttachment> attachments = workClientAttachmentDao.findList(attchment);
             visa.setWorkAttachments(attachments);
             model.addAttribute("projectVisa", visa);
@@ -214,11 +239,12 @@ public class ProjectVisaController extends BaseController {
     //编辑签证汇总页面
     @RequestMapping(value = "view")
     public String view(ProjectVisa projectVisa, Model model) {
-
+        //判断id是否为空 获取基本信息
         if(StringUtils.isNotEmpty(projectVisa.getId())){
             ProjectVisa visa=projectVisaService.getVisa(projectVisa);
             WorkClientAttachment attchment = new WorkClientAttachment();
             attchment.setAttachmentId(projectVisa.getId());
+            //获取附件信息
             List<WorkClientAttachment> attachments = workClientAttachmentDao.findList(attchment);
             visa.setWorkAttachments(attachments);
             model.addAttribute("projectVisa", visa);
@@ -230,7 +256,7 @@ public class ProjectVisaController extends BaseController {
     }
 
     /**
-     * 保存签证信息
+     * 保存签证信息（已作废）
      * @param concealProjectInfo
      * @param redirectAttributes
      * @return
@@ -238,14 +264,15 @@ public class ProjectVisaController extends BaseController {
      */
     @RequestMapping(value = {"save"})
     public String save(ConcealProjectInfo concealProjectInfo, RedirectAttributes redirectAttributes) throws Exception {
-
+        //保存签证信息
         String str = projectVisaService.saveData(concealProjectInfo);
         addMessage(redirectAttributes, "保存签证信息"+(str.equals("true")?"成功":"失败"));
         return "redirect:"+Global.getAdminPath()+"/project/projectVisa/?repage";
     }
 
-    //显示签证页面
+    //显示签证页面（已作废）
     public String getVisa(ProjectVisa projectVisa,Model model){
+        //获取签证信息
         ProjectVisa projectVisa1=projectVisaService.getVisa(projectVisa);
         model.addAttribute("projectVisa",projectVisa1);
         return "";
@@ -262,6 +289,7 @@ public class ProjectVisaController extends BaseController {
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        //获取已审核通过项目集合
         Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();
@@ -397,6 +425,7 @@ public class ProjectVisaController extends BaseController {
     public Map<String,Object> delete(ProjectVisa projectVisa, RedirectAttributes redirectAttributes) {
         Map<String,Object> j= new HashMap<>();
         try {
+            //调用删除方法
             projectVisaService.deleteByLogic(projectVisa.getId(),projectVisa.getType());
             j.put("status",true);
             j.put("msg","删除成功");
@@ -421,6 +450,7 @@ public class ProjectVisaController extends BaseController {
             List<ProjectVisa> list = ei.getDataList(ProjectVisa.class);
             List<ProjectVisa> listAll = new ArrayList<>();
             for (ProjectVisa ctrlprice : list) {
+                //判断 将没数据得行删除
                 if(StringUtils.isNotBlank(ctrlprice.getNumber()) && StringUtils.isNotBlank(ctrlprice.getDateStr()) && null != ctrlprice.getSendMoney() && null != ctrlprice.getConfirmMoney()){
                     listAll.add(ctrlprice);
                 }

src/main/java/com/jeeplus/modules/projectcontentinfo/dao/ProjectBasedDataDao.java

@@ -23,6 +23,11 @@ public interface ProjectBasedDataDao extends CrudDao<ProjectBasedData> {
 
     List<ProjectBasedData> findReportBased(@Param("reportId") String reportId, @Param("type") String type);
 
+    /**
+     * 获取依据性资料信息
+     * @param contentId
+     * @return
+     */
     List<ProjectBasedData> queryListByContentId(String contentId);
 
     List<RuralProjectBasedData> findListOnRural(RuralProjectBasedData projectBasedData);

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectContentDataService.java

@@ -58,8 +58,13 @@ public class ProjectContentDataService extends CrudService<ProjectContentDataDao
         return projectContentData;
     }
 
+    /**
+     * 获取依据性资料信息
+     * @param projectContentData
+     */
     public void queryBasedData(ProjectContentData projectContentData){
 	    if (projectContentData==null || StringUtils.isBlank(projectContentData.getId()))return;
+	    //获取依据性资料信息
         List<ProjectBasedData> list = projectBasedDataDao.queryListByContentId(projectContentData.getId());
         projectContentData.setProjectBasedDataList(list);
     }
@@ -68,7 +73,13 @@ public class ProjectContentDataService extends CrudService<ProjectContentDataDao
 		return super.findList(projectContentData);
 	}
 
+    /**
+     * 查询工作内容详情信息
+     * @param projectContentData
+     * @return
+     */
 	public List<RuralProjectContentData> findListOnRural(RuralProjectContentData projectContentData) {
+	    //查询工作内容详情信息
 		return dao.findListOnRural(projectContentData);
 	}
 	
@@ -131,6 +142,7 @@ public class ProjectContentDataService extends CrudService<ProjectContentDataDao
         if(i==0){
             return;
         }
+        //如果为项目实施前期、实施阶段、竣工阶段信息则进行删除工作内容引用资料中间表关系
         if("according".equals(condition) || "completion".equals(condition) || "early".equals(condition) || "claim".equals(condition) || "design".equals(condition) || "visa".equals(condition) || "interim".equals(condition) || "distribution".equals(condition) || "material".equals(condition) || "armor".equals(condition)){
             dao.deleteProjectContentBased(contentId,basedId);
         }else{
@@ -169,6 +181,11 @@ public class ProjectContentDataService extends CrudService<ProjectContentDataDao
         dao.saveReportContent(contentId,reportId,type);
     }
 
+    /**
+     * 查询工作内容引用资料中间表信息条数
+     * @param basedId
+     * @return
+     */
     public Integer countBased(String basedId) {
         return dao.countByBaseId(basedId);
     }
@@ -203,15 +220,37 @@ public class ProjectContentDataService extends CrudService<ProjectContentDataDao
         return workReviewAudits;
     }
 
+    /**
+     * 根据项目编号和阶段Type获取信息
+     * @param projectId
+     * @param projectTypeParentId
+     * @return
+     */
     public List<ProjectRecordTreeData> getProjectContentDataList(String projectId,String projectTypeParentId) {
+        //根据项目编号和阶段Type获取信息
         List<ProjectRecordTreeData> projectRecordTreeDataList = dao.getProjectContentDataList(projectId,projectTypeParentId);
         return projectRecordTreeDataList;
     }
 
+    /**
+     * 根据项目编号和阶段Type获取信息(实施阶段)
+     * @param projectId
+     * @param contractId
+     * @param projectTypeParentId
+     * @param typeId
+     * @return
+     */
     public List<ProjectRecordTreeData> getProjectContentDataListOnImplement(String projectId,String contractId,String projectTypeParentId,String typeId) {
+        //根据项目编号和阶段Type获取信息(实施阶段)
         List<ProjectRecordTreeData> projectRecordTreeDataList = dao.getProjectContentDataListOnImplement(projectId,contractId,projectTypeParentId,typeId);
         return projectRecordTreeDataList;
     }
+
+    /**
+     * 查询工作内容信息
+     * @param id
+     * @return
+     */
     public List<ProjectContentData> getProjectContentData(String id) {
         List<ProjectContentData> projectRecordTreeDataList = dao.getProjectContentData(id);
         return projectRecordTreeDataList;
@@ -224,6 +263,7 @@ public class ProjectContentDataService extends CrudService<ProjectContentDataDao
      * @return
      */
     public List<ProjectRecordTreeData> getProjectContentReportDataList(String projectId,String projectTypeParentId) {
+        //根据项目编号和阶段Type获取信息(项目复核)
         List<ProjectRecordTreeData> projectRecordTreeDataList = dao.getProjectContentReportDataList(projectId,projectTypeParentId);
         return projectRecordTreeDataList;
     }
@@ -235,6 +275,7 @@ public class ProjectContentDataService extends CrudService<ProjectContentDataDao
      * @return
      */
     public List<ProjectRecordTreeData> getProjectContentReportDataListOnImplement(String projectId,String projectTypeParentId,String typeId) {
+        //根据项目编号和阶段Type获取信息(项目复核，实施阶段)
         List<ProjectRecordTreeData> projectRecordTreeDataList = dao.getProjectContentReportDataListOnImplement(projectId,projectTypeParentId,typeId);
         return projectRecordTreeDataList;
     }
@@ -247,6 +288,7 @@ public class ProjectContentDataService extends CrudService<ProjectContentDataDao
      * @return
      */
     public List<ProjectRecordTreeData> getProjectContentReportArchiveDataList(String projectId,String projectTypeParentId) {
+        //根据项目编号和阶段Type获取信息(项目归档)
         List<ProjectRecordTreeData> projectRecordTreeDataList = dao.getProjectContentReportArchiveDataList(projectId,projectTypeParentId);
         return projectRecordTreeDataList;
     }

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectReportDataService.java

@@ -249,15 +249,23 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 		return page;
 	}
 
+	/**
+	 * 根据条件查询报告详情信息
+	 * @param projectReportData
+	 * @return
+	 */
 	public ProjectReportData findInfoByStatus(ProjectReportData projectReportData) {
-
+		//询报告详情信息
 		ProjectReportData projectReportDatas = dao.findInfoByStatus(projectReportData);
+		//判断是否为空 不为空则添加项目负责人信息
 		if (null != projectReportDatas){
 			String projectMaster = projectRecordsService.getMasterStr(projectReportDatas.getProject().getId());
 			projectReportDatas.setProjectMaster(projectMaster);
 		}
+		//判断合同信息是否为空  不为空则获取客户信息
 		if(StringUtils.isBlank(projectReportDatas.getClientName())){
 			List<WorkClientLinkman> clientLinkmanList = workClientLinkmanDao.queryProjectLinkmans(projectReportDatas.getProject().getId(), 1);
+			//判断客户信息是否为空 不为空则添加到报告详情信息中
 			if(null != clientLinkmanList){
 				for(WorkClientLinkman linkman :clientLinkmanList){
 					WorkClientInfo clientInfo = workClientInfoService.get(linkman.getClientId().getId());

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectReportRecordService.java

@@ -97,6 +97,12 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 		}
 		return projectReportRecord;
 	}
+
+	/**
+	 * 获取归档编号
+	 * @param reportId
+	 * @return
+	 */
 	public int getNumber(String reportId) {
 		String number = dao.getNumber(reportId);
 		if (StringUtils.isNotBlank(number)){
@@ -667,22 +673,32 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 	}
 
 
+	/**
+	 * 归档信息删除操作
+	 * @param reportRecord
+	 */
 	@Transactional(readOnly = false)
 	public void delete(ProjectReportRecord reportRecord) {
+		//获取归档信息
 		ProjectReportRecord projectReportRecord = get(reportRecord.getId());
+		//判断是否有附件信息  有则删除
 		if (projectReportRecord.getWorkAttachments() != null && projectReportRecord.getWorkAttachments().size() != 0) {
 			for (Workattachment workattachment : projectReportRecord.getWorkAttachments()) {
 				workattachmentDao.delete(workattachment);
 			}
 		}
+		//查询工作流信息 并删除
 		if (StringUtils.isNotBlank(projectReportRecord.getProcessInstanceId())){
 			workActivityProcessService.deleteProcessInstanceId(projectReportRecord.getProcessInstanceId());
 		}
+		//查询报告详情信息
 		ProjectReportData reportData = projectReportDataService.get(projectReportRecord.getReport().getId());
+		//判断归档状态，如果是2 则进行修改处理
 		if ("2".equals(reportData.getFileStatus())){
 			reportData.setFileStatus("1");
 			projectReportDataService.updateFileStatus(reportData);
 		}
+		//进行删除操作
 		super.delete(projectReportRecord);
 	}
 

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectcontentinfoService.java

@@ -110,6 +110,11 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 		return super.get(id);
 	}
 
+	/**
+	 * 根据项目id查询工作内容信息
+	 * @param projectId
+	 * @return
+	 */
 	public Projectcontentinfo getByProjectId(String projectId) {
 		return dao.getByProjectId(projectId);
 	}
@@ -128,6 +133,11 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 		return dao.getByInfoId(infoId);
 	}
 
+	/**
+	 * 根据详情id查询工作内容管理信息
+	 * @param infoId
+	 * @return
+	 */
 	public Projectcontentinfo getByInfoIdOnRural(String infoId) {
 		return dao.getByInfoId(infoId);
 	}
@@ -143,6 +153,11 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 		return dao.findListByProject(projectcontentinfo);
 	}
 
+	/**
+	 * 根据参数查询项目集合信息
+	 * @param projectcontentinfo
+	 * @return
+	 */
 	public List<RuralProjectcontentinfo> findListByProjectOnRural(RuralProjectcontentinfo projectcontentinfo) {
 		return dao.findListByProjectOnRural(projectcontentinfo);
 	}
@@ -475,6 +490,7 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 				}
 			}
 			//添加工作内容和报告关系
+			//判断是否为实施前期、实施阶段、竣工阶段信息
 			if ("according".equals(projectcontentinfo.getCondition()) || "completion".equals(projectcontentinfo.getCondition()) || "early".equals(projectcontentinfo.getCondition()) || "claim".equals(projectcontentinfo.getCondition()) || "design".equals(projectcontentinfo.getCondition()) || "visa".equals(projectcontentinfo.getCondition()) || "interim".equals(projectcontentinfo.getCondition()) || "distribution".equals(projectcontentinfo.getCondition())){
 				if(null != projectReportData.getProjectContentDataList() && null != projectReportData){
 					Integer contentAndReportCount = projectImplementEarlyService.getProjectContrntAndReport(projectReportData.getProjectContentDataList().get(0).getId(), projectReportData.getId());
@@ -518,6 +534,7 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 				}
 			}
 			//保存tree数据
+			//判断是否为实施前期、实施阶段、竣工阶段信息
 			if (!"according".equals(projectcontentinfo.getCondition()) && !"completion".equals(projectcontentinfo.getCondition()) && !"early".equals(projectcontentinfo.getCondition()) && !"claim".equals(projectcontentinfo.getCondition()) && !"design".equals(projectcontentinfo.getCondition()) && !"visa".equals(projectcontentinfo.getCondition()) && !"interim".equals(projectcontentinfo.getCondition()) && !"distribution".equals(projectcontentinfo.getCondition())){
 				saveReportTree(projectcontentinfo,status,company,office,reportDataName,infoId,attachmentList,projectReportData.getReviewStandard(),1);
 			}
@@ -1397,8 +1414,10 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 
 	@Transactional(readOnly = false)
 	public void deleteInfoIdChange(String infoId) {
+		//根据infoId获取报告详情信息
 		ProjectReportData projectReportData = projectReportChangeService.get(infoId);
 		String reportId = projectReportData.getReportId();
+		//判断是否有附件信息，删除附件信息
 		if (projectReportData.getWorkAttachments() != null && projectReportData.getWorkAttachments().size() != 0) {
 			for (Workattachment workattachment : projectReportData.getWorkAttachments()) {
 				if (workattachment.getAttachmentFlag().equals("87")){
@@ -1462,8 +1481,15 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 		return filename;
 	}
 
+	/**
+	 * 根据参数获取业务字典信息
+	 * @param achievementParentId
+	 * @param judgeType
+	 * @return
+	 */
 	public List<MainDictDetail> getAchievementTypeList(String achievementParentId,Integer judgeType){
 		String type = "";
+		//judgeType为字典key
 		if (1 == judgeType){
 			type = "achievement_type";
 		}else if (2 == judgeType){
@@ -1474,6 +1500,7 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 		List<MainDictDetail> dictList=new ArrayList<>();
 		String comId=UserUtils.getSelectCompany().getId();
 		String branchId=UserUtils.getSelectBranchOffice();
+		//根据字典key获取字典信息
 		MainDict mainDict = mainDictService.getIdByName(type);
 		try {
 			MainDictDetail mainDictDetail = new MainDictDetail();
@@ -1484,6 +1511,7 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 			}
 			mainDictDetail.setAchievementParentId(achievementParentId);
 			mainDictDetail.setType(type);
+			//根据条件查询字典明细集合
 			dictList = mainDictDetailDao.findAchievementParentIdList(mainDictDetail);
 			return dictList;
 		} catch (Exception e) {
@@ -1492,11 +1520,18 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 		return dictList;
 	}
 
+	/**
+	 * 根据成果类型查询复核条件
+	 * @param reviewStandardParentId
+	 * @return
+	 */
 	public List<MainDictDetail> getReviewStandardList(String reviewStandardParentId){
+		//type
 		String type = "reviewStandard";
 		List<MainDictDetail> dictList=new ArrayList<>();
 		String comId=UserUtils.getSelectCompany().getId();
 		String branchId=UserUtils.getSelectBranchOffice();
+		//根据字典key获取字典信息
 		MainDict mainDict = mainDictService.getIdByName(type);
 		try {
 			MainDictDetail mainDictDetail = new MainDictDetail();
@@ -1507,6 +1542,7 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 			}
 			mainDictDetail.setReviewStandardParentId(reviewStandardParentId);
 			mainDictDetail.setType(type);
+			//根据条件查询字典明细集合
 			dictList = mainDictDetailDao.findReviewStandardParentIdList(mainDictDetail);
 			return dictList;
 		} catch (Exception e) {
@@ -1530,6 +1566,7 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 	 * @return
 	 */
 	public List<ProjectContentTreeData> getProjectContentTreeDataOnLeft(String projectId,Integer workContentType,String dictType){
+		//判断 41为汇总展示
 		if("41".equals(dictType)) {
 			return projectcontentinfoDao.getProjectContentTreeDataOnLeft(projectId, workContentType, "");
 		}
@@ -1565,12 +1602,18 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 	}
 
 
+	/**
+	 * 查询项目余额
+	 * @param workContentContractSum
+	 * @return
+	 */
 	public Map<String,Double> getProjectBalanceInfo(WorkContentContractSum workContentContractSum) {
 		Map<String,Double> map = new HashMap<>();
 		//初始金额
 		Double alterMoney = 0D;
 		WorkContentContractSum oldRecord = null;
 		if(StringUtils.isNotBlank(workContentContractSum.getContentId())){
+			//获取合同登记信息
 			List<WorkContentContractSum> list = workContentContractSumService.findList(workContentContractSum);
 			if(list!=null&&!list.isEmpty()){
 				oldRecord = list.get(0);
@@ -1587,7 +1630,9 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 					alterMoney += workContentClaim.getSetAmt();
 				}
 			}
+			//添加变更金额
 			map.put("alterMoney",alterMoney);
+			//添加最终金额
 			map.put("ultimatelyMoney",oldRecord.getContractAmount()-alterMoney);
 		}
 		return map;

src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectReportRecordController.java

@@ -87,14 +87,17 @@ public class ProjectReportRecordController extends BaseController {
 	 */
 	@RequestMapping(value = "form")
 	public String form(ProjectReportRecord projectReportRecord, Model model) {
+		//判断报告归档信息是否存在id
 		if(StringUtils.isBlank(projectReportRecord.getId())){
 			projectReportRecord.setCreateDate(new Date());
 			projectReportRecord.setCreateBy(UserUtils.getUser());
 		}
 		model.addAttribute("projectReportRecord", projectReportRecord);
+		//判断是否为查看功能进入
 		if (StringUtils.isNotBlank(projectReportRecord.getView()) && projectReportRecord.getView().equals("view")){
 			return "modules/projectcontentinfo/projectReportRecordView";
 		}else if (StringUtils.isNotBlank(projectReportRecord.getView()) && projectReportRecord.getView().equals("modiftApply")){
+			//获取审核流节点信息
 			ProcessInstance processInstance = actTaskService.getProcIns(projectReportRecord.getProcessInstanceId());
 			if (processInstance!=null) {
 				Task taskInfok = actTaskService.getCurrentTaskInfo(processInstance);
@@ -109,9 +112,11 @@ public class ProjectReportRecordController extends BaseController {
 			}
 			return "modules/projectcontentinfo/projectReportRecordModiftApply";
 		}
+		//项目前期归档返回
 		if("earlyArchive".equals(projectReportRecord.getCondition())){
 			return "modules/projectrecord/workContentFromAndView/projectEarlyForm";
 		}
+		//项目竣工阶段归档返回
 		if("completionArchive".equals(projectReportRecord.getCondition())){
 			return "modules/projectrecord/workContentFromAndView/projectReportRecordForm";
 		}
@@ -179,16 +184,19 @@ public class ProjectReportRecordController extends BaseController {
 		ProjectReportData projectReportData = new ProjectReportData();
 		projectReportData.setFileStatus("1");
 		projectReportData.setId(projectReportRecord.getReport().getId());
+		//获取报告详情信息
 		ProjectReportData projectReportDatas = projectReportDataService.findInfoByStatus(projectReportData);
 		//添加归档申请编号
 		if(null != projectReportDatas){
 			try {
+				//获取归档编号后的数字
 				int count = projectReportRecordService.getNumber(projectReportDatas.getId());
 				projectReportDatas.setRecordNum(count>9?projectReportDatas.getNumber()+"-"+count+"":projectReportDatas.getNumber()+"-0"+count);
 			}catch (Exception e){
 				logger.error("Exception e"+e);
 			}
 		}
+		//基础数据添加
 		reportRecord.setRecordNum(projectReportDatas.getRecordNum());
 		reportRecord.setReport(projectReportDatas);
 		reportRecord.setContractNum(projectReportDatas.getContractNum());
@@ -335,14 +343,17 @@ public class ProjectReportRecordController extends BaseController {
 				addMessage(redirectAttributes, "报告归档正在审核中，无法删除");
 				return "redirect:"+Global.getAdminPath()+"/projectcontentinfo/projectReportRecord/?repage";
 			}
+			//删除操作
 			projectReportRecordService.delete(projectReportRecord);
 			addMessage(redirectAttributes, "删除报告归档成功");
 		}catch (Exception e){
 				addMessage(redirectAttributes, "删除报告归档失败");
 		}
+		//项目前期归档返回
 		if("earlyArchive".equals(projectReportRecord.getCondition())){
 			return "redirect:"+Global.getAdminPath()+"/project/projectEarlyPigeonhole/?repage";
 		}
+		//项目竣工阶段归档返回
 		if("completionArchive".equals(projectReportRecord.getCondition())){
 			return "redirect:"+Global.getAdminPath()+"/project/projectCompletionPigeonhole/?repage";
 		}
@@ -358,6 +369,7 @@ public class ProjectReportRecordController extends BaseController {
 			if(projectReportRecord.getStatus().equals("5")){
 				addMessage(redirectAttributes, "报告归档已审批通过，无法撤回");
 			}else{
+				//撤回审批
 				projectReportRecordService.cancelInvalidate(projectReportRecord);
 				addMessage(redirectAttributes, "强制撤回报告归档成功");
 			}

src/main/java/com/jeeplus/modules/projectrecord/dao/implementStage/ProjectInterimPaymentDao.java

@@ -54,6 +54,12 @@ public interface ProjectInterimPaymentDao  extends CrudDao<ProjectPaymentTreeDat
      */
     Integer upodateInterimPayment(ProjectContentData projectContentData);
 
+    /**
+     * 删除工作内容引用资料中间表信息
+     * @param contentId
+     * @param basedId
+     * @return
+     */
     int deleteBasedData(@Param("contentId") String contentId, @Param("basedId") String basedId);
 
 

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectImplementEarlyService.java

@@ -115,15 +115,18 @@ public class ProjectImplementEarlyService extends CrudService<ProjectImplementEa
         //设置数据权限
         if(!UserUtils.getUser().isAdmin()) {
             String dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_RECORDS.getValue());
+            //判断是否为空，为空则进行新的权限查询
             if(org.apache.commons.lang3.StringUtils.isBlank(dataScopeSql)){
                 dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_WORK_RECORDS.getValue());
             }
             projectRecords.getSqlMap().put("dsf", dataScopeSql);
         }
+        //获取数据条数
         Integer count = dao.getProjectRecodesCount(projectRecords);
         page.setCount(count);
         page.setCountFlag(false);
         projectRecords.setPage(page);
+        //获取已审核的项目数据信息
         List<ProjectImplementEarly> recordsList = dao.getProjectRecodesList(projectRecords);
         //查询负责人信息
         for (ProjectImplementEarly records : recordsList) {
@@ -137,6 +140,12 @@ public class ProjectImplementEarlyService extends CrudService<ProjectImplementEa
         return page;
     }
 
+    /**
+     * 查询艮宫咨询报告信息
+     * @param page
+     * @param projectFollowReport
+     * @return
+     */
     public Page<ProjectFollowReport> findFollowPage(Page<ProjectFollowReport> page, ProjectFollowReport projectFollowReport) {
         projectFollowReport.setPage(page);
         List<ProjectFollowReport> list = projectFollowReportDao.findList(projectFollowReport);
@@ -144,21 +153,36 @@ public class ProjectImplementEarlyService extends CrudService<ProjectImplementEa
         return page;
     }
 
+    /**
+     * 根据项目id查询跟踪咨询报告信息
+     * @param projectId
+     * @return
+     */
     @Transactional(readOnly = true)
     public List<ProjectFollowReport> find(String projectId) {
         return  projectFollowReportDao.find(projectId);
     }
 
+    /**
+     * 删除操作
+     * @param projectFollowReport
+     */
     @Transactional(readOnly = false)
     public void deleteFollow(ProjectFollowReport projectFollowReport) {
         projectFollowReportDao.delete(projectFollowReport);
     }
 
+    /**
+     * 修改跟踪咨询报告信息
+     * @param projectFollowReport
+     * @throws Exception
+     */
     @Transactional(readOnly = false)
     public void updateFollow(ProjectFollowReport projectFollowReport) throws Exception {
         //获取原有的审核数据
         Integer oldStatus = projectFollowReport.getStatus();
         projectFollowReport.setStatus(ProjectStatusEnum.IN_APRL.getValue());
+        //修改信息
         projectFollowReportDao.update(projectFollowReport);
 
         ProjectContentData projectContentData = projectFollowReport.getProjectContentData();
@@ -168,6 +192,7 @@ public class ProjectImplementEarlyService extends CrudService<ProjectImplementEa
                 if (data.getDelFlag().equals("0")){
                     List<ProjectBasedData> projectBasedData = new ArrayList<>();
                     projectBasedData.add(data);
+                    //添加内容和依据性资料关系信息表
                     projectContentDataService.saveBasedData(projectFollowReport.getId(),projectBasedData);
                 }
             }
@@ -182,13 +207,16 @@ public class ProjectImplementEarlyService extends CrudService<ProjectImplementEa
                     workattachment.setAttachmentId(projectFollowReport.getId());
                     workattachment.setAttachmentUser(UserUtils.getUser().getId());
                     if (StringUtils.isBlank(workattachment.getId()) || "null".equals(workattachment.getId())) {
+                        //新增
                         workattachment.preInsert();
                         workattachmentDao.insert(workattachment);
                     } else {
+                        //修改
                         workattachment.preUpdate();
                         workattachmentDao.update(workattachment);
                     }
                 } else {
+                    //删除
                     workattachmentDao.delete(workattachment);
                 }
             }
@@ -199,6 +227,11 @@ public class ProjectImplementEarlyService extends CrudService<ProjectImplementEa
         }
     }
 
+    /**
+     * 新增跟踪咨询报告信息
+     * @param projectFollowReport
+     * @throws Exception
+     */
     @Transactional(readOnly = false)
     public void insertFollow(ProjectFollowReport projectFollowReport) throws Exception {
         projectFollowReport.setStatus(ProjectStatusEnum.IN_APRL.getValue());
@@ -210,7 +243,9 @@ public class ProjectImplementEarlyService extends CrudService<ProjectImplementEa
         ReportNum reportNum = new ReportNum();
         reportNum.setNum(projectNumPrefix);
         ReportNum lastReportNum = projectReportNumDao.getLastReportNum(reportNum);
+        //判断是否是新的报告号
         if (null != lastReportNum){
+            //不是
             lastReportNum.getNum().lastIndexOf("-");
             //截取最后四位流水号
             String substring = lastReportNum.getNum().substring(lastReportNum.getNum().lastIndexOf("-")+1, lastReportNum.getNum().length());
@@ -224,12 +259,15 @@ public class ProjectImplementEarlyService extends CrudService<ProjectImplementEa
             newSerialNum.append(substringInteger);
             reportNum.setNum(reportNum.getNum()+newSerialNum);
         }else{
+            //是则在后面添加0001初始报告号
             reportNum.setNum(reportNum.getNum()+"0001");
         }
         reportNum.preInsert();
+        //报告号进行新增操作
         projectReportNumDao.insert(reportNum);
         projectFollowReport.setProjectFollowId(reportNum.getNum());
 
+        //跟踪咨询报告信息进行新增操作
         projectFollowReport.preInsert();
         projectFollowReportDao.insertFollow(projectFollowReport);
         //保存月报基本信息
@@ -254,13 +292,16 @@ public class ProjectImplementEarlyService extends CrudService<ProjectImplementEa
                     workattachment.setAttachmentId(projectFollowReport.getId());
                     workattachment.setAttachmentUser(UserUtils.getUser().getId());
                     if (StringUtils.isBlank(workattachment.getId()) || "null".equals(workattachment.getId())) {
+                        //新增
                         workattachment.preInsert();
                         workattachmentDao.insert(workattachment);
                     } else {
+                        //修改
                         workattachment.preUpdate();
                         workattachmentDao.update(workattachment);
                     }
                 } else {
+                    //删除
                     workattachmentDao.delete(workattachment);
                 }
             }
@@ -308,6 +349,7 @@ public class ProjectImplementEarlyService extends CrudService<ProjectImplementEa
                             ""
                     );
 
+            //获取初始审核人员list信息
             List<User> users = new ArrayList<>();
             List<User> bmzrs = UserUtils.getByRoleActivityEnname("bzshb",3,office.getId(),"4",projectFollowReport.getCreateBy());
 
@@ -695,13 +737,20 @@ public class ProjectImplementEarlyService extends CrudService<ProjectImplementEa
     }
 
 
+    /**
+     * 撤回操作
+     * @param projectFollowReport
+     * @throws Exception
+     */
     @Transactional(readOnly = false)
     public void cancelProcess(ProjectFollowReport projectFollowReport) throws Exception {
+        //创建工作流审批信息
         WorkActivityProcess process = new WorkActivityProcess();
         process.setProcessInstanceId(projectFollowReport.getProcessInstanceId());
         process.setIsApproval("0");
         WorkActivityProcess workActivityProcess = new WorkActivityProcess();
         workActivityProcess.setProcessInstanceId(projectFollowReport.getProcessInstanceId());
+        //获取工作流审批信息集合
         List<WorkActivityProcess> processList = workActivityProcessService.findList(workActivityProcess);
         WorkProjectNotify notify = new WorkProjectNotify();
         notify.setNotifyId(projectFollowReport.getId());

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectPlanService.java

@@ -63,12 +63,14 @@ public class ProjectPlanService extends CrudService<ProjectPlanDao, ProjectPlanI
             //根据项目类型查询typeId
             String projectTypeId = dao.getProjectTypeName(projectPlanInfo.getProjectStage(),projectRecords.getProjectTypeId());
             projectPlanInfo.setProjectStage(projectTypeId);
-
+            //将提醒人信息进行去重
             masterIdSet.add(userR.getId());
 
-
+            //添加项目id
             projectPlanInfo.setProjectId(projectRecords.getId());
+            //判断删除信息
             if (ProjectPlanInfo.DEL_FLAG_NORMAL.equals(projectPlanInfo.getDelFlag())){
+                //判断是否有id  没有则为新增
                 if (StringUtils.isBlank(projectPlanInfo.getId())){
                     projectPlanInfo.preInsert();
                     dao.insert(projectPlanInfo);
@@ -80,7 +82,7 @@ public class ProjectPlanService extends CrudService<ProjectPlanDao, ProjectPlanI
                 dao.delete(projectPlanInfo);
             }
         }
-
+        //向接收人发起通知操作
         String notifyStr = "项目编号："+projectRecords.getProjectId()+"，项目名称："+ projectRecords.getProjectName();
         String titleStr = "项目名称："+ projectRecords.getProjectName();
         //Set转List
@@ -109,6 +111,7 @@ public class ProjectPlanService extends CrudService<ProjectPlanDao, ProjectPlanI
             if (workClientAttachment.getId() == null){
                 continue;
             }
+            //判断附件删除状况 进行操作
             if (WorkClientAttachment.DEL_FLAG_NORMAL.equals(workClientAttachment.getDelFlag())){
                 workClientAttachment.setAttachmentId(projectRecords.getId());
                 workClientAttachment.setAttachmentFlag("131");

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsService.java

@@ -151,6 +151,12 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 		projectRecords.setProjectLeaders(users);
 		return projectRecords;
 	}
+
+	/**
+	 * 查询项目负责人信息
+	 * @param id
+	 * @return
+	 */
 	public ProjectRecords getRuralMasters(String id) {
 		ProjectRecords projectRecords = dao.getRuralProjectRecodes(id);
 		List<User> users = workProjectUserDao.queryProjectUsers(projectRecords.getId(), "1");
@@ -197,6 +203,7 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 			}
             projectRecords.getSqlMap().put("dsf", dataScopeSql);
         }
+        //查询数据条数
         int count = dao.queryCount(projectRecords);
         page.setCount(count);
         page.setCountFlag(false);
@@ -804,6 +811,7 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 						reportNum.setParentId("0");
 						reportNum.setParentId("0");
 						reportNum.setProjectId(projectRecords.getId());
+						//添加信息
 						projectReportNumDao.insert(reportNum);
 					} else {
 						workActivityProcess.setIsApproval("2");
@@ -1182,6 +1190,7 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 	 */
 	public void queryContractInfos(ProjectRecords projectRecords) {
 		if (null != projectRecords.getWorkContractInfo()){
+			//查询合同信息
 			WorkContractInfo workContractInfo = contractInfoService.get(projectRecords.getWorkContractInfo().getId());
 			if(workContractInfo!=null){
 				workContractInfo.setConstructionProjectTypeStr(DictUtils.getMainDictLabel(String.valueOf(workContractInfo.getContractType()), "contract_type", ""));
@@ -1289,6 +1298,11 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 		return clientLinkmanDao.getLinkManByNameAndOffice(workClientLinkman);
 	}
 
+	/**
+	 * 查询项目类型信息
+	 * @param projectTypeId
+	 * @return
+	 */
 	public List<ProjectType> getProjectType(String projectTypeId){
 		return dao.getProjectType(projectTypeId);
 	}

src/main/java/com/jeeplus/modules/projectrecord/service/armorForMaterials/ArmorForMaterialsService.java

@@ -45,32 +45,55 @@ public class ArmorForMaterialsService extends CrudService<ArmorForMaterialsDao,
     private WorkattachmentDao workattachmentDao;
 
 
+    /**
+     * 根据id查询工作内容详情信息
+     * @param id
+     * @return
+     */
     @Transactional(readOnly = true)
     public List<ProjectContentData> getConcealProjectList(String id) {
+        //根据id查询工作内容详情信息
         List<ProjectContentData> projectVisaList=dao.getConcealProjectList(id);
         return projectVisaList;
     }
 
-
+    /**
+     * 根据id查询甲供物资信息
+     * @param id
+     * @return
+     */
     public ProjectContentData getProjectContentData(String id) {
+        //根据id查询甲供物资信息
         ProjectContentData projectContentData = dao.getConcealProjectData(id);
         if(projectContentData!=null){
             Workattachment workattachment = new Workattachment();
             workattachment.setAttachmentId(id);
+            //查询对应的附件信息并添加到甲供物资信息表中
             projectContentData.setWorkAttachments(workattachmentDao.findList(workattachment));
         }
         return projectContentData;
     }
 
+    /**
+     * 删除依据性资料联系表中的信息
+     * @param contentId
+     * @param basedId
+     */
     @Transactional(readOnly = false)
     public void deleteBased(String contentId,String basedId) {
+        //删除依据性资料联系表中的信息
         int i = dao.deleteBasedData(contentId, basedId);
         if(i==0){
             return;
         }
     }
 
-
+    /**
+     * 保存信息
+     * @param concealProjectInfo
+     * @return
+     * @throws Exception
+     */
     @Transactional(readOnly = false)
     public String saveData(ConcealProjectInfo concealProjectInfo) throws Exception {
         Projectcontentinfo s = new Projectcontentinfo();
@@ -81,17 +104,23 @@ public class ArmorForMaterialsService extends CrudService<ArmorForMaterialsDao,
         //保存工作内容相关数据
         ProjectContentData projectContentData = concealProjectInfo.getProjectContentData();
         if(StringUtils.isNotBlank(projectContentData.getId())){
+            //查询甲供物资信息
             ProjectContentData oldData = dao.getConcealProjectData(projectContentData.getId());
+            //整合甲供物资信息
             MyBeanUtils.copyBeanNotNull2Bean(projectContentData, oldData);
             projectContentData = oldData;
         }
+        //添加基础数据
         projectContentData.setCompanyId(contentinfo.getCompanyId());
         projectContentData.setOfficeId(contentinfo.getOfficeId());
         projectContentData.setContractId(concealProjectInfo.getContract().getId());
+        //判断是否已存在数据
         if(StringUtils.isNotBlank(projectContentData.getId())){
+            //修改
             projectContentData.preUpdate();
             dao.upodateConcealProject(projectContentData);
         }else{
+            //新增
             projectContentData.preInsert();
             dao.saveConcealProject(projectContentData);
         }
@@ -106,6 +135,7 @@ public class ArmorForMaterialsService extends CrudService<ArmorForMaterialsDao,
                     List<ProjectBasedData> projectBasedData = new ArrayList<>();
                     if(StringUtils.isNotBlank(data.getName())){
                         projectBasedData.add(data);
+                        //添加宜居性文件和甲供物资信息关系表
                         projectContentDataService.saveBasedData(projectContentData.getId(),projectBasedData);
                     }
                 }
@@ -115,9 +145,11 @@ public class ArmorForMaterialsService extends CrudService<ArmorForMaterialsDao,
         if (concealProjectInfo.getWorkAttachments()!=null && !concealProjectInfo.getWorkAttachments().isEmpty()) {
             //保存附件信息
             for (WorkClientAttachment workClientAttachment : concealProjectInfo.getWorkAttachments()) {
+                //判断是否已存在
                 if (StringUtils.isBlank(workClientAttachment.getId())&& StringUtils.isNotBlank(workClientAttachment.getAttachmentId())) {
                     continue;
                 }
+                //判断是否有文件
                 if (StringUtils.isBlank(workClientAttachment.getId())&& StringUtils.isBlank(workClientAttachment.getUrl())) {
                     continue;
                 }
@@ -126,13 +158,16 @@ public class ArmorForMaterialsService extends CrudService<ArmorForMaterialsDao,
                     workClientAttachment.setAttachmentFlag("135");
                     workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
                     if (StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())) {
+                        //新增
                         workClientAttachment.preInsert();
                         workClientAttachmentDao.insert(workClientAttachment);
                     } else {
+                        //修改
                         workClientAttachment.preUpdate();
                         workClientAttachmentDao.update(workClientAttachment);
                     }
                 } else {
+                    //删除
                     workClientAttachmentDao.delete(workClientAttachment);
                 }
             }
@@ -140,6 +175,10 @@ public class ArmorForMaterialsService extends CrudService<ArmorForMaterialsDao,
         return "true";
     }
 
+    /**
+     * 删除甲供物资信息
+     * @param concealProjectInfo
+     */
     @Transactional(readOnly = false)
     public void deleteConcealProject(ConcealProjectInfo concealProjectInfo){
         dao.deleteConcealProject(concealProjectInfo);

src/main/java/com/jeeplus/modules/projectrecord/service/concealProject/ConcealProjectService.java

@@ -77,26 +77,42 @@ public class ConcealProjectService extends CrudService<ConcealProjectDao, Concea
 	@Autowired
 	private WorkattachmentDao workattachmentDao;
 
-
+	/**
+	 * 获取隐蔽工程量基本信息
+	 * @param id
+	 * @return
+	 */
 	@Transactional(readOnly = true)
 	public List<ProjectContentData> getConcealProjectList(String id) {
 		List<ProjectContentData> projectVisaList=dao.getConcealProjectList(id);
 		return projectVisaList;
 	}
 
-
+	/**
+	 * 根据id查询信息
+	 * @param id
+	 * @return
+	 */
 	public ProjectContentData getProjectContentData(String id) {
+		//根据id查询信息
 		ProjectContentData projectContentData = dao.getConcealProjectData(id);
 		if(projectContentData!=null){
 			Workattachment workattachment = new Workattachment();
 			workattachment.setAttachmentId(id);
+			//查询并添加对应附件信息
 			projectContentData.setWorkAttachments(workattachmentDao.findList(workattachment));
 		}
 		return projectContentData;
 	}
 
+	/**
+	 * 删除工作内容引用资料中间表关系信息
+	 * @param contentId
+	 * @param basedId
+	 */
 	@Transactional(readOnly = false)
 	public void deleteBased(String contentId,String basedId) {
+		//调用删除方法
 		int i = dao.deleteBasedData(contentId, basedId);
 		if(i==0){
 			return;
@@ -104,6 +120,12 @@ public class ConcealProjectService extends CrudService<ConcealProjectDao, Concea
 	}
 
 
+	/**
+	 * 保存隐蔽工程量信息
+	 * @param concealProjectInfo
+	 * @return
+	 * @throws Exception
+	 */
 	@Transactional(readOnly = false)
 	public String saveData(ConcealProjectInfo concealProjectInfo) throws Exception {
 		Projectcontentinfo s = new Projectcontentinfo();
@@ -173,6 +195,10 @@ public class ConcealProjectService extends CrudService<ConcealProjectDao, Concea
 		return "true";
 	}
 
+	/**
+	 * 删除文件
+	 * @param concealProjectInfo
+	 */
 	@Transactional(readOnly = false)
 	public void deleteConcealProject(ConcealProjectInfo concealProjectInfo){
 		dao.deleteConcealProject(concealProjectInfo);

src/main/java/com/jeeplus/modules/projectrecord/service/distributionSettlement/DistributionSettlementService.java

@@ -26,7 +26,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * 甲供物资Service
+ * 分布结算Service
  * @author 徐滕
  * @version 2020-07-30
  */
@@ -45,26 +45,43 @@ public class DistributionSettlementService extends CrudService<DistributionSettl
     @Autowired
     private WorkattachmentDao workattachmentDao;
 
-
+    /**
+     * 根据合同id查询分布结算信息
+     * @param id
+     * @return
+     */
     @Transactional(readOnly = true)
     public List<ProjectContentData> getConcealProjectList(String id) {
+        //查询分布结算信息
         List<ProjectContentData> projectVisaList=dao.getConcealProjectList(id);
         return projectVisaList;
     }
 
-
+    /**
+     * 根据id查询分布结算信息
+     * @param id
+     * @return
+     */
     public ProjectContentData getProjectContentData(String id) {
+        //根据id查询分布结算信息
         ProjectContentData projectContentData = dao.getConcealProjectData(id);
         if(projectContentData!=null){
             Workattachment workattachment = new Workattachment();
             workattachment.setAttachmentId(id);
+            //查询并添加附件信息
             projectContentData.setWorkAttachments(workattachmentDao.findList(workattachment));
         }
         return projectContentData;
     }
 
+    /**
+     * 删除内容和依据性资料关联信息
+     * @param contentId
+     * @param basedId
+     */
     @Transactional(readOnly = false)
     public void deleteBased(String contentId,String basedId) {
+        //调用删除方法
         int i = dao.deleteBasedData(contentId, basedId);
         if(i==0){
             return;
@@ -72,6 +89,12 @@ public class DistributionSettlementService extends CrudService<DistributionSettl
     }
 
 
+    /**
+     * 保存信息
+     * @param concealProjectInfo
+     * @return
+     * @throws Exception
+     */
     @Transactional(readOnly = false)
     public String saveData(ConcealProjectInfo concealProjectInfo) throws Exception {
         Projectcontentinfo s = new Projectcontentinfo();
@@ -82,17 +105,22 @@ public class DistributionSettlementService extends CrudService<DistributionSettl
         //保存工作内容相关数据
         ProjectContentData projectContentData = concealProjectInfo.getProjectContentData();
         if(StringUtils.isNotBlank(projectContentData.getId())){
+            //查询分布结算信息
             ProjectContentData oldData = dao.getConcealProjectData(projectContentData.getId());
+            //数据整合
             MyBeanUtils.copyBeanNotNull2Bean(projectContentData, oldData);
             projectContentData = oldData;
         }
+        //添加基础信息
         projectContentData.setCompanyId(contentinfo.getCompanyId());
         projectContentData.setOfficeId(contentinfo.getOfficeId());
         projectContentData.setContractId(concealProjectInfo.getContract().getId());
         if(StringUtils.isNotBlank(projectContentData.getId())){
+            //修改
             projectContentData.preUpdate();
             dao.upodateConcealProject(projectContentData);
         }else{
+            //新增
             projectContentData.preInsert();
             dao.saveConcealProject(projectContentData);
         }
@@ -107,6 +135,7 @@ public class DistributionSettlementService extends CrudService<DistributionSettl
                     List<ProjectBasedData> projectBasedData = new ArrayList<>();
                     if(StringUtils.isNotBlank(data.getName())){
                         projectBasedData.add(data);
+                        //添加分布结算和依据性资料关系表
                         projectContentDataService.saveBasedData(projectContentData.getId(),projectBasedData);
                     }
                 }
@@ -127,13 +156,16 @@ public class DistributionSettlementService extends CrudService<DistributionSettl
                     workClientAttachment.setAttachmentFlag("135");
                     workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
                     if (StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())) {
+                        //新增
                         workClientAttachment.preInsert();
                         workClientAttachmentDao.insert(workClientAttachment);
                     } else {
+                        //修改
                         workClientAttachment.preUpdate();
                         workClientAttachmentDao.update(workClientAttachment);
                     }
                 } else {
+                    //删除
                     workClientAttachmentDao.delete(workClientAttachment);
                 }
             }
@@ -141,6 +173,10 @@ public class DistributionSettlementService extends CrudService<DistributionSettl
         return "true";
     }
 
+    /**
+     * 删除分布结算信息
+     * @param concealProjectInfo
+     */
     @Transactional(readOnly = false)
     public void deleteConcealProject(ConcealProjectInfo concealProjectInfo){
         dao.deleteConcealProject(concealProjectInfo);

src/main/java/com/jeeplus/modules/projectrecord/service/early/ProjectEarlyReviewService.java

@@ -41,19 +41,32 @@ public class ProjectEarlyReviewService extends CrudService<ProjectEarlyReviewDao
     @Autowired
     private ProjectEarlyReviewDao projectEarlyReviewDao;
 
+    /**
+     * 根据id查询项目信息
+     * @param id
+     * @return
+     */
     public ProjectImplementEarly get(String id) {
         return super.get(id);
     }
 
+    /**
+     * 查询项目信息集合
+     * @param page
+     * @param projectRecords
+     * @return
+     */
     public Page<ProjectImplementEarly> findProjectPage(Page<ProjectImplementEarly> page, ProjectImplementEarly projectRecords) {
         //设置数据权限
         if(!UserUtils.getUser().isAdmin()) {
             String dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_RECORDS.getValue());
+            //判断若dataScopeSql权限为空则调用下面的权限查询方法
             if(StringUtils.isBlank(dataScopeSql)){
                 dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_WORK_RECORDS.getValue());
             }
             projectRecords.getSqlMap().put("dsf", dataScopeSql);
         }
+        //查询数据条数
         Integer count = dao.getProjectRecodesCount(projectRecords);
         page.setCount(count);
         page.setCountFlag(false);
@@ -77,6 +90,7 @@ public class ProjectEarlyReviewService extends CrudService<ProjectEarlyReviewDao
      */
     public void queryContractInfos(ProjectImplementEarly projectRecords) {
         if (null != projectRecords.getWorkContractInfo()){
+            //查询合同信息
             WorkContractInfo workContractInfo = contractInfoService.get(projectRecords.getWorkContractInfo().getId());
             if(workContractInfo!=null){
                 workContractInfo.setConstructionProjectTypeStr(DictUtils.getMainDictLabel(String.valueOf(workContractInfo.getContractType()), "contract_type", ""));
@@ -122,7 +136,11 @@ public class ProjectEarlyReviewService extends CrudService<ProjectEarlyReviewDao
         return dao.saveProjectContrntAndReport(contentId,reportId);
     }
 
-    //ProjectRecordTreeData中的项目编号（根据类型名称）获取项目类型表的type_id
+    /**
+     * ProjectRecordTreeData中的项目编号（根据类型名称）获取项目类型表的type_id
+     * @param projectId
+     * @return
+     */
     public String getTypeId(String projectId) {
         return projectEarlyReviewDao.getTypeId(projectId);
     }

src/main/java/com/jeeplus/modules/projectrecord/service/implementStage/ProjectInterimPaymentService.java

@@ -96,11 +96,11 @@ public class ProjectInterimPaymentService extends CrudService<ProjectInterimPaym
         projectContentData.setCompanyId(contentinfo.getCompanyId());
         projectContentData.setOfficeId(contentinfo.getOfficeId());
         projectContentData.setContractId(concealProjectInfo.getContract().getId());
-
+        //获取工作内容详情信息
         ProjectRecords project = new ProjectRecords();
         project.setId(projectContentData.getContractId());
         projectContentData.setProject(project);
-
+        //保存工作内容详情信息表
         projectContentDataService.save(projectContentData);
         //保存工作内容详情
         if(com.jeeplus.common.utils.StringUtils.isNotBlank(projectContentData.getContentDetail())) {
@@ -183,6 +183,11 @@ public class ProjectInterimPaymentService extends CrudService<ProjectInterimPaym
         }
     }*/
 
+    /**
+     * 删除工作内容引用资料中间表信息
+     * @param contentId
+     * @param basedId
+     */
     @Transactional(readOnly = false)
     public void deleteBased(String contentId,String basedId) {
         int i = dao.deleteBasedData(contentId, basedId);

src/main/java/com/jeeplus/modules/projectrecord/service/material/MaterialService.java

@@ -27,6 +27,9 @@ import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * 暂定材料
+ */
 @Service
 @Transactional(readOnly = true)
 public class MaterialService extends CrudService<MaterialDao, MaterialProjectInfo> {
@@ -35,8 +38,6 @@ public class MaterialService extends CrudService<MaterialDao, MaterialProjectInf
     @Autowired
     private WorkClientAttachmentDao workClientAttachmentDao;
     @Autowired
-    private WorkConcealProjectService workConcealProjectService;
-    @Autowired
     private WorkMaterialsPriceService workMaterialsPriceService;
     @Autowired
     private WorkattachmentDao workattachmentDao;
@@ -44,23 +45,42 @@ public class MaterialService extends CrudService<MaterialDao, MaterialProjectInf
     @Autowired
     private MaterialDao dao;
 
+    /**
+     * 根据合同id查询暂定材料价信息集合
+     * @param id
+     * @return
+     */
     @Transactional(readOnly = true)
     public List<ProjectContentData> getMaterialList(String id) {
+        //查询集合
         List<ProjectContentData> projectMaterialList=dao.getMaterialList(id);
         return projectMaterialList;
     }
 
+    /**
+     * 根据id查询暂定材料价信息
+     * @param id
+     * @return
+     */
     public ProjectContentData getProjectContentData(String id) {
+        //查询暂定材料价信息
         ProjectContentData projectContentData = dao.getConcealProjectData(id);
         if(projectContentData!=null){
             Workattachment workattachment = new Workattachment();
             workattachment.setAttachmentId(id);
+            //查询附件信息并添加
             projectContentData.setWorkAttachments(workattachmentDao.findList(workattachment));
         }
         return projectContentData;
     }
 
 
+    /**
+     * 保存暂定材料价信息
+     * @param materialProjectInfo
+     * @return
+     * @throws Exception
+     */
     @Transactional(readOnly = false)
     public String saveData(MaterialProjectInfo materialProjectInfo) throws Exception {
         Projectcontentinfo s = new Projectcontentinfo();
@@ -71,17 +91,22 @@ public class MaterialService extends CrudService<MaterialDao, MaterialProjectInf
         //保存工作内容相关数据
         ProjectContentData projectContentData = materialProjectInfo.getProjectContentData();
         if(StringUtils.isNotBlank(projectContentData.getId())){
+            //获取暂定材料价信息
             ProjectContentData oldData = dao.getConcealProjectData(projectContentData.getId());
+            //数据整合
             MyBeanUtils.copyBeanNotNull2Bean(projectContentData, oldData);
             projectContentData = oldData;
         }
+        //添加基本数据
         projectContentData.setCompanyId(contentinfo.getCompanyId());
         projectContentData.setOfficeId(contentinfo.getOfficeId());
         projectContentData.setContractId(materialProjectInfo.getContract().getId());
         if(StringUtils.isNotBlank(projectContentData.getId())){
+            //修改
             projectContentData.preUpdate();
             dao.upodateConcealProject(projectContentData);
         }else{
+            //新增
             projectContentData.preInsert();
             dao.saveConcealProject(projectContentData);
         }
@@ -96,6 +121,7 @@ public class MaterialService extends CrudService<MaterialDao, MaterialProjectInf
                     List<ProjectBasedData> projectBasedData = new ArrayList<>();
                     if(StringUtils.isNotBlank(data.getName())){
                         projectBasedData.add(data);
+                        //添加保存暂定材料价信息和依据性资料关系信息
                         projectContentDataService.saveBasedData(projectContentData.getId(),projectBasedData);
                     }
                 }
@@ -116,13 +142,16 @@ public class MaterialService extends CrudService<MaterialDao, MaterialProjectInf
                     workClientAttachment.setAttachmentFlag("135");
                     workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
                     if (StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())) {
+                        //新增
                         workClientAttachment.preInsert();
                         workClientAttachmentDao.insert(workClientAttachment);
                     } else {
+                        //修改
                         workClientAttachment.preUpdate();
                         workClientAttachmentDao.update(workClientAttachment);
                     }
                 } else {
+                    //删除
                     workClientAttachmentDao.delete(workClientAttachment);
                 }
             }
@@ -130,6 +159,11 @@ public class MaterialService extends CrudService<MaterialDao, MaterialProjectInf
         return "true";
     }
 
+    /**
+     * 删除保存暂定材料价信息和依据性资料关系信息
+     * @param contentId
+     * @param basedId
+     */
     @Transactional(readOnly = false)
     public void deleteBased(String contentId,String basedId) {
         int i = dao.deleteBasedData(contentId, basedId);
@@ -138,6 +172,10 @@ public class MaterialService extends CrudService<MaterialDao, MaterialProjectInf
         }
     }
 
+    /**
+     * 删除保存暂定材料价信息
+     * @param materialProjectInfo
+     */
     @Transactional(readOnly = false)
     public void deleteConcealProject(MaterialProjectInfo materialProjectInfo){
         dao.deleteConcealProject(materialProjectInfo);

src/main/java/com/jeeplus/modules/projectrecord/service/monthly/MonthlyConsultationReportService.java

@@ -35,24 +35,40 @@ public class MonthlyConsultationReportService extends CrudService<MonthlyConsult
     @Autowired
     private ProjectReportNumDao projectReportNumDao;
 
+    /**
+     * 获取月报信息列表
+     * @param projectId
+     * @return
+     */
     public List<ProjectRecordTreeData> getFindList(String projectId){
         List<ProjectRecordTreeData> projectRecordTreeData = dao.getFindList(projectId);
         return projectRecordTreeData;
     }
 
 
+    /**
+     * 新增 编辑
+     * @param projectcontentinfo
+     * @return
+     * @throws Exception
+     */
     @Transactional(readOnly = false)
     public String saveData(Projectcontentinfo projectcontentinfo) throws Exception {
         String monthlyId = "";
+        //获取所有附件信息
         List<Workattachment> attachmentList = projectcontentinfo.getWorkAttachments();
         if(projectcontentinfo.getProjectContentData()!=null){
             MonthlyInfo monthly = new MonthlyInfo();
+            //月报信息处理
             MyBeanUtils.copyBeanNotNull2Bean(projectcontentinfo,monthly);
+            //月报添加项目id
             monthly.setProjectId(projectcontentinfo.getProject().getId());
             if(StringUtils.isNotBlank(monthly.getId())){
+                //修改操作
                 monthly.preUpdate();
                 dao.updateMonthly(monthly);
             }else{
+                //新增操作
                 monthly.setIsNewRecord(false);
                 //查询项目报告号前缀
                 String projectNumPrefix = dao.getProjectNum(monthly.getProjectId());
@@ -78,9 +94,11 @@ public class MonthlyConsultationReportService extends CrudService<MonthlyConsult
                 }else{
                     reportNum.setNum(reportNum.getNum()+"0001");
                 }
+                //报告号新增操作
                 reportNum.preInsert();
                 projectReportNumDao.insert(reportNum);
                 monthly.setMonthlyNumber(reportNum.getNum());
+                //月报新增操作
                 monthly.preInsert();
                 dao.saveMonthly(monthly);
             }
@@ -109,13 +127,16 @@ public class MonthlyConsultationReportService extends CrudService<MonthlyConsult
                     workattachment.setAttachmentId(monthlyId);
                     workattachment.setAttachmentUser(UserUtils.getUser().getId());
                     if (StringUtils.isBlank(workattachment.getId()) || "null".equals(workattachment.getId())) {
+                        //新增
                         workattachment.preInsert();
                         workattachmentDao.insert(workattachment);
                     } else {
+                        //修改
                         workattachment.preUpdate();
                         workattachmentDao.update(workattachment);
                     }
                 } else {
+                    //删除
                     workattachmentDao.delete(workattachment);
                 }
             }
@@ -123,6 +144,11 @@ public class MonthlyConsultationReportService extends CrudService<MonthlyConsult
         return "true";
     }
 
+    /**
+     * 根据id获取月报信息
+     * @param id
+     * @return
+     */
     public MonthlyInfo getById(String id){
         MonthlyInfo monthlyInfo = dao.getById(id);
         return monthlyInfo;
@@ -157,6 +183,10 @@ public class MonthlyConsultationReportService extends CrudService<MonthlyConsult
         return null;
     }
 
+    /**
+     * 删除月报信息
+     * @param id
+     */
     @Transactional(readOnly = false)
     public void deleteMonthly(String id){
         dao.deleteMonthly(id);

src/main/java/com/jeeplus/modules/projectrecord/web/Early/ProjectEarlyPigeonholeController.java

@@ -67,6 +67,7 @@ public class ProjectEarlyPigeonholeController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //获取项目列表信息
         Page<ProjectImplementEarly> page = projectEarlyPigeonholeService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
         List<ProjectImplementEarly> list = page.getList();
@@ -83,11 +84,13 @@ public class ProjectEarlyPigeonholeController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //获取项目列表信息
         Page<ProjectImplementEarly> page = projectEarlyPigeonholeService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
         List<ProjectImplementEarly> list = page.getList();
         List<ProjectRecordTreeData> projectRecordTreeDataList = new ArrayList<>();
         Map<String,List> map = new HashMap<>();
+        //对项目信息进行处理
         for (int i = 0; i < list.size(); i++) {
             ProjectRecordTreeData projectRecordTreeData = new ProjectRecordTreeData();
             ProjectImplementEarly records1 = list.get(i);
@@ -194,6 +197,15 @@ public class ProjectEarlyPigeonholeController extends BaseController {
         return map;
     }
 
+    /**
+     * 归档跳转方法（已废除）
+     * @param projectcontentinfo
+     * @param request
+     * @param response
+     * @param model
+     * @param attr
+     * @return
+     */
     @RequestMapping(value = {"reviewForm"})
     public String form(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
         String dictType = projectcontentinfo.getDictType();
@@ -264,7 +276,7 @@ public class ProjectEarlyPigeonholeController extends BaseController {
     }
 
     /**
-     * 发起审核操作
+     * 发起审核操作(已废除)
      * @param projectcontentinfo
      * @param request
      * @param response

src/main/java/com/jeeplus/modules/projectrecord/web/Early/ProjectEarlyReviewController.java

@@ -74,6 +74,7 @@ public class ProjectEarlyReviewController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //获取项目列表信息
         Page<ProjectImplementEarly> page = projectEarlyReviewService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
         List<ProjectImplementEarly> list = page.getList();
@@ -91,6 +92,7 @@ public class ProjectEarlyReviewController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //获取项目列表信息
         Page<ProjectImplementEarly> page = projectEarlyReviewService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
         List<ProjectImplementEarly> list = page.getList();
@@ -204,6 +206,16 @@ public class ProjectEarlyReviewController extends BaseController {
         return map;
     }
 
+    /**
+     * 审核方法
+     * @param projectcontentinfo
+     * @param request
+     * @param response
+     * @param model
+     * @param attr
+     * @param projectId
+     * @return
+     */
     @RequestMapping(value = {"reviewForm"})
     public String form(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr,String projectId) {
 
@@ -214,35 +226,42 @@ public class ProjectEarlyReviewController extends BaseController {
         }
 
         String dictType = projectcontentinfo.getDictType();
+        //获取项目信息
         ProjectRecords records = projectRecordsService.getQueryProjectUsers(projectcontentinfo.getProject().getId());
+        //将项目信息添加到工作内容管理中
         projectcontentinfo.setProject(records);
 
-
+        //创建报告详情
         ProjectReportData projectReportData = new ProjectReportData();
         projectReportData.setType(dictType);
+        //判断判定参数
         if (projectcontentinfo.getView().equals("reportChangeForm")){
             projectReportData = projectReportChangeService.get(projectcontentinfo.getProjectReportData().getId());
         }else {
             projectReportData.setNumber("");
         }
-
+        //判断报告类型负责人是否为空 为空则将当前登录用户添加为负责人
         if (projectReportData.getMaster()==null || StringUtils.isBlank(projectReportData.getMaster().getId())){
             projectReportData.setMaster(UserUtils.getUser());
         }
+        //判断项目类型status信息
         if (StringUtils.isBlank(projectReportData.getStatus())){
             projectReportData.setFileStatus("1");
         }
+        //根据id查询工作内容详情信息
         List<ProjectContentData> projectContentDataList = projectContentDataService.getProjectContentData(projectcontentinfo.getInfoId());
         //获取需要复核工作内容的对应typeId
         String typeId = projectContentDataList.get(0).getType();
 
         ProjectContentData projectContentData = new ProjectContentData();
         projectContentData.setType(dictType);
+        //判断详情页id是否为空 并获取详情信息
         if (StringUtils.isNotBlank(projectcontentinfo.getInfoId())){
             projectContentData = projectContentDataService.get(projectcontentinfo.getInfoId());
         }else if (projectcontentinfo.getProjectContentData()!=null && StringUtils.isNotBlank(projectcontentinfo.getProjectContentData().getId())) {
             projectContentData = projectContentDataService.get(projectcontentinfo.getProjectContentData().getId());
         }
+        //添加负责人信息
         projectContentData.setMaster(UserUtils.getUser());
         //查询是否含有上传或者引用的依据性文件信息
         if(StringUtils.isNotBlank(projectContentData.getId())){
@@ -259,8 +278,11 @@ public class ProjectEarlyReviewController extends BaseController {
         }
         //获取该工作内容的依据性资料信息
         List<ProjectBasedData> projectBasedDataList =  projectTypeService.getAccrdingDataList(typeId);
+        //遍历依据性资料
         for (ProjectBasedData projectBasedData: projectBasedDataList) {
+            //查询依据性文件信息
             ProjectBasedData contentAttachmentData =  projectTypeService.getBasedData(projectContentDataList.get(0).getId(),projectBasedData.getId());
+            //判断是否为空
             if (null != contentAttachmentData) {
                 try {
                     MyBeanUtils.copyBeanNotNull2Bean(contentAttachmentData, projectBasedData);
@@ -269,6 +291,7 @@ public class ProjectEarlyReviewController extends BaseController {
                 }
             }
             projectBasedData.setFlag("according");
+            //添加上传人信息
             if (StringUtils.isNotBlank(projectBasedData.getFileAttachmentId())) {
                 projectBasedData.setUploadUser(UserUtils.get(projectBasedData.getFileAttachmentId()));
             }
@@ -282,11 +305,13 @@ public class ProjectEarlyReviewController extends BaseController {
                 projectBasedData.setNature("必填");
             }
         }
+        //查询字典表名称
         for (ProjectBasedData projectBasedData: projectContentData.getProjectBasedDataList()) {
             projectBasedData.setType(dictService.dictLabel("project_document_type",projectBasedData.getType()));
         }
+        //将所有的宜居性资料信息全都添加到工作内容详情中
         projectContentData.getProjectBasedDataList().addAll(projectBasedDataList);
-
+        //将工作内容详情中的宜居性资料信息添加到报告详情中
         projectReportData.setProjectBasedDataList(projectContentData.getProjectBasedDataList());
         projectReportData.setProjectContentDataList(projectContentDataList);
         projectcontentinfo.setProjectReportData(projectReportData);
@@ -337,6 +362,7 @@ public class ProjectEarlyReviewController extends BaseController {
     public String saveReport(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response,
                              Model model,RedirectAttributes redirectAttributes)  {
         try{
+            //进行审核操作
             String str = projectcontentinfoService.saveData(projectcontentinfo,2);
             addMessage(redirectAttributes, "提交成果文件"+(str.equals("true")?"成功":"失败"));
             ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectImplementCompletionController.java

@@ -68,6 +68,11 @@ public class ProjectImplementCompletionController {
 
     /**
      * 项目列表页面
+     * @param projectRecords
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequiresPermissions("project:projectImplementCompletion:list")
     @RequestMapping(value = {"list", ""})
@@ -75,6 +80,7 @@ public class ProjectImplementCompletionController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //查询项目信息
         Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
         List<ProjectImplementEarly> list = page.getList();
@@ -83,7 +89,12 @@ public class ProjectImplementCompletionController {
     }
 
     /**
-     * 项目列表页面
+     * 项目列表页面树形图
+     * @param projectRecords
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequestMapping(value = "getProjectList")
     @ResponseBody
@@ -203,31 +214,46 @@ public class ProjectImplementCompletionController {
         return map;
     }
 
+    /**
+     * 新增、修改、查看方法
+     * @param projectcontentinfo
+     * @param request
+     * @param response
+     * @param model
+     * @param attr
+     * @return
+     */
     @RequestMapping(value = {"form"})
     public String form(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
         String dictType = projectcontentinfo.getDictType();
         String projectContentDataName = projectcontentinfo.getProjectContentData().getName();
+        //查询项目信息
         ProjectRecords records = projectRecordsService.getQueryProjectUsers(projectcontentinfo.getProject().getId());
         projectcontentinfo.setProject(records);
 
 
         ProjectContentData projectContentData = new ProjectContentData();
         projectContentData.setType(dictType);
+        //查询竣工阶段信息
         if (StringUtils.isNotBlank(projectcontentinfo.getInfoId())){
             projectContentData = projectContentDataService.get(projectcontentinfo.getInfoId());
         }else if (projectcontentinfo.getProjectContentData()!=null && StringUtils.isNotBlank(projectcontentinfo.getProjectContentData().getId())) {
             projectContentData = projectContentDataService.get(projectcontentinfo.getProjectContentData().getId());
         }
+        //添加负责人信息
         projectContentData.setMaster(UserUtils.getUser());
         if(StringUtils.isNotBlank(projectContentData.getId())){
+            //查询对应的过程控制表信息
             List<ProjectControlTable> controlData = projectControlTableService.getControlData(projectContentData.getId(),"");
             projectContentData.setProjectControlTableList(controlData);
+            //查询对应附件信息并添加
             projectContentDataService.queryBasedData(projectContentData);
         }
         if(StringUtils.isNotBlank(projectContentDataName)){
             projectContentData.setName(projectContentDataName);
         }
         projectcontentinfo.setProjectContentData(projectContentData);
+        //根据项目所属区域类型获取对应得二级级别信息
         String projectType = projectImplementEarlyService.getProjectType(records.getProjectTypeId(), "竣工阶段");
         projectcontentinfo.setType(projectType);
         if(StringUtils.isBlank(projectcontentinfo.getId()) && StringUtils.isNotBlank(projectcontentinfo.getProjectContentId())){
@@ -235,6 +261,7 @@ public class ProjectImplementCompletionController {
         }
         model.addAttribute("projectcontentinfo", projectcontentinfo);
         model.addAttribute("flag", "complement");
+        //判断是否是查看方法访问
         if (projectcontentinfo.getView().equals("contentView")){
             return "modules/projectcontentinfo/workContentView";
         }else {

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectImplementEarlyController.java

@@ -80,6 +80,7 @@ public class ProjectImplementEarlyController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //获取项目实施前期项目列表信息
         Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
         List<ProjectImplementEarly> list = page.getList();
@@ -96,6 +97,7 @@ public class ProjectImplementEarlyController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //获取项目实施前期项目列表信息
         Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
         List<ProjectImplementEarly> list = page.getList();
@@ -177,6 +179,7 @@ public class ProjectImplementEarlyController {
                 project.setId(records1.getId());
                 select.setParentIds("0,");
                 select.setProject(project);
+                //查询工作内容管理信息
                 List<Projectcontentinfo> p = projectcontentinfoService.findListByProject(select);
                 for (ProjectRecordTreeData reportData : reportDataList) {
                     //添加工作内容id
@@ -210,21 +213,35 @@ public class ProjectImplementEarlyController {
         return map;
     }
 
+    /**
+     * 新增方法
+     * @param projectcontentinfo
+     * @param request
+     * @param response
+     * @param model
+     * @param attr
+     * @return
+     */
     @RequestMapping(value = {"form"})
     public String form(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
         String dictType = projectcontentinfo.getDictType();
         String projectContentDataName = projectcontentinfo.getProjectContentData().getName();
+        //获取项目信息
         ProjectRecords records = projectRecordsService.getQueryProjectUsers(projectcontentinfo.getProject().getId());
+        //将项目信息添加到工作内容管理中
         projectcontentinfo.setProject(records);
         if (projectcontentinfo.getView().contains("before")){
             ProjectContentData projectContentData = new ProjectContentData();
             projectContentData.setType(dictType);
+            //获取工作内容详情信息
             if (StringUtils.isNotBlank(projectcontentinfo.getInfoId())){
                 projectContentData = projectContentDataService.get(projectcontentinfo.getInfoId());
             }else if (projectcontentinfo.getProjectContentData()!=null && StringUtils.isNotBlank(projectcontentinfo.getProjectContentData().getId())) {
                 projectContentData = projectContentDataService.get(projectcontentinfo.getProjectContentData().getId());
             }
+            //在工作内容详情信息中添加负责人信息
             projectContentData.setMaster(UserUtils.getUser());
+            //判断工作内容详情信息是否存在
             if(StringUtils.isNotBlank(projectContentData.getId())){
                 List<ProjectControlTable> controlData = projectControlTableService.getControlData(projectContentData.getId(),"");
                 projectContentData.setProjectControlTableList(controlData);
@@ -234,6 +251,7 @@ public class ProjectImplementEarlyController {
                 projectContentData.setName(projectContentDataName);
             }
             projectcontentinfo.setProjectContentData(projectContentData);
+            //获取项目类型
             String projectType = projectImplementEarlyService.getProjectType(records.getProjectTypeId(), "实施前期");
             projectcontentinfo.setType(projectType);
             if(StringUtils.isBlank(projectcontentinfo.getId()) && StringUtils.isNotBlank(projectcontentinfo.getProjectContentId())){
@@ -241,9 +259,11 @@ public class ProjectImplementEarlyController {
             }
             model.addAttribute("projectcontentinfo", projectcontentinfo);
             model.addAttribute("flag", "early");
+            //如果是查询则跳转查询页面
             if (projectcontentinfo.getView().equals("contentView")){
                 return "modules/projectcontentinfo/workContentView";
             }else {
+                //跳转新增页面
                 if (projectContentData != null && projectContentData.getCreateBy() != null && StringUtils.isNotBlank(projectContentData.getCreateBy().getId()) && projectContentData.getCreateBy().getId().equals(UserUtils.getUser().getId())) {
                     return "modules/projectrecord/workContentFromAndView/workContentForm";
                 } else if (projectContentData == null || StringUtils.isBlank(projectContentData.getId())) {
@@ -259,7 +279,7 @@ public class ProjectImplementEarlyController {
     }
 
     /**
-     * 根据type查询对应的宜居性文件内容
+     * 根据type查询对应的依据性文件内容
      * @param typeId
      * @return
      */
@@ -269,6 +289,7 @@ public class ProjectImplementEarlyController {
         Map<String,List<ProjectBasedData>> map = new HashMap<>();
         //获取该工作内容的依据性资料信息
         List<ProjectBasedData> projectBasedDataList =  projectTypeService.getAccrdingDataList(typeId);
+        //判断是否含有依据性文件  若有则添加基础信息
         if(projectBasedDataList.size()>0){
             for (ProjectBasedData projectBasedData: projectBasedDataList) {
                 projectBasedData.setFlag("according");

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectPlanController.java

@@ -77,8 +77,9 @@ public class ProjectPlanController extends BaseController {
             model.addAttribute("flag","1");
         }
         projectRecords.setProjectStatus(5);
+        //查询已审核通过的项目信息
         Page<ProjectRecords> page = projectRecordsService.findPage(new Page<ProjectRecords>(request, response), projectRecords);
-        //无合同状态下，获取委托方的名称
+        //无合同状态下，获取委托方的名称，并将委托方信息添加到数据中
         List<ProjectRecords> list = page.getList();
         for (int i = 0; i < list.size(); i++) {
             ProjectRecords records1 = list.get(i);
@@ -92,6 +93,7 @@ public class ProjectPlanController extends BaseController {
                 }
             }
             Set masterIdSet = new HashSet();
+            //将项目的项目负责人id进行去重处理
             for (User masterUser:records1.getProjectLeaders()) {
                 masterIdSet.add(masterUser.getId());
             }
@@ -102,11 +104,6 @@ public class ProjectPlanController extends BaseController {
             records1.setProjectMembers(members);
             records1.setMemberNameStr(Collections3.extractToString(members, "name", ","));
             records1.setMemberIds(Collections3.extractToString(members, "id", ","));
-            for (User masterUser:records1.getProjectMembers()) {
-                masterIdSet.add(masterUser.getId());
-            }
-
-
 
             //Set转List
             List<String> masterIdList = new ArrayList<>(masterIdSet);
@@ -127,10 +124,12 @@ public class ProjectPlanController extends BaseController {
     @RequestMapping(value = {"form"})
     public String form(ProjectRecords projectRecords, Model model) {
         boolean flag = false;
+        //判断是否为查看信息操作
         if("view".equals(projectRecords.getView())){
             flag = true;
         }
         //获取项目信息
+        //如果没有id则为新增 添加创建人信息和当前创建时间信息
         if (projectRecords!=null&&StringUtils.isNotBlank(projectRecords.getId())) {
             projectRecords = projectRecordsService.get(projectRecords.getId());
         }else {
@@ -138,8 +137,10 @@ public class ProjectPlanController extends BaseController {
             projectRecords.setCreateDate(new Date());
         }
 
+        //获取项目计划通知栏中的项目类型信息
         List<ProjectType> projectTypeList = projectRecordsService.getProjectType(projectRecords.getProjectTypeId());
         ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
+        //将项目id放入项目计划表中
         projectPlanInfo.setProjectId(projectRecords.getId());
         //获取项目计划信息
         List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
@@ -173,6 +174,7 @@ public class ProjectPlanController extends BaseController {
     @RequestMapping(value = "export")
     public String exportFile(ProjectRecords projectRecords, HttpServletResponse response, RedirectAttributes redirectAttributes) {
         try {
+            //文件名称
             String fileName = projectRecords.getProjectName()+"-项目计划.xlsx";
             ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
             projectPlanInfo.setProjectId(projectRecords.getId());

src/main/java/com/jeeplus/modules/projectrecord/web/armorForMaterials/ArmorForMaterialsController.java

@@ -75,7 +75,12 @@ public class ArmorForMaterialsController extends BaseController {
     }
 
     /**
-     * 签证汇总表列表页面
+     * 甲供物资审核list页面
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequiresPermissions("project:armorForMaterials:list")
     @RequestMapping(value = {"list", ""})
@@ -87,12 +92,20 @@ public class ArmorForMaterialsController extends BaseController {
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        //获取项目信息
         Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
         return "modules/projectrecord/armorForMaterials/armorForMaterialsList";
     }
 
-    //获取树状图
+    /**
+     * 甲供物资审核页面树形图信息
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "getProjectList")
     @ResponseBody
     public Map<String, List> getTreeList(ConstructionContract constructionContract, HttpServletRequest request, HttpServletResponse response, Model model){
@@ -234,21 +247,28 @@ public class ArmorForMaterialsController extends BaseController {
 
         ProjectContentData projectContentData = new ProjectContentData();
         projectContentData.setType("");
+        //根据infoId查询工作内容详情信息
         if (StringUtils.isNotBlank(concealProjectInfo.getInfoId())){
             projectContentData = armorForMaterialsService.getProjectContentData(concealProjectInfo.getInfoId());
         }else if (concealProjectInfo.getProjectContentData()!=null && StringUtils.isNotBlank(concealProjectInfo.getProjectContentData().getId())) {
             projectContentData = armorForMaterialsService.getProjectContentData(concealProjectInfo.getProjectContentData().getId());
         }
+        //添加负责人信息
         projectContentData.setMaster(UserUtils.getUser());
+        //判断工作内容详情信息是否存在
         if(StringUtils.isNotBlank(projectContentData.getId())){
+            //查询相对应的过程控制表信息
             List<ProjectControlTable> controlData = projectControlTableService.getControlData(projectContentData.getId(),"");
+            //添加过程控制表信息
             projectContentData.setProjectControlTableList(controlData);
+            //查询并添加附件信息
             projectContentDataService.queryBasedData(projectContentData);
         }
 
         concealProjectInfo.setCondition("armor");
         concealProjectInfo.setProjectContentData(projectContentData);
         model.addAttribute("concealProjectInfo", concealProjectInfo);
+        //判断是否为查看页面方法
         if("view".equals(concealProjectInfo.getType())){
             return "modules/projectrecord/armorForMaterials/armorForMaterialsView";
         }
@@ -264,18 +284,26 @@ public class ArmorForMaterialsController extends BaseController {
      */
     @RequestMapping(value = {"save"})
     public String save(ConcealProjectInfo concealProjectInfo, RedirectAttributes redirectAttributes) throws Exception {
-
+        //调用新增方法
         String str = armorForMaterialsService.saveData(concealProjectInfo);
         addMessage(redirectAttributes, "保存甲供物资内容信息"+(str.equals("true")?"成功":"失败"));
         return "redirect:"+Global.getAdminPath()+"/project/armorForMaterials/?repage";
     }
 
+    /**
+     * 删除依据性资料
+     * @param contentId
+     * @param basedId
+     * @return
+     */
     @RequestMapping("ajaxdelete")
     @ResponseBody
     public AjaxJson deleteBased(String contentId, String basedId){
         AjaxJson ajaxJson = new AjaxJson();
         try {
             if (StringUtils.isNotBlank(contentId)) {
+                //调用删除方法
+                //删除依据性资料联系表中的信息
                 armorForMaterialsService.deleteBased(contentId, basedId);
             }
             Integer count = projectContentDataService.countBased(basedId);
@@ -296,6 +324,7 @@ public class ArmorForMaterialsController extends BaseController {
      */
     @RequestMapping(value = {"deleteConcealProject"})
     public String deleteConcealProject(ConcealProjectInfo concealProjectInfo) {
+        //调用删除方法
         armorForMaterialsService.deleteConcealProject(concealProjectInfo);
         return "redirect:"+ Global.getAdminPath()+"/project/armorForMaterials/?repage";
     }

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

@@ -40,7 +40,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 
-//实施阶段-签证汇总
+//实施阶段-设计变更汇总
 @Controller
 @RequestMapping(value = "${adminPath}/project/checkDesign")
 public class ChechDesignController extends BaseController {
@@ -73,13 +73,19 @@ public class ChechDesignController extends BaseController {
     }
 
     /**
-     * 签证汇总表列表页面
+     * 设计变更汇总表列表页面
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequestMapping(value = {"list", ""})
     public String list(ConstructionContract constructionContract, HttpServletRequest request, HttpServletResponse response, Model model) {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //查询合同信息
         Page<ConstructionContract> page = contractService.findPage(new Page<ConstructionContract>(request, response), constructionContract);
         model.addAttribute("page", page);
         model.addAttribute("reportType","3");
@@ -88,26 +94,36 @@ public class ChechDesignController extends BaseController {
         return "modules/projectrecord/check/checkDesignList";
     }
 
-    //添加签证汇总页面
+    /**
+     * 添加设计变更汇总页面
+     * @param concealProjectInfo
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "form")
     public String form(ConcealProjectInfo concealProjectInfo, Model model) {
 
         ProjectContentData projectContentData = new ProjectContentData();
         projectContentData.setType("");
+        //查询设计变更信息
         if (StringUtils.isNotBlank(concealProjectInfo.getInfoId())){
             projectContentData = projectVisaService.getProjectContentData(concealProjectInfo.getInfoId());
         }else if (concealProjectInfo.getProjectContentData()!=null && StringUtils.isNotBlank(concealProjectInfo.getProjectContentData().getId())) {
             projectContentData = projectVisaService.getProjectContentData(concealProjectInfo.getProjectContentData().getId());
         }
+        //添加负责人
         projectContentData.setMaster(UserUtils.getUser());
         if(StringUtils.isNotBlank(projectContentData.getId())){
+            //查询过程控制明细信息
             List<ProjectControlTable> controlData = projectControlTableService.getControlData(projectContentData.getId(),"");
             projectContentData.setProjectControlTableList(controlData);
+            //查询并添加附件信息
             projectContentDataService.queryBasedData(projectContentData);
         }
 
         concealProjectInfo.setProjectContentData(projectContentData);
         model.addAttribute("concealProjectInfo", concealProjectInfo);
+        //判断是否为查看页面
         if("view".equals(concealProjectInfo.getView())){
             return "modules/projectrecord/design/projectDesignView";
         }
@@ -115,17 +131,25 @@ public class ChechDesignController extends BaseController {
     }
 
     /**
-     * 工程费用列表页面
+     * 设计变更列表页面
+     * @param projectVisa
+     * @param view
+     * @param request
+     * @param model
+     * @return
      */
     @RequestMapping(value = {"visaList"})
     public String list(ProjectVisa projectVisa, String view, HttpServletRequest request, Model model) {
+        //获取判断条件sign
         String sign = request.getParameter("sign");
         List<String> signList = new ArrayList();
         if (StringUtils.isNotBlank(sign)){
+            //根据，分割
             signList = Arrays.asList(sign.split(","));
         }
         List<ProjectVisa> list = new ArrayList<>();
         if(StringUtils.isNotBlank(projectVisa.getContentId())){
+            //查询设计变更信息list
             list = projectVisaService.findList(projectVisa);
         }
         if(null != list){
@@ -138,6 +162,7 @@ public class ChechDesignController extends BaseController {
         model.addAttribute("signList", signList);
         model.addAttribute("investmentCostList", list);
         String viewPath = "modules/workcontent/workDesignChangeList";
+        //判断是否为查看页面
         if("view".equals(view)){
             viewPath+="View";
         }
@@ -150,14 +175,21 @@ public class ChechDesignController extends BaseController {
         return viewPath;
     }
 
-    //编辑签证汇总页面
+    /**
+     * 编辑设计变更汇总页面
+     * @param projectVisa
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "updateTable")
     public String updateTable(ProjectVisa projectVisa, Model model) {
 
         if(StringUtils.isNotEmpty(projectVisa.getId())){
+            //查询设计变更信息
             ProjectVisa visa=projectVisaService.getDesign(projectVisa);
             WorkClientAttachment attchment = new WorkClientAttachment();
             attchment.setAttachmentId(projectVisa.getId());
+            //查询附件信息
             List<WorkClientAttachment> attachments = workClientAttachmentDao.findList(attchment);
             visa.setWorkAttachments(attachments);
             model.addAttribute("projectVisa", visa);
@@ -168,15 +200,21 @@ public class ChechDesignController extends BaseController {
         return "modules/projectrecord/implementStage/projectDesignForm";
     }
 
-    //编辑签证汇总页面
+    /**
+     * 查看设计变更汇总页面
+     * @param projectVisa
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "view")
     public String view(ProjectVisa projectVisa, Model model) {
 
         if(StringUtils.isNotEmpty(projectVisa.getId())){
-
+            //获取设计变更信息
             ProjectVisa visa=projectVisaService.getDesign(projectVisa);
             WorkClientAttachment attchment = new WorkClientAttachment();
             attchment.setAttachmentId(projectVisa.getId());
+            //获取附件信息
             List<WorkClientAttachment> attachments = workClientAttachmentDao.findList(attchment);
             visa.setWorkAttachments(attachments);
             model.addAttribute("projectVisa", visa);
@@ -189,7 +227,11 @@ public class ChechDesignController extends BaseController {
 
 
     /**
-     * 保存客户管理
+     * 保存信息
+     * @param concealProjectInfo
+     * @param redirectAttributes
+     * @return
+     * @throws Exception
      */
     @RequestMapping(value = "save")
     public String save(ConcealProjectInfo concealProjectInfo, RedirectAttributes redirectAttributes) throws Exception {
@@ -200,7 +242,14 @@ public class ChechDesignController extends BaseController {
     }
 
 
-    //获取树状图
+    /**
+     * 获取设计变更树状图信息
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "getVisaList")
     @ResponseBody
     public Map<String,List> getTreeList(ConstructionContract constructionContract, HttpServletRequest request, HttpServletResponse response, Model model){

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

@@ -69,13 +69,19 @@ public class CheckClaimController extends BaseController {
     }
 
     /**
-     * 签证汇总表列表页面
+     * 索赔管理表列表页面
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequestMapping(value = {"list", ""})
     public String list(ConstructionContract constructionContract, HttpServletRequest request, HttpServletResponse response, Model model) {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //查询合同信息
         Page<ConstructionContract> page = contractService.findPage(new Page<ConstructionContract>(request, response), constructionContract);
         model.addAttribute("page", page);
         model.addAttribute("reportType","3");
@@ -84,7 +90,14 @@ public class CheckClaimController extends BaseController {
         return "modules/projectrecord/check/checkClaimList";
     }
 
-    //获取树状图
+    /**
+     * 查询索赔管理列表树状图信息
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "getVisaList")
     @ResponseBody
     public Map<String,List> getTreeList(ConstructionContract constructionContract, HttpServletRequest request, HttpServletResponse response, Model model){
@@ -224,26 +237,36 @@ public class CheckClaimController extends BaseController {
         return map;
     }
 
-    //添加签证汇总页面
+    /**
+     * 添加索赔管理页面
+     * @param concealProjectInfo
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "form")
     public String form(ConcealProjectInfo concealProjectInfo, Model model) {
 
         ProjectContentData projectContentData = new ProjectContentData();
         projectContentData.setType("");
+        //查询索赔管理信息
         if (StringUtils.isNotBlank(concealProjectInfo.getInfoId())){
             projectContentData = projectVisaService.getProjectContentData(concealProjectInfo.getInfoId());
         }else if (concealProjectInfo.getProjectContentData()!=null && StringUtils.isNotBlank(concealProjectInfo.getProjectContentData().getId())) {
             projectContentData = projectVisaService.getProjectContentData(concealProjectInfo.getProjectContentData().getId());
         }
+        //添加负责人信息
         projectContentData.setMaster(UserUtils.getUser());
         if(StringUtils.isNotBlank(projectContentData.getId())){
+            //查询过程控制明细信息
             List<ProjectControlTable> controlData = projectControlTableService.getControlData(projectContentData.getId(),"");
             projectContentData.setProjectControlTableList(controlData);
+            //查询并添加附件信息
             projectContentDataService.queryBasedData(projectContentData);
         }
 
         concealProjectInfo.setProjectContentData(projectContentData);
         model.addAttribute("concealProjectInfo", concealProjectInfo);
+        //判断是否为查看页面
         if("view".equals(concealProjectInfo.getView())){
             return "modules/projectrecord/claim/projectClaimView";
         }
@@ -251,17 +274,25 @@ public class CheckClaimController extends BaseController {
     }
 
     /**
-     * 工程费用列表页面
+     * 索赔管理页面
+     * @param projectVisa
+     * @param view
+     * @param request
+     * @param model
+     * @return
      */
     @RequestMapping(value = {"visaList"})
     public String list(ProjectVisa projectVisa, String view, HttpServletRequest request, Model model) {
+        //获取判断条件sign
         String sign = request.getParameter("sign");
         List<String> signList = new ArrayList();
         if (StringUtils.isNotBlank(sign)){
+            //根据，分割
             signList = Arrays.asList(sign.split(","));
         }
         List<ProjectVisa> list = new ArrayList<>();
         if(StringUtils.isNotBlank(projectVisa.getContentId())){
+            //查询索赔管理信息list
             list = projectVisaService.findList(projectVisa);
         }
         if(null != list){
@@ -274,6 +305,7 @@ public class CheckClaimController extends BaseController {
         model.addAttribute("signList", signList);
         model.addAttribute("investmentCostList", list);
         String viewPath = "modules/workcontent/workClaimList";
+        //判断是否为查看页面
         if("view".equals(view)){
             viewPath+="View";
         }
@@ -288,20 +320,25 @@ public class CheckClaimController extends BaseController {
 
     /**
      * 保存信息
+     * @param concealProjectInfo
+     * @param redirectAttributes
+     * @return
+     * @throws Exception
      */
     @RequestMapping(value = "save")
     public String save(ConcealProjectInfo concealProjectInfo, RedirectAttributes redirectAttributes) throws Exception {
-
+        //调用保存方法
         String str = projectVisaService.saveData(concealProjectInfo);
         addMessage(redirectAttributes, "保存索赔信息"+(str.equals("true")?"成功":"失败"));
         return "redirect:"+Global.getAdminPath()+"/project/projectClaim/?repage";
     }
 
 
-
-
     /**
      * 删除
+     * @param projectVisa
+     * @param redirectAttributes
+     * @return
      */
     @RequestMapping(value = "delete")
     @ResponseBody

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

@@ -75,7 +75,12 @@ public class CheckDistributionSettlementController extends BaseController {
     }
 
     /**
-     * 签证汇总表列表页面
+     * 分布结算信息列表
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequestMapping(value = {"list", ""})
     public String list(ConstructionContract constructionContract, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -86,6 +91,7 @@ public class CheckDistributionSettlementController extends BaseController {
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        //查询项目信息
         Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
         model.addAttribute("reportType","3");
@@ -94,7 +100,14 @@ public class CheckDistributionSettlementController extends BaseController {
         return "modules/projectrecord/check/checkDistributionSettlementList";
     }
 
-    //获取树状图
+    /**
+     * 查询分布结算信息列表树状图
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "getProjectList")
     @ResponseBody
     public Map<String, List> getTreeList(ConstructionContract constructionContract, HttpServletRequest request, HttpServletResponse response, Model model){
@@ -237,7 +250,7 @@ public class CheckDistributionSettlementController extends BaseController {
     }
 
     /**
-     * 甲供物资查方法
+     * 分布结算查方法
      * @param concealProjectInfo
      * @param model
      * @return
@@ -247,15 +260,19 @@ public class CheckDistributionSettlementController extends BaseController {
 
         ProjectContentData projectContentData = new ProjectContentData();
         projectContentData.setType("");
+        //查询分布结算信息
         if (StringUtils.isNotBlank(concealProjectInfo.getInfoId())){
             projectContentData = distributionSettlementService.getProjectContentData(concealProjectInfo.getInfoId());
         }else if (concealProjectInfo.getProjectContentData()!=null && StringUtils.isNotBlank(concealProjectInfo.getProjectContentData().getId())) {
             projectContentData = distributionSettlementService.getProjectContentData(concealProjectInfo.getProjectContentData().getId());
         }
+        //添加负责人信息
         projectContentData.setMaster(UserUtils.getUser());
         if(StringUtils.isNotBlank(projectContentData.getId())){
+            //查询过程控制明细信息
             List<ProjectControlTable> controlData = projectControlTableService.getControlData(projectContentData.getId(),"");
             projectContentData.setProjectControlTableList(controlData);
+            //查询并添加附件信息
             projectContentDataService.queryBasedData(projectContentData);
         }
 
@@ -264,6 +281,7 @@ public class CheckDistributionSettlementController extends BaseController {
         }
         concealProjectInfo.setProjectContentData(projectContentData);
         model.addAttribute("concealProjectInfo", concealProjectInfo);
+        //判断是否为查看页面
         if("view".equals(concealProjectInfo.getType())){
             return "modules/projectrecord/distributionSettlement/distributionSettlementView";
         }
@@ -271,7 +289,7 @@ public class CheckDistributionSettlementController extends BaseController {
     }
 
     /**
-     * 甲供物资增改方法
+     * 分布结算增改方法
      * @param concealProjectInfo
      * @param redirectAttributes
      * @return
@@ -279,18 +297,25 @@ public class CheckDistributionSettlementController extends BaseController {
      */
     @RequestMapping(value = {"save"})
     public String save(ConcealProjectInfo concealProjectInfo, RedirectAttributes redirectAttributes) throws Exception {
-
+        //调用新增方法
         String str = distributionSettlementService.saveData(concealProjectInfo);
         addMessage(redirectAttributes, "保存分布结算内容信息"+(str.equals("true")?"成功":"失败"));
         return "redirect:"+Global.getAdminPath()+"/project/distributionSettlement/?repage";
     }
 
+    /**
+     * 删除分布结算和宜居性资料关系
+     * @param contentId
+     * @param basedId
+     * @return
+     */
     @RequestMapping("ajaxdelete")
     @ResponseBody
     public AjaxJson deleteBased(String contentId, String basedId){
         AjaxJson ajaxJson = new AjaxJson();
         try {
             if (StringUtils.isNotBlank(contentId)) {
+                //调用删除方法
                 distributionSettlementService.deleteBased(contentId, basedId);
             }
             Integer count = projectContentDataService.countBased(basedId);
@@ -305,7 +330,7 @@ public class CheckDistributionSettlementController extends BaseController {
 
 
     /**
-     * 甲供物资删除方法
+     * 分布结算删除方法
      * @param concealProjectInfo
      * @return
      */

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

@@ -72,6 +72,11 @@ public class CheckInterimPaymentController extends BaseController {
 
     /**
      * 合同列表页面
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequiresPermissions("project:checkInterimPayment:list")
     @RequestMapping(value = {"list", ""})
@@ -79,6 +84,7 @@ public class CheckInterimPaymentController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //查询合同信息
         Page<ConstructionContract> page = contractService.findPage(new Page<ConstructionContract>(request, response), constructionContract);
         //无合同状态下，获取委托方的名称
         List<ConstructionContract> list = page.getList();
@@ -89,7 +95,14 @@ public class CheckInterimPaymentController extends BaseController {
         return "modules/projectrecord/check/checkInterimPayment";
     }
 
-    //获取树状图
+    /**
+     * 获取复核树状图信息
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "getProjectList")
     @ResponseBody
     public Map<String, List> getTreeList(ConstructionContract constructionContract, HttpServletRequest request, HttpServletResponse response, Model model){
@@ -231,7 +244,7 @@ public class CheckInterimPaymentController extends BaseController {
 
 
     /**
-     * 跳转方法
+     * 审核跳转方法
      * @param projectcontentinfo
      * @param model
      * @return
@@ -246,6 +259,7 @@ public class CheckInterimPaymentController extends BaseController {
         }
 
         String dictType = projectcontentinfo.getDictType();
+        //查询项目信息
         ProjectRecords records = projectRecordsService.getQueryProjectUsers(projectcontentinfo.getProject().getId());
         projectcontentinfo.setProject(records);
 
@@ -253,17 +267,21 @@ public class CheckInterimPaymentController extends BaseController {
         ProjectReportData projectReportData = new ProjectReportData();
         projectReportData.setType(dictType);
         if (projectcontentinfo.getView().equals("reportChangeForm")){
+            //查询详情信息
             projectReportData = projectReportChangeService.get(projectcontentinfo.getProjectReportData().getId());
         }else {
             projectReportData.setNumber("");
         }
 
         if (projectReportData.getMaster()==null || StringUtils.isBlank(projectReportData.getMaster().getId())){
+            //添加负责人信息
             projectReportData.setMaster(UserUtils.getUser());
         }
+        //判断归档状态  没参数则添加1 为未归档状态
         if (StringUtils.isBlank(projectReportData.getStatus())){
             projectReportData.setFileStatus("1");
         }
+        //查询工作内容信息
         List<ProjectContentData> projectContentDataList = projectContentDataService.getProjectContentData(projectcontentinfo.getInfoId());
         //获取需要复核工作内容的对应typeId
         String typeId = projectContentDataList.get(0).getType();
@@ -273,13 +291,16 @@ public class CheckInterimPaymentController extends BaseController {
             ProjectBasedData contentAttachmentData =  projectTypeService.getBasedData(projectContentDataList.get(0).getId(),projectBasedData.getId());
             if (null != contentAttachmentData) {
                 try {
+                    //数据整理
                     MyBeanUtils.copyBeanNotNull2Bean(contentAttachmentData, projectBasedData);
                 }catch (Exception e) {
                     e.printStackTrace();
                 }
             }
+            //添加判断条件
             projectBasedData.setFlag("according");
             if (StringUtils.isNotBlank(projectBasedData.getFileAttachmentId())) {
+                //添加依据性资料信息
                 projectBasedData.setUploadUser(UserUtils.get(projectBasedData.getFileAttachmentId()));
             }
             //判断是否有上传文件 如果没有上传文件则添加当前登录人信息 和当前时间作为上传时间
@@ -291,6 +312,7 @@ public class CheckInterimPaymentController extends BaseController {
 
         ProjectContentData projectContentData = new ProjectContentData();
         projectContentData.setType(dictType);
+        //根据infoId查询详情信息
         if (StringUtils.isNotBlank(projectcontentinfo.getInfoId())){
             projectContentData = projectContentDataService.get(projectcontentinfo.getInfoId());
         }else if (projectcontentinfo.getProjectContentData()!=null && StringUtils.isNotBlank(projectcontentinfo.getProjectContentData().getId())) {
@@ -306,8 +328,10 @@ public class CheckInterimPaymentController extends BaseController {
 
 
         for (ProjectBasedData projectBasedData: projectContentData.getProjectBasedDataList()) {
+            //根据字典表key键查询添加type信息
             projectBasedData.setType(dictService.dictLabel("project_document_type",projectBasedData.getType()));
         }
+        //将所有的宜居性资料信息全部添加进来
         projectContentData.getProjectBasedDataList().addAll(projectBasedDataList);
 
         projectReportData.setProjectBasedDataList(projectContentData.getProjectBasedDataList());
@@ -320,6 +344,7 @@ public class CheckInterimPaymentController extends BaseController {
         model.addAttribute("projectId", projectcontentinfo.getProject().getId());
         model.addAttribute("reportType", projectcontentinfo.getReportType());
         model.addAttribute("projectType",projectcontentinfo.getProjectType());
+        //判断是审核 还是查看方法
         if (projectReportData == null || StringUtils.isBlank(projectReportData.getId())) {
             model.addAttribute("condition", projectcontentinfo.getCondition());
             return "modules/projectrecord/check/reportForm";
@@ -333,20 +358,28 @@ public class CheckInterimPaymentController extends BaseController {
      */
     @RequestMapping(value = "save")
     public String save(ConcealProjectInfo concealProjectInfo, RedirectAttributes redirectAttributes) throws Exception {
-
+        //条用新增方法
         String str = service.saveData(concealProjectInfo);
         addMessage(redirectAttributes, "保存工程进度款信息"+(str.equals("true")?"成功":"失败"));
         return "redirect:"+Global.getAdminPath()+"/project/checkInterimPayment/?repage";
     }
 
+    /**
+     * 删除内容和宜居性资料关系信息
+     * @param contentId
+     * @param basedId
+     * @return
+     */
     @RequestMapping("ajaxdelete")
     @ResponseBody
     public AjaxJson deleteBased(String contentId, String basedId){
         AjaxJson ajaxJson = new AjaxJson();
         try {
             if (StringUtils.isNotBlank(contentId)) {
+                //调用删除
                 service.deleteBased(contentId, basedId);
             }
+            //查询信息条数
             Integer count = projectContentDataService.countBased(basedId);
             ajaxJson.getBody().put("inuse", count == null ? true : count > 0);
         }catch (Exception e){

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

@@ -77,12 +77,18 @@ public class CheckVisaController extends BaseController {
 
     /**
      * 签证汇总表列表页面
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequestMapping(value = {"list", ""})
     public String list(ConstructionContract constructionContract, HttpServletRequest request, HttpServletResponse response, Model model) {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //查询合同信息
         Page<ConstructionContract> page = contractService.findPage(new Page<ConstructionContract>(request, response), constructionContract);
         model.addAttribute("page", page);
         model.addAttribute("reportType","3");
@@ -91,26 +97,36 @@ public class CheckVisaController extends BaseController {
         return "modules/projectrecord/check/checkVisaList";
     }
 
-    //添加签证汇总页面
+    /**
+     * 添加签证汇总页面
+     * @param concealProjectInfo
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "form")
     public String form(ConcealProjectInfo concealProjectInfo, Model model) {
 
         ProjectContentData projectContentData = new ProjectContentData();
         projectContentData.setType("");
+        //查询签证汇总信息
         if (StringUtils.isNotBlank(concealProjectInfo.getInfoId())){
             projectContentData = projectVisaService.getProjectContentData(concealProjectInfo.getInfoId());
         }else if (concealProjectInfo.getProjectContentData()!=null && StringUtils.isNotBlank(concealProjectInfo.getProjectContentData().getId())) {
             projectContentData = projectVisaService.getProjectContentData(concealProjectInfo.getProjectContentData().getId());
         }
+        //添加负责人
         projectContentData.setMaster(UserUtils.getUser());
         if(StringUtils.isNotBlank(projectContentData.getId())){
+            //查询过程控制明细信息
             List<ProjectControlTable> controlData = projectControlTableService.getControlData(projectContentData.getId(),"");
             projectContentData.setProjectControlTableList(controlData);
+            //查询并添加附件信息
             projectContentDataService.queryBasedData(projectContentData);
         }
 
         concealProjectInfo.setProjectContentData(projectContentData);
         model.addAttribute("concealProjectInfo", concealProjectInfo);
+        //判断是否为查看页面
         if("view".equals(concealProjectInfo.getView())){
             return "modules/projectrecord/visa/projectVisaView";
         }
@@ -118,17 +134,25 @@ public class CheckVisaController extends BaseController {
     }
 
     /**
-     * 工程费用列表页面
+     * 签证汇总页
+     * @param projectVisa
+     * @param view
+     * @param request
+     * @param model
+     * @return
      */
     @RequestMapping(value = {"visaList"})
     public String list(ProjectVisa projectVisa, String view, HttpServletRequest request, Model model) {
+        //获取判断条件sign
         String sign = request.getParameter("sign");
         List<String> signList = new ArrayList();
         if (StringUtils.isNotBlank(sign)){
+            //根据，分割
             signList = Arrays.asList(sign.split(","));
         }
         List<ProjectVisa> list = new ArrayList<>();
         if(StringUtils.isNotBlank(projectVisa.getContentId())){
+            //查询设计变更信息list
             list = projectVisaService.findList(projectVisa);
         }
         if(null != list){
@@ -141,6 +165,7 @@ public class CheckVisaController extends BaseController {
         model.addAttribute("signList", signList);
         model.addAttribute("investmentCostList", list);
         String viewPath = "modules/workcontent/workSiteVisaList";
+        //判断是否为查看页面
         if("view".equals(view)){
             viewPath+="View";
         }
@@ -153,14 +178,21 @@ public class CheckVisaController extends BaseController {
         return viewPath;
     }
 
-    //编辑签证汇总页面
+    /**
+     * 编辑签证汇总页面
+     * @param projectVisa
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "updateTable")
     public String updateTable(ProjectVisa projectVisa, Model model) {
 
         if(StringUtils.isNotEmpty(projectVisa.getId())){
+            //查询签证汇总信息
             ProjectVisa visa=projectVisaService.getVisa(projectVisa);
             WorkClientAttachment attchment = new WorkClientAttachment();
             attchment.setAttachmentId(projectVisa.getId());
+            //查询附件信息
             List<WorkClientAttachment> attachments = workClientAttachmentDao.findList(attchment);
             visa.setWorkAttachments(attachments);
             model.addAttribute("projectVisa", visa);
@@ -171,14 +203,21 @@ public class CheckVisaController extends BaseController {
         return "modules/projectrecord/visa/projectVisaForm";
     }
 
-    //编辑签证汇总页面
+    /**
+     * 查看签证汇总方法
+     * @param projectVisa
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "view")
     public String view(ProjectVisa projectVisa, Model model) {
 
         if(StringUtils.isNotEmpty(projectVisa.getId())){
+            //查询签证汇总信息
             ProjectVisa visa=projectVisaService.getVisa(projectVisa);
             WorkClientAttachment attchment = new WorkClientAttachment();
             attchment.setAttachmentId(projectVisa.getId());
+            //查询附件信息
             List<WorkClientAttachment> attachments = workClientAttachmentDao.findList(attchment);
             visa.setWorkAttachments(attachments);
             model.addAttribute("projectVisa", visa);
@@ -198,21 +237,34 @@ public class CheckVisaController extends BaseController {
      */
     @RequestMapping(value = {"save"})
     public String save(ConcealProjectInfo concealProjectInfo, RedirectAttributes redirectAttributes) throws Exception {
-
+        //调用新增方法
         String str = projectVisaService.saveData(concealProjectInfo);
         addMessage(redirectAttributes, "保存签证信息"+(str.equals("true")?"成功":"失败"));
         return "redirect:"+Global.getAdminPath()+"/project/checkVisa/?repage";
     }
 
-    //显示签证页面
+    /**
+     * 显示签证页面
+     * @param projectVisa
+     * @param model
+     * @return
+     */
     public String getVisa(ProjectVisa projectVisa,Model model){
+        //获取签证汇总信息
         ProjectVisa projectVisa1=projectVisaService.getVisa(projectVisa);
         model.addAttribute("projectVisa",projectVisa1);
         return "";
     }
 
 
-    //获取树状图
+    /**
+     * 获取签证汇总列表树状图
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "getVisaList")
     @ResponseBody
     public Map<String,List> getTreeList(ConstructionContract constructionContract, HttpServletRequest request, HttpServletResponse response, Model model){

src/main/java/com/jeeplus/modules/projectrecord/web/completion/ProjectCompletionPigeonholeController.java

@@ -58,8 +58,14 @@ public class ProjectCompletionPigeonholeController extends BaseController {
     private ProjectCompletionPigeonholeService projectCompletionPigeonholeService;
     @Autowired
     private WorkProjectUserDao workProjectUserDao;
+
     /**
      * 项目列表页面
+     * @param projectRecords
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequiresPermissions("project:projectCompletionPigeonhole:list")
     @RequestMapping(value = {"list", ""})
@@ -67,6 +73,7 @@ public class ProjectCompletionPigeonholeController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //获取审核通过的项目信息
         Page<ProjectImplementEarly> page = projectCompletionPigeonholeService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
         List<ProjectImplementEarly> list = page.getList();
@@ -75,7 +82,12 @@ public class ProjectCompletionPigeonholeController extends BaseController {
     }
 
     /**
-     * 项目列表页面
+     * 项目列表页面树形图信息
+     * @param projectRecords
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequestMapping(value = "getProjectList")
     @ResponseBody
@@ -195,9 +207,19 @@ public class ProjectCompletionPigeonholeController extends BaseController {
         return map;
     }
 
+    /**
+     * 归档申请 修改、查看操作
+     * @param projectcontentinfo
+     * @param request
+     * @param response
+     * @param model
+     * @param attr
+     * @return
+     */
     @RequestMapping(value = {"reviewForm"})
     public String form(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
         String dictType = projectcontentinfo.getDictType();
+        //获取项目信息
         ProjectRecords records = projectRecordsService.getQueryProjectUsers(projectcontentinfo.getProject().getId());
         projectcontentinfo.setProject(records);
 
@@ -205,17 +227,20 @@ public class ProjectCompletionPigeonholeController extends BaseController {
         ProjectReportData projectReportData = new ProjectReportData();
         projectReportData.setType(dictType);
         if (projectcontentinfo.getView().equals("reportChangeForm")){
+            //获取报告信息
             projectReportData = projectReportChangeService.get(projectcontentinfo.getProjectReportData().getId());
         }else {
             projectReportData.setNumber("");
         }
-
+        //判断有无负责人，没有将当前登陆人添加进去
         if (projectReportData.getMaster()==null || StringUtils.isBlank(projectReportData.getMaster().getId())){
             projectReportData.setMaster(UserUtils.getUser());
         }
+        //判断是否已经存在报告状态，没有添加未审核状态
         if (StringUtils.isBlank(projectReportData.getStatus())){
             projectReportData.setFileStatus("1");
         }
+        ////获取工作内容信息
         List<ProjectContentData> projectContentDataList = projectContentDataService.getProjectContentData(projectcontentinfo.getInfoId());
         //获取需要复核工作内容的对应typeId
         String typeId = projectContentDataList.get(0).getType();
@@ -235,6 +260,7 @@ public class ProjectCompletionPigeonholeController extends BaseController {
         model.addAttribute("achievementParentId", projectReportData.getType());
         model.addAttribute("achievementId", projectReportData.getAchievementType());
         model.addAttribute("reviewStandard", projectReportData.getReviewStandard());
+        //判断是否为查看方法跳转
         if (projectcontentinfo.getView().equals("reportView")){
             return "modules/projectcontentinfo/reportView";
         }else if (projectcontentinfo.getView().equals("reportChange")) {

src/main/java/com/jeeplus/modules/projectrecord/web/completion/ProjectCompletionReviewController.java

@@ -57,8 +57,14 @@ public class ProjectCompletionReviewController extends BaseController {
     private ProjectTypeService projectTypeService;
     @Autowired
     private WorkProjectUserDao workProjectUserDao;
+
     /**
      * 项目列表页面
+     * @param projectRecords
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequiresPermissions("project:projectCompletionReview:list")
     @RequestMapping(value = {"list", ""})
@@ -66,6 +72,7 @@ public class ProjectCompletionReviewController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //获取项目信息
         Page<ProjectImplementEarly> page = projectEarlyReviewService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
         List<ProjectImplementEarly> list = page.getList();
@@ -75,7 +82,12 @@ public class ProjectCompletionReviewController extends BaseController {
     }
 
     /**
-     * 项目列表页面
+     * 项目列表页面树状图信息
+     * @param projectRecords
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequestMapping(value = "getProjectList")
     @ResponseBody
@@ -194,6 +206,16 @@ public class ProjectCompletionReviewController extends BaseController {
         return map;
     }
 
+    /**
+     * 审核页信息
+     * @param projectcontentinfo
+     * @param request
+     * @param response
+     * @param model
+     * @param attr
+     * @param projectId
+     * @return
+     */
     @RequestMapping(value = {"reviewForm"})
     public String form(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr,String projectId) {
 
@@ -205,6 +227,7 @@ public class ProjectCompletionReviewController extends BaseController {
         model.addAttribute("reportType",projectcontentinfo.getReportType());
         model.addAttribute("projectId",projectcontentinfo.getProject().getId());
         String dictType = projectcontentinfo.getDictType();
+        //获取项目信息
         ProjectRecords records = projectRecordsService.getQueryProjectUsers(projectcontentinfo.getProject().getId());
         projectcontentinfo.setProject(records);
 
@@ -212,14 +235,17 @@ public class ProjectCompletionReviewController extends BaseController {
         ProjectReportData projectReportData = new ProjectReportData();
         projectReportData.setType(dictType);
         if (projectcontentinfo.getView().equals("reportChangeForm")){
+            //查询工作内容信息
             projectReportData = projectReportChangeService.get(projectcontentinfo.getProjectReportData().getId());
         }else {
             projectReportData.setNumber("");
         }
 
+        //判断负责人是否为空，为空则添加当前登录人
         if (projectReportData.getMaster()==null || StringUtils.isBlank(projectReportData.getMaster().getId())){
             projectReportData.setMaster(UserUtils.getUser());
         }
+        //判断状态受否为空  为空则添加未审核的字段
         if (StringUtils.isBlank(projectReportData.getStatus())){
             projectReportData.setFileStatus("1");
         }
@@ -233,11 +259,13 @@ public class ProjectCompletionReviewController extends BaseController {
 
             if (null != contentAttachmentData) {
                 try {
+                    //数据整理
                     MyBeanUtils.copyBeanNotNull2Bean(contentAttachmentData, projectBasedData);
                 }catch (Exception e) {
                     e.printStackTrace();
                 }
             }
+            //添加标记
             projectBasedData.setFlag("according");
             if (StringUtils.isNotBlank(projectBasedData.getFileAttachmentId())) {
                 projectBasedData.setUploadUser(UserUtils.get(projectBasedData.getFileAttachmentId()));
@@ -257,6 +285,7 @@ public class ProjectCompletionReviewController extends BaseController {
         model.addAttribute("achievementParentId", projectReportData.getType());
         model.addAttribute("achievementId", projectReportData.getAchievementType());
         model.addAttribute("reviewStandard", projectReportData.getReviewStandard());
+        //判断是否是查看方法
         if (projectcontentinfo.getView().equals("reportView")){
             return "modules/projectcontentinfo/reportView";
         }else if (projectcontentinfo.getView().equals("reportChange")) {
@@ -298,6 +327,7 @@ public class ProjectCompletionReviewController extends BaseController {
     public String saveReport(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response,
                              Model model,RedirectAttributes redirectAttributes)  {
         try{
+            //审核操作
             String str = projectcontentinfoService.saveData(projectcontentinfo,2);
             addMessage(redirectAttributes, "提交成果文件"+(str.equals("true")?"成功":"失败"));
             ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();

src/main/java/com/jeeplus/modules/projectrecord/web/concealProject/ConcealProjectController.java

@@ -79,20 +79,30 @@ public class ConcealProjectController extends BaseController {
     @RequiresPermissions("project:concealProject:list")
     @RequestMapping(value = {"list", ""})
     public String list(ConstructionContract constructionContract, HttpServletRequest request, HttpServletResponse response, Model model) {
+        //判断当前用户在当前企业是否是管理员
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
 
         ProjectImplementEarly projectRecords = new ProjectImplementEarly();
+        //判断项目名称是否为空
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        //查询已审核通过的项目信息
         Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
         return "modules/projectrecord/concealProject/concealProjectList";
     }
 
-    //获取树状图
+    /**
+     * 获取树状图
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "getProjectList")
     @ResponseBody
     public Map<String,List> getTreeList(ConstructionContract constructionContract, HttpServletRequest request, HttpServletResponse response, Model model){
@@ -102,6 +112,7 @@ public class ConcealProjectController extends BaseController {
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        //查询已审核通过的项目信息
         Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();
@@ -225,47 +236,78 @@ public class ConcealProjectController extends BaseController {
         return map;
     }
 
-    //添加签证汇总页面
+    /**
+     * 跳转页面
+     * @param concealProjectInfo
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "form")
     public String form(ConcealProjectInfo concealProjectInfo, Model model) {
 
         ProjectContentData projectContentData = new ProjectContentData();
         projectContentData.setType("");
+        //判断infoId是否为空来获取工作内容详情信息
         if (StringUtils.isNotBlank(concealProjectInfo.getInfoId())){
             projectContentData = concealProjectService.getProjectContentData(concealProjectInfo.getInfoId());
         }else if (concealProjectInfo.getProjectContentData()!=null && StringUtils.isNotBlank(concealProjectInfo.getProjectContentData().getId())) {
             projectContentData = concealProjectService.getProjectContentData(concealProjectInfo.getProjectContentData().getId());
         }
+        //添加负责人
         projectContentData.setMaster(UserUtils.getUser());
+        //判断工作内容详情信息id是否为空
         if(StringUtils.isNotBlank(projectContentData.getId())){
+            //获取过程控制明细信息
             List<ProjectControlTable> controlData = projectControlTableService.getControlData(projectContentData.getId(),"");
             projectContentData.setProjectControlTableList(controlData);
+            //将依据性资料信息添加到工作内容详情中
             projectContentDataService.queryBasedData(projectContentData);
         }
 
+        /**
+         * 添加判断条件
+         */
         concealProjectInfo.setCondition("conceal");
+        //添加工作内容详情信息
         concealProjectInfo.setProjectContentData(projectContentData);
         model.addAttribute("concealProjectInfo", concealProjectInfo);
+        //判断是否为查看页面，是则跳转查看页面
         if("view".equals(concealProjectInfo.getType())){
             return "modules/projectrecord/concealProject/workContentView";
         }
         return "modules/projectrecord/concealProject/workContentForm";
     }
 
+    /**
+     * 新增方法
+     * @param concealProjectInfo
+     * @param redirectAttributes
+     * @return
+     * @throws Exception
+     */
     @RequestMapping(value = {"save"})
     public String save(ConcealProjectInfo concealProjectInfo, RedirectAttributes redirectAttributes) throws Exception {
 
+        //调用新增方法
         String str = concealProjectService.saveData(concealProjectInfo);
         addMessage(redirectAttributes, "保存隐蔽工程量内容信息"+(str.equals("true")?"成功":"失败"));
         return "redirect:"+Global.getAdminPath()+"/project/concealProject/?repage";
     }
 
+    /**
+     * 删除宜居性资料
+     * @param contentId
+     * @param basedId
+     * @return
+     */
     @RequestMapping("ajaxdelete")
     @ResponseBody
     public AjaxJson deleteBased(String contentId, String basedId){
         AjaxJson ajaxJson = new AjaxJson();
         try {
+            //判断contentId是否为空然后进行删除操作
             if (StringUtils.isNotBlank(contentId)) {
+                //调用删除方法
                 concealProjectService.deleteBased(contentId, basedId);
             }
             Integer count = projectContentDataService.countBased(basedId);
@@ -286,6 +328,7 @@ public class ConcealProjectController extends BaseController {
      */
     @RequestMapping(value = {"deleteConcealProject"})
     public String deleteConcealProject(ConcealProjectInfo concealProjectInfo) {
+        //删除隐蔽工程量信息
         concealProjectService.deleteConcealProject(concealProjectInfo);
         return "redirect:"+Global.getAdminPath()+"/project/concealProject/?repage";
     }
@@ -297,6 +340,7 @@ public class ConcealProjectController extends BaseController {
     public Map<String,Object> delete(ProjectVisa projectVisa, RedirectAttributes redirectAttributes) {
         Map<String,Object> j= new HashMap<>();
         try {
+            //删除依据性资料信息
             projectVisaService.deleteByLogic(projectVisa.getId(),projectVisa.getType());
             j.put("status",true);
             j.put("msg","删除成功");

src/main/java/com/jeeplus/modules/projectrecord/web/contractMaterial/MaterialController.java

@@ -70,8 +70,14 @@ public class MaterialController extends BaseController {
         }
         return entity;
     }
+
     /**
-     * 暂定材料列表页面
+     * 暂定材料价列表
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequiresPermissions("project:contractMaterial:list")
     @RequestMapping(value = {"list", ""})
@@ -83,11 +89,20 @@ public class MaterialController extends BaseController {
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        //查询已审核通过 的项目信息
         Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
         return "modules/projectrecord/contractMaterial/materialList";
     }
-    //获取树状图
+
+    /**
+     * 暂定材料价列表树状图信息
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "getProjectList")
     @ResponseBody
     public Map<String, List> getTreeList(ConstructionContract constructionContract, HttpServletRequest request, HttpServletResponse response, Model model){
@@ -217,27 +232,38 @@ public class MaterialController extends BaseController {
         map.put("data",treeList);
         return map;
     }
-    //添加暂定材料页面
+
+    /**
+     * 添加暂定材料页面
+     * @param materialProjectInfo
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "form")
     public String form(MaterialProjectInfo materialProjectInfo, Model model) {
 
         ProjectContentData projectContentData = new ProjectContentData();
         projectContentData.setType("");
+        //根据infoId查询暂定材料价信息
         if (StringUtils.isNotBlank(materialProjectInfo.getInfoId())){
             projectContentData = materialService.getProjectContentData(materialProjectInfo.getInfoId());
         }else if (materialProjectInfo.getProjectContentData()!=null && StringUtils.isNotBlank(materialProjectInfo.getProjectContentData().getId())) {
             projectContentData = materialService.getProjectContentData(materialProjectInfo.getProjectContentData().getId());
         }
+        //添加负责人信息
         projectContentData.setMaster(UserUtils.getUser());
         if(StringUtils.isNotBlank(projectContentData.getId())){
+            //查询过程控制明细信息
             List<ProjectControlTable> controlData = projectControlTableService.getControlData(projectContentData.getId(),"");
             projectContentData.setProjectControlTableList(controlData);
+            //查询附件信息并添加
             projectContentDataService.queryBasedData(projectContentData);
         }
 
         materialProjectInfo.setCondition("material");
         materialProjectInfo.setProjectContentData(projectContentData);
         model.addAttribute("materialProjectInfo", materialProjectInfo);
+        //判断是否是查看页面访问
         if("view".equals(materialProjectInfo.getType())){
             return "modules/projectrecord/contractMaterial/workContentView";
         }
@@ -250,18 +276,25 @@ public class MaterialController extends BaseController {
      */
     @RequestMapping(value = {"save"})
     public String save(MaterialProjectInfo materialProjectInfo, RedirectAttributes redirectAttributes) throws Exception {
-
+        //调用新增方法
         String str = materialService.saveData(materialProjectInfo);
         addMessage(redirectAttributes, "保存内容信息"+(str.equals("true")?"成功":"失败"));
         return "redirect:"+ Global.getAdminPath()+"/project/contractMaterial/?repage";
     }
 
+    /**
+     * 删除暂定材料价信息和依据性资料关系信息
+     * @param contentId
+     * @param basedId
+     * @return
+     */
     @RequestMapping("ajaxdelete")
     @ResponseBody
     public AjaxJson deleteBased(String contentId, String basedId){
         AjaxJson ajaxJson = new AjaxJson();
         try {
             if (StringUtils.isNotBlank(contentId)) {
+                //调用删除方法
                 materialService.deleteBased(contentId, basedId);
             }
             Integer count = projectContentDataService.countBased(basedId);

src/main/java/com/jeeplus/modules/projectrecord/web/distributionSettlement/DistributionSettlementController.java

@@ -76,7 +76,12 @@ public class DistributionSettlementController extends BaseController {
     }
 
     /**
-     * 签证汇总表列表页面
+     * 分布结算list页面查询
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequiresPermissions("project:distributionSettlement:list")
     @RequestMapping(value = {"list", ""})
@@ -88,12 +93,20 @@ public class DistributionSettlementController extends BaseController {
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        //获取已审核通过项目信息
         Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
         return "modules/projectrecord/distributionSettlement/distributionSettlementList";
     }
 
-    //获取树状图
+    /**
+     * 分布结算页面树形图数据查询
+     * @param constructionContract
+     * @param request
+     * @param response
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "getProjectList")
     @ResponseBody
     public Map<String, List> getTreeList(ConstructionContract constructionContract, HttpServletRequest request, HttpServletResponse response, Model model){
@@ -231,7 +244,7 @@ public class DistributionSettlementController extends BaseController {
     }
 
     /**
-     * 甲供物资查方法
+     * 分布结算查看方法
      * @param concealProjectInfo
      * @param model
      * @return
@@ -241,15 +254,19 @@ public class DistributionSettlementController extends BaseController {
 
         ProjectContentData projectContentData = new ProjectContentData();
         projectContentData.setType("");
+        //根据infoId查询分布结算信息
         if (StringUtils.isNotBlank(concealProjectInfo.getInfoId())){
             projectContentData = distributionSettlementService.getProjectContentData(concealProjectInfo.getInfoId());
         }else if (concealProjectInfo.getProjectContentData()!=null && StringUtils.isNotBlank(concealProjectInfo.getProjectContentData().getId())) {
             projectContentData = distributionSettlementService.getProjectContentData(concealProjectInfo.getProjectContentData().getId());
         }
+        //添加负责人
         projectContentData.setMaster(UserUtils.getUser());
         if(StringUtils.isNotBlank(projectContentData.getId())){
+            //查询过程控制表信息
             List<ProjectControlTable> controlData = projectControlTableService.getControlData(projectContentData.getId(),"");
             projectContentData.setProjectControlTableList(controlData);
+            //查询相关依据性资料并添加
             projectContentDataService.queryBasedData(projectContentData);
         }
 
@@ -259,6 +276,7 @@ public class DistributionSettlementController extends BaseController {
         concealProjectInfo.setCondition("distribution");
         concealProjectInfo.setProjectContentData(projectContentData);
         model.addAttribute("concealProjectInfo", concealProjectInfo);
+        //判断是否是查看页面方法调用
         if("view".equals(concealProjectInfo.getType())){
             return "modules/projectrecord/distributionSettlement/distributionSettlementView";
         }
@@ -266,7 +284,7 @@ public class DistributionSettlementController extends BaseController {
     }
 
     /**
-     * 甲供物资增改方法
+     * 分布结算增改方法
      * @param concealProjectInfo
      * @param redirectAttributes
      * @return
@@ -274,20 +292,28 @@ public class DistributionSettlementController extends BaseController {
      */
     @RequestMapping(value = {"save"})
     public String save(ConcealProjectInfo concealProjectInfo, RedirectAttributes redirectAttributes) throws Exception {
-
+        //调用新增方法
         String str = distributionSettlementService.saveData(concealProjectInfo);
         addMessage(redirectAttributes, "保存分布结算内容信息"+(str.equals("true")?"成功":"失败"));
         return "redirect:"+Global.getAdminPath()+"/project/distributionSettlement/?repage";
     }
 
+    /**
+     * 依据性资料删除方法
+     * @param contentId
+     * @param basedId
+     * @return
+     */
     @RequestMapping("ajaxdelete")
     @ResponseBody
     public AjaxJson deleteBased(String contentId, String basedId){
         AjaxJson ajaxJson = new AjaxJson();
         try {
             if (StringUtils.isNotBlank(contentId)) {
+                //删除
                 distributionSettlementService.deleteBased(contentId, basedId);
             }
+            //查询工作内容引用资料中间表信息条数
             Integer count = projectContentDataService.countBased(basedId);
             ajaxJson.getBody().put("inuse", count == null ? true : count > 0);
         }catch (Exception e){
@@ -300,12 +326,13 @@ public class DistributionSettlementController extends BaseController {
 
 
     /**
-     * 甲供物资删除方法
+     * 分布结算删除方法
      * @param concealProjectInfo
      * @return
      */
     @RequestMapping(value = {"deleteConcealProject"})
     public String deleteConcealProject(ConcealProjectInfo concealProjectInfo) {
+        //删除
         distributionSettlementService.deleteConcealProject(concealProjectInfo);
         return "redirect:"+ Global.getAdminPath()+"/project/distributionSettlement/?repage";
     }

src/main/java/com/jeeplus/modules/projectrecord/web/implementStage/ProjectInterimPaymentController.java

@@ -63,6 +63,7 @@ public class ProjectInterimPaymentController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //获取审核通过的项目信息
         Page<ConstructionContract> page = contractService.findPage(new Page<ConstructionContract>(request, response), constructionContract);
         //无合同状态下，获取委托方的名称
         List<ConstructionContract> list = page.getList();
@@ -82,6 +83,7 @@ public class ProjectInterimPaymentController extends BaseController {
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        //获取审核通过的项目信息
         Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();
@@ -382,13 +384,17 @@ public class ProjectInterimPaymentController extends BaseController {
 
         ProjectContentData projectContentData = new ProjectContentData();
         projectContentData.setType("");
+        //获取工作内容详情信息
         if (StringUtils.isNotBlank(concealProjectInfo.getInfoId())){
             projectContentData = service.getInterimPaymentData(concealProjectInfo.getInfoId());
         }else if (concealProjectInfo.getProjectContentData()!=null && StringUtils.isNotBlank(concealProjectInfo.getProjectContentData().getId())) {
             projectContentData = service.getInterimPaymentData(concealProjectInfo.getProjectContentData().getId());
         }
+        //添加负责人信息
         projectContentData.setMaster(UserUtils.getUser());
+        //判定工作内容详情id是否为空
         if(StringUtils.isNotBlank(projectContentData.getId())){
+            //获取过程控制表信息
             List<ProjectControlTable> controlData = projectControlTableService.getControlData(projectContentData.getId(),"");
             projectContentData.setProjectControlTableList(controlData);
             projectContentDataService.queryBasedData(projectContentData);
@@ -432,7 +438,7 @@ public class ProjectInterimPaymentController extends BaseController {
      */
     @RequestMapping(value = "save")
     public String save(ConcealProjectInfo concealProjectInfo, RedirectAttributes redirectAttributes) throws Exception {
-
+        //新增操作
         String str = service.saveData(concealProjectInfo);
         addMessage(redirectAttributes, "保存工程进度款信息"+(str.equals("true")?"成功":"失败"));
         return "redirect:"+Global.getAdminPath()+"/project/projectInterimPayment/?repage";
@@ -447,7 +453,11 @@ public class ProjectInterimPaymentController extends BaseController {
         return "redirect:"+ Global.getAdminPath()+"/project/projectInterimPayment/?repage";
     }*/
 
-
+    /**
+     * String转double方法
+     * @param moneyStr
+     * @return
+     */
     private static Double shiftDouble(String moneyStr){
         if(StringUtils.isNotBlank(moneyStr)){
             moneyStr = moneyStr.replaceAll(",","");
@@ -457,14 +467,22 @@ public class ProjectInterimPaymentController extends BaseController {
         return null;
     }
 
+    /**
+     * 删除方法
+     * @param contentId
+     * @param basedId
+     * @return
+     */
     @RequestMapping("ajaxdelete")
     @ResponseBody
     public AjaxJson deleteBased(String contentId, String basedId){
         AjaxJson ajaxJson = new AjaxJson();
         try {
             if (StringUtils.isNotBlank(contentId)) {
+                //删除工作内容引用资料中间表信息
                 service.deleteBased(contentId, basedId);
             }
+            //查询工作内容引用资料中间表信息条数
             Integer count = projectContentDataService.countBased(basedId);
             ajaxJson.getBody().put("inuse", count == null ? true : count > 0);
         }catch (Exception e){

src/main/java/com/jeeplus/modules/projectrecord/web/monthly/MonthlyConsultationReportController.java

@@ -73,6 +73,11 @@ public class MonthlyConsultationReportController extends BaseController {
 
     /**
      * 项目列表页面
+     * @param projectRecords
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequiresPermissions("project:monthlyConsultationReport:list")
     @RequestMapping(value = {"list", ""})
@@ -80,13 +85,19 @@ public class MonthlyConsultationReportController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //获取项目信息
         Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
         return "modules/projectrecord/monthly/monthlyConsultationReportList";
     }
 
     /**
-     * 项目列表页面
+     * 项目列表页面树形图信息
+     * @param projectRecords
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequestMapping(value = "getProjectList")
     @ResponseBody
@@ -94,6 +105,7 @@ public class MonthlyConsultationReportController extends BaseController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
+        //获取项目信息
         Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
         List<ProjectImplementEarly> list = page.getList();
@@ -213,26 +225,35 @@ public class MonthlyConsultationReportController extends BaseController {
     @RequestMapping(value = {"form"})
     public String form(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) throws Exception {
         String dictType = projectcontentinfo.getDictType();
+        //获取项目信息
         ProjectRecords records = projectRecordsService.getQueryProjectUsers(projectcontentinfo.getProject().getId());
         projectcontentinfo.setProject(records);
 
         ProjectContentData projectContentData = new ProjectContentData();
         projectContentData.setType(dictType);
 
+        //判断是否含有id  有则查询月报信息
         if(StringUtils.isNotBlank(projectcontentinfo.getId())){
+            //根据id查询月报信息
             MonthlyInfo monthlyInfo = service.getById(projectcontentinfo.getId());
             if(null != monthlyInfo){
+                //月报信息汇总处理
                 MyBeanUtils.copyBeanNotNull2Bean(monthlyInfo,projectcontentinfo);
                 User user = UserUtils.get(monthlyInfo.getCreateBy().getId());
+                //添加负责人信息
                 projectContentData.setMaster(user);
+                //添加宜居性文件信息
                 projectContentData.setProjectBasedDataList(service.getBasedData(monthlyInfo));
+                //添加附件信息
                 projectContentData.setWorkAttachments(service.getWorkattachment(monthlyInfo));
             }
         }else{
+            //新增 添加负责人信息
             projectContentData.setMaster(UserUtils.getUser());
         }
 
         projectcontentinfo.setProjectContentData(projectContentData);
+        //根据项目所属区域类型获取对应得二级级别信息
         String projectType = projectImplementEarlyService.getProjectType(records.getProjectTypeId(), "实施前期");
         projectcontentinfo.setType(projectType);
         /*if(StringUtils.isBlank(projectcontentinfo.getId()) && StringUtils.isNotBlank(projectcontentinfo.getProjectContentId())){
@@ -255,6 +276,7 @@ public class MonthlyConsultationReportController extends BaseController {
      */
     @RequestMapping(value = {"save"})
     public String save(Projectcontentinfo projectcontentinfo,RedirectAttributes redirectAttributes) throws Exception {
+        //调用新增接口
         String str = service.saveData(projectcontentinfo);
         addMessage(redirectAttributes, "保存月报信息"+(str.equals("true")?"成功":"失败"));
         return "redirect:"+Global.getAdminPath()+"/project/monthlyConsultationReport/?repage";
@@ -272,7 +294,7 @@ public class MonthlyConsultationReportController extends BaseController {
     }
 
     /**
-     * 下载导入项目数据模板
+     * 下载导入项目数据模板（废除）
      */
     public void downloadTemplate(HttpServletRequest request,HttpServletResponse response) {
         try {
@@ -282,6 +304,11 @@ public class MonthlyConsultationReportController extends BaseController {
         }
     }
 
+    /**
+     * 导出
+     * @param request
+     * @param response
+     */
     @RequestMapping(value = "downloadTemplate")
     public void thisLocalityDownloadUtil(HttpServletRequest request,HttpServletResponse response) {
         try {

src/main/java/com/jeeplus/modules/projectrecord/web/summarizing/ContentArmorSummarizingController.java

@@ -60,6 +60,11 @@ public class ContentArmorSummarizingController extends BaseController {
 
     /**
      * 项目列表页面
+     * @param projectRecords
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequestMapping(value = {"list", ""})
     public String list(ProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -100,6 +105,12 @@ public class ContentArmorSummarizingController extends BaseController {
         return "modules/projectrecord/summarizing/armorProjectRecordsList";
     }
 
+    /**
+     * 跳转查看页面并获取信息
+     * @param projectcontentinfo
+     * @param model
+     * @return
+     */
     @RequestMapping(value = {"form"})
     public String form(Projectcontentinfo projectcontentinfo, Model model) {
         String dictType = projectcontentinfo.getDictType();
@@ -116,7 +127,7 @@ public class ContentArmorSummarizingController extends BaseController {
 
 
     /**
-     * 根据type查询对应的宜居性文件内容
+     * 根据type查询对应的依据性文件内容
      * @param typeId
      * @return
      */

src/main/java/com/jeeplus/modules/projectrecord/web/summarizing/ContentClaimSummarizingController.java

@@ -60,6 +60,11 @@ public class ContentClaimSummarizingController extends BaseController {
 
     /**
      * 项目列表页面
+     * @param projectRecords
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequestMapping(value = {"list", ""})
     public String list(ProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -100,6 +105,12 @@ public class ContentClaimSummarizingController extends BaseController {
         return "modules/projectrecord/summarizing/claimSumamarizingProjectRecordsList";
     }
 
+    /**
+     * 跳转查看页面并获取信息
+     * @param projectcontentinfo
+     * @param model
+     * @return
+     */
     @RequestMapping(value = {"form"})
     public String form(Projectcontentinfo projectcontentinfo, Model model) {
         String dictType = projectcontentinfo.getDictType();
@@ -116,7 +127,7 @@ public class ContentClaimSummarizingController extends BaseController {
 
 
     /**
-     * 根据type查询对应的宜居性文件内容
+     * 根据type查询对应的依据性文件内容
      * @param typeId
      * @return
      */

src/main/java/com/jeeplus/modules/projectrecord/web/summarizing/ContentConcealSummarizingController.java

@@ -60,6 +60,11 @@ public class ContentConcealSummarizingController extends BaseController {
 
     /**
      * 项目列表页面
+     * @param projectRecords
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequestMapping(value = {"list", ""})
     public String list(ProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -100,6 +105,12 @@ public class ContentConcealSummarizingController extends BaseController {
         return "modules/projectrecord/summarizing/concealProjectRecordsList";
     }
 
+    /**
+     * 跳转查看页面并获取信息
+     * @param projectcontentinfo
+     * @param model
+     * @return
+     */
     @RequestMapping(value = {"form"})
     public String form(Projectcontentinfo projectcontentinfo, Model model) {
         String dictType = projectcontentinfo.getDictType();
@@ -116,7 +127,7 @@ public class ContentConcealSummarizingController extends BaseController {
 
 
     /**
-     * 根据type查询对应的宜居性文件内容
+     * 根据type查询对应的依据性文件内容
      * @param typeId
      * @return
      */

src/main/java/com/jeeplus/modules/projectrecord/web/summarizing/ContentDesignSummarizingController.java

@@ -77,6 +77,11 @@ public class ContentDesignSummarizingController extends BaseController {
 
     /**
      * 项目列表页面
+     * @param projectRecords
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequestMapping(value = {"list", ""})
     public String list(ProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -117,6 +122,12 @@ public class ContentDesignSummarizingController extends BaseController {
         return "modules/projectrecord/summarizing/designSumamarizingProjectRecordsList";
     }
 
+    /**
+     * 跳转查看页面并获取信息
+     * @param projectcontentinfo
+     * @param model
+     * @return
+     */
     @RequestMapping(value = {"form"})
     public String form(Projectcontentinfo projectcontentinfo, Model model) {
         String dictType = projectcontentinfo.getDictType();
@@ -133,7 +144,7 @@ public class ContentDesignSummarizingController extends BaseController {
 
 
     /**
-     * 根据type查询对应的宜居性文件内容
+     * 根据type查询对应的依据性文件内容
      * @param typeId
      * @return
      */

src/main/java/com/jeeplus/modules/projectrecord/web/summarizing/ContentDistributionSummarizingController.java

@@ -60,6 +60,11 @@ public class ContentDistributionSummarizingController extends BaseController {
 
     /**
      * 项目列表页面
+     * @param projectRecords
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequestMapping(value = {"list", ""})
     public String list(ProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -100,6 +105,12 @@ public class ContentDistributionSummarizingController extends BaseController {
         return "modules/projectrecord/summarizing/distributionSumamarizingProjectRecordsList";
     }
 
+    /**
+     * 跳转查看页面并获取信息
+     * @param projectcontentinfo
+     * @param model
+     * @return
+     */
     @RequestMapping(value = {"form"})
     public String form(Projectcontentinfo projectcontentinfo, Model model) {
         String dictType = projectcontentinfo.getDictType();

src/main/java/com/jeeplus/modules/projectrecord/web/summarizing/ContentInterimPaymentSummarizingController.java

@@ -61,6 +61,11 @@ public class ContentInterimPaymentSummarizingController extends BaseController {
 
     /**
      * 项目列表页面
+     * @param projectRecords
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequiresPermissions("project:interimPaymentSummarizing:list")
     @RequestMapping(value = {"list", ""})
@@ -102,6 +107,12 @@ public class ContentInterimPaymentSummarizingController extends BaseController {
         return "modules/projectrecord/summarizing/sumamarizingProjectRecordsList";
     }
 
+    /**
+     * 跳转查看页面并获取信息
+     * @param projectcontentinfo
+     * @param model
+     * @return
+     */
     @RequestMapping(value = {"form"})
     public String form(Projectcontentinfo projectcontentinfo, Model model) {
         String dictType = projectcontentinfo.getDictType();
@@ -118,7 +129,7 @@ public class ContentInterimPaymentSummarizingController extends BaseController {
 
 
     /**
-     * 根据type查询对应的宜居性文件内容
+     * 根据type查询对应的依据性文件内容
      * @param typeId
      * @return
      */

src/main/java/com/jeeplus/modules/projectrecord/web/summarizing/ContentMaterialSummarizingController.java

@@ -61,6 +61,11 @@ public class ContentMaterialSummarizingController extends BaseController {
 
     /**
      * 项目列表页面
+     * @param projectRecords
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequestMapping(value = {"list", ""})
     public String list(ProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -101,6 +106,12 @@ public class ContentMaterialSummarizingController extends BaseController {
         return "modules/projectrecord/summarizing/materialProjectRecordsList";
     }
 
+    /**
+     * 跳转查看页面并获取信息
+     * @param projectcontentinfo
+     * @param model
+     * @return
+     */
     @RequestMapping(value = {"form"})
     public String form(Projectcontentinfo projectcontentinfo, Model model) {
         String dictType = projectcontentinfo.getDictType();
@@ -117,7 +128,7 @@ public class ContentMaterialSummarizingController extends BaseController {
 
 
     /**
-     * 根据type查询对应的宜居性文件内容
+     * 根据type查询对应的依据性文件内容
      * @param typeId
      * @return
      */

src/main/java/com/jeeplus/modules/projectrecord/web/summarizing/ContentVisaSummarizingController.java

@@ -60,6 +60,11 @@ public class ContentVisaSummarizingController extends BaseController {
 
     /**
      * 项目列表页面
+     * @param projectRecords
+     * @param request
+     * @param response
+     * @param model
+     * @return
      */
     @RequestMapping(value = {"list", ""})
     public String list(ProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -100,6 +105,12 @@ public class ContentVisaSummarizingController extends BaseController {
         return "modules/projectrecord/summarizing/visaSumamarizingProjectRecordsList";
     }
 
+    /**
+     * 跳转查看页面并获取信息
+     * @param projectcontentinfo
+     * @param model
+     * @return
+     */
     @RequestMapping(value = {"form"})
     public String form(Projectcontentinfo projectcontentinfo, Model model) {
         String dictType = projectcontentinfo.getDictType();
@@ -116,7 +127,7 @@ public class ContentVisaSummarizingController extends BaseController {
 
 
     /**
-     * 根据type查询对应的宜居性文件内容
+     * 根据type查询对应的依据性文件内容
      * @param typeId
      * @return
      */

src/main/java/com/jeeplus/modules/projectreportnum/web/ProjectReportNumController.java

@@ -66,6 +66,15 @@ public class ProjectReportNumController extends BaseController {
 	@Autowired
 	private ProjectEarlyReviewService projectEarlyReviewService;
 
+	/**
+	 * 跳转报告号页面
+	 * @param reportNum
+	 * @param request
+	 * @param response
+	 * @param model
+	 * @param reportType
+	 * @return
+	 */
 	@RequestMapping(value = "skipMethod")
 	public String skipMethod(ReportNum reportNum, HttpServletRequest request, HttpServletResponse response, Model model,String reportType) {
 
@@ -74,8 +83,14 @@ public class ProjectReportNumController extends BaseController {
 		model.addAttribute("projectType",reportNum.getProjectType());
 		return "modules/projectreportnum/projectReportNumList";
 	}
+
 	/**
-	 * 列表页面
+	 * 列表页面数据查询
+	 * @param reportNum
+	 * @param request
+	 * @param response
+	 * @param model
+	 * @return
 	 */
 	@RequestMapping(value = {"list", ""})
 	public String list(ReportNum reportNum, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -85,8 +100,13 @@ public class ProjectReportNumController extends BaseController {
 		model.addAttribute("page", page);
 		return "modules/projectreportnum/projectReportNumList";
 	}
+
 	/**
-	 * 列表页面
+	 * 报告号数据查询
+	 * @param reportNum
+	 * @param projectTypeId
+	 * @param reportType
+	 * @return
 	 */
 	@RequestMapping(value = "getReportNumList")
 	@ResponseBody
@@ -97,6 +117,7 @@ public class ProjectReportNumController extends BaseController {
 		Map<String,List> map = new HashMap<>();
 
 		String stageName=null;
+		//根据项目对应编码查询报告号
 		List<ProjectContentTreeData> projectContentTreeDataList = projectReportNumService.getReportNumList(reportNum);
 		if(StringUtils.isNotEmpty(reportType)&&projectContentTreeDataList.size()>0){
 			//通过id获取阶段名称
@@ -115,17 +136,21 @@ public class ProjectReportNumController extends BaseController {
 			}
 		}
 
-
+		//判断项目类型是否为空
 		if(StringUtils.isNotEmpty(projectTypeId)){
 			for(ProjectContentTreeData treeData:projectContentTreeDataList){
+				//判断是否为父节点
 				if(treeData.getPid().equals("0")){
 					listNum.add(treeData);
 				}else{
+					//截取字符串
 					String typeId=treeData.getNum().split("-")[1];
 					if(typeId.equals(projectTypeId)){
+						//根据父节点查询对应的附件信息
 						List<WorkClientAttachment> workClientAttachmentList = projectResultsFileTemplateService.getWorkClientAttachmentList(typeId);
 						if(null != workClientAttachmentList){
 							for (WorkClientAttachment workClientAttachment: workClientAttachmentList) {
+								//获取对应附件的路径
 								treeData.setUrl(workClientAttachment.getUrl());
 							}
 							treeData.setCount(workClientAttachmentList.size());
@@ -143,6 +168,7 @@ public class ProjectReportNumController extends BaseController {
 				if(StringUtils.isNotBlank(reportNum.getProjectType())){
 					typeIdList.add(reportNum.getProjectType());
 				}else{
+					//根据父节点id查询对应的project_type表中的typeId数据
 					typeIdList = projectReportNumService.getTypeIdList(reportType);
 				}
 
@@ -184,6 +210,7 @@ public class ProjectReportNumController extends BaseController {
 
 		String userId = UserUtils.getUser().getId();
 		reportNum.setUserId(userId);
+		//获取报告号列表
 		Page<ReportNum> page = projectReportNumService.findPage(new Page<ReportNum>(request, response), reportNum);
 
 		if(StringUtils.isNotEmpty(projectTypeId)){
@@ -300,11 +327,17 @@ public class ProjectReportNumController extends BaseController {
 
 	/**
 	 * 跳转新增页面
+	 * @param reportNum
+	 * @param model
+	 * @param request
+	 * @param reportType
+	 * @return
 	 */
 	@RequestMapping(value = "getProjectReportNumStageForm")
 	public String getProjectReportNumStageForm(ReportNum reportNum,Model model, HttpServletRequest request,String reportType) {
 		String view = request.getParameter("view");
 		String company = request.getParameter("company");
+		//判断是否为查看页面
 		if("view".equals(view)){
 			view = "modules/projectreportnum/projectReportNumStageForm";
 		}else{
@@ -337,13 +370,16 @@ public class ProjectReportNumController extends BaseController {
 
 	/**
 	 * 保存记录
+	 * @param request
+	 * @param reportNum
+	 * @return
 	 */
 	@ResponseBody
 	@RequestMapping(value = "saveReportNumOnStage")
 	public Map saveReportNumOnStage(HttpServletRequest request,ReportNum reportNum){
 		Map map = new HashMap();
 		try {
-			String type = request.getParameter("type");
+			//调用保存方法
 			String msg = projectReportNumService.saveReportNumOnStage(reportNum);//保存
 			map.put("msg",msg);
 			if(msg.length()>5){

src/main/java/com/jeeplus/modules/workcontent/service/WorkContentBranchAccountService.java

@@ -30,6 +30,12 @@ public class WorkContentBranchAccountService extends CrudService<WorkContentBran
 	public List<WorkContentBranchAccount> findList(WorkContentBranchAccount workContentBranchAccount) {
 		return super.findList(workContentBranchAccount);
 	}
+
+	/**
+	 * 查询分布结算信息
+	 * @param workContentBranchAccount
+	 * @return
+	 */
 	public List<WorkContentBranchAccount> findListByProjectId(WorkContentBranchAccount workContentBranchAccount) {
 		return dao.findListByProjectId(workContentBranchAccount);
 	}

src/main/java/com/jeeplus/modules/workcontent/service/WorkMaterialsPriceService.java

@@ -26,31 +26,68 @@ import java.util.List;
 @Transactional(readOnly = true)
 public class WorkMaterialsPriceService extends CrudService<WorkMaterialsPriceDao, WorkMaterialsPrice> implements WorkContentDetailBaseService{
 
+	/**
+	 * 查询设计概算编制审核表信息
+	 * @param id
+	 * @return
+	 */
 	public WorkMaterialsPrice get(String id) {
 		return super.get(id);
 	}
-	
+
+	/**
+	 * 获取暂定材料价审核、特殊材料价格询价审核表信息
+	 * @param workPreliminaryDesignEstimate
+	 * @return
+	 */
 	public List<WorkMaterialsPrice> findList(WorkMaterialsPrice workPreliminaryDesignEstimate) {
 		return super.findList(workPreliminaryDesignEstimate);
 	}
+
+	/**
+	 * 根据项目id查询所有定材料价审核、特殊材料价格询价审核表的信息
+	 * @param workPreliminaryDesignEstimate
+	 * @return
+	 */
 	public List<WorkMaterialsPrice> findListByProjectId(WorkMaterialsPrice workPreliminaryDesignEstimate) {
 		return dao.findListByProjectId(workPreliminaryDesignEstimate);
 	}
-	
+
+	/**
+	 * 获取暂定材料价审核、特殊材料价格询价审核表信息
+	 * @param page 分页对象
+	 * @param workPreliminaryDesignEstimate
+	 * @return
+	 */
 	public Page<WorkMaterialsPrice> findPage(Page<WorkMaterialsPrice> page, WorkMaterialsPrice workPreliminaryDesignEstimate) {
 		return super.findPage(page, workPreliminaryDesignEstimate);
 	}
-	
+
+	/**
+	 * 保存方法
+	 * @param workPreliminaryDesignEstimate
+	 */
 	@Transactional(readOnly = false)
 	public void save(WorkMaterialsPrice workPreliminaryDesignEstimate) {
 		super.save(workPreliminaryDesignEstimate);
 	}
-	
+
+	/**
+	 * 删除方法
+	 * @param workPreliminaryDesignEstimate
+	 */
 	@Transactional(readOnly = false)
 	public void delete(WorkMaterialsPrice workPreliminaryDesignEstimate) {
 		super.delete(workPreliminaryDesignEstimate);
 	}
-	
+
+	/**
+	 * 详情保存修改方法
+	 * @param detailStr
+	 * @param projectId
+	 * @param contentId
+	 * @param contractId
+	 */
     @Override
     @Transactional(readOnly = false)
     public void saveDetails(String detailStr, String projectId, String contentId,String contractId) {
@@ -58,8 +95,10 @@ public class WorkMaterialsPriceService extends CrudService<WorkMaterialsPriceDao
 	        return;
         }
 		/*detailStr = detailStr.replace("][",",");*/
+		//json数据处理
         List<WorkMaterialsPrice> preliminaryDesignEstimateList = JSON.parseArray(detailStr, WorkMaterialsPrice.class);
         for (WorkMaterialsPrice preliminaryDesignEstimate : preliminaryDesignEstimateList) {
+        	//判断是否需要删除
             if(WorkMaterialsPrice.DEL_FLAG_DELETE.equals(preliminaryDesignEstimate.getDelFlag())){
                 dao.delete(preliminaryDesignEstimate);
                 continue;
@@ -67,6 +106,7 @@ public class WorkMaterialsPriceService extends CrudService<WorkMaterialsPriceDao
 			preliminaryDesignEstimate.setContractId(contractId);
 			preliminaryDesignEstimate.setContentId(contentId);
 			preliminaryDesignEstimate.setProjectId(projectId);
+			//执行新增方法
             this.save(preliminaryDesignEstimate);
         }
     }