上报咨询员功能修改

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

@@ -147,4 +147,11 @@ public interface RuralProjectRecordsDao extends CrudDao<RuralProjectRecords> {
      * @return
      */
     RuralProjectRecords getById(String id);
-}
+
+    /**
+     * 修改项目责任人信息
+     * @param projectRecords
+     * @return
+     */
+    Integer updateProjectMaster(RuralProjectRecords projectRecords);
+}

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

@@ -1152,6 +1152,14 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         projectReportData.setConsultantRemarks(reportData.getConsultantRemarks());
         projectReportData.setPrincipalRemarks(reportData.getPrincipalRemarks());
         projectReportDataDao.update(projectReportData);
+
+
+        //将项目表中的项目负责人信息修改
+        RuralProjectRecords ruralProjectRecords = new RuralProjectRecords();
+        ruralProjectRecords.setId(projectRecords.getId());
+        ruralProjectRecords.setProjectMasterId(projectReportData.getPrincipal().getId());
+        ruralProjectRecordsService.updateProjectMaster(ruralProjectRecords);
+
         return "保存审核意见成功！";
     }
 
@@ -1585,7 +1593,11 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         }else {
             projectReportDataService.save(projectReportData);
         }
-
+        //将项目表中的项目负责人信息修改
+        RuralProjectRecords ruralProjectRecords = new RuralProjectRecords();
+        ruralProjectRecords.setId(projectRecords.getId());
+        ruralProjectRecords.setProjectMasterId(projectReportData.getPrincipal().getId());
+        ruralProjectRecordsService.updateProjectMaster(ruralProjectRecords);
         //盖章人
         //List<User> gzrs = UserUtils.getByRoleActivityEnname("gzr",3,recordsOffice.getId(),"12",projectReportData.getCreateBy());
         if (com.jeeplus.common.utils.StringUtils.isNotBlank(workActivityMenu.getId())) {

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

@@ -1949,4 +1949,12 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		map.put("data",treeList);
 		return map;
 	}
+
+	/**
+	 * 修改项目责任人信息
+	 * @param ruralProjectRecords
+	 */
+	public void updateProjectMaster(RuralProjectRecords ruralProjectRecords){
+		dao.updateProjectMaster(ruralProjectRecords);
+	}
 }

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

@@ -470,9 +470,14 @@ public class RuralCostProjectMessageController extends BaseController {
         ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
         projectReportData = projectReportDataService.get(projectReportData.getId());
         RuralProjectRecords ruralProjectRecords = projectRecordsService.getQueryProjectUsers(projectcontentinfo1.getProject().getId());
-        if(StringUtils.isBlank(ruralProjectRecords.getProjectMasterId())){
+        /*if(StringUtils.isBlank(ruralProjectRecords.getProjectMasterId())){
             ruralProjectRecords.setProjectMasterId(projectReportData.getPrincipal().getId());
             ruralProjectRecords.setProjectMasterName(projectReportData.getPrincipal().getName());
+        }*/
+        // 将项目负责人替换为项目中的负责人
+        if(StringUtils.isNotBlank(ruralProjectRecords.getProjectMasterId())){
+            User user = UserUtils.get(ruralProjectRecords.getProjectMasterId());
+            projectReportData.setPrincipal(user);
         }
         Projectcontentinfo projectcontent = projectcontentinfoService.getByInfoId(projectReportData.getId());
         projectcontent.setProjectReportData(projectReportData);
@@ -616,6 +621,7 @@ public class RuralCostProjectMessageController extends BaseController {
                 return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
             }
             if(null != reportData){
+                projectcontentinfo.getProjectReportData().setBzshbUserId(reportData.getBzshbUserId());
                 if(reportData.getStatus().equals("2")){
                     addMessage(redirectAttributes, "报告已送审，请勿重复提交");
                     return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";

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

@@ -480,9 +480,14 @@ public class RuralProjectMessageController extends BaseController {
         ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
         projectReportData = projectReportDataService.get(projectReportData.getId());
         RuralProjectRecords ruralProjectRecords = projectRecordsService.getQueryProjectUsers(projectcontentinfo1.getProject().getId());
-        if(StringUtils.isBlank(ruralProjectRecords.getProjectMasterId())){
+        /*if(StringUtils.isBlank(ruralProjectRecords.getProjectMasterId())){
             ruralProjectRecords.setProjectMasterId(projectReportData.getPrincipal().getId());
             ruralProjectRecords.setProjectMasterName(projectReportData.getPrincipal().getName());
+        }*/
+        // 将项目负责人替换为项目中的负责人
+        if(StringUtils.isNotBlank(ruralProjectRecords.getProjectMasterId())){
+            User user = UserUtils.get(ruralProjectRecords.getProjectMasterId());
+            projectReportData.setPrincipal(user);
         }
         Projectcontentinfo projectcontent = projectcontentinfoService.getByInfoId(projectReportData.getId());
         projectcontent.setProjectReportData(projectReportData);
@@ -642,6 +647,7 @@ public class RuralProjectMessageController extends BaseController {
                 return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
             }
             if(null != reportData){
+                projectcontentinfo.getProjectReportData().setBzshbUserId(reportData.getBzshbUserId());
                 if(reportData.getStatus().equals("2")){
                     addMessage(redirectAttributes, "报告已送审，请勿重复提交");
                     return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";

src/main/java/com/jeeplus/modules/workfullmanage/web/WorkFullManageController.java

@@ -24,6 +24,7 @@ import com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.Role;
+import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.SystemService;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
@@ -103,6 +104,8 @@ public class WorkFullManageController extends BaseController {
 	private ProjectReportDataService projectReportDataService;
 	@Autowired
 	private RuralProjectRecordsService ruralProjectRecordsService;
+	@Autowired
+	private RuralProjectRecordsService projectRecordsService;
 
 	@Autowired
 	private WorkFullDesignService workFullDesignService;
@@ -873,6 +876,13 @@ public class WorkFullManageController extends BaseController {
 		projectReportData = projectReportDataService.get(projectReportData.getId());
 		//获取项目信息
 		RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(projectReportData.getProject().getId());
+		projectRecordsService.queryUserNames(ruralProjectRecords);
+		// 将项目负责人替换为项目中的负责人
+		if(StringUtils.isNotBlank(ruralProjectRecords.getProjectMasterId())){
+			User user = UserUtils.get(ruralProjectRecords.getProjectMasterId());
+			projectReportData.setPrincipal(user);
+		}
+
 		//获取合同信息
 		WorkContractInfo workContractInfo = workContractInfoService.get(ruralProjectRecords.getWorkContractInfo().getId());
 		//获取咨询员信息

src/main/resources/mappings/modules/projectcontentinfo/ProjectReportDataDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jeeplus.modules.projectcontentinfo.dao.ProjectReportDataDao">
-    
+
 	<sql id="projectReportDataColumns">
 		a.id AS "id",
 		a.create_by AS "createBy.id",
@@ -53,12 +53,12 @@
 		a.technicist_date as "technicistDate"
 
 	</sql>
-	
+
 	<sql id="projectReportDataJoins">
 		LEFT JOIN sys_user m ON m.id = a.master
 	</sql>
-	
-    
+
+
 	<select id="get" resultType="ProjectReportData" >
 		SELECT
 			<include refid="projectReportDataColumns"/>
@@ -145,7 +145,7 @@
 	</select>
 
 	<select id="findList" resultType="ProjectReportData" >
-		SELECT 
+		SELECT
 			<include refid="projectReportDataColumns"/>
 		FROM project_report_data a
 		<include refid="projectReportDataJoins"/>
@@ -496,13 +496,13 @@
 	</select>
 
 	<select id="findAllList" resultType="ProjectReportData" >
-		SELECT 
+		SELECT
 			<include refid="projectReportDataColumns"/>
 		FROM project_report_data a
 		<include refid="projectReportDataJoins"/>
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
-		</where>		
+		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 				ORDER BY ${page.orderBy}
@@ -512,7 +512,7 @@
 			</otherwise>
 		</choose>
 	</select>
-	
+
 	<insert id="insert">
 		INSERT INTO project_report_data(
 			id,
@@ -604,9 +604,9 @@
 			#{technicistDate}
 		)
 	</insert>
-	
+
 	<update id="update">
-		UPDATE project_report_data SET 	
+		UPDATE project_report_data SET
 			update_by = #{updateBy.id}
 			,update_date = #{updateDate}
 			,remarks = #{remarks}
@@ -727,21 +727,21 @@
 		WHERE id = #{id}
 	</update>
 
-	
+
 	<!--物理删除-->
 	<update id="delete">
 		DELETE FROM project_report_data
 		WHERE id = #{id}
 	</update>
-	
+
 	<!--逻辑删除-->
 	<update id="deleteByLogic">
-		UPDATE project_report_data SET 
+		UPDATE project_report_data SET
 			del_flag = #{DEL_FLAG_DELETE}
 		WHERE id = #{id}
 	</update>
-	
-	
+
+
 	<!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
 	<select id="findUniqueByProperty" resultType="ProjectReportData" statementType="STATEMENT">
 		select * FROM project_report_data  where ${propertyName} = '${value}'
@@ -935,4 +935,4 @@
 		where projectId = #{projectId}
 	</select>
 
-</mapper>
+</mapper>

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

@@ -52,12 +52,12 @@
 		a.attachment_project_sort as "attachmentProjectSort",
 		a.check_remarks as "check_Remarks"
 	</sql>
-	
+
 	<sql id="projectRecordsJoins">
 		LEFT JOIN sys_area area ON area.id = a.area_id
 	</sql>
-	
-    
+
+
 	<select id="get" resultType="RuralProjectRecords" >
 		SELECT
 			<include refid="projectRecordsColumns"/>
@@ -114,7 +114,7 @@
         LEFT JOIN sys_office o ON o.id = a.office_id
 		WHERE a.id = #{id}
 	</select>
-	
+
 	<select id="findList" resultType="RuralProjectRecords" >
 		SELECT
 			<include refid="projectRecordsColumns"/>
@@ -416,15 +416,15 @@
             AND a.del_flag = #{DEL_FLAG_NORMAL}
         </where>
     </select>
-	
+
 	<select id="findAllList" resultType="RuralProjectRecords" >
-		SELECT 
+		SELECT
 			<include refid="projectRecordsColumns"/>
 		FROM rural_project_records a
 		<include refid="projectRecordsJoins"/>
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
-		</where>		
+		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 				ORDER BY ${page.orderBy}
@@ -434,7 +434,7 @@
 			</otherwise>
 		</choose>
 	</select>
-	
+
 	<insert id="insert">
 		INSERT INTO rural_project_records(
 			id,
@@ -534,7 +534,7 @@
 		    #{engineeringType}
 		)
 	</insert>
-	
+
 	<update id="update">
 		UPDATE rural_project_records SET
 			update_by = #{updateBy.id},
@@ -630,15 +630,15 @@
 		    attachment_project_sort = #{attachmentProjectSort}
 		WHERE id = #{id}
 	</update>
-	
-	
+
+
 	<!--物理删除-->
 	<update id="delete">
 		UPDATE rural_project_records SET
 			status = 7
 		WHERE id = #{id}
 	</update>
-	
+
 	<!--逻辑删除-->
 	<update id="deleteByLogic">
 		UPDATE rural_project_records SET
@@ -685,7 +685,7 @@
           status = #{projectStatus}
         WHERE id = #{id}
     </update>
-	
+
 	<update id="updateSelectiveById">
 		UPDATE  rural_project_records
 		<set>
@@ -1503,4 +1503,11 @@
 	<select id="getReportRecordStatus" resultType="java.lang.String">
 		select status from rural_project_report_record where report_id = #{reportId}
 	</select>
-</mapper>
+
+
+	<update id="updateProjectMaster">
+		UPDATE rural_project_records SET
+			project_master_id =  #{projectMasterId}
+		WHERE id = #{id}
+	</update>
+</mapper>

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

@@ -965,7 +965,7 @@
 					<label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
 					<div class="layui-input-block  with-icon">
 						<sys:reportedtreeselectUser id="principal" name="projectReportData.principal.id" value="${projectRecords.projectMasterId}" labelName="projectReportData.principal.name" labelValue="${projectRecords.projectMasterName}"
-													cssStyle="background-color:#fff" title="项目负责人" url="/sys/office/treeDataAll?type=4" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+													cssStyle="background-color:#fff" title="项目负责人" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 <%--						<sys:inquireselectUser id="principal" name="projectReportData.principal.id" value="${projectReportData.principal.id}" labelName="projectReportData.principal.name" labelValue="${projectReportData.principal.name}"--%>
 <%--									cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>--%>
 					</div>

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

@@ -917,7 +917,7 @@
 							</tr>
 							</thead>
 							<tbody id="reportedConsultantList">
-							<c:forEach items="${info}" var = "info" varStatus="status">
+							<%--<c:forEach items="${info}" var = "info" varStatus="status">
 								<tr>
 									<td width="60px">
 										<input id="reportedConsultantList${status.index+1}_costNum" name="reportedConsultantList[${status.index+1}].costNum" readonly="readonly" style="text-align: center"  value="${status.index+1}" type="text" class="form-control contentDetail"/>
@@ -941,7 +941,7 @@
 										<span class="op-btn op-btn-delete" onclick="delRow(this, '#reportedConsultantList${status.index+1}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>
 									</td>
 								</tr>
-							</c:forEach>
+							</c:forEach>--%>
 							</tbody>
 						</table>
 						<script type="text/template" id="workClientBankTpl">//<!--
@@ -950,6 +950,7 @@
                                         <input id="reportedConsultantList{{idx}}_id" name="reportedConsultantList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
                                         <input id="reportedConsultantList{{idx}}_delFlag" name="reportedConsultantList[{{idx}}].delFlag" type="hidden" value="0"/>
                                         <input id="reportedConsultantList{{idx}}_remindId" name="reportedConsultantList[{{idx}}].remindId" type="hidden" value="{{row.remindId}}"/>
+                                    	<input id="reportedConsultantList{{idx}}_zhucezigezhKey" name="reportedConsultantList[{{idx}}].zhucezigezhKey" type="hidden" value="{{row.zhucezigezhKey}}"/>
                                     </td>
 
                                     <td width="60px">
@@ -1640,9 +1641,9 @@
 		return false;
 	}
 	function addRow(list, idx, tpl, row){
-		var idx1 = $("#reportedConsultantList tr").length;
-		idx1 +=1;
-		bornTemplete(list, idx1, tpl, row, idx);
+		/*var idx1 = $("#reportedConsultantList tr").length;
+		idx1 +=1;*/
+		bornTemplete(list, idx+1, tpl, row, idx);
 	}
 
 	function bornTemplete(list, idx, tpl, row, idx1){
@@ -1787,7 +1788,7 @@
 	var workClientBankRowIdx = 0,
 			workClientBankTpl = $("#workClientBankTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
 	$(document).ready(function () {
-		var dataBank = ${fns:toJson(ruralProjectRecordsReported.reportedConsultantList)};
+		var dataBank = ${fns:toJson(info)};
 		for (var i = 0; i < dataBank.length; i++) {
 			addRow('#reportedConsultantList', workClientBankRowIdx, workClientBankTpl, dataBank[i]);
 			workClientBankRowIdx = workClientBankRowIdx + 1;