导入修改

jwtech-admin/src/main/java/com/kms/config/WaterRequestUtil.java

@@ -270,7 +270,7 @@ public class WaterRequestUtil {
         log.info("--------请求获取门户用户信息,请求地址为:"+usersUrl);
         HashMap<String, Object> hashMap = new HashMap<>();
         hashMap.put("page",1);
-        hashMap.put("size",100);
+        hashMap.put("size",99999);
         hashMap.put("systemCode",systemCode);
         HttpRequest get = createPost(usersUrl,usersServiceId,usersAppsecret);
         HttpResponse response = get.body(JSONObject.toJSONString(hashMap))

jwtech-admin/src/main/java/com/kms/config/scheduled/WaterScheduled.java

@@ -75,7 +75,7 @@ public class WaterScheduled {
             QueryWrapper<SysUser> query = Wrappers.query();
             query.eq("single_user_id",id);
             SysUser user = userService.getOne(query,false);
-            Boolean flag = (user==null);
+            Boolean flag = (ObjectUtil.isEmpty(user));
             if(flag){
                 user = new SysUser();
                 user.preInsert();

jwtech-pc/src/main/java/com/kms/web/controller/system/SysLoginController.java

@@ -164,42 +164,11 @@ public class SysLoginController extends BaseController {
 	 *
 	 * @return
 	 */
-	@GetMapping("/returnToken")
+
-	public AjaxResult returnToken(
-			@RequestParam(name = "token")String token){
-		WaterResult waterResult = waterRequestUtil.authUser(token);
-		JSONObject jsonObject = JSONObject.parseObject(waterResult.getData());
-		String user = jsonObject.getString("user");
-		JSONObject userJsonObject = JSONObject.parseObject(user);
-		String uid = userJsonObject.getString("id");
-		QueryWrapper<SysUser> query = Wrappers.query();
-		query.eq("single_user_id",uid);
-		List<SysUser> list = userService.list(query);
-		if(list.isEmpty()){
-			return AjaxResult.error("登录用户不存在，请同步用户");
-		}
-		AjaxResult ajax = AjaxResult.success();
-		SysUser sysUser = list.get(0);
-		if (UserStatus.DELETED.getCode().equals(sysUser.getDelFlag())) {
-			log.info(" ：{} 已被删除.", sysUser.getUserName());
-			AsyncManager.me().execute(AsyncFactory.recordLogininfor(sysUser.getUserName(), Constants.LOGIN_FAIL, "账户已删除"));
-			return  AjaxResult.error("对不起，您的账号：" + sysUser.getUserName() + " 已被删除");
-		} else if (UserStatus.DISABLE.getCode().equals(sysUser.getStatus())) {
-			log.info("登录用户：{} 已被停用.", sysUser.getUserName());
-			AsyncManager.me().execute(AsyncFactory.recordLogininfor(sysUser.getUserName(), Constants.LOGIN_FAIL, "账户已停用"));
-			return  AjaxResult.error("对不起，您的账号：" + sysUser.getUserName() + " 已停用");
-		}
-		AsyncManager.me().execute(AsyncFactory.recordLogininfor(sysUser.getUserName(), Constants.LOGIN_SUCCESS, "登录成功"));
-		StpUtil.login(sysUser.getId());
-		StpUtil.getSession().set("jianwei-user",user);
-		String tokenValue = StpUtil.getTokenValue();
-		ajax.put("token",tokenValue);
-		return ajax;
-	}
 
 
 	@GetMapping("/signOnLogin")
-	public ModelAndView signOnLogin(HttpServletRequest request,
+	public AjaxResult signOnLogin(HttpServletRequest request,
 								  HttpServletResponse response,
 								  @RequestParam(name = "token")String token) throws IOException {
 		WaterResult waterResult = waterRequestUtil.authUser(token);
@@ -231,46 +200,46 @@ public class SysLoginController extends BaseController {
 		ajax.put("token",tokenValue);
 		RedirectView redirectView = new RedirectView(redirect+"?token="+tokenValue);
 		ModelAndView modelAndView = new ModelAndView(redirectView);
-		return modelAndView;
+		return  ajax;
 	}
 
 
-	@GetMapping("/signOnLogin")
+//	@GetMapping("/signOnLogin")
-	public ModelAndView signOnLogin(HttpServletRequest request,
+//	public ModelAndView signOnLogin(HttpServletRequest request,
-									HttpServletResponse response,
+//									HttpServletResponse response,
-									@RequestParam(name ="page",required = false) String page,
+//									@RequestParam(name ="page",required = false) String page,
-									@RequestParam(name = "token")String token) throws IOException {
+//									@RequestParam(name = "token")String token) throws IOException {
-		WaterResult waterResult = waterRequestUtil.authUser(token);
+//		WaterResult waterResult = waterRequestUtil.authUser(token);
-		JSONObject jsonObject = JSONObject.parseObject(waterResult.getData());
+//		JSONObject jsonObject = JSONObject.parseObject(waterResult.getData());
-		String user = jsonObject.getString("user");
+//		String user = jsonObject.getString("user");
-		JSONObject userJsonObject = JSONObject.parseObject(user);
+//		JSONObject userJsonObject = JSONObject.parseObject(user);
-		String uid = userJsonObject.getString("id");
+//		String uid = userJsonObject.getString("id");
-		QueryWrapper<SysUser> query = Wrappers.query();
+//		QueryWrapper<SysUser> query = Wrappers.query();
-		query.eq("single_user_id",uid);
+//		query.eq("single_user_id",uid);
-		List<SysUser> list = userService.list(query);
+//		List<SysUser> list = userService.list(query);
-		if(list.isEmpty()){
+//		if(list.isEmpty()){
-			throw new CustomException("登录用户不存在，请同步用户");
+//			throw new CustomException("登录用户不存在，请同步用户");
-		}
+//		}
-		AjaxResult ajax = AjaxResult.success();
+//		AjaxResult ajax = AjaxResult.success();
-		SysUser sysUser = list.get(0);
+//		SysUser sysUser = list.get(0);
-		if (UserStatus.DELETED.getCode().equals(sysUser.getDelFlag())) {
+//		if (UserStatus.DELETED.getCode().equals(sysUser.getDelFlag())) {
-			log.info(" ：{} 已被删除.", sysUser.getUserName());
+//			log.info(" ：{} 已被删除.", sysUser.getUserName());
-			AsyncManager.me().execute(AsyncFactory.recordLogininfor(sysUser.getUserName(), Constants.LOGIN_FAIL, "账户已删除"));
+//			AsyncManager.me().execute(AsyncFactory.recordLogininfor(sysUser.getUserName(), Constants.LOGIN_FAIL, "账户已删除"));
-			throw new BaseException("对不起，您的账号：" + sysUser.getUserName() + " 已被删除");
+//			throw new BaseException("对不起，您的账号：" + sysUser.getUserName() + " 已被删除");
-		} else if (UserStatus.DISABLE.getCode().equals(sysUser.getStatus())) {
+//		} else if (UserStatus.DISABLE.getCode().equals(sysUser.getStatus())) {
-			log.info("登录用户：{} 已被停用.", sysUser.getUserName());
+//			log.info("登录用户：{} 已被停用.", sysUser.getUserName());
-			AsyncManager.me().execute(AsyncFactory.recordLogininfor(sysUser.getUserName(), Constants.LOGIN_FAIL, "账户已停用"));
+//			AsyncManager.me().execute(AsyncFactory.recordLogininfor(sysUser.getUserName(), Constants.LOGIN_FAIL, "账户已停用"));
-			throw new BaseException("对不起，您的账号：" + sysUser.getUserName() + " 已停用");
+//			throw new BaseException("对不起，您的账号：" + sysUser.getUserName() + " 已停用");
-		}
+//		}
-		AsyncManager.me().execute(AsyncFactory.recordLogininfor(sysUser.getUserName(), Constants.LOGIN_SUCCESS, "登录成功"));
+//		AsyncManager.me().execute(AsyncFactory.recordLogininfor(sysUser.getUserName(), Constants.LOGIN_SUCCESS, "登录成功"));
-		StpUtil.login(sysUser.getId());
+//		StpUtil.login(sysUser.getId());
-		StpUtil.getSession().set("jianwei-user",user);
+//		StpUtil.getSession().set("jianwei-user",user);
-		String tokenValue = StpUtil.getTokenValue();
+//		String tokenValue = StpUtil.getTokenValue();
-		ajax.put("token",tokenValue);
+//		ajax.put("token",tokenValue);
-		RedirectView redirectView = new RedirectView(redirect+"?token="+tokenValue+"&page="+page);
+//		RedirectView redirectView = new RedirectView(redirect+"?token="+tokenValue+"&page="+page);
-		ModelAndView modelAndView = new ModelAndView(redirectView);
+//		ModelAndView modelAndView = new ModelAndView(redirectView);
-		return modelAndView;
+//		return modelAndView;
-	}
+//	}
 
 
 

jwtech-pc/src/main/java/com/kms/web/controller/system/TokenController.java

@@ -0,0 +1,84 @@
+package com.kms.web.controller.system;
+
+import cn.dev33.satoken.stp.StpUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.jianwei.common.constant.Constants;
+import com.jianwei.common.core.domain.AjaxResult;
+import com.jianwei.common.core.domain.entity.SysUser;
+import com.jianwei.common.core.redis.RedisCache;
+import com.jianwei.common.enums.UserStatus;
+import com.kms.config.WaterRequestUtil;
+import com.kms.config.WaterResult;
+import com.kms.framework.manager.AsyncManager;
+import com.kms.framework.manager.factory.AsyncFactory;
+import com.kms.framework.web.service.SysPermissionService;
+import com.kms.system.service.SysMenuService;
+import com.kms.system.service.SysUserService;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+@RestController
+@Log4j2
+@RequestMapping("/token")
+public class TokenController {
+
+
+    @Autowired
+    private SysMenuService menuService;
+
+    @Autowired
+    private SysPermissionService permissionService;
+    @Autowired
+    private SysUserService userService;
+    @Autowired
+    private RedisCache redisCache;
+    @Autowired
+    private WaterRequestUtil waterRequestUtil;
+    @Value("${water.redirect}")
+    private String redirect;
+
+
+
+    @GetMapping("/returnToken")
+    public AjaxResult returnToken(
+            @RequestParam(name = "token")String token){
+        WaterResult waterResult = waterRequestUtil.authUser(token);
+        JSONObject jsonObject = JSONObject.parseObject(waterResult.getData());
+        String user = jsonObject.getString("user");
+        JSONObject userJsonObject = JSONObject.parseObject(user);
+        String uid = userJsonObject.getString("id");
+        QueryWrapper<SysUser> query = Wrappers.query();
+        query.eq("single_user_id",uid);
+        List<SysUser> list = userService.list(query);
+        if(list.isEmpty()){
+            return AjaxResult.error("登录用户不存在，请同步用户");
+        }
+        AjaxResult ajax = AjaxResult.success();
+        SysUser sysUser = list.get(0);
+        if (UserStatus.DELETED.getCode().equals(sysUser.getDelFlag())) {
+            log.info(" ：{} 已被删除.", sysUser.getUserName());
+            AsyncManager.me().execute(AsyncFactory.recordLogininfor(sysUser.getUserName(), Constants.LOGIN_FAIL, "账户已删除"));
+            return  AjaxResult.error("对不起，您的账号：" + sysUser.getUserName() + " 已被删除");
+        } else if (UserStatus.DISABLE.getCode().equals(sysUser.getStatus())) {
+            log.info("登录用户：{} 已被停用.", sysUser.getUserName());
+            AsyncManager.me().execute(AsyncFactory.recordLogininfor(sysUser.getUserName(), Constants.LOGIN_FAIL, "账户已停用"));
+            return  AjaxResult.error("对不起，您的账号：" + sysUser.getUserName() + " 已停用");
+        }
+        AsyncManager.me().execute(AsyncFactory.recordLogininfor(sysUser.getUserName(), Constants.LOGIN_SUCCESS, "登录成功"));
+        StpUtil.login(sysUser.getId());
+        StpUtil.getSession().set("jianwei-user",user);
+        String tokenValue = StpUtil.getTokenValue();
+        ajax.put("token",tokenValue);
+        return ajax;
+    }
+}

jwtech-quartz/src/main/java/com/jwtech/quartz/task/evaluateTask.java

@@ -183,9 +183,10 @@ public class evaluateTask {
         Date date1 = Date.from(date.atStartOfDay(ZoneId.systemDefault()).toInstant());
 
         for (BsSgcJsjdBuiConstrMeas bsSgcJsjdBuiConstrMeas:list){
-            BsSgcjsjdBuiProInfo one = bsSgcjsjdBuiProInfoService.getOne(new QueryWrapper<BsSgcjsjdBuiProInfo>()
+            List<BsSgcjsjdBuiProInfo> list1 = bsSgcjsjdBuiProInfoService.list(new QueryWrapper<BsSgcjsjdBuiProInfo>()
                     .eq("PRO_NO", bsSgcJsjdBuiConstrMeas.getProNo())
-                    .eq("PRO_CODE", bsSgcJsjdBuiConstrMeas.getProCode()));
+                    .eq("PRO_CODE", bsSgcJsjdBuiConstrMeas.getProCode()).orderByAsc("approval_time1"));
+            BsSgcjsjdBuiProInfo one=list1.get(0);
             LocalDate localDate =null;
             if (ObjectUtil.isNotEmpty(one.getPlannedCompletionDate())){
             localDate = one.getPlannedCompletionDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();}

jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiRealNameController.java

@@ -11,10 +11,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.jianwei.common.core.controller.BaseController;
 import com.jianwei.common.core.domain.SearchParam;
+import com.jianwei.common.core.domain.entity.SysDictData;
+import com.jianwei.common.utils.StringUtils;
 import com.jianwei.common.utils.poi.ExcelUtil;
 import com.kms.build.domain.BsSgcJsjdBuiRealNameExcel;
 import com.kms.build.domain.vo.BsSgcJsjdBuiAttendanceInformationExcel;
 import com.kms.common.utils.BaseEntityUtils;
+import com.kms.framework.web.domain.server.Sys;
+import com.kms.system.service.SysDictDataService;
 import org.springframework.beans.BeanUtils;
 
 import io.swagger.annotations.Api;
@@ -48,6 +52,9 @@ public class BsSgcJsjdBuiRealNameController extends BaseController
     @Autowired
     private BsSgcJsjdBuiRealNameService bsSgcJsjdBuiRealNameService;
 
+    @Autowired
+    private SysDictDataService sysDictDataService;
+
     /**
      * 查询农民工人员实名制信息列表
      */
@@ -131,7 +138,7 @@ public class BsSgcJsjdBuiRealNameController extends BaseController
     @ApiOperation("农民工实名制信息导入模板导出")
     public AjaxResult  exportTemplate(){
         ExcelUtil<BsSgcJsjdBuiRealNameExcel>util=new ExcelUtil<>(BsSgcJsjdBuiRealNameExcel.class);
-        return util.exportExcel(new ArrayList<>(),"农民工花名册导入模板导出");
+        return util.exportExcel(new ArrayList<>(),"农民工花名册导入模板");
     }
 
 

jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiRealNameExcel.java

@@ -1,10 +1,13 @@
 package com.kms.build.domain;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jianwei.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class BsSgcJsjdBuiRealNameExcel {
     /** $column.columnComment */
@@ -12,12 +15,33 @@ public class BsSgcJsjdBuiRealNameExcel {
     @ApiModelProperty("姓名")
     private String name;
 
+    @Excel(name = "籍贯")
+    private String native_place;
+
     /** 身份证号码 */
     @Excel(name = "身份证",cellType = Excel.ColumnType.STRING)
     @ApiModelProperty("身份证号码")
     private String idNo;
 
-
     @Excel(name = "手机号")
     private String phone;
+
+    /** 政治面貌 */
+    @Excel(name = "政治面貌")
+    private String politicalAffiliation;
+
+    @Excel(name = "所属单位")
+    private String belowUnit;
+
+    @Excel(name = "所属单位统一社会信用代码")
+    private String socialCreditCode;
+
+
+    @Excel(name="进场日期",width = 20)
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    private Date admissionTime;
+
+    @Excel(name="离职日期",width = 20)
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    private Date exitTime;
 }

jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java

@@ -44,7 +44,8 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper<BsSgcjsjdBuiProInf
                                            @Param("pageNum") int pageNum,
                                            @Param("pageSize") int pageSize,
                                            @Param("proNo") String proNo,
-                                           @Param("proCode")String proCode);
+                                           @Param("proCode")String proCode,
+                                           @Param("isMajor")String isMajor);
 
     IPage<BsSgcjsjdBuiProInfo> selectManagePage(@Param("userId") String userId,
                                                 @Param("userType") String userType,

jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiGzjbService.java

@@ -10,8 +10,12 @@ import com.jianwei.common.core.domain.entity.SysDept;
 import com.jianwei.common.core.domain.entity.SysUser;
 import com.kms.build.domain.BsSgcjsjdBuiProInfo;
 import com.kms.build.domain.dto.GzjbDto;
+import com.kms.build.mapper.BsSgcJsjdBuiSalaryEnsureMapper;
 import com.kms.build.mapper.BsSgcjsjdBuiProInfoMapper;
 import com.kms.common.utils.UserUtils;
+import com.kms.earlyStage.mapper.BsSlgcQqjdLybzjMapper;
+import com.kms.earlyStage.mapper.BsSlgcQqjdTbbzjMapper;
+import com.kms.earlyStage.mapper.BsSlgcQqjdZlbzjMapper;
 import com.kms.system.service.SysDeptService;
 import com.kms.system.service.SysXzqhService;
 import io.swagger.annotations.ApiOperation;
@@ -44,6 +48,18 @@ public class BsSgcJsjdBuiGzjbService extends BaseService<BsSgcJsjdBuiGzjbMapper,
     @Autowired
     private SysXzqhService sysXzqhService;
 
+    @Autowired
+    BsSgcJsjdBuiSalaryEnsureMapper bsSgcJsjdBuiSalaryEnsureMapper;
+
+    @Autowired
+    BsSlgcQqjdTbbzjMapper bsSlgcQqjdTbbzjMapper;
+
+    @Autowired
+    BsSlgcQqjdLybzjMapper bsSlgcQqjdLybzjMapper;
+
+    @Autowired
+    BsSlgcQqjdZlbzjMapper bsSlgcQqjdZlbzjMapper;
+
     public IPage listById(SearchParam<BsSgcJsjdBuiGzjb> sp) {
 
         SysUser sysUser = UserUtils.getUser();
@@ -66,7 +82,9 @@ public class BsSgcJsjdBuiGzjbService extends BaseService<BsSgcJsjdBuiGzjbMapper,
                 "create_time",
                 sp.getPageNum(), sp.getPageSize());
 
-
+//        for (GzjbDto gz:list){
+//
+//        }
         Page<GzjbDto> page = new Page<>();
 
         page.setTotal(list.size());

jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java

@@ -12,6 +12,7 @@ import com.jianwei.common.core.domain.entity.SysDept;
 import com.jianwei.common.core.domain.entity.SysUser;
 import com.jianwei.common.core.service.BaseService;
 import com.jianwei.common.mybaitsplus.BeanToWrapper;
+import com.jianwei.common.utils.StringUtils;
 import com.jwtech.util.StringUtil;
 import com.kms.build.domain.*;
 import com.kms.build.domain.dto.AssertStatisticsDto;
@@ -141,14 +142,22 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
         assert sysUser != null;
         List<BsSgcjsjdBuiProInfo> list = null;
 
+        String isMajor=null;
+        if(StringUtils.isNotEmpty(sp.getData().getIsMajorProject())) {
+            if (sp.getData().getIsMajorProject().equals("1")) {
+                isMajor = "zd";
+            } else if (sp.getData().getIsMajorProject().equals("0")) {
+                isMajor = "ms";
+            }
+        }
 
         if (ObjectUtil.isNull(params)) {
             list = bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(),
                     sysXzqhService.getSubString(data.getAdcd()),
-                    "create_time", sp.getPageNum(), sp.getPageSize(),sp.getData().getProNo(),sp.getData().getProCode());
+                    "create_time", sp.getPageNum(), sp.getPageSize(),sp.getData().getProNo(),sp.getData().getProCode(),isMajor);
         } else {
             list = bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getId(), sysUser.getUserType(), data.getId(),
-                    data.getProjectName(), sysXzqhService.getSubString(data.getAdcd()), (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize(),sp.getData().getProNo(),sp.getData().getProCode());
+                    data.getProjectName(), sysXzqhService.getSubString(data.getAdcd()), (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize(),sp.getData().getProNo(),sp.getData().getProCode(),isMajor);
         }
 
 
@@ -184,13 +193,15 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
                     record.setProjectName(one.getProjectName());
                     record.setAdcd(one.getAdcd());
                 }
+                if (ObjectUtil.isEmpty(record.getProNo())){
+                    record.setProNo(record.getId());
+                }
                 bsSgcjsjdBuiProInfoMapper.updateById(record);
             }
         }
         page.setRecords(records);
         page.setTotal(records.size());
         return page;
-
     }
 
     public IPage<BsSgcjsjdBuiProInfo> selectManagePage(SearchParam<BsSgcjsjdBuiProInfo> sp) {

jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiNmgStatisticsService.java

@@ -1,6 +1,7 @@
 package com.kms.statistics.service;
 
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -83,8 +84,41 @@ public class BsSgcJsjdBuiNmgStatisticsService {
                         }
                         map.put(year,bsSgcJsjdNmgStatisticVo1);
                     }
+                    if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiRealName.getExitTime())){
+                        long l = DateUtil.betweenYear(bsSgcJsjdBuiRealName.getAdmissionTime(), bsSgcJsjdBuiRealName.getExitTime(), true);
+                        for (int i=1;l>i;i++){
+                            year=year+1;
+                            if (map.containsKey(year)){
+                                BsSgcJsjdNmgStatisticVo o = (BsSgcJsjdNmgStatisticVo) map.get(year);
+                                o.setTotalNum(String.valueOf(Integer.parseInt(o.getTotalNum())+1));
+                                if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiRealName.getExitTime())){
+                                    o.setExitNum(String.valueOf(Integer.parseInt(o.getExitNum())+1));
+                                }
+                                if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiRealName.getAdmissionTime())){
+                                    o.setPresentNum(String.valueOf(Integer.parseInt(o.getPresentNum()+1)));
+                                }
+                                map.put(year,o);
+                            }else {
+                                bsSgcJsjdNmgStatisticVo1.setProjectName(bs.getProjectName());
+                                bsSgcJsjdNmgStatisticVo1.setTotalNum("1");
+                                bsSgcJsjdNmgStatisticVo1.setCurrentTime(year);
+                                if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiRealName.getExitTime())){
+                                    bsSgcJsjdNmgStatisticVo1.setExitNum("1");
+                                }else {
+                                    bsSgcJsjdNmgStatisticVo1.setExitNum("0");
                                 }
+                                if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiRealName.getAdmissionTime())){
+                                    bsSgcJsjdNmgStatisticVo1.setPresentNum("1");
+                                }else {
+                                    bsSgcJsjdNmgStatisticVo1.setPresentNum("0");
                                 }
+                                map.put(year,bsSgcJsjdNmgStatisticVo1);
+                            }
+                        }
+                    }
+                }
+            }
+
 
             for (BsSgcJsjdBuiSalaryPayable bsSgcJsjdBuiSalaryPayable:bsSgcJsjdBuiSalaryPayables){
                 LocalDate localDate = bsSgcJsjdBuiSalaryPayable.getSalaryTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();

jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml

@@ -155,6 +155,9 @@
                 <if test="proNo != null and proNo != ''">
                     and pi.PRO_NO=#{proNo}
                 </if>
+                <if test="isMajor != null and isMajor != ''">
+                    and pi.IS_MAJOR=#{isMajor}
+                </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
             order by pi.${orderBy} desc LIMIT #{pageNum},#{pageSize};
@@ -170,6 +173,9 @@
                 <if test="proNo != null and proNo != ''">
                     and pi.PRO_NO=#{proNo}
                 </if>
+                <if test="isMajor != null and isMajor != ''">
+                    and pi.IS_MAJOR=#{isMajor}
+                </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
             order by pi.${orderBy} desc LIMIT #{pageNum},#{pageSize};