Skip to content

P
patzn-cloud-service-hmhj
Commit ad84d26b by wangweidong
Options

土工平台修改

parent fcba4df4
Showing with 1411 additions and 10 deletions
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustController.java
......@@ -485,7 +485,7 @@ public class EntrustController extends ServiceController {
@PostMapping("/page_entrust_report_make_his")
public RestResult<Page<EntrustVO>> getPageReportMakeHis(EntrustVO entrust) {
entrust.setReportNotStatus(EntrustReportStatusEnum.MAKING);
return success(entrustService.pageEntrustByReport(getPage(), entrust));
return success(entrustService.pageEntrustByReportNotHis(getPage(), entrust));
}
......
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustSampleItemController.java
......@@ -2,6 +2,7 @@ package com.patzn.cloud.service.lims.hmhj.controller;
import com.google.common.collect.Lists;
import com.patzn.cloud.service.hmhj.entity.EntrustSampleItem;
import com.patzn.cloud.service.hmhj.entity.OriginalRecord;
import com.patzn.cloud.service.hmhj.enums.EntrustSampleItemStatusEnum;
import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -543,4 +544,13 @@ public class EntrustSampleItemController extends ServiceController {
return success(entrustSampleItemService.backAudit(ids, reason, getAccount()));
}
@ApiOperation(value = "填写原始记录", notes = "填写原始记录")
@PostMapping("/save_excel_original_record")
public RestResult<OriginalRecord> saveExcelOriginalRecord(@RequestParam("ids")Long[] ids, @RequestParam("templateId") Long templateId) {
return success(entrustSampleItemService.saveExcelOriginalRecord(ids,templateId,getAccount()));
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/ItemRelOriginalRecordController.java 0 → 100644
package com.patzn.cloud.service.lims.hmhj.controller;
import com.patzn.cloud.service.hmhj.entity.ItemRelOriginalRecord;
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.IItemRelOriginalRecordService;
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-03-15
*/
@Api(tags = "土工试验项目关联原始记录表")
@RestController
@RequestMapping("/v1/rel_original_record")
public class ItemRelOriginalRecordController extends ServiceController {
@Autowired
private IItemRelOriginalRecordService itemRelOriginalRecordService;
@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<ItemRelOriginalRecord>> getPage(ItemRelOriginalRecord itemRelOriginalRecord) {
return success(itemRelOriginalRecordService.page(getPage(), itemRelOriginalRecord));
}
@ApiOperation("查询 id 信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
})
@GetMapping("/{id}")
public RestResult<ItemRelOriginalRecord> get(@PathVariable("id") Long id) {
return success(itemRelOriginalRecordService.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, ItemRelOriginalRecord itemRelOriginalRecord) {
itemRelOriginalRecord.setId(id);
return success(itemRelOriginalRecordService.updateById(itemRelOriginalRecord));
}
@ApiOperation("添加")
@PostMapping("/")
public RestResult<Boolean> add(ItemRelOriginalRecord itemRelOriginalRecord) {
return success(itemRelOriginalRecordService.save(itemRelOriginalRecord));
}
@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(itemRelOriginalRecordService.removeByIds(ids));
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/OriginalRecordController.java 0 → 100644
package com.patzn.cloud.service.lims.hmhj.controller;
import com.patzn.cloud.service.hmhj.entity.OriginalRecord;
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.IOriginalRecordService;
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-03-15
*/
@Api(tags = "土工原始记录表")
@RestController
@RequestMapping("/v1/original_record")
public class OriginalRecordController extends ServiceController {
@Autowired
private IOriginalRecordService originalRecordService;
@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<OriginalRecord>> getPage(OriginalRecord originalRecord) {
return success(originalRecordService.page(getPage(), originalRecord));
}
@ApiOperation("查询 id 信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
})
@GetMapping("/{id}")
public RestResult<OriginalRecord> get(@PathVariable("id") Long id) {
return success(originalRecordService.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, OriginalRecord originalRecord) {
originalRecord.setId(id);
return success(originalRecordService.updateById(originalRecord));
}
@ApiOperation("添加")
@PostMapping("/")
public RestResult<Boolean> add(OriginalRecord originalRecord) {
return success(originalRecordService.save(originalRecord));
}
@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(originalRecordService.removeByIds(ids));
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/OriginalTemplateConfigController.java 0 → 100644
package com.patzn.cloud.service.lims.hmhj.controller;
import com.patzn.cloud.service.hmhj.entity.OriginalTemplateConfig;
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.IOriginalTemplateConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import java.util.List;
/**
* ${table.comment} 前端控制器
*
* @author wwd
* @since 2021-03-15
*/
@Api(tags = "原始记录模板配置")
@RestController
@RequestMapping("/v1/template_config")
public class OriginalTemplateConfigController extends ServiceController {
@Autowired
private IOriginalTemplateConfigService originalTemplateConfigService;
@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<OriginalTemplateConfig>> getPage(OriginalTemplateConfig originalTemplateConfig) {
return success(originalTemplateConfigService.page(getPage(), originalTemplateConfig));
}
@ApiOperation("查询 id 信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
})
@GetMapping("/{id}")
public RestResult<OriginalTemplateConfig> get(@PathVariable("id") Long id) {
return success(originalTemplateConfigService.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, OriginalTemplateConfig originalTemplateConfig) {
originalTemplateConfig.setId(id);
return success(originalTemplateConfigService.updateById(originalTemplateConfig));
}
@ApiOperation("添加")
@PostMapping("/")
public RestResult<Boolean> add(OriginalTemplateConfig originalTemplateConfig) {
return success(originalTemplateConfigService.save(originalTemplateConfig));
}
@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(originalTemplateConfigService.removeByIds(ids));
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/OriginalTemplateController.java 0 → 100644
package com.patzn.cloud.service.lims.hmhj.controller;
import com.patzn.cloud.service.hmhj.entity.OriginalTemplate;
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.IOriginalTemplateService;
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 java.util.List;
/**
* 模板文件表 前端控制器
*
* @author wwd
* @since 2021-03-15
*/
@Api(tags = "模板文件表")
@RestController
@RequestMapping("/v1/original_template")
public class OriginalTemplateController extends ServiceController {
@Autowired
private IOriginalTemplateService originalTemplateService;
@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<OriginalTemplate>> getPage(OriginalTemplate originalTemplate) {
return success(originalTemplateService.page(getPage(), originalTemplate));
}
@ApiOperation("查询 id 信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
})
@GetMapping("/{id}")
public RestResult<OriginalTemplate> get(@PathVariable("id") Long id) {
return success(originalTemplateService.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, OriginalTemplate originalTemplate) {
originalTemplate.setId(id);
return success(originalTemplateService.updateById(originalTemplate));
}
@ApiOperation("添加")
@PostMapping("/")
public RestResult<Boolean> add(OriginalTemplate originalTemplate) {
return success(originalTemplateService.save(originalTemplate));
}
@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(originalTemplateService.removeByIds(ids));
}
@ApiOperation(value = "附件上传", notes = "附件上传")
@PostMapping("/upload_template/")
public RestResult<Boolean> uploadTemplate(@RequestParam("classType") String classType,@RequestParam("name") String name,@RequestParam("remark") String remark, MultipartFile file) {
return success(originalTemplateService.uploadTemplate(file, classType,name,remark,0));
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/OriginalTemplateVersionController.java 0 → 100644
package com.patzn.cloud.service.lims.hmhj.controller;
import com.patzn.cloud.service.hmhj.entity.OriginalTemplateVersion;
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.IOriginalTemplateVersionService;
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-03-15
*/
@Api(tags = "模板文件历史表")
@RestController
@RequestMapping("/v1/template_version")
public class OriginalTemplateVersionController extends ServiceController {
@Autowired
private IOriginalTemplateVersionService originalTemplateVersionService;
@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<OriginalTemplateVersion>> getPage(OriginalTemplateVersion originalTemplateVersion) {
return success(originalTemplateVersionService.page(getPage(), originalTemplateVersion));
}
@ApiOperation("查询 id 信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
})
@GetMapping("/{id}")
public RestResult<OriginalTemplateVersion> get(@PathVariable("id") Long id) {
return success(originalTemplateVersionService.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, OriginalTemplateVersion originalTemplateVersion) {
originalTemplateVersion.setId(id);
return success(originalTemplateVersionService.updateById(originalTemplateVersion));
}
@ApiOperation("添加")
@PostMapping("/")
public RestResult<Boolean> add(OriginalTemplateVersion originalTemplateVersion) {
return success(originalTemplateVersionService.save(originalTemplateVersion));
}
@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(originalTemplateVersionService.removeByIds(ids));
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustSampleItemMapper.java
......@@ -26,4 +26,6 @@ public interface EntrustSampleItemMapper extends BatchMapper<EntrustSampleItem>
List<EntrustSampleItemVO> selectVOList(RowBounds rowBounds, @Param("vo") EntrustSampleItemVO entrustSampleItem);
List<EntrustSampleItemVO> selectVOListBySampleIds(@Param("ids")Long[] ids);
List<EntrustSampleItemVO> selectVOListByIds(@Param("ids")Long[] ids);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/ItemRelOriginalRecordMapper.java 0 → 100644
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.ItemRelOriginalRecord;
import com.patzn.cloud.commons.mapper.BatchMapper;
/**
* <p>
* 土工试验项目关联原始记录表 Mapper 接口
* </p>
*
* @author wwd
* @since 2021-03-15
*/
public interface ItemRelOriginalRecordMapper extends BatchMapper<ItemRelOriginalRecord> {
}
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/OriginalRecordMapper.java 0 → 100644
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.OriginalRecord;
import com.patzn.cloud.commons.mapper.BatchMapper;
/**
* <p>
* 土工原始记录表 Mapper 接口
* </p>
*
* @author wwd
* @since 2021-03-15
*/
public interface OriginalRecordMapper extends BatchMapper<OriginalRecord> {
}
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/OriginalTemplateConfigMapper.java 0 → 100644
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.OriginalTemplateConfig;
import com.patzn.cloud.commons.mapper.BatchMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author wwd
* @since 2021-03-15
*/
public interface OriginalTemplateConfigMapper extends BatchMapper<OriginalTemplateConfig> {
}
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/OriginalTemplateMapper.java 0 → 100644
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.service.hmhj.entity.OriginalTemplate;
import com.patzn.cloud.commons.mapper.BatchMapper;
/**
* <p>
* 模板文件表 Mapper 接口
* </p>
*
* @author wwd
* @since 2021-03-15
*/
public interface OriginalTemplateMapper extends BatchMapper<OriginalTemplate> {
}
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/OriginalTemplateVersionMapper.java 0 → 100644
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.OriginalTemplateVersion;
/**
* <p>
* 模板文件历史表 Mapper 接口
* </p>
*
* @author wwd
* @since 2021-03-15
*/
public interface OriginalTemplateVersionMapper extends BatchMapper<OriginalTemplateVersion> {
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleItemService.java
......@@ -4,6 +4,7 @@ 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.EntrustSampleItem;
import com.patzn.cloud.service.hmhj.entity.OriginalRecord;
import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO;
import java.util.List;
......@@ -42,4 +43,7 @@ public interface IEntrustSampleItemService extends IBaseService<EntrustSampleIte
boolean backAudit(Long[] ids, String reason, Account account);
List<EntrustSampleItemVO> listBySampleIds(Long[] ids);
OriginalRecord saveExcelOriginalRecord(Long[] ids, Long templateId, Account account);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustService.java
......@@ -51,6 +51,8 @@ public interface IEntrustService extends IBaseService<Entrust> {
Page<EntrustVO> pageEntrustByReport(Page<EntrustVO> page, EntrustVO entrust);
Page<EntrustVO> pageEntrustByReportNotHis(Page<EntrustVO> page, EntrustVO entrust);
Page<EntrustVO> pageEntrustByReportHis(Page<EntrustVO> page, EntrustVO entrust);
Page<EntrustVO> pageEntrustJudge(Page<EntrustVO> page, EntrustVO entrust);
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IItemRelOriginalRecordService.java 0 → 100644
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.ItemRelOriginalRecord;
import java.util.List;
/**
* 土工试验项目关联原始记录表 服务类
*
* @author wwd
* @since 2021-03-15
*/
public interface IItemRelOriginalRecordService extends IBaseService<ItemRelOriginalRecord> {
Page<ItemRelOriginalRecord> page(Page<ItemRelOriginalRecord> page, ItemRelOriginalRecord itemRelOriginalRecord);
boolean removeByIds(List<Long> ids);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IOriginalRecordService.java 0 → 100644
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.Entrust;
import com.patzn.cloud.service.hmhj.entity.OriginalRecord;
import com.patzn.cloud.service.hmhj.entity.OriginalTemplate;
import java.io.File;
import java.util.List;
/**
* 土工原始记录表 服务类
*
* @author wwd
* @since 2021-03-15
*/
public interface IOriginalRecordService extends IBaseService<OriginalRecord> {
Page<OriginalRecord> page(Page<OriginalRecord> page, OriginalRecord originalRecord);
boolean removeByIds(List<Long> ids);
OriginalRecord uploadExpGenerate(Long[] ids, OriginalTemplate template, Entrust entrust, Account account, String remark, File file);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IOriginalTemplateConfigService.java 0 → 100644
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.OriginalTemplateConfig;
import java.util.List;
/**
* 服务类
*
* @author wwd
* @since 2021-03-15
*/
public interface IOriginalTemplateConfigService extends IBaseService<OriginalTemplateConfig> {
Page<OriginalTemplateConfig> page(Page<OriginalTemplateConfig> page, OriginalTemplateConfig originalTemplateConfig);
boolean removeByIds(List<Long> ids);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IOriginalTemplateService.java 0 → 100644
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.OriginalTemplate;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
/**
* 模板文件表 服务类
*
* @author wwd
* @since 2021-03-15
*/
public interface IOriginalTemplateService extends IBaseService<OriginalTemplate> {
Page<OriginalTemplate> page(Page<OriginalTemplate> page, OriginalTemplate originalTemplate);
boolean removeByIds(List<Long> ids);
boolean uploadTemplate(MultipartFile file, String classType, String name, String remark, int i);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IOriginalTemplateVersionService.java 0 → 100644
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.OriginalTemplateVersion;
import java.util.List;
/**
* 模板文件历史表 服务类
*
* @author wwd
* @since 2021-03-15
*/
public interface IOriginalTemplateVersionService extends IBaseService<OriginalTemplateVersion> {
Page<OriginalTemplateVersion> page(Page<OriginalTemplateVersion> page, OriginalTemplateVersion originalTemplateVersion);
boolean removeByIds(List<Long> ids);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleItemServiceImpl.java
......@@ -4,18 +4,23 @@ import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.toolkit.CollectionUtils;
import com.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.service.hmhj.entity.EntrustSample;
import com.patzn.cloud.service.hmhj.entity.EntrustSampleItem;
import com.patzn.cloud.commons.toolkit.FileUtils;
import com.patzn.cloud.oss.starter.OssClient;
import com.patzn.cloud.service.hmhj.entity.*;
import com.patzn.cloud.service.hmhj.enums.EntrustSampleItemStatusEnum;
import com.patzn.cloud.service.hmhj.enums.EntrustSampleStatusEnum;
import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO;
import com.patzn.cloud.service.lims.common.HSSFWorkbookUtil;
import com.patzn.cloud.service.lims.common.StringHandleUtils;
import com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleItemMapper;
import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleItemRecordService;
import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleItemService;
import com.patzn.cloud.service.lims.hmhj.service.*;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleService;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.BorderStyle;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xssf.usermodel.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
......@@ -23,9 +28,11 @@ 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;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
/**
......@@ -43,6 +50,25 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
@Autowired
private IEntrustSampleItemRecordService entrustSampleItemRecordService;
@Autowired
private IOriginalTemplateService originalTemplateService;
@Autowired
private IOriginalTemplateConfigService originalTemplateConfigService;
@Autowired
private IOriginalRecordService originalRecordService;
@Autowired
private IEntrustService entrustService;
@Autowired
private OssClient ossClient;
@Override
public Page<EntrustSampleItem> page(Page<EntrustSampleItem> page, EntrustSampleItem entrustSampleItem) {
Wrapper wrapper = new EntityWrapper<>(entrustSampleItem);
......@@ -274,5 +300,421 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
return baseMapper.selectVOListBySampleIds(ids);
}
@Override
public OriginalRecord saveExcelOriginalRecord(Long[] ids, Long templateId, Account account) {
logger.error("saveExcelOriginalRecord");
RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择试验项目!");
RestAssert.fail(null == templateId,"请选择原始记录模板");
OriginalTemplate template = originalTemplateService.getById(templateId);
if (null == template){
logger.error("----------------------0");
RestAssert.fail("模板不存在");
}
logger.error("saveExcelOriginalRecord模板存在");
List<EntrustSampleItemVO> voList = listVOByIds(ids);
if (CollectionUtils.isEmpty(voList)){
return null;
}
List<Long> sampleIdList = voList.stream().map(s->{
return s.getEntrustSampleId();
}).collect(Collectors.toList());
Entrust entrust = entrustService.getById(voList.get(0).getEntrustId());
logger.error("saveExcelOriginalRecord entrust");
InputStream io = ossClient.download(template.getObjectKey());
if (null == io){
logger.error("----------------------2");
RestAssert.fail("模板不存在");
}
logger.error(" InputStream io 存在");
OriginalRecord objectKey=null;
XSSFWorkbook xssfWorkbook= null;
try {
xssfWorkbook= new XSSFWorkbook(io);
}catch (Exception e){
logger.error("获取证书模板错误"+e.getMessage());
e.printStackTrace();
}
Map<String, String> mapReplace = new HashMap<>();
mapReplace.put("#{client}",entrust.getClient());
List<OriginalTemplateConfig> configList = originalTemplateConfigService.list(Condition.create().eq("template_id",templateId));
if (null==template.getMoreSheet() || 0 == template.getMoreSheet()){
logger.error("----------------------3");
HSSFWorkbookUtil.replaceModel(mapReplace,xssfWorkbook,0);
logger.error("----------------------4");
XSSFSheet sheetOne = xssfWorkbook.getSheetAt(0);
sheetOne.setForceFormulaRecalculation(true);
logger.error("----------------------5");
Integer beginRow = template.getSampleBeginRow();
if (null != beginRow
&& null!=template.getSampleMergerNum()
&& null!=template.getTemplateSampleNum()){
int templateSampleNum = template.getTemplateSampleNum();
if (voList.size()<templateSampleNum){
int sampleMergerNum = template.getSampleMergerNum();
int xBegin1 = 9;
int xBegin2 = 10;
int xBegin3 = 11;
int xStep = 5;
for (EntrustSampleItemVO vo:voList) {
XSSFRow xssfRow = sheetOne.getRow(beginRow);
for (OriginalTemplateConfig config:configList) {
XSSFCell cell = xssfRow.getCell(config.getColumnPlace());
if ("sn".equals(config.getDataAttribute())){
continue;
}
cell.setCellValue(StringHandleUtils.getFieldIfNummReturnBlankValueByFieldName(config.getDataAttribute(),vo));
}
beginRow+=sampleMergerNum;
}
for (OriginalTemplateConfig config:configList) {
if (null == config.getMergeRowNum()){
config.setMergeRowNum(1);
}
if (StringUtils.isNotBlank(config.getFormula())&&null != config.getColumnPlace() && null != config.getMergeRowNum()){
Integer sampleBgMum = template.getSampleBeginRow();
Integer mergeRowNum = config.getMergeRowNum();
int formulaNum = template.getSampleBeginRow()+sampleMergerNum*templateSampleNum-1 ;
for (int i =sampleBgMum ; i <= formulaNum; i+=mergeRowNum) {
XSSFRow row = sheetOne.getRow(i);
XSSFCell cell = row.getCell(config.getColumnPlace());
String formula = config.getFormula();
formula = formula.replace("#{sn}",(i+1)+"");
if (formula.contains("#{sneven1}")){
if (StringHandleUtils.isEven(i)){
formula= formula.replace("#{sneven1}",(i+1)+"");
}else{
formula= formula.replace("#{sneven1}",i+"");
}
}
if (formula.contains("#{snodd1}")){
if (!StringHandleUtils.isEven(i)){
formula= formula.replace("#{snodd1}",(i+1)+"");
}else{
formula= formula.replace("#{snodd1}",i+"");
}
}
if (formula.contains("#{sn+1}")){
formula= formula.replace("#{sn+1}",(i+2)+"");
}
if (formula.contains("#{sn+2}")){
formula= formula.replace("#{sn+2}",(i+3)+"");
}
if (formula.contains("#{sn+3}")){
formula= formula.replace("#{sn+3}",(i+4)+"");
}
if (formula.contains("#{sn+4}")){
formula= formula.replace("#{sn+4}",(i+5)+"");
}
if (formula.contains("#{sn+5}")){
formula= formula.replace("#{sn+5}",(i+6)+"");
}
if (formula.contains("#{sn+6}")){
formula= formula.replace("#{sn+6}",(i+7)+"");
}
if (formula.contains("#{sn+7}")){
formula= formula.replace("#{sn+7}",(i+8)+"");
}
cell.setCellFormula(formula);
}
}
}
}else{
logger.error("----------------------8");
int sampleMergerNum = template.getSampleMergerNum();
int insertRow = beginRow+sampleMergerNum*templateSampleNum;
logger.error("---------------------9");
XSSFRow zeroRow = sheetOne.getRow(beginRow);
XSSFCellStyle cellStyle = zeroRow.getCell(0).getCellStyle();
logger.error("----------------------10");
int lastCellNum = zeroRow.getLastCellNum();
int insertCount = voList.size()-templateSampleNum;
for (int m = 0 ; m<insertCount ;m++) {
for (int i = 0; i < sampleMergerNum; i++) {
sheetOne.shiftRows(insertRow, sheetOne.getLastRowNum(), 1,true,false);
XSSFRow row = sheetOne.createRow(insertRow);
row.setHeight(zeroRow.getHeight());
for (int j = 0; j < lastCellNum; j++) {
XSSFCell xssfCell = row.createCell(j);
xssfCell.setCellStyle(cellStyle);
}
insertRow++;
}
}
int sn = 1;
int xBegin1 = 9;
int xBegin2 = 10;
int xBegin3 = 11;
int xStep = 5;
for (EntrustSampleItemVO vo:voList) {
XSSFRow xssfRow = sheetOne.getRow(beginRow);
for (OriginalTemplateConfig config:configList) {
if (null == config.getColumnPlace()){
continue;
}
XSSFCell cell = xssfRow.getCell(config.getColumnPlace());
if ("sn".equals(config.getDataAttribute())){
cell.setCellValue(sn);
}else{
cell.setCellValue(StringHandleUtils.getFieldIfNummReturnBlankValueByFieldName(config.getDataAttribute(),vo));
}
}
beginRow+=sampleMergerNum;
sn++;
}
for (OriginalTemplateConfig config:configList) {
if (null==config.getMergeRowNum()){
config.setMergeRowNum(1);
}
if (StringUtils.isNotBlank(config.getFormula())&&null != config.getColumnPlace() && null != config.getMergeRowNum()){
Integer sampleBgMum = template.getSampleBeginRow();
Integer mergeRowNum = config.getMergeRowNum();
int formulaNum = template.getSampleBeginRow()+sampleMergerNum*voList.size()-1 ;
for (int i =sampleBgMum ; i <= formulaNum; i+=mergeRowNum) {
XSSFRow row = sheetOne.getRow(i);
if (null == row){
continue;
}
XSSFCell cell = row.getCell(config.getColumnPlace());
if (null == cell){
continue;
}
String formula = config.getFormula();
formula = formula.replace("#{sn}",(i+1)+"");
if (formula.contains("#{sneven1}")){
if (StringHandleUtils.isEven(i)){
formula= formula.replace("#{sneven1}",(i+1)+"");
}else{
formula= formula.replace("#{sneven1}",i+"");
}
}
if (formula.contains("#{snodd1}")){
if (!StringHandleUtils.isEven(i)){
formula= formula.replace("#{snodd1}",(i+1)+"");
}else{
formula= formula.replace("#{snodd1}",i+"");
}
}
if (formula.contains("#{sn+1}")){
formula= formula.replace("#{sn+1}",(i+2)+"");
}
if (formula.contains("#{sn+2}")){
formula= formula.replace("#{sn+2}",(i+3)+"");
}
if (formula.contains("#{sn+3}")){
formula= formula.replace("#{sn+3}",(i+4)+"");
}
if (formula.contains("#{sn+4}")){
formula= formula.replace("#{sn+4}",(i+5)+"");
}
if (formula.contains("#{sn+5}")){
formula= formula.replace("#{sn+5}",(i+6)+"");
}
if (formula.contains("#{sn+6}")){
formula= formula.replace("#{sn+6}",(i+7)+"");
}
if (formula.contains("#{sn+7}")){
formula= formula.replace("#{sn+7}",(i+8)+"");
}
cell.setCellFormula(formula);
}
}
}
for (OriginalTemplateConfig config:configList) {
if (null==config.getMergeRowNum()){
config.setMergeRowNum(1);
}
if (null == config.getMergeBegin()){
continue;
}
if (null == config.getMergeEnd()){
continue;
}
int step= config.getMergeRowNum();
if (step==1 && config.getMergeEnd() == config.getMergeBegin()){
continue;
}
if (null != config.getColumnPlace() && null != config.getMergeRowNum()){
Integer sampleBgMum = template.getSampleBeginRow()+templateSampleNum*sampleMergerNum;
Integer sampleEnMum = template.getSampleBeginRow()+voList.size()*sampleMergerNum-1;
while (sampleBgMum<=sampleEnMum) {
sheetOne.addMergedRegion(new CellRangeAddress(sampleBgMum,sampleBgMum+step-1,config.getMergeBegin(),config.getMergeEnd()));
sampleBgMum=sampleBgMum+step;
}
}
}
}
}
}else{
Integer templateSampleNum = template.getTemplateSampleNum();
if (null == templateSampleNum || 1==templateSampleNum){
XSSFSheet xssfSheet = xssfWorkbook.getSheetAt(0);
xssfSheet.setForceFormulaRecalculation(true);
int index = 0;
EntrustSampleItemVO firstVO = null;
int sheetNum = xssfWorkbook.getNumberOfSheets();
for (EntrustSampleItemVO vo:voList) {
if (index==0){
index++;
firstVO = vo;
continue;
}
XSSFSheet sheet = xssfWorkbook.cloneSheet(0);
index++;
}
int nextSample = sheetNum;
boolean start = true;
for (EntrustSampleItemVO vo:voList) {
if (start){
start = false;
continue;
}
XSSFSheet sheet = xssfWorkbook.getSheetAt(nextSample);
xssfWorkbook.setSheetName(nextSample,vo.getSampleCode());
mapReplace.put("#{sampleCode}",vo.getSampleCode());
HSSFWorkbookUtil.replaceModel(mapReplace,xssfWorkbook,sheet);
nextSample++;
}
mapReplace.put("#{sampleCode}",firstVO.getSampleCode());
HSSFWorkbookUtil.replaceModel(mapReplace,xssfWorkbook,xssfSheet);
}else{
List<List<EntrustSampleItemVO>> relList= ListUtils.partition(voList,templateSampleNum);
int templateSheetMum = xssfWorkbook.getNumberOfSheets();
XSSFSheet sheetMy = xssfWorkbook.getSheetAt(0);
boolean first = true;
List<EntrustSampleItemVO> firstList = null;
for (List<EntrustSampleItemVO> expVOList:relList) {
XSSFSheet sheet=null;
if (first){
sheet = sheetMy;
firstList = expVOList;
first = false;
continue;
}else{
sheet = xssfWorkbook.cloneSheet(0,sheetMy.getSheetName()+(templateSheetMum));
}
Map<String,String> mapReplaceMy = new HashMap<>();
for (int i = 0; i < templateSampleNum; i++) {
mapReplaceMy.put("#{sampleCode"+i+"}","");
}
mapReplaceMy.put("#{client}",entrust.getClient());
int entitySize = expVOList.size();
for (int j = 0; j < entitySize; j++) {
EntrustSampleItemVO vo = expVOList.get(j);
mapReplaceMy.put("#{sampleCode"+j+"}",StringHandleUtils.getString(vo.getSampleCode()));
}
HSSFWorkbookUtil.replaceModel(mapReplaceMy,xssfWorkbook,sheet);
templateSheetMum++;
}
int firstSize = firstList.size();
Map<String,String> mapReplaceMy = new HashMap<>();
for (int i = 0; i < templateSampleNum; i++) {
mapReplaceMy.put("#{sampleCode"+i+"}","");
}
mapReplaceMy.put("#{client}",entrust.getClient());
for (int j = 0; j < firstSize; j++) {
EntrustSampleItemVO vo = firstList.get(j);
mapReplaceMy.put("#{sampleCode"+j+"}",StringHandleUtils.getString(vo.getSampleCode()));
}
HSSFWorkbookUtil.replaceModel(mapReplaceMy,xssfWorkbook,sheetMy);
}
}
FileOutputStream os = null;
File file = null;
String generated="原始记录";
try {
file = File.createTempFile(generated, ".xlsx");
os = new FileOutputStream(file);
xssfWorkbook.write(os);
os.flush();
objectKey= originalRecordService.uploadExpGenerate(ids,template,entrust, account, "原始记录生成", file);
logger.error("----------------------17");
} catch (Exception e) {
logger.error("Exception 报错"+e.getMessage());
e.printStackTrace();
} finally {
try {
os.close();
xssfWorkbook.close();
io.close();
FileUtils.deleteFiles(file);
} catch (Exception e) {
e.printStackTrace();
}
}
logger.error("----------------------20");
return objectKey;
}
private List<EntrustSampleItemVO> listVOByIds(Long[] ids) {
return baseMapper.selectVOListByIds(ids);
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustServiceImpl.java
......@@ -536,9 +536,31 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
}
@Override
public Page<EntrustVO> pageEntrustByReportNotHis(Page<EntrustVO> page, EntrustVO entrust) {
RestAssert.fail(null == entrust.getReportNotStatus(),"报告状态不能为空");
List<EntrustReport> reportList = entrustReportService.list(Condition.create().ne("status",entrust.getReportNotStatus()));
if (CollectionUtils.isEmpty(reportList)){
return page;
}
List<Long> ids = reportList.stream().map(s->{
return s.getEntrustId();
}).collect(Collectors.toList());
if (CollectionUtils.isEmpty(ids)){
return page;
}
entrust.setIdsList(ids);
return page.setRecords(baseMapper.selectVOList(page,entrust));
}
@Override
public Page<EntrustVO> pageEntrustByReportHis(Page<EntrustVO> page, EntrustVO entrust) {
RestAssert.fail(null == entrust.getReportStatus(),"报告状态不能为空");
RestAssert.fail(CollectionUtils.isEmpty(entrust.getReportStatusList()),"报告状态不能为空");
List<EntrustReport> reportList = entrustReportService.list(Condition.create().in("status",entrust.getReportStatusList()));
if (CollectionUtils.isEmpty(reportList)){
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/ItemRelOriginalRecordServiceImpl.java 0 → 100644
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.patzn.cloud.service.hmhj.entity.ItemRelOriginalRecord;
import com.patzn.cloud.service.lims.hmhj.mapper.ItemRelOriginalRecordMapper;
import com.patzn.cloud.service.lims.hmhj.service.IItemRelOriginalRecordService;
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-03-15
*/
@Service
public class ItemRelOriginalRecordServiceImpl extends BaseServiceImpl<ItemRelOriginalRecordMapper, ItemRelOriginalRecord> implements IItemRelOriginalRecordService {
@Override
public Page<ItemRelOriginalRecord> page(Page<ItemRelOriginalRecord> page, ItemRelOriginalRecord itemRelOriginalRecord) {
Wrapper wrapper = new EntityWrapper<>(itemRelOriginalRecord);
return this.page(page, wrapper);
}
@Override
public boolean removeByIds(List<Long> ids) {
return baseMapper.deleteBatchIds(ids) > 0;
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/OriginalRecordServiceImpl.java 0 → 100644
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.baomidou.mybatisplus.toolkit.CollectionUtils;
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.*;
import com.patzn.cloud.service.lims.hmhj.mapper.OriginalRecordMapper;
import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleItemService;
import com.patzn.cloud.service.lims.hmhj.service.IItemRelOriginalRecordService;
import com.patzn.cloud.service.lims.hmhj.service.IOriginalRecordService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import org.apache.commons.lang3.ArrayUtils;
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.io.File;
import java.util.ArrayList;
import java.util.List;
/**
* 土工原始记录表 服务实现类
*
* @author wwd
* @since 2021-03-15
*/
@Service
public class OriginalRecordServiceImpl extends BaseServiceImpl<OriginalRecordMapper, OriginalRecord> implements IOriginalRecordService {
@Autowired
private IItemRelOriginalRecordService itemRelOriginalRecordService;
@Autowired
private OssClient ossClient;
@Override
public Page<OriginalRecord> page(Page<OriginalRecord> page, OriginalRecord originalRecord) {
Wrapper wrapper = new EntityWrapper<>(originalRecord);
return this.page(page, wrapper);
}
@Override
public boolean removeByIds(List<Long> ids) {
return baseMapper.deleteBatchIds(ids) > 0;
}
@Transactional(rollbackFor = Exception.class)
@Override
public OriginalRecord uploadExpGenerate(Long[] ids, OriginalTemplate template, Entrust entrust, Account account, String remark, File file) {
RestAssert.fail(ArrayUtils.isEmpty(ids), "请选择试验项目");
RestAssert.fail(null == entrust.getId(), "试验委托单ID不能为空");
OriginalRecord soilOriginalRecord = new OriginalRecord();
soilOriginalRecord.setEntrustId(entrust.getId());
soilOriginalRecord.setTemplateId(template.getId());
soilOriginalRecord.setTitle(template.getName());
soilOriginalRecord.setRemark(remark);
soilOriginalRecord.setUname(account.getUserName());
OssFileResult obsFileResult = ossClient.upload(file);
if (null == obsFileResult) {
return null;
}
soilOriginalRecord.setObjectKey(obsFileResult.getObjectKey());
if (save(soilOriginalRecord)){
List<ItemRelOriginalRecord> saveList = new ArrayList<>();
for (Long id:ids) {
ItemRelOriginalRecord relOriginalRecord = new ItemRelOriginalRecord();
relOriginalRecord.setItemId(id);
relOriginalRecord.setRecordId(soilOriginalRecord.getId());
saveList.add(relOriginalRecord);
}
if (CollectionUtils.isNotEmpty(saveList)){
itemRelOriginalRecordService.saveBatch(saveList);
}
}
return soilOriginalRecord;
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/OriginalTemplateConfigServiceImpl.java 0 → 100644
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.patzn.cloud.service.hmhj.entity.OriginalTemplateConfig;
import com.patzn.cloud.service.lims.hmhj.mapper.OriginalTemplateConfigMapper;
import com.patzn.cloud.service.lims.hmhj.service.IOriginalTemplateConfigService;
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-03-15
*/
@Service
public class OriginalTemplateConfigServiceImpl extends BaseServiceImpl<OriginalTemplateConfigMapper, OriginalTemplateConfig> implements IOriginalTemplateConfigService {
@Override
public Page<OriginalTemplateConfig> page(Page<OriginalTemplateConfig> page, OriginalTemplateConfig originalTemplateConfig) {
Wrapper wrapper = new EntityWrapper<>(originalTemplateConfig);
return this.page(page, wrapper);
}
@Override
public boolean removeByIds(List<Long> ids) {
return baseMapper.deleteBatchIds(ids) > 0;
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/OriginalTemplateServiceImpl.java 0 → 100644
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.oss.starter.OssClient;
import com.patzn.cloud.oss.starter.OssFileResult;
import com.patzn.cloud.service.hmhj.entity.OriginalTemplate;
import com.patzn.cloud.service.lims.hmhj.mapper.OriginalTemplateMapper;
import com.patzn.cloud.service.lims.hmhj.service.IOriginalTemplateService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.soil.entity.SoilOriginalTemplate;
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 java.util.List;
/**
* 模板文件表 服务实现类
*
* @author wwd
* @since 2021-03-15
*/
@Service
public class OriginalTemplateServiceImpl extends BaseServiceImpl<OriginalTemplateMapper, OriginalTemplate> implements IOriginalTemplateService {
@Autowired
private OssClient ossClient;
@Override
public Page<OriginalTemplate> page(Page<OriginalTemplate> page, OriginalTemplate originalTemplate) {
Wrapper wrapper = new EntityWrapper<>(originalTemplate);
return this.page(page, wrapper);
}
@Override
public boolean removeByIds(List<Long> ids) {
return baseMapper.deleteBatchIds(ids) > 0;
}
@Override
public boolean uploadTemplate(MultipartFile file, String classType, String name, String remark, int templateType) {
RestAssert.fail(StringUtils.isBlank(classType),"模板类别不能为空");
RestAssert.fail(StringUtils.isBlank(name),"请填写原始记录名称");
String fileName = file.getOriginalFilename();
RestAssert.fail(StringUtils.isBlank(fileName), "请上传文件");
OriginalTemplate attachment = new OriginalTemplate();
OssFileResult result = ossClient.upload(file);
if (null == result) {
return false;
}
attachment.setAlias(name);
attachment.setRemark(remark);
attachment.setClassType(classType);
attachment.setBucketName(result.getBucketName());
attachment.setType(result.getType());
attachment.setName(result.getName());
attachment.setObjectKey(result.getObjectKey());
attachment.setVersionId(result.getVersionId());
attachment.setTemplateType(templateType);
return save(attachment);
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/OriginalTemplateVersionServiceImpl.java 0 → 100644
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.patzn.cloud.service.hmhj.entity.OriginalTemplateVersion;
import com.patzn.cloud.service.lims.hmhj.mapper.OriginalTemplateVersionMapper;
import com.patzn.cloud.service.lims.hmhj.service.IOriginalTemplateVersionService;
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-03-15
*/
@Service
public class OriginalTemplateVersionServiceImpl extends BaseServiceImpl<OriginalTemplateVersionMapper, OriginalTemplateVersion> implements IOriginalTemplateVersionService {
@Override
public Page<OriginalTemplateVersion> page(Page<OriginalTemplateVersion> page, OriginalTemplateVersion originalTemplateVersion) {
Wrapper wrapper = new EntityWrapper<>(originalTemplateVersion);
return this.page(page, wrapper);
}
@Override
public boolean removeByIds(List<Long> ids) {
return baseMapper.deleteBatchIds(ids) > 0;
}
}
src/main/resources/mapper/hmhj/EntrustSampleItemMapper.xml
......@@ -155,5 +155,21 @@
</select>
<select id="selectVOListByIds" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
SELECT i.id,i.name,i.entrust_sample_id,s.entrust_id,i.agreed_value,i.test_value,i.standard,s.code AS "sampleCode"
FROM
entrust_sample_item i
JOIN entrust_sample s ON i.entrust_sample_id = s.ID
WHERE i.deleted = 0 AND s.deleted = 0
AND i.id IN
<foreach collection="ids" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
ORDER BY s.code , i.name
</select>
</mapper>
src/main/resources/mapper/hmhj/ItemRelOriginalRecordMapper.xml 0 → 100644
<?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.ItemRelOriginalRecordMapper">
</mapper>
src/main/resources/mapper/hmhj/OriginalRecordMapper.xml 0 → 100644
<?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.OriginalRecordMapper">
</mapper>
src/main/resources/mapper/hmhj/OriginalTemplateConfigMapper.xml 0 → 100644
<?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.OriginalTemplateConfigMapper">
</mapper>
src/main/resources/mapper/hmhj/OriginalTemplateMapper.xml 0 → 100644
<?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.OriginalTemplateMapper">
</mapper>
src/main/resources/mapper/hmhj/OriginalTemplateVersionMapper.xml 0 → 100644
<?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.OriginalTemplateVersionMapper">
</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