报告归档整合归档详情

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

@@ -8,6 +8,7 @@ import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.test.cw.projectReportArchive.domain.CwProjectReportArchive;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.test.cw.projectReportArchive.service.dto.CwProjectReportArchiveDTO;
+import com.jeeplus.test.cw.projectReportArchive.service.dto.CwProjectReportArchiveDetailDTO;
 import com.jeeplus.test.cw.projectReportArchive.service.dto.ReportDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -15,7 +16,7 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface CwProjectReportArchiveMapper extends BaseMapper<CwProjectReportArchive> {
 
-    IPage<CwProjectReportArchiveDTO> findList(Page<CwProjectReportArchiveDTO> page, @Param("currentUser") UserDTO currentUser, @Param("isBmzr") String isBmzr, @Param(Constants.WRAPPER) QueryWrapper<CwProjectReportArchive> queryWrapper);
+    IPage<CwProjectReportArchiveDTO> findList(Page<CwProjectReportArchiveDTO> page, @Param("currentUser") UserDTO currentUser, @Param("isBmzr") String isBmzr, @Param(Constants.WRAPPER) QueryWrapper<CwProjectReportArchive> queryWrapper,@Param("sta") String sta);
 
     CwProjectReportArchiveDTO queryById(@Param("id") String id);
 

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

@@ -226,7 +226,9 @@
         su.name as user_name,
         su1.name as project_master_name,
         cw_pr.project_name as project_name,
-        cw_prnl.report_no
+        cw_prnl.report_no,
+        date_format(cw_prnl.report_date,'%Y-%m-%d') as report_date,
+        (case when cw_pa.audit_date is null then timestampdiff(day,cw_prnl.report_date,now()) when cw_pa.audit_date is not null then timestampdiff(day,cw_prnl.report_date,cw_pa.audit_date) end) as archiveDay
         from cw_project_report_archive cw_pa
         left join cw_work_client_base cw_wcb on cw_pa.audited_units = cw_wcb.id and cw_wcb.del_flag = '0'
         left join sys_user su on su.id = cw_pa.create_by and su.del_flag = '0'
@@ -234,6 +236,19 @@
         left join sys_user su1 on cw_pr.project_master_id = su1.id and su1.del_flag = '0'
         left join cw_project_report_new_line cw_prnl on cw_prnl.report_id = cw_pa.report_id and cw_prnl.del_flag = '0'
         ${ew.customSqlSegment}
+        and cw_prnl.report_number is not null and cw_prnl.report_date is not null
+        <if test="sta == '超期未归档'">
+            and cw_pa.audit_date is null and timestampdiff(day,cw_prnl.report_date,now())>60
+        </if>
+        <if test="sta == '暂时未归档'">
+            and cw_pa.audit_date is null and timestampdiff(day,cw_prnl.report_date,now()) &lt;= 60
+        </if>
+        <if test="sta == '已超期归档'">
+            and cw_pa.audit_date is not null and timestampdiff(day,cw_prnl.report_date,cw_pa.audit_date)>60
+        </if>
+        <if test="sta == '已按时归档'">
+            and cw_pa.audit_date is not null and timestampdiff(day,cw_prnl.report_date,cw_pa.audit_date) &lt;= 60
+        </if>
         <if test="currentUser.id != '1'.toString">
             <if test="isBmzr == '0'.toString">
                 and (cw_pa.create_by = #{currentUser.id} or cw_pa.project_id in (

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

@@ -27,6 +27,7 @@ import com.jeeplus.test.cw.projectReportArchive.mapper.CwProjectReportArchiveMap
 import com.jeeplus.test.cw.projectReportArchive.mapper.CwProjectReportArchiveReportMapper;
 import com.jeeplus.test.cw.projectRecords.mapper.CwProjectRecordsMapper;
 import com.jeeplus.test.cw.projectReportArchive.service.dto.CwProjectReportArchiveDTO;
+import com.jeeplus.test.cw.projectReportArchive.service.dto.CwProjectReportArchiveDetailDTO;
 import com.jeeplus.test.cw.projectReportArchive.service.dto.CwProjectReportArchiveReportDTO;
 import com.jeeplus.test.cw.projectReportArchive.service.dto.ReportDTO;
 import com.jeeplus.test.cw.projectReportArchive.service.mapstruct.CwProjectReportArchiveReportWrapper;
@@ -143,7 +144,49 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
         } else {
             isBmzr = "0";
         }
-        return cwProjectReportArchiveMapper.findList(page,userDTO,isBmzr, queryWrapper);
+        if (StringUtils.isBlank(cwProjectReportArchiveDTO.getArchiveSta())) {
+            cwProjectReportArchiveDTO.setArchiveSta("");
+        }
+        IPage<CwProjectReportArchiveDTO> list = cwProjectReportArchiveMapper.findList(page, userDTO, isBmzr, queryWrapper, cwProjectReportArchiveDTO.getArchiveSta());
+        List<CwProjectReportArchiveDTO> records = list.getRecords();
+        if (null != records && records.size()>0){
+            //循环查询出来的数据
+            for (CwProjectReportArchiveDTO info : records) {
+                //如果归档日期为空，则表示该报告还未归档
+                if(null == info.getAuditDate()){
+                    //如果归档日期差大于60天，表示超期未归档
+                    if(info.getArchiveDay()>60){
+                        info.setArchiveSta("超期未归档");
+                        long n = (info.getArchiveDay()) / 60;
+                        String money = Long.toString(n * 200);
+                        info.setOverdueDay(String.valueOf(info.getArchiveDay() - 60));
+                        info.setFineMoney(money);
+                    }else{
+                        //如果归档日期差小于等于60天，表示暂时未归档
+                        info.setArchiveSta("暂时未归档");
+                        info.setOverdueDay(String.valueOf(info.getArchiveDay() - 60));
+                        info.setFineMoney("0");
+                    }
+                } else {
+                    //如果归档日期不为空，则表示该报告已归档
+
+                    //如果归档日期差大于60天，表示已超期归档
+                    if(info.getArchiveDay()>60){
+                        info.setArchiveSta("已超期归档");
+                        long n = (info.getArchiveDay()) / 60;
+                        String money = Long.toString(n * 200);
+                        info.setOverdueDay(String.valueOf(info.getArchiveDay() - 60));
+                        info.setFineMoney(money);
+                    }else{
+                        //如果归档日期差小于等于60天，表示已按时归档
+                        info.setArchiveSta("已按时归档");
+                        info.setOverdueDay(String.valueOf(info.getArchiveDay() - 60));
+                        info.setFineMoney("0");
+                    }
+                }
+            }
+        }
+        return list;
     }
 
     /**

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

@@ -11,7 +11,7 @@ import java.util.List;
 /**
  * 财务-项目报告归档-项目归档
  */
-@Data
+
 public class CwProjectReportArchiveDTO extends BaseDTO {
 
     public static final String BIZ_CODE = "15";
@@ -26,6 +26,310 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
      */
     private String projectId;
 
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getAuditedUnits() {
+        return auditedUnits;
+    }
+
+    public void setAuditedUnits(String auditedUnits) {
+        this.auditedUnits = auditedUnits;
+    }
+
+    public String getReportNum() {
+        return reportNum;
+    }
+
+    public void setReportNum(String reportNum) {
+        this.reportNum = reportNum;
+    }
+
+    public String getPapersNum() {
+        return papersNum;
+    }
+
+    public void setPapersNum(String papersNum) {
+        this.papersNum = papersNum;
+    }
+
+    public String getYear() {
+        return year;
+    }
+
+    public void setYear(String year) {
+        this.year = year;
+    }
+
+    public String getNumber() {
+        return number;
+    }
+
+    public void setNumber(String number) {
+        this.number = number;
+    }
+
+    public String getIsNumber() {
+        return isNumber;
+    }
+
+    public void setIsNumber(String isNumber) {
+        this.isNumber = isNumber;
+    }
+
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+
+    @Override
+    public String getProcInsId() {
+        return procInsId;
+    }
+
+    @Override
+    public void setProcInsId(String procInsId) {
+        this.procInsId = procInsId;
+    }
+
+    @Override
+    public String getProcessDefinitionId() {
+        return processDefinitionId;
+    }
+
+    @Override
+    public void setProcessDefinitionId(String processDefinitionId) {
+        this.processDefinitionId = processDefinitionId;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public CwProjectRecordsDTO getCwProjectRecordsDTO() {
+        return cwProjectRecordsDTO;
+    }
+
+    public void setCwProjectRecordsDTO(CwProjectRecordsDTO cwProjectRecordsDTO) {
+        this.cwProjectRecordsDTO = cwProjectRecordsDTO;
+    }
+
+    public List<WorkAttachmentArchiveDto> getWorkAttachmentDtoList() {
+        return WorkAttachmentDtoList;
+    }
+
+    public void setWorkAttachmentDtoList(List<WorkAttachmentArchiveDto> workAttachmentDtoList) {
+        WorkAttachmentDtoList = workAttachmentDtoList;
+    }
+
+    public List<CwProjectReportArchiveReportDTO> getCwProjectReportArchiveReportDTOList() {
+        return cwProjectReportArchiveReportDTOList;
+    }
+
+    public void setCwProjectReportArchiveReportDTOList(List<CwProjectReportArchiveReportDTO> cwProjectReportArchiveReportDTOList) {
+        this.cwProjectReportArchiveReportDTOList = cwProjectReportArchiveReportDTOList;
+    }
+
+    public String getAuditedUnitsName() {
+        return auditedUnitsName;
+    }
+
+    public void setAuditedUnitsName(String auditedUnitsName) {
+        this.auditedUnitsName = auditedUnitsName;
+    }
+
+    public String[] getAuditDates() {
+        return auditDates;
+    }
+
+    public void setAuditDates(String[] auditDates) {
+        this.auditDates = auditDates;
+    }
+
+    public String[] getCreateDates() {
+        return createDates;
+    }
+
+    public void setCreateDates(String[] createDates) {
+        this.createDates = createDates;
+    }
+
+    public String getReportNo() {
+        return reportNo;
+    }
+
+    public void setReportNo(String reportNo) {
+        this.reportNo = reportNo;
+    }
+
+    public String getFileNumber() {
+        return fileNumber;
+    }
+
+    public void setFileNumber(String fileNumber) {
+        this.fileNumber = fileNumber;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getProjectMasterName() {
+        return projectMasterName;
+    }
+
+    public void setProjectMasterName(String projectMasterName) {
+        this.projectMasterName = projectMasterName;
+    }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
+    public String getCreateDateT() {
+        return createDateT;
+    }
+
+    public void setCreateDateT(String createDateT) {
+        this.createDateT = createDateT;
+    }
+
+    public String getReportId() {
+        return reportId;
+    }
+
+    public void setReportId(String reportId) {
+        this.reportId = reportId;
+    }
+
+    public String getReportRemarks() {
+        return reportRemarks;
+    }
+
+    public void setReportRemarks(String reportRemarks) {
+        this.reportRemarks = reportRemarks;
+    }
+
+    public Date getReportDate() {
+        return reportDate;
+    }
+
+    public void setReportDate(Date reportDate) {
+        this.reportDate = reportDate;
+    }
+
+    public String getReportCreateName() {
+        return reportCreateName;
+    }
+
+    public void setReportCreateName(String reportCreateName) {
+        this.reportCreateName = reportCreateName;
+    }
+
+    public String getSignatureAnnotator1Name() {
+        return signatureAnnotator1Name;
+    }
+
+    public void setSignatureAnnotator1Name(String signatureAnnotator1Name) {
+        this.signatureAnnotator1Name = signatureAnnotator1Name;
+    }
+
+    public String getSignatureAnnotator2Name() {
+        return signatureAnnotator2Name;
+    }
+
+    public void setSignatureAnnotator2Name(String signatureAnnotator2Name) {
+        this.signatureAnnotator2Name = signatureAnnotator2Name;
+    }
+
+    public String getArchiveSta() {
+        return archiveSta;
+    }
+
+    public void setArchiveSta(String archiveSta) {
+        this.archiveSta = archiveSta;
+    }
+
+    public Integer getArchiveDay() {
+        return archiveDay;
+    }
+
+    public void setArchiveDay(Integer archiveDay) {
+        this.archiveDay = archiveDay;
+    }
+
+    public String[] getReportDates() {
+        return reportDates;
+    }
+
+    public void setReportDates(String[] reportDates) {
+        this.reportDates = reportDates;
+    }
+
+    public String getFineMoney() {
+        return fineMoney;
+    }
+
+    public void setFineMoney(String fineMoney) {
+        this.fineMoney = fineMoney;
+    }
+
+    public String getOverDueDay() {
+        return overDueDay;
+    }
+
+    public void setOverDueDay(String overDueDay) {
+        this.overDueDay = overDueDay;
+    }
+
+    public String getOverdueDay() {
+        return overdueDay;
+    }
+
+    public void setOverdueDay(String overdueDay) {
+        this.overdueDay = overdueDay;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
     /**
      * 档案名称
      */
@@ -184,6 +488,35 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
      */
     private String signatureAnnotator2Name;
 
+    /**
+     * 归档状态
+     */
+    private String archiveSta;
+
+    /**
+     * 报告到归档时间差（天数）
+     */
+    private Integer archiveDay;
+
+    /**
+     * 报告时间区间
+     */
+    private String[] reportDates;
+
+    /**
+     * 罚款金额
+     */
+    private String fineMoney;
+
+    /**
+     * 超期天数
+     */
+    private String overDueDay;
+
+    /**
+     * 逾期天数（天数）
+     */
+    private String overdueDay;
 
 
     private static final long serialVersionUID = 1L;