财务代码提交

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/service/ContractFilePaperService.java

@@ -112,9 +112,10 @@ public class ContractFilePaperService {
         file.setUpdateTime(new Date());
         mapper.insert(file);
         List<WorkAttachmentInfo> list = filePaper.getContractProperList();
-        if (CollectionUtils.isNotEmpty(list)) {
-            saveFiles(list, userDTO, id);
-        }
+//        if (CollectionUtils.isNotEmpty(list)) {
+//            saveFiles(list, userDTO, id);
+//        }
+        saveFiles(list, userDTO, id);
         return id;
     }
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/service/dto/CwWorkContractBorrowDto.java

@@ -3,6 +3,7 @@ package com.jeeplus.finance.contractRegistration.service.dto;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.service.dto.BaseDTO;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -27,9 +28,11 @@ public class CwWorkContractBorrowDto extends BaseDTO {
 
     private String borrowName;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date borrowData;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date borrowRetData;
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectBusinessType/mapper/CwProjectBusinessTypeMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.finance.projectBusinessType.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
@@ -13,6 +14,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 @Mapper
+@InterceptorIgnore(tenantLine = "true")
 public interface CwProjectBusinessTypeMapper extends BaseMapper<CwProjectBusinessType> {
 
     public IPage<CwProjectBusinessTypeDTO> findList(Page<CwProjectBusinessTypeDTO> page, @Param(Constants.WRAPPER) QueryWrapper<CwProjectBusinessType> queryWrapper);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/CwManHourManagementMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.finance.projectRecords.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -18,6 +19,7 @@ import java.util.List;
  * @version: 2022-11-10 14:56
  */
 @Mapper
+@InterceptorIgnore(tenantLine = "true")
 public interface CwManHourManagementMapper extends BaseMapper<CwManHourManagement> {
     /**
      * 查询项目数据集合

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/CwProjectClientInfoMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.finance.projectRecords.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.finance.projectRecords.domain.CwProjectClientInfo;
 import org.apache.ibatis.annotations.Mapper;
@@ -8,6 +9,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @Entity generator.domain.CwProjectClientInfo
  */
 @Mapper
+@InterceptorIgnore(tenantLine = "true")
 public interface CwProjectClientInfoMapper extends BaseMapper<CwProjectClientInfo> {
 
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/CwProjectRecordsMapper.java

@@ -21,6 +21,7 @@ import java.util.List;
  * @version: 2022-11-10 14:56
  */
 @Mapper
+@InterceptorIgnore(tenantLine = "true")
 public interface CwProjectRecordsMapper extends BaseMapper<CwProjectRecords> {
     /**
      * 查询项目数据集合
@@ -68,7 +69,6 @@ public interface CwProjectRecordsMapper extends BaseMapper<CwProjectRecords> {
 
     List<String> isUseByFinance(String[] idArray);
 
-    @InterceptorIgnore(tenantLine = "true")
     void updatereportReviewById(CwProjectRecords records);
 
     @InterceptorIgnore(tenantLine = "true")

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

@@ -92,7 +92,23 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
                 queryWrapper.between("a.create_time", cwProjectRecordsDTO.getCreateDates()[0], cwProjectRecordsDTO.getCreateDates()[1]);
             }
             if (StringUtils.isNotBlank(cwProjectRecordsDTO.getProjectMasterName())) {
-                List<User> userList = SpringUtil.getBean ( IUserApi.class ).selectListByName(cwProjectRecordsDTO.getProjectMasterName());
+                queryWrapper.in("a.project_master_id", cwProjectRecordsDTO.getProjectMasterName());
+//                UserDTO user = SpringUtil.getBean ( IUserApi.class ).getById(cwProjectRecordsDTO.getProjectMasterName());
+//                List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, cwProjectRecordsDTO.getProjectMasterName()));
+//                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 {
+//                    queryWrapper.in("a.project_master_id", cwProjectRecordsDTO.getProjectMasterName());
+//                }
+
+            }
+            if (StringUtils.isNotBlank(cwProjectRecordsDTO.getProjectMasterName2())) {
+                List<User> userList = SpringUtil.getBean ( IUserApi.class ).selectListByName(cwProjectRecordsDTO.getProjectMasterName2());
 //                List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, cwProjectRecordsDTO.getProjectMasterName()));
                 if (CollectionUtils.isNotEmpty(userList)){
                     List<String> ids = userList.stream().distinct().map(User::getId).collect(Collectors.toList());
@@ -104,16 +120,16 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
                 } else {
                     queryWrapper.in("a.project_master_id", cwProjectRecordsDTO.getProjectMasterName());
                 }
-
             }
             if (StringUtils.isNotBlank(cwProjectRecordsDTO.getRealHeaderName())) {
-                List<User> userList = SpringUtil.getBean ( IUserApi.class ).selectListByName(cwProjectRecordsDTO.getRealHeaderName());
-                List<String> ids = userList.stream().distinct().map(User::getId).collect(Collectors.toList());
-                if (CollectionUtil.isNotEmpty(ids)) {
-                    queryWrapper.in("a.real_header", ids);
-                } else {
-                    return new Page<>();
-                }
+                queryWrapper.in("a.real_header", cwProjectRecordsDTO.getRealHeaderName());
+//                List<User> userList = SpringUtil.getBean ( IUserApi.class ).selectListByName(cwProjectRecordsDTO.getRealHeaderName());
+//                List<String> ids = userList.stream().distinct().map(User::getId).collect(Collectors.toList());
+//                if (CollectionUtil.isNotEmpty(ids)) {
+//                    queryWrapper.in("a.real_header", ids);
+//                } else {
+//                    return new Page<>();
+//                }
             }
             if (StringUtils.isNotBlank(cwProjectRecordsDTO.getCreateId())){
                 queryWrapper.eq("a.create_by_id", cwProjectRecordsDTO.getCreateId());

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

@@ -116,6 +116,7 @@ public class CwProjectRecordsDTO extends BaseDTO {
     @Excel(name = "项目经理",width = 25,orderNum = "3")
     private String projectMasterName;
 
+    private String projectMasterName2;
     /**
      * 时间查询
      */

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/CwProjectInfoMapper.java

@@ -91,6 +91,7 @@ public interface CwProjectInfoMapper extends BaseMapper<CwProjectInfoData> {
      * 根据报告id修改报告文号
      * @param
      */
+    @InterceptorIgnore(tenantLine = "true")
     void updateReportNoByReportId(@Param("reportId")String reportId,
                           @Param("reportNo")String reportNo);
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/CwProjectReportMapper.java

@@ -22,6 +22,7 @@ import java.util.List;
  * @create: 2022-11-16 14:17
  **/
 @Mapper
+@InterceptorIgnore(tenantLine = "true")
 public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
 
     /**
@@ -30,6 +31,7 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
      * @param queryWrapper
      * @return
      */
+    @InterceptorIgnore(tenantLine = "true")
     IPage<CwProjectReportData> findList(Page<CwProjectReportData> page, @Param("currentUser") UserDTO currentUser, @Param("isBmzr") String isBmzr, @Param("officeIds") String officeIds, @Param(Constants.WRAPPER) QueryWrapper<CwProjectReportData> queryWrapper);
 
     @InterceptorIgnore(tenantLine = "true")
@@ -49,6 +51,7 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
      * @param queryWrapper
      * @return
      */
+    @InterceptorIgnore(tenantLine = "true")
     public IPage<CwWorkClientBaseDTO> findClineList(Page<CwWorkClientBaseDTO> page, @Param(Constants.WRAPPER) QueryWrapper<CwWorkClientBase> queryWrapper);
 
     @InterceptorIgnore(tenantLine = "true")

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/CwProjectReportReviewMapper.java

@@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Param;
  * @create: 2022-12-12 20:35
  **/
 @Mapper
+@InterceptorIgnore(tenantLine = "true")
 public interface CwProjectReportReviewMapper extends BaseMapper<CwProjectReview> {
 
     @InterceptorIgnore(tenantLine = "true")

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

@@ -1938,10 +1938,10 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             }
         }
         if (StringUtils.isNotEmpty(cwWorkClientBaseDTO.getName())){
-            queryWrapper.eq("cw_wcb.name", cwWorkClientBaseDTO.getName());
+            queryWrapper.like("cw_wcb.name", cwWorkClientBaseDTO.getName());
         }
         if (StringUtils.isNotEmpty(cwWorkClientBaseDTO.getNo())){
-            queryWrapper.eq("cw_wcb.no", cwWorkClientBaseDTO.getNo());
+            queryWrapper.like("cw_wcb.no", cwWorkClientBaseDTO.getNo());
         }
         queryWrapper.orderByDesc("cw_wcb.create_time");
         IPage<CwWorkClientBaseDTO> list = reportMapper.findClineList(page, queryWrapper);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/mapper/CwProjectReportArchiveDetailMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.finance.projectReportArchive.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,6 +12,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 @Mapper
+@InterceptorIgnore(tenantLine = "true")
 public interface CwProjectReportArchiveDetailMapper extends BaseMapper<CwProjectReportArchiveDetail> {
 
     IPage<CwProjectReportArchiveDetailDTO> findList(Page<CwProjectReportArchiveDetailDTO> page, @Param(Constants.WRAPPER) QueryWrapper<CwProjectReportArchiveDetail> queryWrapper, @Param("cwProjectReportArchiveDetailDTO") CwProjectReportArchiveDetailDTO cwProjectReportArchiveDetailDTO);

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

@@ -167,13 +167,14 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
                 // 创建人
                 if (ObjectUtil.isNotEmpty(cwProjectReportArchiveDTO.getCreateBy())){
                     if (StringUtils.isNotBlank(cwProjectReportArchiveDTO.getCreateBy().getName())){
-                        List<User> userList = SpringUtil.getBean ( IUserApi.class ).selectListByName(cwProjectReportArchiveDTO.getCreateBy().getName());
-                        List<String> ids = userList.stream().map(User::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
-                        if (CollectionUtil.isNotEmpty(ids)){
-                            queryWrapper.in("cw_pa.create_by_id",ids);
-                        }else{
-                            return new Page<>();
-                        }
+//                        List<User> userList = SpringUtil.getBean ( IUserApi.class ).selectListByName(cwProjectReportArchiveDTO.getCreateBy().getName());
+//                        List<String> ids = userList.stream().map(User::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+//                        if (CollectionUtil.isNotEmpty(ids)){
+//                            queryWrapper.in("cw_pa.create_by_id",ids);
+//                        }else{
+//                            return new Page<>();
+//                        }
+                        queryWrapper.in("cw_pa.create_by_id",cwProjectReportArchiveDTO.getCreateBy().getName());
                     }
                 }
                 // 报告文号

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportAuditSheet/mapper/CwProofreadTypeMapper.java

@@ -13,6 +13,7 @@ import java.util.List;
  * @author: 王强
  * @create: 2022-12-08 09:19
  **/
+@InterceptorIgnore(tenantLine = "true")
 public interface CwProofreadTypeMapper extends BaseMapper<CwProofreadType>, TreeMapper<CwProofreadType> {
     @InterceptorIgnore(tenantLine = "true")
     List<CwProofreadDetail> prooList(@Param("type")String type);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApply/mapper/ReportCancellApplyMapper.java

@@ -27,7 +27,7 @@ public interface ReportCancellApplyMapper extends BaseMapper<ReportCancellApply>
      */
     @InterceptorIgnore(tenantLine = "true")
     IPage<ReportInfoDto> getList(Page<ReportInfoDto> page, @Param(Constants.WRAPPER) QueryWrapper<ReportInfoDto> queryWrapper, @Param("officeIds") String officeIds);
-
+    @InterceptorIgnore(tenantLine = "true")
     ReportInfoDto queryById(@Param("id") String id);
 
     /**
@@ -36,12 +36,12 @@ public interface ReportCancellApplyMapper extends BaseMapper<ReportCancellApply>
      * @param queryWrapper
      * @return
      */
+    @InterceptorIgnore(tenantLine = "true")
     IPage<ReportInfoDto> findList(Page<ReportInfoDto> page, @Param(Constants.WRAPPER) QueryWrapper<ReportInfoDto> queryWrapper);
 
     @InterceptorIgnore(tenantLine = "true")
     ReportCancellApply selectByArchivedId(String id);
 
-
     String queryReportIdByReportNo(String no);
 
     /**

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApplyArchived/mapper/ReportCancellApplyArchivedMapper.java

@@ -33,6 +33,7 @@ public interface ReportCancellApplyArchivedMapper extends BaseMapper<CwProjectRe
      * @param queryWrapper
      * @return
      */
+    @InterceptorIgnore(tenantLine = "true")
     IPage<ArchivedReportInfoDto> getList(Page<ArchivedReportInfoDto> page, @Param(Constants.WRAPPER) QueryWrapper<ArchivedReportInfoDto> queryWrapper, @Param("officeIds") String officeIds);
 
     ApplyArchiveReportDTO queryById(@Param("id") String id);
@@ -44,9 +45,9 @@ public interface ReportCancellApplyArchivedMapper extends BaseMapper<CwProjectRe
      */
     @InterceptorIgnore(tenantLine = "true")
     void deleteFileInfo(String attachmentId);
-
+    @InterceptorIgnore(tenantLine = "true")
     List<WorkAttachmentInfo> findList(@Param("id") String id);
-
+    @InterceptorIgnore(tenantLine = "true")
     Integer findIsExit(@Param("id") String id, @Param("name")String name);
 
     @InterceptorIgnore(tenantLine = "true")

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApplyArchived/mapper/xml/ReportCancellApplyArchivedMapper.xml

@@ -311,7 +311,7 @@
             `year` = #{year},
         </if>
         <if test="number != null and number != ''">
-            `number`'' = #{number},
+            `number` = #{number},
         </if>
         <if test="isNumber != null and isNumber != ''">
             is_number = #{isNumber},

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

@@ -183,6 +183,8 @@ public class ReportCancellApplyArchivedService extends ServiceImpl<ReportCancell
                 reportDTO.setApplyFileType(applyArchive.getApplyFileType());
                 reportDTO.setReportRemarks(applyArchive.getReportRemarks());
                 reportDTO.setCarchivedType(applyArchive.getCarchivedType());
+                reportDTO.setRemarks(applyArchive.getRemarks());
+
                 //设置附件
                 List<CwWorkAttachmentArchiveDto> files = applyMapper.selectFileInfoByAttid(applyArchive.getId());
                 if (null != files) {
@@ -224,6 +226,7 @@ public class ReportCancellApplyArchivedService extends ServiceImpl<ReportCancell
                     reportDTO.setApplyFileType(applyArchive.getApplyFileType());
                     reportDTO.setReportRemarks(applyArchive.getReportRemarks());
                     reportDTO.setCarchivedType(applyArchive.getCarchivedType());
+                    reportDTO.setRemarks(applyArchive.getRemarks());
                     //设置附件
                     List<CwWorkAttachmentArchiveDto> files = applyMapper.selectFileInfoByAttid(applyArchive.getId());
                     if (null != files) {
@@ -301,9 +304,10 @@ public class ReportCancellApplyArchivedService extends ServiceImpl<ReportCancell
         //修改报告作废表的归档状态
         applyMapper.updateArchiveStyle(reportDTO.getId(), applyArchive.getApplyFileType());
         List<CwWorkAttachmentArchiveDto> list = reportDTO.getWorkAttachmentDtoList();
-        if (CollectionUtils.isNotEmpty(list)) {
-            saveFiles(list, userDTO, id);
-        }
+//        if (CollectionUtils.isNotEmpty(list)) {
+//            saveFiles(list, userDTO, id);
+//        }
+        saveFiles(list, userDTO, id);
         return id;
     }
 

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

@@ -27,9 +27,8 @@ public interface CwManageLevelTypeMapper extends BaseMapper<CwManageLevelType> {
 
     public List<CwManageLevelTypeDTO> getList();
 
-    @InterceptorIgnore(tenantLine = "true")
     List<CwManageLevelType> selectByName(@Param(Constants.WRAPPER) QueryWrapper<CwManageLevelType> queryWrapper);
-    @InterceptorIgnore(tenantLine = "true")
+
     List<CwManageLevelType> selectByParentIds(@Param(Constants.WRAPPER) LambdaQueryWrapper<CwManageLevelType> queryWrapper);
 }
 

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/mapper/UserMapper.java

@@ -184,5 +184,6 @@ public interface UserMapper extends BaseMapper <User> {
      * @param name
      * @return
      */
+    @InterceptorIgnore(tenantLine = "true")
     List<User> selectListByName(@Param("name")String name);
 }