入职人员查询调整

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/CwProjectRecordsService.java

@@ -325,7 +325,9 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
         UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
         QueryWrapper<CwProjectRecords> queryWrapper = QueryWrapperGenerator.buildQueryCondition(CwProjectRecordsWrapper.INSTANCE.toEntity(cwProjectRecordsDTO), CwProjectRecords.class);
         queryWrapper.eq("a.del_flag", "0");
-        queryWrapper.eq("a.create_by_id", userDTO.getId());
+        if(!userDTO.isAdmin()){
+            queryWrapper.eq("a.create_by_id", userDTO.getId());
+        }
         if (ObjectUtil.isNotEmpty(cwProjectRecordsDTO)) {
             if (ArrayUtil.isNotEmpty(cwProjectRecordsDTO.getCreateDates())) {
                 queryWrapper.between("a.create_time", cwProjectRecordsDTO.getCreateDates()[0], cwProjectRecordsDTO.getCreateDates()[1]);

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/domain/EnrollmentRegistration.java

@@ -140,4 +140,7 @@ public class EnrollmentRegistration extends BaseEntity {
     @TableField(exist = false)
     private String loginName; //登录名
 
+    @TableField(exist = false)
+    private String[] createDates;
+
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentRegistrationService.java

@@ -110,6 +110,17 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
         if (StringUtils.isNotBlank(projectReportData.getCompanyId())) {
             queryWrapper.eq("so.parent_id", projectReportData.getCompanyId());
         }
+        if (StringUtils.isNotBlank(projectReportData.getLoginFlag())) {
+            queryWrapper.eq("u.login_flag", projectReportData.getLoginFlag());
+        }
+        if (StringUtils.isNotBlank(projectReportData.getPoliticalOutlook())) {
+            queryWrapper.eq("a.political_outlook", projectReportData.getPoliticalOutlook());
+        }
+
+        if (projectReportData.getCreateDates() != null && projectReportData.getCreateDates().length > 0) {
+            queryWrapper.between("a.entry_date", projectReportData.getCreateDates()[0], projectReportData.getCreateDates()[1]);
+        }
+
         IPage<EnrollmentRegistration> list = mapper.findList(page, queryWrapper);
         return list;
 
@@ -281,7 +292,7 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
 
             Map<String, String> newMap = pingMap(procDefId, procDefKey, businessTable, businessId, title, assignee, recordType);
             allMap.put("入职", newMap);
-            if (StringUtils.isBlank(reportData.getIsPc())) {
+            if ("2".equals(reportData.getIsPc())) {
                 SpringUtil.getBean(IFlowableApi.class).startForFenNew(allMap);
             }
             /*} else {