1月9日513导出代码

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

@@ -141,7 +141,7 @@ public class SysUserController {
         //TODO 外部模拟登陆临时账号，列表不显示
         queryWrapper.ne("username","_reserve_user_external");
 		Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
-		IPage<SysUser> pageList = sysUserService.page(page, queryWrapper);
+        IPage<SysUser> pageList = sysUserService.page(page, queryWrapper);
 
         //批量查询用户的所属部门
         //step.1 先拿到全部的 useids

module_kzks/src/main/java/org/jeecg/dataSync/task/UserDataSync.java

@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -65,25 +66,27 @@ public class UserDataSync implements Job {
                     //新增
                     if (Integer.parseInt(item.get("state").toString()) == 2) return;
                     SysUser sysUser = new SysUser();
-                    sysUser.setId(item.get("employee_id").toString()); //员工id
+                    //sysUser.setId(item.get("employee_id").toString()); //员工id
                     sysUser.setRealname(item.get("employee_name").toString()); //姓名
                     sysUser.setPost(item.get("job_name").toString()); //职位名称
                     int state = item.get("state") == null ? 1 : (int) item.get("state");
                     sysUser.setStatus(state); //状态
                     sysUser.setUsername(item.get("login").toString());//账号
                     sysUser.setEmail(item.get("login").toString() + "@c513.cast.casc");//邮箱
-
+                    sysUser.setUserIdentity(1);
                     String salt = oConvertUtils.randomGen(8);
                     sysUser.setSalt(salt);  //md5密码盐
                     String passwordEncode = PasswordUtil.encrypt(sysUser.getUsername(), hrConfigurer.getPwd(), salt);
                     sysUser.setPassword(passwordEncode);  //密码 (加密)
-
+                    sysUser.setCreateBy("system");
+                    sysUser.setCreateTime(new Date());
+                    sysUser.setDelFlag(0);
+                    sysUserService.save(sysUser);
                     //给用户设置默认角色
                     SysUserRole sysUserRole = new SysUserRole();
                     sysUserRole.setUserId(sysUser.getId());
-                    sysUserRole.setRoleId("1"); //默认角色
+                    sysUserRole.setRoleId("1706145760051716097"); //默认角色
                     sysUserRoleService.saveOrUpdate(sysUserRole);
-                    sysUserService.save(sysUser);
 
                     //保存用户与hr系统部门的关联关系
                     String departOldId = item.get("department_id") == null ? "0" : item.get("department_id").toString();

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/controller/ProjectCostHuijiController.java

@@ -239,7 +239,7 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
                 children.addAll(children2);
                 return projectCostHuijiConverCustom.toHuijiListVOAndYs(i, children, 1);
             }).collect(Collectors.toList());
-            IPage<ProjectCostHuijiListVO> pageList1 = ProjectCostHuijiConvert.INSTANCE.toHuijiListVOPage(pageList, collect);
+            IPage<ProjectCostHuijiListVO> pageList1 = projectCostHuijiConverCustom.toHuijiListVOPage(pageList, collect);
             if (pageList.getRecords().isEmpty()) huiji = new ProjectCostHuiji();
             sumVO.setProjectCostHuiji(huiji);
             sumVO.setPageList(pageList1);

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/convert/ProjectCostHuijiConvert.java

@@ -1,8 +1,6 @@
 package org.jeecg.modules.projectCostHuiji.convert;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.modules.projectCost.entity.ProjectCost;
-import org.jeecg.modules.projectCost.vo.ProjectCostVO;
 import org.jeecg.modules.projectCostHuiji.entity.ProjectCostHuiji;
 import org.jeecg.modules.projectCostHuiji.vo.ProjectCostHuijiListVO;
 import org.mapstruct.Mapper;
@@ -11,7 +9,6 @@ import org.mapstruct.ReportingPolicy;
 import org.mapstruct.factory.Mappers;
 import org.springframework.util.CollectionUtils;
 
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -19,15 +16,7 @@ import java.util.stream.Collectors;
 public interface ProjectCostHuijiConvert {
 
     ProjectCostHuijiConvert INSTANCE = Mappers.getMapper(ProjectCostHuijiConvert.class);
-
-    ProjectCostHuijiListVO toHuijiListVO(ProjectCostHuiji huiji, List<ProjectCostVO> children, Integer ji);
-
-    ProjectCostHuijiListVO toHuijiListVOAndYs(ProjectCostHuiji huiji, List<ProjectCostVO> children, Integer ji,BigDecimal wxysSum, BigDecimal clysSum);
-
     @Mapping(target ="records",source ="results" )
     Page<ProjectCostHuijiListVO> toHuijiListVOPage(Page<ProjectCostHuiji> page, List<ProjectCostHuijiListVO> results);
 
-    @Mapping(target ="records",source ="results" )
-    Page<ProjectCostVO> toProjectCostListVOPage(Page<ProjectCost> page, List<ProjectCostVO> results);
-
 }