电子签章流程部分调整

jeeplus-modules/jeeplus-finance/pom.xml

@@ -117,6 +117,10 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -54,6 +54,7 @@ import java.lang.reflect.Type;
 import java.util.*;
 import java.util.stream.Collectors;
 //import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.mock.web.MockMultipartFile;
 
 /**
  * 项目签章回调接口Controller
@@ -289,18 +290,18 @@ public class CwProjectReportSignatureCallBackController {
                     String filepath = "";
                     //取得上传文件
                     //将文件上传到oss云盘中
-//                    MultipartFile cMultiFile = new MockMultipartFile("file", f.getName(), null, new FileInputStream(f));
-//                    if (!cMultiFile.isEmpty()) {
-//                        // 文件保存路径
-//                        String realPath =DIRECTORY.replace("/","")+"/cw_project_report_file"+ossClientService.datePath()+"/"+ System.currentTimeMillis();
-//                        //文件原名称
-//                        String newName = cMultiFile.getOriginalFilename();
-//                        if(StringUtils.isNotBlank(newName)){
-//                            newName = newName.substring(13, newName.length());
-//                            ossClientService.uploadFile2OSS(cMultiFile.getInputStream(),realPath,newName);
-//                            filepath = "/" + realPath + newName;
-//                        }
-//                    }
+                    MultipartFile cMultiFile = new MockMultipartFile("file", f.getName(), null, new FileInputStream(f));
+                    if (!cMultiFile.isEmpty()) {
+                        // 文件保存路径
+                        String realPath =DIRECTORY.replace("/","")+"/cw_project_report_file"+ossClientService.datePath()+"/"+ System.currentTimeMillis();
+                        //文件原名称
+                        String newName = cMultiFile.getOriginalFilename();
+                        if(StringUtils.isNotBlank(newName)){
+                            newName = newName.substring(13, newName.length());
+                            ossClientService.uploadFile2OSS(cMultiFile.getInputStream(),realPath,newName);
+                            filepath = "/" + realPath + newName;
+                        }
+                    }
 
                     System.out.println(f.getName());
                     //截取文件后缀名
@@ -332,8 +333,8 @@ public class CwProjectReportSignatureCallBackController {
                         CwProjectReportFile cwProjectReportFile = new CwProjectReportFile();
                         cwProjectReportFile.setDelFlag(0);
                         cwProjectReportFile.setId(UUID.randomUUID().toString().replace("-", ""));
-                        cwProjectReportFile.setCreateById(UserUtils.getByLoginName("admin",null).getId());
-                        cwProjectReportFile.setUpdateById(UserUtils.getByLoginName("admin",null).getId());
+                        cwProjectReportFile.setCreateById(projectReportData.getCreateById());
+                        cwProjectReportFile.setUpdateById(projectReportData.getCreateById());
                         cwProjectReportFile.setCreateTime(new Date());
                         cwProjectReportFile.setUpdateTime(new Date());
                         cwProjectReportFile.setReportFileId(id);

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

@@ -33,10 +33,12 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
      */
     IPage<CwProjectReportData> findList(Page<CwProjectReportData> page, @Param("currentUser") UserDTO currentUser, @Param("isBmzr") String isBmzr, @Param("officeIds") String officeIds, @Param(Constants.WRAPPER) QueryWrapper<CwProjectReportData> queryWrapper);
 
+    @InterceptorIgnore(tenantLine = "true")
     List<WorkAttachment> findFileList(@Param("id") String id);
 
     Integer findIsExit(@Param("id") String id, @Param("name")String name);
 
+    @InterceptorIgnore(tenantLine = "true")
     Integer deleteAttachement(@Param("id") String id,@Param("attachmentFlag") String attachmentFlag);
 
     @InterceptorIgnore(tenantLine = "true")
@@ -63,6 +65,7 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
      * 更改报告号签章id信息
      * @param cwProjectReportData
      */
+    @InterceptorIgnore(tenantLine = "true")
     void updateSignatureUrl(CwProjectReportData cwProjectReportData);
 
     /**
@@ -76,6 +79,7 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
      * @param contractId
      * @return
      */
+    @InterceptorIgnore(tenantLine = "true")
     CwProjectReportData queryByContractId(@Param("contractId") String contractId);
 
     /**
@@ -106,6 +110,7 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
      * 修改签章流程节点状态
      * @param repportSignature
      */
+    @InterceptorIgnore(tenantLine = "true")
     void updateSignatureType(CwProjectReportSignature repportSignature);
 
     /**
@@ -113,12 +118,14 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
      * @param id
      * @return
      */
+    @InterceptorIgnore(tenantLine = "true")
     CwProjectReportSignature getReportSignatureById(String id);
 
     /**
      * 新增签章附件信息
      * @param cwProjectReportFile
      */
+    @InterceptorIgnore(tenantLine = "true")
     void insertProjectReportFile(CwProjectReportFile cwProjectReportFile);
 
     List<String> getIdByProjectId(@Param("id") String id);

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

@@ -13,6 +13,9 @@ public interface CwProjectReportSignatureMapper extends BaseMapper<CwProjectRepo
     @InterceptorIgnore(tenantLine = "true")
     CwProjectReportSignature getInfoById(String id);
 
+    @InterceptorIgnore(tenantLine = "true")
+    void updateInfoById(CwProjectReportSignature info);
+
 }
 
 

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

@@ -42,6 +42,7 @@ public interface ProjectReportWorkAttachmentMapper extends BaseMapper<CwProjectR
      * @param id
      * @return
      */
+    @InterceptorIgnore(tenantLine = "true")
     List<WorkAttachment> selectWorkAttachmentByReportId(String id);
 
     /**

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

@@ -58,4 +58,24 @@
             id = #{id}
             AND del_flag = 0
     </select>
+
+    <update id="updateInfoById">
+        update cw_project_report_signature SET
+        <if test="status != null and status != ''">
+            status = #{status},
+        </if>
+        <if test="sealAdminStatus != null and sealAdminStatus != ''">
+            seal_admin_status = #{sealAdminStatus},
+        </if>
+        <if test="signatureAnnotator1Status != null and signatureAnnotator1Status != ''">
+            signature_annotator1_status = #{signatureAnnotator1Status},
+        </if>
+        <if test="signatureAnnotator2Status != null and signatureAnnotator2Status != ''">
+            signature_annotator2_status = #{signatureAnnotator2Status},
+        </if>
+            update_by_id = #{updateById},
+            update_time = #{updateTime}
+        WHERE id = #{id}
+            AND del_flag = 0
+    </update>
 </mapper>

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

@@ -2294,7 +2294,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             cwProjectReportSignature.setSignatureAnnotator2Status("0");
             cwProjectReportSignature.setSealAdminStatus("0");
         }
-        cwProjectReportSignatureMapper.updateById(cwProjectReportSignature);
+        cwProjectReportSignatureMapper.updateInfoById(cwProjectReportSignature);
         return "操作成功";
     }
 
@@ -2418,10 +2418,16 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                 WorkAttachment i = new WorkAttachment();
                 //包含了url、size、name
                 i.setId(UUID.randomUUID().toString().replace("-", ""));
-//                i.getCreateBy().setId(userDTO.getId());
-                i.setCreateTime(new Date());
-//                i.getUpdateBy().setId(userDTO.getId());
-                i.setUpdateTime(new Date());
+                if(infoList.size()>0){
+                    userDTO = UserUtils.get(infoList.get(0).getCreateById());
+                    i.setCreateTime(infoList.get(0).getCreateTime());
+                    i.setUpdateTime(infoList.get(0).getUpdateTime());
+                }else{
+                    i.setCreateById(userDTO.getId());
+                    i.setUpdateById(userDTO.getId());
+                    i.setCreateTime(new Date());
+                    i.setUpdateTime(new Date());
+                }
                 i.setDelFlag(0);
                 i.setUrl(dto.getUrl());
                 //文件类型处理
@@ -2438,6 +2444,12 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                 CwProjectReportFile reportFile = new CwProjectReportFile();
                 BeanUtils.copyProperties(dto, reportFile);
                 reportFile.setReportFileId(i.getId());
+                if(infoList.size()>0){
+                    reportFile.setCreateById(infoList.get(0).getCreateById());
+                    reportFile.setUpdateById(infoList.get(0).getUpdateById());
+                    reportFile.setCreateTime(infoList.get(0).getCreateTime());
+                    reportFile.setUpdateTime(infoList.get(0).getUpdateTime());
+                }
                 attachmentMapper.insert(reportFile);
                 j++;
         }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/mapper/CwProjectReportArchiveMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.finance.projectReportArchive.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
@@ -14,7 +15,7 @@ import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface CwProjectReportArchiveMapper extends BaseMapper<CwProjectReportArchive> {
-
+    @InterceptorIgnore(tenantLine = "true")
     IPage<CwProjectReportArchiveDTO> findList(Page<CwProjectReportArchiveDTO> page, @Param("currentUser") UserDTO currentUser, @Param("isBmzr") String isBmzr, @Param("officeIds") String officeIds, @Param(Constants.WRAPPER) QueryWrapper<CwProjectReportArchive> queryWrapper, @Param("sta") String sta);
 
     CwProjectReportArchiveDTO queryById(@Param("id") String id);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/service/CwProjectReportArchiveService.java

@@ -80,7 +80,7 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
     public IPage<CwProjectReportArchiveDTO> findList(Page<CwProjectReportArchiveDTO> page, CwProjectReportArchiveDTO cwProjectReportArchiveDTO) throws Exception{
         QueryWrapper<CwProjectReportArchive> queryWrapper = QueryWrapperGenerator.buildQueryCondition ( CwProjectReportArchiveWrapper.INSTANCE.toEntity(cwProjectReportArchiveDTO), CwProjectReportArchive.class );
         queryWrapper.eq("cw_pa.del_flag","0");
-        /*if (ObjectUtil.isNotEmpty(cwProjectReportArchiveDTO)) {
+        if (ObjectUtil.isNotEmpty(cwProjectReportArchiveDTO)) {
             if (ObjectUtil.isNotEmpty(cwProjectReportArchiveDTO.getCwProjectRecordsDTO())){
                 // 项目名称
                 if (StringUtils.isNotBlank(cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getProjectName())){
@@ -172,17 +172,17 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
                 }
 
             }
-        }*/
+        }
         String isBmzr = "0";
         StringBuilder officeIds = new StringBuilder();
         UserDTO userDTO = UserUtils.getCurrentUserDTO();
         List<String> manageOfficeIdList= Lists.newArrayList();
 
-        /*if (StringUtils.isBlank(cwProjectReportArchiveDTO.getArchiveSta())) {
+        if (StringUtils.isBlank(cwProjectReportArchiveDTO.getArchiveSta())) {
             cwProjectReportArchiveDTO.setArchiveSta("");
-        }*/
+        }
         IPage<CwProjectReportArchiveDTO> list = cwProjectReportArchiveMapper.findList(page, userDTO, isBmzr, officeIds.toString(), queryWrapper, cwProjectReportArchiveDTO.getArchiveSta());
-        /*List<CwProjectReportArchiveDTO> records = list.getRecords();
+        List<CwProjectReportArchiveDTO> records = list.getRecords();
         if (null != records && records.size()>0){
             //循环查询出来的数据
             for (CwProjectReportArchiveDTO info : records) {
@@ -225,7 +225,7 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
                     }
                 }
             }
-        }*/
+        }
         return list;
     }
 

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

@@ -1,5 +1,6 @@
 package com.jeeplus.pubmodules.oss.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -19,6 +20,7 @@ public interface OssServiceMapper extends BaseMapper<WorkAttachment> {
 
     List<AttachmentDTO> findList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper);
 
+    @InterceptorIgnore(tenantLine = "true")
     void insertWorkAttachment (@Param("workAttachment") WorkAttachment workAttachment, @Param("userDto") UserDTO userDto);
 
     /**
@@ -26,5 +28,6 @@ public interface OssServiceMapper extends BaseMapper<WorkAttachment> {
      * @param workAttachment
      * @return
      */
+    @InterceptorIgnore(tenantLine = "true")
     List<AttachmentDTO> getByAttachmentIdAndUrlAndAttachmentFlag(WorkAttachment workAttachment);
 }