feat: 成绩查询增加年龄查询返回

钟日健

2026-06-01 62eb499b0c969f246d3245d1429a97da4de1ce28

 src/main/java/org/springblade/modules/system/controller/DeptController.java

@@ -41,6 +41,7 @@
import org.springblade.modules.system.node.TreeNodes;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.system.service.MyAsyncService;
import org.springblade.modules.system.vo.DeptVO;
import org.springblade.modules.system.wrapper.DeptWrapper;
import org.springframework.web.bind.annotation.*;
@@ -70,6 +71,7 @@

   private final IUserService userService;
   private final IInformationService informationService;
   private final MyAsyncService myAsyncService;

   /**
    * 详情
@@ -169,6 +171,19 @@


   /**
    * 懒加载获取单位树,电子围栏用
    * @param type 1：本单位  2：分公司  3：服务单位
    * @param deptId
    * @return
    */
   @GetMapping("/lazy-tree-rail")
   public R<List<DeptVO>> lazyTreeRail(Integer type,Long deptId) {
      List<DeptVO> tree = deptService.lazyTreeRail(type,deptId);
      return R.data(tree);
   }


   /**
    * 懒加载获取部门树形结构(包含用户数据)app
    * @param type 1:保安对保安  2：保安向民警   3：民警向民警
    * @return
@@ -224,61 +239,13 @@
   @ApiOperationSupport(order = 6)
   @ApiOperation(value = "新增或修改", notes = "传入dept")
   public R submit(@Valid @RequestBody Dept dept) {
   //   Information information = new Information();
      boolean type = false;
      //如果为修改
      if (null!=dept.getId()){
         type = true;
      }
      if (deptService.submit(dept)) {
         CacheUtil.clear(SYS_CACHE);
         // 返回懒加载树更新节点所需字段
         Kv kv = Kv.create().set("id", String.valueOf(dept.getId())).set("tenantId", dept.getTenantId())
            .set("deptCategoryName", DictCache.getValue(DictEnum.ORG_CATEGORY, dept.getDeptCategory()));
         if (!type) {
            Integer isDeleted = 0;
            //内网同步新增
            String ss = "insert into blade_dept(id,parent_id,tenant_id,dept_name,ancestors,dept_category,full_name,sort,remark,is_deleted) values("
               + "'" + dept.getId() + "'" + ","
               + "'" + dept.getParentId() + "'" + ","
               + "'" + dept.getTenantId() + "'" +
               "," + "'" + dept.getDeptName() + "'" +
               "," + "'" + dept.getAncestors() + "'" +
               "," + "'" + dept.getDeptCategory() + "'" +
               "," + "'" + dept.getFullName() + "'" +
               "," + "'" + dept.getSort() + "'" +
               "," + "'" + dept.getRemark() + "'" +
               "," + "'" + isDeleted + "'" + ")";
            FtpUtil.sqlFileUpload(ss);
         }else {
            //修改
            //内网同步
            String s1 =
               "update blade_dept set parent_id = " + "'" + dept.getParentId() + "'"
                  + ",dept_name = " + "'" + dept.getDeptName() + "'"
                  + ",ancestors = " + "'" + dept.getAncestors() + "'"
                  + ",dept_category = " + "'" + dept.getDeptCategory() + "'"
                  + ",full_name = " + "'" + dept.getFullName() + "'"
                  + ",sort = " + "'" + dept.getSort() + "'"
                  + ",remark = " + "'" + dept.getRemark() + "'"
                  + ",is_deleted = " + "'" + dept.getIsDeleted() + "'"
                  + " " + "where id = " + "'" + dept.getId() + "'";
            FtpUtil.sqlFileUpload(s1);
         }
//         String id = kv.get("id").toString();
//         information.setDepartmentid(id);
//         information.setEnterprisename(dept.getDeptName());
//         Integer deptCategory = dept.getDeptCategory();
//         information.setStats(String.valueOf(deptCategory));
         return R.data(kv);
      }
//      informationService.save(information);
//      String s = "insert into sys_information(id,enterpriseName,departmentid,stats) " +
//         "values(" + "'" + information.getId() + "'" +
//         "," + "'" + information.getEnterprisename() + "'" +
//         "," + "'" + information.getDepartmentid() + "'" +
//         "," + "'" + information.getStats() + "'"+ ")";
//      FtpUtil.sqlFileUpload(s);
      return R.fail("操作失败");
   }

@@ -290,12 +257,6 @@
   @ApiOperation(value = "删除", notes = "传入ids")
   public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
      CacheUtil.clear(SYS_CACHE);
      List<String> list = Arrays.asList(ids.split(","));
      list.forEach(id -> {
         //内网同步
         String s1 = "update blade_dept set is_deleted = 1 where id = " + "'" + id + "'";
         FtpUtil.sqlFileUpload(s1);
      });
      return R.status(deptService.removeDept(ids));
   }