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

钟日健

2026-06-01 62eb499b0c969f246d3245d1429a97da4de1ce28

 src/main/java/org/springblade/modules/record/controller/RecordController.java

@@ -38,14 +38,17 @@
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.permit.vo.PermitVO;
import org.springblade.modules.record.dto.RecordDTO;
import org.springblade.modules.record.entity.Record;
import org.springblade.modules.record.service.IRecordService;
import org.springblade.modules.record.vo.RecordVO;
import org.springblade.modules.recordLegalperson.dto.RecordLegalpersonDTO;
import org.springblade.modules.resource.service.IAttachService;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
@@ -73,6 +76,7 @@
   private final IInformationService informationService;
   private final IUserService userService;
   private final IAttachService attachService;
   private final MyAsyncService myAsyncService;

   /**
    * 详情
@@ -138,25 +142,26 @@
         String id = map.get("id").toString();
         recordService.removeByIds(Func.toLongList(id));
         String s1 = "delete from sys_record where id = " + "'" + id + "'";
         FtpUtil.sqlFileUpload(s1);
         //FtpUtil.sqlFileUpload(s1);
         myAsyncService.dataSync(s1);
      }
      record.setStorage("1");
      record.setType("2");
      record.setPermitime(new Date());
      recordService.save(record);
      //String offtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getOfficetime());
      //String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getPermitime());
      String s = "insert into sys_record(id,representative," +
         "address,business,registration,industry,type,ptype,representativecell,contacts,contactscell,perid,offices,jurisdiction,cardid,storage,overtime)" +
         "values(" + "'" + record.getId() + "'" + "," +
         "'" + record.getRepresentative() + "'" + "," + "'" +
         record.getAddress() + "'" + "," + "'" + record.getBusiness() + "'" + "," + "'" + record.getRegistration() + "'" + "," + "'" + record.getIndustry() + "'" + "," + "'" + record.getType() + "'" + "," + "'" + record.getPtype() + "'" + "," +
         "'" + record.getRepresentativecell() + "'" + "," + "'" + record.getContacts() + "'" + "," + "'" + record.getContactscell() + "'" + "," + "'" + record.getPerid() + "'" + "," + "'" + record.getOffices() + "'" + "," + "'" + record.getJurisdiction() + "'" +
         "," + "'" + record.getCardid() + "'" +
         "," + "'" + record.getStorage() + "'" +
         "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getOvertime()) + "'"
         + ")";
      FtpUtil.sqlFileUpload(s);
      boolean save = recordService.save(record);
      if (save) {
         String s = "insert into sys_record(id,representative," +
            "address,business,registration,industry,type,ptype,representativecell,contacts,contactscell,perid,offices,jurisdiction,cardid,storage,overtime)" +
            "values(" + "'" + record.getId() + "'" + "," +
            "'" + record.getRepresentative() + "'" + "," + "'" +
            record.getAddress() + "'" + "," + "'" + record.getBusiness() + "'" + "," + "'" + record.getRegistration() + "'" + "," + "'" + record.getIndustry() + "'" + "," + "'" + record.getType() + "'" + "," + "'" + record.getPtype() + "'" + "," +
            "'" + record.getRepresentativecell() + "'" + "," + "'" + record.getContacts() + "'" + "," + "'" + record.getContactscell() + "'" + "," + "'" + record.getPerid() + "'" + "," + "'" + record.getOffices() + "'" + "," + "'" + record.getJurisdiction() + "'" +
            "," + "'" + record.getCardid() + "'" +
            "," + "'" + record.getStorage() + "'" +
            "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getOvertime()) + "'"
            + ")";
         myAsyncService.dataSync(s);
      }
      return R.success("成功");
   }

@@ -249,190 +254,7 @@
         user.setRoleId("1414575196264300546");
         user.setStatus(1);
         user.setIsDeleted(0);
         userService.save(user);
         String roleid = "1415563428727328770";
         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,create_user_id) " +
            "values(" + "'" + information.getId() + "'" +
            "," + "'" + information.getCreditcode() + "'" +
            "," + "'" + information.getEnterprisename() + "'" +
            "," + "'" + information.getRepresentative() + "'" +
            "," + "'" + information.getRegisteredcapital() + "'" +
            "," + "'" + information.getOrganizationcode() + "'" +
            "," + "'" + information.getRegistrationnumber() + "'" +
            "," + "'" + information.getEnterprises() + "'" +
            "," + "'" + information.getAddress() + "'" +
            "," + "'" + information.getBusiness() + "'" +
            "," + "'" + information.getRegion() + "'" +
            "," + "'" + information.getRegistration() + "'" +
            "," + "'" + information.getIndustry() + "'" +
            "," + "'" + information.getDepartmentid() + "'" +
            "," + "'" + information.getStats() + "'" +
            "," + "'" + information.getJurisdiction() + "'" +
            "," + "'" + information.getRepresentativecell() + "'" +
            "," + "'" + information.getContacts() + "'" +
            "," + "'" + information.getContactscell() + "'" +
            "," + "'" + information.getCreateUserId() + "'" + ")";
         FtpUtil.sqlFileUpload(s);
         String ss = "insert into blade_dept(id,parent_id,tenant_id,dept_name,ancestors,dept_category,is_deleted) values(" + "'" + dept.getId() + "'" + "," + "'" + dept.getParentId() + "'" + ","
            + "'" + dept.getTenantId() + "'" +
            "," + "'" + information.getEnterprisename() + "'" +
            "," + "'" + dept.getAncestors() + "'" +
            "," + "'" + dept.getDeptCategory() + "'" +
            "," + "'" + isDeleted + "'" + ")";
         FtpUtil.sqlFileUpload(ss);
         String rtime;
         String paperTime;
         if (user.getRtime() == null) {
            rtime = null;
         } else {
            rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
         }
         //发证日期处理
         if (user.getPaperTime() == null) {
            paperTime = "";
         } else {
            paperTime = new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime());
         }
         //头像
         if (null != user.getAvatar() && !user.getAvatar().equals("")) {
            user.setAvatar(FtpConfig.ip + user.getAvatar().substring(26));
         }

         //指纹
         if (null != user.getFingerprint() && !user.getFingerprint().equals("")) {
            user.setFingerprint(FtpConfig.ip + user.getFingerprint().substring(26));
         }

         String sss = "insert into blade_user(" +
            "id,tenant_id,account,password,name,real_name,avatar,email,phone,sex," +
            "role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
            "politicaloutlook,healstats,height,address,registered,rtime," +
            "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch) " +
            "values(" + "'" + user.getId() + "'" +
            "," + "'" + user.getTenantId() + "'" +
            "," + "'" + user.getAccount() + "'" +
            "," + "'" + user.getPassword() + "'" +
            "," + "'" + user.getName() + "'" +
            "," + "'" + user.getRealName() + "'" +
            "," + "'" + user.getAvatar() + "'" +
            "," + "'" + user.getEmail() + "'" +
            "," + "'" + user.getPhone() + "'" +
            "," + "'" + null + "'" +
            "," + "'" + roleid + "'" +
            "," + "'" + user.getDeptId() + "'" +
            "," + "'" + user.getCardid() + "'" +
            "," + "'" + user.getNativeplace() + "'" +
            "," + "'" + user.getNation() + "'" +
            "," + "'" + user.getFingerprint() + "'" +
            "," + "'" + user.getEducation() + "'" +
            "," + "'" + user.getPoliticaloutlook() + "'" +
            "," + "'" + user.getHealstats() + "'" +
            "," + "'" + user.getHeight() + "'" +
            "," + "'" + user.getAddress() + "'" +
            "," + "'" + user.getRegistered() + "'" +
            "," + "'" + rtime + "'" +
            "," + "'" + user.getSecuritynumber() + "'" +
            "," + "'" + user.getHold() + "'" +
            "," + "'" + user.getJurisdiction() + "'" +
            "," + "'" + user.getExaminationType() + "'" +
            "," + "'" + user.getStatus() + "'" +
            "," + "'" + user.getIsDeleted() + "'" +
            "," + "'" + user.getDispatch() + "'" + ")";
         FtpUtil.sqlFileUpload(sss);
//         Integer isDeleted = 0;
//         //注册用户
//         User user = new User();
//         user.setDeptId(information.getDepartmentid());
//         user.setTenantId("000000");
//         user.setAccount(record.getEnterprisename());
//         String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
//         user.setPassword(initPassword);
//         user.setCreateTime(new Date());
//         user.setUpdateTime(new Date());
//         user.setRoleId("1414575196264300546");
//         user.setStatus(1);
//         user.setIsDeleted(0);
//         userService.save(user);
//         String roleid = "1415563428727328770";
//         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,create_time,create_user_id) " +
//            "values(" + "'" + information.getId() + "'" +
//            "," + "'" + information.getCreditcode() + "'" +
//            "," + "'" + information.getEnterprisename() + "'" +
//            "," + "'" + information.getRepresentative() + "'" +
//            "," + "'" + information.getRegisteredcapital() + "'" +
//            "," + "'" + information.getOrganizationcode() + "'" +
//            "," + "'" + information.getRegistrationnumber() + "'" +
//            "," + "'" + information.getEnterprises() + "'" +
//            "," + "'" + information.getAddress() + "'" +
//            "," + "'" + information.getBusiness() + "'" +
//            "," + "'" + information.getRegion() + "'" +
//            "," + "'" + information.getRegistration() + "'" +
//            "," + "'" + information.getIndustry() + "'" +
//            "," + "'" + information.getDepartmentid() + "'" +
//            "," + "'" + information.getStats() + "'" +
//            "," + "'" + information.getJurisdiction() + "'" +
//            "," + "'" + information.getRepresentativecell() + "'" +
//            "," + "'" + information.getContacts() + "'" +
//            "," + "'" + 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() + "'" +
//            "," + "'" + dept.getAncestors() + "'" +
//            "," + "'" + dept.getDeptCategory() + "'" +
//            "," + "'" + isDeleted + "'" + ");" +
//            "insert into blade_user(id,tenant_id,account,password,role_id,dept_id,create_time,update_time,status,is_deleted) " +
//            "values(" + "'" + user.getId() + "'" +
//            "," + "'" + user.getTenantId() + "'"
//            + "," + "'" + user.getAccount() + "'" +
//            "," + "'" + user.getPassword() + "'" +
//            "," + "'" + roleid + "'" +
//            "," + "'" + user.getDeptId() + "'" +
//            "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" +
//            "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'" +
//            "," + "'" + user.getStatus() + "'" +
//            "," + "'" + user.getIsDeleted() + "'" + ")";
//         FtpUtil.sqlFileUpload(s);
//         //注册用户
//         User user = new User();
//         user.setAccount(record.getEnterprisename());
//         String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
//         user.setPassword(initPassword);
//         boolean b = userService.saveOrUpdate(user);
         //把附件添加单位id
         attachService.updat(information.getDepartmentid(), record.getCardid());
         String s1 = "update sys_record set type = " + "'" + record.getType() + "'" +
            ",papprove = " + "'" + record.getPapprove() + "'" +
            ",xapprove = " + "'" + record.getXapprove() + "'" +
            ",sapprove = " + "'" + record.getSapprove() + "'" +
            ",popinion = " + "'" + record.getPopinion() + "'" +
            ",sopinion = " + "'" + record.getSopinion() + "'" +
            ",xopinion = " + "'" + record.getXopinion() + "'" +
            ",ptime = " + "'" + record.getPtime() + "'" +
            ",stime = " + "'" + record.getStime() + "'" +
            ",xtime = " + "'" + record.getXtime() + "'" +
            " " + "where id = " + "'" + record.getId() + "'";
         FtpUtil.sqlFileUpload(s1);
      } else {
         String s1 = "update sys_record set type = " + "'" + record.getType() + "'" +
            ",papprove = " + "'" + record.getPapprove() + "'" +
            ",xapprove = " + "'" + record.getXapprove() + "'" +
            ",sapprove = " + "'" + record.getSapprove() + "'" +
            ",popinion = " + "'" + record.getPopinion() + "'" +
            ",sopinion = " + "'" + record.getSopinion() + "'" +
            ",xopinion = " + "'" + record.getXopinion() + "'" +
            ",ptime = " + "'" + record.getPtime() + "'" +
            ",stime = " + "'" + record.getStime() + "'" +
            ",xtime = " + "'" + record.getXtime() + "'" +
            " " + "where id = " + "'" + record.getId() + "'";
         FtpUtil.sqlFileUpload(s1);
         boolean save = userService.save(user);
      }
      return R.status(recordService.saveOrUpdate(record));
   }
@@ -464,4 +286,16 @@
      Map map = recordService.selectIn(cardid, type);
      return R.data(map);
   }

   /**
    * 保安公司备案信息(基本信息和附件列表信息)
    *
    * @param record
    * @return
    */
   @GetMapping("/details")
   public R details(RecordDTO record) {
      RecordDTO detail = recordService.getDetails(record);
      return R.data(detail);
   }
}