修改多城市排班问题

house365-hgs-ws/src/main/java/com/house365/ws/dao/mapper/UserMapper.java

@@ -55,6 +55,8 @@ public interface UserMapper {
 
     List<UserEntity> getDutyUserByCity(Map<String, Object> map);
 
+    List<UserEntity> getDutyUserByCityAndOnDuty(String  cityCode);
+
     List<UserEntity> getUserByCity(Map<String, Object> map);
 
     void deleteDutyById(Integer userId);

house365-hgs-ws/src/main/java/com/house365/ws/service/impl/StaffDuty.java

@@ -107,7 +107,7 @@ public class StaffDuty implements IStaffDuty {
 
     @Override
     public void updateDutyStaff() {
-        System.out.println("1122334411223344");
+//        List<UserEntity> entities = usermapper.getDutyUserByCityAndOnDuty("nj");
         Map<String, Object> searchParams = new HashMap<>();
         Page page = new Page(1000);
         DepartmentListRequest listRequest = new DepartmentListRequest();
@@ -179,41 +179,54 @@ public class StaffDuty implements IStaffDuty {
                         Date now = new Date();
                         for (String city : cityList) {
                             //南京和其他城市区分
-                            Map<String, Object> map = new HashMap<>(5);
-                            if ("nj".equals(city)) {
-                                map.put("onduty", 1);
-                                List<DutyStaffEntity> list = usermapper.getDutyByCondition(map);
-                                if (CollectionUtils.isNotEmpty(list)) {
-                                    DutyStaffEntity staffEntity = list.get(0);
-                                    //每天新增一个云迹活动
-                                    CloudActivityEntity entity = new CloudActivityEntity();
-                                    String name = "云迹数据" + date;
-                                    entity.setName(name);
-                                    entity.setCity(city);
-                                    entity.setCreateId(Integer.valueOf(staffEntity.getUserId()));
-                                    entity.setCreateName(staffEntity.getName());
-                                    entity.setCreateTime(now);
-                                    setData(entity);
-                                    activityMapper.save(entity);
-                                }
-                            } else {
-                                map.put("isDuty", 1);
-                                map.put("city", city);
-                                List<DutyStaffOtherEntity> dutyList = staffOtherMapper.queryByConditions(map);
-                                if (CollectionUtils.isNotEmpty(dutyList)) {
-                                    DutyStaffOtherEntity staffEntity = dutyList.get(0);
-                                    //每天新增一个云迹活动
-                                    CloudActivityEntity entity = new CloudActivityEntity();
-                                    String name = "云迹数据" + date;
-                                    entity.setName(name);
-                                    entity.setCity(city);
-                                    entity.setCreateId(staffEntity.getUserId());
-                                    entity.setCreateName(staffEntity.getName());
-                                    entity.setCreateTime(now);
-                                    setData(entity);
-                                    activityMapper.save(entity);
-                                }
-                            }
+
+                            List<UserEntity> entities = usermapper.getDutyUserByCityAndOnDuty(city);
+                            UserEntity user = entities.get(0);
+                            //每天新增一个云迹活动
+                            CloudActivityEntity entity = new CloudActivityEntity();
+                            String name = "云迹数据" + date;
+                            entity.setName(name);
+                            entity.setCity(city);
+                            entity.setCreateId(entity.getId());
+                            entity.setCreateName(entity.getName());
+                            entity.setCreateTime(now);
+                            setData(entity);
+                            activityMapper.save(entity);
+
+//                            if ("nj".equals(city)) {
+//                                map.put("onduty", 1);
+//                                List<DutyStaffEntity> list = usermapper.getDutyByCondition(map);
+//                                if (CollectionUtils.isNotEmpty(list)) {
+//                                    DutyStaffEntity staffEntity = list.get(0);
+//                                    //每天新增一个云迹活动
+//                                    CloudActivityEntity entity = new CloudActivityEntity();
+//                                    String name = "云迹数据" + date;
+//                                    entity.setName(name);
+//                                    entity.setCity(city);
+//                                    entity.setCreateId(Integer.valueOf(staffEntity.getUserId()));
+//                                    entity.setCreateName(staffEntity.getName());
+//                                    entity.setCreateTime(now);
+//                                    setData(entity);
+//                                    activityMapper.save(entity);
+//                                }
+//                            } else {
+//                                map.put("isDuty", 1);
+//                                map.put("city", city);
+//                                List<DutyStaffOtherEntity> dutyList = staffOtherMapper.queryByConditions(map);
+//                                if (CollectionUtils.isNotEmpty(dutyList)) {
+//                                    DutyStaffOtherEntity staffEntity = dutyList.get(0);
+//                                    //每天新增一个云迹活动
+//                                    CloudActivityEntity entity = new CloudActivityEntity();
+//                                    String name = "云迹数据" + date;
+//                                    entity.setName(name);
+//                                    entity.setCity(city);
+//                                    entity.setCreateId(staffEntity.getUserId());
+//                                    entity.setCreateName(staffEntity.getName());
+//                                    entity.setCreateTime(now);
+//                                    setData(entity);
+//                                    activityMapper.save(entity);
+//                                }
+//                            }
                         }
                     }
                 }

house365-hgs-ws/src/main/resources/development/mybatis/UserMapper.xml

@@ -262,6 +262,14 @@
         order by b.`order`
     </select>
 
+    <select id="getDutyUserByCityAndOnDuty" resultMap="infoMap">
+        select a.id, a.realName
+        from user a
+                 join `duty_staff` b on a.id = b.userId
+        where a.`deptUrlPath` REGEXP CONCAT('^', (select urlPath from `department` where `descripition` = #{cityCode}))
+        and b.onduty = 1
+    </select>
+
     <select id="getUserByCity" resultMap="infoMap">
         select a.id, a.realName,a.position
         from user a

house365-hgs-ws/src/main/resources/production/ibatis/Customer.xml

@@ -1547,6 +1547,14 @@
 					c.is_show_in_plat $searchFilters.isShowInPlat.operation$ #searchFilters.isShowInPlat.value#
 		            ]]>
                 </isNotEmpty>
+                <isNotEmpty prepend="AND" property="searchFilters.actSources">
+                    <![CDATA[ c.act_source in ]]>
+
+					    <iterate prepend="" property="searchFilters.actSources.value" close=")" open="(" conjunction=",">
+                            <![CDATA[ #searchFilters.actSources.value[]# ]]>
+					    </iterate>
+
+                </isNotEmpty>
                 <isNotEmpty prepend="AND" property="searchFilters.starCustomer">
                     <![CDATA[
                     starCustomer $searchFilters.starCustomer.operation$ #searchFilters.starCustomer.value#

house365-hgs-ws/src/main/resources/production/mybatis/UserMapper.xml

@@ -262,6 +262,14 @@
         order by b.`order`
     </select>
 
+    <select id="getDutyUserByCityAndOnDuty" resultMap="infoMap">
+        select a.id, a.realName
+        from user a
+                 join `duty_staff` b on a.id = b.userId
+        where a.`deptUrlPath` REGEXP CONCAT('^', (select urlPath from `department` where `descripition` = #{cityCode}))
+        and b.onduty = 1
+    </select>
+
     <select id="getUserByCity" resultMap="infoMap">
         select a.id, a.realName,a.position
         from user a

house365-hgs-ws/src/main/resources/test/mybatis/UserMapper.xml

@@ -262,6 +262,14 @@
         order by b.`order`
     </select>
 
+    <select id="getDutyUserByCityAndOnDuty" resultMap="infoMap">
+        select a.id, a.realName
+        from user a
+                 join `duty_staff` b on a.id = b.userId
+        where a.`deptUrlPath` REGEXP CONCAT('^', (select urlPath from `department` where `descripition` = #{cityCode}))
+        and b.onduty = 1
+    </select>
+
     <select id="getUserByCity" resultMap="infoMap">
         select a.id, a.realName,a.position
         from user a