|
|
|
@ -1,60 +1,49 @@
|
|
|
|
|
package jnpf.controller;
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
|
import cn.afterturn.easypoi.excel.ExcelExportUtil;
|
|
|
|
|
import cn.afterturn.easypoi.excel.ExcelImportUtil;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.ExportParams;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.ImportParams;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
|
|
|
|
|
import cn.xuyanwu.spring.file.storage.FileInfo;
|
|
|
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
|
|
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
|
|
|
import jnpf.base.ActionResult;
|
|
|
|
|
import jnpf.base.UserInfo;
|
|
|
|
|
import jnpf.exception.DataException;
|
|
|
|
|
import jnpf.permission.entity.UserEntity;
|
|
|
|
|
import jnpf.service.*;
|
|
|
|
|
import jnpf.entity.*;
|
|
|
|
|
import jnpf.util.*;
|
|
|
|
|
import jnpf.model.yysdaywork.*;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
|
|
import javax.validation.Valid;
|
|
|
|
|
import java.util.*;
|
|
|
|
|
|
|
|
|
|
import jnpf.annotation.JnpfField;
|
|
|
|
|
import jnpf.base.model.ColumnDataModel;
|
|
|
|
|
import jnpf.base.util.VisualUtils;
|
|
|
|
|
import jnpf.base.vo.DownloadVO;
|
|
|
|
|
import jnpf.base.vo.PageListVO;
|
|
|
|
|
import jnpf.base.vo.PaginationVO;
|
|
|
|
|
import jnpf.base.vo.DownloadVO;
|
|
|
|
|
import jnpf.config.ConfigValueUtil;
|
|
|
|
|
import jnpf.base.entity.ProvinceEntity;
|
|
|
|
|
|
|
|
|
|
import java.io.IOException;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
import jnpf.engine.entity.FlowTaskEntity;
|
|
|
|
|
import jnpf.exception.WorkFlowException;
|
|
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
import cn.afterturn.easypoi.excel.ExcelExportUtil;
|
|
|
|
|
import cn.afterturn.easypoi.excel.ExcelImportUtil;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.ExportParams;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.ImportParams;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
|
|
|
|
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
|
|
|
|
import org.apache.poi.ss.usermodel.Workbook;
|
|
|
|
|
|
|
|
|
|
import java.io.File;
|
|
|
|
|
|
|
|
|
|
import jnpf.entity.YysDayWorkEntity;
|
|
|
|
|
import jnpf.entity.YysMonthlyProductionEntity;
|
|
|
|
|
import jnpf.model.visualJson.config.HeaderModel;
|
|
|
|
|
import jnpf.model.yysdaywork.*;
|
|
|
|
|
import jnpf.onlinedev.model.ExcelImFieldModel;
|
|
|
|
|
import jnpf.onlinedev.model.OnlineImport.ExcelImportModel;
|
|
|
|
|
import jnpf.onlinedev.model.OnlineImport.ImportDataModel;
|
|
|
|
|
import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel;
|
|
|
|
|
import jnpf.onlinedev.model.OnlineImport.ExcelImportModel;
|
|
|
|
|
import jnpf.onlinedev.model.OnlineImport.VisualImportModel;
|
|
|
|
|
import cn.xuyanwu.spring.file.storage.FileInfo;
|
|
|
|
|
import jnpf.service.YysDayWorkService;
|
|
|
|
|
import jnpf.service.YysMonthlyProductionService;
|
|
|
|
|
import jnpf.util.*;
|
|
|
|
|
import lombok.Cleanup;
|
|
|
|
|
import jnpf.model.visualJson.config.HeaderModel;
|
|
|
|
|
import jnpf.base.model.ColumnDataModel;
|
|
|
|
|
import jnpf.base.util.VisualUtils;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import org.apache.commons.collections4.MapUtils;
|
|
|
|
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
|
|
|
|
import org.apache.poi.ss.usermodel.Workbook;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
|
|
|
|
import javax.validation.Valid;
|
|
|
|
|
import java.io.File;
|
|
|
|
|
import java.io.IOException;
|
|
|
|
|
import java.util.*;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* yysDayWork
|
|
|
|
@ -80,8 +69,7 @@ public class YysDayWorkController {
|
|
|
|
|
private YysDayWorkService yysDayWorkService;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
private YysClassesService yysClassesService;
|
|
|
|
|
|
|
|
|
|
private YysMonthlyProductionService yysMonthlyProductionService;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
private ConfigValueUtil configValueUtil;
|
|
|
|
@ -97,9 +85,14 @@ public class YysDayWorkController {
|
|
|
|
|
public ActionResult list(@RequestBody YysDayWorkPagination yysDayWorkPagination) throws IOException {
|
|
|
|
|
List<YysDayWorkEntity> list = yysDayWorkService.getList(yysDayWorkPagination);
|
|
|
|
|
List<Map<String, Object>> realList = new ArrayList<>();
|
|
|
|
|
List<YysMonthlyProductionEntity> list1 = yysMonthlyProductionService.list();
|
|
|
|
|
Map<String, String> collect = list1.stream().collect(Collectors.toMap(YysMonthlyProductionEntity::getId, YysMonthlyProductionEntity::getIsFrozen));
|
|
|
|
|
for (YysDayWorkEntity entity : list) {
|
|
|
|
|
Map<String, Object> yysDayWorkMap = JsonUtil.entityToMap(entity);
|
|
|
|
|
yysDayWorkMap.put("id", yysDayWorkMap.get("id"));
|
|
|
|
|
if (MapUtils.isNotEmpty(collect) && collect.containsKey(entity.getMonthId())) {
|
|
|
|
|
yysDayWorkMap.put("f_isFrozen", collect.getOrDefault(entity.getMonthId(), ""));
|
|
|
|
|
}
|
|
|
|
|
//副表数据
|
|
|
|
|
//子表数据
|
|
|
|
|
realList.add(yysDayWorkMap);
|
|
|
|
@ -570,4 +563,16 @@ public class YysDayWorkController {
|
|
|
|
|
return ActionResult.fail(result);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Operation(summary = "冻结")
|
|
|
|
|
@GetMapping("/isFrozen/{id}")
|
|
|
|
|
public ActionResult isFrozen(@PathVariable("id") String id) {
|
|
|
|
|
return ActionResult.success(yysDayWorkService.isFrozen(id));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Operation(summary = "解冻")
|
|
|
|
|
@GetMapping("/cancelFrozen/{id}")
|
|
|
|
|
public ActionResult cancelFrozen(@PathVariable("id") String id) {
|
|
|
|
|
return ActionResult.success(yysDayWorkService.cancelFrozen(id));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|