修改质量复核和上报信息，项目添加修改合同（无合同修改合同）功能

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralProjectRecordsDao.java

@@ -485,4 +485,10 @@ public interface RuralProjectRecordsDao extends CrudDao<RuralProjectRecords> {
 
     //根据项目名称查询项目信息
     RuralProjectRecords findUseableByProjectName(@Param("projectName")String projectName);
+
+    /**
+     * 修改项目合同信息
+     * @param projectRecords
+     */
+    void updateContract(RuralProjectRecords projectRecords);
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -999,6 +999,80 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		logger.info("保存项目耗时：{}ms;启动流程耗时：{}ms",t4-t1,System.currentTimeMillis()-t4);
 	}
 
+	@Transactional(readOnly = false)
+	public void updateContract(RuralProjectRecords projectRecords, ProjectStatusEnum projectStatus) throws Exception {
+		//判定项目是否存在id（即是否为修改）查询项目的合同信息
+		WorkContractInfo oldWorkContractInfo = null;
+		WorkContractInfo newWorkContractInfo = null;
+		//查询老的合同信息
+		if(StringUtils.isNotBlank(projectRecords.getId())){
+			RuralProjectRecords oldInfo = this.get(projectRecords.getId());
+			if(null != oldInfo.getWorkContractInfo() && StringUtils.isNotBlank(oldInfo.getWorkContractInfo().getId())){
+				oldWorkContractInfo = workContractInfoService.get(oldInfo.getWorkContractInfo().getId());
+			}
+		}
+		//查询新的合同信息
+		if(null != projectRecords.getWorkContractInfo() && StringUtils.isNotBlank(projectRecords.getWorkContractInfo().getId())){
+			newWorkContractInfo = workContractInfoService.get(projectRecords.getWorkContractInfo().getId());
+		}
+
+		WorkContractInfo workContractInfo = null;
+		Office company= new Office();
+		Office office =  new Office();
+        if(StringUtils.isNotBlank((projectRecords.getWorkContractInfo().getId()))){
+            //有合同状态
+			workContractInfo = workContractInfoDao.get(projectRecords.getWorkContractInfo().getId());
+			company.setId(workContractInfo.getCompanyId());
+			office.setId(UserUtils.getUser().getOffice().getId());
+        }else{
+        	//无合同
+			company.setId(UserUtils.getUser().getCompany().getId());
+			office.setId(UserUtils.getUser().getOffice().getId());
+		}
+		projectRecords.setCompany(company);
+		projectRecords.setOffice(office);
+
+		dao.updateContract(projectRecords);
+
+
+		//项目送审之后处理项目合同文件信息
+		//查询咨询合同附件类型id
+		ProjectTemplateInfo projectTemplateInfo = projectTemplateDao.getProjectTemplateInfoByName("咨询合同");
+		//删除该项目咨询合同类型中老合同对应的附件信息
+		WorkClientAttachment attchment = new WorkClientAttachment();
+		attchment.setAttachmentId(projectTemplateInfo.getId());
+		attchment.setProjectId(projectRecords.getId());
+		if(null != oldWorkContractInfo && null != oldWorkContractInfo.getWorkAttachments()){
+			for (WorkClientAttachment info:oldWorkContractInfo.getWorkAttachments()) {
+				attchment.setAttachmentName(info.getAttachmentName());
+				workattachmentService.deleteByAttachIdAndProject(attchment);
+			}
+		}
+		//将新合同对应的附件信息添加到咨询合同中
+		if(null != newWorkContractInfo && null != newWorkContractInfo.getWorkAttachments()){
+			WorkClientAttachment workattachment = new WorkClientAttachment();
+			for (WorkClientAttachment info:newWorkContractInfo.getWorkAttachments()) {
+				workattachment.setType(info.getType());
+				workattachment.setAttachmentName(info.getAttachmentName());
+				workattachment.setUrl(info.getUrl());
+				workattachment.setAttachmentUser(info.getAttachmentUser());
+				workattachment.setAttachmentFlag(info.getAttachmentFlag());
+				workattachment.setAttachmentId(projectTemplateInfo.getId());
+				workattachment.setProjectId(projectRecords.getId());
+				switch (uploadMode){
+					case "1":
+						workattachment.setUrl(workattachment.getUrl().replace(bosUrl,""));
+						break;
+					case "2":
+						workattachment.setUrl(workattachment.getUrl().replace(aliyunUrl,""));
+						break;
+				}
+				workattachment.preInsert();
+				workClientAttachmentDao.insert(workattachment);
+			}
+		}
+	}
+
 	/**
 	 * 管理员修改项目信息
 	 * @param projectRecords

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageController.java

@@ -65,6 +65,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -624,6 +625,23 @@ public class RuralCostProjectMessageController extends BaseController {
             //获取工程类型
             ProjectEngineeringInfo engineeringInfos=engineeringService.getProjectReportedType(reported.getPorjectUse());
             model.addAttribute("engineeringInfo", engineeringInfos);
+            //判定上报中咨询标的额是否和质量复核中的一致，不一致则调整成质量复核中的值
+            //将质量复核中的咨询标的额转换为万元并四舍五入
+            if(StringUtils.isNotBlank(projectReportData.getConsultFee())){
+                Double ziXunBDE = Double.valueOf(projectReportData.getConsultFee())/10000;
+                BigDecimal ziXunBDEB = BigDecimal.valueOf(ziXunBDE);
+                ziXunBDEB = ziXunBDEB.setScale(2, BigDecimal.ROUND_HALF_UP);
+                String ziXunBDEStr = String.valueOf(ziXunBDEB);
+                if(StringUtils.isNotBlank(reported.getZiXunBDE())){
+                    if(ziXunBDEStr.equals(reported.getZiXunBDE())){
+
+                    }else{
+                        reported.setZiXunBDE(ziXunBDEStr);
+                    }
+                }else{
+                    reported.setZiXunBDE(ziXunBDEStr);
+                }
+            }
         }
 
         //查询总审人员信息

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectRecordsController.java

@@ -288,6 +288,73 @@ public class RuralCostProjectRecordsController extends BaseController {
 	}
 
 	/**
+	 * 查看，增加，编辑项目表单页面
+	 */
+	@RequiresPermissions(value={"ruralProject:ruralCostProjectRecords:add","ruralProject:ruralCostProjectRecords:edit"},logical=Logical.OR)
+	@RequestMapping(value = "updateContractForm")
+	public String updateContractForm(RuralProjectRecords projectRecords, Model model) {
+		if (projectRecords!=null&&StringUtils.isNotBlank(projectRecords.getId())) {
+			projectRecords = projectRecordsService.get(projectRecords.getId());
+
+			//根据归属部门Id查询归属部门名称显示
+			String belongingDepartmentName = projectRecordsService.getBelongingDepartmentNameByBelongingDepartment(projectRecords.getBelongingDepartment());
+			model.addAttribute("belongingDepartmentName",belongingDepartmentName);
+
+            projectRecordsService.queryProjectDetail(projectRecords);
+			//获取工程类型
+			ProjectEngineeringInfo engineeringInfos=engineeringService.get(projectRecords.getEngineeringType());
+			model.addAttribute("engineeringInfo", engineeringInfos);
+			projectRecords.setCreateReportFlag(false);
+			//获取项目计划信息
+			ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
+			//将项目id放入项目计划表中
+			projectPlanInfo.setProjectId(projectRecords.getId());
+			//获取项目计划信息
+			List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
+			if(projectPlanList.size()>0){
+				String startDate = projectPlanList.get(0).getEndDate();
+				String endDate = projectPlanList.get(projectPlanList.size()-1).getBeginDate();
+				model.addAttribute("projectStartDate", startDate);
+				model.addAttribute("projectEndDate", endDate);
+			}else{
+				model.addAttribute("projectStartDate", "");
+				model.addAttribute("projectEndDate", "");
+			}
+
+            /*//处理所在地信息
+            StringBuffer areaName = new StringBuffer();
+			if(StringUtils.isNotBlank(projectRecords.getProvince())){
+				areaName.append(projectRecords.getProvince());
+			}
+            if(StringUtils.isNotBlank(projectRecords.getCity())){
+				areaName.append("-").append(projectRecords.getCity());
+			}
+            if(StringUtils.isNotBlank(projectRecords.getCounty())){
+				areaName.append("-").append(projectRecords.getCounty());
+			}
+			projectRecords.getArea().setName(areaName.toString());*/
+		}else {
+		    projectRecords.setCreateBy(UserUtils.getUser());
+		    projectRecords.setCreateDate(new Date());
+			projectRecords.setLeaderIds(UserUtils.getUser().getId());
+			projectRecords.setLeaderNameStr(UserUtils.getUser().getName());
+			projectRecords.setCreateReportFlag(true);
+			model.addAttribute("projectStartDate", "");
+			model.addAttribute("projectEndDate", "");
+			String belongingDepartmentName = UserUtils.getUser().getOffice().toString();
+			String belongingDepartmentParentId = UserUtils.getUser().getOffice().getParentId();
+			//如果父级id为工程五部则不予显示
+			if(!belongingDepartmentParentId.equals("ee4e055e2f074aef934d283880983a38")){
+				model.addAttribute("belongingDepartmentName",belongingDepartmentName);
+			}
+        }
+
+
+		model.addAttribute("ruralProjectRecords", projectRecords);
+		return "modules/ruralprojectrecords/cost/ruralCostProjectRecordsUpdateContractForm";
+	}
+
+	/**
 	 * 查看
 	 * @param projectRecords
 	 * @param model
@@ -445,6 +512,42 @@ public class RuralCostProjectRecordsController extends BaseController {
 	}
 
 	/**
+	 * 修改项目关联合同
+	 */
+	@RequiresPermissions(value={"ruralProject:ruralCostProjectRecords:add","ruralProject:ruralCostProjectRecords:edit"},logical=Logical.OR)
+	@RequestMapping(value = "updateContract")
+	public String updateContract(RuralProjectRecords projectRecords, Model model, RedirectAttributes redirectAttributes
+						,@RequestParam(value = "belongingDepartmentName") String belongingDepartmentName) throws Exception {
+		if (!beanValidator(model, projectRecords)){
+			return form(projectRecords, model);
+		}
+		try {
+            if (!projectRecords.getIsNewRecord()) {//编辑表单保存
+                RuralProjectRecords t = projectRecordsService.get(projectRecords.getId());//从数据库取出记录的值
+				String oldSubmitMoney = t.getSubmitMoney();
+					MyBeanUtils.copyBeanNotNull2Bean(projectRecords, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+
+				projectRecordsService.updateContract(t, ProjectStatusEnum.SIGNED);//保存
+            }
+			addMessage(redirectAttributes, "保存项目成功");
+        }catch (Exception e){
+		    logger.error("保存项目异常：",e);
+            addMessage(redirectAttributes, "保存项目异常:"+e.getMessage());
+        }
+		//判断项目创建人所属部门是否是苏州分公司
+		RuralProjectRecords records=projectRecordsService.findUseableByProjectName(projectRecords.getProjectName());
+		Office info = officeDao.getByName("苏州分公司");
+		List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
+		for (Office office1 : officeList) {
+			if (office1.getId().equals(records.getOffice().getId())){
+				//将该数据保存到ccpm cloud项目中
+				sendProjectInfoDataToCloud(records);
+			}
+		}
+		return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectRecords/?repage";
+	}
+
+	/**
 	 * 将该项目信息保存到cloud项目中
 	 * @param ruralProjectRecords
 	 */

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageAllController.java

@@ -446,6 +446,23 @@ public class RuralProjectMessageAllController extends BaseController {
             //获取工程类型
             ProjectEngineeringInfo engineeringInfos=engineeringService.getProjectReportedType(reported.getPorjectUse());
             model.addAttribute("engineeringInfo", engineeringInfos);
+            //判定上报中咨询标的额是否和质量复核中的一致，不一致则调整成质量复核中的值
+            //将质量复核中的咨询标的额转换为万元并四舍五入
+            if(StringUtils.isNotBlank(projectReportData.getConsultFee())){
+                Double ziXunBDE = Double.valueOf(projectReportData.getConsultFee())/10000;
+                BigDecimal ziXunBDEB = BigDecimal.valueOf(ziXunBDE);
+                ziXunBDEB = ziXunBDEB.setScale(2, BigDecimal.ROUND_HALF_UP);
+                String ziXunBDEStr = String.valueOf(ziXunBDEB);
+                if(StringUtils.isNotBlank(reported.getZiXunBDE())){
+                    if(ziXunBDEStr.equals(reported.getZiXunBDE())){
+
+                    }else{
+                        reported.setZiXunBDE(ziXunBDEStr);
+                    }
+                }else{
+                    reported.setZiXunBDE(ziXunBDEStr);
+                }
+            }
         }
 
         //查询总审人员信息

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsController.java

@@ -401,6 +401,98 @@ public class RuralProjectRecordsController extends BaseController {
 		return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
 	}
 
+
+	/**
+	 * 查看，增加，编辑项目表单页面
+	 */
+	@RequiresPermissions(value={"ruralProject:ruralCostProjectRecords:add","ruralProject:ruralCostProjectRecords:edit"},logical=Logical.OR)
+	@RequestMapping(value = "updateContractForm")
+	public String updateContractForm(RuralProjectRecords projectRecords, Model model) {
+		if (projectRecords!=null&&StringUtils.isNotBlank(projectRecords.getId())) {
+			projectRecords = projectRecordsService.get(projectRecords.getId());
+
+			//根据归属部门Id查询归属部门名称显示
+			String belongingDepartmentName = projectRecordsService.getBelongingDepartmentNameByBelongingDepartment(projectRecords.getBelongingDepartment());
+			model.addAttribute("belongingDepartmentName",belongingDepartmentName);
+
+			projectRecordsService.queryProjectDetail(projectRecords);
+			//获取工程类型
+			ProjectEngineeringInfo engineeringInfos=engineeringService.get(projectRecords.getEngineeringType());
+			model.addAttribute("engineeringInfo", engineeringInfos);
+			projectRecords.setCreateReportFlag(false);
+			//获取项目计划信息
+			ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
+			//将项目id放入项目计划表中
+			projectPlanInfo.setProjectId(projectRecords.getId());
+			//获取项目计划信息
+			List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
+			if(projectPlanList.size()>0){
+				String startDate = projectPlanList.get(0).getEndDate();
+				String endDate = projectPlanList.get(projectPlanList.size()-1).getBeginDate();
+				model.addAttribute("projectStartDate", startDate);
+				model.addAttribute("projectEndDate", endDate);
+			}else{
+				model.addAttribute("projectStartDate", "");
+				model.addAttribute("projectEndDate", "");
+			}
+		}else {
+			projectRecords.setCreateBy(UserUtils.getUser());
+			projectRecords.setCreateDate(new Date());
+			projectRecords.setLeaderIds(UserUtils.getUser().getId());
+			projectRecords.setLeaderNameStr(UserUtils.getUser().getName());
+			projectRecords.setCreateReportFlag(true);
+			model.addAttribute("projectStartDate", "");
+			model.addAttribute("projectEndDate", "");
+			String belongingDepartmentName = UserUtils.getUser().getOffice().toString();
+			String belongingDepartmentParentId = UserUtils.getUser().getOffice().getParentId();
+			//如果父级id为工程五部则不予显示
+			if(!belongingDepartmentParentId.equals("ee4e055e2f074aef934d283880983a38")){
+				model.addAttribute("belongingDepartmentName",belongingDepartmentName);
+			}
+		}
+
+
+		model.addAttribute("ruralProjectRecords", projectRecords);
+		return "modules/ruralprojectrecords/ruralProjectRecordsUpdateContractForm";
+	}
+
+
+	/**
+	 * 修改项目关联合同
+	 */
+	@RequiresPermissions(value={"ruralProject:ruralCostProjectRecords:add","ruralProject:ruralCostProjectRecords:edit"},logical=Logical.OR)
+	@RequestMapping(value = "updateContract")
+	public String updateContract(RuralProjectRecords projectRecords, Model model, RedirectAttributes redirectAttributes
+			,@RequestParam(value = "belongingDepartmentName") String belongingDepartmentName) throws Exception {
+		if (!beanValidator(model, projectRecords)){
+			return form(projectRecords, model);
+		}
+		try {
+			if (!projectRecords.getIsNewRecord()) {//编辑表单保存
+				RuralProjectRecords t = projectRecordsService.get(projectRecords.getId());//从数据库取出记录的值
+				String oldSubmitMoney = t.getSubmitMoney();
+				MyBeanUtils.copyBeanNotNull2Bean(projectRecords, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+
+				projectRecordsService.updateContract(t, ProjectStatusEnum.SIGNED);//保存
+			}
+			addMessage(redirectAttributes, "保存项目成功");
+		}catch (Exception e){
+			logger.error("保存项目异常：",e);
+			addMessage(redirectAttributes, "保存项目异常:"+e.getMessage());
+		}
+		//判断项目创建人所属部门是否是苏州分公司
+		RuralProjectRecords records=projectRecordsService.findUseableByProjectName(projectRecords.getProjectName());
+		Office info = officeDao.getByName("苏州分公司");
+		List<Office> officeList = officeDao.getChildrenOfficeById(info.getId());
+		for (Office office1 : officeList) {
+			if (office1.getId().equals(records.getOffice().getId())){
+				//将该数据保存到ccpm cloud项目中
+				sendProjectInfoDataToCloud(records);
+			}
+		}
+		return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
+	}
+
 	/**
 	 * 将该项目信息保存到cloud项目中
 	 * @param ruralProjectRecords

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -1573,6 +1573,13 @@
 			</choose>
 		WHERE id = #{id}
 	</update>
+	<update id="updateContract">
+	UPDATE rural_project_records SET
+	update_by = #{updateBy.id},
+	update_date = #{updateDate},
+	contract_id = #{workContractInfo.id}
+	WHERE id = #{id}
+	</update>
 	<update id="updateDate">
 		UPDATE rural_project_records SET
 			start_date =  #{startDate},

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/adminReportEditForm.jsp

@@ -678,6 +678,13 @@
 			}
 			if(af !=''){
 				$("#consultFee").val(af)
+				//将咨询标的额整理成万元并赋值给上报中的咨询标的额
+				// 将元转换为万元
+				let wan = af / 10000;
+
+				// 四舍五入保留两位小数
+				wan = Math.round(wan * 100) / 100;
+				$("#ZiXunBDE").val(wan);
 			}
 		}
 
@@ -710,6 +717,13 @@
 			}
 			if(af !=''){
 				$("#consultFee").val(af)
+				//将咨询标的额整理成万元并赋值给上报中的咨询标的额
+				// 将元转换为万元
+				let wan = af / 10000;
+
+				// 四舍五入保留两位小数
+				wan = Math.round(wan * 100) / 100;
+				$("#ZiXunBDE").val(wan);
 			}
 			$("#buildingFee").val("");
 			$("#installFee").val("");

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsList.jsp

@@ -703,6 +703,10 @@
 							xml+="<a href=\"#\" onclick=\"openDialogView('文件上传', '${ctx}/ruralProject/ruralCostProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上传文件</a>";
 							/*xml+="<a href=\"#\" onclick=\"btnImport('" + d.id + "')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 导入压缩文件</a>";*/
 						}
+						//针对无合同项目添加修改合同的功能
+						if(!d.conId){
+						xml+="<a href=\"#\" onclick=\"openDialogre('修改合同', '${ctx}/ruralProject/ruralCostProjectRecords/updateContractForm?id=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 合同修改</a>";
+						}
 						if(d.reportDataFlag != undefined && d.reportDataFlag =="1")
 						{
 							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/createReportDataId?id=" + d.id + "&projectType=2"+"\" onclick=\"return confirmx('确认要生成报告号吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-orange\"> 生成报告号</a>";

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsList.jsp

@@ -570,6 +570,10 @@
                         {
 							xml+="<a href=\"#\" onclick=\"openDialogView('文件上传', '${ctx}/ruralProject/ruralProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上传文件</a>";
                         }
+						//针对无合同项目添加修改合同的功能
+						if(!d.conId){
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改合同', '${ctx}/ruralProject/ruralProjectRecords/updateContractForm?id=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 合同修改</a>";
+						}
 						if(d.reportDataFlag != undefined && d.reportDataFlag =="1")
 						{
 							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/createReportDataId?id=" + d.id + "&projectType=1"+"\" onclick=\"return confirmx('确认要生成报告号吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-orange\"> 生成报告号</a>";

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/adminReportEditFormAlls.jsp

@@ -156,6 +156,7 @@
 						//咨询标的额
 						var ZiXunBDE = $("#ZiXunBDE").val();
 						var GCGMValue = $("#GCGMValue").val();
+						console.log('ZiXunBDE',ZiXunBDE)
 
 						if(GCGMValue == 0){
 							parent.layer.msg("建筑面积或规模必须大于0!", {icon: 5});
@@ -685,6 +686,13 @@
 			}
 			if(af !=''){
 				$("#consultFee").val(af)
+				//将咨询标的额整理成万元并赋值给上报中的咨询标的额
+				// 将元转换为万元
+				let wan = af / 10000;
+
+				// 四舍五入保留两位小数
+				wan = Math.round(wan * 100) / 100;
+				$("#ZiXunBDE").val(wan);
 			}
 		}
 		function getApprovalFee() {
@@ -705,6 +713,14 @@
 			}
 			if(af !=''){
 				$("#consultFee").val(af)
+				//将咨询标的额整理成万元并赋值给上报中的咨询标的额
+				// 将元转换为万元
+				let wan = af / 10000;
+
+				// 四舍五入保留两位小数
+				wan = Math.round(wan * 100) / 100;
+				$("#ZiXunBDE").val(wan);
+
 			}
 			$("#buildingFee").val("");
 			$("#installFee").val("");