调整跨租户审核流程功能（修改原表中的流程id）

jeeplus-api/jeeplus-public-modules-api/src/main/java/com/jeeplus/sys/feign/IWorkAttachmentApi.java

@@ -143,7 +143,7 @@ public interface IWorkAttachmentApi {
      * @param workattachment
      * @return
      */
-    @PostMapping("/oss/file/getByAttachmentIdAndUrlAndAttachmentFlag")
+    @RequestMapping(value = "/oss/file/getByAttachmentIdAndUrlAndAttachmentFlag", method = RequestMethod.POST)
     List<WorkAttachmentInfo> getByAttachmentIdAndUrlAndAttachmentFlag(@RequestBody WorkAttachmentInfo workattachment);
 
     /**

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/mapper/ContractFilePaperMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.finance.contractRegistration.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.finance.contractRegistration.domain.ContractFilePaper;
 import com.jeeplus.sys.domain.WorkAttachmentInfo;
@@ -11,6 +12,7 @@ import java.util.List;
  * @author: 王强
  * @create: 2022-11-29 14:20
  **/
+@InterceptorIgnore(tenantLine = "true")
 public interface ContractFilePaperMapper extends BaseMapper<ContractFilePaper> {
     /**
      * 根据合同id查询纸质归档信息

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/mapper/ContractInfoMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.finance.contractRegistration.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;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/CwProjectRecordsMapper.java

@@ -70,4 +70,7 @@ public interface CwProjectRecordsMapper extends BaseMapper<CwProjectRecords> {
 
     @InterceptorIgnore(tenantLine = "true")
     void updatereportReviewById(CwProjectRecords records);
+
+    @InterceptorIgnore(tenantLine = "true")
+    List<CwProjectRecords> getListByIds(@Param("ids") List<String> ids);
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/xml/CwProjectRecordsMapper.xml

@@ -454,4 +454,16 @@
             id = #{id}
             AND del_flag = 0
     </update>
+
+    <select id="getListByIds" resultType="com.jeeplus.finance.projectRecords.domain.CwProjectRecords">
+        SELECT  id,remarks,project_number,project_name,office_id,project_money,audit_year,plan_start_date,plan_end_date,project_master_id,project_leader_id,proc_ins_id,process_definition_id,status,contract_id,business_type,risk_level,real_header,report_type,report_review,create_time,create_by_id,update_time,update_by_id,del_flag,tenant_id  FROM cw_project_records
+         <where>
+             del_flag=0
+             and id in
+             <foreach collection="ids" open="(" close=")" separator="," item="id">
+                 #{id}
+             </foreach>
+         </where>
+
+    </select>
 </mapper>

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/CwProjectRecordsService.java

@@ -511,6 +511,15 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
     }
 
     /**
+     * 根据客户id获取关联的项目信息
+     * @param ids
+     * @return
+     */
+    public List<CwProjectRecords> getListByIds(List ids) {
+        return cwProjectRecordsMapper.getListByIds(ids);
+    }
+
+    /**
      * 根据合同id获取关联的项目信息
      * @param contractId
      * @return

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

@@ -460,13 +460,13 @@
         update cw_project_report_signature
         set
         <if test="signatureAnnotator1Status != null and signatureAnnotator1Status != ''">
-            signature_annotator1_status = ${signatureAnnotator1Status}
+            signature_annotator1_status = #{signatureAnnotator1Status}
         </if>
         <if test="signatureAnnotator2Status != null and signatureAnnotator2Status != ''">
-            signature_annotator2_status = ${signatureAnnotator2Status}
+            signature_annotator2_status = #{signatureAnnotator2Status}
         </if>
         <if test="sealAdminStatus != null and sealAdminStatus != ''">
-            seal_admin_status = ${sealAdminStatus}
+            seal_admin_status = #{sealAdminStatus}
         </if>
         where id = #{id}
     </update>
@@ -647,64 +647,64 @@
         update cw_project_report
         set
         <if test="delFlag != null and delFlag != ''">
-            del_flag = ${delFlag},
+            del_flag = #{delFlag},
         </if>
         <if test="documentNo != null and documentNo != ''">
-            document_no = ${documentNo},
+            document_no = #{documentNo},
         </if>
         <if test="projectId != null and projectId != ''">
-            project_id = ${projectId},
+            project_id = #{projectId},
         </if>
         <if test="officeId != null and officeId != ''">
-            office_id = ${officeId},
+            office_id = #{officeId},
         </if>
         <if test="signatureType != null and signatureType != ''">
-            signature_type = ${signatureType},
+            signature_type = #{signatureType},
         </if>
         <if test="signatureAnnotator1 != null and signatureAnnotator1 != ''">
-            signature_annotator1 = ${signatureAnnotator1},
+            signature_annotator1 = #{signatureAnnotator1},
         </if>
         <if test="signatureAnnotator2 != null and signatureAnnotator2 != ''">
-            signature_annotator2 = ${signatureAnnotator2},
+            signature_annotator2 = #{signatureAnnotator2},
         </if>
         <if test="signatureContractId != null and signatureContractId != ''">
-            signature_contract_id = ${signatureContractId},
+            signature_contract_id = #{signatureContractId},
         </if>
         <if test="procInsId != null and procInsId != ''">
-            proc_ins_id = ${procInsId},
+            proc_ins_id = #{procInsId},
         </if>
         <if test="status != null and status != ''">
-            status = ${status},
+            status = #{status},
         </if>
         <if test="processDefinitionId != null and processDefinitionId != ''">
-            process_definition_id = ${processDefinitionId},
+            process_definition_id = #{processDefinitionId},
         </if>
         <if test="auditFees != null and auditFees != ''">
-            audit_fees = ${auditFees},
+            audit_fees = #{auditFees},
         </if>
         <if test="businessType != null and businessType != ''">
-            business_type = ${businessType},
+            business_type = #{businessType},
         </if>
         <if test="auditBusinessType != null and auditBusinessType != ''">
-            audit_business_type = ${auditBusinessType},
+            audit_business_type = #{auditBusinessType},
         </if>
         <if test="registerAddress != null and registerAddress != ''">
-            register_address = ${registerAddress},
+            register_address = #{registerAddress},
         </if>
         <if test="businessLocation != null and businessLocation != ''">
-            business_location = ${businessLocation},
+            business_location = #{businessLocation},
         </if>
         <if test="securityBusiness != null and securityBusiness != ''">
-            security_business = ${securityBusiness},
+            security_business = #{securityBusiness},
         </if>
         <if test="industry != null and industry != ''">
-            industry = ${industry},
+            industry = #{industry},
         </if>
         <if test="businessObjects != null and businessObjects != ''">
-            business_objects = ${businessObjects},
+            business_objects = #{businessObjects},
         </if>
         <if test="tenantId != null and tenantId != ''">
-            tenant_id = ${tenantId},
+            tenant_id = #{tenantId},
         </if>
         update_by_id = #{updateById},
         update_time = #{updateTime}

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/controller/CwProjectReportArchiveController.java

@@ -111,7 +111,7 @@ public class CwProjectReportArchiveController {
      * @return
      */
     @ApiLog(value = "保存财务项目报告归档信息-流程", type = LogTypeEnum.SAVE)
-    @PreAuthorize("hasAnyAuthority('cwProjectReportArchive:add','cwProjectReportArchive:edit')")
+    // @PreAuthorize("hasAnyAuthority('cwProjectReportArchive:add','cwProjectReportArchive:edit')")
     @PostMapping("saveForm")
     public ResponseEntity saveForm(@Valid @RequestBody CwProjectReportArchiveDTO cwProjectReportArchiveDTO) throws Exception {
         String id = cwProjectReportArchiveService.saveForm(cwProjectReportArchiveDTO);

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

@@ -15,6 +15,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 @Mapper
+@InterceptorIgnore(tenantLine = "true")
 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);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/mapper/CwReimbursementAmountInfoMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.finance.reimbursementApproval.approvalInfo.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.finance.reimbursementApproval.approvalInfo.domain.CwReimbursementAmountInfo;
 
@@ -7,5 +8,6 @@ import com.jeeplus.finance.reimbursementApproval.approvalInfo.domain.CwReimburse
  * @author: 王强
  * @create: 2022-11-24 16:25
  **/
+@InterceptorIgnore(tenantLine = "true")
 public interface CwReimbursementAmountInfoMapper extends BaseMapper<CwReimbursementAmountInfo>  {
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/mapper/CwReimbursementDetailInfoContractMapper.java

@@ -1,7 +1,9 @@
 package com.jeeplus.finance.reimbursementApproval.approvalInfo.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.finance.reimbursementApproval.approvalInfo.domain.CwReimbursementDetailInfoContract;
 
+@InterceptorIgnore(tenantLine = "true")
 public interface CwReimbursementDetailInfoContractMapper extends BaseMapper<CwReimbursementDetailInfoContract> {
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/mapper/CwReimbursementDetailInfoMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.finance.reimbursementApproval.approvalInfo.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.finance.reimbursementApproval.approvalInfo.domain.CwReimbursementDetailInfo;
 
@@ -7,5 +8,6 @@ import com.jeeplus.finance.reimbursementApproval.approvalInfo.domain.CwReimburse
  * @author: 王强
  * @create: 2022-11-24 16:31
  **/
+@InterceptorIgnore(tenantLine = "true")
 public interface CwReimbursementDetailInfoMapper extends BaseMapper<CwReimbursementDetailInfo> {
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/mapper/CwReimbursementDetailInfoOtherMapper.java

@@ -1,7 +1,9 @@
 package com.jeeplus.finance.reimbursementApproval.approvalInfo.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.finance.reimbursementApproval.approvalInfo.domain.CwReimbursementDetailInfoOther;
 
+@InterceptorIgnore(tenantLine = "true")
 public interface CwReimbursementDetailInfoOtherMapper extends BaseMapper<CwReimbursementDetailInfoOther> {
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/mapper/CwReimbursementDetailInfoProcuredMapper.java

@@ -1,7 +1,9 @@
 package com.jeeplus.finance.reimbursementApproval.approvalInfo.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.finance.reimbursementApproval.approvalInfo.domain.CwReimbursementDetailInfoProcured;
 
+@InterceptorIgnore(tenantLine = "true")
 public interface CwReimbursementDetailInfoProcuredMapper extends BaseMapper<CwReimbursementDetailInfoProcured> {
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/mapper/CwReimbursementDetailInfoReportMapper.java

@@ -1,7 +1,9 @@
 package com.jeeplus.finance.reimbursementApproval.approvalInfo.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.finance.reimbursementApproval.approvalInfo.domain.CwReimbursementDetailInfoReport;
 
+@InterceptorIgnore(tenantLine = "true")
 public interface CwReimbursementDetailInfoReportMapper extends BaseMapper<CwReimbursementDetailInfoReport> {
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/mapper/CwReimbursementInfoMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.finance.reimbursementApproval.approvalInfo.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -19,6 +20,7 @@ import java.util.List;
  * @author: 王强
  * @create: 2022-11-24 16:09
  **/
+@InterceptorIgnore(tenantLine = "true")
 public interface CwReimbursementInfoMapper extends BaseMapper<CwReimbursementInfo> {
 
     IPage<ProgramProjectListInfo> findProjectList(Page<ProgramProjectListInfo> page, @Param(Constants.WRAPPER) QueryWrapper<ProgramProjectListInfo> wrapper);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/service/CwReimbursementInfoService.java

@@ -529,7 +529,7 @@ public class CwReimbursementInfoService {
         String projectName = "";
         String[] split = ids.split(",");
         List<String> idList = Arrays.asList(split);
-        List<CwProjectRecords> list = cwProjectRecordsService.list(new LambdaQueryWrapper<CwProjectRecords>().in(CwProjectRecords::getId, idList));
+        List<CwProjectRecords> list = cwProjectRecordsService.getListByIds(idList);
         if (CollectionUtil.isNotEmpty(list)) {
             projectName = list.stream().map(CwProjectRecords::getProjectName).collect(Collectors.joining(","));
         }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/mapper/CwManageLevelTypeMapper.java

@@ -1,5 +1,7 @@
 package com.jeeplus.finance.workClientInfo.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.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/oss/controller/OssFileController.java

@@ -388,8 +388,8 @@ public class OssFileController {
      * @param workattachment
      * @return
      */
-    @PostMapping("getByAttachmentIdAndUrlAndAttachmentFlag")
-    public List<WorkAttachmentInfo> getByAttachmentIdAndUrlAndAttachmentFlag(@RequestParam WorkAttachmentInfo workattachment){
+    @RequestMapping(value = "getByAttachmentIdAndUrlAndAttachmentFlag", method = RequestMethod.POST)
+    public List<WorkAttachmentInfo> getByAttachmentIdAndUrlAndAttachmentFlag(@RequestBody WorkAttachmentInfo workattachment){
         return ossService.getByAttachmentIdAndUrlAndAttachmentFlag(workattachment);
     }