Merge remote-tracking branch 'origin/master'

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java

@@ -143,7 +143,13 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 			viewDate = DateUtils.getNYTime();
 		}
 
-		List<Map<String ,Object>> map = viewClockInMapper1.selectErrorNum(viewDate,orgId);
+		List<String> deptList = new ArrayList<>();
+
+		for(SysDepart o:list){
+			deptList.add(o.getId());
+		}
+
+		List<Map<String ,Object>> map = viewClockInMapper1.selectErrorNum(viewDate,deptList);
 
 		for(SysDepart o:list){
 
@@ -170,7 +176,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 		}
 		//获取人员类型
 		List<SysDictItem> dictList = sysDictItemMapper.selectItemsByMainCode("category");
-		List<Map<String ,Object>> userMap = viewClockInMapper1.selectUserError(viewDate,orgId);
+		List<Map<String ,Object>> userMap = viewClockInMapper1.selectUserError(viewDate,deptList);
 
 //		LambdaQueryWrapper<SysUser> query1 = new LambdaQueryWrapper<SysUser>();
 //		query1.eq(SysUser::getDelFlag, CommonConstant.DEL_FLAG_0.toString());

jeecg-boot-module-system/src/main/java/org/jeecg/modules/viewClockIn/mapper/viewClockInMapper.java

@@ -29,9 +29,9 @@ public interface viewClockInMapper extends BaseMapper<ViewClockIn> {
 
     List<Map<String,Object>> selectByOvertime(@Param("monthTime") String monthTime,@Param("userList")List<String> userList);
 
-    List<Map<String,Object>> selectErrorNum(@Param("viewDate") String viewDate, @Param("deptCode")String deptCode);
+    List<Map<String,Object>> selectErrorNum(@Param("viewDate") String viewDate, @Param("deptCode")List<String> deptCode);
 
-    List<Map<String,Object>> selectUserError(@Param("viewDate") String viewDate, @Param("deptCode")String deptCode);
+    List<Map<String,Object>> selectUserError(@Param("viewDate") String viewDate, @Param("deptCode")List<String> deptCode);
 
     List<ViewClockIn> selectPage(Page<ViewClockIn> page);
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/viewClockIn/mapper/xml/viewClockInMapper.xml

@@ -175,7 +175,7 @@
         or (duration is not null and (work_overtime > 0 or work_overtime is null))  <!-- 有加班信息,打卡时间早于加班申请时间-->
         or (shift_type = 1 and (latetime1_s &lt; 0 or latetime1_x > 0 or latetime2_s &lt; 0 or latetime2_x > 0))  <!-- 分段打卡-->
         and b.set_info > 0 ) and b.error_state is null
-
+        and b.holiday_type is null -- 请假信息（有值时表示当天有请假记录）
 
         group by b.username,b.depart_names
 
@@ -183,10 +183,13 @@
         group by A.depart_name,A.id
         ) C on A.depart_name = C.depart_name
 
-        <if test="deptCode != null and deptCode != ''">
-            where c.id=#{deptCode}
+        <if test="deptCode != null and deptCode != '' and deptCode.size >0">
+            and c.id in(
+            <foreach collection="deptCode" item="item" index="index" separator=",">
+                #{item}
+            </foreach>
+            )
         </if>
-
     </select>
 
 
@@ -213,15 +216,19 @@
                 or (shift_type = 1 and (latetime1_s &lt; 0 or latetime1_x > 0 or latetime2_s &lt; 0 or latetime2_x > 0))  <!-- 分段打卡-->
 
                 and b.set_info > 0 ) and b.error_state is null
-
+                and b.holiday_type is null -- 请假信息（有值时表示当天有请假记录）
                 group by b.username
-                ) B on a.id = b.user_id
+            ) B on a.id = b.user_id
 
             where (a.employment_status = 10 or date_format(a.term_date,'%Y-%m') >= #{viewDate} or a.term_date is null )
-        <if test="deptCode != null and deptCode != ''">
-            and find_in_set(#{deptCode} , a.depart_ids)
-        </if>
 
+        <if test="deptCode != null and deptCode != '' and deptCode.size >0">
+            and a.depart_ids in(
+            <foreach collection="deptCode" item="item" index="index" separator=",">
+                #{item}
+            </foreach>
+            )
+        </if>
     </select>
     
     <select id="selectByOvertime" resultType="Map">

jeecg-boot-module-system/src/main/java/org/jeecg/modules/workOvertime/controller/workOvertimeController.java

@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import io.netty.util.internal.StringUtil;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
@@ -310,7 +311,14 @@ public class workOvertimeController extends JeecgController<workOvertime, IworkO
 		 String viewDate = jsonObject.get("viewDate").toString();
 		 String username = jsonObject.get("username").toString();
 		 List<workOvertime> list = workOvertimeService.getJiaBan(username,viewDate);
-		 return list;
+		 List<workOvertime> list2 = new ArrayList<>();
+		 for(workOvertime o:list){
+		 	if(StringUtil.isNullOrEmpty(o.getSetInfo())){
+		 		o.setMultiple(null);
+			}
+			 list2.add(o);
+		 }
+		 return list2;
 	 }
 
 }

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -134,7 +134,7 @@ spring:
           url: jdbc:mysql://10.0.0.199:3306/geke?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
 #          url: jdbc:mysql://127.0.0.1:3306/geke?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
-          password: 123
+          password: root
           driver-class-name: com.mysql.cj.jdbc.Driver
 
         multi-datasource1: