优化、调整、bug修复

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/domain/CwProjectReportData.java

@@ -414,4 +414,14 @@ public class CwProjectReportData extends BaseDTO {
     List<ReviewUser> reviewBys;
 
     private String reviewBy;
+
+    /**
+     * 项目经理2id
+     */
+    private String projectMaster2Id;
+
+    /**
+     * 项目经理2name
+     */
+    private String projectMaster2Name;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -65,6 +65,8 @@
         d.name as userName,
         a.audit_fees,
         e.name as projectMasterName,
+        b.real_header as projectMaster2Id,
+        f.name as projectMaster2Name,
         cw_prs1.proc_ins_id as proc_ins_id1,
         cw_prs1.process_definition_id as process_definition_id1,
         cw_prs1.status as status1,
@@ -86,6 +88,7 @@
         LEFT JOIN sys_office c on a.office_id = c.id
         LEFT JOIN sys_user d on a.create_by = d.id
         LEFT JOIN sys_user e on b.project_master_id = e.id
+        LEFT JOIN sys_user f on b.real_header = f.id
         LEFT JOIN cw_project_report_signature cw_prs1 on cw_prs1.report_id = a.id and cw_prs1.type = '1' and cw_prs1.del_flag = '0'
         LEFT JOIN cw_project_report_signature cw_prs2 on cw_prs2.report_id = a.id and cw_prs2.type = '2' and cw_prs2.del_flag = '0'
         LEFT JOIN cw_project_report_signature cw_prs3 on cw_prs3.report_id = a.id and cw_prs3.type = '3' and cw_prs3.del_flag = '0'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/service/CwProjectReportService.java

@@ -438,6 +438,9 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         if (StringUtils.isNotEmpty(projectReportData.getProjectMasterId())) {
             queryWrapper.eq("b.project_master_id", projectReportData.getProjectMasterId());
         }
+        if (StringUtils.isNotEmpty(projectReportData.getProjectMaster2Id())) {
+            queryWrapper.eq("b.real_header", projectReportData.getProjectMaster2Id());
+        }
         if (StringUtils.isNotEmpty(projectReportData.getCreateBy().getId())) {
             queryWrapper.like("a.create_by", projectReportData.getCreateBy().getId());
         }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReportArchive/mapper/xml/CwProjectReportArchiveMapper.xml

@@ -83,6 +83,8 @@
         <result property="contractNum" column="contract_num" jdbcType="VARCHAR"/>
         <result property="payerSubject" column="payer_subject" jdbcType="VARCHAR"/>
         <result property="paymentMethod" column="payment_method" jdbcType="VARCHAR"/>
+        <result property="realHeader" column="real_header" jdbcType="VARCHAR"/>
+        <result property="realHeaderName" column="real_header_name" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -170,7 +172,8 @@
         cw_pr.proc_ins_id,
         cw_pr.status,
         cw_pr.process_definition_id,
-        cw_pr.contract_id
+        cw_pr.contract_id,
+        cw_pr.real_header
     </sql>
 
     <select id="getProject" resultMap="ProjectResultMap">
@@ -182,11 +185,13 @@
         cw_wci.payer_subject,
         cw_wci.payment_method,
         su.name as user_name,
-        su2.name as project_master_name
+        su2.name as project_master_name,
+        su3.name as real_header_name
         from cw_project_records cw_pr
         left join cw_work_contract_info cw_wci on cw_wci.id = cw_pr.contract_id and cw_wci.del_flag = '0'
         left join sys_user su on su.id = cw_pr.create_by and su.del_flag = '0'
         left join sys_user su2 on su2.id = cw_pr.project_master_id and su2.del_flag = '0'
+        left join sys_user su3 on su3.id = cw_pr.real_header and su3.del_flag = '0'
         where cw_pr.del_flag = '0' and cw_pr.id = #{id}
     </select>
     <select id="getReportList" resultType="com.jeeplus.test.cw.projectReportArchive.service.dto.CwProjectReportArchiveReportDTO">

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReportArchive/service/CwProjectReportArchiveService.java

@@ -3,6 +3,7 @@ package com.jeeplus.test.cw.projectReportArchive.service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
+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;
@@ -81,20 +82,36 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
                 // 项目名称
                 if (StringUtils.isNotBlank(cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getProjectName())){
                     List<CwProjectRecords> cwProjectRecords = cwProjectRecordsMapper.selectList(new QueryWrapper<CwProjectRecords>().lambda().like(CwProjectRecords::getProjectName, cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getProjectName()));
-                    List<String> ids = cwProjectRecords.stream().distinct().map(CwProjectRecords::getId).collect(Collectors.toList());
+                    List<String> ids = cwProjectRecords.stream().map(CwProjectRecords::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
                     if(CollectionUtil.isNotEmpty(ids)) {
                         queryWrapper.in("cw_pa.project_id",ids);
                     }else{
                         return new Page<>();
                     }
                 }
-                // 项目经理
+                // 项目经理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().distinct().map(User::getId).collect(Collectors.toList());
+                    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().distinct().map(CwProjectRecords::getId).collect(Collectors.toList());
+                        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));
+                        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{
@@ -116,7 +133,7 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
                 if (ObjectUtil.isNotEmpty(cwProjectReportArchiveDTO.getCreateBy())){
                     if (StringUtils.isNotBlank(cwProjectReportArchiveDTO.getCreateBy().getName())){
                         List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, cwProjectReportArchiveDTO.getCreateBy().getName()));
-                        List<String> ids = userList.stream().distinct().map(User::getId).collect(Collectors.toList());
+                        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",ids);
                         }else{
@@ -211,7 +228,7 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
                 return true;
             }
             return false;
-        }).distinct().map(CwProjectReportArchive::getReportId).collect(Collectors.toList());
+        }).map(CwProjectReportArchive::getReportId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
         QueryWrapper<ReportDTO> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("cw_pr.del_flag","0");
         queryWrapper.orderByDesc("cw_pr.create_date");

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApply/mapper/xml/ReportCancellApplyMapper.xml

@@ -7,8 +7,12 @@
          su3.name as reportSponsor,
         b.report_no,
         cw_re.review_status,
-        c.project_name,c.project_master_id,su.name as user_name,
+        c.project_name,
+        c.project_master_id,
+        c.real_header as project_master2_id,
+        su.name as user_name,
         su2.name as project_master_name,
+        suu.name as project_master2_name,
         b.id as report_new_line_id
         FROM cw_project_report a
         left join cw_project_report_new_line b
@@ -17,6 +21,7 @@
         on a.project_id = c.id and c.del_flag = '0'
         left join cw_project_report_review cw_re on a.id = cw_re.id and cw_re.del_flag = '0'
         left join sys_user su on su.id = a.create_by and su.del_flag = '0'
+        left join sys_user suu on suu.id = c.real_header and suu.del_flag = '0'
         left join sys_user su2 on su2.id = c.project_master_id and su2.del_flag = '0'
         left join sys_user su3 on su3.id = a.create_by and su3.del_flag = '0'
         ${ew.customSqlSegment}
@@ -27,10 +32,12 @@
         a.cancellate_reason,a.report_no,a.proc_ins_id,a.status,a.process_definition_id,
         c.document_no,case c.`status` WHEN '5' THEN '已完成' END as documentStatus,
         su3.name as reportSponsor,
-        d.project_name,d.project_master_id,
+        d.project_name,
+        d.project_master_id,
+        d.real_header as project_master2_id,
         su.name as user_name,
-        su2.name as project_master_name
-
+        su2.name as project_master_name,
+        suu.name as project_master2_name
         FROM cw_project_report_cancell_apply a
         LEFT JOIN cw_project_report_new_line b
         on a.report_new_line_id = b.id
@@ -40,6 +47,7 @@
         on c.project_id = d.id
         left join sys_user su on su.id = a.create_by and su.del_flag = '0'
         left join sys_user su2 on su2.id = d.project_master_id and su2.del_flag = '0'
+        left join sys_user suu on suu.id = d.real_header and suu.del_flag = '0'
         left join sys_user su3 on su3.id = c.create_by and su3.del_flag = '0'
         where a.del_flag = '0' and a.id = #{id}
     </select>
@@ -67,7 +75,9 @@
 				h.name as reportSponsor,
 				d.project_master_id as projectMasterId,
 				cw_ar.proc_ins_id as cwProcInsId,
-				cw_ar.process_definition_id as cwProDefId
+				cw_ar.process_definition_id as cwProDefId,
+				d.real_header as projectMaster2Id,
+                k.name as projectMaster2Name
 
 				FROM cw_project_report_cancell_apply a
 				LEFT JOIN cw_project_report_new_line b
@@ -83,6 +93,7 @@
         left join sys_user_manage_office sumo on sumo.office_id = f.office_id
 				LEFT JOIN sys_user g
         on d.project_master_id = g.id
+        LEFT JOIN sys_user k on d.real_header = k.id
         LEFT JOIN sys_user h
         on c.create_by = h.id
         left join cw_project_report_cancell_apply_archived cw_ar

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApply/service/ReportCancellApplyService.java

@@ -84,6 +84,9 @@ public class ReportCancellApplyService extends ServiceImpl<ReportCancellApplyMap
         if (StringUtils.isNotEmpty(projectReportData.getProjectMasterId())) {
             queryWrapper.eq("d.project_master_id", projectReportData.getProjectMasterId());
         }
+        if (StringUtils.isNotEmpty(projectReportData.getProjectMaster2Id())) {
+            queryWrapper.eq("d.real_header", projectReportData.getProjectMaster2Id());
+        }
         if (StringUtils.isNotEmpty(projectReportData.getCreateBy().getId())) {
             queryWrapper.like("a.create_by", projectReportData.getCreateBy().getId());
         }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApply/service/dto/ReportInfoDto.java

@@ -111,4 +111,16 @@ public class ReportInfoDto extends BaseDTO {
      */
     @TableField(exist = false)
     private String cwProDefId;
+
+    /**
+     * 项目经理2id
+     */
+    @TableField(exist = false)
+    private String projectMaster2Id;
+
+    /**
+     * 项目经理2name
+     */
+    @TableField(exist = false)
+    private String projectMaster2Name;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApplyArchived/mapper/xml/ReportCancellApplyArchivedMapper.xml

@@ -75,6 +75,8 @@
 				g.name as projectMasterName,
 				h.name as reportSponsor,
 				d.project_master_id as projectMasterId,
+				d.real_header as projectMaster2Id,
+                k.name as projectMaster2Name,
 				cw_ar.proc_ins_id as cwProcInsId,
 				cw_ar.process_definition_id as cwProDefId
 
@@ -90,8 +92,8 @@
 				LEFT JOIN sys_user f
         on a.create_by = f.id
         left join sys_user_manage_office sumo on sumo.office_id = f.office_id
-				LEFT JOIN sys_user g
-        on d.project_master_id = g.id
+				LEFT JOIN sys_user g on d.project_master_id = g.id
+                LEFT JOIN sys_user k on d.real_header = k.id
         LEFT JOIN sys_user h
         on c.create_by = h.id
         left join cw_project_report_cancell_apply_archived cw_ar
@@ -245,9 +247,42 @@
         select * from cw_project_report_cancell_apply_archived where archive_id = #{bfId}
     </select>
     <select id="getProjectByNewLineId" resultType="com.jeeplus.test.cw.projectRecords.service.dto.CwProjectRecordsDTO">
-        select cw.* from cw_project_records cw
+        select
+            <include refid="Project_Column_List"></include>,
+            su2.name as project_master_name,
+            su3.name as real_header_name
+        from cw_project_records cw
         left join cw_project_report cw_p on cw.id = cw_p.project_id
         left join cw_project_report_new_line cw_n on cw_p.id = cw_n.report_id
+        left join sys_user su2 on su2.id = cw.project_master_id and su2.del_flag = '0'
+        left join sys_user su3 on su3.id = cw.real_header and su3.del_flag = '0'
         where cw_n.id = #{reportNewLineId}
     </select>
+    <sql id="Project_Column_List">
+        cw.id,
+        cw.create_by,
+        cw.create_date,
+        cw.update_by,
+        cw.update_date,
+        cw.del_flag,
+        cw.remarks,
+        cw.project_number,
+        cw.project_name,
+        cw.office_id,
+        cw.project_money,
+        cw.audit_year,
+        cw.plan_start_date,
+        cw.plan_end_date,
+        cw.project_master_id,
+        cw.project_leader_id,
+        cw.proc_ins_id,
+        cw.status,
+        cw.process_definition_id,
+        cw.contract_id,
+        cw.business_type,
+        cw.risk_level,
+        cw.real_header,
+        cw.report_type,
+        cw.report_review
+    </sql>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApplyArchived/service/ReportCancellApplyArchivedService.java

@@ -92,6 +92,9 @@ public class ReportCancellApplyArchivedService extends ServiceImpl<ReportCancell
         if (StringUtils.isNotEmpty(projectReportData.getProjectMasterId())) {
             queryWrapper.eq("d.project_master_id", projectReportData.getProjectMasterId());
         }
+        if (StringUtils.isNotEmpty(projectReportData.getProjectMaster2Id())) {
+            queryWrapper.eq("d.real_header", projectReportData.getProjectMaster2Id());
+        }
         if (StringUtils.isNotEmpty(projectReportData.getCreateBy().getId())) {
             queryWrapper.like("a.create_by", projectReportData.getCreateBy().getId());
         }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApplyArchived/service/dto/ArchivedReportInfoDto.java

@@ -114,4 +114,17 @@ public class ArchivedReportInfoDto extends BaseDTO {
      */
     @TableField(exist = false)
     private String cwProDefId;
+
+    /**
+     * 项目经理2id
+     */
+    @TableField(exist = false)
+    private String projectMaster2Id;
+
+    /**
+     * 项目经理2name
+     */
+    @TableField(exist = false)
+    private String projectMaster2Name;
+
 }

jeeplus-plugins/jeeplus-notify/src/main/java/com/jeeplus/notify/controller/NotifyController.java

@@ -3,6 +3,8 @@
  */
 package com.jeeplus.notify.controller;
 
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -16,6 +18,8 @@ import com.jeeplus.notify.service.NotifyService;
 import com.jeeplus.notify.service.dto.NotifyDTO;
 import com.jeeplus.notify.service.dto.NotifyRecordDTO;
 import com.jeeplus.sys.constant.CommonConstants;
+import com.jeeplus.sys.service.UserService;
+import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.sys.utils.UserUtils;
 import com.jeeplus.test.cw.workClientInfo.service.dto.CwWorkClientBaseDTO;
 import com.jeeplus.test.knowledge.domain.KnowledgeShareComment;
@@ -41,6 +45,9 @@ public class NotifyController {
     @Autowired
     private NotifyService notifyService;
 
+    @Autowired
+    private UserService userService;
+
     /**
      * 通告列表数据
      * 若对该方法进行调整则需要同步调整下边的 myNotifyData 方法
@@ -48,6 +55,14 @@ public class NotifyController {
     @GetMapping("list")
     public ResponseEntity data(NotifyDTO notifyDTO, boolean isSelf, Page <NotifyDTO> page) throws Exception {
         QueryWrapper <NotifyDTO> queryWrapper = QueryWrapperGenerator.buildQueryCondition ( notifyDTO, NotifyDTO.class );
+        if (ObjectUtil.isNotEmpty(notifyDTO)) {
+            if (StringUtils.isNotBlank(notifyDTO.getCreateName())) {
+                queryWrapper.like("u.name",notifyDTO.getCreateName());
+            }
+            if (ArrayUtil.isNotEmpty(notifyDTO.getCreateDates())) {
+                queryWrapper.between("a.create_date", notifyDTO.getCreateDates()[0], notifyDTO.getCreateDates()[1]);
+            }
+        }
         IPage <NotifyDTO> result = notifyService.findPage ( page, UserUtils.getCurrentUserDTO ( ).getId ( ), isSelf, null, queryWrapper );
         return ResponseEntity.ok ( result );
     }
@@ -58,6 +73,14 @@ public class NotifyController {
     @GetMapping("myNotifyList")
     public ResponseEntity myNotifyData(NotifyDTO notifyDTO, boolean isSelf, Page <NotifyDTO> page) throws Exception {
         QueryWrapper <NotifyDTO> queryWrapper = QueryWrapperGenerator.buildQueryCondition ( notifyDTO, NotifyDTO.class );
+        if (ObjectUtil.isNotEmpty(notifyDTO)) {
+            if (StringUtils.isNotBlank(notifyDTO.getCreateName())) {
+                queryWrapper.like("u.name",notifyDTO.getCreateName());
+            }
+            if (ArrayUtil.isNotEmpty(notifyDTO.getCreateDates())) {
+                queryWrapper.between("a.create_date", notifyDTO.getCreateDates()[0], notifyDTO.getCreateDates()[1]);
+            }
+        }
         IPage <NotifyDTO> result = notifyService.myNotifyDataFindPage ( page, UserUtils.getCurrentUserDTO ( ).getId ( ), isSelf, null, queryWrapper );
         return ResponseEntity.ok ( result );
     }

jeeplus-plugins/jeeplus-notify/src/main/java/com/jeeplus/notify/service/dto/NotifyDTO.java

@@ -114,6 +114,16 @@ public class NotifyDTO extends BaseDTO {
     private String isClose;
 
     /**
+     * 筛选条件：发布者
+     */
+    private String createName;
+
+    /**
+     * 筛选条件：创建时间
+     */
+    private String[] createDates;
+
+    /**
      * 附件
      */
     private List<WorkAttachmentDto> workAttachmentDtoList;