代码提交

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

@@ -150,4 +150,16 @@ public interface ProjectcontentinfoDao extends CrudDao<Projectcontentinfo> {
 
 	void deleteOverallProcessContentById(String id);
 
+	/**
+	 * 根据id修改项目组成员人员信息
+	 * @param ruralReportConsultant
+	 */
+	void updateReportConsultantZixunyuanById(RuralReportConsultant ruralReportConsultant);
+
+	/**
+	 * 根据id删除项目组成员人员信息
+	 * @param ruralReportConsultant
+	 */
+	void deleteReportConsultant(RuralReportConsultant ruralReportConsultant);
+
 }

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

@@ -9,6 +9,7 @@ import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportDataTwo;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecordsExport;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant;
 import com.jeeplus.modules.statement.entity.StatementCompanyComprehensiveInfo;
 import com.jeeplus.modules.sys.entity.User;
 import org.apache.ibatis.annotations.Param;
@@ -491,4 +492,11 @@ public interface RuralProjectRecordsDao extends CrudDao<RuralProjectRecords> {
      * @param projectRecords
      */
     void updateContract(RuralProjectRecords projectRecords);
+
+    /**
+     * 根据项目id查询质量复核中项目组成员负责人信息
+     * @param id
+     * @return
+     */
+    List<RuralReportConsultant> getFZRReportConsultantByProjectId(String id);
 }

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

@@ -892,6 +892,35 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
         }else {
             super.save(projectRecords);
         }
+
+        //根据项目id查询是否有质量复核项目组成员信息，如果有，判定项目责任人是否与项目组成员中的负责人员一致，不一致则需要修改项目组人员中的负责人信息
+		List<RuralReportConsultant> fzrReportConsultantByProjectId = dao.getFZRReportConsultantByProjectId(projectRecords.getId());
+        if(fzrReportConsultantByProjectId.size()>0){
+        	if(fzrReportConsultantByProjectId.size()>1){
+        		for(int i = 0;i<fzrReportConsultantByProjectId.size(); i ++){
+					RuralReportConsultant ruralReportConsultant = fzrReportConsultantByProjectId.get(i);
+        			if(i == 0){
+						//如果项目负责人和质量复核中的项目组成员的负责人不一致，则需要修改项目组成员中的人员细腻些
+						if(!ruralReportConsultant.getZixunyuan().equals(projectRecords.getProjectMasterId())){
+							ruralReportConsultant.setZixunyuan(projectRecords.getProjectMasterId());
+							projectcontentinfoDao.updateReportConsultantZixunyuanById(ruralReportConsultant);
+						}
+					}else{
+        				//除去第一行  剩下的全都删除
+						projectcontentinfoDao.deleteReportConsultant(ruralReportConsultant);
+					}
+				}
+
+			}else{
+				RuralReportConsultant ruralReportConsultant = fzrReportConsultantByProjectId.get(0);
+				//如果项目负责人和质量复核中的项目组成员的负责人不一致，则需要修改项目组成员中的人员细腻些
+        		if(!ruralReportConsultant.getZixunyuan().equals(projectRecords.getProjectMasterId())){
+					ruralReportConsultant.setZixunyuan(projectRecords.getProjectMasterId());
+					projectcontentinfoDao.updateReportConsultantZixunyuanById(ruralReportConsultant);
+				}
+			}
+		}
+
 		//保存项目负责人
 		List<User> leaders = projectRecords.getProjectLeaders();
 		this.saveProjectUsers(projectRecords.getId(), leaders, true);

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

@@ -656,4 +656,12 @@
 	<update id="deleteOverallProcessContentById">
 		update project_content_data set del_flag = 1 where id = #{id}
 	</update>
+
+	<update id="updateReportConsultantZixunyuanById">
+		update rural_report_consultant set zixunyuan = #{zixunyuan} where id = #{id}
+	</update>
+
+	<delete id="deleteReportConsultant">
+		delete from rural_report_consultant where id = #{id}
+	</delete>
 </mapper>

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

@@ -6842,6 +6842,18 @@ GROUP BY
 		LEFT JOIN sys_user supmi ON supmi.id = a.project_master_id
 		WHERE a.project_name = #{projectName}
 	</select>
+	<select id="getFZRReportConsultantByProjectId"
+		resultType="com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant">
+		select id
+			 ,zixunyuan
+			 ,zhucezigezhID as 'zhucezigezhKey'
+			 ,major
+			 ,wordnr
+			 ,projectId
+			 ,auditOpinion
+			 ,role
+		from rural_report_consultant where projectId=#{projectId} and role = '负责人' order by update_date desc
+	</select>
 
 
 

src/main/webapp/webpage/include/head.jsp

@@ -99,7 +99,7 @@
         {
              document.write('<script src="http://gosspublic.alicdn.com/aliyun-oss-sdk-4.4.4.min.js"><\/script>');
             document.write('<script src="${ctxStatic}/bos/node_modules/@baiducloud/sdk/dist/baidubce-sdk.bundle.min.js"><\/script>');
-            document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?15"><\/script>');
+            document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?16"><\/script>');
             /*document.write('<script type="text/javascript" src="${ctxStatic}/bos/bosupload.js"><\/script>');*/
         }
     }
@@ -107,7 +107,7 @@
     {
          document.write('<script src="http://gosspublic.alicdn.com/aliyun-oss-sdk-4.4.4.min.js"><\/script>');
         document.write('<script src="${ctxStatic}/bos/node_modules/@baiducloud/sdk/dist/baidubce-sdk.bundle.min.js"><\/script>');
-        document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?15"><\/script>');
+        document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?16"><\/script>');
         /*document.write('<script type="text/javascript" src="${ctxStatic}/bos/bosupload.js"><\/script>');*/
     }
 

src/main/webapp/webpage/include/ossTools.jsp

@@ -9,4 +9,4 @@
 <script type="text/javascript" src="${ctxStatic}/oss/lib/plupload-2.3.6/plupload-2.3.6/js/jquery.plupload.queue/jquery.plupload.queue.js"></script>
 <script type="text/javascript" src="${ctxStatic}/oss/lib/plupload-2.3.6/plupload-2.3.6/js/plupload.dev.js"></script>
 <script type="text/javascript" src="${ctxStatic}/oss/upload.js"></script>
-<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?15"></script>
+<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?16"></script>

src/main/webapp/webpage/modules/projectcontentinfo/achievementFileDataForm.jsp

@@ -6,7 +6,7 @@
 	<meta name="decorator" content="default"/>
 	<link href="${ctxStatic}/bootstrap-select-1.12.4/css/bootstrap-select.min.css" rel="stylesheet" />
 	<script src="${ctxStatic}/bootstrap-select-1.12.4/js/bootstrap-select.min.js"></script>
-	<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?15"></script>
+	<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?16"></script>
 	<style>
 		label.error{
 			top:40px;

src/main/webapp/webpage/modules/projectcontentinfo/basedDataForm.jsp

@@ -6,7 +6,7 @@
 	<meta name="decorator" content="default"/>
 	<link href="${ctxStatic}/bootstrap-select-1.12.4/css/bootstrap-select.min.css" rel="stylesheet" />
 	<script src="${ctxStatic}/bootstrap-select-1.12.4/js/bootstrap-select.min.js"></script>
-	<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?15"></script>
+	<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?16"></script>
 	<style>
 		label.error{
 			top:40px;