소스 검색

项目日志上链开发

anderx 1 년 전
부모
커밋
708ad0f3a3

+ 11 - 0
ruoyi-system/src/main/java/com/ruoyi/project/bo/ProjectStaffRecordOut.java

@@ -54,6 +54,17 @@ public class ProjectStaffRecordOut extends ProjectStaffRecord {
 
     private Long aid;
 
+    private String projectTianheUrl;
+
+
+    public String getProjectTianheUrl() {
+        return projectTianheUrl;
+    }
+
+    public void setProjectTianheUrl(String projectTianheUrl) {
+        this.projectTianheUrl = projectTianheUrl;
+    }
+
     @Override
     public Double getInitDuration() {
         return initDuration;

+ 1 - 1
ruoyi-system/src/main/resources/mapper/project/ProjectStaffRecordMapper.xml

@@ -204,7 +204,7 @@
         b.name projectName,b.admin_name adminName ,a.project_status projectStatus,a.content ,b.project_number projectNumber,
         a.pid ,a.aid ,a.examine_id examineId ,a.examine_name examineName ,a.examine_time examineTime,a.record_time recordTime,
         a.annex_url annexUrl,a.create_time createTime,a.process_status processStatus , a.duration,a.init_duration initDuration,
-        a.check_duration checkDuration
+        a.check_duration checkDuration,a.tianhe_url tianheUrl,a.tianhe_type tianheType,b.tianhe_url projectTianheUrl
         from project_staff_record a left join project_task b on a.pid=b.id
         left join sys_user c on a.aid=c.user_id left join sys_dept d on c.dept_id =d.dept_id
         where 1=1

+ 2 - 1
ruoyi-system/src/main/resources/mapper/project/ProjectTaskMapper.xml

@@ -214,12 +214,13 @@
         <result column="cross_year" jdbcType="INTEGER" property="crossYear" />
         <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
         <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
+        <result column="tianhe_url" jdbcType="VARCHAR" property="tianheUrl" />
     </resultMap>
 
     <select id="selectList" resultMap="BaseResultOutMap">
         select
         a.id, a.aid, a.`name`, a.project_status , a.create_time, a.remark, a.admin_name, a.staff_name, a.project_number,
-        a.project_year, a.create_year, a.cross_year,a.duration,a.start_time,a.end_time
+        a.project_year, a.create_year, a.cross_year,a.duration,a.start_time,a.end_time,a.tianhe_url
         from project_task a
         left join sys_user c on a.aid=c.user_id
         left join sys_dept d on c.dept_id=d.dept_id