OTA日期修改
This commit is contained in:
+12
-6
@@ -11,12 +11,20 @@ import com.jero.common.util.oConvertUtils;
|
|||||||
import com.jero.modules.dummy.enums.OrderEnum;
|
import com.jero.modules.dummy.enums.OrderEnum;
|
||||||
import com.jero.modules.feishu.enums.TemplateInfoEnum2;
|
import com.jero.modules.feishu.enums.TemplateInfoEnum2;
|
||||||
import com.jero.modules.feishu.service.IFeishuService;
|
import com.jero.modules.feishu.service.IFeishuService;
|
||||||
import com.jero.modules.ota.entity.*;
|
import com.jero.modules.ota.entity.OtaManageApplyEO;
|
||||||
|
import com.jero.modules.ota.entity.OtaManageHistory;
|
||||||
|
import com.jero.modules.ota.entity.OtaManagePermission;
|
||||||
|
import com.jero.modules.ota.entity.OtaManageReceive;
|
||||||
|
import com.jero.modules.ota.entity.OtaManageReceiveNsdp;
|
||||||
import com.jero.modules.ota.enums.OtaCarEnum;
|
import com.jero.modules.ota.enums.OtaCarEnum;
|
||||||
import com.jero.modules.ota.enums.OtaHomoImpactEnum;
|
import com.jero.modules.ota.enums.OtaHomoImpactEnum;
|
||||||
import com.jero.modules.ota.enums.OtaStatusEnum;
|
import com.jero.modules.ota.enums.OtaStatusEnum;
|
||||||
import com.jero.modules.ota.mapper.OtaManageApplyEOMapper;
|
import com.jero.modules.ota.mapper.OtaManageApplyEOMapper;
|
||||||
import com.jero.modules.ota.service.*;
|
import com.jero.modules.ota.service.IOtaManageApplyEOService;
|
||||||
|
import com.jero.modules.ota.service.IOtaManageHistoryService;
|
||||||
|
import com.jero.modules.ota.service.IOtaManagePermissionService;
|
||||||
|
import com.jero.modules.ota.service.IOtaManageReceiveNsdpService;
|
||||||
|
import com.jero.modules.ota.service.IOtaManageReceiveService;
|
||||||
import com.jero.modules.ota.vo.AllCarExportCnVO;
|
import com.jero.modules.ota.vo.AllCarExportCnVO;
|
||||||
import com.jero.modules.ota.vo.AllCarExportEnVO;
|
import com.jero.modules.ota.vo.AllCarExportEnVO;
|
||||||
import com.jero.modules.ota.vo.OneCarExportCnVO;
|
import com.jero.modules.ota.vo.OneCarExportCnVO;
|
||||||
@@ -57,7 +65,6 @@ import org.springframework.web.servlet.ModelAndView;
|
|||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import java.text.Collator;
|
import java.text.Collator;
|
||||||
import java.text.ParseException;
|
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
@@ -119,8 +126,6 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
|
|||||||
@Value(value = "${jero.backUrlPhone}")
|
@Value(value = "${jero.backUrlPhone}")
|
||||||
private String backUrlPhone;
|
private String backUrlPhone;
|
||||||
|
|
||||||
private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
||||||
private static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 保存
|
* 保存
|
||||||
@@ -197,6 +202,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
|
|||||||
|
|
||||||
|
|
||||||
public List<OtaManageApplyEO> getNsdpList(OtaManageApplyEO otaManageApplyEO) {
|
public List<OtaManageApplyEO> getNsdpList(OtaManageApplyEO otaManageApplyEO) {
|
||||||
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
||||||
Date today = new Date();
|
Date today = new Date();
|
||||||
List<OtaManageApplyEO> resList = new ArrayList<>();
|
List<OtaManageApplyEO> resList = new ArrayList<>();
|
||||||
List<OtaManageReceiveNsdp> dataList = otaManageReceiveNsdpService.queryList();
|
List<OtaManageReceiveNsdp> dataList = otaManageReceiveNsdpService.queryList();
|
||||||
@@ -226,7 +232,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (ParseException e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
String appliedVehicleProject = omrn.getVehicle();
|
String appliedVehicleProject = omrn.getVehicle();
|
||||||
|
|||||||
Reference in New Issue
Block a user