Commit c20366d6 by wangweidong

霍煤鸿骏

parent 787e59e7
......@@ -500,4 +500,5 @@ public class ContractSampleController extends ServiceController {
public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
return success(contractSampleService.removeByIds(ids));
}
}
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.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.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import java.util.List;
/**
* 判级标准附件表 前端控制器
*
* @author wwd
* @since 2021-05-14
*/
@Api(tags = "判级标准附件表")
@RestController
@RequestMapping("/v1/grading_standard_annex")
public class GradingAnnexController extends ServiceController {
@Autowired
private IGradingAnnexService gradingAnnexService;
@ApiOperation("分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
})
@PostMapping("/page")
public RestResult<Page<GradingAnnex>> getPage(GradingAnnex gradingAnnex) {
return success(gradingAnnexService.page(getPage(), gradingAnnex));
}
@ApiOperation("查询 id 信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
})
@GetMapping("/{id}")
public RestResult<GradingAnnex> get(@PathVariable("id") Long id) {
return success(gradingAnnexService.getById(id));
}
@ApiOperation("根据 id 修改信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
})
@PutMapping("/{id}")
public RestResult<Boolean> edit(@PathVariable("id") Long id, GradingAnnex gradingAnnex) {
gradingAnnex.setId(id);
return success(gradingAnnexService.updateById(gradingAnnex));
}
@ApiOperation("添加")
@PostMapping("/")
public RestResult<Boolean> add(GradingAnnex gradingAnnex) {
return success(gradingAnnexService.save(gradingAnnex));
}
@ApiOperation("根据 ids 删除")
@ApiImplicitParams({
@ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
})
@DeleteMapping("/")
public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
return success(gradingAnnexService.removeByIds(ids));
}
@ApiOperation(value = "附件上传", notes = "附件上传")
@PostMapping("/upload/{gradingStandardId}")
public RestResult<Boolean> upload(@PathVariable("gradingStandardId") Long gradingStandardId, MultipartFile file) {
return success(gradingAnnexService.upload(file, gradingStandardId));
}
@ApiOperation(value = "附件批量上传", notes = "附件批量上传")
@PostMapping("/upload_bath/{gradingStandardId}")
public RestResult<Boolean> uploadBath(@PathVariable("gradingStandardId") Long gradingStandardId, MultipartHttpServletRequest httpServletRequest) {
return success(gradingAnnexService.uploadBath(httpServletRequest, gradingStandardId,getAccount()));
}
@ApiOperation(value = "下载附件", notes = "下载指定附件")
@GetMapping("/download/{id}")
public void downloadFile(@PathVariable("id")Long id) {
gradingAnnexService.downloadFile(id, response);
}
@ApiOperation(value = "预览图片", notes = "预览图片")
@Login(action = Action.Skip)
@GetMapping("/view")
public void view(String objectKey) {
gradingAnnexService.view(response, objectKey);
}
}
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.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 java.util.List;
/**
* 判级产品检测项目表 前端控制器
*
* @author wwd
* @since 2021-05-14
*/
@Api(tags = "判级产品检测项目表")
@RestController
@RequestMapping("/v1/grading_item")
public class GradingItemController extends ServiceController {
@Autowired
private IGradingItemService gradingItemService;
@ApiOperation("分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
})
@PostMapping("/page")
public RestResult<Page<GradingItem>> getPage(GradingItem gradingItem) {
return success(gradingItemService.page(getPage(), gradingItem));
}
@ApiOperation("查询 id 信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
})
@GetMapping("/{id}")
public RestResult<GradingItem> get(@PathVariable("id") Long id) {
return success(gradingItemService.getById(id));
}
@ApiOperation("根据 id 修改信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
})
@PutMapping("/{id}")
public RestResult<Boolean> edit(@PathVariable("id") Long id, GradingItem gradingItem) {
gradingItem.setId(id);
return success(gradingItemService.updateById(gradingItem));
}
@ApiOperation("添加")
@PostMapping("/")
public RestResult<Boolean> add(GradingItem gradingItem) {
return success(gradingItemService.save(gradingItem));
}
@ApiOperation("根据 ids 删除")
@ApiImplicitParams({
@ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
})
@DeleteMapping("/")
public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
return success(gradingItemService.removeByIds(ids));
}
}
package com.patzn.cloud.service.lims.hmhj.controller;
import com.patzn.cloud.service.hmhj.entity.GradingProduct;
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.lims.hmhj.service.IGradingProductService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import java.util.List;
/**
* 判级产品表 前端控制器
*
* @author wwd
* @since 2021-05-14
*/
@Api(tags = "判级产品表")
@RestController
@RequestMapping("/v1/grading_product")
public class GradingProductController extends ServiceController {
@Autowired
private IGradingProductService gradingProductService;
@ApiOperation("分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
})
@PostMapping("/page")
public RestResult<Page<GradingProduct>> getPage(GradingProduct gradingProduct) {
return success(gradingProductService.page(getPage(), gradingProduct));
}
@ApiOperation("查询 id 信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
})
@GetMapping("/{id}")
public RestResult<GradingProduct> get(@PathVariable("id") Long id) {
return success(gradingProductService.getById(id));
}
@ApiOperation("根据 id 修改信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
})
@PutMapping("/{id}")
public RestResult<Boolean> edit(@PathVariable("id") Long id, GradingProduct gradingProduct) {
gradingProduct.setId(id);
return success(gradingProductService.updateById(gradingProduct));
}
@ApiOperation("添加")
@PostMapping("/")
public RestResult<Boolean> add(GradingProduct gradingProduct) {
return success(gradingProductService.save(gradingProduct));
}
@ApiOperation("根据 ids 删除")
@ApiImplicitParams({
@ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
})
@DeleteMapping("/")
public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
return success(gradingProductService.removeByIds(ids));
}
}
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.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 java.util.List;
/**
* 判级标准附件表 前端控制器
*
* @author wwd
* @since 2021-05-14
*/
@Api(tags = "判级标准附件表")
@RestController
@RequestMapping("/v1/grading_record")
public class GradingRecordController extends ServiceController {
@Autowired
private IGradingRecordService gradingRecordService;
@ApiOperation("分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
})
@PostMapping("/page")
public RestResult<Page<GradingRecord>> getPage(GradingRecord gradingRecord) {
return success(gradingRecordService.page(getPage(), gradingRecord));
}
@ApiOperation("查询 id 信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
})
@GetMapping("/{id}")
public RestResult<GradingRecord> get(@PathVariable("id") Long id) {
return success(gradingRecordService.getById(id));
}
@ApiOperation("根据 id 修改信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
})
@PutMapping("/{id}")
public RestResult<Boolean> edit(@PathVariable("id") Long id, GradingRecord gradingRecord) {
gradingRecord.setId(id);
return success(gradingRecordService.updateById(gradingRecord));
}
@ApiOperation("添加")
@PostMapping("/")
public RestResult<Boolean> add(GradingRecord gradingRecord) {
return success(gradingRecordService.save(gradingRecord));
}
@ApiOperation("根据 ids 删除")
@ApiImplicitParams({
@ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
})
@DeleteMapping("/")
public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
return success(gradingRecordService.removeByIds(ids));
}
}
package com.patzn.cloud.service.lims.hmhj.controller;
import com.patzn.cloud.service.hmhj.dto.GradingStandardDTO;
import com.patzn.cloud.service.hmhj.entity.GradingStandard;
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.lims.hmhj.service.IGradingStandardService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import java.util.List;
/**
* 判级标准表 前端控制器
*
* @author wwd
* @since 2021-05-14
*/
@Api(tags = "判级标准表")
@RestController
@RequestMapping("/v1/grading_standard")
public class GradingStandardController extends ServiceController {
@Autowired
private IGradingStandardService gradingStandardService;
@ApiOperation("分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
})
@PostMapping("/page")
public RestResult<Page<GradingStandard>> getPage(GradingStandard gradingStandard) {
return success(gradingStandardService.page(getPage(), gradingStandard));
}
@ApiOperation("查询 id 信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
})
@GetMapping("/{id}")
public RestResult<GradingStandard> get(@PathVariable("id") Long id) {
return success(gradingStandardService.getById(id));
}
@ApiOperation("根据 id 修改信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
})
@PutMapping("/{id}")
public RestResult<Boolean> edit(@PathVariable("id") Long id, GradingStandard gradingStandard) {
gradingStandard.setId(id);
return success(gradingStandardService.updateById(gradingStandard));
}
@ApiOperation("添加")
@PostMapping("/")
public RestResult<Boolean> add(GradingStandard gradingStandard) {
return success(gradingStandardService.save(gradingStandard));
}
@ApiOperation("根据 ids 删除")
@ApiImplicitParams({
@ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
})
@DeleteMapping("/")
public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
return success(gradingStandardService.removeByIds(ids));
}
@ApiOperation(value = "添加判级标准", notes = "添加判级标准")
@PostMapping("/add_grading_standard")
public RestResult<Boolean> addGradingStandard(@RequestBody GradingStandardDTO dto) {
return success(gradingStandardService.addGradingStandard(dto,getAccount()));
}
@ApiOperation(value = "编辑判级标准", notes = "添加判级标准")
@PostMapping("/edit_grading_standard")
public RestResult<Boolean> editGradingStandard(@RequestBody GradingStandardDTO dto) {
return success(gradingStandardService.editGradingStandard(dto,getAccount()));
}
@ApiOperation("作废")
@PostMapping("/abolish_grading_standard")
public RestResult<Boolean> abolish(@RequestParam("ids")Long [] ids, @RequestParam("reason")String reason) {
return success(gradingStandardService.abolish(ids,reason,getAccount()));
}
}
......@@ -25,12 +25,12 @@ import io.swagger.annotations.ApiOperation;
import java.util.List;
/**
* ${table.comment} 前端控制器
* 偏离表 前端控制器
*
* @author wwd
* @since 2021-04-17
*/
@Api(tags = "${table.comment}")
@Api(tags = "偏离表")
@RestController
@RequestMapping("/v1/deviate")
public class ItemDeviateController extends ServiceController {
......
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.GradingAnnex;
import com.patzn.cloud.commons.mapper.BatchMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author wwd
* @since 2021-05-14
*/
public interface GradingAnnexMapper extends BatchMapper<GradingAnnex> {
}
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.GradingItem;
/**
* <p>
* Mapper 接口
* </p>
*
* @author wwd
* @since 2021-05-14
*/
public interface GradingItemMapper extends BatchMapper<GradingItem> {
}
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.GradingProduct;
/**
* <p>
* Mapper 接口
* </p>
*
* @author wwd
* @since 2021-05-14
*/
public interface GradingProductMapper extends BatchMapper<GradingProduct> {
}
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.GradingRecord;
/**
* <p>
* Mapper 接口
* </p>
*
* @author wwd
* @since 2021-05-14
*/
public interface GradingRecordMapper extends BatchMapper<GradingRecord> {
}
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.GradingStandard;
/**
* <p>
* Mapper 接口
* </p>
*
* @author wwd
* @since 2021-05-14
*/
public interface GradingStandardMapper extends BatchMapper<GradingStandard> {
}
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.GradingAnnex;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 服务类
*
* @author wwd
* @since 2021-05-14
*/
public interface IGradingAnnexService extends IBaseService<GradingAnnex> {
Page<GradingAnnex> page(Page<GradingAnnex> page, GradingAnnex gradingAnnex);
boolean removeByIds(List<Long> ids);
boolean upload(MultipartFile file, Long gradingStandardId);
boolean uploadBath(MultipartHttpServletRequest httpServletRequest, Long gradingStandardId, Account account);
void downloadFile(Long id, HttpServletResponse response);
void view(HttpServletResponse response, String objectKey);
}
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.GradingItem;
import java.util.List;
/**
* 服务类
*
* @author wwd
* @since 2021-05-14
*/
public interface IGradingItemService extends IBaseService<GradingItem> {
Page<GradingItem> page(Page<GradingItem> page, GradingItem gradingItem);
boolean removeByIds(List<Long> ids);
}
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.GradingProduct;
import java.util.List;
/**
* 服务类
*
* @author wwd
* @since 2021-05-14
*/
public interface IGradingProductService extends IBaseService<GradingProduct> {
Page<GradingProduct> page(Page<GradingProduct> page, GradingProduct gradingProduct);
boolean removeByIds(List<Long> ids);
}
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.GradingRecord;
import java.util.List;
/**
* 服务类
*
* @author wwd
* @since 2021-05-14
*/
public interface IGradingRecordService extends IBaseService<GradingRecord> {
Page<GradingRecord> page(Page<GradingRecord> page, GradingRecord gradingRecord);
boolean removeByIds(List<Long> ids);
}
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.dto.GradingStandardDTO;
import com.patzn.cloud.service.hmhj.entity.GradingStandard;
import java.util.List;
/**
* 服务类
*
* @author wwd
* @since 2021-05-14
*/
public interface IGradingStandardService extends IBaseService<GradingStandard> {
Page<GradingStandard> page(Page<GradingStandard> page, GradingStandard gradingStandard);
boolean removeByIds(List<Long> ids);
boolean addGradingStandard(GradingStandardDTO dto, Account account);
boolean abolish(Long[] ids, String reason, Account account);
boolean editGradingStandard(GradingStandardDTO dto, Account account);
}
......@@ -237,14 +237,18 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
public boolean addDTO(ContractSampleDTO dto) {
RestAssert.fail(null == dto , "数据有错误");
List<ContractSampleItem> itemList = dto.getItemList();
RestAssert.fail(CollectionUtils.isEmpty(itemList),"请选择检测项目");
// RestAssert.fail(CollectionUtils.isEmpty(itemList),"请选择检测项目");
ContractSample contractSample = dto.convert(ContractSample.class);
if (save(contractSample)){
for (ContractSampleItem item:itemList) {
item.setContractSampleId(contractSample.getId());
if (CollectionUtils.isNotEmpty(itemList)){
for (ContractSampleItem item:itemList) {
item.setContractSampleId(contractSample.getId());
}
return contractSampleItemService.saveBatch(itemList);
}
return contractSampleItemService.saveBatch(itemList);
return true;
}
return false;
}
......
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.commons.controller.Account;
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;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
/**
* 服务实现类
*
* @author wwd
* @since 2021-05-14
*/
@Service
public class GradingAnnexServiceImpl extends BaseServiceImpl<GradingAnnexMapper, GradingAnnex> implements IGradingAnnexService {
@Autowired
private OssClient ossClient;
@Autowired
private IGradingStandardService gradingStandardService;
@Override
public Page<GradingAnnex> page(Page<GradingAnnex> page, GradingAnnex gradingAnnex) {
Wrapper wrapper = new EntityWrapper<>(gradingAnnex);
return this.page(page, wrapper);
}
@Override
public boolean removeByIds(List<Long> ids) {
return baseMapper.deleteBatchIds(ids) > 0;
}
@Override
public boolean upload(MultipartFile file, Long gradingStandardId) {
RestAssert.fail(null == gradingStandardId,"请选择委托");
String fileName = file.getOriginalFilename();
RestAssert.fail(StringUtils.isBlank(fileName), "请上传文件");
if (null==gradingStandardService.getById(gradingStandardId)){
RestAssert.fail("委托不存在");
}
OssFileResult result = ossClient.upload(file);
if (null == result) {
return false;
}
GradingAnnex sampleAnnex = new GradingAnnex();
sampleAnnex.setType(result.getType());
sampleAnnex.setFileName(result.getName());
sampleAnnex.setObjectKey(result.getObjectKey());
sampleAnnex.setGradingStandardId(gradingStandardId);
return save(sampleAnnex);
}
@Override
public boolean uploadBath(MultipartHttpServletRequest multipartHttpServletRequest, Long gradingStandardId, Account account) {
// 先拿到文件名称的迭代器
Iterator<String> fileNamesIt = multipartHttpServletRequest.getFileNames();
List<String> failedNameList = new ArrayList<>();
while (fileNamesIt.hasNext()) {
String fileName = fileNamesIt.next();
// 获取文件
MultipartFile multipartFile = multipartHttpServletRequest.getFile(fileName);
upload(multipartFile,gradingStandardId);
failedNameList.add(fileName);
}
return true;
}
@Override
public void downloadFile(Long id, HttpServletResponse response) {
GradingAnnex attachment = super.getById(id);
if (null == attachment) {
RestAssert.fail("抱歉!该照片不存在");
}
ossClient.download(attachment.getObjectKey(), attachment.getFileName() + "." + attachment.getType(), response);
}
@Override
public void view(HttpServletResponse response, String objectKey) {
ossClient.download(objectKey, response);
}
}
package com.patzn.cloud.service.lims.hmhj.service.impl;
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;
/**
* 服务实现类
*
* @author wwd
* @since 2021-05-14
*/
@Service
public class GradingItemServiceImpl extends BaseServiceImpl<GradingItemMapper, GradingItem> implements IGradingItemService {
@Override
public Page<GradingItem> page(Page<GradingItem> page, GradingItem gradingItem) {
Wrapper wrapper = new EntityWrapper<>(gradingItem);
return this.page(page, wrapper);
}
@Override
public boolean removeByIds(List<Long> ids) {
return baseMapper.deleteBatchIds(ids) > 0;
}
}
package com.patzn.cloud.service.lims.hmhj.service.impl;
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;
/**
* 服务实现类
*
* @author wwd
* @since 2021-05-14
*/
@Service
public class GradingProductServiceImpl extends BaseServiceImpl<GradingProductMapper, GradingProduct> implements IGradingProductService {
@Override
public Page<GradingProduct> page(Page<GradingProduct> page, GradingProduct gradingProduct) {
Wrapper wrapper = new EntityWrapper<>(gradingProduct);
return this.page(page, wrapper);
}
@Override
public boolean removeByIds(List<Long> ids) {
return baseMapper.deleteBatchIds(ids) > 0;
}
}
package com.patzn.cloud.service.lims.hmhj.service.impl;
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;
/**
* 服务实现类
*
* @author wwd
* @since 2021-05-14
*/
@Service
public class GradingRecordServiceImpl extends BaseServiceImpl<GradingRecordMapper, GradingRecord> implements IGradingRecordService {
@Override
public Page<GradingRecord> page(Page<GradingRecord> page, GradingRecord gradingRecord) {
Wrapper wrapper = new EntityWrapper<>(gradingRecord);
return this.page(page, wrapper);
}
@Override
public boolean removeByIds(List<Long> ids) {
return baseMapper.deleteBatchIds(ids) > 0;
}
}
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.toolkit.IdWorker;
import com.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.service.hmhj.dto.GradingProductDTO;
import com.patzn.cloud.service.hmhj.dto.GradingStandardDTO;
import com.patzn.cloud.service.hmhj.entity.GradingItem;
import com.patzn.cloud.service.hmhj.entity.GradingProduct;
import com.patzn.cloud.service.hmhj.entity.GradingRecord;
import com.patzn.cloud.service.hmhj.entity.GradingStandard;
import com.patzn.cloud.service.lims.hmhj.mapper.GradingStandardMapper;
import com.patzn.cloud.service.lims.hmhj.service.IGradingItemService;
import com.patzn.cloud.service.lims.hmhj.service.IGradingProductService;
import com.patzn.cloud.service.lims.hmhj.service.IGradingRecordService;
import com.patzn.cloud.service.lims.hmhj.service.IGradingStandardService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import org.apache.commons.lang3.ArrayUtils;
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 java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* 服务实现类
*
* @author wwd
* @since 2021-05-14
*/
@Service
public class GradingStandardServiceImpl extends BaseServiceImpl<GradingStandardMapper, GradingStandard> implements IGradingStandardService {
@Autowired
private IGradingItemService gradingItemService;
@Autowired
private IGradingProductService gradingProductService;
@Autowired
private IGradingRecordService gradingRecordService;
@Override
public Page<GradingStandard> page(Page<GradingStandard> page, GradingStandard gradingStandard) {
Wrapper wrapper = new EntityWrapper<>(gradingStandard);
if (StringUtils.isNotBlank(gradingStandard.getCode())){
wrapper.like("code",gradingStandard.getCode());
gradingStandard.setCode(null);
}
if (StringUtils.isNotBlank(gradingStandard.getName())){
wrapper.like("name",gradingStandard.getName());
gradingStandard.setName(null);
}
return this.page(page, wrapper);
}
@Override
public boolean removeByIds(List<Long> ids) {
return baseMapper.deleteBatchIds(ids) > 0;
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean addGradingStandard(GradingStandardDTO dto, Account account) {
RestAssert.fail(StringUtils.isBlank(dto.getCode()),"产品标准不能为空!");
RestAssert.fail(StringUtils.isBlank(dto.getName()),"产品标准名称不能为空!");
GradingStandard gradingStandard = dto.convert(GradingStandard.class);
gradingStandard.setId(IdWorker.getId());
List<GradingProductDTO> gradingProductList = dto.getGradingProductList();
List<GradingItem> saveItemList = new ArrayList<>();
List<GradingProduct> saveGradingProductList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(gradingProductList)){
for (GradingProductDTO productDTO : gradingProductList) {
List<GradingItem> itemList = productDTO.getGradingItemList();
GradingProduct product = productDTO.convert(GradingProduct.class);
product.setGradingStandardId(gradingStandard.getId());
product.setId(IdWorker.getId());
saveGradingProductList.add(product);
if (CollectionUtils.isNotEmpty(itemList)){
for (GradingItem item : itemList) {
item.setGradingProductId(product.getId());
saveItemList.add(item);
}
}
}
}
if (save(gradingStandard)){
gradingProductService.saveBatch(saveGradingProductList);
gradingItemService.saveBatch(saveItemList);
}
GradingRecord record = new GradingRecord();
record.setRemark("新增");
record.setGradingStandardId(gradingStandard.getId());
record.setOperator(account.getUserName());
record.setOperatorId(account.getUserId());
record.setOrigin("新增");
record.setTarget("新增");
record.setType(0);
gradingRecordService.save(record);
return true;
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean abolish(Long[] ids, String reason, Account account) {
RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择需要作废的判级标准");
RestAssert.fail(StringUtils.isBlank(reason),"请填写,作废原因!");
List<GradingStandard> standards = super.list(Condition.create().in("id",ids).eq("effective",1));
if (CollectionUtils.isNotEmpty(standards)){
for (GradingStandard standard : standards) {
RestAssert.fail("判级标准:"+standard.getCode()+"已经作废,请勿重复作废!");
}
}
GradingStandard gradingStandard = new GradingStandard();
gradingStandard.setAbolisher(account.getUserName());
gradingStandard.setAbolisherId(account.getUserId());
gradingStandard.setAbolishTime(new Date());
gradingStandard.setAbolishReason(reason);
gradingStandard.setEffective(1);
List<GradingRecord> saveRecord = new ArrayList<>();
for (Long id : ids) {
GradingRecord record = new GradingRecord();
record.setRemark("作废");
record.setGradingStandardId(id);
record.setOperator(account.getUserName());
record.setOperatorId(account.getUserId());
record.setOrigin("作废");
record.setTarget("作废");
record.setType(0);
saveRecord.add(record);
}
gradingRecordService.saveBatch(saveRecord);
return super.update(gradingStandard,Condition.create().in("id",ids));
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean editGradingStandard(GradingStandardDTO dto, Account account) {
if (null == dto.getId()){
return false;
}
List<GradingProductDTO> sampleList = dto.getGradingProductList();
if (CollectionUtils.isEmpty(sampleList)){
// PtAssert.fail("样品不能为空");
}
GradingStandard standard =dto.convert(GradingStandard.class);
if (updateById(standard)){
List<Long> sampleIdsList = new ArrayList<>();
List<GradingProduct> updateSampleList = new ArrayList<>();
List<GradingProduct> saveSampleList = new ArrayList<>();
List<GradingItem> saveItemList = new ArrayList<>();
List<GradingItem> updateItemList = new ArrayList<>();
for (GradingProductDTO productDTO:sampleList) {
GradingProduct sample = productDTO.convert(GradingProduct.class);
if (null != sample.getId()){
updateSampleList.add(sample);
sampleIdsList.add(sample.getId());
}else{
sample.setGradingStandardId(standard.getId());
sample.setId(IdWorker.getId());
saveSampleList.add(sample);
}
List<GradingItem> viewItemList= productDTO.getGradingItemList();
if (CollectionUtils.isNotEmpty(viewItemList)){
for (GradingItem item:viewItemList) {
if (null == item.getId()){
item.setId(IdWorker.getId());
item.setGradingProductId(sample.getId());
saveItemList.add(item);
}else{
updateItemList.add(item);
}
}
}
}
if (CollectionUtils.isNotEmpty(updateSampleList)){
gradingProductService.updateBatchById(updateSampleList);
}
if (CollectionUtils.isNotEmpty(saveSampleList)){
gradingProductService.saveBatch(saveSampleList);
}
if (CollectionUtils.isNotEmpty(saveItemList)){
gradingItemService.saveBatch(saveItemList);
}
if (CollectionUtils.isNotEmpty(updateItemList)){
gradingItemService.updateBatchById(updateItemList);
}
}
GradingRecord record = new GradingRecord();
record.setRemark("编辑");
record.setGradingStandardId(dto.getId());
record.setOperator(account.getUserName());
record.setOperatorId(account.getUserId());
record.setOrigin("编辑");
record.setTarget("编辑");
record.setType(0);
gradingRecordService.save(record);
return true;
}
}
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.patzn.cloud.service.lims.hmhj.mapper.GradingAnnexMapper">
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.patzn.cloud.service.lims.hmhj.mapper.GradingItemMapper">
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.patzn.cloud.service.lims.hmhj.mapper.GradingProductMapper">
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.patzn.cloud.service.lims.hmhj.mapper.GradingRecordMapper">
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.patzn.cloud.service.lims.hmhj.mapper.GradingStandardMapper">
</mapper>
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