Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-adm...

杜洪波

2024-08-19 1d1d34b48e6e80bea350d805d8ff2564ca226f25

 src/main/java/com/product/administration/service/LeaveRequestService.java

@@ -43,7 +43,7 @@
      if(!StringUtils.isEmpty(dataFilter)){
         filter += " and "+dataFilter;
      }
      DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_SYS_ASK_FOR_LEAVE,filter,null,null,"created_utc_datetime desc",fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE),false);
      DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_SYS_ASK_FOR_LEAVE,filter,null,null,"id desc",fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE),false);
      baseDao.loadPromptData(dt);
      return dt;
   }
@@ -61,16 +61,23 @@
    * 请假申请保存
    */
   public String saveLeaveRequest(FieldSetEntity fs) throws BaseException {
//      fs.setValue("org_level_uuid", SpringMVCContextHolder.getCurrentUser().getOrg_level_uuid());//公司
//      fs.setValue("fill_in_time", new Date());//填单时间
//      fs.setValue("department_uuid", SpringMVCContextHolder.getCurrentUser().getOrg_level_uuid());//部门
      fs.setValue("created_by", SpringMVCContextHolder.getCurrentUser().getUser_id());//姓名
      fs.setValue("flow_flag", 0);
      if(StringUtils.isEmpty(fs.getString(CmnConst.UUID))){
         return baseDao.add(fs);
      DataTableEntity dataTableEntity = baseDao.listTable(CmnConst.PRODUCT_SYS_ASK_FOR_LEAVE, " uuid  not in (?) and user_id=? and ((start_time<=? and end_time>=?) or(start_time<=? and end_time>=?))"
            , new String[]{StringUtils.isEmpty(fs.getUUID())?"":fs.getUUID(), fs.getString("user_id"), fs.getString("start_time"), fs.getString("start_time"), fs.getString("end_time"), fs.getString("end_time")});
        if (dataTableEntity.getRows()>0){
         return "1";
      }else {
         baseDao.update(fs);
         return fs.getString(CmnConst.UUID);
         if (StringUtils.isEmpty(fs.getString(CmnConst.UUID))) {
            fs.setValue("created_by", SpringMVCContextHolder.getCurrentUser().getUser_id());
            fs.setValue("created_utc_datetime", new Date());
            fs.setValue("org_level_uuid", SpringMVCContextHolder.getCurrentUser().getOrg_level_uuid());
            return baseDao.add(fs);
         } else {
            fs.setValue("updated_by", SpringMVCContextHolder.getCurrentUser().getUser_id());
            fs.setValue("updated_utc_datetime", new Date());
            baseDao.update(fs);
            return fs.getString(CmnConst.UUID);
         }

      }
   }
   /**