test 日期区间

Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/291

src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml

@@ -149,7 +149,7 @@
                      groupid,
                      #{scopeId} as scopeId,
                      'hrm'      as tablename
-              FROM hrm_formfield where isuse = 1) hrmallfield
+              FROM hrm_formfield) hrmallfield
         WHERE FIELDHTMLTYPE != '6' and groupid IN (SELECT id FROM hrm_fieldgroup WHERE grouptype = #{scopeId})
         ORDER BY hrmallfield.groupid, hrmallfield.fieldorder
     </select>

src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java

@@ -86,9 +86,8 @@ public class FunctionOutStaffServiceImpl {
         Integer sum = numberF.stream()
                 .mapToInt(Integer::intValue)
                 .sum();
-        Integer sums = sum + staffPO.getPermanentNum();
         if (staffPO.getControlPolicy().equals(HARDCONTROLLER)) {
-            OrganizationAssert.isFalse(sums.compareTo(staffPO.getStaffNum()) > 0, SystemEnv.getHtmlLabelName(547469,user.getLanguage()));
+            OrganizationAssert.isFalse(sum.compareTo(staffPO.getStaffNum()) > 0, SystemEnv.getHtmlLabelName(547469,user.getLanguage()));
         }
         staffPO.setFreezeNum(sum);
         buildStaffPO(staffPO);

src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java

@@ -245,9 +245,9 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe
      */
     public static List<Integer> getJclRoleLevels(Integer uId) {
         List<Integer> ecRoleLevels = new ArrayList<>();
-       // ManagerDetachMapper mangeDetachMapper = MapperProxyFactory.getProxy(ManagerDetachMapper.class);
+        ManagerDetachMapper mangeDetachMapper = MapperProxyFactory.getProxy(ManagerDetachMapper.class);
         //人员
-        List<ManagerDetachPO> detachListById = new ArrayList<>(MapperProxyFactory.getProxy(ManagerDetachMapper.class).getDetachListById(uId,0));
+        List<ManagerDetachPO> detachListById = new ArrayList<>(mangeDetachMapper.getDetachListById(uId,0));
         //角色
         HrmCommonService hrmCommonService = new HrmCommonServiceImpl();
         List<String> roleIds = new ArrayList<>(Arrays.asList(hrmCommonService.getRoleIds(uId).split(",")));

src/com/engine/organization/service/impl/SchemeServiceImpl.java

@@ -113,6 +113,12 @@ public class SchemeServiceImpl extends Service implements SchemeService {
         SearchConditionItem schemeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547131, "schemeNo");
         conditionItems.add(schemeNameCondition);
         conditionItems.add(schemeNoCondition);
+
+
+        //测试
+        SearchConditionItem dateCondition = OrganizationFormItemUtil.rangeDateItem(user, 2, 16, 2, "测试", "date1", "date2");
+        conditionItems.add(dateCondition);
+
         addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems));
         apiDatas.put("conditions", addGroups);
         return apiDatas;

src/com/engine/organization/util/OrganizationFormItemUtil.java

@@ -239,7 +239,7 @@ public class OrganizationFormItemUtil {
     public static SearchConditionItem rangeDateItem(User user, int colSpan, int fieldcol, int viewAttr
             , String label, String name1, String name2) {
         ConditionFactory conditionFactory = new ConditionFactory(user);
-        SearchConditionItem rangeDate = conditionFactory.createCondition(ConditionType.TIMEPICKER, 502327, new String[]{name1, name2});
+        SearchConditionItem rangeDate = conditionFactory.createCondition(ConditionType.RANGEPICKER, 502327, new String[]{name1, name2});
         rangeDate.setColSpan(colSpan);
         rangeDate.setFieldcol(fieldcol);
         rangeDate.setViewAttr(viewAttr);

src/com/engine/organization/util/detach/DetachUtil.java

@@ -25,11 +25,7 @@ public class DetachUtil {
     private final List<Integer> jclRoleLevels;
 
     public DetachUtil(User user) {
-//        if (1 == user.getUID() || user.isAdmin()) {
+        if (1 == user.getUID() || user.isAdmin()) {
-//            DETACH = false;
-//        }
-        //分权管理员支持分权
-        if (1 == user.getUID()) {
             DETACH = false;
         }
         if (DETACH) {