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

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/mapper/ProgramReportNoMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.assess.program.configuration.projectList.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.assess.program.configuration.projectList.domain.ProgramReportNo;
 import org.apache.ibatis.annotations.Mapper;
@@ -15,6 +16,7 @@ public interface ProgramReportNoMapper extends BaseMapper<ProgramReportNo> {
      * @param id
      * @return
      */
+    @InterceptorIgnore(tenantLine = "true")
     ProgramReportNo selectByProgramId(String id);
 }
 

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/mapper/ProjectLinkMapper.java

@@ -1,11 +1,13 @@
 package com.jeeplus.assess.program.configuration.projectList.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.assess.program.configuration.projectList.domain.ProgramProjectListLink;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 @Mapper
+@InterceptorIgnore(tenantLine = "true")
 public interface ProjectLinkMapper extends BaseMapper<ProgramProjectListLink> {
 
     void deleteByInfoId(@Param("id") String id);

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/mapper/ProjectListMapper.java

@@ -39,7 +39,16 @@ public interface ProjectListMapper extends BaseMapper<ProgramProjectListInfo> {
 
     String selectInvoiceFlag(@Param("id") String id);
 
+    @InterceptorIgnore(tenantLine = "true")
     ProgramProjectListInfo getById(@Param("id")String id);
 
     List<String> getHaveProjectIds(@Param("currentUser") UserDTO currentUser);
+
+    /**
+     * 根据id集合查询项目信息
+     * @param idList
+     * @return
+     */
+    @InterceptorIgnore(tenantLine = "true")
+    List<ProgramProjectListInfo> getListByidList(@Param("idList") List<String> idList);
 }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/mapper/xml/ProjectListMapper.xml

@@ -650,4 +650,80 @@
         from program_members pm
         where pm.user_id = #{currentUser.id} and pm.del_flag = '0'
     </select>
+
+    <select id="getListByidList" resultType="com.jeeplus.assess.program.configuration.projectList.domain.ProgramProjectListInfo">
+        SELECT
+            id,
+            contract_id,
+            contract_name,
+            client,
+            client_name,
+            amount,
+            contract_type,
+            NAME,
+            NO,
+            project_type,
+            approval_no,
+            company,
+            project_mould,
+            property_holder,
+            property_holder_name,
+            location,
+            is_first,
+            year_num,
+            check_year,
+            project_manager,
+            project_manager_name,
+            report_type,
+            industry,
+            enterprise_type,
+            risk_level,
+            project_source,
+            estimate,
+            plan_end_time,
+            use_num,
+            appointment,
+            work_hours,
+            remarks,
+            assessment_enterprise,
+            assessment_enterprise_name,
+            link_num,
+            relationship,
+            assessment_way,
+            assessment_objective,
+            assessment_date,
+            num,
+            project_development,
+            delegate_project_type,
+            assessment_object,
+            assessment_range,
+            generate_report_number,
+            work_begin_date,
+            work_end_date,
+            reporting_date,
+            is_have,
+            is_influence,
+            MODE,
+            STATUS,
+            proc_ins_id,
+            process_definition_id,
+            agree_time,
+            agree_user_id,
+            tab_type,
+            create_time,
+            create_by_id,
+            update_time,
+            update_by_id,
+            del_flag,
+            tenant_id
+        from
+            program_project_list_info
+        <where>
+            del_flag = 0
+            and id in
+            <foreach collection="idList" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </where>
+    </select>
 </mapper>

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/service/ProjectListService.java

@@ -523,7 +523,7 @@ public class ProjectListService {
     public ProjectListDto findById(String id) {
         ProjectListDto dto = new ProjectListDto();
         // 查询主表信息
-        ProgramProjectListInfo info = projectListMapper.selectById(id);
+        ProgramProjectListInfo info = projectListMapper.getById(id);
         BeanUtils.copyProperties(info, dto);
         // 查询联系人列表
         LambdaQueryWrapper<ProgramProjectListLink> linkWrapper = new LambdaQueryWrapper<>();

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/service/ReimbursementInfoService.java

@@ -223,7 +223,7 @@ public class ReimbursementInfoService {
         String projectName = "";
         String[] split = ids.split(",");
         List<String> idList = Arrays.asList(split);
-        List<ProgramProjectListInfo> list = projectListMapper.selectList(new LambdaQueryWrapper<ProgramProjectListInfo>().in(ProgramProjectListInfo::getId, idList));
+        List<ProgramProjectListInfo> list = projectListMapper.getListByidList(idList);
         if (CollectionUtil.isNotEmpty(list)) {
             projectName = list.stream().map(ProgramProjectListInfo::getName).collect(Collectors.joining(","));
         }
@@ -240,10 +240,10 @@ public class ReimbursementInfoService {
         String reportNo = "";
         String[] split = ids.split(",");
         List<String> idList = Arrays.asList(split);
-        List<ProgramProjectListInfo> list = projectListMapper.selectList(new LambdaQueryWrapper<ProgramProjectListInfo>().in(ProgramProjectListInfo::getId, idList));
+        List<ProgramProjectListInfo> list = projectListMapper.getListByidList(idList);
         if (CollectionUtil.isNotEmpty(list)) {
             list.stream().forEach(item -> {
-                ProgramReportNo programReportNo = programReportNoMapper.selectOne(new LambdaQueryWrapper<ProgramReportNo>().eq(ProgramReportNo::getProgramId, item.getId()));
+                ProgramReportNo programReportNo = programReportNoMapper.selectByProgramId(item.getId());
                 if (ObjectUtil.isNotEmpty(programReportNo) && StringUtils.isNotBlank(programReportNo.getReportNo())) {
                     reportNoList.add(programReportNo.getReportNo());
                 } else {
@@ -862,10 +862,10 @@ public class ReimbursementInfoService {
     public List<ProgramProjectListInfo> queryByProIds(String ids) {
         String[] split = ids.split(",");
         List<String> idList = Arrays.asList(split);
-        List<ProgramProjectListInfo> list = projectListMapper.selectList(new LambdaQueryWrapper<ProgramProjectListInfo>().in(ProgramProjectListInfo::getId, idList));
+        List<ProgramProjectListInfo> list = projectListMapper.getListByidList(idList);
         if (CollectionUtil.isNotEmpty(list)) {
             list.stream().forEach(item -> {
-                ProgramReportNo programReportNo = programReportNoMapper.selectOne(new LambdaQueryWrapper<ProgramReportNo>().eq(ProgramReportNo::getProgramId, item.getId()));
+                ProgramReportNo programReportNo = programReportNoMapper.selectByProgramId(item.getId());
                 if (ObjectUtil.isNotEmpty(programReportNo) && StringUtils.isNotBlank(programReportNo.getReportNo())) {
                     item.setReportNo(programReportNo.getReportNo());
                 } else {

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/service/ContractFilePaperService.java

@@ -115,7 +115,7 @@ public class ContractFilePaperService {
 //        if (CollectionUtils.isNotEmpty(list)) {
 //            saveFiles(list, userDTO, id);
 //        }
-        saveFiles(list, userDTO, id);
+        saveFiles(list, userDTO, id,filePaper);
         return id;
     }
 
@@ -186,7 +186,7 @@ public class ContractFilePaperService {
      * @param id 关联id
      */
     @Transactional(rollbackFor = Exception.class)
-    public void saveFiles(List<WorkAttachmentInfo> list, UserDTO userDTO, String id) {
+    public void saveFiles(List<WorkAttachmentInfo> list, UserDTO userDTO, String id,ContractFilePaper filePaper) {
         int j = 1;
         for (WorkAttachmentInfo dto : list) {
             WorkAttachmentInfo i = new WorkAttachmentInfo();
@@ -213,7 +213,8 @@ public class ContractFilePaperService {
             String userDTOInfo = JSON.toJSONString((userDTO));
             map.put("workAttachment",workAttachment);
             map.put("userDTO",userDTOInfo);
-            SpringUtil.getBean ( IWorkAttachmentApi.class ).insertWorkAttachment(map);
+            updateFiles(list, userDTO, filePaper.getId(),filePaper.getContractInfoId());
+            //SpringUtil.getBean ( IWorkAttachmentApi.class ).insertWorkAttachment(map);
 //            ossServiceMapper.insertWorkAttachment(i, userDTO);
             j++;
         }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/CwFinanceInvoiceService.java

@@ -299,7 +299,7 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
             }else if("cw_bmzr".equals(roleDTOById.getEnName()) && "兴光会计部门主任".equals(roleDTOById.getName())){
                 queryWrapper.eq("sumo.user_id", userDTO.getId());
                 break;
-            }else if("szfbdagly".equals(roleDTOById.getEnName()) && "苏州分布档案管理员".equals(roleDTOById.getName())){
+            }else if("szfbdagly".equals(roleDTOById.getEnName()) && "苏州分部档案管理员".equals(roleDTOById.getName())){
                 queryWrapper.eq("d.office_id", "1613800824395530242");
                 break;
             }

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

@@ -21,7 +21,6 @@ import java.util.List;
  * @version: 2022-11-10 14:56
  */
 @Mapper
-@InterceptorIgnore(tenantLine = "true")
 public interface CwProjectRecordsMapper extends BaseMapper<CwProjectRecords> {
     /**
      * 查询项目数据集合
@@ -69,6 +68,7 @@ public interface CwProjectRecordsMapper extends BaseMapper<CwProjectRecords> {
 
     List<String> isUseByFinance(String[] idArray);
 
+    @InterceptorIgnore(tenantLine = "true")
     void updatereportReviewById(CwProjectRecords records);
 
     @InterceptorIgnore(tenantLine = "true")

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

@@ -35,9 +35,11 @@ import com.jeeplus.finance.workClientInfo.service.dto.CwWorkClientBaseDTO;
 //import com.jeeplus.pubmodules.oss.service.OssService;
 //import com.jeeplus.pubmodules.serialNumTpl.service.SerialnumTplService;
 import com.jeeplus.sys.domain.User;
+import com.jeeplus.sys.feign.IRoleApi;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;
 //import com.jeeplus.sys.mapper.UserMapper;
+import com.jeeplus.sys.service.dto.RoleDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;

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

@@ -22,7 +22,7 @@ import java.util.List;
  * @create: 2022-11-16 14:17
  **/
 @Mapper
-@InterceptorIgnore(tenantLine = "true")
+//@InterceptorIgnore(tenantLine = "true")
 public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
 
     /**
@@ -31,7 +31,7 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
      * @param queryWrapper
      * @return
      */
-    @InterceptorIgnore(tenantLine = "true")
+    //@InterceptorIgnore(tenantLine = "true")
     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")

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

@@ -206,7 +206,7 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
             }else if("cw_bmzr".equals(roleDTOById.getEnName()) && "兴光会计部门主任".equals(roleDTOById.getName())){
                 queryWrapper.eq("sumo.user_id", userDTO.getOfficeDTO().getId());
                 break;
-            }else if("szfbdagly".equals(roleDTOById.getEnName()) && "苏州分布档案管理员".equals(roleDTOById.getName())){
+            }else if("szfbdagly".equals(roleDTOById.getEnName()) && "苏州分部档案管理员".equals(roleDTOById.getName())){
                 queryWrapper.eq("so.code", "szfb");
                 break;
             }else if("cwhtgdr".equals(roleDTOById.getEnName()) && "兴光会计报告归档管理员".equals(roleDTOById.getName())){

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApply/service/ReportCancellApplyService.java

@@ -344,7 +344,7 @@ public class ReportCancellApplyService extends ServiceImpl<ReportCancellApplyMap
             }else if("zkbyg".equals(roleDTOById.getEnName()) && "质控部员工".equals(roleDTOById.getName())){
                 queryWrapper.eq("cw_rev.review_by", userDTO.getId());
                 break;
-            }else if("szfbdagly".equals(roleDTOById.getEnName()) && "苏州分布档案管理员".equals(roleDTOById.getName())){
+            }else if("szfbdagly".equals(roleDTOById.getEnName()) && "苏州分部档案管理员".equals(roleDTOById.getName())){
                 queryWrapper.eq("d.office_id", "1613800824395530242");
                 break;
             }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApplyArchived/controller/ReportCancellApplyArchivedController.java

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