Merge remote-tracking branch 'origin/master'

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.RuralProjectRecordReportInfo;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
+import com.jeeplus.modules.sys.entity.User;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -230,4 +231,11 @@ public interface RuralProjectRecordsDao extends CrudDao<RuralProjectRecords> {
      * @return
      */
     Integer getProjectByName(String projectName);
+
+    /**
+     * 根据项目id查询项目创建人和责任人
+     * @param projectId
+     * @return
+     */
+    List<User> getProjectCreateUserAndChargeUser(String projectId);
 }

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

@@ -1629,7 +1629,10 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 				notifyStr = "项目【"+ info.getProjectName()+"】即将上报超期";
 				titleStr = "项目【"+ info.getProjectName()+"】即将上报超期。超期时间："+info.getAdventDate();
 			}
-			List<User> projectLeaders = workProjectUserDao.queryProjectUsers(info.getId(), "1");
+
+			//查询项目的登记人和责任人的id
+			List<User> projectLeaders = dao.getProjectCreateUserAndChargeUser(info.getId());
+			//List<User> projectLeaders = workProjectUserDao.queryProjectUsers(info.getId(), "1");
 			for (User user: projectLeaders) {
 				workProjectNotifyService
 					.save(UtilNotify.saveNotify(info.getId(),
@@ -2253,7 +2256,9 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 				notifyStr = "项目【"+ info.getProjectName()+"】即将归档超期";
 				titleStr = "项目【"+ info.getProjectName()+"】即将归档超期。超期时间："+info.getAdventDate();
 			}
-			List<User> projectLeaders = workProjectUserDao.queryProjectUsers(info.getId(), "1");
+			//查询项目的登记人和责任人的id
+			List<User> projectLeaders = dao.getProjectCreateUserAndChargeUser(info.getId());
+			//List<User> projectLeaders = workProjectUserDao.queryProjectUsers(info.getId(), "1");
 			for (User user: projectLeaders) {
 				workProjectNotifyService
 						.save(UtilNotify.saveNotify(info.getId(),

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

@@ -1816,4 +1816,17 @@
 		set audit_pass_date = #{createDate}
 		where process_instance_id = #{processInstanceId}
 	</update>
+
+	<select id="getProjectCreateUserAndChargeUser" resultType="User">
+		select z.id,z.name,z.photo from (
+		select a.id,a.name,a.photo from sys_user a
+		left join rural_project_records b on a.id = b.create_by
+		where b.id = #{projectId}
+		union all
+		select a.id,a.name,a.photo from sys_user a
+		left join rural_project_records b on a.id = b.project_master_id
+		where b.id = #{projectId}
+		) z
+		group by z.id
+	</select>
 </mapper>