Commit a36406ed authored by 竹天卫's avatar 竹天卫

检测方法 改成检测标准管理

配置管理模块增加处理项管理,检测项组管理
parent 350d3e9f
......@@ -138,6 +138,17 @@ public class EntrustController {
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "样品处理详情")
@GetMapping("getHandleDtail/{id}")
public BaseResponse getHandleDtail(@PathVariable Integer id){
try {
return entrustService.getHandleDtail(id);
}catch (Exception e){
log.debug("样品处理详情{}",e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "完成样品处理任务")
@PostMapping("/finishHandle")
public BaseResponse finishHandle(Integer id) {
......
package cn.wise.sc.cement.business.controller;
import cn.wise.sc.cement.business.entity.Handle;
import cn.wise.sc.cement.business.entity.Method;
import cn.wise.sc.cement.business.entity.TeamGroup;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.MethodQuery;
import cn.wise.sc.cement.business.service.IHandleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* <p>
* 前端控制器
* </p>
*
* @author ztw
* @since 2020-09-10
*/
@Api(tags = "配置管理-处理项配置")
@RestController
@RequestMapping("/business/handle")
public class HandleController {
private static final Logger log = LoggerFactory.getLogger("HandleController");
@Autowired
private IHandleService handleService;
@ApiOperation(value = "处理项分页列表")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "name", value = "标准名称", paramType = "query", dataType = "String")
})
@GetMapping("/getPage")
public BaseResponse getPage(PageQuery pageQuery, String name) {
try {
return handleService.getPage(pageQuery, name);
} catch (Exception e) {
log.debug("处理项分页列表{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "处理项详情")
@GetMapping("/{id}")
public BaseResponse getById(@PathVariable Integer id){
try {
Handle e = handleService.getById(id);
if(e == null){
return BaseResponse.errorMsg("信息错误!");
}
return BaseResponse.okData(e);
}catch (Exception e){
log.debug("处理项详情{}",e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "处理项列表")
@GetMapping("/getList")
public BaseResponse getList() {
try {
List<Handle> list = handleService.list();
return BaseResponse.okData(list);
} catch (Exception e) {
log.debug("处理项列表{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "新增处理项")
@PostMapping("/create")
@Transactional
public BaseResponse create(@RequestBody Handle query){
try {
return handleService.create(query);
}catch (Exception e){
log.debug("新增处理项{}",e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "更新处理项")
@PostMapping("/update")
@Transactional
public BaseResponse update(@RequestBody Handle query){
try {
return handleService.update(query);
}catch (Exception e){
log.debug("更新处理项{}",e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "删除处理项")
@PostMapping("/delete/{id}")
public BaseResponse delete(@PathVariable Integer id){
try {
handleService.removeById(id);
return BaseResponse.okData("删除成功");
}catch (Exception e){
log.debug("删除处理项{}",e);
}
return BaseResponse.errorMsg("失败!");
}
}
......@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletResponse;
* @author ztw
* @since 2020-08-18
*/
@Api(tags = "配置管理-检测方法配置")
@Api(tags = "配置管理-检测标准配置")
@RestController
@RequestMapping("/business/method")
public class MethodController {
......@@ -38,7 +38,7 @@ public class MethodController {
@Autowired
private IMethodService methodService;
@ApiOperation(value = "检测方法分页列表")
@ApiOperation(value = "检测标准分页列表")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "name", value = "标准名称", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "standard", value = "标准号", paramType = "query", dataType = "String")
......@@ -48,23 +48,23 @@ public class MethodController {
try {
return methodService.getPage(pageQuery, name, standard);
} catch (Exception e) {
log.debug("检测方法分页列表{}", e);
log.debug("检测标准分页列表{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation("检测方法导出")
@ApiOperation("检测标准导出")
@PostMapping("/export")
public void export(String name, String standard, String fileName, HttpServletResponse response) {
try {
methodService.export(name, standard, fileName, response);
} catch (Exception e) {
log.debug("检测方法导出{}", e);
log.debug("检测标准导出{}", e);
}
}
@ApiOperation(value = "检测方法详情")
@ApiOperation(value = "检测标准详情")
@GetMapping("/{id}")
public BaseResponse getById(@PathVariable Integer id){
try {
......@@ -74,53 +74,53 @@ public class MethodController {
}
return BaseResponse.okData(e);
}catch (Exception e){
log.debug("检测方法详情{}",e);
log.debug("检测标准详情{}",e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "检测方法列表")
@ApiOperation(value = "检测标准列表")
@GetMapping("/getList")
public BaseResponse getList() {
try {
return methodService.getList();
} catch (Exception e) {
log.debug("检测方法列表{}", e);
log.debug("检测标准列表{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "新增检测方法")
@ApiOperation(value = "新增检测标准")
@PostMapping("/create")
@Transactional
public BaseResponse create(@RequestBody MethodQuery query){
try {
return methodService.create(query);
}catch (Exception e){
log.debug("新增检测方法{}",e);
log.debug("新增检测标准{}",e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "更新检测方法")
@ApiOperation(value = "更新检测标准")
@PostMapping("/update")
@Transactional
public BaseResponse update(@RequestBody MethodQuery query){
try {
return methodService.update(query);
}catch (Exception e){
log.debug("更新检测方法{}",e);
log.debug("更新检测标准{}",e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "删除检测方法")
@ApiOperation(value = "删除检测标准")
@PostMapping("/delete/{id}")
public BaseResponse delete(@PathVariable Integer id){
try {
return methodService.delete(id);
}catch (Exception e){
log.debug("删除检测方法{}",e);
log.debug("删除检测标准{}",e);
}
return BaseResponse.errorMsg("失败!");
}
......
......@@ -25,7 +25,7 @@ import java.util.List;
* @author ztw
* @since 2020-09-10
*/
@Api(tags="资源管理-检测项组管理")
@Api(tags="配置管理-检测项组管理")
@RestController
@RequestMapping("/business/team-group")
public class TeamGroupController {
......
package cn.wise.sc.cement.business.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
*
* </p>
*
* @author ztw
* @since 2020-09-10
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class Handle implements Serializable {
private static final long serialVersionUID=1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 样品处理项名称
*/
private String name;
/**
* 创建时间
*/
private LocalDateTime createTime;
/**
* 备注
*/
private String remark;
}
......@@ -39,10 +39,10 @@ public class Team extends BaseEntity implements Serializable {
@ApiModelProperty("检测项目")
private String name;
@ApiModelProperty("元素分组id")
@ApiModelProperty("检测项组id")
private Integer groupId;
@ApiModelProperty("元素分组名称")
@ApiModelProperty("检测项组名称")
private String groupName;
@ApiModelProperty("检测依据")
......
package cn.wise.sc.cement.business.mapper;
import cn.wise.sc.cement.business.entity.Handle;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author ztw
* @since 2020-09-10
*/
public interface HandleMapper extends BaseMapper<Handle> {
}
......@@ -23,5 +23,6 @@ public interface SampleHandleMapper extends BaseMapper<SampleHandle> {
IPage<SampleHandleVo> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
SampleHandleVo getDetail(Integer id);
}
<?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="cn.wise.sc.cement.business.mapper.HandleMapper">
</mapper>
......@@ -39,6 +39,19 @@
</select>
<select id="getDetail" resultType="cn.wise.sc.cement.business.model.vo.SampleHandleVo">
select t.*, su.name as userName, s.name as sampleName, s.sample_code as sampleCode,
s.cement_code as cementCode, p.id as projectId, p.name as projectName, p.code as projectCode
from sample_handle t
left join sys_user su on su.id = t.user_id
left join sample s on s.id = t.sample_id
left join entrust e on e.id = s.entrust_id
left join project p on p.id = e.project_id
where t.id = #{id}
</select>
</mapper>
......@@ -16,8 +16,7 @@
</sql>
<select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.TeamVo">
SELECT t.*,
t.group_name as groupName
SELECT t.*
FROM team t
<include refid="where" />
ORDER BY t.id DESC
......
......@@ -19,10 +19,10 @@ public class TeamQuery {
@ApiModelProperty("检测项目")
private String name;
@ApiModelProperty("元素分组id")
@ApiModelProperty("检测项组id")
private Integer groupId;
@ApiModelProperty("元素分组名称")
@ApiModelProperty("检测项组名称")
private String groupName;
@ApiModelProperty("检测依据")
......
......@@ -36,7 +36,7 @@ public class SampleHandleVo {
@ApiModelProperty("样品名称")
private String sampleName;
@ApiModelProperty("private String 来样编号(样品编号)")
@ApiModelProperty("来样编号")
private String sampleCode;
@ApiModelProperty("本所编号")
......
......@@ -23,9 +23,12 @@ public class TeamVo{
@ApiModelProperty("检测项目")
private String name;
@ApiModelProperty("元素分组id")
@ApiModelProperty("检测项组id")
private Integer groupId;
@ApiModelProperty("检测项组名称")
private String groupName;
@ApiModelProperty("检测依据")
private String basis;
......@@ -41,6 +44,5 @@ public class TeamVo{
@ApiModelProperty("状态 0:禁用 1:激活")
private String status;
@ApiModelProperty("分组名称")
private String groupName;
}
......@@ -35,6 +35,9 @@ public interface IEntrustService extends IService<Entrust> {
BaseResponse<IPage<SampleHandleVo>> getSampleHandlePage(PageQuery pageQuery, String startDate, String endDate, Integer status,
Integer clientId, String projectName);
BaseResponse<String> acceptHandle(Integer id);
BaseResponse<SampleHandleVo> getHandleDtail(Integer id);
BaseResponse<String> finishHandle(Integer id);
BaseResponse<String> distribution(DistributionQuery query);
......
package cn.wise.sc.cement.business.service;
import cn.wise.sc.cement.business.entity.Handle;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author ztw
* @since 2020-09-10
*/
public interface IHandleService extends IService<Handle> {
BaseResponse<IPage<Handle>> getPage(PageQuery pageQuery, String name);
BaseResponse<Handle> create(Handle query);
BaseResponse<Handle> update(Handle query);
}
......@@ -49,7 +49,10 @@ public class CommonServiceImpl {
public String createParallelCode(String cementCode){
String[] cementCodes = cementCode.split("-");
Integer counts = Integer.parseInt(cementCodes[1])+1;
String tailNo = counts<10?("00"+counts):counts<100?("0"+counts):String.valueOf(counts);
String tailNo = counts<10?("000"+counts):
counts<100?("00"+counts):
counts<1000?("000"+counts):
String.valueOf(counts);
String resultCode = cementCodes[0]+"-"+tailNo;
return resultCode;
}
......
......@@ -279,15 +279,15 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
maxCementCode = obj.toString();
}
//校验获取的最大本所编号
SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
SimpleDateFormat sdf = new SimpleDateFormat("yy");
Date date = new Date();
String yesrString = sdf.format(date);
if(maxCementCode == null){ //如果数据库没有本所编号,初始化本所编号
maxCementCode = yesrString +"-000";
maxCementCode = yesrString +"-0000";
}else{
String yearStr = commonService.getIntegerYear(maxCementCode);
if(!yearStr.equals(yesrString)){ //如果数据库本所编号年份和当前不一样,初始化本所编号
maxCementCode = yesrString +"-000";
maxCementCode = yesrString +"-0000";
}
}
redisUtil.setString("maxCementCode", maxCementCode);
......@@ -486,6 +486,19 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
return BaseResponse.okMsg("已接受样品处理任务");
}
/**
* 样品处理详情
* @param id
* @return
*/
@Override
public BaseResponse<SampleHandleVo> getHandleDtail(Integer id){
SampleHandleVo sampleHandleVo = sampleHandleMapper.getDetail(id);
return BaseResponse.okData(sampleHandleVo);
}
/**
* 完成样品处理任务
* @param id
......
package cn.wise.sc.cement.business.service.impl;
import cn.wise.sc.cement.business.entity.Handle;
import cn.wise.sc.cement.business.entity.TeamGroup;
import cn.wise.sc.cement.business.mapper.HandleMapper;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.service.IHandleService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.time.LocalDateTime;
/**
* <p>
* 服务实现类
* </p>
*
* @author ztw
* @since 2020-09-10
*/
@Service
public class HandleServiceImpl extends ServiceImpl<HandleMapper, Handle> implements IHandleService {
@Resource
private HandleMapper handleMapper;
/**
* 获取分页
* @param pageQuery
* @return
*/
@Override
public BaseResponse<IPage<Handle>> getPage(PageQuery pageQuery, String name) {
QueryWrapper<Handle> qw = new QueryWrapper<>();
if(StringUtils.isNotEmpty(name)){
qw.like("name", name);
}
qw.orderByDesc("create_time");
IPage<Handle> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
page = handleMapper.selectPage(page, qw);
return BaseResponse.okData(page);
}
/**
* 新增处理项
* @param query
* @return
*/
@Override
@Transactional
public BaseResponse<Handle> create(Handle query) {
if (StringUtils.isEmpty(query.getName())) {
return BaseResponse.errorMsg("处理项名称不能为空!");
}
QueryWrapper<Handle> qw = new QueryWrapper<>();
qw.eq("name", query.getName());
int count = handleMapper.selectCount(qw);
if (count > 0) {
return BaseResponse.errorMsg(query.getName() + "已存在");
}
query.setCreateTime(LocalDateTime.now());
handleMapper.insert(query);
return BaseResponse.okData(query);
}
/**
* 修改处理项
* @param query
* @return
*/
@Override
@Transactional
public BaseResponse<Handle> update(Handle query) {
if (StringUtils.isEmpty(query.getName())) {
return BaseResponse.errorMsg("处理项名称不能为空!");
}
QueryWrapper<Handle> qw = new QueryWrapper<>();
qw.eq("name", query.getName());
qw.ne("id", query.getId());
int count = handleMapper.selectCount(qw);
if (count > 0) {
return BaseResponse.errorMsg(query.getName() + "已存在");
}
handleMapper.updateById(query);
return BaseResponse.okData(query);
}
}
......@@ -71,7 +71,7 @@ public class MethodServiceImpl extends ServiceImpl<MethodMapper, Method> impleme
qw.eq("name", query.getName());
int count = methodMapper.selectCount(qw);
if(count>0){
return BaseResponse.errorMsg("检测方法名称已存在!");
return BaseResponse.errorMsg("检测标准名称已存在!");
}
Method crate = new Method();
BeanUtils.copyProperties(query, crate);
......@@ -119,7 +119,7 @@ public class MethodServiceImpl extends ServiceImpl<MethodMapper, Method> impleme
datas.add(objects);
}
ExcelUtil.excelExport(
fileName == null || fileName.trim().length() <= 0 ? "检测方法": fileName, headers,
fileName == null || fileName.trim().length() <= 0 ? "检测标准": fileName, headers,
datas, response);
}
}
......@@ -128,7 +128,7 @@ public class MethodServiceImpl extends ServiceImpl<MethodMapper, Method> impleme
public BaseResponse delete(Integer id) {
Method method = methodMapper.selectById(id);
if(method == null){
return BaseResponse.errorMsg("检测方法不存在");
return BaseResponse.errorMsg("检测标准不存在");
}
methodMapper.deleteById(id);
return BaseResponse.okData("删除成功");
......
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