Commit 0e2b1530 by zhangyu

部门

parent 544ec217
...@@ -128,7 +128,14 @@ ...@@ -128,7 +128,14 @@
</if> </if>
</select> </select>
<select id="findverifNo" resultType="com.ejweb.modules.airline.entity.VerifyEntity">
SELECT a.verif_no
FROM foc_airline_verify a
where a.del_flag = #{DEL_FLAG_NORMAL}
<if test="verifNo!= null and verifNo!=''">
AND a.verif_no=#{verifNo}
</if>
</select>
<select id="findAllList" resultType="com.ejweb.modules.airline.entity.VerifyEntity"> <select id="findAllList" resultType="com.ejweb.modules.airline.entity.VerifyEntity">
SELECT a.verif_no as verifNo, SELECT a.verif_no as verifNo,
a.id as verifId, a.id as verifId,
......
...@@ -167,7 +167,8 @@ ...@@ -167,7 +167,8 @@
(SELECT verif_id FROM foc_airline_connect WHERE arrIata = #{areaAr.airportIata} AND is_main != '0') (SELECT verif_id FROM foc_airline_connect WHERE arrIata = #{areaAr.airportIata} AND is_main != '0')
) )
</if> </if>
ORDER BY a.route_no DESC order by fu.update_time DESC
/* ORDER BY a.route_no DESC*/
</select> </select>
<select id="getDay" resultType="Integer"> <select id="getDay" resultType="Integer">
SELECT SELECT
......
package com.ejweb.modules.airline.dao; package com.ejweb.modules.airline.dao;
import java.util.List;
import com.ejweb.core.persistence.CrudDao; import com.ejweb.core.persistence.CrudDao;
import com.ejweb.modules.airline.entity.VerifyEntity; import com.ejweb.modules.airline.entity.VerifyEntity;
import java.util.List;
public interface VerifyDao extends CrudDao<VerifyEntity>{ public interface VerifyDao extends CrudDao<VerifyEntity>{
public VerifyEntity getverifyByVerifNo(VerifyEntity verifyEntity); public VerifyEntity getverifyByVerifNo(VerifyEntity verifyEntity);
public List<VerifyEntity> findValidator(VerifyEntity verifyEntity); public List<VerifyEntity> findValidator(VerifyEntity verifyEntity);
public List<VerifyEntity> findverifNo(VerifyEntity verifyEntity);
public VerifyEntity getConnect(VerifyEntity verifyEntity); public VerifyEntity getConnect(VerifyEntity verifyEntity);
public VerifyEntity getVerify(String id); public VerifyEntity getVerify(String id);
public VerifyEntity get2(String id); public VerifyEntity get2(String id);
......
...@@ -68,10 +68,10 @@ public class VerifyAddService extends CrudService<VerifyDao, VerifyEntity> { ...@@ -68,10 +68,10 @@ public class VerifyAddService extends CrudService<VerifyDao, VerifyEntity> {
AddDepartTypeDto addDepartTypeDto = new AddDepartTypeDto(); AddDepartTypeDto addDepartTypeDto = new AddDepartTypeDto();
String type = userDepartEntity.getType(); String type = userDepartEntity.getType();
String list = userDepartEntity.getList(); String list = userDepartEntity.getList();
if (list == null || list == " ") { /* if (list == null || list == " ") {
verifyDepartAddDao.addUserDepartType(addDepartTypeDto); verifyDepartAddDao.addUserDepartType(addDepartTypeDto);
return "1"; return "1";
} }*/
String[] split = list.split(" "); String[] split = list.split(" ");
List<String> departIdList = new ArrayList<>(); List<String> departIdList = new ArrayList<>();
for (String sp : split) { for (String sp : split) {
......
...@@ -125,7 +125,7 @@ public class VerifyService extends CrudService<VerifyDao, VerifyEntity> { ...@@ -125,7 +125,7 @@ public class VerifyService extends CrudService<VerifyDao, VerifyEntity> {
public String saveVerify(VerifyEntity verifyEntity) { public String saveVerify(VerifyEntity verifyEntity) {
String verifNo = verifyEntity.getVerifNo(); String verifNo = verifyEntity.getVerifNo();
if (null!=verifNo&& ""!=verifNo){ if (null!=verifNo&& ""!=verifNo){
List<VerifyEntity> validator = verifyDao.findValidator(verifyEntity); List<VerifyEntity> validator = verifyDao.findverifNo(verifyEntity);
if (validator.size()!=0){ if (validator.size()!=0){
return "1"; return "1";
} }
......
...@@ -77,6 +77,15 @@ public class VerifyAddController extends BaseController { ...@@ -77,6 +77,15 @@ public class VerifyAddController extends BaseController {
if (!beanValidator(model, userDepartNoCheckVo)) { if (!beanValidator(model, userDepartNoCheckVo)) {
return form(userDepartEntity, model); return form(userDepartEntity, model);
} }
String type = userDepartNoCheckVo.getType();
String list = userDepartNoCheckVo.getList();
if (type == null|| type.equals("")) {
addMessage(redirectAttributes, "未选择类型");
return "redirect:" + adminPath + "/airline/verifyAdd/list?repage";
}else if(list == null || list.equals("")){
addMessage(redirectAttributes, "未选择部门");
return "redirect:" + adminPath + "/airline/verifyAdd/list?repage";
}
String s = verifyService.addUserDepartType(userDepartNoCheckVo); String s = verifyService.addUserDepartType(userDepartNoCheckVo);
addMessage(redirectAttributes, "操作成功"); addMessage(redirectAttributes, "操作成功");
return "redirect:" + adminPath + "/airline/verifyAdd/list?repage"; return "redirect:" + adminPath + "/airline/verifyAdd/list?repage";
......
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