格克

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

@@ -15,7 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @Version: V1.0
  */
 public interface MakeUpCardMapper extends BaseMapper<MakeUpCard> {
-    int deleteDate(@Param("startDate")String startDate);
+    int deleteDate(@Param("startDate")String startDate,@Param("endDate")String endDate);
 
     List<MakeUpCard>lists(Page<MakeUpCard> page,@Param("code")String code,@Param("username")String username,@Param("deptids")List<String> deptids,@Param("date")String date);
     /**

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

@@ -7,6 +7,9 @@
         <if test="startDate!=null and ''!=startDate">
          and   date_format(commit_date,'%Y-%m-%d')>=date_format(#{startDate},'%Y-%m-%d')
         </if>
+        <if test="endDate!=null and ''!=endDate">
+            and date_format(commit_date,'%Y-%m-%d')&lt;=date_format(#{endDate},'%Y-%m-%d')
+        </if>
     </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'

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

@@ -14,7 +14,7 @@ import java.util.Map;
  * @Version: V1.0
  */
 public interface IMakeUpCardService extends IService<MakeUpCard> {
-    int deleteDate(String startDate);
+    int deleteDate(String startDate,String endDate);
 
     Page<MakeUpCard> lists(Page<MakeUpCard> page,String code,String username,String dept,String date);
 }

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

@@ -26,8 +26,8 @@ public class MakeUpCardServiceImpl extends ServiceImpl<MakeUpCardMapper, MakeUpC
     private MakeUpCardMapper makeUpCardMapper;
 
     @Override
-    public int deleteDate(String startDate) {
-        return makeUpCardMapper.deleteDate(startDate);
+    public int deleteDate(String startDate,String endDate) {
+        return makeUpCardMapper.deleteDate(startDate,endDate);
     }
 
     @Override

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

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.DateUtils;
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.geke.shift.mapper.ShiftMapper;
 import org.jeecg.modules.geke.userShift.entity.UserDept;
 import org.jeecg.modules.geke.userShift.entity.UserShift;
@@ -159,7 +160,9 @@ public class UserShiftServiceImpl extends ServiceImpl<UserShiftMapper, UserShift
                             if (id.get(0).get("id").equals("0") || id.get(0).get("id") == "0") {
                                 shiftname = "休息";
                             } else {
-                                shiftname = id.get(0).get("name").toString();
+                                if (oConvertUtils.isNotEmpty(id.get(0).get("name"))){
+                                    shiftname = id.get(0).get("name").toString();
+                                }
                             }
                         }
                         user.put("a" + i, shiftname);

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

@@ -43,7 +43,7 @@ public class UserChage {
     @ApiModelProperty(value = "部门id")
 	private java.lang.String deptId;
 	/**员工id*/
-	@Excel(name = "工号", width = 15)
+	@Excel(name = "*工号", width = 15)
     @ApiModelProperty(value = "员工id")
 	private java.lang.String userId;
 	/**员工姓名*/
@@ -60,7 +60,7 @@ public class UserChage {
     @ApiModelProperty(value = "原薪资")
 	private java.lang.String startWages;
 	/**调整后薪资*/
-	@Excel(name = "调整后薪资", width = 15)
+	@Excel(name = "*调整后薪资", width = 15)
     @ApiModelProperty(value = "调整后薪资")
 	private java.lang.String endWages;
 	/**新部门id*/
@@ -72,7 +72,7 @@ public class UserChage {
 	@Dict(dicCode = "id",dictTable = "sys_user",dicText = "realname")
 	private java.lang.String conmitId;
 	/**生效日期*/
-	@Excel(name = "生效日期", width = 15,format = "yyyy-MM-dd")
+	@Excel(name = "*生效日期", width = 15,format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "生效日期")

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

@@ -331,8 +331,8 @@ public class SysUserController {
             subDepIdsByDepId= sysDepartService.getSubDepIdsByDepId(user.getOrgCodeTxt());
         }if (user.getEmpStatus()!=null&&!"".equals(user.getEmpStatus())){
             status=Arrays.asList(user.getEmpStatus().split(","));
-        }if (user.getCategory()!=null&&!"".equals(user.getCategory())){
-            category=Arrays.asList(user.getCategory().toString().split(","));
+        }if (user.getCategorys()!=null&&!"".equals(user.getCategorys())){
+            category=Arrays.asList(user.getCategorys().toString().split(","));
         }if(oConvertUtils.isNotEmpty(user.getRealname())){
             user.setRealname(user.getRealname().trim());
         }if(oConvertUtils.isNotEmpty(user.getWorkNo())){
@@ -939,6 +939,10 @@ public class SysUserController {
         return mv;
     }
 
+
+
+
+
     /**
      * 通过excel导入数据
      *
@@ -972,19 +976,18 @@ public class SysUserController {
                     CodeVo codeVo=new CodeVo();
                     codeVo.setSeqName("工号编码");
                     sysUserMapper.getNextNo(codeVo);
-                    String workNo=String.valueOf(codeVo.getSeqNo());
-                    if (sysUserExcel.getCategory()!=null&&!sysUserExcel.getCategory().equals("")){
+                    String workNo=sysUserExcel.getWorkNo();
+                    if(!oConvertUtils.isNotEmpty(workNo)){
+                        workNo=String.valueOf(codeVo.getSeqNo());
+                    }if (oConvertUtils.isNotEmpty(sysUserExcel.getCategory())&&!oConvertUtils.isNotEmpty(sysUserExcel.getWorkNo())){
                         if (sysUserExcel.getCategory().equals(105)||sysUserExcel.getCategory().equals(106)){
                             workNo="WB"+String.valueOf(codeVo.getSeqNo());
                         }
-                    }else {
-                        sysUserExcel.setCategory(101);
                     }
                     sysUserExcel.setWorkNo(workNo);
                     sysUserExcel.setCode(workNo);
                     sysUserExcel.setId(workNo);
-                    sysUserExcel.setTrialMoth("6");
-                    if (sysUserExcel.getEmploymentStatus()==null||sysUserExcel.getEmploymentStatus().equals("")){
+                    if (!oConvertUtils.isNotEmpty(sysUserExcel.getEmploymentStatus())){
                         sysUserExcel.setEmploymentStatus(40);
                     }if(sysUserExcel.getEntryDate()!=null){
                         Date entryDate =new Date(sysUserExcel.getEntryDate().getTime());
@@ -999,16 +1002,41 @@ public class SysUserController {
                         now.setTime(date);
                         now.add(Calendar.DAY_OF_MONTH,-1);
                         sysUserExcel.setTrialEndDate(now.getTime());
-                    }if (sysUserExcel.getIsAttendance().equals("否")){
-                        sysUserExcel.setIsAttendance("1");
-                    }if (sysUserExcel.getIsAttendance().equals("是")){
-                        sysUserExcel.setIsAttendance("0");
+                    }if (oConvertUtils.isNotEmpty(sysUserExcel.getIsAttendance())){
+                        if (sysUserExcel.getIsAttendance().equals("否")){
+                            sysUserExcel.setIsAttendance("1");
+                        }if (sysUserExcel.getIsAttendance().equals("是")){
+                            sysUserExcel.setIsAttendance("0");
+                        }
+                    }if (oConvertUtils.isNotEmpty(sysUserExcel.getSfzType())){
+                        if (sysUserExcel.getSfzType().equals("中国身份证")){
+                            sysUserExcel.setSfzType("0");
+                        }if(sysUserExcel.getSfzType().equals("其他")){
+                            sysUserExcel.setSfzType("1");
+                        }
+                    }if (oConvertUtils.isNotEmpty(sysUserExcel.getRealname())&&oConvertUtils.isNotEmpty(sysUserExcel.getEgName())){
+                            String email=sysUserExcel.getEmail();
+                        if (!oConvertUtils.isNotEmpty(sysUserExcel.getEmail())){
+                            String pinYinFirst = UrlData.getPinYinFirst(sysUserExcel.getEgName());
+                            String s = pinYinFirst.substring(0, 1).toLowerCase();
+                            email=s+pinYinFirst.substring(1,pinYinFirst.length())+"."+UrlData.getPinYinFirst(sysUserExcel.getRealname().substring(0,1))+"@gksports.com.cn";
+                        }
+                        String emails = this.emails(email, null);
+                        sysUserExcel.setEmail(email);
+                        if (oConvertUtils.isNotEmpty(emails)){
+                            sysUserExcel.setEmail(emails);
+                        }
+                    }if (oConvertUtils.isNotEmpty(sysUserExcel.getSfzCode())&&oConvertUtils.isNotEmpty(sysUserExcel.getSfzType())){
+                        if (sysUserExcel.getSfzType().equals("0")){
+
+                        }
                     }
+
                     sysUserExcel.setUsername(workNo);
                     if (StringUtils.isBlank(sysUserExcel.getPassword())) {
                         // 密码默认为 “123456”
                         sysUserExcel.setPassword("123456");
-                }
+                    }
                     // 密码加密加盐
                     String salt = oConvertUtils.randomGen(8);
                     sysUserExcel.setSalt(salt);
@@ -1017,7 +1045,6 @@ public class SysUserController {
                     sysUserExcel.setDelFlag(Integer.parseInt(CommonConstant.DEL_FLAG_0.toString()));
                     sysUserExcel.setStatus(1);
                     sysUserExcel.setInfoSy(3);
-                    sysUserExcel.setSfzType("0");
                     boolean f=true;
                     String depids="";
                     if(oConvertUtils.isNotEmpty(sysUserExcel.getOrgCodeTxt())) {
@@ -1048,12 +1075,12 @@ public class SysUserController {
                                                         if (!"".equals(sysUserExcel.getEgName())&&sysUserExcel.getEgName()!=null){
                                                             if (sysUserExcel.getBirthday()!=null){
                                                                     if (!"".equals(sysUserExcel.getSex())&&sysUserExcel.getSex()!=null){
-                                                                        sysUserService.addUserWithRole(sysUserExcel, "1473241527673765890");
+                                                                        //sysUserService.addUserWithRole(sysUserExcel, "1473241527673765890");
                                                                         if (sysUserExcel.getIsAttendance().equals("0")){
                                                                             AttendanceRule attendanceRule=new AttendanceRule();
                                                                             attendanceRule.setUserId(workNo);
                                                                             attendanceRule.setType(sysUserExcel.getType());
-                                                                            attendanceRuleService.save(attendanceRule);
+                                                                          //  attendanceRuleService.save(attendanceRule);
                                                                         }
                                                                         UserContract userContract=new UserContract();
                                                                         userContract.setUserId(sysUserExcel.getId());
@@ -1062,7 +1089,7 @@ public class SysUserController {
                                                                         userContract.setDeptId(sysUserExcel.getDepartId());
                                                                         userContract.setStartDate(sysUserExcel.getEntryDate());
                                                                         userContract.setEndDate(sysUserExcel.getCEndDate());
-                                                                        userContractService.save(userContract);
+                                                                      //  userContractService.save(userContract);
                                                                         successLines++;
                                                                     }else {
                                                                         errorLines++;
@@ -1125,7 +1152,7 @@ public class SysUserController {
                     }
                     // 批量将部门和用户信息建立关联关系
                     String departIds = sysUserExcel.getOrgCodeTxt();
-                    if (StringUtils.isNotBlank(departIds)) {
+                   /* if (StringUtils.isNotBlank(departIds)) {
                         String userId = sysUserExcel.getId();
                         String[] departIdArray = departIds.split(",");
                         List<SysUserDepart> userDepartList = new ArrayList<>(departIdArray.length);
@@ -1137,7 +1164,7 @@ public class SysUserController {
                         }
                         sysUserDepartService.saveBatch(userDepartList);
                     }
-
+*/
                 }
             } catch (Exception e) {
                 errorMessage.add("发生异常：" + e.getMessage());
@@ -1153,6 +1180,81 @@ public class SysUserController {
         return ImportExcelUtil.imporReturnRes(errorLines,successLines,errorMessage);
     }
 
+
+    /*@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();
+        Calendar now=Calendar.getInstance();
+        // 错误信息
+        List<String> errorMessage = new ArrayList<>();
+        int successLines = 0, errorLines = 0;
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();// 获取上传文件对象
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+
+            try {
+                List<SysUser> listSysUsers = ExcelImportUtil.importExcel(file.getInputStream(), SysUser.class, params);
+                listSysUsers.remove(0);
+                for (int i = 0; i < listSysUsers.size(); i++) {
+                    SysUser sysUserExcel = listSysUsers.get(i);
+                    int lineNumber = i + 1;
+                    sysUserExcel.setId(sysUserExcel.getWorkNo());
+                    if (sysUserExcel.getSfzType().equals("其他")){
+                        sysUserExcel.setSfzType("1");
+                    }if (sysUserExcel.getSfzType().equals("中国身份证")){
+                        sysUserExcel.setSfzType("0");
+                    }if (sysUserExcel.getIsAttendance().equals("是")){
+                        sysUserExcel.setIsAttendance("0");
+                    }if (sysUserExcel.getIsAttendance().equals("否")){
+                        sysUserExcel.setIsAttendance("1");
+                    }
+                    try {
+                        sysUserService.updateById(sysUserExcel);
+                        if (sysUserExcel.getIsAttendance().equals("0")){
+                            AttendanceRule attendanceRule=new AttendanceRule();
+                            attendanceRule.setUserId(sysUserExcel.getWorkNo());
+                            attendanceRule.setType(sysUserExcel.getType());
+                            if (sysUserExcel.getType().equals("1")||sysUserExcel.getType().equals(1)){
+                                String str="2022-01-02 10:00:00";
+                                String end="2022-01-02 19:00:00";
+                                attendanceRule.setWorkDay("0,1,2,3,4,5,6");
+                                attendanceRule.setStartDate(DateUtils.parseDate(str,"yyyy-MM-dd HH:mm:ss"));
+                                attendanceRule.setEndDate(DateUtils.parseDate(end,"yyyy-MM-dd HH:mm:ss"));
+                            }
+                            attendanceRuleService.save(attendanceRule);
+                        }
+                    } catch (Exception e) {
+                        errorLines++;
+                        String message = e.getMessage().toLowerCase();
+
+                        // 通过索引名判断出错信息
+                        if (message.contains(CommonConstant.SQL_INDEX_UNIQ_SYS_USER_USERNAME)) {
+                            errorMessage.add("第 " + lineNumber + " 行：用户名已经存在，忽略导入。");
+                        } else if (message.contains(CommonConstant.SQL_INDEX_UNIQ_SYS_USER_PHONE)) {
+                            errorMessage.add("第 " + lineNumber + " 行：手机号已经存在，忽略导入。");
+                        } else if (message.contains(CommonConstant.SQL_INDEX_UNIQ_SYS_USER_EMAIL)) {
+                            errorMessage.add("第 " + lineNumber + " 行：电子邮件已经存在，忽略导入。");
+                        }
+                    }
+
+                }
+            } catch (Exception e) {
+                errorMessage.add("发生异常：" + e.getMessage());
+                log.error(e.getMessage(), e);
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    log.error(e.getMessage(), e);
+                }
+            }
+        }
+        return ImportExcelUtil.imporReturnRes(errorLines,successLines,errorMessage);
+    }*/
     /**
 	 * @功能：根据id 批量查询
 	 * @param userIds
@@ -2275,42 +2377,48 @@ public class SysUserController {
                 List<UserChage> list = ExcelImportUtil.importExcel(file.getInputStream(), UserChage.class, params);
                 LoginUser sysUsers = (LoginUser) SecurityUtils.getSubject().getPrincipal();
                 //update-begin-author:taoyan date:20190528 for:批量插入数据
+                List<UserChage>lstt=new ArrayList<>();
                 if (list!=null&&list.size()>0){
                     List<SysUser>lst=new ArrayList<>();
                     list.forEach(str->{
-                    str.setTime(new Date());
-                    str.setType("工资调整");
-                    str.setState(1);
-                    str.setConmitId(sysUsers.getId());
-                    str.setConmitDate(new Date());
-                    List<SysDepart> sysDeparts = sysDepartService.queryUserDeparts(str.getUserId());
+                    if (oConvertUtils.isNotEmpty(str.getUserId())&&oConvertUtils.isNotEmpty(str.getEndWages())&&str.getTime()!=null) {
+                        str.setType("工资调整");
+                        str.setState(1);
+                        str.setConmitId(sysUsers.getId());
+                        str.setConmitDate(new Date());
+                        List<SysDepart> sysDeparts = sysDepartService.queryUserDeparts(str.getUserId());
                         SysUser byId = sysUserService.getById(str.getUserId());
-                        SysUser sysUser=new SysUser();
-                     if (byId!=null){
-                         str.setRealname(byId.getRealname());
-                     }
-                    if (str.getUserId()!=null&&!str.getUserId().equals("")){
-                        sysUser.setId(str.getUserId());
-                    }if (str.getEndWages()!=null&&!str.getEndWages().equals("")){
-                        sysUser.setWagesOne(str.getEndWages());
-                    }if (sysDeparts!=null){
-                        str.setDeptId(sysDeparts.get(0).getId());
-                        str.setDeptName(sysDeparts.get(0).getDepartName());
-                    }if (byId!=null&&byId.getPost()!=null&&!"".equals(byId.getPost())){
+                        SysUser sysUser = new SysUser();
+                        if (byId != null) {
+                            str.setRealname(byId.getRealname());
+                        }
+                        if (str.getUserId() != null && !str.getUserId().equals("")) {
+                            sysUser.setId(str.getUserId());
+                        }
+                        if (str.getEndWages() != null && !str.getEndWages().equals("")) {
+                            sysUser.setWagesOne(str.getEndWages());
+                        }
+                        if (sysDeparts != null) {
+                            str.setDeptId(sysDeparts.get(0).getId());
+                            str.setDeptName(sysDeparts.get(0).getDepartName());
+                        }
+                        if (byId != null && byId.getPost() != null && !"".equals(byId.getPost())) {
                             SysPosition ones = sysPositionService.getOnes(byId.getPost());
-                            if (ones!=null){
+                            if (ones != null) {
                                 str.setStartPost(ones.getName());
                             }
                         }
+                        lstt.add(str);
+                    }
                    // lst.add(sysUser);
                     });
-                    userChageService.saveBatch(list);
+                    userChageService.saveBatch(lstt);
                     //sysUserService.updateBatchById(lst);
                 }
                 //400条 saveBatch消耗时间1592毫秒  循环插入消耗时间1947毫秒
                 //1200条  saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒
                 //update-end-author:taoyan date:20190528 for:批量插入数据
-                return Result.ok("文件导入成功！数据行数：" + list.size());
+                return Result.ok("文件导入成功！数据行数：" + lstt.size());
             } catch (Exception e) {
                 log.error(e.getMessage(), e);
                 return Result.error("文件导入失败:" + e.getMessage());
@@ -2350,6 +2458,7 @@ public class SysUserController {
                     eml=split[0]+"01"+"@"+split[1];
                 }
             }
+
         }else {
             List<String> emails = sysUserService.emails(email.split("@")[0],null);
             if (emails!=null&&emails.size()>1){

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

@@ -58,7 +58,7 @@ public class SysUser implements Serializable {
     private String realname;
 
     /**英文名**/
-    @Excel(name="*英文名",width = 15)
+    //@Excel(name="*英文名",width = 15)
     private  String egName;
 
     @Excel(name = "*身份证号码", width = 15)
@@ -71,7 +71,7 @@ public class SysUser implements Serializable {
     /**
      * 生日
      */
-    @Excel(name = "*生日", width = 15, format = "yyyy-MM-dd")
+    @Excel(name = "生日", width = 15, format = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date birthday;
@@ -98,7 +98,7 @@ public class SysUser implements Serializable {
     /**
      * 证件类型（1中国身份证，2其他身份证）
      */
-    @Excel(name = "身份证类型", width = 15)
+    @Excel(name = "*身份证类型", width = 15)
     private String sfzType;
 
     /**
@@ -129,7 +129,7 @@ public class SysUser implements Serializable {
     /**
      * 电子邮件
      */
-    @Excel(name = "*电子邮件", width = 15)
+    //@Excel(name = "电子邮件", width = 15)
     private String email;
 
 
@@ -195,16 +195,16 @@ public class SysUser implements Serializable {
     @Excel(name = "家庭住址", width = 15)
     private String addr;
     /**用户所属组织**/
-    @Excel(name = "一级部门", width = 15)
+    ///@Excel(name = "一级部门", width = 15)
     private transient  String del2;
     /**用户所属组织**/
-    @Excel(name = "二级部门", width = 15)
+    //@Excel(name = "二级部门", width = 15)
     private  transient String del3;
     /**用户所属组织**/
-    @Excel(name = "三级部门", width = 15)
+    //@Excel(name = "三级部门", width = 15)
     private transient  String del4;
     /**部门名称*/
-    @Excel(name = "*末级部门", width = 15)
+    //@Excel(name = "*末级部门", width = 15)
     private transient String orgCodeTxt;
 
     /**入职日期**/
@@ -222,7 +222,7 @@ public class SysUser implements Serializable {
     /**
      * 试用结束时间
      */
-    @Excel(name = "*结束日期", width = 15,format = "yyyy-MM-dd")
+    @Excel(name = "结束日期", width = 15,format = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date trialEndDate;
@@ -323,7 +323,7 @@ public class SysUser implements Serializable {
     /**
      * 职务，关联职务表
      */
-    @Excel(name = "职位", width = 15,dictTable ="sys_position",dicText = "name",dicCode = "code")
+    //@Excel(name = "职位", width = 15,dictTable ="sys_position",dicText = "name",dicCode = "code")
     @Dict(dictTable ="sys_position",dicText = "name",dicCode = "code")
     private String post;
 
@@ -453,9 +453,13 @@ public class SysUser implements Serializable {
 
     private transient String empStatus;
 
+    //@Excel(name = "*合同类型", width = 15)
     private transient String contractType;
 
+   // @Excel(name="合同到期日期",width = 15,format = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private transient Date cEndDate;
 
+
+    private transient String categorys;
 }

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

@@ -177,12 +177,17 @@ public class WeixinUserImpl implements IWeixinUserService{
             sysUser.setSex(Integer.parseInt(ls.getGender()));
             if (ls.getEmail()!=null&&!ls.getEmail().equals("")) {
                 sysUser.setEmail(ls.getEmail());
+                String s = ls.getEmail().split("@")[0];
+                String[] split = s.split("\\.");
+                if (split!=null&&split.length>0){
+                    sysUser.setEgName(split[0]);
+                }
             }if (ls.getMobile()!=null&&!ls.getMobile().equals("")) {
                 sysUser.setPhone(ls.getMobile());
             }
             Map map=(Map)ls.getExtattr();
             List<Map<String,Object>> list = (List)map.get("attrs");
-            String workNo=null;
+            String workNo=ls.getUserid();
             if (list.size()>0&&list!=null){
                 for (Map o:list){
                     if (o.get("name").equals("工号")){
@@ -191,16 +196,16 @@ public class WeixinUserImpl implements IWeixinUserService{
                         }
                     }
                 }
-            }if (workNo!=null&&!workNo.equals("")) {
+            }if (!sysUser.getRealname().equals("Mark.Zhang")&&!sysUser.getRealname().equals("用友U8")) {
                 sysUser.setDelFlag(Integer.parseInt(CommonConstant.DEL_FLAG_0.toString()));
                 sysUser.setStatus(1);
                 sysUser.setCreateTime(new Date());
-                if (!"".equals(ls.getPosition()) && ls.getPosition() != null) {
-                    String one = positionService.getOne(ls.getPosition());
-                    if (!"".equals(one) && one != null) {
-                        sysUser.setPost(one);
-                    }
-                }
+//                if (!"".equals(ls.getPosition()) && ls.getPosition() != null) {
+//                    String one = positionService.getOne(ls.getPosition());
+//                    if (!"".equals(one) && one != null) {
+//                        sysUser.setPost(one);
+//                    }
+//                }
                 SysUserRole sysUserRole = new SysUserRole();
                 sysUserRole.setUserId(ls.getUserid());
                 sysUserRole.setRoleId("1473241527673765890");
@@ -959,21 +964,21 @@ public class WeixinUserImpl implements IWeixinUserService{
         stDate2 = now.getTime();
         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));
+        //makeUpCardService.deleteDate(sdf.format(startDate2),sdf.format(endDate));
         List<MakeUpCard>ls=new ArrayList<>();
         list.forEach(str->{
             try {
                 MakeUpCard makeUpCard = WxUpCard(str);
                 if (makeUpCard!=null){
-                    ls.add(makeUpCard);
+                    makeUpCardService.save(makeUpCard);
                 }
                 System.out.println(makeUpCard);
             }catch (Exception e){
                 e.printStackTrace();
             }
         });
-        makeUpCardService.saveBatch(ls);
-        System.out.println(list);
+        /*makeUpCardService.saveBatch(ls);
+        System.out.println(list);*/
         return null;
     }
 
@@ -1302,14 +1307,9 @@ public class WeixinUserImpl implements IWeixinUserService{
                                 l = (List<Map<String, Object>>)l.get(0).get("value");
                                 types=(Map) l.get(0);
                                 userChage.setType(types.get("text").toString());
-                            }else if (str.get("control").equals("Table")){
-                                types = (Map) str.get("value");
-                                List<Map<String, Object>> t =(List<Map<String, Object>>)types.get("children");
-                                t =(List<Map<String, Object>>)t.get(0).get("list");
-                                for (Map sr:t){
-                                    List<Map<String, Object>> tt=null;
-                                    if (sr.get("control").equals("Contact")){
-                                        types = (Map) sr.get("value");
+                            }else if (str.get("control").equals("Contact")){
+                                        List<Map<String, Object>> tt=null;
+                                        types = (Map) str.get("value");
                                         List<Map<String, Object>> members = (List<Map<String, Object>>) types.get("members");
                                         List<Map<String, Object>> departments = (List<Map<String, Object>>) types.get("departments");
                                         if (types.get("members")!=null&&members.size()>0){
@@ -1321,8 +1321,8 @@ public class WeixinUserImpl implements IWeixinUserService{
                                             userChage.setDeptId(tt.get(0).get("openapi_id").toString());
                                             userChage.setDeptName(tt.get(0).get("name").toString());
                                         }
-                                    }else if (sr.get("control").equals("Text")) {
-                                        List<Map<String,Object>>lis=(List<Map<String, Object>>)sr.get("title");
+                                    }else if (str.get("control").equals("Text")) {
+                                        List<Map<String,Object>>lis=(List<Map<String, Object>>)str.get("title");
                                         String f=null;
                                         if (lis.get(0).get("text").equals("原岗位")){
                                             f="1";
@@ -1333,7 +1333,7 @@ public class WeixinUserImpl implements IWeixinUserService{
                                         }else if (lis.get(0).get("text").equals("调整后薪资")){
                                             f="4";
                                         }
-                                        types=(Map) sr.get("value");
+                                        types=(Map) str.get("value");
                                         if (f!=null&&f.equals("1")){
                                             userChage.setStartPost(types.get("text").toString());
                                         }else  if (f!=null&&f.equals("2")){
@@ -1343,20 +1343,20 @@ public class WeixinUserImpl implements IWeixinUserService{
                                         }else  if (f!=null&&f.equals("4")){
                                             userChage.setEndWages(types.get("text").toString());
                                         }
-                                    }else if (sr.get("control").equals("Date")) {
-                                       types=(Map) sr.get("value");
+                                    }else if (str.get("control").equals("Date")) {
+                                       types=(Map) str.get("value");
                                        types=(Map) types.get("date");
                                        userChage.setTime(new Date(Long.valueOf(types.get("s_timestamp").toString()) * 1000));
-                                    }else if (sr.get("control").equals("Textarea")) {
-                                        types=(Map) sr.get("value");
+                                    }else if (str.get("control").equals("Textarea")) {
+                                        types=(Map) str.get("value");
                                         userChage.setDemo(types.get("text").toString());
                                     }
                                 }
                             }
-                        }
+                         }
                     }
-                }
-            }
+
+
         }catch (Exception e){
             e.printStackTrace();
         }