代码提交

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/core/service/dto/BaseDTO.java

@@ -19,16 +19,19 @@ public abstract class BaseDTO<T> implements Serializable {
     /**
      * taskId
      */
+    @ExcelIgnore
     protected String taskId;
 
     /**
      * 流程id
      */
+    @ExcelIgnore
     protected String procInsId;
 
     /**
      * 流程信息
      */
+    @ExcelIgnore
     protected String processDefinitionId;
 
     /**

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/domain/CwProjectReportData.java

@@ -100,12 +100,12 @@ public class CwProjectReportData extends BaseDTO {
 
 
     @TableField(exist = false)
-    @Excel(name = "报告所属部门",width = 20,orderNum = "5")
+    @Excel(name = "报告所属部门",width = 20,orderNum = "6")
     private String departmentName; //部门名称
     /**
      * 项目经理
      */
-    @Excel(name = "项目经理",width = 12,orderNum = "6")
+    @Excel(name = "项目经理",width = 12,orderNum = "7")
     private String projectMasterName;
 
     /**
@@ -149,13 +149,13 @@ public class CwProjectReportData extends BaseDTO {
      * 创建人
      */
     @TableField(exist = false)
-    @Excel(name = "创建人",width = 12,orderNum = "7")
+    @Excel(name = "创建人",width = 12,orderNum = "8")
     private String userName; //用户名
 
     /**
      * 创建时间
      */
-    @Excel(name = "创建时间", exportFormat="yyyy-MM-dd",width = 16,orderNum = "8")
+    @Excel(name = "创建时间", exportFormat="yyyy-MM-dd",width = 16,orderNum = "9")
     private Date createTime;
 
     /**
@@ -205,7 +205,7 @@ public class CwProjectReportData extends BaseDTO {
     /**
      * 公章流程status
      */
-    @Excel(name = "签章状态",width = 12,orderNum = "10")
+    @Excel(name = "签章状态",width = 12,orderNum = "11")
     private String status1;
 
     /**
@@ -266,6 +266,7 @@ public class CwProjectReportData extends BaseDTO {
     /**
      * 审计收费（元）
      */
+    @Excel(name = "审计收费（元）",width = 12,orderNum = "5")
     private String auditFees;
 
     /**
@@ -348,7 +349,7 @@ public class CwProjectReportData extends BaseDTO {
     /**
      * 报告复核流程状态
      */
-    @Excel(name = "复核状态",width = 12,orderNum = "9")
+    @Excel(name = "复核状态",width = 12,orderNum = "10")
     private String reviewStatus;
 
     /**

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -65,7 +65,7 @@
         b.real_header as projectMasterId2,
         c.name as departmentName,
         d.name as userName,
-        a.audit_fees,
+        ifnull(cw_pa.audit_money,"0") as "auditFees",
         e.name as projectMasterName,
         b.real_header as projectMaster2Id,
         f.name as projectMaster2Name,
@@ -121,6 +121,7 @@
 
         left join cw_project_report_new_line new_line on a.id = new_line.report_id and new_line.del_flag = '0'
         left join cw_project_report_review cw_rev on a.id = cw_rev.report_id and cw_rev.del_flag = '0'
+        LEFT JOIN cw_project_report_archive cw_pa on  a.id = cw_pa.report_id and cw_pa.del_flag = '0'
         left join act_ru_task art ON cw_rev.proc_ins_id = art.PROC_INST_ID_
         left join cw_project_members cpm on b.id = cpm.project_id
         left join sys_user sub on cpm.user_id = sub.id
@@ -160,7 +161,7 @@
         c.name as departmentName,
         d.name as userName,
         a.create_time,
-        a.audit_fees,
+        ifnull(cw_pa.audit_money,"") as "auditFees",
         e.name as projectMasterName,
         a.real_create,
         a.business_type,
@@ -216,6 +217,7 @@
         left join cw_project_report_review cw_re on a.id = cw_re.report_id and cw_re.del_flag = '0'
         LEFT JOIN cw_project_report_number_apply cw_na on  a.id = cw_na.report_id and cw_na.del_flag = '0'
         LEFT JOIN cw_project_report_number_review_apply cw_nra on  a.id = cw_nra.report_id and cw_nra.del_flag = '0'
+        LEFT JOIN cw_project_report_archive cw_pa on  a.id = cw_pa.report_id and cw_pa.del_flag = '0'
         where a.id = #{id}
     </select>
     <select id="queryContainDelById" resultType="com.jeeplus.finance.projectReport.domain.CwProjectReportData">
@@ -757,6 +759,9 @@
         <if test="reportName != null and reportName != ''">
             report_name = #{reportName},
         </if>
+        <if test="realCreate != null and realCreate != ''">
+            real_create = #{realCreate},
+        </if>
         <if test="tenantId != null and tenantId != ''">
             tenant_id = #{tenantId},
         </if>

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/controller/UserController.java

@@ -996,7 +996,8 @@ public class UserController {
     @GetMapping("isAdmin")
     @ApiOperation(value = "判断当前用户是否是管理员")
     public Boolean isAdmin() {
-        return UserUtils.getCurrentUserDTO().isAdmin();
+        UserDTO currentUserDTO = UserUtils.getCurrentUserDTO();
+        return "admin".equals(currentUserDTO.getLoginName()) || UserUtils.getCurrentUserDTO().isAdmin();
     }