Skip to content

P
patzn-cloud-service-hmhj
Commit a48836b6 by lijingjing
Options

委托删除（从 【委托】 到 【报告】）

parent 2a14ace5
Showing with 436 additions and 335 deletions
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/BusinessDataController.java
package com.patzn.cloud.service.lims.hmhj.controller;
import com.patzn.cloud.service.hmhj.enums.BusinessDataEnum;
import com.patzn.cloud.service.hmhj.enums.BusinessStaffEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestConstants;
import com.patzn.cloud.commons.api.RestResult;
import com.patzn.cloud.commons.controller.ServiceController;
import com.patzn.cloud.service.hmhj.entity.BusinessData;
import com.patzn.cloud.service.hmhj.enums.BusinessDataEnum;
import com.patzn.cloud.service.lims.hmhj.service.IBusinessDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/CarbonAppearanceCheckLedgerController.java
package com.patzn.cloud.service.lims.hmhj.controller;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestConstants;
import com.patzn.cloud.commons.api.RestResult;
import com.patzn.cloud.commons.controller.ServiceController;
import com.patzn.cloud.service.hmhj.entity.CarbonAppearanceCheckLedger;
import com.patzn.cloud.service.lims.hmhj.service.ICarbonAppearanceCheckLedgerService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
......@@ -88,7 +79,7 @@ public class CarbonAppearanceCheckLedgerController extends ServiceController {
private void setFailureRate(CarbonAppearanceCheckLedger ledger) {
Integer total = ledger.getQualityCheckTotal();
Integer missedNum = ledger.getMissedBlocksNum();
if (null == total || missedNum == null || 0 == total.intValue()) {
if (null == total || missedNum == null || 0 == total) {
return;
}
ledger.setRandomCheckFailureRate(((float) missedNum / total * 100) + "%");
......
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/ClientInfoController.java
package com.patzn.cloud.service.lims.hmhj.controller;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestConstants;
import com.patzn.cloud.commons.api.RestResult;
import com.patzn.cloud.commons.controller.ServiceController;
import com.patzn.cloud.service.hmhj.entity.ClientInfo;
import com.patzn.cloud.service.lims.hmhj.service.IClientInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/ClientTestSideController.java
package com.patzn.cloud.service.lims.hmhj.controller;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestConstants;
import com.patzn.cloud.commons.api.RestResult;
import com.patzn.cloud.commons.controller.ServiceController;
import com.patzn.cloud.service.hmhj.entity.ClientTestSide;
import com.patzn.cloud.service.lims.hmhj.service.IClientTestSideService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/CodeRuleRecordController.java
package com.patzn.cloud.service.lims.hmhj.controller;
import com.patzn.cloud.service.hmhj.entity.CodeRuleRecord;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestConstants;
import com.patzn.cloud.commons.api.RestResult;
import com.patzn.cloud.commons.controller.ServiceController;
import com.patzn.cloud.service.hmhj.entity.CodeRuleRecord;
import com.patzn.cloud.service.lims.hmhj.service.ICodeRuleRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/ContractItemController.java
package com.patzn.cloud.service.lims.hmhj.controller;
import com.patzn.cloud.service.hmhj.entity.ContractItem;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestConstants;
import com.patzn.cloud.commons.api.RestResult;
import com.patzn.cloud.commons.controller.ServiceController;
import com.patzn.cloud.service.hmhj.entity.ContractItem;
import com.patzn.cloud.service.lims.hmhj.service.IContractItemService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustController.java
......@@ -265,6 +265,15 @@ public class EntrustController extends ServiceController {
return success(entrustService.removeByIds(ids));
}
@ApiOperation("根据 ids 删除")
@ApiImplicitParams({
@ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
})
@DeleteMapping("/deletePhysical")
public RestResult<Boolean> deletePhysical(@RequestParam("ids") List<Long> ids) {
return success(entrustService.deletePhysicalByIds(ids));
}
@ApiOperation(value = "添加委托单", notes = "添加委托单")
@PostMapping("/add_entrust")
......
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustRecordController.java
......@@ -2,26 +2,18 @@ package com.patzn.cloud.service.lims.hmhj.controller;
import com.baomidou.kisso.annotation.Action;
import com.baomidou.kisso.annotation.Login;
import com.patzn.cloud.service.hmhj.entity.EntrustRecord;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestConstants;
import com.patzn.cloud.commons.api.RestResult;
import com.patzn.cloud.commons.controller.ServiceController;
import com.patzn.cloud.service.hmhj.entity.EntrustRecord;
import com.patzn.cloud.service.lims.hmhj.service.IEntrustRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustSampleItemController.java
......@@ -298,8 +298,8 @@ public class EntrustSampleItemController extends ServiceController {
@ApiOperation("手工分配")
@PostMapping("/allot_item")
public RestResult<Boolean> allotItem(@RequestParam("ids") Long[] ids, @RequestParam("tester") String tester, @RequestParam("testerId") Long testerId) {
return success(entrustSampleItemService.allotItem(ids, tester, testerId, getAccount()));
public RestResult<Boolean> allotItem(@RequestParam("ids") Long[] ids, @RequestParam("tester") String tester, @RequestParam("testerId") Long testerId, @RequestParam("type") Integer type) {
return success(entrustSampleItemService.allotItem(ids, tester, testerId, type, getAccount()));
}
@ApiOperation("自动分配")
......@@ -333,8 +333,8 @@ public class EntrustSampleItemController extends ServiceController {
private void handlerData(EntrustSampleItemVO vo) {
// 数据来源
// 若为数据录入节点且不为分组管理员,那么需要过滤数据
boolean isLeader = userInfoService.isGroupLeader(vo.getEntrustId(),getAccount());
if("TEST".equalsIgnoreCase(vo.getSource()) && !isLeader){
boolean isLeader = userInfoService.isGroupLeader(vo.getEntrustId(), getAccount());
if ("TEST".equalsIgnoreCase(vo.getSource()) && !isLeader) {
vo.setTesterId(getAccount().getUserId());
}
}
......
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/GradingAnnexController.java
......@@ -2,27 +2,18 @@ package com.patzn.cloud.service.lims.hmhj.controller;
import com.baomidou.kisso.annotation.Action;
import com.baomidou.kisso.annotation.Login;
import com.patzn.cloud.service.hmhj.entity.GradingAnnex;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestConstants;
import com.patzn.cloud.commons.api.RestResult;
import com.patzn.cloud.commons.controller.ServiceController;
import com.patzn.cloud.service.hmhj.entity.GradingAnnex;
import com.patzn.cloud.service.lims.hmhj.service.IGradingAnnexService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/GradingItemController.java
package com.patzn.cloud.service.lims.hmhj.controller;
import com.patzn.cloud.service.hmhj.entity.GradingItem;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestConstants;
import com.patzn.cloud.commons.api.RestResult;
import com.patzn.cloud.commons.controller.ServiceController;
import com.patzn.cloud.service.hmhj.entity.GradingItem;
import com.patzn.cloud.service.lims.hmhj.service.IGradingItemService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/GradingRecordController.java
package com.patzn.cloud.service.lims.hmhj.controller;
import com.patzn.cloud.service.hmhj.entity.GradingRecord;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestConstants;
import com.patzn.cloud.commons.api.RestResult;
import com.patzn.cloud.commons.controller.ServiceController;
import com.patzn.cloud.service.hmhj.entity.GradingRecord;
import com.patzn.cloud.service.lims.hmhj.service.IGradingRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/ItemDeviateController.java
package com.patzn.cloud.service.lims.hmhj.controller;
import com.patzn.cloud.service.hmhj.entity.ItemDeviate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestConstants;
import com.patzn.cloud.commons.api.RestResult;
import com.patzn.cloud.commons.controller.ServiceController;
import com.patzn.cloud.service.hmhj.entity.ItemDeviate;
import com.patzn.cloud.service.lims.hmhj.service.IItemDeviateService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/MaterialController.java
package com.patzn.cloud.service.lims.hmhj.controller;
import com.patzn.cloud.feign.lims.hmhj.client.LmsChemicalCategoryClient;
import com.patzn.cloud.service.hmhj.entity.Material;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestConstants;
import com.patzn.cloud.commons.api.RestResult;
import com.patzn.cloud.commons.controller.ServiceController;
import com.patzn.cloud.feign.lims.hmhj.client.LmsChemicalCategoryClient;
import com.patzn.cloud.service.hmhj.entity.Material;
import com.patzn.cloud.service.lims.hmhj.service.IMaterialService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/MaterialItemController.java
package com.patzn.cloud.service.lims.hmhj.controller;
import com.patzn.cloud.service.hmhj.entity.MaterialItem;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestConstants;
import com.patzn.cloud.commons.api.RestResult;
import com.patzn.cloud.commons.controller.ServiceController;
import com.patzn.cloud.service.hmhj.entity.MaterialItem;
import com.patzn.cloud.service.lims.hmhj.service.IMaterialItemService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/QualificationController.java
package com.patzn.cloud.service.lims.hmhj.controller;
import com.patzn.cloud.service.hmhj.entity.Qualification;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestConstants;
import com.patzn.cloud.commons.api.RestResult;
import com.patzn.cloud.commons.controller.ServiceController;
import com.patzn.cloud.service.hmhj.entity.Qualification;
import com.patzn.cloud.service.lims.hmhj.service.IQualificationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/StandardAnnexController.java
......@@ -2,27 +2,18 @@ package com.patzn.cloud.service.lims.hmhj.controller;
import com.baomidou.kisso.annotation.Action;
import com.baomidou.kisso.annotation.Login;
import com.patzn.cloud.service.hmhj.entity.StandardAnnex;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestConstants;
import com.patzn.cloud.commons.api.RestResult;
import com.patzn.cloud.commons.controller.ServiceController;
import com.patzn.cloud.service.hmhj.entity.StandardAnnex;
import com.patzn.cloud.service.lims.hmhj.service.IStandardAnnexService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/StandardController.java
package com.patzn.cloud.service.lims.hmhj.controller;
import com.patzn.cloud.service.hmhj.entity.Standard;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestConstants;
import com.patzn.cloud.commons.api.RestResult;
import com.patzn.cloud.commons.controller.ServiceController;
import com.patzn.cloud.service.hmhj.entity.Standard;
import com.patzn.cloud.service.lims.hmhj.service.IStandardService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/AnodeSpotCheckLedgerMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.AnodeSpotCheckLedger;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.AnodeSpotCheckLedger;
/**
* <p>
......
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/BusinessDataMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.BusinessData;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.BusinessData;
/**
* <p>
......
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/BusinessStaffMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.BusinessStaff;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.BusinessStaff;
/**
* <p>
......
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/CarbonAppearanceCheckLedgerMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.CarbonAppearanceCheckLedger;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.CarbonAppearanceCheckLedger;
/**
* <p>
......
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/CenterCostMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.CenterCost;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.CenterCost;
/**
* <p>
......
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/CenterCostRecordMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.CenterCostRecord;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.CenterCostRecord;
/**
* <p>
......
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/ClientInfoMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.ClientInfo;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.ClientInfo;
/**
* <p>
......
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/ClientTestSideMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.ClientTestSide;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.ClientTestSide;
/**
* <p>
......
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/CodeRuleCategoryMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.CodeRuleCategory;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.CodeRuleCategory;
/**
* <p>
......
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/ContractOkOrganizerMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.ContractOkOrganizer;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.ContractOkOrganizer;
/**
* <p>
......
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustAnnexMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.EntrustAnnex;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.EntrustAnnex;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
......@@ -13,4 +16,5 @@ import com.patzn.cloud.commons.mapper.BatchMapper;
*/
public interface EntrustAnnexMapper extends BatchMapper<EntrustAnnex> {
Integer deletePhysicalByEntrustIds(@Param("entrustIds") List<Long> entrustIds);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.dto.EntrustSampleDTO;
import com.patzn.cloud.service.hmhj.entity.Entrust;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.vo.EntrustVO;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
......@@ -33,4 +33,6 @@ public interface EntrustMapper extends BatchMapper<Entrust> {
List<EntrustVO> selectEntrustVOHisList(Page<EntrustVO> page, @Param("vo") EntrustVO entrust);
Integer updateEntrustById(@Param("vo") Entrust entrust);
Integer deletePhysicalByIds(@Param("ids") List<Long> ids);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustRecordMapper.java
......@@ -23,4 +23,6 @@ public interface EntrustRecordMapper extends BatchMapper<EntrustRecord> {
@SqlParser(filter = true)
Long selectInTimeCount(@Param("start") Date startYM, @Param("endYM") Date endYM);
Integer deletePhysicalByEntrustIds(@Param("entrustIds") List<Long> entrustIds);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustReportMapper.java
......@@ -21,4 +21,5 @@ public interface EntrustReportMapper extends BatchMapper<EntrustReport> {
@SqlParser(filter = true)
List<EntrustReport> selectPageList(Page<EntrustReport> page, @Param("vo") EntrustReport report);
Integer deletePhysicalByIds(@Param("ids") List<Long> ids);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustReportRecordMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.EntrustReportRecord;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.EntrustReportRecord;
/**
* <p>
......
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustReportRelSampleMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.EntrustReportRelSample;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.EntrustReportRelSample;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
......@@ -13,4 +16,5 @@ import com.patzn.cloud.commons.mapper.BatchMapper;
*/
public interface EntrustReportRelSampleMapper extends BatchMapper<EntrustReportRelSample> {
Integer deletePhysicalByReportIds(@Param("reportIds") List<Long> reportIds);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustReportTemplateMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.EntrustReportTemplate;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.EntrustReportTemplate;
import org.apache.ibatis.annotations.Param;
/**
......
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustSampleBackupMapper.java
......@@ -24,4 +24,6 @@ public interface EntrustSampleBackupMapper extends BatchMapper<EntrustSampleBack
List<EntrustSampleBackupVO> selectCOList(RowBounds rowBounds, @Param("vo") EntrustSampleBackupVO entrustSampleBackup);
List<EntrustSampleBackupVO> selectManageList(Page<EntrustSampleBackupVO> page, @Param("vo") EntrustSampleBackupVO entrustSampleBackup);
Integer deletePhysicalByEntrustIds(@Param("entrustIds") List<Long> entrustIds);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustSampleItemIndexMapper.java
......@@ -32,4 +32,6 @@ public interface EntrustSampleItemIndexMapper extends BatchMapper<EntrustSampleI
List<EntrustSampleItemIndexVO> selectIndexWithItem(RowBounds rowBounds, @Param("vo") EntrustSampleItemIndexVO entrustSampleItemIndexVO);
List<SampleItemVO> selectSampleItemIndex(@Param("sampleIds") List<Long> sampleIds);
Integer physicalDeleteByItemIds(@Param("itemIds") List<Long> itemIds);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustSampleItemMapper.java
......@@ -85,4 +85,6 @@ public interface EntrustSampleItemMapper extends BatchMapper<EntrustSampleItem>
@SqlParser(filter = true)
List<ItemVO> pageItemDataRight(RowBounds rowBounds, @Param("vo") ItemVO vo);
Integer deletePhysicalByEntrustIds(@Param("entrustIds") List<Long> entrustIds);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustSampleMakeMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.EntrustSampleMake;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.EntrustSampleMake;
/**
* <p>
......
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustSampleMapper.java
......@@ -52,4 +52,6 @@ public interface EntrustSampleMapper extends BatchMapper<EntrustSample> {
List<EntrustSampleIndexVO> selectSampleIndex(RowBounds rowBounds, @Param("vo") EntrustSampleIndexVO sampleIndexVO);
int isRepeatSampleCode(@Param("vo") EntrustSample sample);
Integer deletePhysicalByEntrustIds(@Param("entrustIds") List<Long> entrustIds);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustSamplePrepareMapper.java
......@@ -2,6 +2,9 @@ package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.EntrustSamplePrepare;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
......@@ -13,4 +16,5 @@ import com.patzn.cloud.service.hmhj.entity.EntrustSamplePrepare;
*/
public interface EntrustSamplePrepareMapper extends BatchMapper<EntrustSamplePrepare> {
Integer deletePhysicalBySampleIds(@Param("sampleIds") List<Long> sampleIds);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustSampleRecordMapper.java
......@@ -2,6 +2,9 @@ package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.EntrustSampleRecord;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
......@@ -13,4 +16,5 @@ import com.patzn.cloud.service.hmhj.entity.EntrustSampleRecord;
*/
public interface EntrustSampleRecordMapper extends BatchMapper<EntrustSampleRecord> {
Integer deletePhysicalBySampleIds(@Param("sampleIds") List<Long> sampleIds);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/GradingAnnexMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.GradingAnnex;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.GradingAnnex;
/**
* <p>
......
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/ItemRelOriginalRecordMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.ItemRelOriginalRecord;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.ItemRelOriginalRecord;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
......@@ -13,4 +16,5 @@ import com.patzn.cloud.commons.mapper.BatchMapper;
*/
public interface ItemRelOriginalRecordMapper extends BatchMapper<ItemRelOriginalRecord> {
Integer physicalDeleteByItemIds(@Param("itemIds") List<Long> itemIds);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/LmsOriginalRecordInfoMapper.java
......@@ -6,7 +6,6 @@ import com.patzn.cloud.service.lims.collection.entity.LmsOriginalRecordInfo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* <p>
......
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/MaterialMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.Material;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.Material;
/**
* <p>
......
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/OriginalRecordMapper.java
......@@ -22,4 +22,6 @@ public interface OriginalRecordMapper extends BatchMapper<OriginalRecord> {
List<OriginalRecordVO> selectPageVO(RowBounds rowBounds, @Param("vo") OriginalRecordVO vo);
Map<String,String> selectOriginalFileKey(@Param("entrustId") Long entrustId, @Param("recordId") Long recordId);
Integer deletePhysicalByEntrustIds(@Param("entrustIds") List<Long> entrustIds);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/OriginalTemplateConfigMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.OriginalTemplateConfig;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.OriginalTemplateConfig;
import org.apache.ibatis.annotations.Param;
/**
......
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/OriginalTemplateMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.OriginalTemplate;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.OriginalTemplate;
import org.apache.ibatis.annotations.Param;
/**
......
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/QualificationMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.Qualification;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.Qualification;
/**
* <p>
......
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/StandardMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.Standard;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.Standard;
/**
* <p>
......
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/TransformerMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.Transformer;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.Transformer;
/**
* <p>
......
src/main/java/com/patzn/cloud/service/lims/hmhj/original/MoreSheetOneOperation.java
......@@ -4,11 +4,7 @@ import com.patzn.cloud.service.hmhj.entity.Entrust;
import com.patzn.cloud.service.hmhj.entity.OriginalTemplate;
import com.patzn.cloud.service.hmhj.entity.OriginalTemplateConfig;
import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO;
import com.patzn.cloud.service.lims.common.StringHandleUtils;
import com.patzn.cloud.service.lims.hmhj.common.HSSFWorkbookUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.xssf.usermodel.XSSFCell;
import org.apache.poi.xssf.usermodel.XSSFRow;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/original/SingleSheetLittleOperation.java
......@@ -6,16 +6,13 @@ import com.patzn.cloud.service.hmhj.entity.OriginalTemplate;
import com.patzn.cloud.service.hmhj.entity.OriginalTemplateConfig;
import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO;
import com.patzn.cloud.service.lims.common.StringHandleUtils;
import com.patzn.cloud.service.lims.hmhj.common.HSSFWorkbookUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.xssf.usermodel.XSSFCell;
import org.apache.poi.xssf.usermodel.XSSFRow;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class SingleSheetLittleOperation implements Operation {
......
src/main/java/com/patzn/cloud/service/lims/hmhj/schedule/UserStatsTask.java 0 → 100644
package com.patzn.cloud.service.lims.hmhj.schedule;
import com.patzn.cloud.service.lims.hmhj.service.IUserTestStatisticsService;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.time.LocalDateTime;
/**
*
* @author: meazty
* @since: 2022/2/21 19:44
**/
@Component
@Configuration //1.主要用于标记配置类，兼备Component的效果。
@EnableScheduling
public class UserStatsTask {
@Resource
private IUserTestStatisticsService userTestStatisticsService;
/**
* 每3分钟执行一次
*/
@Scheduled(cron = "0 */3 * * * ?")
private void configureTasks() {
System.err.println("执行同步用户检测量定时任务时间: " + LocalDateTime.now());
userTestStatisticsService.updateUserStatisticsInfo();
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IClientInfoService.java
......@@ -3,7 +3,6 @@ package com.patzn.cloud.service.lims.hmhj.service;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.commons.service.IBaseService;
import com.patzn.cloud.service.base.entity.SysOrg;
import com.patzn.cloud.service.hmhj.entity.ClientInfo;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IContractOkOrganizerService.java
......@@ -2,7 +2,6 @@ package com.patzn.cloud.service.lims.hmhj.service;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.service.IBaseService;
import com.patzn.cloud.service.hmhj.dto.ContractOkOrganizerDTO;
import com.patzn.cloud.service.hmhj.entity.ContractOkOrganizer;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustAnnexService.java
......@@ -33,4 +33,6 @@ public interface IEntrustAnnexService extends IBaseService<EntrustAnnex> {
/* 获取最近时间的附件的key */
Map<String,String> getLastKey(String businessId);
boolean deletePhysicalByEntrustIds(List<Long> ids);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustRecordService.java
......@@ -33,4 +33,6 @@ public interface IEntrustRecordService extends IBaseService<EntrustRecord> {
/* 查询不及时的报告数 */
Long selectInTimeCount(Date startYM, Date endYM);
boolean deletePhysicalByEntrustIds(List<Long> ids);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustReportRelSampleService.java
......@@ -17,4 +17,6 @@ public interface IEntrustReportRelSampleService extends IBaseService<EntrustRepo
Page<EntrustReportRelSample> page(Page<EntrustReportRelSample> page, EntrustReportRelSample entrustReportRelSample);
boolean removeByIds(List<Long> ids);
boolean deletePhysicalByReportIds(List<Long> collect);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustReportService.java
......@@ -76,4 +76,6 @@ public interface IEntrustReportService extends IBaseService<EntrustReport> {
Boolean launchWithdrawApplication(ReportWithdrawDTO reportWithdrawDTO,Account account);
Boolean auditReportWithdraw(ReportWithdrawDTO reportWithdrawDTO, int i, Account account);
boolean deletePhysicalByEntrustIds(List<Long> ids);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleBackupService.java
......@@ -31,4 +31,6 @@ public interface IEntrustSampleBackupService extends IBaseService<EntrustSampleB
Page<EntrustSampleBackupVO> pageManage(Page<EntrustSampleBackupVO> page, EntrustSampleBackupVO entrustSampleBackup);
void updateEntrustId(Long id, List<Long> contractSamplings);
boolean deletePhysicalByEntrustIds(List<Long> ids);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleItemIndexService.java
......@@ -40,4 +40,6 @@ public interface IEntrustSampleItemIndexService extends IBaseService<EntrustSamp
Page<EntrustSampleItemIndexVO> pageIndexWithItem(Page<EntrustSampleItemIndexVO> page, EntrustSampleItemIndexVO entrustSampleItemIndexVO);
List<SampleItemVO> listSampleItemIndex(List<Long> sampleIds);
boolean physicalDeleteByItemIds(List<Long> itemIds);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleItemService.java
......@@ -33,7 +33,7 @@ public interface IEntrustSampleItemService extends IBaseService<EntrustSampleIte
Page<EntrustSampleItemVO> pageAllotBySampleRight(Page<EntrustSampleItemVO> page, EntrustSampleItemVO entrustSampleItem);
boolean allotItem(Long[] ids, String tester, Long testerId, Account account);
boolean allotItem(Long[] ids, String tester, Long testerId,Integer type, Account account);
Page<EntrustSampleItemVO> pageByItemLeft(Page<EntrustSampleItemVO> page, EntrustSampleItemVO entrustSampleItem);
......@@ -135,4 +135,6 @@ public interface IEntrustSampleItemService extends IBaseService<EntrustSampleIte
Boolean checkCanWriteOriginal(Long[] ids);
Boolean backUserItem(Long[] ids);
boolean deletePhysicalByEntrustIds(List<Long> ids);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSamplePrepareService.java
......@@ -32,4 +32,6 @@ public interface IEntrustSamplePrepareService extends IBaseService<EntrustSample
boolean removeBySampleIds(Long[] sampleIds);
boolean receiveSampleBatch(Long[] ids, Account account);
boolean deletePhysicalBySampleIds(List<Long> collect);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleRecordService.java
......@@ -23,4 +23,6 @@ public interface IEntrustSampleRecordService extends IBaseService<EntrustSampleR
void record(Long[] ids, String from, String to, int type, Account account, String remark);
void record(Collection<Long> ids, String from, String to, int type, Account account, String remark);
boolean deletePhysicalBySampleIds(List<Long> sampleIds);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleService.java
......@@ -136,4 +136,6 @@ public interface IEntrustSampleService extends IBaseService<EntrustSample> {
void exportSampleIndex(Long entrustId, Account account, HttpServletResponse response);
boolean isRepeatSampleCode(EntrustSample sample);
boolean deletePhysicalByEntrustIds(List<Long> ids);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustService.java
......@@ -22,6 +22,8 @@ public interface IEntrustService extends IBaseService<Entrust> {
boolean removeByIds(List<Long> ids);
boolean deletePhysicalByIds(List<Long> ids);
boolean saveEntrustDTO(EntrustDTO dto, Account account);
boolean submitToCheck(Long[] ids, Account account);
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IItemRelOriginalRecordService.java
......@@ -17,4 +17,6 @@ public interface IItemRelOriginalRecordService extends IBaseService<ItemRelOrigi
Page<ItemRelOriginalRecord> page(Page<ItemRelOriginalRecord> page, ItemRelOriginalRecord itemRelOriginalRecord);
boolean removeByIds(List<Long> ids);
boolean physicalDeleteByItemIds(List<Long> itemIds);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IOriginalRecordService.java
......@@ -32,4 +32,6 @@ public interface IOriginalRecordService extends IBaseService<OriginalRecord> {
Page<OriginalRecordVO> pageVO(Page<OriginalRecordVO> page, OriginalRecordVO originalRecord);
void download(Long entrustId,Long id, HttpServletResponse response);
boolean deletePhysicalByEntrustIds(List<Long> ids);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IOriginalTemplateConfigService.java
......@@ -3,7 +3,6 @@ package com.patzn.cloud.service.lims.hmhj.service;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.commons.service.IBaseService;
import com.patzn.cloud.service.hmhj.entity.OriginalTemplate;
import com.patzn.cloud.service.hmhj.entity.OriginalTemplateConfig;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IQualificationService.java
......@@ -3,6 +3,7 @@ package com.patzn.cloud.service.lims.hmhj.service;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.service.IBaseService;
import com.patzn.cloud.service.hmhj.entity.Qualification;
import java.util.List;
/**
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/AnodeSpotCheckLedgerServiceImpl.java
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.hmhj.entity.AnodeSpotCheckLedger;
import com.patzn.cloud.service.lims.hmhj.mapper.AnodeSpotCheckLedgerMapper;
import com.patzn.cloud.service.lims.hmhj.service.IAnodeSpotCheckLedgerService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/CarbonAppearanceCheckLedgerServiceImpl.java
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.hmhj.entity.CarbonAppearanceCheckLedger;
import com.patzn.cloud.service.lims.hmhj.mapper.CarbonAppearanceCheckLedgerMapper;
import com.patzn.cloud.service.lims.hmhj.service.ICarbonAppearanceCheckLedgerService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/CodeRuleCategoryServiceImpl.java
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.hmhj.entity.CodeRuleCategory;
import com.patzn.cloud.service.lims.hmhj.mapper.CodeRuleCategoryMapper;
import com.patzn.cloud.service.lims.hmhj.service.ICodeRuleCategoryService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/CodeRuleRecordServiceImpl.java
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.hmhj.entity.CodeRule;
import com.patzn.cloud.service.hmhj.entity.CodeRuleRecord;
import com.patzn.cloud.service.lims.hmhj.mapper.CodeRuleRecordMapper;
import com.patzn.cloud.service.lims.hmhj.service.ICodeRuleRecordService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/ContractItemServiceImpl.java
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.hmhj.entity.ContractItem;
import com.patzn.cloud.service.lims.hmhj.mapper.ContractItemMapper;
import com.patzn.cloud.service.lims.hmhj.service.IContractItemService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/ContractSampleAnnexServiceImpl.java
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.oss.starter.OssClient;
import com.patzn.cloud.oss.starter.OssFileResult;
import com.patzn.cloud.service.hmhj.entity.ContractSampleAnnex;
import com.patzn.cloud.service.lims.hmhj.mapper.ContractSampleAnnexMapper;
import com.patzn.cloud.service.lims.hmhj.service.IContractSampleAnnexService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.lims.hmhj.service.IContractSampleService;
import com.patzn.cloud.service.soil.entity.SoilAloneSampleAnnex;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/ContractSampleItemServiceImpl.java
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.hmhj.entity.ContractSampleItem;
import com.patzn.cloud.service.lims.hmhj.mapper.ContractSampleItemMapper;
import com.patzn.cloud.service.lims.hmhj.service.IContractSampleItemService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/ContractSampleRecordServiceImpl.java
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.toolkit.CollectionUtils;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.hmhj.entity.ContractSampleRecord;
import com.patzn.cloud.service.hmhj.enums.ContractSampleStatusEnum;
import com.patzn.cloud.service.lims.hmhj.mapper.ContractSampleRecordMapper;
import com.patzn.cloud.service.lims.hmhj.service.IContractSampleRecordService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import java.util.ArrayList;
import java.util.Arrays;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/ElectrolyzerServiceImpl.java
......@@ -7,7 +7,6 @@ import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.hmhj.entity.Electrolyzer;
import com.patzn.cloud.service.lims.hmhj.mapper.ElectrolyzerMapper;
import com.patzn.cloud.service.lims.hmhj.service.IElectrolyzerService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustAnnexServiceImpl.java
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.toolkit.CollectionUtils;
import com.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.commons.toolkit.DateUtils;
import com.patzn.cloud.oss.starter.OssClient;
import com.patzn.cloud.oss.starter.OssFileResult;
import com.patzn.cloud.service.hmhj.entity.EntrustAnnex;
import com.patzn.cloud.service.lims.hmhj.mapper.EntrustAnnexMapper;
import com.patzn.cloud.service.lims.hmhj.service.IEntrustAnnexService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.lims.hmhj.service.IEntrustService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;
/**
* 服务实现类
* 服务实现类
*
* @author wwd
* @since 2021-03-10
......@@ -55,10 +56,10 @@ public class EntrustAnnexServiceImpl extends BaseServiceImpl<EntrustAnnexMapper,
@Transactional(rollbackFor = Exception.class)
@Override
public boolean upload(MultipartFile file, Long entrustId) {
RestAssert.fail(null == entrustId,"请选择委托");
RestAssert.fail(null == entrustId, "请选择委托");
String fileName = file.getOriginalFilename();
RestAssert.fail(StringUtils.isBlank(fileName), "请上传文件");
if (null==entrustService.getById(entrustId)){
if (null == entrustService.getById(entrustId)) {
RestAssert.fail("委托不存在");
}
OssFileResult result = ossClient.upload(file);
......@@ -98,7 +99,7 @@ public class EntrustAnnexServiceImpl extends BaseServiceImpl<EntrustAnnexMapper,
String fileName = fileNamesIt.next();
// 获取文件
MultipartFile multipartFile = multipartHttpServletRequest.getFile(fileName);
upload(multipartFile,contractSampleId);
upload(multipartFile, contractSampleId);
failedNameList.add(fileName);
}
......@@ -106,24 +107,39 @@ public class EntrustAnnexServiceImpl extends BaseServiceImpl<EntrustAnnexMapper,
}
@Override
public Map<String,String> getLastKey(String businessId) {
public Map<String, String> getLastKey(String businessId) {
if (StringUtils.isNotBlank(businessId)) {
List<EntrustAnnex> entrustAnnexes = new ArrayList<>();
String[] entrustIdAndType = businessId.split("#");
if (entrustIdAndType.length == 2) {
entrustAnnexes = this.list(Condition.create().eq("entrust_id", Long.parseLong(entrustIdAndType[0]))
.eq("type",entrustIdAndType[1].equals("word") ? "docx" : "")
.eq("type", entrustIdAndType[1].equals("word") ? "docx" : "")
/* 这个remark写死，保证取到是生成的检测委托书，不是用户自己上传的 */
.eq("remark","打印检测委托书时上传生成的文件")
.eq("remark", "打印检测委托书时上传生成的文件")
.ge("ctime", DateUtils.toDate(DateUtils.toYearMonthDay(new Date())))
.orderBy("ctime", false));
if (CollectionUtils.isNotEmpty(entrustAnnexes)) {
HashMap<String, String> map = new HashMap<>();
map.put("key",entrustAnnexes.get(0).getObjectKey());
map.put("key", entrustAnnexes.get(0).getObjectKey());
return map;
}
}
}
return null;
}
@Override
public boolean deletePhysicalByEntrustIds(List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) {
return true;
}
List<EntrustAnnex> annexList = list(Condition.create().in("entrust_id", ids));
if (CollectionUtils.isEmpty(annexList)) {
return true;
}
// 删除对应附件
ossClient.deleteObjects(annexList.stream().map(EntrustAnnex::getObjectKey).collect(Collectors.toList()));
// 删除附件对应记录
return baseMapper.deletePhysicalByEntrustIds(ids) > 0;
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustRecordServiceImpl.java
......@@ -9,13 +9,9 @@ import com.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.commons.toolkit.DateUtils;
import com.patzn.cloud.commons.toolkit.MapMergeUtils;
import com.patzn.cloud.service.hmhj.entity.EntrustRecord;
import com.patzn.cloud.service.hmhj.entity.EntrustReport;
import com.patzn.cloud.service.hmhj.enums.EntrustReportStatusEnum;
import com.patzn.cloud.service.lims.frame.entity.LmsFrameCheckPlan;
import com.patzn.cloud.service.lims.frame.entity.LmsFrameCheckReport;
import com.patzn.cloud.service.lims.frame.enums.ManageCheckEnum;
import com.patzn.cloud.service.lims.hmhj.mapper.EntrustRecordMapper;
import com.patzn.cloud.service.lims.hmhj.service.IEntrustRecordService;
import com.patzn.cloud.service.lims.hmhj.service.IEntrustReportService;
......@@ -25,7 +21,6 @@ import org.springframework.stereotype.Service;
import java.text.NumberFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
/**
* 委托操作日志表 服务实现类
......@@ -42,7 +37,7 @@ public class EntrustRecordServiceImpl extends BaseServiceImpl<EntrustRecordMappe
@Override
public Page<EntrustRecord> page(Page<EntrustRecord> page, EntrustRecord entrustRecord) {
Wrapper wrapper = new EntityWrapper<>(entrustRecord);
wrapper.orderBy("ctime",false);
wrapper.orderBy("ctime", false);
return this.page(page, wrapper);
}
......@@ -53,15 +48,15 @@ public class EntrustRecordServiceImpl extends BaseServiceImpl<EntrustRecordMappe
@Override
public void record(Long[] ids, String from, String to, int type, Account account, String remark) {
record(Arrays.asList(ids),from,to,type,account,remark);
record(Arrays.asList(ids), from, to, type, account, remark);
}
@Override
public void record(Collection<Long> ids, String from, String to, int type, Account account, String remark) {
RestAssert.fail(CollectionUtils.isEmpty(ids),"委托ID不能为空");
RestAssert.fail(CollectionUtils.isEmpty(ids), "委托ID不能为空");
List<EntrustRecord> saveRecord = new ArrayList<>();
for (Long entrustId:ids) {
for (Long entrustId : ids) {
EntrustRecord entrustRecord = new EntrustRecord();
entrustRecord.setEntrustId(entrustId);
entrustRecord.setOperator(account.getUserName());
......@@ -73,7 +68,7 @@ public class EntrustRecordServiceImpl extends BaseServiceImpl<EntrustRecordMappe
saveRecord.add(entrustRecord);
}
if (CollectionUtils.isNotEmpty(saveRecord)){
if (CollectionUtils.isNotEmpty(saveRecord)) {
saveBatch(saveRecord);
}
}
......@@ -109,10 +104,10 @@ public class EntrustRecordServiceImpl extends BaseServiceImpl<EntrustRecordMappe
String dealRate = "100%";
String satisfactionRate = "100%";
resMap.put(mistakeRateKey,mistakeRate);
resMap.put(inTimeRateKey,inTimeRate);
resMap.put(dealRateKey,dealRate);
resMap.put(satisfactionRateKey,satisfactionRate);
resMap.put(mistakeRateKey, mistakeRate);
resMap.put(inTimeRateKey, inTimeRate);
resMap.put(dealRateKey, dealRate);
resMap.put(satisfactionRateKey, satisfactionRate);
return resMap;
}
......@@ -120,12 +115,21 @@ public class EntrustRecordServiceImpl extends BaseServiceImpl<EntrustRecordMappe
/* 查询被退回过的报告数 */
@Override
public Integer selectRollBackCount(Date startYM, Date endYM) {
return baseMapper.selectRollBackCount(startYM,endYM).size();
return baseMapper.selectRollBackCount(startYM, endYM).size();
}
@Override
public Long selectInTimeCount(Date startYM, Date endYM) {
return baseMapper.selectInTimeCount(startYM,endYM);
return baseMapper.selectInTimeCount(startYM, endYM);
}
@Override
public boolean deletePhysicalByEntrustIds(List<Long> entrustIds) {
if (CollectionUtils.isEmpty(entrustIds)) {
return true;
}
// return baseMapper.delete(Condition.create().in("entrust_id", entrustIds)) > 0;
return baseMapper.deletePhysicalByEntrustIds(entrustIds) > 0;
}
private Map<String, Map<String, Date>> getMonthStartDayEndDayMap(Date start, Date end) {
......@@ -142,35 +146,34 @@ public class EntrustRecordServiceImpl extends BaseServiceImpl<EntrustRecordMappe
Map<String, Map<String, Date>> map = new HashMap<>();
Calendar cStart = Calendar.getInstance();
cStart.setTime(DateUtils.toDateByFormatStr(startStr,ym));
cStart.setTime(DateUtils.toDateByFormatStr(startStr, ym));
Calendar cEnd = Calendar.getInstance();
cEnd.setTime(DateUtils.toDateByFormatStr(endStr,ym));
cEnd.add(Calendar.MONTH,1); // 加一个月，不超过这个月
cEnd.setTime(DateUtils.toDateByFormatStr(endStr, ym));
cEnd.add(Calendar.MONTH, 1); // 加一个月，不超过这个月
while (cStart.before(cEnd)) {
String key = DateUtils.toStrByFormatStr(cStart.getTime(),ym);
cStart.set(Calendar.DAY_OF_MONTH,1);//第一天
String s = DateUtils.toStrByFormatStr(cStart.getTime(),ymd) + startTime;
cStart.set(Calendar.DAY_OF_MONTH,cStart.getActualMaximum(Calendar.DAY_OF_MONTH));//最后一天
String e = DateUtils.toStrByFormatStr(cStart.getTime(),ymd) + endTime;
String key = DateUtils.toStrByFormatStr(cStart.getTime(), ym);
cStart.set(Calendar.DAY_OF_MONTH, 1);//第一天
String s = DateUtils.toStrByFormatStr(cStart.getTime(), ymd) + startTime;
cStart.set(Calendar.DAY_OF_MONTH, cStart.getActualMaximum(Calendar.DAY_OF_MONTH));//最后一天
String e = DateUtils.toStrByFormatStr(cStart.getTime(), ymd) + endTime;
HashMap<String, Date> SEMap = new HashMap<>();
SEMap.put(startKey,DateUtils.toDateByFormatStr(s,ymdt));
SEMap.put(endKey,DateUtils.toDateByFormatStr(e,ymdt));
map.put(key,SEMap);
SEMap.put(startKey, DateUtils.toDateByFormatStr(s, ymdt));
SEMap.put(endKey, DateUtils.toDateByFormatStr(e, ymdt));
map.put(key, SEMap);
cStart.add(Calendar.MONTH,1);
cStart.add(Calendar.MONTH, 1);
}
return map;
}
/**
*
* @param numerator 分子
* @param numerator 分子
* @param denominator 分母
* @param digit 百分比的小数位数 设置精确到小数点后几位
* @param digit 百分比的小数位数 设置精确到小数点后几位
* @return
*/
private String calculatePercent(int numerator,int denominator,int digit) {
private String calculatePercent(int numerator, int denominator, int digit) {
NumberFormat numberFormat = NumberFormat.getInstance();
// 设置精确到小数点后几位
numberFormat.setMaximumFractionDigits(digit);
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustReportRecordServiceImpl.java
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.hmhj.entity.EntrustReportRecord;
import com.patzn.cloud.service.lims.hmhj.mapper.EntrustReportRecordMapper;
import com.patzn.cloud.service.lims.hmhj.service.IEntrustReportRecordService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustReportRelSampleServiceImpl.java
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.toolkit.CollectionUtils;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.hmhj.entity.EntrustReportRelSample;
import com.patzn.cloud.service.lims.hmhj.mapper.EntrustReportRelSampleMapper;
import com.patzn.cloud.service.lims.hmhj.service.IEntrustReportRelSampleService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import java.util.List;
......@@ -31,4 +32,12 @@ public class EntrustReportRelSampleServiceImpl extends BaseServiceImpl<EntrustRe
public boolean removeByIds(List<Long> ids) {
return baseMapper.deleteBatchIds(ids) > 0;
}
@Override
public boolean deletePhysicalByReportIds(List<Long> reportIds) {
if (CollectionUtils.isEmpty(reportIds)) {
return true;
}
return baseMapper.deletePhysicalByReportIds(reportIds) > 0;
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustReportServiceImpl.java
......@@ -563,6 +563,21 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
return true;
}
@Override
public boolean deletePhysicalByEntrustIds(List<Long> ids) {
List<EntrustReport> reports = list(Condition.create().in("entrust_id", ids));
if (CollectionUtils.isEmpty(reports)) {
return true;
}
ossClient.deleteObjects(reports.stream().map(EntrustReport::getPdfObjectKey).collect(Collectors.toList()));
List<Long> reportIds = reports.stream().map(EntrustReport::getId).collect(Collectors.toList());
// 删除报告与样品的关联
entrustReportRelSampleService.deletePhysicalByReportIds(reportIds);
// 删除报告操作日志(并没有对报告记录)
// 删除报告
return baseMapper.deletePhysicalByIds(reportIds) > 0;
}
private void deleteReportPdf(Long[] ids) {
List<EntrustReport> reportList = list(Condition.create().in("id", ids).isNotNull("object_key"));
if (CollectionUtils.isEmpty(reportList)) {
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustReportTemplateConfigServiceImpl.java
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.hmhj.entity.EntrustReportTemplateConfig;
import com.patzn.cloud.service.lims.hmhj.mapper.EntrustReportTemplateConfigMapper;
import com.patzn.cloud.service.lims.hmhj.service.IEntrustReportTemplateConfigService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import java.util.Date;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleBackupServiceImpl.java
......@@ -87,4 +87,13 @@ public class EntrustSampleBackupServiceImpl extends BaseServiceImpl<EntrustSampl
}
update(new EntrustSampleBackup().setEntrustId(entrustId), Condition.create().in("contract_id", contractSampleIds).isNull("entrust_id"));
}
@Override
public boolean deletePhysicalByEntrustIds(List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) {
return true;
}
// return baseMapper.delete(Condition.create().in("entrust_id",ids)) > 0;
return baseMapper.deletePhysicalByEntrustIds(ids) > 0;
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleItemIndexServiceImpl.java
......@@ -55,6 +55,14 @@ public class EntrustSampleItemIndexServiceImpl extends BaseServiceImpl<EntrustSa
}
@Override
public boolean physicalDeleteByItemIds(List<Long> itemIds) {
if (CollectionUtils.isEmpty(itemIds)) {
return true;
}
return baseMapper.physicalDeleteByItemIds(itemIds) > 0;
}
@Override
public boolean removeByIds(List<Long> ids) {
return baseMapper.deleteBatchIds(ids) > 0;
}
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleItemRecordServiceImpl.java
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.toolkit.CollectionUtils;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.hmhj.entity.EntrustSampleItemRecord;
import com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleItemRecordMapper;
import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleItemRecordService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import java.util.ArrayList;
import java.util.Arrays;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleItemServiceImpl.java
......@@ -156,6 +156,9 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
@Autowired
private IContractSampleItemService contractSampleItemService;
@Autowired
private IUserTestStatisticsService userTestStatisticsService;
@Override
public Page<EntrustSampleItem> page(Page<EntrustSampleItem> page, EntrustSampleItem entrustSampleItem) {
String name = entrustSampleItem.getName();
......@@ -220,7 +223,7 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
@Transactional(rollbackFor = Exception.class)
@Override
public boolean allotItem(Long[] ids, String tester, Long testerId, Account account) {
public boolean allotItem(Long[] ids, String tester, Long testerId, Integer type, Account account) {
RestAssert.fail(ArrayUtils.isEmpty(ids), "请选择要分配的检测项目");
RestAssert.fail(StringUtils.isBlank(tester), "请选择检测人员");
RestAssert.fail(null == testerId, "请选择检测人员");
......@@ -234,7 +237,6 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
item.setStatus(EntrustSampleItemStatusEnum.TEST);
item.setProgress(EntrustSampleItemStatusEnum.TEST);
super.update(item, Condition.create().in("id", ids));
entrustSampleItemRecordService.record(ids, EntrustSampleItemStatusEnum.ALLOT.getDisplay(), EntrustSampleItemStatusEnum.TEST.getDisplay(), 0, "任务分配", account);
......@@ -1554,6 +1556,21 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
return true;
}
@Override
public boolean deletePhysicalByEntrustIds(List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) {
return true;
}
List<EntrustSampleItem> items = list(Condition.create().in("entrust_id", ids));
List<Long> itemIds = items.stream().map(EntrustSampleItem::getId).collect(Collectors.toList());
// 删除指标
entrustSampleItemIndexService.physicalDeleteByItemIds(itemIds);
// 删除原始记录关联
itemRelOriginalRecordService.physicalDeleteByItemIds(itemIds);
// return baseMapper.delete(Condition.create().in("entrust_id", ids)) > 0;
return baseMapper.deletePhysicalByEntrustIds(ids) > 0;
}
private String getCellValue(XSSFRow xssfRow, int cellIndex) {
XSSFCell cell = xssfRow.getCell(cellIndex);
String value = HSSFWorkbookUtil.getJavaValue(cell).toString();
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleMakeServiceImpl.java
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.hmhj.entity.EntrustSampleMake;
import com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleMakeMapper;
import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleMakeService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSamplePrepareServiceImpl.java
......@@ -375,6 +375,15 @@ public class EntrustSamplePrepareServiceImpl extends BaseServiceImpl<EntrustSamp
}
@Override
public boolean deletePhysicalBySampleIds(List<Long> sampleIds) {
if (CollectionUtils.isEmpty(sampleIds)) {
return true;
}
// return baseMapper.delete(Condition.create().in("entrust_sample_id", sampleIds)) > 0;
return baseMapper.deletePhysicalBySampleIds(sampleIds) > 0;
}
@Override
public boolean addOrUpdateToSetStatus(Long[] sampleIds, EntrustSamplePrepareStatusEnum statusEnum) {
List<EntrustSample> sampleList = entrustSampleService.getBatchIds(Arrays.asList(sampleIds));
if (CollectionUtils.isEmpty(sampleList)) {
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleRecordServiceImpl.java
......@@ -63,4 +63,13 @@ public class EntrustSampleRecordServiceImpl extends BaseServiceImpl<EntrustSampl
saveBatch(saveRecord);
}
}
@Override
public boolean deletePhysicalBySampleIds(List<Long> sampleIds) {
if (CollectionUtils.isEmpty(sampleIds)) {
return true;
}
// return baseMapper.delete(Condition.create().in("sample_id", sampleIds)) > 0;
return baseMapper.deletePhysicalBySampleIds(sampleIds) > 0;
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleServiceImpl.java
......@@ -64,7 +64,6 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
@Autowired
private IEntrustSampleRecordService entrustSampleRecordService;
@Autowired
private IEntrustReportTemplateService entrustReportTemplateService;
......@@ -86,10 +85,8 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
private IEntrustReportService entrustReportService;
@Autowired
private IOriginalTemplateConfigService originalTemplateConfigService;
@Autowired
private IEntrustService entrustService;
@Autowired
private IEntrustReportRelSampleService entrustReportRelSampleService;
@Autowired
......@@ -98,6 +95,8 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
private IEntrustSamplePrepareService entrustSamplePrepareService;
@Autowired
private IContractSampleRecordService contractSampleRecordService;
@Autowired
private IEntrustSampleBackupService entrustSampleBackupService;
@Override
public Page<EntrustSample> page(Page<EntrustSample> page, EntrustSample entrustSample) {
......@@ -2238,6 +2237,29 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
return baseMapper.isRepeatSampleCode(sample) > 0;
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean deletePhysicalByEntrustIds(List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) {
return true;
}
// 删除备样
entrustSampleBackupService.deletePhysicalByEntrustIds(ids);
// ==
List<EntrustSample> sampleList = list(Condition.create().in("entrust_id", ids));
if (CollectionUtils.isEmpty(sampleList)) {
return true;
}
List<Long> sampleIds = sampleList.stream().map(EntrustSample::getId).collect(Collectors.toList());
// 删除样品接收信息
entrustSamplePrepareService.deletePhysicalBySampleIds(sampleIds);
// 删除样品操作记录
entrustSampleRecordService.deletePhysicalBySampleIds(sampleIds);
// 删除样品
// return baseMapper.delete(Condition.create().in("entrust_id", ids)) > 0;
return baseMapper.deletePhysicalByEntrustIds(ids) > 0;
}
private List<EntrustSampleItemIndex> getIndexList(Long sampleId) {
if (null == sampleId) {
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustServiceImpl.java
......@@ -116,6 +116,9 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
@Autowired
private IContractSamplingService contractSamplingService;
@Autowired
private IOriginalRecordService originalRecordService;
@Override
public Page<Entrust> page(Page<Entrust> page, Entrust entrust) {
......@@ -138,6 +141,24 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
}
@Transactional(rollbackFor = Exception.class)
public boolean deletePhysicalByIds(List<Long> ids) {
// 删除相关报告
entrustReportService.deletePhysicalByEntrustIds(ids);
// 删除检测项目及指标
entrustSampleItemService.deletePhysicalByEntrustIds(ids);
// 删除原始记录和文件
originalRecordService.deletePhysicalByEntrustIds(ids);
// 删除样品及备用信息
entrustSampleService.deletePhysicalByEntrustIds(ids);
// 删除委托相关附件
entrustAnnexService.deletePhysicalByEntrustIds(ids);
// 删除委托操作记录
entrustRecordService.deletePhysicalByEntrustIds(ids);
// 删除委托
return baseMapper.deletePhysicalByIds(ids) > 0;
}
@Transactional(rollbackFor = Exception.class)
public boolean saveEntrust(Entrust entrust) {
String entrustCode = codeRuleService.getKey((Integer) CodeTypeEnum.ENTRUST_CODE.getValue(), CodeTypeEnum.ENTRUST_CODE.getName(), entrust);
if (StringUtils.isNotEmpty(entrustCode)) {
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/GradingAnnexServiceImpl.java
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.oss.starter.OssClient;
import com.patzn.cloud.oss.starter.OssFileResult;
import com.patzn.cloud.service.hmhj.entity.GradingAnnex;
import com.patzn.cloud.service.lims.hmhj.mapper.GradingAnnexMapper;
import com.patzn.cloud.service.lims.hmhj.service.IGradingAnnexService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.lims.hmhj.service.IGradingStandardService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/GradingItemServiceImpl.java
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.hmhj.entity.GradingItem;
import com.patzn.cloud.service.lims.hmhj.mapper.GradingItemMapper;
import com.patzn.cloud.service.lims.hmhj.service.IGradingItemService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/GradingProductServiceImpl.java
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.hmhj.entity.GradingProduct;
import com.patzn.cloud.service.lims.hmhj.mapper.GradingProductMapper;
import com.patzn.cloud.service.lims.hmhj.service.IGradingProductService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import java.util.List;
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/GradingRecordServiceImpl.java
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.hmhj.entity.GradingRecord;
import com.patzn.cloud.service.lims.hmhj.mapper.GradingRecordMapper;
import com.patzn.cloud.service.lims.hmhj.service.IGradingRecordService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import java.util.List;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment