格克

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

@@ -28,4 +28,11 @@ public interface MakeUpCardMapper extends BaseMapper<MakeUpCard> {
     List<String>getUseridByDeptids(@Param("deptids")List<String>deptids);
 
     List<Map<String,Object>>listDeptTop(@org.springframework.data.repository.query.Param("codes")List<String>codes);
+
+    /**
+     * 删除2022-5-30之前的数据
+     * @param date
+     * @return
+     */
+    boolean deleteByDate();
 }

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

@@ -11,6 +11,9 @@
             and date_format(commit_date,'%Y-%m-%d')<=date_format(#{endDate},'%Y-%m-%d')
         </if>
     </delete>
+    <delete id="deleteByDate">
+        delete  from geke_make_up_card a where date_format(a.time, '%Y-%m')&lt;=date_format('2022-05-31', '%Y-%m')
+    </delete>
     <select id="lists" resultType="org.jeecg.modules.geke.makeUpCard.entity.MakeUpCard">
         select a.id, a.code,a.commit_date as 'commitDate',a.state,a.demo,a.time,b.realname as 'userId',c.depart_name as'dept',c.org_type as 'order'
             ,c.org_code as 'deptCode'

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/makeUpCard/service/IMakeUpCardService.java

@@ -17,4 +17,10 @@ public interface IMakeUpCardService extends IService<MakeUpCard> {
     int deleteDate(String startDate,String endDate);
 
     Page<MakeUpCard> lists(Page<MakeUpCard> page,String code,String username,String dept,String date);
+    /**
+     * 删除2022-5-30之前的数据
+     * @param date
+     * @return
+     */
+    boolean deleteByDate();
 }

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/makeUpCard/service/impl/MakeUpCardServiceImpl.java

@@ -61,4 +61,9 @@ public class MakeUpCardServiceImpl extends ServiceImpl<MakeUpCardMapper, MakeUpC
         }
         return page.setRecords(lists);
     }
+
+    @Override
+    public boolean deleteByDate() {
+        return makeUpCardMapper.deleteByDate();
+    }
 }

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

@@ -22,4 +22,5 @@ public interface UserChageMapper extends BaseMapper<UserChage> {
 
     List<UserChage>lists(Page<UserChage> page,@Param("username")String username, @Param("type")String type, @Param("state")String state,@Param("startDate")String startDate,@Param("endDate")String endDate);
 
+    boolean updateId(@Param("id")String id,@Param("state")String state);
 }

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

@@ -9,6 +9,9 @@
         </foreach>
 
     </update>
+    <update id="updateId">
+        update geke_personnel_changes set state=#{state} where id=#{id}
+    </update>
 
     <select id="listDate" resultType="org.jeecg.modules.geke.userchange.entity.UserChage">
         select *from geke_personnel_changes where state='1'

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

@@ -19,5 +19,5 @@ public interface IUserChageService extends IService<UserChage> {
     List<UserChage>listUserId(String userid);
     boolean updateByUserids(List<String>userid);
     Page<UserChage>lists(Page<UserChage> page, String username, String type, String state, String startDate, String endDate);
-
+    boolean updateId(String id,String state);
 }

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

@@ -41,4 +41,9 @@ public class UserChageServiceImpl extends ServiceImpl<UserChageMapper, UserChage
     public Page<UserChage> lists(Page<UserChage> page, String username, String type, String state, String startDate, String endDate) {
         return page.setRecords(userChageMapper.lists(page,username,type,state,startDate,endDate));
     }
+
+    @Override
+    public boolean updateId(String id, String state) {
+        return userChageMapper.updateId(id,state);
+    }
 }

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/usercontract/entity/UserContract.java

@@ -46,9 +46,9 @@ public class UserContract {
 	/**用户id*/
 
     @ApiModelProperty(value = "用户id")
-	private java.lang.String userId;
+	private  java.lang.String userId;
     //状态（0正常，1已过期，2临近到期，3.即将到期）
-	private java.lang.String state;
+	private transient java.lang.String state;
 
 	@ApiModelProperty(value = "部门id")
 	private java.lang.String deptId;

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/usercontract/mapper/xml/UserContractMapper.xml

@@ -83,8 +83,8 @@
             <if test="endDate!=null and ''!=endDate">
                 and date_format(a.end_date,'%Y-%m-%d')&lt;=date_format(#{endDate},'%Y-%m-%d')
             </if>
-            <if test="dateTime!=null and ''!=dateTime">
-                and date_format(a.end_date,'%Y-%m-%d')>date_format(#{dateTime},'%Y-%m-%d')
+            <if test="oneMonth!=null and ''!=oneMonth">
+                and date_format(a.end_date,'%Y-%m-%d')>date_format(#{oneMonth},'%Y-%m-%d')
             </if>
             <if test="twoMonth!=null and ''!=twoMonth">
                 and date_format(a.end_date,'%Y-%m-%d')&lt;=date_format(#{twoMonth},'%Y-%m-%d')
@@ -191,8 +191,8 @@
             <if test="endDate!=null and ''!=endDate">
                 and date_format(a.end_date,'%Y-%m-%d')&lt;=date_format(#{endDate},'%Y-%m-%d')
             </if>
-            <if test="dateTime!=null and ''!=dateTime">
-                and date_format(a.end_date,'%Y-%m-%d')>date_format(#{dateTime},'%Y-%m-%d')
+            <if test="oneMonth!=null and ''!=oneMonth">
+                and date_format(a.end_date,'%Y-%m-%d')>date_format(#{oneMonth},'%Y-%m-%d')
             </if>
             <if test="twoMonth!=null and ''!=twoMonth">
                 and date_format(a.end_date,'%Y-%m-%d')&lt;=date_format(#{twoMonth},'%Y-%m-%d')

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

@@ -30,4 +30,6 @@ public interface UserQuitMapper extends BaseMapper<UserQuit> {
     boolean updateByUserid(@Param("userid")List<String>userid);
     //离职率
     String getUserQuitCount(@Param("startDate") String startDate,@Param("endDate") String endDate);
+
+    boolean updateId(@Param("id")String id,@Param("state")String state);
 }

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

@@ -14,6 +14,9 @@
             #{id}
         </foreach>
     </update>
+    <update id="updateId">
+        update geke_user_quit set state=#{state}  where id=#{id}
+    </update>
 
     <delete id="deleteDate">
         delete from geke_user_quit where 1=1

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

@@ -25,4 +25,6 @@ public interface IUserQuitService extends IService<UserQuit> {
     List<UserQuit>lists2(String startDate);
 
     String getUserQuitCount(String startDate,String endDate);
+
+    boolean updateId(String id,String state);
 }

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

@@ -110,4 +110,9 @@ public class UserQuitServiceImpl extends ServiceImpl<UserQuitMapper, UserQuit> i
     public String getUserQuitCount(String startDate, String endDate) {
         return userQuitMapper.getUserQuitCount(startDate,endDate);
     }
+
+    @Override
+    public boolean updateId(String id, String state) {
+        return userQuitMapper.updateId(id,state);
+    }
 }

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/vacation/controller/VacationController.java

@@ -197,10 +197,10 @@ public class VacationController extends JeecgController<Vacation, IVacationServi
 	  IPage<Vacation> lists = vacationService.lists(page, vacation);
 	  LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 	  ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-	  mv.addObject(NormalExcelConstants.FILE_NAME, "请假息列表"); //此处设置的filename无效 ,前端会重更新设置一下
+	  mv.addObject(NormalExcelConstants.FILE_NAME, "请假信息列表"); //此处设置的filename无效 ,前端会重更新设置一下
 	  mv.addObject(NormalExcelConstants.CLASS, Vacation.class);
 	  //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
-	  ExportParams  exportParams=new ExportParams("请假息列表", "导出人:" + sysUser.getRealname(), "请假息列表");
+	  ExportParams  exportParams=new ExportParams("请假信息列表", "导出人:" + sysUser.getRealname(), "请假信息列表");
 	  exportParams.setImageBasePath(upLoadPath);
 	  //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
 	  mv.addObject(NormalExcelConstants.PARAMS,exportParams);

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

@@ -48,4 +48,11 @@ public interface VacationMapper extends BaseMapper<Vacation> {
 
     List<Vacation>lists(Page<Vacation> page, @Param("vacation")Vacation vacation, @Param("depts") List<String> depts, @Param("types")List<String>types,
                         @Param("startDate")String startDate,@Param("endDate")String endDate);
+
+    /**
+     * 删除2022-5-30之前的数据
+     * @param date
+     * @return
+     */
+    boolean deleteByDate();
 }

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

@@ -10,6 +10,9 @@
     <update id="updateVacationHead">
         update geke_vacation_header set user_id=#{userid},year_day=#{yearDate},available_day=#{avDate},name=#{name},weixin_id=#{weixinId}   where id=#{id}
     </update>
+    <delete id="deleteByDate">
+        delete from geke_vacation_body  where date_format(end_date, '%Y-%m')&lt;=date_format('2022-05-31', '%Y-%m')
+    </delete>
 
 
     <select id="queryList" resultType="org.jeecg.modules.geke.vacation.entity.Vacation">

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/vacation/service/IVacationService.java

@@ -25,5 +25,11 @@ public interface IVacationService extends IService<Vacation> {
             String yearDate,String avDate,String weixinId);
 
     IPage<Vacation> lists(Page<Vacation> page, Vacation vacation);
+    /**
+     * 删除2022-5-30之前的数据
+     * @param date
+     * @return
+     */
+    boolean deleteByDate();
 
 }

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/vacation/service/impl/VacationServiceImpl.java

@@ -101,6 +101,11 @@ public class VacationServiceImpl extends ServiceImpl<VacationMapper, Vacation> i
         return page.setRecords(lists);
     }
 
+    @Override
+    public boolean deleteByDate() {
+        return vacationMapper.deleteByDate();
+    }
+
 
     public String days(Date date){
         if (date.getHours() >= 0 && date.getHours() < 12) {

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

@@ -1048,6 +1048,130 @@ public class SysUserController {
 
 
 
+    /**
+     * 导出excel 员工年假调休
+     *
+     * @param
+     * @param
+     */
+    @RequestMapping(value = "/exportXlsts")
+    public ModelAndView exportXlsts(SysUser sysUser,HttpServletRequest request,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+        // Step.1 组装查询条件
+        QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(sysUser, request.getParameterMap());
+        List<OrderItem>orderItems=new ArrayList<>();
+        if (queryWrapper.getExpression().getOrderBy()!=null&&queryWrapper.getExpression().getOrderBy().size()>0){
+            String[] s = queryWrapper.getExpression().getOrderBy().get(0).getSqlSegment().split(" ");
+            OrderItem orderItem=new OrderItem();
+            orderItem.setColumn(s[0]);
+            orderItem.setAsc(true);
+            if (s[1].equals("DESC")){
+                orderItem.setAsc(false);
+            }if (s[0].equals("create_time")){
+                orderItem.setColumn("work_no");
+            }
+            orderItems.add(orderItem);
+        }
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        Page<SysUser> page = new Page<SysUser>(1, 10000);
+        page.setOrders(orderItems);
+        //update-begin--Author:kangxiaolin  Date:20180825 for：[03]用户导出，如果选择数据则只导出相关数据--------------------
+        String selections = request.getParameter("selections");
+        if(!oConvertUtils.isEmpty(selections)){
+            queryWrapper.in("id",selections.split(","));
+        }
+        String rzStartDate="";
+        String rzEndDate="";
+        String syStartDate="";
+        String syEndDate="";
+        if (oConvertUtils.isNotEmpty(sysUser.getRzDate())){
+            String[] split = sysUser.getRzDate().split(",");
+            rzStartDate=split[0];
+            rzEndDate=split[1];
+        }if (oConvertUtils.isNotEmpty(sysUser.getSyDate())){
+            String[] split = sysUser.getSyDate().split(",");
+            syStartDate=split[0];
+            syEndDate=split[1];
+        }
+        List<String> mySubDepIdsByDepId=null;
+        LoginUser sysUsers = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        List<SysUserRole> userRole = sysUserRoleService.list(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, sysUsers.getId()));
+        if (userRole!=null&&userRole.size()>0){
+            for (SysUserRole role:userRole){
+                if (role.getRoleId().equals("1462659329857978370")){
+                    SysDepart one = sysDepartService.getOne(new QueryWrapper<SysDepart>().lambda().eq(SysDepart::getOrgCode, sysUsers.getOrgCode()));
+                    if (one!=null&&!one.getOrgType().equals("0")){
+                        mySubDepIdsByDepId = sysDepartService.getMySubDepIdsByDepId(one.getId());
+                    }
+                }
+            }
+        }
+        //update-end--Author:kangxiaolin  Date:20180825 for：[03]用户导出，如果选择数据则只导出相关数据----------------------
+        List<String> subDepIdsByDepId=null;
+        List<String> status=null;
+        List<String> category=null;
+        if (sysUser.getOrgCodeTxt()!=null){
+            subDepIdsByDepId= sysDepartService.getSubDepIdsByDepId(sysUser.getOrgCodeTxt());
+        }if (sysUser.getEmpStatus()!=null&&!"".equals(sysUser.getEmpStatus())){
+            status=Arrays.asList(sysUser.getEmpStatus().split(","));
+        }if (sysUser.getCategorys()!=null&&!"".equals(sysUser.getCategorys())){
+            category=Arrays.asList(sysUser.getCategorys().toString().split(","));
+        }
+        List<SysUser> pageList = sysUserMapper.kQueryUser(page, sysUser,subDepIdsByDepId,mySubDepIdsByDepId,status,category,rzStartDate,rzEndDate,syStartDate,syEndDate);
+        List<UserVacation>us=new ArrayList<>();
+        List<String>userids=new ArrayList<>();
+        if (pageList.size()>0){
+            for (SysUser ls:pageList){
+                userids.add(ls.getId());
+            }
+            if(userids.size()>0){
+                pageList.forEach(item->{
+                    UserVacation uv=new UserVacation();
+                    uv.setWorkNo(item.getWorkNo());
+                    uv.setRealname(item.getRealname());
+                    List<SysUserDepVo> depNamesByUserIds = sysUserMapper.getDepNamesByUserIds(Arrays.asList(item.getId().split(",")));
+                   if (depNamesByUserIds!=null&&depNamesByUserIds.size()>0&&!depNamesByUserIds.get(0).getOrgType().equals("0")){
+                        String code=depNamesByUserIds.get(0).getOrgCode();
+                        List<String>codes=new ArrayList<>();
+                        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){
+                            sysDeparts.forEach(str->{
+                                if (str.getOrgType().equals("1")){
+                                    uv.setDeptName(str.getDepartName());
+                                }else if (str.getOrgType().equals("2")){
+                                    uv.setDeptName2(str.getDepartName());
+                                }
+                            });
+                        }
+                    }
+                    Map<String, Object> map = weixinUserService.U8Vacation(item.getId());
+                   if (map!=null&&map.size()>0){
+                       uv.setSyYear(map.get("syYearCount").toString());
+                       uv.setSyTx(map.get("txCount").toString());
+                   }
+                   us.add(uv);
+                });
+            }
+
+        }
+
+
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "员工假期列表");
+        mv.addObject(NormalExcelConstants.CLASS, UserVacation.class);
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String sName="员工假期列表";
+        ExportParams exportParams = new ExportParams("员工假期列表", "导出人:"+user.getRealname(), sName);
+        exportParams.setImageBasePath(upLoadPath);
+        mv.addObject(NormalExcelConstants.PARAMS, exportParams);
+        mv.addObject(NormalExcelConstants.DATA_LIST, us);
+        return mv;
+    }
+
 
     /**
      * 导出excel
@@ -2801,7 +2925,8 @@ public class SysUserController {
     @ApiOperation(value="人事变动-编辑", notes="人事变动-编辑")
     @PutMapping(value = "/userChageEdit")
     public Result<?> userChageEdit(@RequestBody UserChage userChage) throws IOException, ParseException {
-        userChageService.updateById(userChage);
+       // userChageService.updateById(userChage);
+        userChageService.updateId(userChage.getId(),userChage.getState().toString());
         weixinUserService.editUserChange();
         return Result.OK("编辑成功!");
     }
@@ -2818,7 +2943,7 @@ public class SysUserController {
     @ApiOperation(value="入职，离职信息-编辑", notes="入职，离职信息-编辑")
     @PutMapping(value = "/userQuitEdit")
     public Result<?> userQuitEdit(@RequestBody UserQuit userQuit) throws IOException, ParseException {
-        boolean b = userQuitService.updateById(userQuit);
+        boolean b = userQuitService.updateId(userQuit.getId(),userQuit.getState().toString());
         weixinUserService.UserQuits();
         return Result.OK("编辑成功!");
     }

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

@@ -35,4 +35,11 @@ public interface workOvertimeMapper extends BaseMapper<workOvertime> {
      * @return
      */
     int delAttendanceByUser(@Param("userId")String userId,@Param("viewDate")String viewDate);
+
+    /**
+     * 删除2022-5-30之前的数据
+     * @param date
+     * @return
+     */
+    boolean deleteByDate();
 }

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

@@ -1,6 +1,9 @@
 <?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.workOvertime.mapper.workOvertimeMapper">
+    <delete id="deleteByDate">
+        delete from bd_work_overtime where date_format(end_date,'%Y-%m')&lt;=date_format('2022-05-31', '%Y-%m') and demo!='系统调休初始化'
+    </delete>
 
     <select id="getOne" resultType="java.lang.String">
         select id from bd_work_overtime where 1=1

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

@@ -21,4 +21,11 @@ public interface IworkOvertimeService extends IService<workOvertime> {
     IPage<workOvertime> getWork(Page<workOvertime> page, String name, String code,String startDate,String endDate,List<String>depts,List<String>types);
 
     public List<workOvertime> getJiaBan(String person, String viewDate);
+
+    /**
+     * 删除2022-5-30之前的数据
+     * @param date
+     * @return
+     */
+    boolean deleteByDate();
 }

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

@@ -35,6 +35,11 @@ public class workOvertimeServiceImpl extends ServiceImpl<workOvertimeMapper, wor
         return works.getJiaBan(person,viewDate);
     }
 
+    @Override
+    public boolean deleteByDate() {
+        return works.deleteByDate();
+    }
+
     @Override
     public Boolean workSave(workOvertime work) {
 //        Boolean b=true;