添加立刻离职导出接口

src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java

@@ -187,7 +187,7 @@ public class AsyncFactory {
      * @param totalAmount
      * @return
      */
-    public static TimerTask saveVtbSubmit(VtbVerification verification, BigDecimal totalAmount) {
+    public static TimerTask saveVtbSubmit(VtbVerification verification, BigDecimal totalAmount,Integer state) {
         return new TimerTask() {
             @Override
             public void run() {
@@ -197,10 +197,16 @@ public class AsyncFactory {
                     log.debug("saveVtbSubmit");
                     VtbVerificationOperationServiceImpl verificationOperationService = SpringUtils.getBean(VtbVerificationOperationServiceImpl.class);
                     String summeryResult = verificationOperationService.checkAffairSummery(verification.getId().toString());
-                    if(summeryResult.equals(VtbVerificationOperationServiceImpl.SummeryState_Success)){
-                        //调用成功回调方法
+                    if( summeryResult.equals(VtbVerificationOperationServiceImpl.SummeryState_Success)){
                         VtbVerificationApplication verificationApplication = SpringUtils.getBean(VtbVerificationApplication.class);
+                        if(state.equals(1)){
+                            //调用成功回调方法
                             verificationApplication.finishCallBack(verification, totalAmount);
+                        }else if(state.equals(2)){
+                            verificationApplication.backCommitAndStop(verification,true);
+                        }else if(state.equals(0)){
+                            verificationApplication.backCommitAndStop(verification,false);
+                        }
                     }
                 } catch (Exception e) {
                     e.printStackTrace();

src/main/java/com/qs/serve/modules/exl/common/ExlConst.java

@@ -18,7 +18,9 @@ public interface ExlConst {
     String TABLE_CONFIG_PARAM = "tb_config_cnf_id";
 
     String PRE_COLUMN_START = "START--";
+    String PRE_COLUMN_START_LABEL = "(开始时间)";
 
     String PRE_COLUMN_END = "END--";
+    String PRE_COLUMN_END_LABEL = "(结束时间)";
 
 }

src/main/java/com/qs/serve/modules/exl/controller/ExlTableConfController.java

@@ -96,12 +96,12 @@ public class ExlTableConfController {
                 ExlQueryFieldDto startDto = new ExlQueryFieldDto();
                 startDto.setField(ExlConst.PRE_COLUMN_START + columnConf.getColumnName());
                 startDto.setType(columnConf.getColumnType());
-                startDto.setLabel(columnConf.getColumnHeader());
+                startDto.setLabel(columnConf.getColumnHeader()+ExlConst.PRE_COLUMN_START_LABEL);
                 queryFieldList.add(startDto);
                 ExlQueryFieldDto fieldDto = new ExlQueryFieldDto();
                 fieldDto.setField(ExlConst.PRE_COLUMN_END + columnConf.getColumnName());
                 fieldDto.setType(columnConf.getColumnType());
-                fieldDto.setLabel(columnConf.getColumnHeader());
+                fieldDto.setLabel(columnConf.getColumnHeader()+ExlConst.PRE_COLUMN_END_LABEL);
                 queryFieldList.add(fieldDto);
             }else {
                 ExlQueryFieldDto fieldDto = new ExlQueryFieldDto();

src/main/java/com/qs/serve/modules/exl/controller/ExlTableDataController.java

@@ -62,6 +62,9 @@ public class ExlTableDataController {
         String tableConfigId = map.get(ExlConst.TABLE_CONFIG_PARAM);
         map.remove(ExlConst.TABLE_CONFIG_PARAM);
         // table
+        if(tableConfigId==null){
+            return R.byEmptyList();
+        }
         ExlTableConf tableConf = exlTableConfService.getById(tableConfigId);
         // columns
         LambdaQueryWrapper<ExlColumnConf> columnLqw = new LambdaQueryWrapper<>();
@@ -80,6 +83,7 @@ public class ExlTableDataController {
             queryMap.put("startRow",startRow);
             queryMap.put("pageSize",pageSize);
             List<Map<String,Object>> list = exlTableConfMapper.listData(targetTableName,queryMap);
+            this.formatListData(list);
             vo.setList(list);
         }else {
             vo.setList(new ArrayList());
@@ -87,6 +91,7 @@ public class ExlTableDataController {
         return R.ok(vo);
     }
 
+
     @NotNull
     private Map<String, Object> buildQueryMap(Map<String, String> map, List<ExlColumnConf> columnList) {
         Map<String,Object> queryMap = new HashMap<>(10);
@@ -146,6 +151,7 @@ public class ExlTableDataController {
         Map<String, Object> queryMap = buildQueryMap(map, columnList);
         String targetTableName = ExlConst.TABLE_NAME_PRE + tableConf.getTableName();
         List<Map<String,Object>> list = exlTableConfMapper.listData(targetTableName,queryMap);
+        this.formatListData(list);
         return R.ok(list);
     }
 
@@ -219,5 +225,16 @@ public class ExlTableDataController {
     }
 
 
+    private void formatListData(List<Map<String, Object>> list) {
+        for (Map<String, Object> objectMap : list) {
+            for (String field : objectMap.keySet()) {
+                Object value = objectMap.get(field);
+                if(value!=null&&value.getClass().getName().equals("java.sql.Timestamp")){
+                    objectMap.put(field,value.toString().split(".")[0]);
+                }
+            }
+        }
+    }
+
 }
 

src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java

@@ -600,5 +600,17 @@ public class SysUserController {
         return R.ok();
     }
 
+    /**
+     * 人员立刻离职
+     * @param userId
+     * @return
+     */
+    @SysLog(title = "人员",desc = "离职调整",biz = BizType.LEAVE)
+    @PostMapping("/leaveNow")
+    public R<?> leaveNow(String userId){
+        sysUserService.leaveNow(userId);
+        return R.ok();
+    }
+
 }
 

src/main/java/com/qs/serve/modules/sys/service/SysUserService.java

@@ -55,10 +55,10 @@ public interface SysUserService extends IService<SysUser> {
     void leave(SysUserLeaveBo userLeaveParam);
 
     /**
-     * 离职执行函数
-     * @param date 执行日期
+     * 立刻离职执行函数
+     * @param userId
      */
-    void leaveAction(LocalDate date);
+    void leaveNow(String userId);
 
     /**
      * 取消离职

src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java

@@ -254,12 +254,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    public void leaveAction(LocalDate date) {
-        //todo 更新离职业务
+    public void leaveNow(String userId) {
         SysUser user = new SysUser();
-        user.setId(user.getId());
+        user.setId(userId);
         user.setServingState(0);
         user.setLoginEnable(0);
+        user.setServingLeaveDate(LocalDate.now());
         this.updateById(user);
     }
 

src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetCheckController.java

@@ -39,15 +39,6 @@ public class TbsBudgetCheckController {
     private final TbsBudgetApplyOperationServiceImpl tbsBudgetApplyOperationService;
     private final TbsBudgetChangeOperationServiceImpl tbsBudgetChangeOperationService;
 
-    //测试
-    @PostMapping("test/{id}")
-    public R<?> test(@PathVariable String id){
-        TbsAffairCommitBo param = new TbsAffairCommitBo();
-        param.setTargetId(id);
-        tbsBudgetChangeOperationService.doFinished(param);
-        return R.ok();
-    }
-
 
     /**
      * 提交申请

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java

@@ -85,6 +85,10 @@ public class TbsBudgetChangeOperationServiceImpl implements SeeYonOperationServi
             budgetChangeMapper.updateById(budgetChange);
         }
         TbsBudget tbsBudget = budgetMapper.selectById(budgetChange.getBudgetId());
+        if(budgetChange.getNewAttachIds()!=null&&budgetChange.getNewAttachIds().length>0){
+            tbsBudget.setAttachIds(budgetChange.getNewAttachIds());
+            budgetMapper.updateById(tbsBudget);
+        }
         SysUser sysUser = getSysUserService().getById(budgetChange.getUserId());
         //更新条件
         List<TbsBudgetChangeCondition> allChangeConditionList = tbsBudgetChangeConditionService.listByChangeId(budgetChange.getId());

src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java

@@ -284,7 +284,7 @@ public class VtbVerificationApplication {
         }
         if(isNext){
             //判断是否直接跳过审批的申请
-            AsyncManager.me().execute(AsyncFactory.saveVtbSubmit(verification, totalAmount));
+            AsyncManager.me().execute(AsyncFactory.saveVtbSubmit(verification, totalAmount,affairCommit.getState()));
         }
         return R.ok();
     }
@@ -343,7 +343,7 @@ public class VtbVerificationApplication {
      * @param verification
      * @param isBackCommit
      */
-    private void backCommitAndStop(VtbVerification verification, boolean isBackCommit) {
+    public void backCommitAndStop(VtbVerification verification, boolean isBackCommit) {
         if(isBackCommit){
             VtbVerification vtbVer = new VtbVerification();
             vtbVer.setId(verification.getId());

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -696,7 +696,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         }
 
         //判断是否直接跳过审批的申请
-        AsyncManager.me().execute(AsyncFactory.saveVtbSubmit(verification, totalAmount));
+        AsyncManager.me().execute(AsyncFactory.saveVtbSubmit(verification, totalAmount,1));
 
     }
 

src/main/java/com/qs/serve/task/controller/TaskUserController.java

@@ -59,6 +59,7 @@ public class TaskUserController {
         updLqw.in(SysUser::getId,userIds);
         SysUser sysUser = new SysUser();
         sysUser.setServingState(0);
+        sysUser.setLoginEnable(0);
         sysUser.setServingLeaveDate(LocalDate.now());
         sysUserService.update(sysUser,updLqw);
         return R.ok();