Commit e5cfde1a by java-李谡

申请单管理列表根据更新时间排序

parent d680cf6b
...@@ -114,7 +114,6 @@ ...@@ -114,7 +114,6 @@
</when> </when>
</choose> </choose>
AND a.depart_id = (SELECT depart_id FROM sys_user_profiles WHERE user_id = #{userCode}) AND a.depart_id = (SELECT depart_id FROM sys_user_profiles WHERE user_id = #{userCode})
order by a.update_date desc
</select> </select>
<select id="detail" resultType="com.ejweb.modules.verify.entity.VerifyManageDetailEntity"> <select id="detail" resultType="com.ejweb.modules.verify.entity.VerifyManageDetailEntity">
SELECT SELECT
......
...@@ -193,13 +193,6 @@ public class AirlineVerifyController { ...@@ -193,13 +193,6 @@ public class AirlineVerifyController {
AirlineVerifyAddBean bean = requestBean.getObjectBean(AirlineVerifyAddBean.class); AirlineVerifyAddBean bean = requestBean.getObjectBean(AirlineVerifyAddBean.class);
String message = airLineVerifyService.validate(bean); String message = airLineVerifyService.validate(bean);
String verifId = bean.getId(); String verifId = bean.getId();
/* //为重开的情况时
if("1".equals(bean.getType())){
if(verifId==null||"".equals(verifId)){
message="重开时,id不能为空";
}
}*/
if (bean.getVerifyFile() != null && bean.getVerifyFile().size() > 0) { if (bean.getVerifyFile() != null && bean.getVerifyFile().size() > 0) {
if (bean.getVerifyFile().size() != 1) { if (bean.getVerifyFile().size() != 1) {
responseBean.setMessage("编排航班计划只支持传单个文件"); responseBean.setMessage("编排航班计划只支持传单个文件");
...@@ -210,24 +203,17 @@ public class AirlineVerifyController { ...@@ -210,24 +203,17 @@ public class AirlineVerifyController {
responseBean.setMessage("导入文档为空"); responseBean.setMessage("导入文档为空");
responseBean.setStatus(ErrorCode.STATUS_CODE_4001); responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean; return responseBean;
} else if (!bean.getVerifyFile().get(0).getFileName().toLowerCase(Locale.ENGLISH).endsWith("xls") && !bean.getVerifyFile().get(0).getFileName().toLowerCase().endsWith("xlsx")) { } else if (!bean.getVerifyFile().get(0).getFileName().toLowerCase(Locale.ENGLISH).endsWith("xls") && !bean.getVerifyFile().get(0).getFileName().toLowerCase().endsWith("xlsx")) {
responseBean.setMessage("编排航班计划只支持xls,xlsx"); responseBean.setMessage("编排航班计划只支持xls,xlsx");
responseBean.setStatus(ErrorCode.STATUS_CODE_4001); responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean; return responseBean;
} }
} }
} }
if (message == null) {// 通过参数校验 if (message == null) {// 通过参数校验
bean.setId(IdWorker.getNextId()); bean.setId(IdWorker.getNextId());
airLineVerifyService.insert(bean); airLineVerifyService.insert(bean);
/** //提交申请后,则记录时间节点
* 提交申请后,则记录时间节点
*/
VerifyProcessAddBean bean1 = new VerifyProcessAddBean(); VerifyProcessAddBean bean1 = new VerifyProcessAddBean();
bean1.setUserCode(bean.getUserCode()); bean1.setUserCode(bean.getUserCode());
bean1.setProcessValue("airline_verify"); bean1.setProcessValue("airline_verify");
......
...@@ -288,17 +288,13 @@ public class AirlineVerifyService extends BaseService<AirlineVerifyDao> { ...@@ -288,17 +288,13 @@ public class AirlineVerifyService extends BaseService<AirlineVerifyDao> {
String appNo = String.format("%03d", curNum); String appNo = String.format("%03d", curNum);
applyNo = applyNoPre + appNo; applyNo = applyNoPre + appNo;
} else { } else {
applyNo = applyNoPre + "001"; applyNo = applyNoPre + "001";
} }
bean.setApplyNo(applyNo); bean.setApplyNo(applyNo);
dao.insert(bean); dao.insert(bean);
dao.insertVerified(bean); dao.insertVerified(bean);
// 发送消息 // 发送消息
//发送审核消息 //发送审核消息
switch (bean.getVerifType()) { switch (bean.getVerifType()) {
case "01": case "01":
case "02": case "02":
...@@ -320,7 +316,6 @@ public class AirlineVerifyService extends BaseService<AirlineVerifyDao> { ...@@ -320,7 +316,6 @@ public class AirlineVerifyService extends BaseService<AirlineVerifyDao> {
connect2.setIsMain("0"); connect2.setIsMain("0");
connects.add(connect); connects.add(connect);
connects.add(connect2); connects.add(connect2);
if (bean.getConnect() != null && bean.getConnect().size() > 0) { if (bean.getConnect() != null && bean.getConnect().size() > 0) {
for (Connect connectTmp : bean.getConnect()) { for (Connect connectTmp : bean.getConnect()) {
connectTmp.setId(IdWorker.getNextId()); connectTmp.setId(IdWorker.getNextId());
......
...@@ -72,7 +72,7 @@ public class VerifyManageService extends BaseService<VerifyManageDao> { ...@@ -72,7 +72,7 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
// 必须紧贴dao的查询方法 // 必须紧贴dao的查询方法
PageHelper.startPage(bean.getPageNo(), bean.getPageSize()); PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
if (StringUtils.isEmpty(bean.getSort())) { if (StringUtils.isEmpty(bean.getSort())) {
PageHelper.orderBy(" verifNo DESC"); PageHelper.orderBy(" a.update_date desc");
} else { } else {
PageHelper.orderBy(bean.getSort()); PageHelper.orderBy(bean.getSort());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment