格克

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

@@ -24,6 +24,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.geke.userShift.entity.UserShift;
+import org.jeecg.modules.geke.userShift.service.IUserShiftService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -53,6 +55,9 @@ import io.swagger.annotations.ApiOperation;
 public class ShiftController extends JeecgController<Shift, IShiftService> {
 	@Autowired
 	private IShiftService shiftService;
+	@Autowired
+	private IUserShiftService userShiftService;
+
 	 @Value("${jeecg.path.upload}")
 	 private String upLoadPath;
 	/**
@@ -127,8 +132,13 @@ public class ShiftController extends JeecgController<Shift, IShiftService> {
 	@ApiOperation(value="班次档案-通过id删除", notes="班次档案-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		shiftService.removeById(id);
-		return Result.OK("删除成功!");
+		List<UserShift> userShifts = userShiftService.listByShiftId(id);
+		if (userShifts!=null&&userShifts.size()>0){
+			return Result.error("删除失败,该班次已使用!");
+		}else {
+			shiftService.removeById(id);
+			return Result.OK("删除成功!");
+		}
 	}
 	
 	/**

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/statutoryleave/controller/StatutoryLeaveController.java

@@ -1,8 +1,6 @@
 package org.jeecg.modules.geke.statutoryleave.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -18,7 +16,6 @@ import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.geke.makeUpCard.entity.MakeUpCard;
 import org.jeecg.modules.geke.statutoryleave.entity.StatutoryLeave;
 import org.jeecg.modules.geke.statutoryleave.service.IStatutoryLeaveService;
-import java.util.Date;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -116,7 +113,11 @@ public class StatutoryLeaveController extends JeecgController<StatutoryLeave, IS
 	@ApiOperation(value="法定假期-通过id删除", notes="法定假期-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		statutoryLeaveService.removeById(id);
+		//statutoryLeaveService.removeById(id);
+		StatutoryLeave leave=new StatutoryLeave();
+		leave.setId(id);
+		leave.setDelFlag("1");
+		statutoryLeaveService.updateById(leave);
 		return Result.OK("删除成功!");
 	}
 	
@@ -130,7 +131,16 @@ public class StatutoryLeaveController extends JeecgController<StatutoryLeave, IS
 	@ApiOperation(value="法定假期-批量删除", notes="法定假期-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.statutoryLeaveService.removeByIds(Arrays.asList(ids.split(",")));
+		//this.statutoryLeaveService.removeByIds(Arrays.asList(ids.split(",")));
+		List<String> list = Arrays.asList(ids.split(","));
+		List<StatutoryLeave>leaves=new ArrayList<>();
+		for (String id:list){
+			StatutoryLeave leave=new StatutoryLeave();
+			leave.setId(id);
+			leave.setDelFlag("1");
+			leaves.add(leave);
+		}
+		statutoryLeaveService.updateBatchById(leaves);
 		return Result.OK("批量删除成功！");
 	}
 	
@@ -148,7 +158,14 @@ public class StatutoryLeaveController extends JeecgController<StatutoryLeave, IS
 		return Result.OK(statutoryLeave);
 	}
 
-  /**
+
+	 @GetMapping(value = "/queryByDate")
+	 public Result<?> queryByDate(@RequestParam(name="startDate",required=true) String startDate) {
+		 StatutoryLeave statutoryLeave = statutoryLeaveService.getOne(startDate);
+		 return Result.OK(statutoryLeave);
+	 }
+
+	 /**
    * 导出excel
    *
    * @param request

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/statutoryleave/entity/StatutoryLeave.java

@@ -64,4 +64,6 @@ public class StatutoryLeave {
 	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "创建时间")
 	private java.util.Date createTime;
+
+	private  java.lang.String delFlag;
 }

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userPrize/controller/UserPrizeController.java

@@ -1,8 +1,6 @@
 package org.jeecg.modules.geke.userPrize.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -18,7 +16,6 @@ import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.geke.makeUpCard.entity.MakeUpCard;
 import org.jeecg.modules.geke.userPrize.entity.UserPrize;
 import org.jeecg.modules.geke.userPrize.service.IUserPrizeService;
-import java.util.Date;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -116,7 +113,11 @@ public class UserPrizeController extends JeecgController<UserPrize, IUserPrizeSe
 	@ApiOperation(value="员工奖惩-通过id删除", notes="员工奖惩-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		userPrizeService.removeById(id);
+		/*userPrizeService.removeById(id);*/
+		UserPrize userPrize=new UserPrize();
+		userPrize.setId(id);
+		userPrize.setDelFlag("1");
+		userPrizeService.updateById(userPrize);
 		return Result.OK("删除成功!");
 	}
 	
@@ -130,7 +131,16 @@ public class UserPrizeController extends JeecgController<UserPrize, IUserPrizeSe
 	@ApiOperation(value="员工奖惩-批量删除", notes="员工奖惩-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.userPrizeService.removeByIds(Arrays.asList(ids.split(",")));
+		//this.userPrizeService.removeByIds(Arrays.asList(ids.split(",")));
+		List<String> list = Arrays.asList(ids.split(","));
+		List<UserPrize>lists=new ArrayList<>();
+		for (String id:list){
+			UserPrize userPrize=new UserPrize();
+			userPrize.setId(id);
+			userPrize.setDelFlag("1");
+			lists.add(userPrize);
+		}
+		userPrizeService.updateBatchById(lists);
 		return Result.OK("批量删除成功！");
 	}
 	

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userPrize/entity/UserPrize.java

@@ -83,4 +83,6 @@ public class UserPrize {
 
 	private  transient String orgCode;
 
+	private  java.lang.String delFlag;
+
 }

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userPrize/mapper/xml/UserPrizeMapper.xml

@@ -7,7 +7,7 @@
         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'
+        where b.del_flag='0' and a.del_flag='0'
         <if test="userPrize.realname!=null and ''!=userPrize.realname">
             and b.realname like concat(concat('%',#{userPrize.realname}),'%')
         </if>

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

@@ -53,6 +53,8 @@ public interface UserShiftMapper extends BaseMapper<UserShift> {
 
     List<String>uids(@Param("depts") List<String> depts);
 
+    List<UserShift>listByShiftId(@Param("shiftid")String shiftid);
+
     //统计每月班次有多少次人员排班
    Map<String,Object>ShiftCount(@Param("id")String id,@Param("date")String date,@Param("deptids")List<String>deptids,@Param("realname")String realname,@Param("deptid")String deptid);
 }

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

@@ -190,4 +190,12 @@ order by a.shift_date desc
             </foreach>
         </if>
     </select>
+    <select id="listByShiftId" resultType="org.jeecg.modules.geke.userShift.entity.UserShift">
+        select a.*from geke_user_shift a
+        left join sys_user b  on a.user_id=b.id
+        where b.del_flag='0' and b.employment_status='10'
+        <if test="shiftid!=null and ''!=shiftid">
+            and a.shift_id=#{shiftid}
+        </if>
+    </select>
 </mapper>

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userShift/service/IUserShiftService.java

@@ -34,6 +34,8 @@ public interface IUserShiftService extends IService<UserShift> {
 
     public boolean addUserShifts(UserShift userShift);
 
+    List<UserShift>listByShiftId(String shiftid);
+
     List<Map<String,Object>> getMothUserShifts(String userid, String date);
 
     IPage<Map<String,Object>>mothUserShift(String date,Integer pageNo,Integer pageSize,String type,List<String>deptids,String name,String dept) throws ParseException;

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userShift/service/impl/UserShiftServiceImpl.java

@@ -118,6 +118,11 @@ public class UserShiftServiceImpl extends ServiceImpl<UserShiftMapper, UserShift
         return save;
     }
 
+    @Override
+    public List<UserShift> listByShiftId(String shiftid) {
+        return userShiftMapper.listByShiftId(shiftid);
+    }
+
     @Override
     public List<Map<String, Object>> getMothUserShifts(String userid, String date) {
         return userShiftMapper.getMothUserShifts(userid,date);

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

@@ -29,6 +29,7 @@
         <if test="state!=null and ''!=state">
             and state=#{state}
         </if>
+
         <if test="deptids!=null and deptids.size()>0">
             and dept_id in
             <foreach collection="deptids" index="index" item="id" open="(" separator="," close=")">

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

@@ -271,8 +271,13 @@ public class SysDepartController {
 		if (ids == null || "".equals(ids.trim())) {
 			result.error500("参数不识别！");
 		} else {
-			this.sysDepartService.deleteBatchWithChildren(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
+			List<SysUser> sysUsers = sysUserService.listUserByDeptIds(Arrays.asList(ids.split(",")));
+			if (sysUsers!=null&&sysUsers.size()>0){
+				result.error500("该部门或子部门已被使用,删除失败!");
+			}else {
+				this.sysDepartService.deleteBatchWithChildren(Arrays.asList(ids.split(",")));
+				result.success("删除成功!");
+			}
 		}
 		return result;
 	}

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

@@ -1227,7 +1227,7 @@ public class SysUserController {
     }
 
 
-   /* @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    /*@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response)throws IOException {
         MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
         Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
@@ -1248,7 +1248,22 @@ public class SysUserController {
                 for (int i = 0; i < listSysUsers.size(); i++) {
                     SysUser sysUserExcel = listSysUsers.get(i);
                     int lineNumber = i + 1;
-                    sysUserExcel.setId(sysUserExcel.getWorkNo());
+                    if (sysUserExcel.getWorkNo().equals("100009")){
+                        sysUserExcel.setId("100009");
+                    }if (sysUserExcel.getWorkNo().equals("100024")){
+                        sysUserExcel.setId("Alice.guo");
+                    }if (sysUserExcel.getWorkNo().equals("100025")){
+                        sysUserExcel.setId("eva.zheng");
+                    }if (sysUserExcel.getWorkNo().equals("100027")){
+                        sysUserExcel.setId("kerr.zou");
+                    }if (sysUserExcel.getWorkNo().equals("100059")){
+                        sysUserExcel.setId("100059");
+                    }if (sysUserExcel.getWorkNo().equals("100134")){
+                        sysUserExcel.setId("100134");
+                    }if (sysUserExcel.getWorkNo().equals("100135")){
+                        sysUserExcel.setId("100135");
+                    }
+                    //sysUserExcel.setId(sysUserExcel.getWorkNo());
                     if (sysUserExcel.getSfzType().equals("其他")){
                         sysUserExcel.setSfzType("1");
                     }if (sysUserExcel.getSfzType().equals("中国身份证")){
@@ -1259,10 +1274,11 @@ public class SysUserController {
                         sysUserExcel.setIsAttendance("1");
                     }
                     try {
-                        sysUserService.updateById(sysUserExcel);
+
+                       // sysUserService.updateById(sysUserExcel);
                         if (sysUserExcel.getIsAttendance().equals("0")){
                             AttendanceRule attendanceRule=new AttendanceRule();
-                            attendanceRule.setUserId(sysUserExcel.getWorkNo());
+                            attendanceRule.setUserId(sysUserExcel.getId());
                             attendanceRule.setType(sysUserExcel.getType());
                             if (sysUserExcel.getType().equals("1")||sysUserExcel.getType().equals(1)){
                                 String str="2022-01-02 10:00:00";

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

@@ -196,6 +196,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 	 */
 	 List<SysUser>queryEmpByLeave(@Param("username")String username,@Param("depid")String depid);
 
+	 List<SysUser>listUserByDeptIds(@Param("deptids")List<String>deptids);
 
 	List<String>getUserIds(@Param("date")String date);
 

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

@@ -519,4 +519,16 @@ on a.depart_name=b.orgCodeTxt
 		</if>
 		order by  create_time desc
 	</select>
+	<select id="listUserByDeptIds" resultType="org.jeecg.modules.system.entity.SysUser">
+		select a.* from sys_user a
+		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' and a.employment_status='10'
+		<if test="deptids!=null and deptids.size()>0">
+			and c.id in
+			<foreach collection="deptids" index="index" item="id" open="(" separator="," close=")">
+				#{id}
+			</foreach>
+		</if>
+	</select>
 </mapper>

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

@@ -127,6 +127,12 @@ public interface ISysUserService extends IService<SysUser> {
 	 */
 	public Map<String,String> getDepNamesByUserIds(List<String> userIds);
 
+	/**
+	 * 根据部门id集合查询用户
+	 * @param deptids
+	 * @return
+	 */
+	List<SysUser>listUserByDeptIds(List<String>deptids);
     /**
      * 根据部门 Id 和 QueryWrapper 查询
      *

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

@@ -298,6 +298,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		return res;
 	}
 
+	@Override
+	public List<SysUser> listUserByDeptIds(List<String> deptids) {
+		return userMapper.listUserByDeptIds(deptids);
+	}
+
 	@Override
 	public IPage<SysUser> getUserByDepartIdAndQueryWrapper(Page<SysUser> page, String departId, QueryWrapper<SysUser> queryWrapper) {
 		LambdaQueryWrapper<SysUser> lambdaQueryWrapper = queryWrapper.lambda();