Merge remote-tracking branch 'origin/master'

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

@@ -79,8 +79,8 @@ public class CwProjectInfoData extends BaseEntity {
     /**
      * 附件信息
      */
-//    @TableField(exist = false)
-//    List<ProjectReportWorkAttachmentDTO> cwFileInfoList;
+    @TableField(exist = false)
+    List<ProjectReportWorkAttachmentDTO> cwFileInfoList;
 
     /**
      * 单据状态

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

@@ -198,11 +198,16 @@ public class CwProjectReportData extends BaseDTO {
     private String auditFees;
 
     /**
-     * 附件信息
+     * 为签章附件信息
      */
     List<ProjectReportWorkAttachmentDTO> cwFileInfoList;
 
     /**
+     * 已签章附件信息
+     */
+    List<ProjectReportWorkAttachmentDTO> signatureFileList;
+
+    /**
      * 被服务单位名称
      */
     @TableField(exist = false)

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

@@ -68,5 +68,5 @@ public interface CwProjectInfoMapper extends BaseMapper<CwProjectInfoData> {
      * @param id
      * @return
      */
-    List<CwProjectInfoData> getByReportId(String id);
+    CwProjectInfoData getByReportId(String id);
 }

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

@@ -6,6 +6,7 @@ import com.jeeplus.test.cw.projectReport.domain.CwProjectReportFile;
 import com.jeeplus.test.cw.projectReport.service.dto.ProjectReportWorkAttachmentDTO;
 import com.jeeplus.test.oss.domain.WorkAttachment;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -29,7 +30,9 @@ public interface ProjectReportWorkAttachmentMapper extends BaseMapper<CwProjectR
 
     List<ProjectReportWorkAttachmentDTO> selectByInfoId(String id);
 
-    CwProjectReportFile selectInfoByFileId(String id);
+    List<ProjectReportWorkAttachmentDTO> selectByInfoIdAndNewLineId(String id);
+
+    CwProjectReportFile selectInfoByFileId(@Param("id") String id,@Param("fileType") String fileTType);
 
     /**
      * 查询电子章文件信息

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

@@ -15,7 +15,7 @@
         select id,url,file_size as size,attachment_name as name from work_attachment where attachment_id = #{id}
     </select>
     <select id="selectInfoByFileId" resultType="com.jeeplus.test.cw.projectReport.domain.CwProjectReportFile">
-        select * from cw_project_report_file where report_file_id = #{id}
+        select * from cw_project_report_file where report_file_id = #{id} and file_affiliation = #{fileType} and del_flag = '0'
     </select>
 
 
@@ -29,6 +29,12 @@
     <select id="getFileId" resultType="java.lang.String">
         select id from cw_project_report_file where report_file_id = #{id}
     </select>
+    <select id="selectByInfoIdAndNewLineId"
+            resultType="com.jeeplus.test.cw.projectReport.service.dto.ProjectReportWorkAttachmentDTO">
+        select a.id,a.url,a.file_size as size,a.attachment_name as name from work_attachment a
+        left join cw_project_report_new_line b on a.attachment_id = b.report_id
+        where a.attachment_id = #{id}
+    </select>
 
     <update id="updateByIdOnSignature">
         update work_attachment

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

@@ -414,13 +414,15 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
 //        List<CwProjectInfoData> infoData = new ArrayList<>();
 
         List<ProjectReportWorkAttachmentDTO> dtoList = new ArrayList<>();
+        List<ProjectReportWorkAttachmentDTO> signatureList = new ArrayList<>();
         if ( null != reportData){
             List<ProjectReportWorkAttachmentDTO> dtos = attachmentMapper.selectByInfoId(reportData.getId());
             if (null != dtos){
                 dtos.forEach(d->{
                     //根据id查出cw_project_report_file文件表的其他信息
-                    CwProjectReportFile file = attachmentMapper.selectInfoByFileId(d.getId());
-                    if(null != file){
+                    //未签章附件
+                    CwProjectReportFile file = attachmentMapper.selectInfoByFileId(d.getId(),"0");
+                    if (null != file) {
                         d.setFileType(file.getFileType());
                         d.setSealType(file.getSealType());
                         d.setSealedFile(file.getSealedFile());
@@ -436,9 +438,70 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                         d.setCreateDate(file.getCreateDate());
                         dtoList.add(d);
                     }
+
+                    //已签章附件
+                    CwProjectReportFile signatureFile = attachmentMapper.selectInfoByFileId(d.getId(),"1");
+                    if (null != signatureFile){
+                        d.setFileType(signatureFile.getFileType());
+                        d.setSealType(signatureFile.getSealType());
+                        d.setSealedFile(signatureFile.getSealedFile());
+                        d.setSealUser(signatureFile.getSealUser());
+                        d.setSealDate(signatureFile.getSealDate());
+                        d.setRemarks(signatureFile.getRemarks());
+                        UserDTO userDTO2 = new UserDTO();
+                        //根据创建人id查出创建人名称
+                        String name2 = reportMapper.getUserNameById(signatureFile.getCreateBy());
+                        userDTO2.setId(signatureFile.getCreateBy());
+                        userDTO2.setName(name2);
+                        d.setCreateBy(userDTO2);
+                        d.setCreateDate(signatureFile.getCreateDate());
+                        signatureList.add(d);
+                    }
                 });
                 reportData.setCwFileInfoList(dtoList);
+                reportData.setSignatureFileList(signatureList);
             }
+            //设置历史报告列表
+            //根据项目id查出所有的信息
+            List<CwProjectReportData> byProjectList = reportMapper.getByProjectId(reportData.getProjectId());
+            List<CwProjectInfoData> dataInfoList = new ArrayList<>();
+            if (null != byProjectList) {
+                byProjectList.forEach(pro->{
+                    //根据reportid查出新增行数据
+                    CwProjectInfoData infoData = infoMapper.getByReportId(pro.getId());
+                    //根据reportid查出所有的附件信息
+                    List<ProjectReportWorkAttachmentDTO> fileList = new ArrayList<>();
+                    List<ProjectReportWorkAttachmentDTO> cwFileInfoList = attachmentMapper.selectByInfoIdAndNewLineId(reportData.getId());
+                    //历史的附件信息是否是查改reportid对应的所有附件
+                    if (null != cwFileInfoList){
+                        cwFileInfoList.forEach(fi->{
+                            //未签章附件
+                            CwProjectReportFile file = attachmentMapper.selectInfoByFileId(fi.getId(),"0");
+                            if (null != file) {
+                                fi.setFileType(file.getFileType());
+                                fi.setSealType(file.getSealType());
+                                fi.setSealedFile(file.getSealedFile());
+                                fi.setSealUser(file.getSealUser());
+                                fi.setSealDate(file.getSealDate());
+                                fi.setRemarks(file.getRemarks());
+                                UserDTO userDTO = new UserDTO();
+                                //根据创建人id查出创建人名称
+                                String name = reportMapper.getUserNameById(file.getCreateBy());
+                                userDTO.setId(file.getCreateBy());
+                                userDTO.setName(name);
+                                fi.setCreateBy(userDTO);
+                                fi.setCreateDate(file.getCreateDate());
+                                fileList.add(fi);
+                            }
+                        });
+                        //设置附件信息
+                        infoData.setCwFileInfoList(fileList);
+                        dataInfoList.add(infoData);
+                    }
+                });
+            }
+
+            reportData.setCwWorkClientContactDTOList(dataInfoList);
         }
         return reportData;
     }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalInfo/controller/CwReimbursementInfoController.java

@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.common.utils.ResponseUtil;
 import com.jeeplus.core.excel.utils.EasyPoiUtil;
 import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.service.CwReimbursementInfoService;
-import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.service.dto.QueryListDto;
-import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.service.dto.RetureListDto;
-import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.service.dto.SaveInfoDto;
-import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.service.dto.TreeUserDto;
+import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.service.dto.*;
 import com.jeeplus.test.program.configuration.projectList.domain.ProgramProjectListInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -32,6 +29,18 @@ public class CwReimbursementInfoController {
     private CwReimbursementInfoService service;
 
     /**
+     * 报告号查询
+     * @param dto
+     * @return
+     */
+    @ApiOperation(value = "报告号查询")
+    @GetMapping("/reportNoList")
+    public ResponseEntity<IPage<ReportNoDto>> reportNoList(Page<ReportNoDto> page, ReportNoDto dto) throws Exception{
+        IPage<ReportNoDto> iPage = service.getReportNoList(page, dto);
+        return ResponseEntity.ok(iPage);
+    }
+
+    /**
      * 列表查询
      * @param dto
      * @return

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalInfo/domain/CwReimbursementDetailInfo.java

@@ -1,5 +1,6 @@
 package com.jeeplus.test.cw.reimbursementApproval.approvalInfo.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
@@ -63,6 +64,9 @@ public class CwReimbursementDetailInfo extends BaseEntity {
      */
     private String reportNumber;
 
+    @TableField(exist = false)
+    private String reportNo;
+
     /**
      * 费用(元)
      */

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalInfo/mapper/CwReimbursementInfoMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.domain.CwReimbursementInfo;
+import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.service.dto.ReportNoDto;
 import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.service.dto.RetureListDto;
 import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.service.dto.TreeUserDto;
 import com.jeeplus.test.program.configuration.projectList.domain.ProgramProjectListInfo;
@@ -37,4 +38,7 @@ public interface CwReimbursementInfoMapper extends BaseMapper<CwReimbursementInf
     List<RetureListDto> findExportList (@Param(Constants.WRAPPER) QueryWrapper queryWrapper);
 
     IPage<RetureListDto> relationReimbursementList (Page<RetureListDto> page, @Param("id") String id);
+
+    IPage<ReportNoDto> getReportNoList(Page<ReportNoDto> page, @Param(Constants.WRAPPER) QueryWrapper<ReportNoDto> queryWrapper);
+
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalInfo/mapper/xml/CwReimbursementInfoMapper.xml

@@ -244,4 +244,14 @@
         where ff.program_id = #{id}
         limit 1
 	</select>
+	<select id="getReportNoList"
+			resultType="com.jeeplus.test.cw.reimbursementApproval.approvalInfo.service.dto.ReportNoDto">
+		select report_no,c.project_name from cw_project_report_new_line a
+		left join cw_project_report b
+		on a.report_id = b.id
+		left join cw_project_records c
+		on b.project_id = c.id
+		${ew.customSqlSegment}
+		ORDER BY a.update_date DESC
+	</select>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalInfo/service/CwReimbursementInfoService.java

@@ -16,10 +16,7 @@ import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.domain.CwReimburse
 import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.mapper.CwReimbursementAmountInfoMapper;
 import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.mapper.CwReimbursementDetailInfoMapper;
 import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.mapper.CwReimbursementInfoMapper;
-import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.service.dto.QueryListDto;
-import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.service.dto.RetureListDto;
-import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.service.dto.SaveInfoDto;
-import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.service.dto.TreeUserDto;
+import com.jeeplus.test.cw.reimbursementApproval.approvalInfo.service.dto.*;
 import com.jeeplus.test.mould.service.SerialnumTplService;
 import com.jeeplus.test.oss.domain.WorkAttachment;
 import com.jeeplus.test.oss.mapper.OssServiceMapper;
@@ -60,6 +57,21 @@ public class CwReimbursementInfoService {
     private ContractInfoService infoService;
 
     /**
+     * 报告号查询
+     */
+    public IPage<ReportNoDto> getReportNoList(Page<ReportNoDto> page , ReportNoDto dto) throws Exception{
+        QueryWrapper<ReportNoDto> queryWrapper = QueryWrapperGenerator.buildQueryCondition(dto, ReportNoDto.class);
+        /**
+         * a表是reimbursementInfo
+         * b表是reimbursementDetailInfo
+         * c表是sysUser
+         */
+        queryWrapper.eq("a.del_flag", 0);
+        queryWrapper.eq("c.project_name", dto.getProjectName());
+        return infoMapper.getReportNoList(page, queryWrapper);
+    }
+
+    /**
      * 列表查询
      */
     public IPage<RetureListDto> list(Page<RetureListDto> page , QueryListDto dto) throws Exception{
@@ -173,6 +185,8 @@ public class CwReimbursementInfoService {
                 detailInfo.setDelFlag(0);
                 // 保存基础表信息主键值
                 detailInfo.setInfoId(id);
+                //设置报告号
+                detailInfo.setReportNumber(detailInfo.getReportNo());
                 detailInfoMapper.insert(detailInfo);
             }
         }
@@ -223,6 +237,8 @@ public class CwReimbursementInfoService {
                 detailInfo.setDelFlag(0);
                 // 保存基础表信息主键值
                 detailInfo.setInfoId(dto.getId());
+                //设置报告号
+                detailInfo.setReportNumber(detailInfo.getReportNo());
                 detailInfoMapper.insert(detailInfo);
             }
         }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalInfo/service/dto/ReportNoDto.java

@@ -0,0 +1,18 @@
+package com.jeeplus.test.cw.reimbursementApproval.approvalInfo.service.dto;
+
+import com.jeeplus.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * @author: 王强
+ * @create: 2022-12-05 16:33
+ **/
+@Data
+public class ReportNoDto extends BaseEntity {
+
+    //报告号
+    private String reportNo;
+
+    //项目名称
+    private String projectName;
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/mapper/xml/MaterialBasicMapper.xml

@@ -7,6 +7,7 @@
 	</update>
     <select id="findList" resultType="com.jeeplus.test.materialManagement.service.dto.MaterialInfoDto">
         SELECT
+        	DISTINCT
 			a.id,
 			a.create_by,
 			a.create_date,
@@ -23,7 +24,6 @@
 			a.status,
 			a.proc_ins_id,
 			a.process_definition_id,
-			b.procurement_type,
 			b.trade_total_price,
 			so.name as handledByOfficeName
 		FROM

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/service/MaterialService.java

@@ -142,6 +142,7 @@ public class MaterialService {
                 detailed.setDelFlag(0);
                 // 保存基础表信息主键值
                 detailed.setBasicId(id);
+                detailed.setTradeTotalPrice(dto.getTradeTotalPrice());
                 detailedMapper.insert(detailed);
                 //保存详情列表附件信息
                 if (CollectionUtils.isNotEmpty(detailed.getFileInfoLost())){