月报代码调整提交

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/monthly/domain/JyProcess.java

@@ -1,5 +1,6 @@
 package com.jeeplus.business.monthly.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.domain.BaseEntity;
@@ -49,4 +50,24 @@ public class JyProcess extends BaseEntity {
      */
     private String officeName;
 
+
+    @TableField(exist = false)
+    private String auditId1;
+    @TableField(exist = false)
+    private String auditId2;
+    @TableField(exist = false)
+    private String auditId3;
+    @TableField(exist = false)
+    private String sealId;
+    @TableField(exist = false)
+    private String outInstanceId;
+    @TableField(exist = false)
+    private String reportsSubmitId;
+    @TableField(exist = false)
+    private String archiveId;
+    @TableField(exist = false)
+    private String eiaId;
+    @TableField(exist = false)
+    private String projectId;
+
 }

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/monthly/service/MonthlyService.java

@@ -17,6 +17,8 @@ import com.jeeplus.business.monthly.mapper.MonthlyMapper;
 import com.jeeplus.business.monthly.service.dto.MonthlyDTO;
 import com.jeeplus.business.project.service.JyProjectService;
 import com.jeeplus.business.project.service.dto.JyProjectDTO;
+import com.jeeplus.business.useSeal.domain.Signet;
+import com.jeeplus.business.useSeal.mapper.SignetMapper;
 import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.flowable.feign.IFlowableApi;
@@ -30,6 +32,7 @@ import com.jeeplus.sys.service.dto.PostDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.utils.StringUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -51,6 +54,9 @@ public class MonthlyService {
     @Resource
     private JyProcessMapper jyProcessMapper;
 
+    @Autowired
+    private SignetMapper signetMapper;
+
 
     /**
      * 列表展示
@@ -187,10 +193,65 @@ public class MonthlyService {
      */
     public List<JyProcess> saveProcess(List<JyProjectDTO> projectDTOS,String monthId){
         ArrayList<JyProcess> jyProcesses = new ArrayList<>();
+
+        //获取用印id
+        QueryWrapper<Signet> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("del_flag",'0');
+        queryWrapper.orderByDesc("create_time");
+        List<Signet> signets = signetMapper.selectList(queryWrapper);
+        projectDTOS.stream().forEach(item ->{
+            for (Signet signet : signets) {
+                if (org.apache.commons.lang3.StringUtils.isNotBlank(signet.getProjectId())){
+                    String[] split = signet.getProjectId().split(",");
+                    for (String s : split) {
+                        if (org.apache.commons.lang3.StringUtils.isNotBlank(s)){
+                            if (org.apache.commons.lang3.StringUtils.isNotBlank(signet.getTypeStatus())){
+                                //用印类型为报告,则获取报告签发
+                                if ( s.equals(item.getId()) && signet.getTypeStatus().equals("1") ){
+                                    item.setReportStatus(signet.getStatus());
+                                    item.setReportTime(signet.getUpdateTime());
+                                }
+                                if (s.equals(item.getId()) && signet.getTypeStatus().equals("2")){
+                                    //用印类型为报批,则设置报批签发所需信息
+                                    item.setReportsTime(signet.getUpdateTime());
+                                    item.setReportsStatus(signet.getStatus());
+                                }
+                            }
+                        }
+                    }
+                }
+
+                if (org.apache.commons.lang3.StringUtils.isNotBlank(signet.getProjectId())){
+                    String[] split = signet.getProjectId().split(",");
+                    for (String s : split) {
+                        if (org.apache.commons.lang3.StringUtils.isNotBlank(s)){
+                            if (org.apache.commons.lang3.StringUtils.isNotBlank(signet.getTypeStatus())){
+                                //用印类型为报告,则获取报告签发
+                                if ( s.equals(item.getId()) && signet.getTypeStatus().equals("1") ){
+                                    item.setSealId(signet.getId());
+                                    item.setProcInsReportIssuance(signet.getProcInsId());
+                                    item.setReportIssuance(signet.getStatus());
+                                }
+                                if (s.equals(item.getId()) && signet.getTypeStatus().equals("2")){
+                                    //用印类型为报批,则设置报批签发所需信息
+                                    item.setReportsSubmitId(signet.getId());
+                                    item.setProcInsIdReports(signet.getProcInsId());
+                                    item.setReportsSubmit(signet.getStatus());
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        });
+
+
+
         projectDTOS.stream().forEach(item->{
             JyProcess jyProcess = new JyProcess();
             String id = UUID.randomUUID().toString().replace("-", "");
             jyProcess.setId(id);
+            jyProcess.setProjectId(item.getId());
             jyProcess.setOfficeName(item.getOfficeName());//部门
             jyProcess.setProjectName(item.getName());//项目名称
             jyProcess.setNo(item.getNo());//报告号
@@ -198,6 +259,17 @@ public class MonthlyService {
             jyProcess.setProcessTime(item.getProcessTime());//进度完成时间
             jyProcess.setProcess(item.getProcess());//进度
             jyProcess.setMonthlyId(monthId);//月报id
+
+            jyProcess.setAuditId1(item.getAuditId1());
+            jyProcess.setAuditId2(item.getAuditId2());
+            jyProcess.setAuditId3(item.getAuditId3());
+            jyProcess.setSealId(item.getSealId());
+            jyProcess.setOutInstanceId(item.getOutInstanceId());
+            jyProcess.setReportsSubmitId(item.getReportsSubmitId());
+            jyProcess.setArchiveId(item.getArchiveId());
+            jyProcess.setArchiveId(item.getArchiveId());
+            jyProcess.setEiaId(item.getEiaId());
+
             jyProcessMapper.insert(jyProcess);
             jyProcesses.add(jyProcess);
         });

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/mapper/xml/ProjectListMapper.xml

@@ -1003,6 +1003,7 @@
            par.status as reviewStatus,
            par.id as archiveId,
            par.update_time as archiveTime,
+           peq.id as eiaId,
            so.name as officeName
         FROM
             jy_project_record a
@@ -1012,6 +1013,7 @@
             left join jy_project_members pm on a.id = pm.project_id
             left join jy_project_outinstance po on a.id=po.project_id
             left join jy_project_archive par on a.id=par.project_id
+            left join jy_project_eia_qualification peq on a.id=peq.project_id
 						left join jy_project_audit pa1 on pa1.project_id = a.id and pa1.audit_level = '1' and pa1.del_flag = '0'
             LEFT JOIN jy_project_audit pa2 ON pa2.project_id = a.id and pa2.audit_level = '2' and pa2.del_flag = '0'
             LEFT JOIN jy_project_audit pa3 ON pa3.project_id = a.id and pa3.audit_level = '3' and pa3.del_flag = '0'