格克

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/shift/controller/ShiftController.java

@@ -73,6 +73,9 @@ public class ShiftController extends JeecgController<Shift, IShiftService> {
 								   HttpServletRequest req) {
 		QueryWrapper<Shift> queryWrapper = QueryGenerator.initQueryWrapper(shift, req.getParameterMap());
 		Page<Shift> page = new Page<Shift>(pageNo, pageSize);
+		if(oConvertUtils.isNotEmpty(shift.getName())){
+			shift.setName(shift.getName().trim());
+		}
 		Page<Shift> lists = shiftService.lists(page, shift);
 		return Result.OK(lists);
 	}

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/statutoryleave/service/impl/StatutoryLeaveServiceImpl.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.geke.statutoryleave.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.geke.statutoryleave.entity.StatutoryLeave;
 import org.jeecg.modules.geke.statutoryleave.mapper.StatutoryLeaveMapper;
 import org.jeecg.modules.geke.statutoryleave.service.IStatutoryLeaveService;
@@ -30,6 +31,11 @@ public class StatutoryLeaveServiceImpl extends ServiceImpl<StatutoryLeaveMapper,
 
     @Override
     public Page<StatutoryLeave> lists(Page<StatutoryLeave> page, StatutoryLeave st) {
+        if(oConvertUtils.isNotEmpty(st.getName())){
+            st.setName(st.getName().trim());
+        }if(oConvertUtils.isNotEmpty(st.getSum())){
+            st.setSum(st.getSum().trim());
+        }
         List<StatutoryLeave> lists = statutoryLeaveMapper.lists(page, st);
         if (lists!=null&&lists.size()>0){
             lists.forEach(str->{

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userPrize/service/impl/UserPrizeServiceImpl.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.geke.userPrize.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.util.DateUtils;
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.geke.makeUpCard.entity.MakeUpCard;
 import org.jeecg.modules.geke.makeUpCard.mapper.MakeUpCardMapper;
 import org.jeecg.modules.geke.userPrize.entity.UserPrize;
@@ -39,6 +40,8 @@ public class UserPrizeServiceImpl extends ServiceImpl<UserPrizeMapper, UserPrize
         }
         if (userPrize.getDeptId()!=null){
             subDepIdsByDepId= makeUpCardMapper.getSubDepIdsByDepId(userPrize.getDeptId());
+        }if(oConvertUtils.isNotEmpty(userPrize.getRealname())){
+            userPrize.setRealname(userPrize.getRealname().trim());
         }
         List<UserPrize> lists = userPrizeMapper.lists(page, userPrize, date,subDepIdsByDepId);
         lists.forEach(str->{

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userchange/controller/UserChageController.java

@@ -70,6 +70,9 @@ public class UserChageController extends JeecgController<UserChage, IUserChageSe
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
+		if(oConvertUtils.isNotEmpty(userChage.getRealname())){
+			userChage.setRealname(userChage.getRealname().trim());
+		}
 		QueryWrapper<UserChage> queryWrapper = QueryGenerator.initQueryWrapper(userChage, req.getParameterMap());
 		Page<UserChage> page = new Page<UserChage>(pageNo, pageSize);
 		IPage<UserChage> pageList = userChageService.page(page, queryWrapper);

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/usercontract/service/impl/UserContractServiceImpl.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.geke.usercontract.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.geke.makeUpCard.mapper.MakeUpCardMapper;
 import org.jeecg.modules.geke.makeUpCard.service.IMakeUpCardService;
 import org.jeecg.modules.geke.userPrize.entity.UserPrize;
@@ -36,17 +37,23 @@ public class UserContractServiceImpl extends ServiceImpl<UserContractMapper, Use
         List<String> subDepIdsByDepId=null;
         if (userContract.getDeptId()!=null){
             subDepIdsByDepId= makeUpCardMapper.getSubDepIdsByDepId(userContract.getDeptId());
+        }if(oConvertUtils.isNotEmpty(userContract.getRealname())){
+            userContract.setRealname(userContract.getRealname().trim());
         }
         List<UserContract> lists = userContractMapper.lists(page, userContract, subDepIdsByDepId);
         lists.forEach(str->{
             List<Map<String, Object>> userid = userPrizeMapper.queryDept(str.getUserId());
-            if (userid!=null){
+            if (userid!=null&&userid.size()>0){
                 String code=userid.get(0).get("code").toString();
                 str.setDeptNames(userid.get(0).get("name").toString());
                 str.setDeptId(userid.get(0).get("id").toString());
                 List<String> codes = new ArrayList<>();
-                for (int i = 0; i < code.length(); i = i + 2) {
-                    codes.add(code.substring(0, i + 2));
+                if (code.length()>1) {
+                    for (int i = 0; i < code.length(); i = i + 2) {
+                        codes.add(code.substring(0, i + 2));
+                    }
+                }else {
+                    codes.add(code);
                 }
                 List<Map<String,Object>> sysDeparts = makeUpCardMapper.listDeptTop(codes);
                 if (sysDeparts!=null&&sysDeparts.size()>0){

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userquit/controller/UserQuitController.java

@@ -83,6 +83,9 @@ public class UserQuitController extends JeecgController<UserQuit, IUserQuitServi
 		QueryWrapper<UserQuit> queryWrapper = QueryGenerator.initQueryWrapper(userQuit, req.getParameterMap());
 		Page<UserQuit> page = new Page<UserQuit>(pageNo, pageSize);
 		//IPage<UserQuit> pageList = userQuitService.page(page, queryWrapper);
+		if(oConvertUtils.isNotEmpty(userQuit.getUserName())){
+			userQuit.setUserName(userQuit.getUserName().trim());
+		}
 		Page<UserQuit> list = userQuitService.list(page, userQuit);
 		return Result.OK(list);
 	}

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/vacation/mapper/VacationMapper.java

@@ -21,6 +21,9 @@ public interface VacationMapper extends BaseMapper<Vacation> {
     public Vacation queryList(@Param("userid") String userid,@Param("wxId")String wxId);
     //年假
     public List<Vacation>queryListBody(@Param("userid") String userid,@Param("date")String date);
+    //获取失效月份
+    public String getMoth();
+
 
     //调休时间
     public Map<String,Object> txCount(@Param("userid") String userid,@Param("date")String date);

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/vacation/mapper/xml/VacationMapper.xml

@@ -110,4 +110,7 @@
             and a.id=#{userid}
         </if>
     </select>
+    <select id="getMoth" resultType="java.lang.String">
+        select item_value from sys_dict_item where id='1506432937646657538'
+    </select>
 </mapper>

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

@@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface BdAnnualLeaveMapper extends BaseMapper<BdAnnualLeave> {
 
+    List<BdAnnualLeave>getYear(@Param("date") String date);
 }

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

@@ -2,4 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.schedulingInformation.mapper.BdAnnualLeaveMapper">
 
+    <select id="getYear" resultType="org.jeecg.modules.schedulingInformation.entity.BdAnnualLeave">
+        select *from bd_annual_leave where 1=1
+        <if test="date!=null and ''!=date">
+            and date_format(#{date},'%Y-%m-%d')  between date_format(begin_date,'%Y-%m-%d') and date_format(end_date,'%Y-%m-%d')
+        </if>
+    </select>
 </mapper>

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

@@ -97,6 +97,11 @@ public class SysPositionController {
                                                     HttpServletRequest req) {
         Result<IPage<SysPosition>> result = new Result<IPage<SysPosition>>();
         Page<SysPosition> page = new Page<SysPosition>(pageNo, pageSize);
+        if(oConvertUtils.isNotEmpty(sysPosition.getCode())){
+            sysPosition.setCode(sysPosition.getCode().trim());
+        }if(oConvertUtils.isNotEmpty(sysPosition.getName())){
+            sysPosition.setName(sysPosition.getName().trim());
+        }
         IPage<SysPosition> pageList = sysPositionService.lists(page,sysPosition);
         result.setSuccess(true);
         result.setResult(pageList);

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

@@ -333,6 +333,10 @@ public class SysUserController {
             status=Arrays.asList(user.getEmpStatus().split(","));
         }if (user.getCategory()!=null&&!"".equals(user.getCategory())){
             category=Arrays.asList(user.getCategory().toString().split(","));
+        }if(oConvertUtils.isNotEmpty(user.getRealname())){
+            user.setRealname(user.getRealname().trim());
+        }if(oConvertUtils.isNotEmpty(user.getWorkNo())){
+            user.setWorkNo(user.getWorkNo().trim());
         }
         Page<SysUser> pageList = sysUserService.kQueryUser(page, user,subDepIdsByDepId,mySubDepIdsByDepId,status,category);
         //批量查询用户的所属部门
@@ -774,11 +778,14 @@ public class SysUserController {
      * @return
      */
     @RequestMapping(value = "/queryUserByDepId", method = RequestMethod.GET)
-    public Result<List<SysUser>> queryUserByDepId(@RequestParam(name = "id", required = true) String id,@RequestParam(name="realname",required=false) String realname) {
+    public Result<List<SysUser>> queryUserByDepId(@RequestParam(name = "id", required = true) String id,@RequestParam(name="workNo",required=false) String workNo,@RequestParam(name="realname",required=false) String realname) {
         Result<List<SysUser>> result = new Result<>();
         //List<SysUser> userList = sysUserDepartService.queryUserByDepId(id);
+        /*if (id!=null&&id.equals("1")){
+            id=null;
+        }*/
         SysDepart sysDepart = sysDepartService.getById(id);
-        List<SysUser> userList = sysUserDepartService.queryUserByDepCode(sysDepart.getOrgCode(),realname);
+        List<SysUser> userList = sysUserDepartService.queryUserByDepCode(sysDepart.getOrgCode(),workNo,realname);
 
         //批量查询用户的所属部门
         //step.1 先拿到全部的 useids
@@ -2115,6 +2122,9 @@ public class SysUserController {
             }
         }
         Date shiftDate = userShift.getShiftDate();
+        if(oConvertUtils.isNotEmpty(name)){
+            name=name.trim();
+        }
         String date="";
         if (shiftDate!=null){
             date=DateUtils.formatDate(userShift.getShiftDate());
@@ -2162,6 +2172,8 @@ public class SysUserController {
         Date shiftDate = userShift.getShiftDate();
         if (shiftDate==null){
             shiftDate=new Date();
+        } if(oConvertUtils.isNotEmpty(realname)){
+            realname=realname.trim();
         }
        String s= DateUtils.formatDate(userShift.getShiftDate(),"yyyy-MM-dd HH:mm:ss");
         IPage<Map<String, Object>> mapIPage = userShiftService.mothUserByCount(page, s, mySubDepIdsByDepId,realname,deptid);
@@ -2212,7 +2224,7 @@ public class SysUserController {
 
     @GetMapping(value = "/queryUsersByusername")
     public Result<?> queryUsersByusername(SysUser user) {
-        List<Map<String, Object> >deptByUserName = sysUserService.getDeptByUserName(user.getRealname());
+        List<Map<String, Object> >deptByUserName = sysUserService.getDeptByUserName(user.getId());
         return Result.OK(deptByUserName);
     }
 

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

@@ -267,7 +267,7 @@ public class SysUser implements Serializable {
     /**
      * 人员类别 101正式工 102 合同工 103 实习生 104 劳务工
      */
-    @Excel(name = "人员类别", width = 15,dicCode="category")
+    @Excel(name = "*人员类别", width = 15,dicCode="category")
     @Dict(dicCode = "category")
     private Integer category;
 

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

@@ -38,6 +38,7 @@ public interface SysDepartMapper extends BaseMapper<SysDepart> {
 	@Select("select id,parent_id from sys_depart where id=#{departId}")
 	public SysDepart getParentDepartId(@Param("departId") String departId);
 
+
 	/**
 	 *  根据部门Id查询,当前和下级所有部门IDS
 	 * @param departId

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

@@ -222,8 +222,8 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
 	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,@Param("category")List<String>category);
 
-	//根据员工姓名查询部门
-	List<Map<String,Object>>getDeptByUserName(@Param("username")String username);
+	//根据员工id查询部门
+	List<Map<String,Object>>getDeptByUserName(@Param("userid")String userid);
 
 	boolean updateByState(@Param("userids")List<String>userids);
 

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

@@ -60,4 +60,5 @@
         order by org_type asc
     </select>
 
+
 </mapper>

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

@@ -483,8 +483,8 @@ on a.depart_name=b.orgCodeTxt
 		left join sys_user_depart b on a.id=b.user_id
 		left join sys_depart c on b.dep_id=c.id
 		where a.del_flag='0'
-		<if test="username!=null and ''!=username">
-			and a.realname=#{username}
+		<if test="userid!=null and ''!=userid">
+			and a.id=#{userid}
 		</if>
 	</select>
     <select id="RoleUser" resultType="org.jeecg.modules.system.entity.SysUser">

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

@@ -38,7 +38,7 @@ public interface ISysUserDepartService extends IService<SysUserDepart> {
   	/**
 	 * 根据部门code，查询当前部门和下级部门的用户信息
 	 */
-	public List<SysUser> queryUserByDepCode(String depCode,String realname);
+	public List<SysUser> queryUserByDepCode(String depCode,String workNo,String realname);
 
 	Boolean saveUserDepart(SysUserDepart sysUserDepart);
 

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

@@ -57,8 +57,10 @@ public class SysPositionServiceImpl extends ServiceImpl<SysPositionMapper, SysPo
                 String code=str.getOrgCode();
                 if (code!=null) {
                     List<String> codes = new ArrayList<>();
-                    for (int i = 0; i < code.length(); i = i + 2) {
-                        codes.add(code.substring(0, i + 2));
+                    if (code.length()>1) {
+                        for (int i = 0; i < code.length(); i = i + 2) {
+                            codes.add(code.substring(0, i + 2));
+                        }
                     }
                     List<SysDepart> sysDeparts = sysDepartService.listDeptTop(codes);
                     if (sysDeparts != null && sysDeparts.size() > 0) {

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

@@ -100,12 +100,16 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
 	 * 根据部门code，查询当前部门和下级部门的 用户信息
 	 */
 	@Override
-	public List<SysUser> queryUserByDepCode(String depCode,String realname) {
+	public List<SysUser> queryUserByDepCode(String depCode,String workNo,String realname) {
 		LambdaQueryWrapper<SysDepart> queryByDepCode = new LambdaQueryWrapper<SysDepart>();
 		queryByDepCode.likeRight(SysDepart::getOrgCode,depCode);
-		List<SysDepart> sysDepartList = sysDepartService.list(queryByDepCode);
+		List<SysDepart> sysDepartList=new ArrayList<>();
+		if (depCode!=null&&depCode.equals("0")){
+			sysDepartList = sysDepartService.list();
+		}else {
+			sysDepartList = sysDepartService.list(queryByDepCode);
+		}
 		List<String> depIds = sysDepartList.stream().map(SysDepart::getId).collect(Collectors.toList());
-
 		LambdaQueryWrapper<SysUserDepart> queryUDep = new LambdaQueryWrapper<SysUserDepart>();
 		queryUDep.in(SysUserDepart::getDepId, depIds);
 		List<String> userIdList = new ArrayList<>();
@@ -116,7 +120,9 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
 			}
 			LambdaQueryWrapper<SysUser> queryUser = new LambdaQueryWrapper<SysUser>();
 			queryUser.in(SysUser::getId,userIdList);
-			if(oConvertUtils.isNotEmpty(realname)){
+			if(oConvertUtils.isNotEmpty(workNo)){
+				queryUser.like(SysUser::getWorkNo,workNo.trim());
+			}if(oConvertUtils.isNotEmpty(realname)){
 				queryUser.like(SysUser::getRealname,realname.trim());
 			}
 			List<SysUser> userList = (List<SysUser>) sysUserService.list(queryUser);

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

@@ -34,6 +34,8 @@ import org.jeecg.modules.openapi4j.service.DepartmentService;
 import org.jeecg.modules.openapi4j.service.PersonService;
 import org.jeecg.modules.openapi4j.service.SalaryService;
 import org.jeecg.modules.openapi4j.util.PropUtil;
+import org.jeecg.modules.schedulingInformation.entity.BdAnnualLeave;
+import org.jeecg.modules.schedulingInformation.mapper.BdAnnualLeaveMapper;
 import org.jeecg.modules.system.entity.*;
 import org.jeecg.modules.system.mapper.SysPositionMapper;
 import org.jeecg.modules.system.service.*;
@@ -101,6 +103,9 @@ public class WeixinUserImpl implements IWeixinUserService{
     @Autowired
     private RedisUtil redisUtil;
 
+    @Autowired
+    private BdAnnualLeaveMapper bdAnnualLeaveMapper;
+
     @Autowired
     private IMakeUpCardService makeUpCardService;
 
@@ -656,33 +661,51 @@ public class WeixinUserImpl implements IWeixinUserService{
     }
 
 
+    public  int getYear(Date start,Date end,SysUser user){
+        int yearCount=0;
+        double seconds = Math.floor((end.getTime() - start.getTime()) / 1000);
+        double minutes = Math.floor(seconds / 60);
+        double hours = Math.floor(minutes / 60);
+        double days = Math.floor(hours / 24);
+        double months = Math.floor(days / 30);
+        double diffValue = 0;
+        double workMoth=0;
+        double year=0;
+        if (months > 0) {
+            diffValue = months;
+        }if (user.getWorkMoth()!=null&&!user.getWorkMoth().equals("")){
+            workMoth=Double.parseDouble(user.getWorkMoth());
+        }
+        year=diffValue+workMoth;
+        if (year>=12&&year<24){
+            yearCount=5;
+        }else if (year>=120&&year<240){
+            yearCount=10;
+        }else if (year>=240){
+            yearCount=15;
+        }
+
+        return yearCount;
+    }
+
     @Override
     public Map<String, Object> U8Vacation(String id) {
         Map<String,Object> map=new HashMap<>();
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy");//日期格式化
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");//日期格式化
         SysUser userByid = sysUserService.getUserByid(id);
-        Date entryDate = null;
-        if (userByid!=null){
-            entryDate=userByid.getEntryDate();
-        }
-        Date newDate=new Date();
-        int year=0;
-        if (entryDate!=null){
-            year= newDate.getYear()-entryDate.getYear();
+        List<Vacation> vacationsBody=new ArrayList<>();
+        Date newDate = new Date();
+        int yearCount=0;
+        List<BdAnnualLeave> years = bdAnnualLeaveMapper.getYear(simpleDateFormat.format(newDate));
+        if (years!=null&&years.size()>0&&userByid.getEntryDate()!=null){
+            for (BdAnnualLeave ls:years){
+                yearCount+= getYear(userByid.getEntryDate(), ls.getBeginDate(), userByid);
+                vacationsBody.addAll(vacationMapper.queryListBody(id,ls.getYearName()));
+            }
         }
-
-        String yearCount="0";
+        int moths=3;
         String syYearCount="0";
         String txCount="0";
-        if ((year==1&&newDate.getMonth()>=entryDate.getMonth()&&newDate.getDate()>=entryDate.getDate())||(year>1&&year<10)){
-            yearCount="5";
-        }else if ((year==10&&newDate.getMonth()>=entryDate.getMonth()&&newDate.getDate()>=entryDate.getDate())||(year>10&&year<20)){
-            yearCount="10";
-        }else if ((year==20&&newDate.getMonth()>=entryDate.getMonth()&&newDate.getDate()>=entryDate.getDate())||year>20){
-            yearCount="15";
-        }
-
-        List<Vacation> vacationsBody= vacationMapper.queryListBody(id,simpleDateFormat.format(newDate) );
         if (vacationsBody!=null&&vacationsBody.size()>0){
             for (Vacation vs:vacationsBody){
                 syYearCount=new BigDecimal(syYearCount).add(new BigDecimal(vs.getHolidayCount())).toString();
@@ -690,13 +713,16 @@ public class WeixinUserImpl implements IWeixinUserService{
             syYearCount=new BigDecimal(syYearCount).divide(new BigDecimal("24"),1,BigDecimal.ROUND_DOWN).toString();
             syYearCount=new BigDecimal(yearCount).subtract(new BigDecimal(syYearCount)).toString();
         } else {
-            syYearCount=yearCount;
+            syYearCount=String.valueOf(yearCount);
+        }
+        String moth = vacationMapper.getMoth();
+        if (moth!=null&&!"".equals(moth)){
+            moths=Integer.parseInt(moth);
         }
-
         Date dBefore = new Date();
         Calendar calendar = Calendar.getInstance(); //得到日历
         calendar.setTime(newDate);//把当前时间赋给日历
-        calendar.add(calendar.MONTH, -3); //设置为前3月
+        calendar.add(calendar.MONTH, -moths); //设置为前几个月
         dBefore = calendar.getTime(); //得到前3月的时间
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); //设置时间格式
         String defaultStartDate = sdf.format(dBefore); //格式化前3月的时间
@@ -812,6 +838,7 @@ public class WeixinUserImpl implements IWeixinUserService{
                 SysUser user =new SysUser();
                 user.setId(str.getUserId());
                 user.setEmploymentStatus(30);
+                user.setTermDate(str.getNewDate());
                 sysUserService.updateById(user);
                 userids.add(str.getUserId());
             });

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

@@ -96,6 +96,8 @@ public class workOvertimeController extends JeecgController<workOvertime, IworkO
 		 	startDate=DateUtils.formatDate(workOvertime.getBeginDate());
 		 } if (workOvertime.getEndDate()!=null){
 		 	endDate=DateUtils.formatDate(workOvertime.getEndDate());
+		 }if(oConvertUtils.isNotEmpty(workOvertime.getPerson())){
+			 workOvertime.setPerson(workOvertime.getPerson().trim());
 		 }