流程代码调整提交

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/flowable/factory/FlowableApiFallbackFactory.java

@@ -122,6 +122,11 @@ public class FlowableApiFallbackFactory implements FallbackFactory <IFlowableApi
             public boolean checkIsLastTask(String procInsId) {
                 return false;
             }
+
+            @Override
+            public void revokeProcIns(String procInsId) {
+
+            }
         };
     }
 }

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/flowable/feign/IFlowableApi.java

@@ -132,4 +132,10 @@ public interface IFlowableApi {
      */
     @GetMapping(value = "/flowable/task/checkIsLastTask")
     boolean checkIsLastTask(@RequestParam(value = "procInsId")String procInsId);
+
+    /**
+     * 撤回流程
+     */
+    @GetMapping(value = "/flowable/process/revokeProcIns")
+    void revokeProcIns(@RequestParam(value = "procInsId")String procInsId);
 }

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

@@ -1803,7 +1803,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         if (CollectionUtil.isNotEmpty(userDTO.getRoleDTOList())){
             for (RoleDTO roleDTO : userDTO.getRoleDTOList()) {
                 RoleDTO dtoById = SpringUtil.getBean(IRoleApi.class).getRoleDTOById(roleDTO.getId());
-                if ("szbgqzgzdb".equals(dtoById.getEnName())){
+                if (null != dtoById && "szbgqzgzdb".equals(dtoById.getEnName())){
                     reportData.setIsXs("1");
                 }
             }

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

@@ -77,6 +77,14 @@ public interface CwProjectReportArchiveMapper extends BaseMapper<CwProjectReport
      */
     IPage<CwProjectReportArchiveDTO> findCompletedList(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);
 
+
+    /**
+     * 查询最后一条归档并作废的归档信息
+     * @param reportId
+     * @return
+     */
+    List<CwProjectReportArchiveDTO> getArchiveDateByReportId(String reportId);
+
 }
 
 

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

@@ -598,4 +598,13 @@
         order by cw_pa.audit_date desc,cw_pa.update_time desc
         limit 1
     </select>
+
+    <select id="getArchiveDateByReportId" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"></include>
+        from cw_project_report_archive cw_pa
+
+        where cw_pa.report_id = #{reportId} and cw_pa.del_flag = 0
+        order by cw_pa.audit_date desc,cw_pa.update_time desc
+    </select>
 </mapper>