财务代码提交

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

@@ -7,6 +7,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
@@ -88,12 +89,17 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
             }
             if (StringUtils.isNotBlank(cwProjectRecordsDTO.getProjectMasterName())) {
                 List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, cwProjectRecordsDTO.getProjectMasterName()));
-                List<String> ids = userList.stream().distinct().map(User::getId).collect(Collectors.toList());
-                if (CollectionUtil.isNotEmpty(ids)) {
-                    queryWrapper.in("a.project_master_id", ids);
+                if (CollectionUtils.isNotEmpty(userList)){
+                    List<String> ids = userList.stream().distinct().map(User::getId).collect(Collectors.toList());
+                    if (CollectionUtil.isNotEmpty(ids)) {
+                        queryWrapper.in("a.project_master_id", ids);
+                    } else {
+                        return new Page<>();
+                    }
                 } else {
-                    return new Page<>();
+                    queryWrapper.in("a.project_master_id", cwProjectRecordsDTO.getProjectMasterName());
                 }
+
             }
             if (StringUtils.isNotBlank(cwProjectRecordsDTO.getRealHeaderName())) {
                 List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, cwProjectRecordsDTO.getRealHeaderName()));

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/domain/CwProjectReportData.java

@@ -68,7 +68,6 @@ public class CwProjectReportData extends BaseDTO {
     /**
      * 项目经理
      */
-    @Query(tableColumn = "e.name")
     @Excel(name = "项目经理",width = 12,orderNum = "6")
     private String projectMasterName;
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportService.java

@@ -37,6 +37,7 @@ import com.jeeplus.pubmodules.oss.service.OSSClientService;
 import com.jeeplus.pubmodules.oss.service.OssService;
 import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
 import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
+import com.jeeplus.sys.domain.User;
 import com.jeeplus.sys.service.UserService;
 import com.jeeplus.sys.mapper.UserMapper;
 import com.jeeplus.sys.service.dto.UserDTO;
@@ -446,10 +447,10 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             queryWrapper.eq("b.real_header", projectReportData.getProjectMaster2Id());
         }
         if (StringUtils.isNotEmpty(projectReportData.getProjectMasterName())) { // 项目经理1筛选
-            queryWrapper.like("e.name", projectReportData.getProjectMasterName());
+            queryWrapper.like("e.id", projectReportData.getProjectMasterName());
         }
         if (StringUtils.isNotEmpty(projectReportData.getRealHeaderName())) { // 项目经理2筛选
-            queryWrapper.like("f.name", projectReportData.getRealHeaderName());
+            queryWrapper.like("f.id", projectReportData.getRealHeaderName());
         }
         if (StringUtils.isNotEmpty(projectReportData.getCreateBy().getId())) {
             queryWrapper.like("a.create_by_id", projectReportData.getCreateBy().getId());

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/service/CwProjectReportArchiveService.java

@@ -7,6 +7,7 @@ import com.alibaba.druid.sql.dialect.odps.ast.OdpsStatisticClause;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
@@ -94,34 +95,56 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
                 // 项目经理1
                 if (StringUtils.isNotBlank(cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getProjectMasterName())){
                     List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getProjectMasterName()));
-                    List<String> userIdList = userList.stream().map(User::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
-                    if (CollectionUtil.isNotEmpty(userIdList)){
-                        List<CwProjectRecords> cwProjectRecords = cwProjectRecordsMapper.selectList(new QueryWrapper<CwProjectRecords>().lambda().in(CwProjectRecords::getProjectMasterId, userIdList));
+                    if (CollectionUtils.isNotEmpty(userList)){
+                        List<String> userIdList = userList.stream().map(User::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+                        if (CollectionUtil.isNotEmpty(userIdList)){
+                            List<CwProjectRecords> cwProjectRecords = cwProjectRecordsMapper.selectList(new QueryWrapper<CwProjectRecords>().lambda().in(CwProjectRecords::getProjectMasterId, userIdList));
+                            List<String> projectIds = cwProjectRecords.stream().map(CwProjectRecords::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+                            if (CollectionUtil.isNotEmpty(projectIds)){
+                                queryWrapper.in("cw_pa.project_id",projectIds);
+                            }else{
+                                return new Page<>();
+                            }
+                        }else{
+                            return new Page<>();
+                        }
+                    } else {
+                        List<CwProjectRecords> cwProjectRecords = cwProjectRecordsMapper.selectList(new QueryWrapper<CwProjectRecords>().lambda().eq(CwProjectRecords::getProjectMasterId, cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getProjectMasterName()));
                         List<String> projectIds = cwProjectRecords.stream().map(CwProjectRecords::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
                         if (CollectionUtil.isNotEmpty(projectIds)){
                             queryWrapper.in("cw_pa.project_id",projectIds);
                         }else{
                             return new Page<>();
                         }
-                    }else{
-                        return new Page<>();
                     }
+
                 }
                 // 项目经理2
                 if (StringUtils.isNotBlank(cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getRealHeaderName())){
                     List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getRealHeaderName()));
-                    List<String> userIdList = userList.stream().map(User::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
-                    if (CollectionUtil.isNotEmpty(userIdList)){
-                        List<CwProjectRecords> cwProjectRecords = cwProjectRecordsMapper.selectList(new QueryWrapper<CwProjectRecords>().lambda().in(CwProjectRecords::getRealHeader, userIdList));
+                    if (CollectionUtils.isNotEmpty(userList)){
+                        List<String> userIdList = userList.stream().map(User::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+                        if (CollectionUtil.isNotEmpty(userIdList)){
+                            List<CwProjectRecords> cwProjectRecords = cwProjectRecordsMapper.selectList(new QueryWrapper<CwProjectRecords>().lambda().in(CwProjectRecords::getRealHeader, userIdList));
+                            List<String> projectIds = cwProjectRecords.stream().map(CwProjectRecords::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+                            if (CollectionUtil.isNotEmpty(projectIds)){
+                                queryWrapper.in("cw_pa.project_id",projectIds);
+                            }else{
+                                return new Page<>();
+                            }
+                        }else{
+                            return new Page<>();
+                        }
+                    } else {
+                        List<CwProjectRecords> cwProjectRecords = cwProjectRecordsMapper.selectList(new QueryWrapper<CwProjectRecords>().lambda().in(CwProjectRecords::getRealHeader, cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getRealHeaderName()));
                         List<String> projectIds = cwProjectRecords.stream().map(CwProjectRecords::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
                         if (CollectionUtil.isNotEmpty(projectIds)){
                             queryWrapper.in("cw_pa.project_id",projectIds);
                         }else{
                             return new Page<>();
                         }
-                    }else{
-                        return new Page<>();
                     }
+
                 }
                 // 创建时间
                 if (ArrayUtil.isNotEmpty(cwProjectReportArchiveDTO.getCreateDates())){

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApply/service/ReportCancellApplyService.java

@@ -91,10 +91,10 @@ public class ReportCancellApplyService extends ServiceImpl<ReportCancellApplyMap
             queryWrapper.eq("d.real_header", projectReportData.getProjectMaster2Id());
         }
         if (StringUtils.isNotEmpty(projectReportData.getProjectMasterName())) { // 项目经理1筛选
-            queryWrapper.like("g.name", projectReportData.getProjectMasterName());
+            queryWrapper.like("g.id", projectReportData.getProjectMasterName());
         }
         if (StringUtils.isNotEmpty(projectReportData.getProjectMaster2Name())) { // 项目经理2筛选
-            queryWrapper.like("k.name", projectReportData.getProjectMaster2Name());
+            queryWrapper.like("k.id", projectReportData.getProjectMaster2Name());
         }
         if (StringUtils.isNotEmpty(projectReportData.getCreateBy().getId())) {
             queryWrapper.like("a.create_by_id", projectReportData.getCreateBy().getId());

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApplyArchived/service/ReportCancellApplyArchivedService.java

@@ -96,10 +96,10 @@ public class ReportCancellApplyArchivedService extends ServiceImpl<ReportCancell
             queryWrapper.eq("d.real_header", projectReportData.getProjectMaster2Id());
         }
         if (StringUtils.isNotEmpty(projectReportData.getProjectMasterName())) { // 项目经理1筛选
-            queryWrapper.like("g.name", projectReportData.getProjectMasterName());
+            queryWrapper.like("g.id", projectReportData.getProjectMasterName());
         }
         if (StringUtils.isNotEmpty(projectReportData.getProjectMaster2Name())) { // 项目经理2筛选
-            queryWrapper.like("k.name", projectReportData.getProjectMaster2Name());
+            queryWrapper.like("k.id", projectReportData.getProjectMaster2Name());
         }
         if (StringUtils.isNotEmpty(projectReportData.getCreateBy().getId())) {
             queryWrapper.like("a.create_by_id", projectReportData.getCreateBy().getId());

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/mapper/xml/CwWorkClientBillingMapper.xml

@@ -6,10 +6,10 @@
 
     <resultMap id="BaseResultMap" type="com.jeeplus.finance.workClientInfo.service.dto.CwWorkClientBillingDTO">
             <id property="id" column="id" jdbcType="VARCHAR"/>
-            <result property="createBy.id" column="create_by" jdbcType="VARCHAR"/>
-            <result property="createTime" column="create_date" jdbcType="TIMESTAMP"/>
-            <result property="updateBy.id" column="update_by" jdbcType="VARCHAR"/>
-            <result property="updateTime" column="update_date" jdbcType="TIMESTAMP"/>
+            <result property="createBy.id" column="create_by_id" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateBy.id" column="update_by_id" jdbcType="VARCHAR"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
             <result property="delFlag" column="del_flag" jdbcType="INTEGER"/>
             <result property="remarks" column="remarks" jdbcType="VARCHAR"/>
             <result property="clientId" column="client_id" jdbcType="VARCHAR"/>
@@ -24,10 +24,10 @@
 
     <sql id="Billing_Column_List">
         cw_wcbi.id,
-        cw_wcbi.create_by,
-        cw_wcbi.create_date,
-        cw_wcbi.update_by,
-        cw_wcbi.update_date,
+        cw_wcbi.create_by_id,
+        cw_wcbi.create_time,
+        cw_wcbi.update_by_id,
+        cw_wcbi.update_time,
         cw_wcbi.del_flag,
         cw_wcbi.remarks,
         cw_wcbi.client_id,