格克

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/makeUpCard/mapper/MakeUpCardMapper.java

@@ -25,5 +25,7 @@ public interface MakeUpCardMapper extends BaseMapper<MakeUpCard> {
      */
     List<String> getSubDepIdsByDepId(@org.springframework.data.repository.query.Param("departId") String departId);
 
+    List<String>getUseridByDeptids(@Param("deptids")List<String>deptids);
+
     List<Map<String,Object>>listDeptTop(@org.springframework.data.repository.query.Param("codes")List<String>codes);
 }

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/makeUpCard/mapper/xml/MakeUpCardMapper.xml

@@ -16,7 +16,8 @@
             ,c.org_code as 'deptCode'
             from geke_make_up_card a
             left join sys_user b on a.user_id=b.id
-            left join sys_depart c on a.dept=c.id
+            left join sys_user_depart d on b.id=d.user_id
+            left join sys_depart c on d.dep_id=c.id
             where b.del_flag='0'
         <if test="code!=null and ''!=code">
             and a.code LIKE concat(concat('%',#{code}),'%')
@@ -51,5 +52,15 @@
         </if>
         order by org_type asc
     </select>
+    <select id="getUseridByDeptids" resultType="java.lang.String">
+        select a.id from sys_user a left join sys_user_depart b on a.id=b.user_id
+        where a.del_flag='0'
+        <if test="deptids!=null and deptids.size()>0">
+            and b.dep_id in
+            <foreach collection="deptids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+    </select>
 
 </mapper>

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userquit/service/impl/UserQuitServiceImpl.java

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -47,6 +48,7 @@ public class UserQuitServiceImpl extends ServiceImpl<UserQuitMapper, UserQuit> i
         String newDate=null;
         if (userQuit.getDeptId()!=null){
             subDepIdsByDepId= makeUpCardMapper.getSubDepIdsByDepId(userQuit.getDeptId());
+
         }if (userQuit.getState()!=null){
             state=userQuit.getState().toString();
         }if (userQuit.getNewDate()!=null){

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

@@ -452,7 +452,7 @@ public class SysUserController {
                 if (jsonObject.getString("type").equals(1)||jsonObject.getString("type").equals("1")){
                     String str="2022-01-02 10:00:00";
                     String end="2022-01-02 19:00:00";
-                    attendanceRule.setWorkDay("0,1,2,3,4,5,6");
+                    attendanceRule.setWorkDay("1,2,3,4,5");
                     attendanceRule.setStartDate(DateUtils.parseDate(str,"yyyy-MM-dd HH:mm:ss"));
                     attendanceRule.setEndDate(DateUtils.parseDate(end,"yyyy-MM-dd HH:mm:ss"));
                 }
@@ -521,7 +521,7 @@ public class SysUserController {
                     if (jsonObject.getString("type").equals(1)||jsonObject.getString("type").equals("1")){
                         String str="2022-01-02 10:00:00";
                         String end="2022-01-02 19:00:00";
-                        attendanceRule.setWorkDay("0,1,2,3,4,5,6");
+                        attendanceRule.setWorkDay("1,2,3,4,5");
                         attendanceRule.setStartDate(DateUtils.parseDate(str,"yyyy-MM-dd HH:mm:ss"));
                         attendanceRule.setEndDate(DateUtils.parseDate(end,"yyyy-MM-dd HH:mm:ss"));
                     }
@@ -1167,7 +1167,7 @@ public class SysUserController {
                                 if (sysUserExcel.getType().equals("1")||sysUserExcel.getType().equals(1)){
                                     String str="2022-01-02 10:00:00";
                                     String end="2022-01-02 19:00:00";
-                                    attendanceRule.setWorkDay("0,1,2,3,4,5,6");
+                                    attendanceRule.setWorkDay("1,2,3,4,5");
                                     attendanceRule.setStartDate(DateUtils.parseDate(str,"yyyy-MM-dd HH:mm:ss"));
                                     attendanceRule.setEndDate(DateUtils.parseDate(end,"yyyy-MM-dd HH:mm:ss"));
                                 }

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

@@ -210,10 +210,10 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 	List<SysUser>deptUser(Page<SysUser> page,@Param("username") String username,@Param("deptids")List<String>deptids,@Param("sex")Integer sex,@Param("realname")String realname,@Param("ipone")String ipone,@Param("state")Integer state);
 
 	//同步专用用户
-	List<SysUser>tpUser(@Param("state")String state);
+	List<SysUser>tpUser(@Param("state")String state,@Param("wxState")String wxState,@Param("UState")String UState);
 	//同步后修改状态
 	boolean updateTpUser(@Param("userid")String userid);
-
+	boolean updateTUUser(@Param("userid")String userid);
 	//根据ids查询用户
 	List<SysUser>usersByIds(@Param("ids")List<String>ids);
 

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

@@ -191,6 +191,9 @@
 			</foreach>
 		</if>
 	</update>
+	<update id="updateTUUser">
+		update sys_user set u_state="1" where id=#{userid}
+	</update>
 
 
 	<!-- 通过多个部门IDS，查询部门下的用户信息 -->
@@ -411,7 +414,13 @@ on a.depart_name=b.orgCodeTxt
 	<if test="state!=null and ''!=state">
 	and	info_sy in (#{state},'3')
 	</if>
-	and del_flag='0'
+	and del_flag='0' and employment_status='10'
+	<if test="wxState!=null and ''!=wxState">
+		and sy_state='0'
+	</if>
+		<if test="UState!=null and ''!=UState">
+			and u_state='0'
+		</if>
 	</select>
 	<select id="usersByIds" resultType="org.jeecg.modules.system.entity.SysUser">
 		select *from sys_user where 1=1

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

@@ -301,10 +301,10 @@ List<String>  departIds(String userid);
 	int delUserByUserID(String userid);
 
 	//同步专用用户
-	List<SysUser>tpUser(String state);
-
-	boolean updateTpUser(@Param("userid")String userid);
+	List<SysUser>tpUser(String state,String wxState,String UState);
 
+	boolean updateTpUser(String userid);
+	boolean updateTUUser(String userid);
 
 	Page<SysUser>queryUserShift(Page<SysUser> page, String username, String deptid, String userid, Date date);
 

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

@@ -589,8 +589,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	}
 
 	@Override
-	public List<SysUser> tpUser(String state) {
-		return userMapper.tpUser(state);
+	public List<SysUser> tpUser(String state,String wxState,String UState) {
+		return userMapper.tpUser(state, wxState, UState);
 	}
 
 	@Override
@@ -598,6 +598,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		return userMapper.updateTpUser(userid);
 	}
 
+	@Override
+	public boolean updateTUUser(String userid) {
+		return userMapper.updateTUUser(userid);
+	}
+
 	@Override
 	public Page<SysUser> queryUserShift(Page<SysUser> page, String username,String deptid,String userid,Date date) {
 		List<String> userIds=new ArrayList<>();

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

@@ -411,7 +411,7 @@ public class WeixinUserImpl implements IWeixinUserService{
         try{
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
             Map<String, Object> params = Maps.newHashMap();
-            List<SysUser> list = sysUserService.tpUser("1");
+            List<SysUser> list = sysUserService.tpUser("1","0",null);
             List<String>idents=new ArrayList<>();
             if (list.size() > 0) {
                 for (SysUser ls : list) {
@@ -1595,7 +1595,7 @@ public class WeixinUserImpl implements IWeixinUserService{
         String msg="ok";
         getToaccount();
         Map<String, Object> maps = new HashMap<>();
-        List<SysUser> list = sysUserService.tpUser("2");
+        List<SysUser> list = sysUserService.tpUser("2",null,"0");
         if (list.size() > 0) {
             for (SysUser ls : list) {
                 Map<String, Object> map = new HashMap<>();
@@ -1638,7 +1638,7 @@ public class WeixinUserImpl implements IWeixinUserService{
                        e.printStackTrace();
                    }
                     if (msg.equals("0")){
-                        sysUserService.updateTpUser(ls.getId());
+                        sysUserService.updateTUUser(ls.getId());
                     }
 
             }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/workOvertime/mapper/xml/workOvertimeMapper.xml

@@ -14,8 +14,9 @@
     <select id="getworkList" resultType="org.jeecg.modules.workOvertime.entity.workOvertime">
         select a.code,a.demo,a.begin_date,a.end_date,a.commit_date,a.duration,b.realname as 'person',c.depart_name as 'dept'
         , c.org_code as 'deptCode'
-        from bd_work_overtime a left  join sys_user b on a.person=b.id left join sys_depart
-        c on a.dept=c.id
+        from bd_work_overtime a left  join sys_user b on a.person=b.id
+        left join sys_user_depart d on b.id=d.user_id
+        left join sys_depart c on d.dep_id=c.id
         where b.del_flag='0'
         <if test="code!=null and ''!=code">
     and  a.code=#{code}