Browse Source

增加拍摄leader

yumeng 2 years ago
parent
commit
c792cff623

+ 2 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/entity/MaterialAscription.java

@@ -48,6 +48,8 @@ public class MaterialAscription {
      * 平面id
      */
     private String planeId;
+    private String shotLeaderId;
+    private String shotLeaderName;
     private String code;
     private Date createTime;
     private Date updateTime;

+ 29 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -580,7 +580,19 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
                 if (null != clipId && !"".equals(clipId.trim())) {
                     materialAscription.setClipId(clipId);
                 }
-                materialAscription.setShotId(ascription.getString("shotId"));
+                String  shotId = ascription.getString("shotId");
+                if(!Check.isNull(shotId)){
+                    materialAscription.setShotId(shotId);
+                    SysUser shot = userService.getById(shotId);
+                    String shotCode = userService.getRoleCodeByUserId(shotId);
+                    if("designTeamLeader".equals(shotCode)){
+                        materialAscription.setShotLeaderId(shotId);
+                        materialAscription.setShotLeaderName(shot.getRealname());
+                    }else {
+                        materialAscription.setShotLeaderId(shot.getLeaderId());
+                        materialAscription.setShotLeaderName(shot.getLeaderName());
+                    }
+                }
                 materialAscription.setPlanId(ascription.getString("planId"));
                 materialAscription.setPlaneId(ascription.getString("planeId"));
                 materialAscription.setCode(info.getCode());
@@ -753,7 +765,22 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
                 if (null != clipId && !"".equals(clipId.trim())) {
                     materialAscription.setClipId(clipId);
                 }
-                materialAscription.setShotId(ascription.getString("shotId"));
+
+               String  shotId = ascription.getString("shotId");
+                if(!Check.isNull(shotId)){
+                    materialAscription.setShotId(shotId);
+                    SysUser shot = userService.getById(shotId);
+                    String shotCode = userService.getRoleCodeByUserId(shotId);
+                    if("designTeamLeader".equals(shotCode)){
+                        materialAscription.setShotLeaderId(shotId);
+                        materialAscription.setShotLeaderName(shot.getRealname());
+                    }else {
+                        materialAscription.setShotLeaderId(shot.getLeaderId());
+                        materialAscription.setShotLeaderName(shot.getLeaderName());
+                    }
+                }
+
+
                 materialAscription.setPlanId(ascription.getString("planId"));
                 materialAscription.setPlaneId(ascription.getString("planeId"));
                 materialAscription.setCode(info.getCode());