移动端相关功能调整

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/service/FlowProcessService.java

@@ -146,7 +146,7 @@ public class FlowProcessService {
         if (StringUtils.isNotBlank(type)) {
             if (type.equals("ydd")) {
                 // 创建一个包含需要保留的流程定义名称的集合
-                List<String> requiredNames = Arrays.asList("物资管理-领用申请", "物资管理-采购申请", "日常办公-请假申请", "离职申请", "离职交接申请", "会计-报销审批", "会计-发票申请");
+                List<String> requiredNames = Arrays.asList("物资管理-领用申请", "物资管理-采购申请", "日常办公-请假申请", "离职申请", "离职交接申请", "会计-报销审批", "会计-发票申请", "报销申请", "发票申请");
                 /**
                  * 移动端工作台数据处理
                  */

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/service/FlowTaskService.java

@@ -424,7 +424,9 @@ public class FlowTaskService {
                 processName.equals("离职申请") ||
                 processName.equals("离职交接申请") ||
                 processName.equals("会计-报销审批") ||
-                processName.equals("会计-发票申请");
+                processName.equals("会计-发票申请") ||
+                processName.equals("报销申请") ||
+                processName.equals("发票申请")  ;
     }
 
     /**
@@ -669,7 +671,7 @@ public class FlowTaskService {
         if (StringUtils.isNotBlank(type)) {
             if (type.equals("ydd")) {
                 // 创建一个包含需要保留的流程定义名称的集合
-                List<String> requiredNames = Arrays.asList("物资管理-领用申请", "物资管理-采购申请", "日常办公-请假申请", "离职申请", "离职交接申请", "会计-报销审批", "会计-发票申请");
+                List<String> requiredNames = Arrays.asList("物资管理-领用申请", "物资管理-采购申请", "日常办公-请假申请", "离职申请", "离职交接申请", "会计-报销审批", "会计-发票申请", "报销申请","发票申请");
                 /**
                  * 移动端工作台数据处理
                  */
@@ -829,7 +831,8 @@ public class FlowTaskService {
         }
         //设置请假天数
         if (StrUtil.isNotBlank(days)){
-            vars.put(FlowableConstant.DAYS,days);
+            Double value = Double.valueOf(days);
+            vars.put(FlowableConstant.DAYS,value);
         }
 
         // 启动流程

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/purchase/mapper/MaterialBasicMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.pubmodules.purchase.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;
@@ -37,5 +38,6 @@ public interface MaterialBasicMapper extends BaseMapper<MaterialBasic> {
      */
     MaterialBasic getInfoByPurchaseNo(String purchaseNo);
 
-    String getUserNameByUserId(String handledBy);
+    @InterceptorIgnore(tenantLine = "true")
+    MaterialInfoDto getUserNameByUserId(String handledBy);
 }

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/purchase/mapper/xml/MaterialBasicMapper.xml

@@ -49,8 +49,10 @@
             resultType="com.jeeplus.pubmodules.purchase.domain.MaterialBasic">
 		select * from material_management_pruchase_request_basics where purchase_no = #{purchaseNo}
 	</select>
-    <select id="getUserNameByUserId" resultType="java.lang.String">
-		select name from sys_user where id = #{id}
+    <select id="getUserNameByUserId" resultType="com.jeeplus.pubmodules.purchase.service.dto.MaterialInfoDto">
+		select su.name as handledBy,so.name as handledByOfficeName from sys_user su
+		left join sys_office so on su.office_id = so.id
+		where su.id = #{id}
 	</select>
     <select id="findFileList" resultType="com.jeeplus.pubmodules.oss.domain.WorkAttachment">
 		SELECT * FROM work_attachment WHERE del_flag = 0 AND attachment_id = #{id}

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/purchase/service/MaterialService.java

@@ -378,9 +378,12 @@ public class MaterialService {
                 }
             }
             //根据经办人id查出经办人的名称
-            String name = basicMapper.getUserNameByUserId(info.getHandledBy());
-            dto.setHandledBy(name);
+            MaterialInfoDto infoDto = basicMapper.getUserNameByUserId(info.getHandledBy());
+            dto.setHandledBy(infoDto.getHandledBy());
             dto.setHandledById(info.getHandledBy());
+            //设置经办人部门名称
+
+            dto.setHandledByOfficeName(infoDto.getHandledByOfficeName());
             dto.setFiles(files);
         }
         return dto;