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

钟日健

2026-06-01 62eb499b0c969f246d3245d1429a97da4de1ce28

 src/main/java/org/springblade/modules/equipage/service/impl/EquipageServiceImpl.java

@@ -13,6 +13,7 @@
import org.springblade.modules.equipage.vo.EquipageVo;
import org.springblade.modules.system.service.IUserDeptService;
import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -31,6 +32,7 @@
   private final IUserService userService;

   private final IUserDeptService userDeptService;
   private final MyAsyncService myAsyncService;

   @Override
   public IPage<EquipageVo> selectEquipagePage(IPage<EquipageVo> page, EquipageVo rquipage) {
@@ -60,7 +62,7 @@
            Equipage equipage = new Equipage();
            //使用保安公司名称匹配组织机构id
            if (null!=equipageExcel.getDeptName() && equipageExcel.getDeptName()!=""){
               equipage.setDeptId(Long.parseLong(userDeptService.selectIn(equipageExcel.getDeptName())));
               equipage.setDeptId(userDeptService.selectIn(equipageExcel.getDeptName()));
            }

            if (null!=equipageExcel.getBrand() && equipageExcel.getBrand()!="") {
@@ -83,9 +85,17 @@
               equipage.setPersonInCharge(equipageExcel.getPersonInCharge());
            }

            if (null!=equipageExcel.getDateForProduction() && equipageExcel.getDateForProduction()!="") {
            if (null!=equipageExcel.getDateForProduction() && !equipageExcel.getDateForProduction().equals("")) {
               try {
                  equipage.setDateForProduction(new SimpleDateFormat("yyyy/MM/dd").parse(equipageExcel.getDateForProduction()));
               } catch (ParseException e) {
                  e.printStackTrace();
               }
            }

            if (null!=equipageExcel.getReceiveDate() && !equipageExcel.getReceiveDate().equals("")) {
               try {
                  equipage.setReceiveDate(new SimpleDateFormat("yyyy/MM/dd").parse(equipageExcel.getReceiveDate()));
               } catch (ParseException e) {
                  e.printStackTrace();
               }
@@ -94,20 +104,34 @@
            //插入数据
            this.save(equipage);


            //数据推送
            String s1 =
               "insert into sys_equipage(id,name,mode,dept_id,person_in_charge,brand,date_for_production,num) " +
                  "values(" + "'" + equipage.getId() + "'" + "," +
                  "'" + equipage.getName() + "'" + "," +
                  "'" + equipage.getMode() + "'" + "," +
                  "'" + equipage.getDeptId() + "'" + "," +
                  "'" + equipage.getPersonInCharge() + "'" + "," +
                  "'" + equipage.getBrand() + "'" + "," +
                  "'" + new SimpleDateFormat("yyyy/MM/dd").format(equipage.getDateForProduction()) + "'" + "," +
                  "'" +equipage.getNum() + "'" + ")";
            FtpUtil.sqlFileUpload(s1);

//            if (null!=equipageExcel.getDateForProduction() && !equipageExcel.getDateForProduction().equals("")) {
//               //数据推送
//               String s1 =
//                  "insert into sys_equipage(id,name,mode,dept_id,person_in_charge,brand,date_for_production,num) " +
//                     "values(" + "'" + equipage.getId() + "'" + "," +
//                     "'" + equipage.getName() + "'" + "," +
//                     "'" + equipage.getMode() + "'" + "," +
//                     "'" + equipage.getDeptId() + "'" + "," +
//                     "'" + equipage.getPersonInCharge() + "'" + "," +
//                     "'" + equipage.getBrand() + "'" + "," +
//                     "'" + new SimpleDateFormat("yyyy/MM/dd").format(equipage.getDateForProduction()) + "'" + "," +
//                     "'" + equipage.getNum() + "'" + ")";
//               //FtpUtil.sqlFileUpload(s1);
//               myAsyncService.dataSync(s1);
//            }else {
//               //数据推送
//               String s1 =
//                  "insert into sys_equipage(id,name,mode,dept_id,person_in_charge,brand,num) " +
//                     "values(" + "'" + equipage.getId() + "'" + "," +
//                     "'" + equipage.getName() + "'" + "," +
//                     "'" + equipage.getMode() + "'" + "," +
//                     "'" + equipage.getDeptId() + "'" + "," +
//                     "'" + equipage.getPersonInCharge() + "'" + "," +
//                     "'" + equipage.getBrand() + "'" + "," +
//                     "'" + equipage.getNum() + "'" + ")";
//               //FtpUtil.sqlFileUpload(s1);
//               myAsyncService.dataSync(s1);
//            }
         });
      }
   }