格克

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userShift/mapper/xml/UserShiftMapper.xml

@@ -73,7 +73,7 @@ order by a.shift_date desc
     left join sys_user b on a.user_id=b.id
     left join sys_user_depart c on b.id=c.user_id
     left join sys_depart d on c.dep_id=d.id
-    where b.del_flag='0' and b.employment_status='10'
+    where b.del_flag='0' and b.employment_status='10' and b.is_attendance='0'
     <if test="type!=null and ''!=type">
         and a.type=#{type}
     </if>
@@ -153,7 +153,7 @@ order by a.shift_date desc
         select count(shift_id) as 'count' from geke_user_shift a
         left join sys_user b on a.user_id=b.id
         left join sys_user_depart c on a.user_id=c.user_id
-        where b.del_flag='0' and b.employment_status='10'
+        where b.del_flag='0' and b.employment_status='10' and is_attendance='0'
         <if test="id!=null and ''!=id">
             and shift_id=#{id}
         </if>

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userchange/entity/UserChage.java

@@ -85,5 +85,7 @@ public class UserChage {
 	@ApiModelProperty(value = "备注")
 	private java.lang.String demo;
 	@Dict(dicCode = "state")
-	private java.lang.String state;
+	private java.lang.Integer state;
+
+	private  java.lang.Integer status;
 }

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userchange/mapper/UserChageMapper.java

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface UserChageMapper extends BaseMapper<UserChage> {
 
-    List<UserChage>listDate(@Param("startDate")String startDate,@Param("endDate")String endDate);
+    List<UserChage>listDate(@Param("startDate")String startDate);
     List<UserChage>listUserId(@Param("userid")String userid);
+    boolean updateByUserids(@Param("userid")List<String>userid);
 }

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userchange/mapper/xml/UserChageMapper.xml

@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.geke.userchange.mapper.UserChageMapper">
+    <update id="updateByUserids">
+        update geke_personnel_changes set status='1' where status='0'
+        and  user_id in
+        <foreach collection="userid" index="index" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+
+    </update>
 
     <select id="listDate" resultType="org.jeecg.modules.geke.userchange.entity.UserChage">
         select *from geke_personnel_changes where state='1'
-        <if test="startDate!=null and endDate!=null">
-          and  date_format(time,'%Y-%m-%d')  BETWEEN date_format(#{startDate},'%Y-%m-%d') AND date_format(#{endDate},'%Y-%m-%d')
+        <if test="startDate!=null and ''!=startDate">
+          and  date_format(time,'%Y-%m-%d')&lt;= date_format(#{startDate},'%Y-%m-%d')
         </if>
         order by time asc
     </select>

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userchange/service/IUserChageService.java

@@ -13,6 +13,7 @@ import java.util.List;
  * @Version: V1.0
  */
 public interface IUserChageService extends IService<UserChage> {
-    List<UserChage> listDate(String startDate,String endDate);
+    List<UserChage> listDate(String startDate);
     List<UserChage>listUserId(String userid);
+    boolean updateByUserids(List<String>userid);
 }

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userchange/service/impl/UserChageServiceImpl.java

@@ -22,12 +22,17 @@ public class UserChageServiceImpl extends ServiceImpl<UserChageMapper, UserChage
     private  UserChageMapper userChageMapper;
 
     @Override
-    public List<UserChage> listDate(String startDate, String endDate) {
-        return userChageMapper.listDate(startDate,endDate);
+    public List<UserChage> listDate(String startDate) {
+        return userChageMapper.listDate(startDate);
     }
 
     @Override
     public List<UserChage> listUserId(String userid) {
         return userChageMapper.listUserId(userid);
     }
+
+    @Override
+    public boolean updateByUserids(List<String> userid) {
+        return userChageMapper.updateByUserids(userid);
+    }
 }

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userquit/mapper/UserQuitMapper.java

@@ -20,6 +20,8 @@ public interface UserQuitMapper extends BaseMapper<UserQuit> {
     List<UserQuit>list(Page<UserQuit> page,@Param("userQuit")UserQuit userQuit,@Param("deptids")List<String>deptids);
     boolean updateUserSate(@Param("userid")String userid);
 
-    List<UserQuit>lists(@Param("startDate")String startDate,@Param("endDate")String endDate);
+    List<UserQuit>lists(@Param("startDate")String startDate);
     List<UserQuit>getUserIds(@Param("userid")String userid);
+
+    boolean updateByUserid(@Param("userid")List<String>userid);
 }

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userquit/mapper/xml/UserQuitMapper.xml

@@ -7,6 +7,13 @@
             and id=#{userid}
         </if>
     </update>
+    <update id="updateByUserid">
+        update geke_user_quit set status='1' where status='0'
+        and  user_id in
+        <foreach collection="userid" index="index" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
 
     <delete id="deleteDate">
         delete from geke_user_quit where 1=1
@@ -30,9 +37,9 @@
         </if>
     </select>
     <select id="lists" resultType="org.jeecg.modules.geke.userquit.entity.UserQuit">
-        select *from geke_user_quit where state='1'
-        <if test="startDate!=null and endDate!=null">
-        and date_format(new_date,'%Y-%m-%d') between date_format(#{startDate},'%Y-%m-%d') and date_format(#{endDate},'%Y-%m-%d')
+        select *from geke_user_quit where state='1' and status='0'
+        <if test="startDate!=null and ''!=startDate ">
+        and date_format(new_date,'%Y-%m-%d') &lt;=date_format(#{startDate},'%Y-%m-%d')
         </if>
     </select>
     <select id="getUserIds" resultType="org.jeecg.modules.geke.userquit.entity.UserQuit">

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

@@ -20,5 +20,6 @@ public interface IUserQuitService extends IService<UserQuit> {
     Page<UserQuit>list(Page<UserQuit> page,UserQuit userQuit);
     List<UserQuit>getUserIds(String userid);
     boolean updateUserSate(String userid);
-    List<UserQuit>lists(String startDate,String endDate);
+    List<UserQuit>lists(String startDate);
+    boolean updateByUserid(List<String>userid);
 }

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

@@ -60,7 +60,12 @@ public class UserQuitServiceImpl extends ServiceImpl<UserQuitMapper, UserQuit> i
     }
 
     @Override
-    public List<UserQuit> lists(String startDate, String endDate) {
-        return userQuitMapper.lists(startDate,endDate);
+    public List<UserQuit> lists(String startDate) {
+        return userQuitMapper.lists(startDate);
+    }
+
+    @Override
+    public boolean updateByUserid(List<String> userid) {
+        return userQuitMapper.updateByUserid(userid);
     }
 }

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/vacation/entity/Vacation.java

@@ -70,7 +70,8 @@ public class Vacation {
 	@Excel(name = "审批状态", width = 15)
     @ApiModelProperty(value = "审批状态")
 	private java.lang.String state;
-
+	/**事由*/
+	private  String demo;
 
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy")
 	@ApiModelProperty(value = "年度")

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

@@ -307,6 +307,7 @@ public class SysUserController {
         String deptids="";
         String state="0";
         List<String> mySubDepIdsByDepId=null;
+        List<String> status=null;
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         List<SysUserRole> userRole = sysUserRoleService.list(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, sysUser.getId()));
         if (userRole!=null&&userRole.size()>0){
@@ -322,8 +323,10 @@ public class SysUserController {
         List<String> subDepIdsByDepId=null;
         if (user.getOrgCodeTxt()!=null){
             subDepIdsByDepId= sysDepartService.getSubDepIdsByDepId(user.getOrgCodeTxt());
+        }if (user.getEmpStatus()!=null&&!"".equals(user.getEmpStatus())){
+            status=Arrays.asList(user.getEmpStatus().split(","));
         }
-        Page<SysUser> pageList = sysUserService.kQueryUser(page, user,subDepIdsByDepId,mySubDepIdsByDepId);
+        Page<SysUser> pageList = sysUserService.kQueryUser(page, user,subDepIdsByDepId,mySubDepIdsByDepId,status);
         //批量查询用户的所属部门
         //step.1 先拿到全部的 useids
         //step.2 通过 useids，一次性查询用户的所属部门名字
@@ -800,10 +803,13 @@ public class SysUserController {
        }
         //update-end--Author:kangxiaolin  Date:20180825 for：[03]用户导出，如果选择数据则只导出相关数据----------------------
         List<String> subDepIdsByDepId=null;
+        List<String> status=null;
         if (sysUser.getOrgCodeTxt()!=null){
             subDepIdsByDepId= sysDepartService.getSubDepIdsByDepId(sysUser.getOrgCodeTxt());
+        }if (sysUser.getEmpStatus()!=null&&!"".equals(sysUser.getEmpStatus())){
+            status=Arrays.asList(sysUser.getEmpStatus().split(","));
         }
-        List<SysUser> pageList = sysUserMapper.kQueryUser(page, sysUser,subDepIdsByDepId,null);
+        List<SysUser> pageList = sysUserMapper.kQueryUser(page, sysUser,subDepIdsByDepId,null,status);
 
         List<String>userids=new ArrayList<>();
        if (pageList.size()>0){
@@ -814,6 +820,13 @@ public class SysUserController {
                Map<String,String>  useDepNames = sysUserService.getDepNamesByUserIds(userids);
                pageList.forEach(item->{
                    item.setOrgCodeTxt(useDepNames.get(item.getId()));
+                   if (item.getSfzType()!=null){
+                       if (item.getSfzType().equals("0")){
+                            item.setSfzType("中国身份证");
+                       }else {
+                           item.setSfzType("其他");
+                       }
+                   }
                    List<String> orgName = sysUserService.getOrgName(item.getId());
                    List<SysUserDepVo> depNamesByUserIds = sysUserMapper.getDepNamesByUserIds(Arrays.asList(item.getId().split(",")));
                    if (orgName!=null&&orgName.size()>0){
@@ -2202,7 +2215,7 @@ public class SysUserController {
                     list.forEach(str->{
                     str.setTime(new Date());
                     str.setType("工资调整");
-                    str.setState("1");
+                    str.setState(1);
                     str.setConmitId(sysUsers.getId());
                     str.setConmitDate(new Date());
                     List<SysDepart> sysDeparts = sysDepartService.queryUserDeparts(str.getUserId());

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUser.java

@@ -12,6 +12,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serializable;
+import java.util.List;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -65,6 +66,7 @@ public class SysUser implements Serializable {
     /**
      * 年龄
      */
+    @Excel(name = "年龄", width = 15)
     private Integer age;
     /**
      * 生日
@@ -96,6 +98,7 @@ public class SysUser implements Serializable {
     /**
      * 证件类型（1中国身份证，2其他身份证）
      */
+    @Excel(name = "身份证类型", width = 15)
     private String sfzType;
 
     /**
@@ -122,7 +125,7 @@ public class SysUser implements Serializable {
     @Dict(dicCode = "sex")
     private Integer sex;
 
-    private  String wagesBase;
+
     /**
      * 电子邮件
      */
@@ -137,51 +140,26 @@ public class SysUser implements Serializable {
     private String phone;
 
 
-    /**
-     * 备注
-     */
-    private String remarks;
 
     /**
      * 国籍
      */
+    @Excel(name = "国籍", width = 15,dicCode="nationality")
+    @Dict(dicCode = "nationality")
     private String nationality;
 
-    /**
-     * 试用时间（按月）
-     */
-    private String trialMoth;
-
-    /**
-     * 试用结束时间
-     */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date trialEndDate;
-
-    /**
-     * 社会工龄（按月）
-     */
-    private String workMoth;
-
-    /**
-     * 司龄（按月）
-     */
-    private String divisionMoth;
-
-    /**
-     * 户口地址
-     */
-    private String homeAddr;
 
     /**
      * 学历
      */
+    @Excel(name = "学历", width = 15,dicCode="education")
+    @Dict(dicCode = "education")
     private String education;
 
     /**
      * 毕业学校
      */
+    @Excel(name = "毕业学校", width = 15)
     private String school;
 
     /**
@@ -208,10 +186,13 @@ public class SysUser implements Serializable {
     /**
      * 分摊部门
      */
+    @Excel(name = "分摊部门", width = 15,dicCode="share_dept")
+    @Dict(dicCode = "share_dept")
     private  String shareDept;
     /**
      * 家庭住址
      */
+    @Excel(name = "家庭住址", width = 15)
     private String addr;
     /**用户所属组织**/
     @Excel(name = "一级部门", width = 15)
@@ -226,6 +207,38 @@ public class SysUser implements Serializable {
     @Excel(name = "*末级部门", width = 15)
     private transient String orgCodeTxt;
 
+    /**入职日期**/
+    @Excel(name="*入职日期",width = 15,format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private  Date entryDate;
+
+    /**
+     * 试用时间（按月）
+     */
+    @Excel(name = "*试用期(/月)", width = 15)
+    private String trialMoth;
+
+    /**
+     * 试用结束时间
+     */
+    @Excel(name = "*结束日期", width = 15,format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date trialEndDate;
+
+    /**
+     * 社会工龄（按月）
+     */
+    @Excel(name = "社会工龄(/月)", width = 15)
+    private String workMoth;
+
+    /**
+     * 司龄（按月）
+     */
+    @Excel(name = "*司龄(/月)", width = 15)
+    private String divisionMoth;
+
     @Excel(name = "公积金账号", width = 15)
     private String syFund;
 
@@ -242,6 +255,9 @@ public class SysUser implements Serializable {
      */
     @Excel(name = "*基本工资", width = 15)
     private  String wagesOne;
+
+    @Excel(name = "缴交基数", width = 15)
+    private  String wagesBase;
     /**
      * 雇佣状态 10在职 20离退 30离职
      */
@@ -310,6 +326,7 @@ public class SysUser implements Serializable {
     /**
      * 职务，关联职务表
      */
+    @Excel(name = "职位", width = 15,dictTable ="sys_position",dicText = "name",dicCode = "code")
     @Dict(dictTable ="sys_position",dicText = "name",dicCode = "code")
     private String post;
 
@@ -376,11 +393,13 @@ public class SysUser implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private  Date birthDate;
-    /**入职日期**/
-    @Excel(name="入职日期",width = 15,format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private  Date entryDate;
+
+
+    /**
+     * 户口地址
+     */
+    @Excel(name = "户口地址", width = 15)
+    private String homeAddr;
     /**离职日期**/
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -391,7 +410,11 @@ public class SysUser implements Serializable {
     /**紧急联系人电话**/
     @Excel(name="紧急联系人电话",width = 15)
     private  String urgentPhone;
-
+    /**
+     * 备注
+     */
+    @Excel(name = "备注", width = 15)
+    private String remarks;
     /**备用字段**/
     private transient  String del;
     /**部门id**/
@@ -406,6 +429,8 @@ public class SysUser implements Serializable {
     private transient  String del5;
 
     /**备用虚拟字段**/
+    @Excel(name = "上班类型", width = 15,dicCode = "type")
+    @Dict(dicCode = "type")
     private transient  String type;
     /***
      * 预计离职时间
@@ -422,4 +447,6 @@ public class SysUser implements Serializable {
      * 离职原因
      */
     private transient  String demo;
+
+    private transient String empStatus;
 }

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

@@ -220,7 +220,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 	//获取下一个工号
 	void getNextNo(CodeVo params);
 
-	List<SysUser>kQueryUser(Page<SysUser> page,@Param("user") SysUser user,@Param("deptids")List<String> deptids,@Param("mydeptids")List<String>mydeptids);
+	List<SysUser>kQueryUser(Page<SysUser> page,@Param("user") SysUser user,@Param("deptids")List<String> deptids,@Param("mydeptids")List<String>mydeptids,@Param("status")List<String>status);
 
 	//根据员工姓名查询部门
 	List<Map<String,Object>>getDeptByUserName(@Param("username")String username);

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

@@ -441,15 +441,19 @@ on a.depart_name=b.orgCodeTxt
 		<if test="user.sex!=null and ''!=user.sex">
 			and a.sex=#{user.sex}
 		</if>
+		<if test="status!=null and status.size()>0">
+			and a.employment_status in
+			<foreach collection="status" index="index" item="id" open="(" separator="," close=")">
+				#{id}
+			</foreach>
+		</if>
 		<if test="user.phone!=null and ''!=user.phone">
 			and a.phone like concat(concat('%',#{user.phone}),'%')
 		</if>
 		<if test="user.workNo!=null and ''!=user.workNo">
 			and a.work_no like concat(concat('%',#{user.workNo}),'%')
 		</if>
-		<if test="user.employmentStatus!=null and ''!=user.employmentStatus">
-			and a.employment_status=#{user.employmentStatus}
-		</if>
+
 		<if test="deptids!=null and deptids.size()>0">
 			and c.id in
 			<foreach collection="deptids" index="index" item="id" open="(" separator="," close=")">

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

@@ -310,7 +310,7 @@ List<String>  departIds(String userid);
 
 	Page<SysUser>deptUser(Page<SysUser> page,String username,List<String>deptids,Integer sex,String realname,String ipone,Integer state);
 
-	Page<SysUser>kQueryUser(Page<SysUser> page,SysUser user,List<String> deptids,List<String>mydeptids);
+	Page<SysUser>kQueryUser(Page<SysUser> page,SysUser user,List<String> deptids,List<String>mydeptids,List<String>status);
 
 	List<Map<String,Object>>getDeptByUserName(String username);
 

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

@@ -24,7 +24,7 @@ public interface IWeixinUserService {
 
         //u8假期
         Map<String,Object>U8Vacation(String id);
-
+        //加班信息同步
         Map<String,Object>WeixinWork() throws IOException, ParseException;
 
         //同步假期信息到平台

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

@@ -626,8 +626,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	}
 
 	@Override
-	public Page<SysUser> kQueryUser(Page<SysUser> page, SysUser user,List<String> deptids,List<String>mydeptids) {
-		return page.setRecords(userMapper.kQueryUser(page,user,deptids,mydeptids));
+	public Page<SysUser> kQueryUser(Page<SysUser> page, SysUser user,List<String> deptids,List<String>mydeptids,List<String>status) {
+		return page.setRecords(userMapper.kQueryUser(page,user,deptids,mydeptids,status));
 	}
 
 	@Override

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

@@ -741,8 +741,8 @@ public class WeixinUserImpl implements IWeixinUserService{
         now.add(Calendar.DAY_OF_MONTH, -30);
         startDate2 = now.getTime().getTime()/1000;
         stDate2 = now.getTime();
-        list.addAll(WeixinVacationList(String.valueOf(startDate), String.valueOf(endDate),"5",""));
-        list.addAll(WeixinVacationList(String.valueOf(startDate2), String.valueOf(startDate),"5",""));
+        list.addAll(WeixinVacationList(String.valueOf(startDate), String.valueOf(endDate),"","Bs7yC3swLeNVwa2WyLsSXVL5XV6kVJmnEQTwW4cFS"));
+        list.addAll(WeixinVacationList(String.valueOf(startDate2), String.valueOf(startDate),"","Bs7yC3swLeNVwa2WyLsSXVL5XV6kVJmnEQTwW4cFS"));
             for (String ls:list){//循环审批id
                 workOvertime workOvertime = WeixinWorks(ls);
                 if (workOvertime!=null) {
@@ -805,20 +805,18 @@ public class WeixinUserImpl implements IWeixinUserService{
     @Override
     public Map<String, Object> UserQuits() throws IOException, ParseException {
         Calendar now = Calendar.getInstance();//获取系统时间实列
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Date stDate =null;
-        Date enDate = now.getTime();
-        now.add(Calendar.DAY_OF_MONTH, -30);
-        now.add(Calendar.DAY_OF_MONTH, -30);
-        stDate=now.getTime();
-        List<UserQuit> lists = userQuitService.lists(sdf.format(stDate), sdf.format(enDate));
+        List<UserQuit> lists = userQuitService.lists(DateUtils.getDate("yyyy-MM-dd HH:mm:ss"));
+        List<String>userids=new ArrayList<>();
         if (lists!=null&&lists.size()>0){
             lists.forEach(str->{
                 SysUser user =new SysUser();
                 user.setId(str.getUserId());
                 user.setEmploymentStatus(30);
                 sysUserService.updateById(user);
+                userids.add(str.getUserId());
             });
+        }if (userids!=null&&userids.size()>0){
+            userQuitService.updateByUserid(userids);
         }
         return null;
     }
@@ -869,13 +867,8 @@ public class WeixinUserImpl implements IWeixinUserService{
     @Override
     public Map<String, Object> editUserChange() throws IOException, ParseException {
         Calendar now = Calendar.getInstance();//获取系统时间实列
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Date stDate =null;
-        Date enDate = now.getTime();
-        now.add(Calendar.DAY_OF_MONTH, -30);
-        now.add(Calendar.DAY_OF_MONTH, -30);
-        stDate=now.getTime();
-        List<UserChage> userChages = userChageService.listDate(sdf.format(stDate), sdf.format(enDate));
+        List<UserChage> userChages = userChageService.listDate(DateUtils.getDate("yyyy-MM-dd HH:mm:ss"));
+        List<String>userids=new ArrayList<>();
         if (userChages!=null&&userChages.size()>0){
             userChages.forEach(str->{
                 SysUser sysUser=new SysUser();
@@ -899,7 +892,10 @@ public class WeixinUserImpl implements IWeixinUserService{
                     }
                 }
                 sysUserService.updateById(sysUser);
+                userids.add(str.getUserId());
             });
+        }if (userids!=null&&userids.size()>0){
+            userChageService.updateByUserids(userids);
         }
         return null;
     }
@@ -934,9 +930,9 @@ public class WeixinUserImpl implements IWeixinUserService{
         now.add(Calendar.DAY_OF_MONTH, -30);
         startDate2 = now.getTime().getTime()/1000;
         stDate2 = now.getTime();
-        list.addAll(WeixinVacationList(String.valueOf(startDate), String.valueOf(endDate),"2",""));
-        list.addAll(WeixinVacationList(String.valueOf(startDate2), String.valueOf(startDate),"2",""));
-        makeUpCardService.deleteDate(sdf.format(startDate2));
+        list.addAll(WeixinVacationList(String.valueOf(startDate), String.valueOf(endDate),"","3TmB1h5HqrhwHanzxLTSX1x44zz7djoVyWTbQHWn"));
+        list.addAll(WeixinVacationList(String.valueOf(startDate2), String.valueOf(startDate),"","3TmB1h5HqrhwHanzxLTSX1x44zz7djoVyWTbQHWn"));
+        //makeUpCardService.deleteDate(sdf.format(startDate2));
         List<MakeUpCard>ls=new ArrayList<>();
         list.forEach(str->{
             try {
@@ -980,10 +976,13 @@ public class WeixinUserImpl implements IWeixinUserService{
                 if (weixinApproval != null&&weixinApproval.getSp_status().equals("2")) {//获取数据库字段所需的数据
                     work=new MakeUpCard();
                     work.setCode(weixinApproval.getSp_no());
+                    work.setId(weixinApproval.getSp_no());
                     String us = weixinApproval.getApplyer().toString();
                     mapTypes = JSON.parseObject(us);
                     work.setUserId(mapTypes.get("userid").toString());
-                    work.setDept(mapTypes.get("partyid").toString());
+                    if (mapTypes.get("partyid")!=null&&!"".equals(mapTypes.get("partyid"))) {
+                        work.setDept(mapTypes.get("partyid").toString());
+                    }
                     work.setCommitDate(new Date(Long.valueOf(weixinApproval.getApply_time()) * 1000));
                     List<Object> apply_data = weixinApproval.getApply_data();
                     String o = apply_data.get(0).toString();
@@ -1115,9 +1114,9 @@ public class WeixinUserImpl implements IWeixinUserService{
                     });
                     for (Map ll : tl) {
                         Object s = ll.get("control");
+                        Map value = null;
+                        Map types = null;
                         if (s.equals("Vacation")) {
-                            Map value = null;
-                            Map types = null;
                             value = (Map) ll.get("value");
                             value = (Map) value.get("vacation");
                             types = (Map) value.get("selector");
@@ -1138,6 +1137,9 @@ public class WeixinUserImpl implements IWeixinUserService{
                             long countDa = countD / 3600;
 
                             vacation.setHolidayCount(countDa + "");
+                        }else if (s.equals("Textarea")){
+                            value = (Map) ll.get("value");
+                            vacation.setDemo(value.get("text").toString());
                         }
                     }
                 }
@@ -1178,7 +1180,9 @@ public class WeixinUserImpl implements IWeixinUserService{
                     String us = weixinApproval.getApplyer().toString();
                     mapTypes = JSON.parseObject(us);
                     work.setPerson(mapTypes.get("userid").toString());
-                   work.setDept(mapTypes.get("partyid").toString());
+                    if(mapTypes.get("partyid")!=null&&!"".equals(mapTypes.get("partyid"))) {
+                        work.setDept(mapTypes.get("partyid").toString());
+                    }
                    work.setCommitDate(new Date(Long.valueOf(weixinApproval.getApply_time()) * 1000));
                     List<Object> apply_data = weixinApproval.getApply_data();
                     String o = apply_data.get(0).toString();
@@ -1468,8 +1472,8 @@ public class WeixinUserImpl implements IWeixinUserService{
             now.add(Calendar.DAY_OF_MONTH, -30);
             startDate2 = now.getTime().getTime()/1000;
             stDate2 = now.getTime();
-             list.addAll(WeixinVacationList(String.valueOf(startDate), String.valueOf(endDate),"1",""));
-             list.addAll(WeixinVacationList(String.valueOf(startDate2), String.valueOf(startDate),"1",""));
+             list.addAll(WeixinVacationList(String.valueOf(startDate), String.valueOf(endDate),"","Bs7yC3swLeNVwa2WyLsSXVL5XV6kVDd3Zpjq3Tycy"));
+             list.addAll(WeixinVacationList(String.valueOf(startDate2), String.valueOf(startDate),"","Bs7yC3swLeNVwa2WyLsSXVL5XV6kVDd3Zpjq3Tycy"));
                     for (String ls:list){//循环审批id
                         Vacation vacation = WeixinVacationdetail(ls);
                         if (vacation!=null) {

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

@@ -16,8 +16,8 @@
         , 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
-        where 1=1
-<if test="code!=null and ''!=code">
+        where b.del_flag='0'
+        <if test="code!=null and ''!=code">
     and  a.code=#{code}
 </if>
 <if test="name!=null and ''!=name">

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

@@ -53,22 +53,24 @@ public class workOvertimeServiceImpl extends ServiceImpl<workOvertimeMapper, wor
         List<workOvertime> workOvertimes = works.getworkList(page, name, code, startDate, endDate);
         if (workOvertimes!=null){
             workOvertimes.forEach(str->{
-                List<String>codes=new ArrayList<>();
-                String codet=str.getDeptCode();
-                for (int i=0;i<codet.length();i=i+2){
-                    codes.add(codet.substring(0,i+2));
-                }
-                List<SysDepart> sysDeparts = sysDepartService.listDeptTop(codes);
-                if (sysDeparts!=null&&sysDeparts.size()>0) {
-                    sysDeparts.forEach(st -> {
-                        if (st.getOrgType().equals("1")) {
-                            str.setDeptName(st.getDepartName());
-                        } else if (st.getOrgType().equals("2")) {
-                            str.setDeptName2(st.getDepartName());
-                        } else if (st.getOrgType().equals("3")) {
-                            str.setDeptName3(st.getDepartName());
-                        }
-                    });
+                if (str.getDeptCode()!=null&&!"".equals(str.getDeptCode())) {
+                    List<String> codes = new ArrayList<>();
+                    String codet = str.getDeptCode();
+                    for (int i = 0; i < codet.length(); i = i + 2) {
+                        codes.add(codet.substring(0, i + 2));
+                    }
+                    List<SysDepart> sysDeparts = sysDepartService.listDeptTop(codes);
+                    if (sysDeparts != null && sysDeparts.size() > 0) {
+                        sysDeparts.forEach(st -> {
+                            if (st.getOrgType().equals("1")) {
+                                str.setDeptName(st.getDepartName());
+                            } else if (st.getOrgType().equals("2")) {
+                                str.setDeptName2(st.getDepartName());
+                            } else if (st.getOrgType().equals("3")) {
+                                str.setDeptName3(st.getDepartName());
+                            }
+                        });
+                    }
                 }
             });
         }