1.现场检查接口修改 2.车辆位置新增接口 3.成绩导出接口修改 4.公司信息接口修改，新增创建时间和创建人

Administrator

2021-10-26 839cd39a9cfc49e5eaf73739549cf3f9e2725666

 src/main/java/org/springblade/modules/information/controller/InformationController.java

@@ -147,49 +147,33 @@
      Dept dept = new Dept();
      //自招保安公司
      if (information.getStats().equals("0")) {
         Long i = 1420222768149966850L;
         dept.setParentId(i);
         dept.setTenantId("000000");
         dept.setDeptName(information.getEnterprisename());
         dept.setParentId(1420222768149966850L);
         dept.setAncestors("0,1420222768149966850");
         dept.setDeptCategory(1);
      }
      //保安培训公司
      if (information.getStats().equals("1")) {
         Long i = 1418458374477549569L;
         dept.setParentId(i);
         dept.setTenantId("000000");
         dept.setDeptName(information.getEnterprisename());
         dept.setParentId(1418458374477549569L);
         dept.setAncestors("0,1418458374477549569");
         dept.setDeptCategory(1);
      }
      //保安服务公司
      if (information.getStats().equals("2")) {
         Long i = 1413470343230877697L;
         dept.setParentId(i);
         dept.setTenantId("000000");
         dept.setDeptName(information.getEnterprisename());
         dept.setParentId(1413470343230877697L);
         dept.setAncestors("0,1413470343230877697");
         dept.setDeptCategory(1);
      }
      //武装守押公司
      if (information.getStats().equals("3")) {
         Long i = 1420222961377357825L;
         dept.setParentId(i);
         dept.setTenantId("000000");
         dept.setDeptName(information.getEnterprisename());
         dept.setParentId(1420222961377357825L);
         dept.setAncestors("0,1420222961377357825");
         dept.setDeptCategory(1);
      }
      //跨区域保安公司
      if (information.getStats().equals("4")) {
         Long i = 1425366663452196865L;
         dept.setParentId(i);
         dept.setParentId(1425366663452196865L);
         dept.setAncestors("0,1425366663452196865");
      }
         dept.setTenantId("000000");
         dept.setDeptName(information.getEnterprisename());
         dept.setAncestors("0,1425366663452196865");
         dept.setDeptCategory(1);
      }

      if (iDeptService.submit(dept)) {
         CacheUtil.clear(SYS_CACHE);
         // 返回懒加载树更新节点所需字段
@@ -198,6 +182,8 @@
         String id = kv.get("id").toString();
         information.setDepartmentid(id);
      }

      information.setCreateTime(new Date());

      //公司新增
      boolean status = informationService.save(information);
@@ -218,8 +204,13 @@
         user.setStatus(1);
         user.setIsDeleted(0);
         //分配保安角色
         //如果是本市保安公司，分公司，自招保安公司，分配保安公司管理员角色，如果是培训学校，则分配的是培训公司管理员角色
         Role role = new Role();
         if (information.getStats().equals("1")){
            role.setRoleAlias("培训公司管理员");
         }else {
         role.setRoleAlias("保安公司管理员");
         }
         Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
         user.setRoleId(oneRole.getId().toString());
         //插入用户数据
@@ -229,7 +220,8 @@
         //Integer id = information.getId();
         String s = "insert into sys_information(id,creditCode,enterpriseName,representative" +
                  ",registeredCapital,organizationCode,registrationNumber, enterprises, address," +
                  " business,region,registration,industry,departmentid,stats,jurisdiction,representativecell,contacts,contactscell) " +
                  " business,region,registration,industry,departmentid,stats,jurisdiction,representativecell," +
                  "contacts,contactscell,create_time,create_user_id) " +
                  "values(" + "'" + information.getId() + "'" +
                  "," + "'" + information.getCreditcode() + "'" +
                  "," + "'" + information.getEnterprisename() + "'" +
@@ -248,7 +240,9 @@
                  "," + "'" + information.getJurisdiction() + "'" +
                  "," + "'" + information.getRepresentativecell() + "'" +
                  "," + "'" + information.getContacts() + "'" +
                  "," + "'" + information.getContactscell() + "'" + ");" +
                  "," + "'" + information.getContactscell() + "'" +
                  "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(information.getCreateTime()) + "'" +
                  "," + "'" + information.getCreateUserId() + "'" + ");" +
                  "insert into blade_dept(id,parent_id,tenant_id,dept_name,ancestors,dept_category,is_deleted) values(" + "'" + information.getDepartmentid() + "'" + "," + "'" + dept.getParentId() + "'" + ","
                  + "'" + dept.getTenantId() + "'" +
                  "," + "'" + information.getEnterprisename() + "'" +
@@ -342,26 +336,35 @@
   @ApiOperationSupport(order = 8)
   @ApiOperation(value = "删除", notes = "传入ids")
   public R remove(String creditcode, String departmentid) throws Exception {
      String[] strArray = creditcode.split(",");
      String[] strArrays = departmentid.split(",");
      for (int i = 0; i < strArray.length; i++) {
         informationService.deleteIn(strArray[i]);
         informationService.deleteSh(strArray[i]);
         informationService.deleteMe(strArray[i]);
         String s1 = "delete from sys_information where creditCode = " + "'" + strArray[i] + "'";
         FtpUtil.sqlFileUpload(s1);
         String s2 = "delete from sys_shareholder where creditCode = " + "'" + strArray[i] + "'";
         FtpUtil.sqlFileUpload(s2);
         String s3 = "delete from sys_member where creditCode = " + "'" + strArray[i] + "'";
         FtpUtil.sqlFileUpload(s3);
      }
      for (int j = 0; j < strArrays.length; j++) {
      List<String> list = Arrays.asList(departmentid.split(","));
      list.forEach(s -> {
         //公司信息删除
         informationService.deleteIn(s);
         //主要管理人员信息删除
         informationService.deleteSh(s);
         //出资人信息删除
         informationService.deleteMe(s);
         //机构删除
         informationService.deleteDept(strArrays[j]);
         String s4 = "delete from blade_dept where id = " + "'" + strArrays[j] + "'";
         informationService.deleteDept(s);
         //当前公司下人员逻辑删除
           informationService.deleteUserByDeptId(s);
         //保安公司信息
         String s1 = "delete from sys_information where departmentid = " + "'" + s + "'";
         FtpUtil.sqlFileUpload(s1);
         //主要管理人
         String s2 = "delete from sys_shareholder where dept_id = " + "'" + s + "'";
         FtpUtil.sqlFileUpload(s2);
         //出资人
         String s3 = "delete from sys_member where dept_id = " + "'" + s + "'";
         FtpUtil.sqlFileUpload(s3);
         //组织机构信息逻辑删除
         String s4 = "update blade_dept set is_deleted  = 1 where id = " + "'" + s + "'";
         FtpUtil.sqlFileUpload(s4);
      }

         //保安公司人员信息删除
         String s5 = "update blade_user set is_deleted  = 1 where dept_id " + "'" + s + "'";
         FtpUtil.sqlFileUpload(s5);
      });
      //返回
      return R.success("删除成功");
   }