Explorar o código

审核他人文件

zhouyy hai 2 meses
pai
achega
6626d10e72

+ 2 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/vo/OtherTaskFileInfoVO.java

@@ -16,4 +16,6 @@ public class OtherTaskFileInfoVO {
     private String documentName;
     private String finalChargeId;
     private String finalChargeName;
+
+    private Integer groupId;
 }

+ 2 - 5
fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/TaskMapper.xml

@@ -740,7 +740,7 @@
     </select>
     <select id="getOtherTaskChargePage" resultType="com.management.platform.entity.vo.OtherTaskFileInfoVO">
         select tf.task_id,task.name as taskName
-        ,p.id as projectId,p.project_name
+        ,p.id as projectId,p.project_name,task.group_id
         ,tf.creator_id,tf.creator_name,tf.document_name
         ,case tf.charge_stage
         when 1 then tf.charge_one_id when 2 then tf.charge_two_id
@@ -777,10 +777,7 @@
         from (
         select tf.task_id,task.name as taskName
         ,p.id as projectId,p.project_name
-        ,tf.creator_id,tf.document_name
-        ,case tf.charge_stage
-        when 1 then tf.charge_one_id when 2 then tf.charge_two_id
-        end as final_charge_id
+        ,tf.creator_id
         from task_files tf
         left join task on tf.task_id = task.id
         left join project p on task.project_id = p.id