|
|
@@ -1,24 +1,18 @@
|
|
|
package com.goafanti.admin.service.impl;
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Arrays;
|
|
|
-import java.util.List;
|
|
|
-
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
-import com.goafanti.admin.bo.DepartmentComboBox;
|
|
|
-import com.goafanti.common.constant.AFTConstants;
|
|
|
-import com.goafanti.common.dao.AdminMapper;
|
|
|
+import com.goafanti.admin.service.DepartmentService;
|
|
|
import com.goafanti.common.dao.DepartmentMapper;
|
|
|
+import com.goafanti.common.dao.WorkingHoursMapper;
|
|
|
import com.goafanti.common.model.Department;
|
|
|
+import com.goafanti.common.model.WorkingHours;
|
|
|
+import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
-import com.goafanti.admin.service.DepartmentService;
|
|
|
-import com.goafanti.common.dao.WorkingHoursMapper;
|
|
|
-import com.goafanti.common.model.WorkingHours;
|
|
|
-import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.List;
|
|
|
|
|
|
@Service
|
|
|
public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> implements DepartmentService {
|
|
|
@@ -35,6 +29,11 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
+ public int updateWorkingHours(WorkingHours in) {
|
|
|
+ return workingHoursMapper.updateByPrimaryKeySelective(in);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
public int deleteWorkingHours(Integer id) {
|
|
|
return workingHoursMapper.deleteByPrimaryKey(id);
|
|
|
}
|
|
|
@@ -50,10 +49,20 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public boolean checkWorkingHoursType(Integer type) {
|
|
|
- int i=workingHoursMapper.getTypeCount(type);
|
|
|
- if(i>0) {
|
|
|
- return true;
|
|
|
+ public boolean checkWorkingHoursType(WorkingHours in) {
|
|
|
+ if (in.getType()!=null){
|
|
|
+ List<WorkingHours> typeCount = workingHoursMapper.getTypeCount(in.getType());
|
|
|
+ if(typeCount.size()>1) {
|
|
|
+ return true;
|
|
|
+ }else {
|
|
|
+ if (in.getId()!=null){
|
|
|
+ for (WorkingHours e : typeCount) {
|
|
|
+ if (e.getId().equals(in.getId())){
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
return false;
|
|
|
}
|
|
|
@@ -123,6 +132,7 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
public List<String> comparePermissions(List<String> aDep, List<String> input) {
|
|
|
List<String> myAll=new ArrayList<>();
|
|
|
for (String s : aDep) {
|