项目成本加入科研任务负责人并分权限展示

jeecg-module-system/jeecg-system-start/src/main/resources/application.yml

@@ -2,4 +2,4 @@ spring:
   application:
     name: jeecg-system
   profiles:
-    active: '@profile.name@'
+    active: 'dev'

module_kzks/src/main/java/org/jeecg/modules/projectCost/entity/ProjectCost.java

@@ -230,6 +230,10 @@ public class ProjectCost implements Serializable, Cloneable {
     @ApiModelProperty(value = "主管设计师/来自科研任务")
     private java.lang.String ywfzrname;
 
+    @Excel(name = "科研任务责任人/来自科研任务", width = 15)
+    @ApiModelProperty(value = "科研任务责任人/来自科研任务")
+    private java.lang.String xhzzrname;
+
     @TableField(exist = false)
     private List<String> deptNames;
     @Override

module_kzks/src/main/java/org/jeecg/modules/projectCost/mapper/xml/ProjectCostMapper.xml

@@ -9,7 +9,7 @@
                c.clf ,c.zyf,c.swf,c.wxf,c.rldlf,c.gdzczj,c.gzjlwf,c.glf,IFNULL(c.zjcb,m.value) AS zjcb,c.lbsy ,
                c.workhour,c.zrbm,c.jycsid,c.jycs ,c.hxzxid,c. hxzxname ,c.tasktype,c.AuditPrice,c.iflag,c.Brief,
                c.reftaskno,c.pcCode,c.bcCode,c.blCode,c.business_man_name,c.sjgs,c.scgs,c.status,c.proportion,c.ywfzrname,
-               c.clys,c.wxys,
+               c.clys,c.wxys,c.xhzzrname,
                2 as ji
         from kzks_project_cost c
         left join mes_info_installationcost m on  m.taskno = #{taskno}
@@ -23,7 +23,7 @@
                c.clf ,c.zyf,c.swf,c.wxf,c.rldlf,c.gdzczj,c.gzjlwf,c.glf,IFNULL(c.zjcb,m.value) AS zjcb,c.lbsy ,
                c.workhour,c.zrbm,c.jycsid,c.jycs ,c.hxzxid,c. hxzxname ,c.tasktype,c.AuditPrice,c.iflag,c.Brief,
                c.reftaskno,c.pcCode,c.bcCode,c.blCode,c.business_man_name,c.sjgs,c.scgs,c.status,c.proportion,c.ywfzrname,
-               c.clys,c.wxys,
+               c.clys,c.wxys,c.xhzzrname,
                2 as ji
         from kzks_project_cost c
                  left join mes_info_installationcost m on m.taskno = c.taskno

module_kzks/src/main/java/org/jeecg/modules/projectCost/vo/ProjectCostVO.java

@@ -191,6 +191,11 @@ public class ProjectCostVO implements Serializable {
     @ApiModelProperty(value = "业务员/来自科研任务")
     private java.lang.String businessManName;
 
+    @Excel(name = "科研任务责任人/来自科研任务", width = 15)
+    @ApiModelProperty(value = "科研任务责任人/来自科研任务")
+    private java.lang.String xhzzrname;
+
+
     public String getBusinessManName() {
         return businessManName;
     }

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/controller/ProjectCostHuijiController.java

@@ -148,7 +148,8 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
             LoginUser finalSysUser = sysUser;
             queryWrapper.lambda().and(i -> {
                 i.eq(StringUtils.isNotBlank(finalSysUser.getRealname()), ProjectCostHuiji::getBusinessManName, finalSysUser.getRealname()).or()
-                        .eq(StringUtils.isNotBlank(finalSysUser.getRealname()), ProjectCostHuiji::getYwfzrname, finalSysUser.getRealname());
+                        .eq(StringUtils.isNotBlank(finalSysUser.getRealname()), ProjectCostHuiji::getYwfzrname, finalSysUser.getRealname()).or()
+                        .eq(StringUtils.isNotBlank(finalSysUser.getRealname()),ProjectCostHuiji::getXhzzrname,finalSysUser.getRealname());
             });
             isStaff = true;
         } else {
@@ -256,10 +257,10 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
             query.lambda().like(StringUtils.isNotBlank(projectCost.getTaskname()), ProjectCost::getTaskname, projectCost.getTaskname());
 
             if (AuthMark.STAFF.equals(role)) {
-                LoginUser finalSysUser1 = sysUser;
                 query.lambda().and(i -> {
-                    i.eq(ProjectCost::getBusinessManName, finalSysUser1.getRealname()).or()
-                            .eq(ProjectCost::getYwfzrname, finalSysUser1.getRealname());
+                    i.eq(StringUtils.isNotBlank(finalSysUser.getRealname()),ProjectCost::getBusinessManName, finalSysUser.getRealname()).or()
+                            .eq(StringUtils.isNotBlank(finalSysUser.getRealname()),ProjectCost::getYwfzrname, finalSysUser.getRealname()).or()
+                            .eq(StringUtils.isNotBlank(finalSysUser.getRealname()),ProjectCost::getXhzzrname,finalSysUser.getRealname());
                 });
             }
 

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/convert/impl/ProjectCostHuijiConverCustomImpl.java

@@ -138,6 +138,7 @@ public class ProjectCostHuijiConverCustomImpl implements ProjectCostHuijiCustomC
             projectCostHuijiListVO.setClys(huiji.getClys());
             projectCostHuijiListVO.setHjstatus(huiji.getHjstatus());
             projectCostHuijiListVO.setYwfzrname(huiji.getYwfzrname());
+            projectCostHuijiListVO.setXhzzrname(huiji.getXhzzrname());
         }
         List<ProjectCostVO> list = children;
         if ( list != null ) {

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/entity/ProjectCostHuiji.java

@@ -321,6 +321,10 @@ public class ProjectCostHuiji implements Serializable, Cloneable {
     @ApiModelProperty(value = "外协预算")
     private java.math.BigDecimal wxys;
 
+    @Excel(name = "科研任务责任人/来自科研任务", width = 15)
+    @ApiModelProperty(value = "科研任务责任人/来自科研任务")
+    private java.lang.String xhzzrname;
+
     @TableField(exist = false)
     private List<String> deptNames;
     @Override

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/vo/ProjectCostHuijiListVO.java

@@ -235,6 +235,18 @@ public class ProjectCostHuijiListVO implements Serializable {
     @ApiModelProperty(value = "状态")
     private java.lang.String hjstatus;
 
+    @Excel(name = "科研任务责任人/来自科研任务", width = 15)
+    @ApiModelProperty(value = "科研任务责任人/来自科研任务")
+    private java.lang.String xhzzrname;
+
+    public String getXhzzrname() {
+        return xhzzrname;
+    }
+
+    public void setXhzzrname(String xhzzrname) {
+        this.xhzzrname = xhzzrname;
+    }
+
     public String getHjstatus() {
         return hjstatus;
     }