bugfix

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsApprovalInfoQueryVo.java

@@ -26,10 +26,14 @@ public class BmsApprovalInfoQueryVo implements Serializable {
     @ApiModelProperty("主键Id")
     private Long id;
 
-    @ApiModelProperty("默认审批人id")
+    @ApiModelProperty("已审批人id")
-    @Excel(name = "默认审批人id")
+    @Excel(name = "已审批人id")
     private Long approvalById;
 
+    @ApiModelProperty("申报企业名称")
+    @Excel(name = "申报企业名称")
+    private String enterpriseName;
+
     @ApiModelProperty("默认审批人")
     @Excel(name = "默认审批人")
     private String approvalByName;

ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsApprovalInfoMapper.xml

@@ -73,8 +73,9 @@
     <select id="getApprovalInfoList" resultType="com.ruoyi.jjh.declaration.entity.vo.BmsApprovalInfoQueryVo">
         SELECT
         a.id,
+        t.qymc as enterpriseName,
         a.approval_by_id,
-        b.nick_name AS approvalByName,
+        c.nick_name AS approvalByName,
         a.approval_status,
         a.approval_opinions,
         a.approval_attachment,
@@ -83,7 +84,10 @@
         a.sort
         FROM
         bms_approval_info a
-        INNER JOIN sys_user b ON a.approval_by_id = b.user_id
+        inner join bms_declaration_records l on a.declaration_records_id = l.id
+        left join  bms_enterprise_basic_info t on l.credit_code = t.tyshxydm
+        INNER JOIN sys_dept b ON a.approval_dept = b.dept_id
+        left JOIN sys_user c ON a.approval_by_id = c.user_id
         <where>
             a.declaration_records_id=#{declarationRecordsId}
         </where>

ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectMapper.xml

@@ -29,22 +29,28 @@
         order by create_time desc ,project_year desc
     </select>
     <select id="getApprovalInfoList" resultType="com.ruoyi.jjh.declaration.entity.vo.BmsApprovalInfoQueryVo">
-        select
+        SELECT
-        c.id,
+            c.id,
-        c.approval_by_id,
+            c.approval_by_id,
-        d.nick_name AS approvalByName,
+            t.qymc as enterpriseName,
-        c.approval_status,
+            u.nick_name AS approvalByName,
-        c.approval_opinions,
+            c.approval_status,
-        c.approval_attachment,
+            c.approval_opinions,
-        c.approval_time,
+            c.approval_attachment,
-        c.is_before_data,
+            c.approval_time,
-        c.sort
+            c.is_before_data,
-        from j_project a
+            c.sort
-        left join bms_declaration_records b on a.id = b.jjh_project_id
+        FROM
-        left join  bms_approval_info c on b.id = c.declaration_records_id
+            j_project a
-        left join sys_user d on c.approval_by_id = d.user_id
+                INNER JOIN bms_declaration_records b ON a.id = b.jjh_project_id
-        where a.id=#{id}
+                INNER JOIN bms_enterprise_basic_info t ON b.credit_code = t.tyshxydm
-        order by c.sort asc
+                INNER JOIN bms_approval_info c ON b.id = c.declaration_records_id
+                INNER JOIN sys_dept s ON c.approval_dept = s.dept_id
+                left JOIN sys_user u ON c.approval_by_id = u.user_id
+        WHERE
+            a.id = #{id}
+        ORDER BY
+            c.sort ASC
     </select>
     <select id="selectAll" resultType="com.ruoyi.jjh.ent.entity.JProject">
         select * from j_project