格克

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userShift/controller/UserShiftController.java

@@ -198,8 +198,6 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 				  for(UserShiftExcel o:list){
 					 if (oConvertUtils.isNotEmpty(o.getWorkNo())&&oConvertUtils.isNotEmpty(o.getMoth())){
 						 String userId = userShiftService.getUserId(o.getWorkNo());
-
-
 						 userShiftService.deleteUserShift(userId,o.getMoth()+"-01");
 						 if (oConvertUtils.isNotEmpty(userId)) {
 							 if (oConvertUtils.isNotEmpty(o.getA1())) {
@@ -647,7 +645,15 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 	 }
 
 
-
+	 public String getDay(String date,Integer day){
+		 Date today = new Date(date);
+		 Long targetday_milliseconds = today.getTime() + 1000 * 60 * 60 * 24 * day;
+		 today.setTime(targetday_milliseconds); //注意，这行是关键代码
+		 int tYear = today.getYear();
+		 int tMonth = today.getMonth() + 1;
+		 int tDate = today.getDate();
+		 return tYear + "-" + tMonth + "-" + tDate;
+	 }
 
 
 }

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/usercontract/controller/UserContractController.java

@@ -80,6 +80,10 @@ public class UserContractController extends JeecgController<UserContract, IUserC
 			orderItem.setAsc(true);
 			if(s[0].equals("create_time")){
 				orderItem.setColumn("a.create_time");
+			}if(s[0].equals("dept_name")){
+				orderItem.setColumn("deptName");
+			}if(s[0].equals("dept_name1")){
+				orderItem.setColumn("deptName1");
 			}
 			if (s[1].equals("DESC")){
 				orderItem.setAsc(false);
@@ -180,6 +184,10 @@ public class UserContractController extends JeecgController<UserContract, IUserC
 		  orderItem.setAsc(true);
 		  if(s[0].equals("create_time")){
 			  orderItem.setColumn("a.create_time");
+		  }if(s[0].equals("dept_name")){
+			  orderItem.setColumn("deptName");
+		  }if(s[0].equals("dept_name1")){
+			  orderItem.setColumn("deptName1");
 		  }
 		  if (s[1].equals("DESC")){
 			  orderItem.setAsc(false);

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

@@ -5,12 +5,11 @@
     <select id="lists" resultType="org.jeecg.modules.geke.usercontract.entity.UserContract">
         <if test="userContract.state==null or userContract.state=='' ">
         select a.*from (
-            <!-- 已过期-->select a.*,b.realname as 'realname','已到期'as 'state',b.work_no  from geke_user_contract
+            <!-- 已过期-->select a.*,b.realname as 'realname','已到期'as 'state',b.work_no,vi.one_dept as 'deptName',vi.last_dept as 'deptName1'  from geke_user_contract
             a left join sys_user b on a.user_id=b.id
-            where b.
-            del_flag='0'
-            <if
-                    test="userContract.realname!=null and ''!=userContract.realname">
+            left join  view_all_dept vi on b.id=vi.id
+            where b.del_flag='0'
+            <if test="userContract.realname!=null and ''!=userContract.realname">
             and b.realname like concat(concat('%',#{userContract.realname}),'%')
         </if>
         <if test="userContract.contractType!=null and ''!=userContract.contractType">
@@ -33,8 +32,9 @@
         </if>
         <!--即将过期 -->
             UNION ALL
-            select a.*,b.realname as 'realname','即将到期'as 'state',b.work_no  from geke_user_contract a
+            select a.*,b.realname as 'realname','即将到期'as 'state',b.work_no,vi.one_dept as 'deptName',vi.last_dept as 'deptName1'  from geke_user_contract a
             left join sys_user b on a.user_id=b.id
+            left join  view_all_dept vi on b.id=vi.id
             where b.del_flag='0'
             <if test="userContract.realname!=null and ''!=userContract.realname">
                 and b.realname like concat(concat('%',#{userContract.realname}),'%')
@@ -62,8 +62,9 @@
             </if>
             <!--临近过期 -->
             UNION ALL
-            select a.*,b.realname as 'realname','临近到期'as 'state',b.work_no  from geke_user_contract a
+            select a.*,b.realname as 'realname','临近到期'as 'state',b.work_no,vi.one_dept as 'deptName',vi.last_dept as 'deptName1'  from geke_user_contract a
             left join sys_user b on a.user_id=b.id
+            left join  view_all_dept vi on b.id=vi.id
             where b.del_flag='0'
             <if test="userContract.realname!=null and ''!=userContract.realname">
                 and b.realname like concat(concat('%',#{userContract.realname}),'%')
@@ -91,8 +92,9 @@
             </if>
             <!--正常 -->
             UNION ALL
-            select a.*,b.realname as 'realname','正常'as 'state',b.work_no  from geke_user_contract a left
+            select a.*,b.realname as 'realname','正常'as 'state',b.work_no,vi.one_dept as 'deptName',vi.last_dept as 'deptName1'  from geke_user_contract a left
             join sys_user b on a.user_id=b.id
+            left join  view_all_dept vi on b.id=vi.id
             where b.del_flag='0'
             <if test="userContract.realname!=null and ''!=userContract.realname">
                 and b.realname like concat(concat('%',#{userContract.realname}),'%')
@@ -119,7 +121,9 @@
         </if>
 
         <if test="userContract.state==0 or userContract.state=='0' ">
-            select a.*,b.realname as 'realname','正常'as 'state',b.work_no  from geke_user_contract a left join sys_user b on a.user_id=b.id
+            select a.*,b.realname as 'realname','正常'as 'state',b.work_no,vi.one_dept as 'deptName',vi.last_dept as 'deptName1'  from geke_user_contract a
+            left join sys_user b on a.user_id=b.id
+            left join  view_all_dept vi on b.id=vi.id
             where b.del_flag='0'
             <if test="userContract.realname!=null and ''!=userContract.realname">
                 and b.realname like concat(concat('%',#{userContract.realname}),'%')
@@ -145,7 +149,9 @@
         </if>
 
         <if test="userContract.state==1 or userContract.state=='1' ">
-            select a.*,b.realname as 'realname','已到期'as 'state',b.work_no  from geke_user_contract a left join sys_user b on a.user_id=b.id
+            select a.*,b.realname as 'realname','已到期'as 'state',b.work_no,vi.one_dept as 'deptName',vi.last_dept as 'deptName1'  from geke_user_contract a
+            left join sys_user b on a.user_id=b.id
+            left join  view_all_dept vi on b.id=vi.id
             where b.del_flag='0'
             <if test="userContract.realname!=null and ''!=userContract.realname">
                 and b.realname like concat(concat('%',#{userContract.realname}),'%')
@@ -171,7 +177,8 @@
         </if>
 
         <if test="userContract.state==2 or userContract.state=='2' ">
-            select a.*,b.realname as 'realname','临近到期'as 'state',b.work_no  from geke_user_contract a left join sys_user b on a.user_id=b.id
+            select a.*,b.realname as 'realname','临近到期'as 'state',b.work_no,vi.one_dept as 'deptName',vi.last_dept as 'deptName1'  from geke_user_contract a left join sys_user b on a.user_id=b.id
+            left join  view_all_dept vi on b.id=vi.id
             where b.del_flag='0'
             <if test="userContract.realname!=null and ''!=userContract.realname">
                 and b.realname like concat(concat('%',#{userContract.realname}),'%')
@@ -199,7 +206,8 @@
             </if>
         </if>
         <if test="userContract.state==3 or userContract.state=='3' ">
-            select a.*,b.realname as 'realname','即将到期'as 'state',b.work_no  from geke_user_contract a left join sys_user b on a.user_id=b.id
+            select a.*,b.realname as 'realname','即将到期'as 'state',b.work_no,vi.one_dept as 'deptName',vi.last_dept as 'deptName1'  from geke_user_contract a left join sys_user b on a.user_id=b.id
+            left join  view_all_dept vi on b.id=vi.id
             where b.del_flag='0'
             <if test="userContract.realname!=null and ''!=userContract.realname">
                 and b.realname like concat(concat('%',#{userContract.realname}),'%')

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

@@ -57,7 +57,7 @@ public class UserContractServiceImpl extends ServiceImpl<UserContractMapper, Use
         date.setMonth(date.getMonth()+1);
         String towMonth=df.format(date);
         List<UserContract> lists = userContractMapper.lists(page, userContract, subDepIdsByDepId,dateTime,oneMonth,towMonth,startDate,endDate);
-        lists.forEach(str->{
+      /*  lists.forEach(str->{
 
             List<Map<String, Object>> userid = userPrizeMapper.queryDept(str.getUserId());
             if (userid!=null&&userid.size()>0){
@@ -85,7 +85,7 @@ public class UserContractServiceImpl extends ServiceImpl<UserContractMapper, Use
                     });
                 }
             }
-        });
+        });*/
         return page.setRecords(lists);
     }
 

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userquit/entity/UserQuit.java

@@ -128,4 +128,8 @@ public class UserQuit {
 
 	private java.lang.Integer status;
 
+	@Dict(dicCode = "sy_del")
+	private java.lang.Integer syState;
+
+
 }

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

@@ -26,7 +26,7 @@
     </delete>
     <select id="list" resultType="org.jeecg.modules.geke.userquit.entity.UserQuit">
         select a.user_name,a.id,b.work_no as 'workNo',b.category as 'category',b.sfz_code as 'sfzCode',b.entry_Date as 'entryDate',
-        a.dept,a.new_Date,a.post,b.post as 'posts',a.remarks,a.state,d.org_code as 'orgCode',a.status
+        a.dept,a.new_Date,a.post,b.post as 'posts',a.remarks,a.state,d.org_code as 'orgCode',a.status,a.sy_state,b.id as 'userId'
         from geke_user_quit a
         left join sys_user  b on a.user_id=b.id
         left join sys_user_depart c on b.id=c.user_id

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

@@ -92,6 +92,10 @@ public class VacationController extends JeecgController<Vacation, IVacationServi
 			orderItem.setAsc(true);
 			if (s[1].equals("DESC")){
 				orderItem.setAsc(false);
+			}if (s[0].equals("dept_name")){
+				orderItem.setColumn("one_dept");
+			}if (s[0].equals("dept_name2")){
+				orderItem.setColumn("last_dept");
 			}
 			orderItems.add(orderItem);
 		}
@@ -189,6 +193,10 @@ public class VacationController extends JeecgController<Vacation, IVacationServi
 		  orderItem.setAsc(true);
 		  if (s[1].equals("DESC")){
 			  orderItem.setAsc(false);
+		  }if (s[0].equals("dept_name")){
+			  orderItem.setColumn("one_dept");
+		  }if (s[0].equals("dept_name2")){
+			  orderItem.setColumn("last_dept");
 		  }
 		  orderItems.add(orderItem);
 	  }

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

@@ -117,10 +117,11 @@
         select item_value from sys_dict_item where id='1506432937646657538'
     </select>
     <select id="lists" resultType="org.jeecg.modules.geke.vacation.entity.Vacation">
-        select a.*,b.realname,b.work_no,d.org_code as 'deptCode' from geke_vacation_body a
+        select a.*,b.realname,b.work_no,d.org_code as 'deptCode',vi.one_dept as 'deptName',vi.last_dept as 'deptName2' from geke_vacation_body a
         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
+        left join view_all_dept vi  on vi.id=b.id
         where 1=1
         <if test="vacation.realname!=null and ''!=vacation.realname">
             and b.realname like concat(concat('%',#{vacation.realname}),'%')

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

@@ -113,6 +113,10 @@ public class SysPositionController {
             orderItem.setAsc(true);
             if (s[1].equals("DESC")){
                 orderItem.setAsc(false);
+            }if (s[0].equals("dept_name1")){
+                orderItem.setColumn("one_dept");
+            }if (s[0].equals("dept_name2")){
+                orderItem.setColumn("last_dept");
             }
             orderItems.add(orderItem);
         }
@@ -302,6 +306,10 @@ public class SysPositionController {
             orderItem.setAsc(true);
             if (s[1].equals("DESC")){
                 orderItem.setAsc(false);
+            }if (s[0].equals("dept_name1")){
+                orderItem.setColumn("one_dept");
+            }if (s[0].equals("dept_name2")){
+                orderItem.setColumn("last_dept");
             }
             orderItems.add(orderItem);
         }

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

@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.catalina.User;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.mail.EmailException;
 import org.apache.commons.mail.HtmlEmail;
@@ -328,6 +329,10 @@ public class SysUserController {
                 orderItem.setAsc(false);
             }if (s[0].equals("create_time")){
                 orderItem.setColumn("work_no");
+            }if (s[0].equals("del2")){
+                orderItem.setColumn("one_dept");
+            }if (s[0].equals("del3")){
+                orderItem.setColumn("last_dept");
             }
             orderItems.add(orderItem);
         }
@@ -403,12 +408,12 @@ public class SysUserController {
                 if (orgName!=null&&orgName.size()>0){
                     item.setOrgText(sysUserService.getOrgName(item.getId()).get(0));
                 }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);
+//                    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(sysDeparts.size()>1) {
@@ -424,7 +429,7 @@ public class SysUserController {
                                 item.setDel3(str.getDepartName());
                             }
                         });
-                    }
+                    }*/
                 }
 
             });
@@ -530,6 +535,7 @@ public class SysUserController {
 				result.error500("未找到对应实体");
 			}else {
 				SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
+				user.setSyState(0);
 				user.setDepartIds(jsonObject.getString("selecteddeparts").toString());
 				user.setUpdateTime(new Date());
 				//String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), sysUser.getSalt());
@@ -875,6 +881,10 @@ public class SysUserController {
                 orderItem.setAsc(false);
             }if (s[0].equals("create_time")){
                 orderItem.setColumn("work_no");
+            }if (s[0].equals("del2")){
+                orderItem.setColumn("one_dept");
+            }if (s[0].equals("del3")){
+                orderItem.setColumn("last_dept");
             }
             orderItems.add(orderItem);
         }
@@ -2975,8 +2985,18 @@ public class SysUserController {
     @ApiOperation(value="入职，离职信息-编辑", notes="入职，离职信息-编辑")
     @PutMapping(value = "/userQuitEdit")
     public Result<?> userQuitEdit(@RequestBody UserQuit userQuit) throws IOException, ParseException {
-        boolean b = userQuitService.updateId(userQuit.getId(),userQuit.getState().toString());
-        weixinUserService.UserQuits();
+        if (oConvertUtils.isNotEmpty(userQuit.getState())&&userQuit.getState()==3){
+            if (oConvertUtils.isNotEmpty(userQuit.getUserId())) {
+                UserQuit us = new UserQuit();
+                us.setId(userQuit.getId());
+                us.setSyState(1);
+                userQuitService.updateById(us);
+                weixinUserService.delWeixUser(userQuit.getUserId());
+            }
+        }else {
+            boolean b = userQuitService.updateId(userQuit.getId(), userQuit.getState().toString());
+            weixinUserService.UserQuits();
+        }
         return Result.OK("编辑成功!");
     }
 }

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

@@ -57,17 +57,15 @@ public class SysUser implements Serializable {
     @Excel(name = "*真实姓名", width = 15)
     private String realname;
 
-    /**英文名**/
-    @Excel(name="*英文名",width = 15)
-    private  String egName;
-
     @Excel(name = "*身份证号码", width = 15)
     private String sfzCode;
+
     /**
      * 年龄
      */
     @Excel(name = "年龄", width = 15)
     private Integer age;
+
     /**
      * 生日
      */
@@ -76,48 +74,12 @@ public class SysUser implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date birthday;
 
-
-
-    /**
-     * 密码
-     */
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
-    private String password;
-
-    /**
-     * md5密码盐
-     */
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
-    private String salt;
-
-    /**
-     * 头像
-     */
-    private String avatar;
-
     /**
      * 证件类型（1中国身份证，2其他身份证）
      */
     @Excel(name = "*身份证类型", width = 15)
     private String sfzType;
 
-    /**
-     * 人员编码
-     */
-    private String code;
-
-    /**
-     * 同步信息（0不同步，1同步到微信，2同步到u8，3都同步）
-     */
-    //@Excel(name = "同步信息", width = 15,dicCode="infoSy")
-    @Dict(dicCode = "infoSy")
-    private Integer infoSy;
-    /**
-     * 同步状态（0未同步，1已同步）
-     */
-    @Dict(dicCode = "syState")
-    private Integer syState;
-
     /**
      * 性别（1：男 2：女）
      */
@@ -126,21 +88,12 @@ public class SysUser implements Serializable {
     private Integer sex;
 
 
-    /**
-     * 电子邮件
-     */
-    @Excel(name = "电子邮件", width = 15)
-    private String email;
-
-
     /**
      * 电话
      */
     @Excel(name = "*电话", width = 15)
     private String phone;
 
-
-
     /**
      * 国籍
      */
@@ -162,26 +115,6 @@ public class SysUser implements Serializable {
     @Excel(name = "毕业学校", width = 15)
     private String school;
 
-    /**
-     * 合同日期一
-     */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date contractDate;
-
-    /**
-     * 合同日期二
-     */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date contractDate2;
-
-    /**
-     * 合同日期三
-     */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date contractDate3;
 
     /**
      * 分摊部门
@@ -194,18 +127,6 @@ public class SysUser implements Serializable {
      */
     @Excel(name = "家庭住址", width = 15)
     private String addr;
-    /**用户所属组织**/
-    @Excel(name = "一级部门", width = 15)
-    private transient  String del2;
-    /**用户所属组织**/
-    @Excel(name = "二级部门", width = 15)
-    private  transient String del3;
-    /**用户所属组织**/
-    //@Excel(name = "三级部门", width = 15)
-    private transient  String del4;
-    /**部门名称*/
-    @Excel(name = "*末级部门", width = 15)
-    private transient String orgCodeTxt;
 
     /**入职日期**/
     @Excel(name="*入职日期",width = 15,format = "yyyy-MM-dd")
@@ -272,6 +193,126 @@ public class SysUser implements Serializable {
     private Integer category;
 
 
+    /**
+     * 户口地址
+     */
+    @Excel(name = "户口地址", width = 15)
+    private String homeAddr;
+    /**紧急联系人**/
+    @Excel(name="紧急联系人",width = 15)
+    private  String urgentName;
+    /**紧急联系人电话**/
+    @Excel(name="紧急联系人电话",width = 15)
+    private  String urgentPhone;
+
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注", width = 15)
+    private String remarks;
+
+    /**备用虚拟字段**/
+    @Excel(name = "上班类型", width = 15,dicCode = "type")
+    @Dict(dicCode = "type")
+    private transient  String type;
+
+    /**
+     * 是否考勤 0是 1否
+     */
+    @Excel(name = "*是否打卡", width = 15)
+    private String isAttendance;
+
+    /**用户所属组织**/
+    @Excel(name = "一级部门", width = 15)
+    private transient  String del2;
+    /**用户所属组织**/
+    @Excel(name = "二级部门", width = 15)
+    private  transient String del3;
+
+    /**部门名称*/
+    @Excel(name = "*末级部门", width = 15)
+    private transient String orgCodeTxt;
+    @Excel(name = "职位", width = 15,dictTable ="sys_position",dicText = "name",dicCode = "code")
+    @Dict(dictTable ="sys_position",dicText = "name",dicCode = "code")
+    private String post;
+
+    /**英文名**/
+    @Excel(name="*英文名",width = 15)
+    private  String egName;
+
+
+    /**
+     * 电子邮件
+     */
+    @Excel(name = "电子邮件", width = 15)
+    private String email;
+
+
+    /**
+     * 密码
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String password;
+
+    /**
+     * md5密码盐
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String salt;
+
+    /**
+     * 头像
+     */
+    private String avatar;
+
+
+
+    /**
+     * 人员编码
+     */
+    private String code;
+
+    /**
+     * 同步信息（0不同步，1同步到微信，2同步到u8，3都同步）
+     */
+    //@Excel(name = "同步信息", width = 15,dicCode="infoSy")
+    @Dict(dicCode = "infoSy")
+    private Integer infoSy;
+    /**
+     * 同步状态（0未同步，1已同步）
+     */
+    @Dict(dicCode = "syState")
+    private Integer syState;
+
+
+
+    /**
+     * 合同日期一
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date contractDate;
+
+    /**
+     * 合同日期二
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date contractDate2;
+
+    /**
+     * 合同日期三
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date contractDate3;
+
+
+
+    /**用户所属组织**/
+    //@Excel(name = "三级部门", width = 15)
+    private transient  String del4;
 
 
 
@@ -285,7 +326,7 @@ public class SysUser implements Serializable {
     /**
      * 年假可用天数
      */
-    @Excel(name = "年假可用天数", width = 15)
+    //@Excel(name = "年假可用天数", width = 15)
     private String yearCount;
 
 
@@ -313,9 +354,6 @@ public class SysUser implements Serializable {
 
 
 
-
-
-
     /**
      * 是否算薪 0是 1否
      */
@@ -323,9 +361,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;
+
 
     /**
      * 座机号
@@ -392,26 +428,13 @@ public class SysUser implements Serializable {
     private  Date birthDate;
 
 
-    /**
-     * 户口地址
-     */
-    @Excel(name = "户口地址", width = 15)
-    private String homeAddr;
+
     /**离职日期**/
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private  Date termDate;
-    /**紧急联系人**/
-    @Excel(name="紧急联系人",width = 15)
-    private  String urgentName;
-    /**紧急联系人电话**/
-    @Excel(name="紧急联系人电话",width = 15)
-    private  String urgentPhone;
-    /**
-     * 备注
-     */
-    @Excel(name = "备注", width = 15)
-    private String remarks;
+
+
     /**备用字段**/
     private transient  String del;
     /**部门id**/
@@ -425,16 +448,7 @@ public class SysUser implements Serializable {
     /**用户所属组织**/
     private transient  String del5;
 
-    /**备用虚拟字段**/
-    @Excel(name = "上班类型", width = 15,dicCode = "type")
-    @Dict(dicCode = "type")
-    private transient  String type;
 
-    /**
-     * 是否考勤 0是 1否
-     */
-    @Excel(name = "*是否打卡", width = 15)
-    private String isAttendance;
     /***
      * 预计离职时间
      */

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

@@ -10,7 +10,9 @@
 
     </select>
     <select id="lists" resultType="org.jeecg.modules.system.entity.SysPosition">
-        select a.*,b.depart_name as 'deptName', b.org_code as 'orgCode'  from sys_position a left join sys_depart b on a.dept_id=b.id
+        select a.*,b.depart_name as 'deptName', b.org_code as 'orgCode',vi.one_dept as 'deptName1',vi.last_dept as 'deptName2'  from sys_position a
+        left join sys_depart b on a.dept_id=b.id
+        left join view_post_dept vi on a.id=vi.id
         where 1=1
         <if test="deptids!=null and deptids.size()>0">
             and b.id in

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

@@ -440,10 +440,11 @@ on a.depart_name=b.orgCodeTxt
 	</select>
 
 	<select id="kQueryUser"  resultMap="userMap">
-		select DISTINCT a.*,d.type as 'type' from sys_user a
+		select DISTINCT a.*,d.type as 'type',vi.one_dept as 'del2',vi.last_dept as 'del3' 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
 		left join geke_attendance_rule d on a.id=d.user_id
+		left join view_all_dept vi on a.id=vi.id
 		where a.del_flag='0'
 		<if test="user.realname!=null and ''!=user.realname">
 			and a.realname like concat(concat('%',#{user.realname}),'%')

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

@@ -15,6 +15,8 @@ import java.util.Map;
 public interface IWeixinUserService {
         //从企业微信拉取用户信息
         Map<String,Object> pullData() throws IOException;
+        //删除企业微信员工
+         String delWeixUser(String userid) throws IOException;
 
         //同步用户信息到企业微信
         Map<String,Object> synchronizationWeixin() throws IOException, InterruptedException;

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

@@ -53,6 +53,7 @@ public class SysPositionServiceImpl extends ServiceImpl<SysPositionMapper, SysPo
             subDepIdsByDepId= sysDepartService.getSubDepIdsByDepId(sysPosition.getDeptId());
         }
         List<SysPosition> lists = positionMapper.lists(page, sysPosition, subDepIdsByDepId);
+/*
         if (lists!=null&&lists.size()>0){
             lists.forEach(str->{
                 String code=str.getOrgCode();
@@ -78,6 +79,7 @@ public class SysPositionServiceImpl extends ServiceImpl<SysPositionMapper, SysPo
                 }
             });
         }
+*/
         return page.setRecords(lists);
     }
 

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

@@ -530,6 +530,35 @@ public class WeixinUserImpl implements IWeixinUserService{
     }
 
 
+
+
+    /**
+     * 删除微信用户
+     * @param params
+     * @return
+     * @throws UnsupportedEncodingException
+     */
+    public String delWeixUser(String userid) throws IOException {
+        UrlData.getToken();
+        Map<String, Object> headers = Maps.newHashMap();
+        headers.put("Content-Type", "application/json; charset=utf-8");
+        Map mapTypes = null;
+        String errcode = "";
+        String createDeptUrl="";
+        try {
+            createDeptUrl = "https://qyapi.weixin.qq.com/cgi-bin/user/delete?access_token=" + UrlData.token + "&userid="+userid;
+            String res = MyHttpUtils.httpPutRequestWithJson(createDeptUrl, headers, null);
+            mapTypes = JSON.parseObject(res);
+            errcode = mapTypes.get("errcode").toString();
+        }catch (Exception e){
+            e.printStackTrace();
+            errcode="1";
+        }
+        return errcode;
+    }
+
+
+
     /**
      * 批量获取微信用户id
      * @return

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

@@ -110,6 +110,10 @@ public class workOvertimeController extends JeecgController<workOvertime, IworkO
 				 orderItem.setAsc(false);
 			 }if (s[0].equals("create_time")){
 				 orderItem.setColumn("commit_Date");
+			 }if (s[0].equals("dept_name")){
+				 orderItem.setColumn("one_dept");
+			 }if (s[0].equals("dept_name2")){
+				 orderItem.setColumn("last_dept");
 			 }
 			 orderItems.add(orderItem);
 		 }
@@ -237,6 +241,10 @@ public class workOvertimeController extends JeecgController<workOvertime, IworkO
 			  orderItem.setAsc(false);
 		  }if (s[0].equals("create_time")){
 			  orderItem.setColumn("commit_Date");
+		  }if (s[0].equals("dept_name")){
+			  orderItem.setColumn("one_dept");
+		  }if (s[0].equals("dept_name2")){
+			  orderItem.setColumn("last_dept");
 		  }
 		  orderItems.add(orderItem);
 	  }

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

@@ -16,10 +16,11 @@
     </select>
     <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',b.work_no
+        , c.org_code as 'deptCode',b.work_no,vi.one_dept as 'deptName',vi.last_dept as 'deptName2'
         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
+        left join view_all_dept vi  on vi.id=b.id
         where b.del_flag='0'
         <if test="code!=null and ''!=code">
     and  a.code=#{code}

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

@@ -56,7 +56,7 @@ public class workOvertimeServiceImpl extends ServiceImpl<workOvertimeMapper, wor
     @Override
     public IPage<workOvertime> getWork(Page<workOvertime> page, String name, String code,String startDate,String endDate,List<String>depts,List<String>types) {
         List<workOvertime> workOvertimes = works.getworkList(page, name, code, startDate, endDate,depts,types);
-        if (workOvertimes!=null){
+        /*if (workOvertimes!=null){
             workOvertimes.forEach(str->{
                 if (str.getDeptCode()!=null&&!"".equals(str.getDeptCode())) {
                     List<String> codes = new ArrayList<>();
@@ -80,7 +80,7 @@ public class workOvertimeServiceImpl extends ServiceImpl<workOvertimeMapper, wor
                     }
                 }
             });
-        }
+        }*/
         return page.setRecords(workOvertimes);
     }
 }