代码提交

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/controller/CwProjectReportSignatureCallBackController.java

@@ -233,9 +233,9 @@ public class CwProjectReportSignatureCallBackController {
 
     @RequestMapping(value = "/getApprovalCallBackAccomplish", method= RequestMethod.POST)
     public String getApprovalCallBackAccomplish(PresignCallBack presignCallBack, HttpServletResponse response) {
-        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken (TokenProvider.getCurrentToken ( ));
         //根据contractId查询对应的报告信息
         CwProjectReportData projectReportData = cwProjectReportService.queryByContractId(presignCallBack.getContractId());
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getById (projectReportData.getCreateById());
         //对文件回调路径进行处理并保存
         String signatureUrl = null;
         if(StringUtils.isNotBlank(presignCallBack.getStoragePath())){
@@ -321,7 +321,6 @@ public class CwProjectReportSignatureCallBackController {
 
                     //将签章完成的附件进行保存到附件表中
                     WorkAttachmentInfo workattachment = new WorkAttachmentInfo();
-                    workattachment.setDelFlag(0);
                     workattachment.setUrl(filepath);
                     workattachment.setType(substring);
                     workattachment.setAttachmentName(newFileName);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/domain/CwProjectReportTakeNumber.java

@@ -0,0 +1,41 @@
+package com.jeeplus.finance.projectReport.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 报告取号信息表
+ * @author: 徐滕
+ * @version: 2023-12-12 09:19
+ */
+@Data
+@TableName(value = "cw_project_report_take_number")
+public class CwProjectReportTakeNumber extends BaseEntity {
+
+
+    /**
+     * 流程id
+     */
+    private String procInsId;
+
+    private String processDefinitionId;
+
+    /**
+     * 流程状态
+     */
+    private String status;
+    /**
+     * 报告号
+     */
+    private String reportId;
+    /**
+     * 取号类型（0：正常取号；1：非正常取号）
+     */
+    private String takeNumberType;
+
+    /**
+     * 非正常取号原因
+     */
+    private String improperTakeCause;
+}

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

@@ -36,6 +36,8 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
 
     @InterceptorIgnore(tenantLine = "true")
     List<WorkAttachmentInfo> findFileList(@Param("id") String id);
+    @InterceptorIgnore(tenantLine = "true")
+    List<WorkAttachmentInfo> findFileListOnAttachmentFlag(@Param("id") String id,String attachmentFlag);
 
     Integer findIsExit(@Param("id") String id, @Param("name")String name);
 

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

@@ -438,6 +438,16 @@
         left join cw_project_report_file b on a.id = b.report_file_id
         WHERE a.del_flag = 0 AND a.attachment_id = #{id} and b.file_affiliation = 0
     </select>
+    <select id="findFileListOnAttachmentFlag" resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
+        SELECT * FROM work_attachment a
+        left join cw_project_report_file b on a.id = b.report_file_id
+        <where>
+            a.del_flag = 0 AND a.attachment_id = #{id} and b.file_affiliation = 0
+            <if test="attachmentFlag != null and attachmentFlag != ''">
+                and attachment_flag = #{attachmentFlag}
+            </if>
+        </where>
+    </select>
 
     <select id="findIsExit" resultType="java.lang.Integer">
         SELECT

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

@@ -180,7 +180,7 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
         if (StringUtils.isNotEmpty(detail.getProcInsId())) {
             String currentTask = flowTaskService.getCurrentTaskName(detail.getProcInsId());
             if(StringUtils.isNotBlank(currentTask)) {
-                if ("二级复核".equals(currentTask)) {
+                if ("二级复核".equals(currentTask) || "质控审核".equals(currentTask)) {
                     //设置报告文号、报告流水号
                     CwProjectInfoData infoData = new CwProjectInfoData();
                     //报告文号生成
@@ -311,6 +311,8 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
                             mapper.updateSignatureProcInsId(detail.getProcInsId(),detail.getProcessDefinitionId(),signatureId);
                             System.out.println(signatureId);
                         }
+                    } else if("质控审核".equals(currentTask)){
+                        review.setReviewStatus("5");
                     }
 
                 }

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

@@ -4,22 +4,17 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
-import cn.hutool.system.UserInfo;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import com.jeeplus.common.TokenProvider;
 import com.jeeplus.common.constant.CacheNames;
 import com.jeeplus.common.redis.RedisUtils;
-import com.jeeplus.common.utils.ResponseUtil;
 import com.jeeplus.core.query.QueryWrapperGenerator;
-import com.jeeplus.finance.common.flowable.dto.CommitParamDTO;
 import com.jeeplus.finance.invoice.util.SignaturePostUtil;
 import com.jeeplus.finance.projectRecords.domain.CwProjectRecords;
 import com.jeeplus.finance.projectRecords.service.CwProjectRecordsService;
@@ -32,35 +27,21 @@ import com.jeeplus.finance.projectReport.service.mapstruct.CwProjectReportFileWr
 import com.jeeplus.finance.projectReportArchive.domain.CwProjectReportArchive;
 import com.jeeplus.finance.projectReportArchive.mapper.CwProjectReportArchiveMapper;
 import com.jeeplus.finance.projectReportArchive.service.dto.CwProjectReportArchiveDTO;
-import com.jeeplus.finance.reportCancellApply.service.dto.ReportInfoDto;
 import com.jeeplus.finance.utils.Global;
 import com.jeeplus.finance.workClientInfo.domain.CwWorkClientBase;
 import com.jeeplus.finance.workClientInfo.service.dto.CwWorkClientBaseDTO;
 import com.jeeplus.finance.workClientInfo.service.mapstruct.CwWorkClientBaseWrapper;
 import com.jeeplus.flowable.feign.IFlowableApi;
-//import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
-//import com.jeeplus.pubmodules.oss.service.OSSClientService;
-//import com.jeeplus.pubmodules.oss.service.OssService;
-//import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
 import com.jeeplus.sys.domain.User;
 import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import com.jeeplus.sys.feign.IDictApi;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;
-//import com.jeeplus.sys.service.UserService;
-//import com.jeeplus.sys.mapper.UserMapper;
 import com.jeeplus.sys.service.dto.UserDTO;
-//import com.jeeplus.sys.utils.DictUtils;
-//import com.jeeplus.sys.utils.Global;
-//import com.jeeplus.sys.utils.UserUtils;
-import freemarker.template.Configuration;
-import freemarker.template.Template;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.flowable.bpmn.model.FlowNode;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
@@ -69,15 +50,12 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
-import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
-import org.springframework.stereotype.Component;
 
 /**
  * @author: 王强
@@ -2509,7 +2487,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         }
         System.out.println("进入service2");
         //查询保存的附件信息
-        List<WorkAttachmentInfo> infoList = reportMapper.findFileList(id);
+        List<WorkAttachmentInfo> infoList = reportMapper.findFileListOnAttachmentFlag(id,"cw_project_report_file_signature");
         System.out.println("进入service3");
         if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(infoList)) {
             for (WorkAttachmentInfo i : infoList) {

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/modules/flowable/listener/MyExecutionListener.java

@@ -81,7 +81,7 @@ public class MyExecutionListener implements ExecutionListener {
 
                 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-                if(actName.equals("会计-报告签章-电子公章")){
+                if(actName.equals("会计-报告签章-电子公章") || actName.equals("会计-复核及签章")){
                     UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getById(flow.getAssigneeId());
                     OfficeDTO officeDTO = userDTO.getOfficeDTO();
                     if(null != officeDTO){

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/oss/mapper/xml/OssServiceMapper.xml

@@ -61,7 +61,6 @@
             create_time,
             update_by_id,
             update_time,
-            del_flag,
             url,
             type,
             attachment_id,
@@ -76,7 +75,6 @@
             #{workAttachment.createTime},
             #{userDto.id},
             #{workAttachment.updateTime},
-            #{workAttachment.delFlag},
             #{workAttachment.url},
             #{workAttachment.type},
             #{workAttachment.attachmentId},
@@ -104,9 +102,6 @@
              <if test="attachmentFlag != null and attachmentFlag != ''">
                  and a.attachment_flag = #{attachmentFlag}
              </if>
-             <if test="url != null and url != ''">
-                 and a.url = #{url}
-             </if>
          </where>
     </select>