实习登记调整

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/practice/register/domain/Registration.java

@@ -55,5 +55,6 @@ public class Registration extends BaseEntity {
     List<RegistrationFamilyMembers> familyMembers;
     @TableField(exist = false)
     List<RegistrationExperience> experiences;
-
+    @TableField(exist = false)
+    private String parentOfficeName; //实习部门所属公司
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/practice/register/service/RegistrationService.java

@@ -89,6 +89,8 @@ public class RegistrationService extends ServiceImpl<InterRegistrationMapper, Re
             info.setFamilyMembers(familyMembers);
             List<RegistrationExperience> experiences = experienceMapper.getByRegisterId(id);
             info.setExperiences(experiences);
+            OfficeDTO officeDTO = SpringUtil.getBean(IOfficeApi.class).getParentOfficeById(info.getPracticeOffice());
+            info.setParentOfficeName(officeDTO.getName());
         }
         return info;
     }
@@ -703,7 +705,7 @@ public class RegistrationService extends ServiceImpl<InterRegistrationMapper, Re
         dto.setName(report.getName());
         dto.setPassword(SecurityUtils.encryptPassword("123456"));
         dto.setLoginName(report.getName());
-        dto.setLoginFlag("1");
+        dto.setLoginFlag("0");
         dto.setMobile(report.getMobilePhone());
         dto.setNo(report.getMobilePhone());
         dto.setPhoto("");

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

@@ -147,6 +147,27 @@ public class OfficeController {
     }
 
     /**
+     * 获取机构JSON数据(评估,会计,项目)。
+     *
+     * @param extId   排除的ID
+     * @param type    类型（1：公司；2：部门）
+     * @param showAll 是否显示不可用数据 1 显示 0 隐藏
+     * @return
+     */
+    @ApiLog("获取部门数据(评估,会计,项目)")
+    @GetMapping("treeDataPgAndKjAndXm")
+    public ResponseEntity <List <OfficeDTO>> treeDataPgAndKjAndXm(@RequestParam(required = false) String tenantId,
+                                                             @RequestParam(required = false) String parentId,
+                                                             @RequestParam(required = false) String extId,
+                                                             @RequestParam(required = false) String type,
+                                                             @RequestParam(required = false, defaultValue = CommonConstants.NO) String showAll) {
+        List <OfficeDTO> list = officeService.treeDataPgAndKjAndXm ( tenantId, parentId );
+        //List <OfficeDTO> rootTree = officeService.getRootTree (list, extId, type, showAll,"1" );
+        List <OfficeDTO> rootTree = officeService.getOldRootTree (parentId,list, extId, type, showAll );
+        return ResponseEntity.ok ( rootTree );
+    }
+
+    /**
      * 获取机构JSON数据。
      *
      * @param extId   排除的ID

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/service/OfficeService.java

@@ -109,6 +109,24 @@ public class OfficeService extends TreeService <OfficeMapper, Office> {
 
 
     /**
+     * 获取列表(会计,评估,项目)
+     *
+     * @return
+     */
+    public List <OfficeDTO> treeDataPgAndKjAndXm(String tenantId, String parentId) {
+        QueryWrapper<Office> queryWrapper = new QueryWrapper();
+        //根据当前人的所属部门去查相关数据
+        queryWrapper.like ( StringUtils.isNotBlank ( parentId ), "a.parent_ids", "," + parentId + "," );
+
+        queryWrapper.eq("a.del_flag", 0);
+        queryWrapper.and(wrapper -> wrapper.eq("a.tenant_id", "10003").or().eq("a.tenant_id", "10001").or().eq("a.tenant_id", "10005"));
+
+        queryWrapper.orderByAsc ( "a.sort" );
+        return baseMapper.findList ( queryWrapper );
+    }
+
+
+    /**
      * 获取列表
      *
      * @return