fix绩效流导出样式

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/controller/ItdmFlowPathStepController.java

@@ -26,7 +26,7 @@ import java.util.Arrays;
  * @Date:   2023-07-20
  * @Version: V1.0
  */
-@Api(tags="流程步骤表")
+@Api(tags=".流程步骤表")
 @RestController
 @RequestMapping("/flowpath/itdmFlowPathStep")
 @Slf4j
@@ -35,6 +35,7 @@ public class ItdmFlowPathStepController extends JeecgController<ItdmFlowPathStep
 	private IItdmFlowPathStepService itdmFlowPathStepService;
 
 	 /**根据运行流程表的流程步骤id查对应流程步骤表的步骤顺序*/
+	 @ApiOperation("判断有无下一步，0无，1有")
 	 @GetMapping("/getSortByFlowPathId")
 	 public Integer getSortByFlowPathStepId(String dqStep){
 		 String sort = itdmFlowPathStepService.getSortByFlowPathStepId(dqStep);

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/mapper/ItdmRunFlowPathMapper.java

@@ -1,10 +1,7 @@
 package org.jeecg.modules.flowpath.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.flowpath.entity.ItdmRunFlowPath;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.flowpath.entity.ItdmRunFlowPath;
 
 /**
  * @Description: 运行流程表

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/service/IItdmRunFlowPathService.java

@@ -1,8 +1,8 @@
 package org.jeecg.modules.flowpath.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.flowpath.dto.ItdmCreateRunFlowPath;
 import org.jeecg.modules.flowpath.entity.ItdmRunFlowPath;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * @Description: 运行流程表

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/service/impl/ItdmRunFlowPathServiceImpl.java

@@ -108,7 +108,7 @@ public class ItdmRunFlowPathServiceImpl extends ServiceImpl<ItdmRunFlowPathMappe
         itdmRunFlowPath.setFaqiUser(user.getUsername());
         itdmRunFlowPath.setDqSetp(list.get(0).getId());
 //        itdmRunFlowPath.setDqSetpUserIds(list.get(0).getUserIds());
-        //当前步骤用户改为选择的人
+        //当前运行流程的用户改为选择的人
         itdmRunFlowPath.setDqSetpUserIds(itdmCreateRunFlowPath.getUserName());
         itdmRunFlowPath.setDqSetpRoleId(list.get(0).getRoleId());
         itdmRunFlowPath.setStatus("0");//当前运行流程状态0开始2结束

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/service/impl/ItdmRunFlowPathStepServiceImpl.java

@@ -158,7 +158,8 @@ public class ItdmRunFlowPathStepServiceImpl extends ServiceImpl<ItdmRunFlowPathS
     @Transactional
 
     public void pass1(ItdmPassRunFlowPath itdmRunFlowPathStep) {
-        String nextStepUser = itdmRunFlowPathStep.getNextStepUser();//下一步操作人员的登录账号
+        String nextStepUser = "";//下一步操作人员的登录账号
+        if(itdmRunFlowPathStep.getNextStepUser()!=null) nextStepUser = itdmRunFlowPathStep.getNextStepUser();
 
         //根据当前运行流程id查当前运行流程
         ItdmRunFlowPath itdmRunFlowPath = this.itdmRunFlowPathMapper.selectById(itdmRunFlowPathStep.getRunFlowPath());
@@ -199,6 +200,10 @@ public class ItdmRunFlowPathStepServiceImpl extends ServiceImpl<ItdmRunFlowPathS
             }
 
             return;
+        }else {
+            //修改运行流程步骤表的下一步骤的用户
+            nextstep.setUserIds(nextStepUser);
+            runFlowPathStepMapper.updateById(nextstep);
         }
 
         //原待办任务名、委托id

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/jixiaoPersonPrice/service/impl/JixiaoPersonPriceServiceImpl.java

@@ -71,11 +71,14 @@ public class JixiaoPersonPriceServiceImpl extends ServiceImpl<JixiaoPersonPriceM
         List<ExcelExportEntity> filedsList = new ArrayList<>();
         if(exportList != null && !exportList.isEmpty()){
             Map map = exportList.get(0);
+            filedsList.add(new ExcelExportEntity("委托编号", "weituo_no"));
             // 打印键集合
             for (Object key : map.keySet()) {
                 System.out.println((String) key);
+                if(key.equals("weituo_no") || key.equals("TOTAL")) continue;
                 filedsList.add(new ExcelExportEntity((String) key, (String)key));
             }
+            filedsList.add(new ExcelExportEntity("总计", "TOTAL"));
         }
 
         // Step.3 AutoPoi 导出Excel