package org.jeecg.modules.eam.controller;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import io.swagger.annotations.Api;
|
import io.swagger.annotations.ApiOperation;
|
import lombok.extern.slf4j.Slf4j;
|
import org.apache.poi.ss.usermodel.*;
|
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
import org.apache.shiro.SecurityUtils;
|
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
import org.jeecg.common.constant.CommonConstant;
|
import org.jeecg.common.system.base.controller.JeecgController;
|
import org.jeecg.common.system.query.QueryGenerator;
|
import org.jeecg.common.system.vo.LoginUser;
|
import org.jeecg.common.util.ImportExcelUtil;
|
import org.jeecg.modules.eam.entity.*;
|
import org.jeecg.modules.eam.service.*;
|
import org.jeecg.modules.eam.vo.InspectionStandardImportVo;
|
import org.jeecgframework.poi.excel.entity.ImportParams;
|
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 org.springframework.web.multipart.MultipartHttpServletRequest;
|
import org.springframework.web.servlet.ModelAndView;
|
|
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletResponse;
|
import java.io.IOException;
|
import java.io.InputStream;
|
import java.math.BigDecimal;
|
import java.util.*;
|
|
/**
|
* @Description: mom_eam_inspection_project
|
* @Author: jeecg-boot
|
* @Date: 2023-03-10
|
* @Version: V1.0
|
*/
|
@Api(tags = "mom_eam_daily_inspection_standard")
|
@RestController
|
@RequestMapping("/eam/inspectionStandard")
|
@Slf4j
|
public class DailyInspectionStandardController extends JeecgController<DailyInspectionStandard, IDailyInspectionStandardService> {
|
@Autowired
|
private IDailyInspectionStandardService dailyInspectionStandardService;
|
|
@Autowired
|
private IEamEquipmentService equipmentService;
|
|
@Autowired
|
private IDailyInspectionStandardDetailService dailyInspectionStandardDetailService;
|
|
@Autowired
|
private IdentityService identityService;
|
|
@Autowired
|
private IInspectionProjectService inspectionProjectService;
|
|
@Autowired
|
private IInspectionCycleService inspectionCycleService;
|
/**
|
* 分页列表查询
|
*
|
* @param dailyInspectionStandard
|
* @param pageNo
|
* @param pageSize
|
* @param req
|
* @return
|
*/
|
@ApiOperation(value = "mom_eam_daily_inspection_standard-分页列表查询", notes = "mom_eam_daily_inspection_standard-分页列表查询")
|
@GetMapping(value = "/list")
|
public Result<IPage<DailyInspectionStandard>> queryPageList(DailyInspectionStandard dailyInspectionStandard,
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
HttpServletRequest req) {
|
QueryWrapper<DailyInspectionStandard> queryWrapper = QueryGenerator.initQueryWrapper(dailyInspectionStandard, req.getParameterMap());
|
Page<DailyInspectionStandard> page = new Page<DailyInspectionStandard>(pageNo, pageSize);
|
IPage<DailyInspectionStandard> pageList = dailyInspectionStandardService.page(page, queryWrapper);
|
return Result.OK(pageList);
|
}
|
|
/**
|
* 日常点检
|
* qsw 2023-4-26
|
*/
|
@GetMapping("getInspectionStandardList")
|
public Result<?> getInspectionStandardList(@RequestParam("pageNo") Integer pageNo,
|
@RequestParam("pageSize") Integer pageSize,
|
@RequestParam Map<String, Object> params) {
|
IPage<Map<String, Object>> inspectionStandardList = dailyInspectionStandardService.getInspectionStandardList(pageNo, pageSize, params);
|
List<Map<String, Object>> records = inspectionStandardList.getRecords();
|
for (Map<String, Object> record : records) {
|
String dailyInspectionStandardId = (String)record.get("id");
|
List<Map<String, Object>> dailyInspectionStandardDetaillist = dailyInspectionStandardDetailService.getInspectionStandardDetailList(dailyInspectionStandardId);
|
record.put("dailyInspectionStandardDetaillist",dailyInspectionStandardDetaillist);
|
}
|
return Result.ok(inspectionStandardList);
|
}
|
|
|
/**
|
*创建日常点检工单获取，日常点检标准
|
* 2023-8-2 qsw
|
*/
|
@GetMapping("findInspectionStandardList")
|
public Result<?> findInspectionStandardList(@RequestParam("pageNo") Integer pageNo,
|
@RequestParam("pageSize") Integer pageSize,
|
@RequestParam Map<String, Object> params) {
|
IPage<Map<String, Object>> inspectionStandardList = dailyInspectionStandardService.findInspectionStandardList(pageNo, pageSize, params);
|
return Result.ok(inspectionStandardList);
|
}
|
|
/**
|
* 添加
|
*
|
* @param dailyInspectionStandard
|
* @return
|
*/
|
@AutoLog(value = "mom_eam_daily_inspection_standard-添加")
|
@ApiOperation(value = "mom_eam_daily_inspection_standard-添加", notes = "mom_eam_daily_inspection_standard-添加")
|
@PostMapping(value = "/add")
|
@Transactional(rollbackFor = { Exception.class })
|
public Result<String> add(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
dailyInspectionStandard.setWritePerson(sysUser.getRealname());
|
dailyInspectionStandard.setAssignMode("1");
|
dailyInspectionStandardService.save(dailyInspectionStandard);
|
List<DailyInspectionStandardDetail> dailyInspectionStandardDetaillist = dailyInspectionStandard.getDailyInspectionStandardDetaillist();
|
DailyInspectionStandardDetail isd = null;
|
for (DailyInspectionStandardDetail dailyInspectionStandardDetail : dailyInspectionStandardDetaillist) {
|
isd = new DailyInspectionStandardDetail();
|
isd.setDailyInspectionStandardId(dailyInspectionStandard.getId());
|
isd.setLocation(dailyInspectionStandardDetail.getLocation());
|
isd.setPhoto(dailyInspectionStandardDetail.getPhoto());
|
isd.setInspectionProjectId(dailyInspectionStandardDetail.getInspectionProjectId());
|
isd.setInspectionCycleId(dailyInspectionStandardDetail.getInspectionCycleId());
|
dailyInspectionStandardDetailService.save(isd);
|
}
|
return Result.OK("添加成功！");
|
}
|
|
/**
|
* 编辑
|
*
|
* @param dailyInspectionStandard
|
* @return
|
*/
|
@AutoLog(value = "mom_eam_daily_inspection_standard-编辑")
|
@ApiOperation(value = "mom_eam_daily_inspection_standard-编辑", notes = "mom_eam_daily_inspection_standard-编辑")
|
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
@Transactional(rollbackFor = { Exception.class })
|
public Result<String> edit(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
|
dailyInspectionStandard.setApprovalStatus("1");
|
dailyInspectionStandardService.updateById(dailyInspectionStandard);
|
//1.删除原点检项目
|
List<DailyInspectionStandardDetail> dailyInspectionStandardDetails = dailyInspectionStandardDetailService.lambdaQuery()
|
.eq(DailyInspectionStandardDetail::getDailyInspectionStandardId, dailyInspectionStandard.getId())
|
.eq(DailyInspectionStandardDetail::getDelFlag, 0)
|
.eq(DailyInspectionStandardDetail::getStatus, "1").list();
|
for (DailyInspectionStandardDetail dailyInspectionStandardDetail : dailyInspectionStandardDetails) {
|
dailyInspectionStandardDetail.setDelFlag(1);
|
dailyInspectionStandardDetailService.updateById(dailyInspectionStandardDetail);
|
}
|
//2.重新持久点检项目
|
List<DailyInspectionStandardDetail> dailyInspectionStandardDetaillist = dailyInspectionStandard.getDailyInspectionStandardDetaillist();
|
DailyInspectionStandardDetail isd = null;
|
for (DailyInspectionStandardDetail dailyInspectionStandardDetail : dailyInspectionStandardDetaillist) {
|
isd = new DailyInspectionStandardDetail();
|
isd.setDailyInspectionStandardId(dailyInspectionStandard.getId());
|
isd.setLocation(dailyInspectionStandardDetail.getLocation());
|
isd.setPhoto(dailyInspectionStandardDetail.getPhoto());
|
isd.setInspectionProjectId(dailyInspectionStandardDetail.getInspectionProjectId());
|
isd.setInspectionCycleId(dailyInspectionStandardDetail.getInspectionCycleId());
|
dailyInspectionStandardDetailService.save(isd);
|
}
|
return Result.OK("编辑成功!");
|
}
|
|
/**
|
* 通过id删除
|
*
|
* @param id
|
* @return
|
*/
|
@AutoLog(value = "mom_eam_daily_inspection_standard-通过id删除")
|
@ApiOperation(value = "mom_eam_daily_inspection_standard-通过id删除", notes = "mom_eam_daily_inspection_standard-通过id删除")
|
@DeleteMapping(value = "/delete")
|
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
DailyInspectionStandard dailyInspectionStandard = dailyInspectionStandardService.getById(id);
|
dailyInspectionStandard.setDelFlag(1);
|
dailyInspectionStandardService.updateById(dailyInspectionStandard);
|
List<DailyInspectionStandardDetail> dailyInspectionStandardDetails = dailyInspectionStandardDetailService.lambdaQuery()
|
.eq(DailyInspectionStandardDetail::getDailyInspectionStandardId, id)
|
.eq(DailyInspectionStandardDetail::getDelFlag, 0)
|
.eq(DailyInspectionStandardDetail::getStatus, "1").list();
|
for (DailyInspectionStandardDetail dailyInspectionStandardDetail : dailyInspectionStandardDetails) {
|
dailyInspectionStandardDetail.setDelFlag(1);
|
dailyInspectionStandardDetailService.updateById(dailyInspectionStandardDetail);
|
}
|
return Result.OK("删除成功!");
|
}
|
|
/**
|
* 批量删除
|
*
|
* @param ids
|
* @return
|
*/
|
@AutoLog(value = "mom_eam_daily_inspection_standard-批量删除")
|
@ApiOperation(value = "mom_eam_daily_inspection_standard-批量删除", notes = "mom_eam_daily_inspection_standard-批量删除")
|
@DeleteMapping(value = "/deleteBatch")
|
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
List<String> idList = Arrays.asList(ids.split(","));
|
for (String id : idList) {
|
DailyInspectionStandard dailyInspectionStandard = dailyInspectionStandardService.getById(id);
|
dailyInspectionStandard.setDelFlag(1);
|
dailyInspectionStandardService.updateById(dailyInspectionStandard);
|
}
|
return Result.OK("批量删除成功!");
|
}
|
|
/**
|
* 通过id查询
|
*
|
* @param id
|
* @return
|
*/
|
@ApiOperation(value = "mom_eam_daily_inspection_standard-通过id查询", notes = "mom_eam_daily_inspection_standard-通过id查询")
|
@GetMapping(value = "/queryById")
|
public Result<DailyInspectionStandard> queryById(@RequestParam(name = "id", required = true) String id) {
|
DailyInspectionStandard dailyInspectionStandard = dailyInspectionStandardService.getById(id);
|
if (dailyInspectionStandard == null) {
|
return Result.error("未找到对应数据");
|
}
|
return Result.OK(dailyInspectionStandard);
|
}
|
|
/**
|
* 导出excel
|
*
|
* @param request
|
* @param dailyInspectionStandard
|
*/
|
@RequestMapping(value = "/exportXls")
|
public ModelAndView exportXls(HttpServletRequest request, DailyInspectionStandard dailyInspectionStandard) {
|
return super.exportXls(request, dailyInspectionStandard, DailyInspectionStandard.class, "mom_eam_daily_inspection_standard");
|
}
|
|
/**
|
* 通过excel导入数据
|
*
|
* @param request
|
* @param response
|
* @return
|
*/
|
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) throws IOException {
|
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
|
LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
|
// 错误信息
|
List<String> errorMessage = new ArrayList<>();
|
int successLines = 0, errorLines = 0;
|
//a = 1开始读取点检项目；b = 1开始读取周保养项目；c = 1该设备导入信息存在错误；projectColumnIndex点检项目所在列；maintenanceColumnIndex周保养项目所在列
|
int a = 0,b = 0,c = 0,projectColumnIndex = -1,maintenanceColumnIndex = 0;
|
String dailyInspectionStandardId = null;
|
String equipmentNum = null;
|
DailyInspectionStandard dailyInspectionStandard = new DailyInspectionStandard();
|
List<DailyInspectionStandardDetail> dailyInspectionStandardDetailList = new ArrayList<>();
|
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
|
MultipartFile file = entity.getValue();
|
ImportParams params = new ImportParams();
|
params.setNeedSave(true);
|
try {
|
InputStream fis = file.getInputStream();
|
Workbook workbook = new XSSFWorkbook(fis);
|
int sheets = workbook.getNumberOfSheets();
|
//判断点检周期是否存在
|
InspectionCycle dayInspectionCycle = inspectionCycleService.lambdaQuery().eq(InspectionCycle::getName,"1日").eq(InspectionCycle::getVersionStatus,"2").one();
|
InspectionCycle weekInspectionCycle = inspectionCycleService.lambdaQuery().eq(InspectionCycle::getName,"1周").eq(InspectionCycle::getVersionStatus,"2").one();
|
if(dayInspectionCycle == null || weekInspectionCycle == null){
|
c = 1;
|
errorMessage.add("点检周期不存在，请先维护点检周期");
|
errorLines++;
|
}else{
|
for(int i = 0;i < sheets;i++){
|
Sheet sheet = workbook.getSheetAt(i);
|
for (Row row : sheet) {
|
// 遍历每一个单元格
|
for (Cell cell : row) {
|
// 处理单元格数据，例如输出单元格的值
|
if("STRING".equals(cell.getCellType().toString())|| "BLANK".equals(cell.getCellType().toString())){
|
//点检周期存在，判断设备统一编码是否存在
|
if(cell.getStringCellValue().contains("设备名称：")){
|
String[] tybh1 = cell.getStringCellValue().split("统一编号：");
|
String[] tybh2 = tybh1[1].split("年");
|
equipmentNum = tybh2[0].trim().substring(0,tybh2[0].trim().length()-4).trim();
|
/*String year = tybh2[0].trim().substring(tybh2[0].trim().length()-4,tybh2[0].trim().length()).trim();
|
String[] month1 = tybh2[1].split("月");
|
String month = month1[0].trim();
|
String[] unit1 = cell.getStringCellValue().split("单位：");
|
String unit = unit1[1].trim();*/
|
Equipment equipment = equipmentService.lambdaQuery().eq(Equipment::getNum,equipmentNum).eq(Equipment::getDelFlag, CommonConstant.DEL_FLAG_0).one();
|
if(equipment == null){
|
c = 1;
|
errorMessage.add("sheet页为"+sheet.getSheetName()+"，设备统一编码为"+ equipmentNum + "的数据导入失败,原因:设备不存在，请先维护设备台账！");
|
errorLines++;
|
}else {
|
List<DailyInspectionStandard> dailyInspectionStandardList = dailyInspectionStandardService.lambdaQuery().eq(DailyInspectionStandard::getEquipmentId,equipment.getId())
|
.eq(DailyInspectionStandard::getVersionStatus,"2").eq(DailyInspectionStandard::getDelFlag,CommonConstant.DEL_FLAG_0).list();
|
if(CollectionUtils.isNotEmpty(dailyInspectionStandardList)){
|
c = 1;
|
errorMessage.add("sheet页为"+sheet.getSheetName()+"，设备统一编码为"+ equipmentNum + "的数据导入失败,原因:该设备已经存在点检标准！");
|
errorLines++;
|
}else {
|
c = 0;
|
dailyInspectionStandard.setNum(identityService.getNumByTypeAndLength("DailylnspectionStandard",4));
|
dailyInspectionStandard.setVersionStatus("2");
|
dailyInspectionStandard.setVersion("1.0");
|
dailyInspectionStandard.setAssignMode("1");
|
dailyInspectionStandard.setEquipmentId(equipment.getId());
|
dailyInspectionStandard.setApprovalStatus("1");
|
//dailyInspectionStandardService.save(dailyInspectionStandard);
|
//dailyInspectionStandardId = dailyInspectionStandard.getId();
|
}
|
}
|
break;
|
}
|
//设备统一编码存在，判断点检项目是否存在
|
if(c == 0){
|
System.out.print(cell.getStringCellValue() + "\t");
|
if(cell.getStringCellValue().contains("点检项目")){
|
a = 1;
|
projectColumnIndex = cell.getColumnIndex();
|
break;
|
}
|
if(cell.getStringCellValue().contains("维护责任人签字")){
|
a = 0;
|
}
|
if(projectColumnIndex == cell.getColumnIndex() && a == 1){
|
DailyInspectionStandardDetail dailyInspectionStandardDetail = new DailyInspectionStandardDetail();
|
dailyInspectionStandardDetail.setDailyInspectionStandardId(dailyInspectionStandardId);
|
String dayInspectionProjectName = row.getCell(projectColumnIndex).toString();
|
String standard = row.getCell(projectColumnIndex+1).toString();
|
//查询点击项目，如果没有新增点检项目
|
if(StringUtils.isNotBlank(dayInspectionProjectName)){
|
List<InspectionProject> inspectionProjectList = inspectionProjectService.lambdaQuery().eq(InspectionProject::getName,dayInspectionProjectName).eq(InspectionProject::getDelFlag,CommonConstant.DEL_FLAG_0).list();
|
if(CollectionUtils.isEmpty(inspectionProjectList)){
|
InspectionProject inspectionProject = new InspectionProject();
|
inspectionProject.setNum(identityService.getNumByTypeAndLength("InspectionProject",4));
|
inspectionProject.setName(dayInspectionProjectName);
|
inspectionProject.setDetectionStandard(standard);
|
inspectionProjectService.save(inspectionProject);
|
dailyInspectionStandardDetail.setInspectionProjectId(inspectionProject.getId());
|
dailyInspectionStandardDetail.setInspectionCycleId(dayInspectionCycle.getId());
|
dailyInspectionStandardDetailList.add(dailyInspectionStandardDetail);
|
// c = 1;
|
// errorMessage.add("sheet页为"+sheet.getSheetName()+"，设备统一编码为"+ equipmentNum + "的数据导入失败,原因:点检项目不存在，请先维护点检项目！");
|
// errorLines++;
|
}else {
|
dailyInspectionStandardDetail.setInspectionProjectId(inspectionProjectList.get(0).getId());
|
dailyInspectionStandardDetail.setInspectionCycleId(dayInspectionCycle.getId());
|
dailyInspectionStandardDetailList.add(dailyInspectionStandardDetail);
|
//dailyInspectionStandardDetailService.save(dailyInspectionStandardDetail);
|
}
|
}
|
break;
|
}
|
if(cell.getStringCellValue().contains("周保养项目")){
|
b = 1;
|
maintenanceColumnIndex = cell.getColumnIndex();
|
break;
|
}
|
if(cell.getStringCellValue().contains("周保养操作者执行")){
|
b = 0;
|
dailyInspectionStandardService.save(dailyInspectionStandard);
|
for(DailyInspectionStandardDetail dailyInspectionStandardDetail : dailyInspectionStandardDetailList){
|
dailyInspectionStandardDetail.setDailyInspectionStandardId(dailyInspectionStandard.getId());
|
}
|
dailyInspectionStandardDetailService.saveBatch(dailyInspectionStandardDetailList);
|
successLines++;
|
dailyInspectionStandard = null;
|
dailyInspectionStandardDetailList.clear();
|
}
|
if(b == 1 && c == 0 && maintenanceColumnIndex == cell.getColumnIndex()){
|
DailyInspectionStandardDetail dailyInspectionStandardDetail = new DailyInspectionStandardDetail();
|
dailyInspectionStandardDetail.setDailyInspectionStandardId(dailyInspectionStandardId);
|
String weekInspectionProjectName = row.getCell(maintenanceColumnIndex).toString();
|
String inspectionStandardName = row.getCell(maintenanceColumnIndex+1).toString();
|
if(StringUtils.isNotBlank(weekInspectionProjectName)){
|
List<InspectionProject> inspectionProjectList = inspectionProjectService.lambdaQuery().eq(InspectionProject::getName,weekInspectionProjectName).eq(InspectionProject::getDelFlag,CommonConstant.DEL_FLAG_0).list();
|
if(CollectionUtils.isEmpty(inspectionProjectList)){
|
InspectionProject inspectionProject = new InspectionProject();
|
inspectionProject.setNum(identityService.getNumByTypeAndLength("InspectionProject",4));
|
inspectionProject.setName(weekInspectionProjectName);
|
inspectionProject.setDetectionStandard(inspectionStandardName);
|
inspectionProjectService.save(inspectionProject);
|
dailyInspectionStandardDetail.setInspectionProjectId(inspectionProject.getId());
|
dailyInspectionStandardDetail.setInspectionCycleId(weekInspectionCycle.getId());
|
dailyInspectionStandardDetailList.add(dailyInspectionStandardDetail);
|
// c = 1;
|
// errorMessage.add("sheet页为"+sheet.getSheetName()+"，行数为："+row.getRowNum()+"，设备统一编码为"+ equipmentNum + "的数据导入失败,原因:点检项目不存在，请先维护点检项目！");
|
// errorLines++;
|
}else {
|
|
dailyInspectionStandardDetail.setInspectionProjectId(inspectionProjectList.get(0).getId());
|
dailyInspectionStandardDetail.setInspectionCycleId(weekInspectionCycle.getId());
|
dailyInspectionStandardDetailList.add(dailyInspectionStandardDetail);
|
//dailyInspectionStandardDetailService.save(dailyInspectionStandardDetail);
|
}
|
}
|
break;
|
}
|
}
|
}/*else if("NUMERIC".equals(cell.getCellType().toString())){
|
System.out.print(cell.getNumericCellValue() + "\t");
|
}
|
*/
|
}
|
System.out.println();
|
}
|
}
|
}
|
|
} catch (IOException e) {
|
e.printStackTrace();
|
}
|
}
|
return ImportExcelUtil.imporReturnRes(errorLines, successLines, errorMessage);
|
}
|
|
/**
|
*日常点检标准 根据设备台账 获取对象部门（使用部门）
|
* 2023-7-31
|
*/
|
@GetMapping("getDepartByEquipment")
|
public Result<?> getDepartByEquipment(@RequestParam("pageNo") Integer pageNo,
|
@RequestParam("pageSize") Integer pageSize,
|
@RequestParam Map<String, Object> params) {
|
IPage<Map<String, Object>> departByEquipment = dailyInspectionStandardService.getDepartByEquipment(pageNo, pageSize, params);
|
return Result.ok(departByEquipment);
|
}
|
|
/**
|
* 版本升级
|
*/
|
@PostMapping(value = "/revise")
|
@Transactional(rollbackFor = { Exception.class })
|
public Result<String> revise(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
dailyInspectionStandard.setWritePerson(sysUser.getRealname());
|
dailyInspectionStandard.setId("");
|
dailyInspectionStandard.setApprovalStatus("1");
|
dailyInspectionStandard.setCreateTime(new Date());
|
dailyInspectionStandard.setTakeEffectTime(null);
|
dailyInspectionStandard.setLoseEfficacyTime(null);
|
dailyInspectionStandard.setApprovalFeedback(null);
|
dailyInspectionStandard.setAuditFeedback(null);
|
dailyInspectionStandard.setAuditPerson(null);
|
dailyInspectionStandard.setApprovalPerson(null);
|
dailyInspectionStandardService.save(dailyInspectionStandard);
|
List<DailyInspectionStandardDetail> dailyInspectionStandardDetaillist = dailyInspectionStandard.getDailyInspectionStandardDetaillist();
|
DailyInspectionStandardDetail isd = null;
|
for (DailyInspectionStandardDetail dailyInspectionStandardDetail : dailyInspectionStandardDetaillist) {
|
isd = new DailyInspectionStandardDetail();
|
isd.setDailyInspectionStandardId(dailyInspectionStandard.getId());
|
isd.setLocation(dailyInspectionStandardDetail.getLocation());
|
isd.setPhoto(dailyInspectionStandardDetail.getPhoto());
|
isd.setInspectionProjectId(dailyInspectionStandardDetail.getInspectionProjectId());
|
isd.setInspectionCycleId(dailyInspectionStandardDetail.getInspectionCycleId());
|
dailyInspectionStandardDetailService.save(isd);
|
}
|
return Result.OK("添加成功！");
|
}
|
|
/**
|
* 日常点检标准升版
|
* qsw 2023-7-26
|
*/
|
@RequestMapping("/getReviseVersion")
|
public Result<?> getReviseVersion(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
|
List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery().eq(DailyInspectionStandard::getNum, dailyInspectionStandard.getNum())
|
.orderByDesc(DailyInspectionStandard::getVersion).list();
|
String version = dailyInspectionStandards.get(0).getVersion();
|
BigDecimal versionB = null;
|
if(StringUtils.isBlank(version)){
|
versionB = new BigDecimal(0);
|
}else{
|
versionB = new BigDecimal(version);
|
}
|
BigDecimal versionCode = versionB.add(new BigDecimal(1));
|
return Result.ok(versionCode.toString());
|
}
|
|
/**
|
* 版本生效
|
* qsw 2023-7-26
|
*/
|
@RequestMapping(value = "/versionTakeEffect", method = {RequestMethod.PUT,RequestMethod.POST})
|
@Transactional(rollbackFor = { Exception.class })
|
public Result<String> versionTakeEffect(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
|
|
// List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
|
// .eq(DailyInspectionStandard::getNum, dailyInspectionStandard.getNum())
|
// .eq(DailyInspectionStandard::getVersionStatus, "2").list();
|
// for (DailyInspectionStandard standard : dailyInspectionStandards) {
|
// standard.setVersionStatus("3");
|
// standard.setLoseEfficacyTime(new Date());
|
// dailyInspectionStandardService.updateById(standard);
|
// }
|
// dailyInspectionStandard.setTakeEffectTime(new Date());
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
dailyInspectionStandard.setLoseEfficacyPerson(sysUser.getRealname());
|
dailyInspectionStandard.setLoseEfficacyTime(new Date());
|
boolean b = dailyInspectionStandardService.updateById(dailyInspectionStandard);
|
if (b){
|
return Result.OK("编辑成功!");
|
}else{
|
return Result.error("编辑失败!");
|
}
|
}
|
|
/**
|
* 签审流程
|
* qsw 2023-11-16
|
*/
|
@RequestMapping(value = "/auditApproval", method = {RequestMethod.PUT,RequestMethod.POST})
|
@Transactional(rollbackFor = { Exception.class })
|
public Result<String> auditApproval(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
String approvalStatus = dailyInspectionStandard.getApprovalStatus();
|
if("5".equals(approvalStatus)){//审核通过后，版本生效
|
List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
|
.eq(DailyInspectionStandard::getNum, dailyInspectionStandard.getNum())
|
.eq(DailyInspectionStandard::getVersionStatus, "2").list();
|
for (DailyInspectionStandard standard : dailyInspectionStandards) {
|
standard.setVersionStatus("3");
|
standard.setLoseEfficacyTime(new Date());
|
standard.setLoseEfficacyPerson(sysUser.getRealname());
|
dailyInspectionStandardService.updateById(standard);
|
}
|
dailyInspectionStandard.setApprovalPerson(sysUser.getRealname());
|
dailyInspectionStandard.setVersionStatus("2");
|
dailyInspectionStandard.setTakeEffectTime(new Date());
|
}else if("3".equals(approvalStatus)){
|
dailyInspectionStandard.setAuditPerson(sysUser.getRealname());
|
}
|
boolean b = dailyInspectionStandardService.updateById(dailyInspectionStandard);
|
if (b){
|
return Result.OK("审核成功!");
|
}else{
|
return Result.error("审核失败!");
|
}
|
}
|
|
|
/**
|
* 批量 签审流程
|
* qsw 2023-12-12
|
*/
|
@RequestMapping(value = "/auditApprovalBatch", method = {RequestMethod.PUT,RequestMethod.POST})
|
@Transactional(rollbackFor = { Exception.class })
|
public Result<String> auditApprovalBatch(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
List<DailyInspectionStandard> dailyInspectionStandardlist = dailyInspectionStandard.getDailyInspectionStandardlist();
|
for (DailyInspectionStandard inspectionStandard : dailyInspectionStandardlist) {
|
String approvalStatus = inspectionStandard.getApprovalStatus();
|
if("5".equals(approvalStatus)){//审核通过后，版本生效
|
List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
|
.eq(DailyInspectionStandard::getNum, inspectionStandard.getNum())
|
.eq(DailyInspectionStandard::getVersionStatus, "2").list();
|
for (DailyInspectionStandard standard : dailyInspectionStandards) {
|
standard.setVersionStatus("3");
|
standard.setLoseEfficacyTime(new Date());
|
standard.setLoseEfficacyPerson(sysUser.getRealname());
|
dailyInspectionStandardService.updateById(standard);
|
}
|
inspectionStandard.setApprovalPerson(sysUser.getRealname());
|
inspectionStandard.setVersionStatus("2");
|
inspectionStandard.setTakeEffectTime(new Date());
|
}else if("3".equals(approvalStatus)){
|
inspectionStandard.setAuditPerson(sysUser.getRealname());
|
}
|
boolean b = dailyInspectionStandardService.updateById(inspectionStandard);
|
if (!b){
|
return Result.error("审核失败!");
|
}
|
}
|
return Result.OK("审核成功!");
|
}
|
}
|
