Skip to content

T
tianjin-cement
Commit 9e9aae89 authored by zhutianwei@hyzcservice.com's avatar zhutianwei@hyzcservice.com
Browse files
Options

委托管理后台接口已完成

parent 1fbe4ad2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4900 additions and 516 deletions
cement-business/pom.xml
View file @ 9e9aae89
...@@ -114,7 +114,17 @@ ...@@ -114,7 +114,17 @@
<artifactId>poi</artifactId> <artifactId>poi</artifactId>
<version>3.17</version> <version>3.17</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/net.oschina.zcx7878/fastdfs-client-java -->
<dependency>
<groupId>net.oschina.zcx7878</groupId>
<artifactId>fastdfs-client-java</artifactId>
<version>1.27.0.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.6</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
cement-business/src/main/java/cn/wise/sc/cement/business/controller/EntityEnclosureController.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.controller;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.LoginUser;
import cn.wise.sc.cement.business.service.ISysUserService;
import cn.wise.sc.cement.business.util.dfs.FastDFSUtils;
import cn.wise.sc.cement.business.util.dfs.FileTypeUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 附件管理Controller
* @author ztw
*/
@Api(tags = "附件管理")
@RestController
@RequestMapping("/enclosure")
public class EntityEnclosureController {
private static final Logger logger = LoggerFactory.getLogger("adminLogger");
@Autowired
protected HttpServletResponse response;
@Autowired
protected HttpServletRequest request;
@Autowired
private ISysUserService userService;
@ApiOperation(value = "单个文件上传")
@PostMapping("/fileUpLoad")
public BaseResponse fileUpLoad(MultipartFile file){
Map<String,Object> map = new HashMap<>();
String filePath = null;
String fileName = null;
String extName = null;
try {
LoginUser loginUser = userService.getLoginUser();
if(loginUser != null){
filePath = FastDFSUtils.uploadPic(file.getBytes(),file.getOriginalFilename(),file.getSize());
fileName = file.getOriginalFilename().substring(0,file.getOriginalFilename().lastIndexOf("."));
extName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
}else {
return BaseResponse.errorMsg("该账号已在其他地方登陆");
}
String picUrl = filePath;
map.put("fileUrl",picUrl);
map.put("fileName",fileName);
map.put("extName",extName);
return BaseResponse.okData(map);
}catch (Exception e){
logger.error(e.toString());
}
return BaseResponse.errorMsg("失败");
}
@ApiOperation(value = "单个图片上传")
@PostMapping("/imgUpLoad")
public BaseResponse imgUpLoad(MultipartFile file){
Map<String,Object> map = new HashMap<>();
String filePath = null;
String fileName = null;
String extName = null;
try {
LoginUser loginUser = userService.getLoginUser();
if(loginUser != null){
if(!FileTypeUtil.isImageByExtension(file.getOriginalFilename())){
return BaseResponse.errorMsg("请上传有效图片");
}
filePath = FastDFSUtils.uploadPic(file.getBytes(),file.getOriginalFilename(),file.getSize());
fileName = file.getOriginalFilename().substring(0,file.getOriginalFilename().lastIndexOf("."));
extName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
}else {
return BaseResponse.errorMsg("该账号已在其他地方登陆");
}
String picUrl = filePath;
map.put("fileUrl",picUrl);
map.put("fileName",fileName);
map.put("extName",extName);
return BaseResponse.okData(map);
}catch (Exception e){
logger.error(e.toString());
}
return BaseResponse.errorMsg("失败");
}
@ApiOperation(value = "多个文件上传")
@PostMapping("/filesUpLoad")
public BaseResponse filesUpLoad(HttpServletRequest request){
Map<String,Object> map = new HashMap<>();
List<MultipartFile> files = null;
String filePath = null;
String fileName = null;
String extName = null;
List<Map<String,Object>> filePathList = null;
try {
filePathList = new ArrayList<>();
files = ((MultipartHttpServletRequest)request).getFiles("files");
LoginUser loginUser = userService.getLoginUser();
if(loginUser != null){
if(files != null && files.size() > 0) {
for (MultipartFile file : files) {
Map<String,Object> mapSub = new HashMap<>();
filePath = FastDFSUtils.uploadPic(file.getBytes(), file.getOriginalFilename(), file.getSize());
fileName = file.getOriginalFilename().substring(0,file.getOriginalFilename().lastIndexOf("."));
extName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
String picUrl = filePath;
mapSub.put("fileUrl",picUrl);
mapSub.put("fileName",fileName);
mapSub.put("extName",extName);
filePathList.add(mapSub);
}
}else {
return BaseResponse.errorMsg("没有文件");
}
}else {
return BaseResponse.errorMsg("该账号已在其他地方登陆");
}
return BaseResponse.okData(map);
}catch (Exception e){
logger.error(e.toString());
}
return BaseResponse.errorMsg("失败");
}
@ApiOperation(value = "单个文件下载")
@PostMapping("/fileDownload")
public BaseResponse fileDownload(String fileUrl,String fileName,String extName){
OutputStream out = null;
try {
response.setHeader("Content-Disposition", "attachment;filename="+fileName+extName);
response.setContentType("application/force-download");
out = response.getOutputStream();
LoginUser loginUser = userService.getLoginUser();
if(loginUser != null){
fileUrl = fileUrl.substring(fileUrl.indexOf("g"));
byte[] by = FastDFSUtils.fileDownload(fileUrl);
out.write(by);
out.close();
}else {
return BaseResponse.errorMsg("该账号已在其他地方登陆");
}
return BaseResponse.okMsg("成功");
}catch (Exception e){
logger.error(e.toString());
}
return BaseResponse.errorMsg("失败");
}
@ApiOperation(value = "app扫描二维码下载")
@GetMapping("/appDownload")
public BaseResponse appDownload(String fileUrl){
Map<String,Object> map = new HashMap<>();
OutputStream out = null;
try {
response.setHeader("Content-Disposition", "attachment;filename=app-release.apk");
response.setContentType("application/force-download");
out = response.getOutputStream();
fileUrl = fileUrl.substring(fileUrl.indexOf("g"));
byte[] by = FastDFSUtils.fileDownload(fileUrl);
out.write(by);
out.close();
return BaseResponse.okMsg("成功");
}catch (Exception e){
logger.error(e.toString());
}
return BaseResponse.errorMsg("失败");
}
@ApiOperation(value = "删除相关文件")
@PostMapping("/fileDeleted")
public BaseResponse fileDeleted(String[] filePaths){
Map<String,Object> map = new HashMap<>();
String filePath = null;
boolean rel = false;
try {
LoginUser loginUser = userService.getLoginUser();
if(loginUser != null){
for(String url : filePaths){
/*filePath = url.substring(0,url.indexOf("g"));*/
rel = FastDFSUtils.deletePic(url);
if(!rel){
return BaseResponse.errorMsg("删除失败");
}
}
}else {
return BaseResponse.errorMsg("该账号已在其他地方登陆");
}
return BaseResponse.okMsg("成功");
}catch (Exception e){
logger.error(e.toString());
}
return BaseResponse.errorMsg("失败");
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/controller/EntrustController.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.controller;
import cn.wise.sc.cement.business.entity.Project;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.*;
import cn.wise.sc.cement.business.model.vo.EntrustVo;
import cn.wise.sc.cement.business.service.IEntrustService;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.web.bind.annotation.*;
/**
* <p>
* 前端控制器
* </p>
*
* @author ztw
* @since 2020-08-24
*/
@Api(tags="委托管理")
@RestController
@RequestMapping("/business/entrust")
public class EntrustController {
private static final Logger log = LoggerFactory.getLogger("EntrustController");
@Autowired
private IEntrustService entrustService;
@ApiOperation(value = "委托分页列表")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "startDate", value = "开始日期", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "endDate", value = "结束日期", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "status", value = "状态(0未审批，1未通过，2已通过，3样品处理，4派发)", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "clientId", value = "委托单位id", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "projectName", value = "项目名称", paramType = "query", dataType = "String")
})
@GetMapping("/getPage")
public BaseResponse getPage(PageQuery pageQuery, String startDate, String endDate, Integer status, Integer clientId, String projectName) {
try {
return entrustService.getPage(pageQuery, startDate, endDate, status, clientId, projectName);
} catch (Exception e) {
log.debug("委托分页列表{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "新增委托")
@PostMapping("/create")
public BaseResponse create(@RequestBody EntrustQuery query) {
try {
return entrustService.create(query);
}catch (Exception e) {
log.debug("新增委托{}",e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "委托详情")
@GetMapping("/{id}")
public BaseResponse getDtail(@PathVariable Integer id){
try {
return entrustService.getDtail(id);
}catch (Exception e){
log.debug("委托详情{}",e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "委托评审")
@PostMapping("/approval")
public BaseResponse approval(@RequestBody ApprovalQuery query) {
try {
return entrustService.approval(query);
}catch (Exception e) {
log.debug("委托评审{}",e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "发送样品处理任务")
@PostMapping("/handle")
public BaseResponse handle(@RequestBody HandleQuery query) {
try {
return entrustService.handle(query);
}catch (Exception e) {
log.debug("发送样品处理任务{}",e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "样品处理分页列表")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "startDate", value = "开始日期", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "endDate", value = "结束日期", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "status", value = "状态(0未审批，1未通过，2已通过，3样品处理，4派发)", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "clientId", value = "委托单位id", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "projectName", value = "项目名称", paramType = "query", dataType = "String")
})
@GetMapping("/getSampleHandlePage")
public BaseResponse getSampleHandlePage(PageQuery pageQuery, String startDate, String endDate, Integer status, Integer clientId, String projectName) {
try {
return entrustService.getSampleHandlePage(pageQuery, startDate, endDate, status, clientId, projectName);
} catch (Exception e) {
log.debug("样品处理分页列表{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "接受样品处理任务")
@PostMapping("/acceptHandle")
public BaseResponse acceptHandle(Integer id) {
try {
return entrustService.acceptHandle(id);
}catch (Exception e) {
log.debug("接受样品处理任务{}",e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "完成样品处理任务")
@PostMapping("/finishHandle")
public BaseResponse finishHandle(Integer id) {
try {
return entrustService.finishHandle(id);
}catch (Exception e) {
log.debug("完成样品处理任务{}",e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "派发检测项目任务")
@PostMapping("/distribution")
public BaseResponse distribution(@RequestBody DistributionQuery query) {
try {
return entrustService.distribution(query);
}catch (Exception e) {
log.debug("派发检测项目任务{}",e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "派发分页列表")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "startDate", value = "开始日期", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "endDate", value = "结束日期", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "status", value = "状态(0未审批，1未通过，2已通过，3样品处理，4派发)", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "clientId", value = "委托单位id", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "projectName", value = "项目名称", paramType = "query", dataType = "String")
})
@GetMapping("/getSampleDistributionPage")
public BaseResponse getSampleDistributionPage(PageQuery pageQuery, String startDate, String endDate, Integer status, Integer clientId, String projectName) {
try {
return entrustService.getSampleDistributionPage(pageQuery, startDate, endDate, status, clientId, projectName);
} catch (Exception e) {
log.debug("派发分页列表{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "接受检测项目任务")
@PostMapping("/acceptDistribution")
public BaseResponse acceptDistribution(Integer id) {
try {
return entrustService.acceptDistribution(id);
}catch (Exception e) {
log.debug("接受检测项目任务{}",e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "完成检测项目任务")
@PostMapping("/finishDistribution")
public BaseResponse finishDistribution(Integer id) {
try {
return entrustService.finishDistribution(id);
}catch (Exception e) {
log.debug("完成检测项目任务{}",e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "数据校核")
@PostMapping("/check")
public BaseResponse check(CheckQuery query) {
try {
return entrustService.check(query);
}catch (Exception e) {
log.debug("数据校核{}",e);
}
return BaseResponse.errorMsg("失败!");
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/controller/MethodController.java
View file @ 9e9aae89
...@@ -79,13 +79,13 @@ public class MethodController { ...@@ -79,13 +79,13 @@ public class MethodController {
return BaseResponse.errorMsg("失败!"); return BaseResponse.errorMsg("失败!");
} }
@ApiOperation(value = "获取所有检测方法信息") @ApiOperation(value = "检测方法列表")
@GetMapping("/getList") @GetMapping("/getList")
public BaseResponse getList() { public BaseResponse getList() {
try { try {
return methodService.getList(); return methodService.getList();
} catch (Exception e) { } catch (Exception e) {
log.debug("获取所有检测方法信息{}", e); log.debug("检测方法列表{}", e);
} }
return BaseResponse.errorMsg("失败!"); return BaseResponse.errorMsg("失败!");
} }
...@@ -120,7 +120,7 @@ public class MethodController { ...@@ -120,7 +120,7 @@ public class MethodController {
try { try {
return methodService.delete(id); return methodService.delete(id);
}catch (Exception e){ }catch (Exception e){
log.debug("更新检测方法{}",e); log.debug("删除检测方法{}",e);
} }
return BaseResponse.errorMsg("失败!"); return BaseResponse.errorMsg("失败!");
} }
......
cement-business/src/main/java/cn/wise/sc/cement/business/controller/SysGroupController.java
View file @ 9e9aae89
...@@ -3,6 +3,7 @@ package cn.wise.sc.cement.business.controller; ...@@ -3,6 +3,7 @@ package cn.wise.sc.cement.business.controller;
import cn.wise.sc.cement.business.entity.SysGroup; import cn.wise.sc.cement.business.entity.SysGroup;
import cn.wise.sc.cement.business.entity.SysRole; import cn.wise.sc.cement.business.entity.SysRole;
import cn.wise.sc.cement.business.entity.SysUser;
import cn.wise.sc.cement.business.model.BaseResponse; import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery; import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.RoleQuery; import cn.wise.sc.cement.business.model.query.RoleQuery;
...@@ -16,6 +17,8 @@ import org.slf4j.LoggerFactory; ...@@ -16,6 +17,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List;
/** /**
* <p> * <p>
* 前端控制器 * 前端控制器
...@@ -82,6 +85,29 @@ public class SysGroupController { ...@@ -82,6 +85,29 @@ public class SysGroupController {
return BaseResponse.errorMsg("失败!"); return BaseResponse.errorMsg("失败!");
} }
@ApiOperation(value = "工作组列表")
@GetMapping("/getList")
public BaseResponse getById(){
try {
List<SysGroup> list = groupService.list();
return BaseResponse.okData(list);
}catch (Exception e){
log.debug("工作组列表{}",e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "删除工作组")
@PostMapping("/delete/{id}")
public BaseResponse delete(@PathVariable Integer id){
try {
groupService.removeById(id);
return BaseResponse.okData("删除成功");
}catch (Exception e){
log.debug("更新检测方法{}",e);
}
return BaseResponse.errorMsg("失败!");
}
......
cement-business/src/main/java/cn/wise/sc/cement/business/controller/SysLogsController.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.controller;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.service.ISysLogsService;
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.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 前端控制器
* </p>
*
* @author ztw
* @since 2020-08-24
*/
@Api(tags="系统管理-日志管理")
@RestController
@RequestMapping("/business/sys-logs")
public class SysLogsController {
private static final Logger log = LoggerFactory.getLogger("SysLogsController");
@Autowired
private ISysLogsService logsService;
@ApiOperation(value = "日志分页列表")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "startDate", value = "开始日期", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "endDate", value = "结束日期", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "objType", value = "日志类型(0系统日志, 1委托管理)", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "objId", value = "对象表id", paramType = "query", dataType = "Integer")
})
@GetMapping("/getPage")
public BaseResponse getPage(PageQuery pageQuery, String startDate, String endDate, Integer objType, Integer objId) {
try {
return logsService.getPage(pageQuery, startDate, endDate, objType, objId);
} catch (Exception e) {
log.debug("日志分页列表{}", e);
}
return BaseResponse.errorMsg("失败!");
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/controller/SysPostController.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.controller;
import cn.wise.sc.cement.business.entity.SysGroup;
import cn.wise.sc.cement.business.entity.SysPost;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.PostQuery;
import cn.wise.sc.cement.business.service.ISysPostService;
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.web.bind.annotation.*;
import java.util.List;
/**
* <p>
* 前端控制器
* </p>
*
* @author ztw
* @since 2020-08-25
*/
@Api(tags="系统管理-职务管理")
@RestController
@RequestMapping("/business/sys-post")
public class SysPostController {
private static final Logger log = LoggerFactory.getLogger("SysPostController");
@Autowired
private ISysPostService postService;
@ApiOperation(value = "职务分页列表")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "name", value = "职务名称", paramType = "query", dataType = "String")
})
@GetMapping("/getPage")
public BaseResponse getPage(PageQuery pageQuery, String name) {
try {
return postService.getPage(pageQuery, name);
} catch (Exception e) {
log.debug("职务分页列表{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "新增职务")
@PostMapping("/create")
public BaseResponse create(@RequestBody PostQuery query) {
try {
return postService.create(query);
}catch (Exception e) {
log.debug("新增职务{}",e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "修改职务")
@PostMapping("/update")
public BaseResponse update(@RequestBody PostQuery query) {
try {
return postService.update(query);
}catch (Exception e) {
log.debug("修改职务{}",e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "职务详情")
@GetMapping("/{id}")
public BaseResponse getById(@PathVariable Integer id){
try {
SysPost post = postService.getById(id);
if(post == null){
return BaseResponse.errorMsg("信息错误!");
}
return BaseResponse.okData(post);
}catch (Exception e){
log.debug("职务详情{}",e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "职务列表")
@GetMapping("/getList")
public BaseResponse getById(){
try {
List<SysPost> list = postService.list();
return BaseResponse.okData(list);
}catch (Exception e){
log.debug("职务列表{}",e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "删除职务")
@PostMapping("/delete/{id}")
public BaseResponse delete(@PathVariable Integer id){
try {
postService.removeById(id);
return BaseResponse.okData("删除成功");
}catch (Exception e){
log.debug("删除职务{}",e);
}
return BaseResponse.errorMsg("失败!");
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/controller/TeamController.java
View file @ 9e9aae89
...@@ -82,13 +82,13 @@ public class TeamController { ...@@ -82,13 +82,13 @@ public class TeamController {
return BaseResponse.errorMsg("失败!"); return BaseResponse.errorMsg("失败!");
} }
@ApiOperation(value = "获取所有启动的检测项信息") @ApiOperation(value = "检测项列表")
@GetMapping("/getList") @GetMapping("/getList")
public BaseResponse getList() { public BaseResponse getList() {
try { try {
return teamService.getList(); return teamService.getList();
} catch (Exception e) { } catch (Exception e) {
log.debug("获取所有启动的检测项信息{}", e); log.debug("检测项列表{}", e);
} }
return BaseResponse.errorMsg("失败!"); return BaseResponse.errorMsg("失败!");
} }
......
cement-business/src/main/java/cn/wise/sc/cement/business/entity/Client.java
View file @ 9e9aae89
...@@ -5,6 +5,7 @@ import cn.wise.sc.cement.business.model.query.ClientQuery; ...@@ -5,6 +5,7 @@ import cn.wise.sc.cement.business.model.query.ClientQuery;
import cn.wise.sc.cement.business.model.vo.ClientVo; import cn.wise.sc.cement.business.model.vo.ClientVo;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
...@@ -30,30 +31,20 @@ public class Client extends BaseEntity implements Serializable { ...@@ -30,30 +31,20 @@ public class Client extends BaseEntity implements Serializable {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
private Integer id; private Integer id;
/** @ApiModelProperty("委托单位名")
* 单位名
*/
private String name; private String name;
/** @ApiModelProperty("负责人")
* 负责人
*/
private String principal; private String principal;
/** @ApiModelProperty("负责人电话")
* 负责人电话
*/
private String principalPhone; private String principalPhone;
/** @ApiModelProperty("所在地区:xx省xx县xx")
* 所在地区:xx省xx县xx
*/
private String region; private String region;
/** @ApiModelProperty("状态 0:禁用 1:激活")
* 状态 0:禁用 1:激活 private Integer status;
*/
private Boolean status;
......
cement-business/src/main/java/cn/wise/sc/cement/business/entity/Entrust.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import java.time.LocalDate;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
*
* </p>
*
* @author ztw
* @since 2020-08-24
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class Entrust implements Serializable {
private static final long serialVersionUID=1L;
/**
* 主键
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty("委托编号")
private String entrustCode;
@ApiModelProperty("项目id")
private Integer projectId;
@ApiModelProperty("项目编号")
private String projectCode;
@ApiModelProperty("委托单位id")
private Integer clientId;
@ApiModelProperty("送样人")
private String sendName;
@ApiModelProperty("送样人电话")
private String sendPhone;
@ApiModelProperty("委托日期")
private LocalDate entrustDate;
@ApiModelProperty("拟定完成日期")
private LocalDate finishDate;
@ApiModelProperty("受理人id")
private Integer userId;
@ApiModelProperty("样品数量")
private Integer sampleNum;
@ApiModelProperty("（1加急，0不加急）")
private Integer isUrgent;
@ApiModelProperty("剩余样品处理方法（0,取回，1由本所统一处置）")
private Integer handleMethod;
@ApiModelProperty("状态（0未审批，1已通过，2未通过，3样品处理，4派发）")
private Integer status;
@ApiModelProperty("项目类型(常规项目，科研项目，质量控制项目)")
private String projectType;
@ApiModelProperty("（0删除，1正常）")
private Integer isDelete;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("修改时间")
private LocalDateTime updateTime;
@ApiModelProperty("备注")
private String remark;
}
cement-business/src/main/java/cn/wise/sc/cement/business/entity/EntrustApproval.java 0 → 100644
View file @ 9e9aae89
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 io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
*
* </p>
*
* @author ztw
* @since 2020-08-24
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class EntrustApproval implements Serializable {
private static final long serialVersionUID=1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty("委托表id")
private Integer entrustId;
@ApiModelProperty("审批人id")
private Integer userId;
@ApiModelProperty("审批意见")
private String opinion;
@ApiModelProperty("审批结果（1通过，2驳回）")
private Integer status;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("备注")
private String remark;
}
cement-business/src/main/java/cn/wise/sc/cement/business/entity/Method.java
View file @ 9e9aae89
...@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
import java.time.LocalDate; import java.time.LocalDate;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
...@@ -32,35 +35,34 @@ public class Method implements Serializable { ...@@ -32,35 +35,34 @@ public class Method implements Serializable {
return newObj; return newObj;
} }
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
private Integer id; private Integer id;
/** @ApiModelProperty("检测标准名")
* 检测标准名
*/
private String name; private String name;
/** @ApiModelProperty("标准号")
* 标准号
*/
private String standard; private String standard;
/** @ApiModelProperty("编号")
* 编号
*/
private String number; private String number;
/** @ApiModelProperty("实施日期")
* 实施日期
*/
private LocalDate doDate; private LocalDate doDate;
/** @ApiModelProperty("更新日期")
* 更新日期
*/
private LocalDate upDate; private LocalDate upDate;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("备注")
private String remark;
} }
cement-business/src/main/java/cn/wise/sc/cement/business/entity/Project.java
View file @ 9e9aae89
...@@ -5,6 +5,7 @@ import cn.wise.sc.cement.business.model.query.ProjectQuery; ...@@ -5,6 +5,7 @@ import cn.wise.sc.cement.business.model.query.ProjectQuery;
import cn.wise.sc.cement.business.model.vo.ProjectVo; import cn.wise.sc.cement.business.model.vo.ProjectVo;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
...@@ -31,33 +32,22 @@ public class Project extends BaseEntity implements Serializable { ...@@ -31,33 +32,22 @@ public class Project extends BaseEntity implements Serializable {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
private Integer id; private Integer id;
/** @ApiModelProperty("项目名")
* 项目名
*/
private String name; private String name;
/** @ApiModelProperty(" 项目编号:客户自己填的")
* 项目编号:客户自己填的
*/
private String code; private String code;
/** @ApiModelProperty("客户id")
* 客户id
*/
private Integer clientId; private Integer clientId;
/** @ApiModelProperty("状态0:禁用 1:启用")
* 状态0:禁用 1:启用 private Integer status;
*/
private Boolean status;
/** @ApiModelProperty("创建时间")
* 创建时间
*/
private LocalDateTime createTime; private LocalDateTime createTime;
/**
* 备注 @ApiModelProperty("备注")
*/
private String remark; private String remark;
} }
cement-business/src/main/java/cn/wise/sc/cement/business/entity/Sample.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.entity;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
*
* </p>
*
* @author ztw
* @since 2020-08-24
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class Sample implements Serializable {
private static final long serialVersionUID=1L;
/**
* 主键
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty("来样编号（样品编号）")
private String sampleCode;
@ApiModelProperty("样品名")
private String name;
@ApiModelProperty("样品状态（粉、块状)")
private String sampleForm;
@ApiModelProperty("检测项id 例子：1、2、3")
private String teamIds;
@ApiModelProperty("样品照片")
private String samplePhoto;
@ApiModelProperty("样品重量(kg)")
private BigDecimal weight;
@ApiModelProperty("(检测依据编号) 例子：01、23、15")
private String methodNumbers;
@ApiModelProperty("是否平行样（1是，0否）")
private Integer isParallel;
@ApiModelProperty("本所编号")
private String cementCode;
@ApiModelProperty("产值")
private BigDecimal outputValue;
@ApiModelProperty("委托表id")
private Integer entrustId;
@ApiModelProperty("样品临时表id")
private Integer sampleId;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("基本元素检测结果")
private String baseResult;
@ApiModelProperty("比表面积校核结果")
private String surfaceResult;
}
cement-business/src/main/java/cn/wise/sc/cement/business/entity/SampleCheck.java 0 → 100644
View file @ 9e9aae89
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 io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
*
* </p>
*
* @author ztw
* @since 2020-08-24
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class SampleCheck implements Serializable {
private static final long serialVersionUID=1L;
/**
* 主键
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty("样品表d")
private Integer sampleId;
@ApiModelProperty("处理人id")
private Integer userId;
@ApiModelProperty("检测设备表id")
private Integer equipmentId;
@ApiModelProperty("检测设备名称")
private String equipmentName;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("备注")
private String remark;
}
cement-business/src/main/java/cn/wise/sc/cement/business/entity/SampleCheckTeam.java 0 → 100644
View file @ 9e9aae89
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 io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
*
* </p>
*
* @author ztw
* @since 2020-08-24
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class SampleCheckTeam implements Serializable {
private static final long serialVersionUID=1L;
/**
* 主键
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty("样品检测表id")
private Integer checkId;
@ApiModelProperty("检测项目id（检测项目表）")
private Integer testItemId;
@ApiModelProperty("检测项目")
private String testItem;
/**
* 检测项目信息 json串
{"样重m":"40","K值":1.0274,"Vsio2":3.89,................}
*/
@ApiModelProperty("检测项目信息json串")
private String testTeams;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("备注")
private String remark;
}
cement-business/src/main/java/cn/wise/sc/cement/business/entity/SampleDistribution.java 0 → 100644
View file @ 9e9aae89
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 io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
*
* </p>
*
* @author ztw
* @since 2020-08-24
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class SampleDistribution implements Serializable {
private static final long serialVersionUID=1L;
/**
* 主键
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty("样品表d")
private Integer sampleId;
@ApiModelProperty("检测项id")
private Integer teamId;
@ApiModelProperty("处理人id")
private Integer userId;
@ApiModelProperty("（0未接受，1接受，2完成）")
private Integer status;
@ApiModelProperty("接受时间")
private LocalDateTime acceptTime;
@ApiModelProperty("完成时间")
private LocalDateTime finishTime;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("备注")
private String remark;
}
cement-business/src/main/java/cn/wise/sc/cement/business/entity/SampleHandle.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import java.time.LocalDate;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
*
* </p>
*
* @author ztw
* @since 2020-08-24
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class SampleHandle implements Serializable {
private static final long serialVersionUID=1L;
/**
* 主键
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty("样品表d")
private Integer sampleId;
@ApiModelProperty("处理人id")
private Integer userId;
@ApiModelProperty("处理项")
private String content;
@ApiModelProperty("要求完成日期(计划完成日期)")
private LocalDate planFinishDate;
@ApiModelProperty("（0未接受，1接受，2完成）")
private Integer status;
@ApiModelProperty("接受时间")
private LocalDateTime acceptTime;
@ApiModelProperty("完成时间")
private LocalDateTime finishTime;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("备注")
private String remark;
}
cement-business/src/main/java/cn/wise/sc/cement/business/entity/SampleTmp.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.entity;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
*
* </p>
*
* @author ztw
* @since 2020-08-24
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class SampleTmp implements Serializable {
private static final long serialVersionUID=1L;
/**
* 主键
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty("来样编号（样品编号）")
private String sampleCode;
@ApiModelProperty("样品名")
private String name;
@ApiModelProperty("样品状态（粉、块状)")
private String sampleForm;
@ApiModelProperty("检测项id 例子：1、2、3")
private String teamIds;
@ApiModelProperty("样品照片")
private String samplePhoto;
@ApiModelProperty("样品重量(g)")
private BigDecimal weight;
@ApiModelProperty("(检测依据编号) 例子：01、23、15")
private String methodNumbers;
@ApiModelProperty("委托表id")
private Integer entrustId;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("备注")
private String remark;
}
cement-business/src/main/java/cn/wise/sc/cement/business/entity/SysApproval.java
View file @ 9e9aae89
...@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.io.Serializable; import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
...@@ -26,29 +28,19 @@ public class SysApproval implements Serializable { ...@@ -26,29 +28,19 @@ public class SysApproval implements Serializable {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
private Integer id; private Integer id;
/** @ApiModelProperty("审批流程")
* 审批流程
*/
private String name; private String name;
/** @ApiModelProperty("审批人id")
* 审批人id
*/
private Integer userId; private Integer userId;
/** @ApiModelProperty("状态 0:禁用 1:激活")
* 状态 0:禁用 1:激活 private Integer status;
*/
private Boolean status;
/** @ApiModelProperty("创建时间")
* 创建时间
*/
private LocalDateTime createTime; private LocalDateTime createTime;
/** @ApiModelProperty("备注")
* 备注
*/
private String remark; private String remark;
......
cement-business/src/main/java/cn/wise/sc/cement/business/entity/SysGroup.java
View file @ 9e9aae89
...@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.io.Serializable; import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
...@@ -26,24 +28,16 @@ public class SysGroup implements Serializable { ...@@ -26,24 +28,16 @@ public class SysGroup implements Serializable {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
private Integer id; private Integer id;
/** @ApiModelProperty("工作组名称")
* 工作组名称
*/
private String name; private String name;
/** @ApiModelProperty("状态 0:禁用 1:激活")
* 状态 0:禁用 1:激活 private Integer status;
*/
private Boolean status;
/** @ApiModelProperty("创建时间")
* 创建时间
*/
private LocalDateTime createTime; private LocalDateTime createTime;
/** @ApiModelProperty("备注")
* 备注
*/
private String remark; private String remark;
......
cement-business/src/main/java/cn/wise/sc/cement/business/entity/SysLogs.java 0 → 100644
View file @ 9e9aae89
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 io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
*
* </p>
*
* @author ztw
* @since 2020-08-24
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class SysLogs implements Serializable {
private static final long serialVersionUID=1L;
/**
* 主键
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty("操作用户")
private Integer userId;
@ApiModelProperty("日志类型（1委托详情）")
private Integer objType;
@ApiModelProperty("对象表id（委托表id）")
private Integer objId;
@ApiModelProperty("操作内容")
private String module;
@ApiModelProperty("操作状态1成功,0失败")
private Integer flag;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("备注")
private String remark;
public interface ObjType {
int SYSTEM_LOG = 0;
int ENTRUST_LOG = 1;
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/entity/SysPermission.java
View file @ 9e9aae89
...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField; ...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
...@@ -31,49 +32,31 @@ public class SysPermission implements Serializable { ...@@ -31,49 +32,31 @@ public class SysPermission implements Serializable {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
private Integer id; private Integer id;
/** @ApiModelProperty("上级ID(如果是一级为0)")
* 上级ID(如果是一级为0)
*/
private Integer parentId; private Integer parentId;
/** @ApiModelProperty("名字")
* 名字
*/
private String name; private String name;
/** @ApiModelProperty("菜单图标")
* 菜单图标
*/
private String css; private String css;
/** @ApiModelProperty("链接")
* 链接
*/
private String href; private String href;
/** @ApiModelProperty("1菜单权限,2按钮权限")
* 1菜单权限,2按钮权限
*/
private Integer type; private Integer type;
/** @ApiModelProperty("接口权限")
* 接口权限
*/
private String permission; private String permission;
/** @ApiModelProperty("排序")
* 排序
*/
private Integer sort; private Integer sort;
/** @ApiModelProperty("备注")
* 备注
*/
private String remark; private String remark;
/** @ApiModelProperty("子元素")
* 子元素
*/
@TableField(exist = false) @TableField(exist = false)
private List<SysPermission> child; private List<SysPermission> child;
......
cement-business/src/main/java/cn/wise/sc/cement/business/entity/SysPost.java 0 → 100644
View file @ 9e9aae89
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 io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
*
* </p>
*
* @author ztw
* @since 2020-08-25
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class SysPost implements Serializable {
private static final long serialVersionUID=1L;
/**
* 主键
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty("职务名称")
private String name;
@ApiModelProperty("审批级别")
private Integer level;
@ApiModelProperty("状态（0禁用，1启用）")
private Integer status;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("备注")
private String remark;
}
cement-business/src/main/java/cn/wise/sc/cement/business/entity/SysRole.java
View file @ 9e9aae89
...@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.io.Serializable; import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
...@@ -29,24 +31,16 @@ public class SysRole implements Serializable { ...@@ -29,24 +31,16 @@ public class SysRole implements Serializable {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
private Integer id; private Integer id;
/** @ApiModelProperty("角色名称")
* 角色名称
*/
private String name; private String name;
/** @ApiModelProperty("（0禁用，1启用）")
* （0禁用，1启用） private Integer status;
*/
private Boolean status;
/** @ApiModelProperty("创建时间")
* 创建时间
*/
private LocalDateTime createTime; private LocalDateTime createTime;
/** @ApiModelProperty("备注")
* 备注
*/
private String remark; private String remark;
......
cement-business/src/main/java/cn/wise/sc/cement/business/entity/SysUser.java
View file @ 9e9aae89
...@@ -2,6 +2,7 @@ package cn.wise.sc.cement.business.entity; ...@@ -2,6 +2,7 @@ package cn.wise.sc.cement.business.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
...@@ -28,108 +29,65 @@ public class SysUser implements Serializable { ...@@ -28,108 +29,65 @@ public class SysUser implements Serializable {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
private Integer id; private Integer id;
/** @ApiModelProperty("用户账号")
* 用户账号
*/
private String username; private String username;
/** @ApiModelProperty("真实姓名")
* 真实姓名
*/
private String name; private String name;
/** @ApiModelProperty("性别0女1男")
* 性别0女1男
*/
private Integer sex; private Integer sex;
/** @ApiModelProperty("部门id")
* 部门id
*/
private Integer groupId; private Integer groupId;
/** @ApiModelProperty("职务id")
* 职务id
*/
private Integer postId; private Integer postId;
/** @ApiModelProperty("微信号")
* 微信号
*/
private String wxId; private String wxId;
/** @ApiModelProperty("职称")
* 职称
*/
private String qualifications; private String qualifications;
/** @ApiModelProperty("状态（0禁用，1启用")
* 状态（0禁用，1启用） private Integer status;
*/
private Boolean status;
/** @ApiModelProperty("工作年限")
* 工作年限
*/
private Double workYear; private Double workYear;
/** @ApiModelProperty("手机号")
* 手机号
*/
private String phone; private String phone;
/** @ApiModelProperty("传真")
* 传真
*/
private String fax; private String fax;
/** @ApiModelProperty("专业")
* 专业
*/
private String major; private String major;
/** @ApiModelProperty("邮箱")
* 邮箱
*/
private String email; private String email;
/** @ApiModelProperty("从事本技术领域日期")
* 从事本技术领域日期
*/
private LocalDate technologyDate; private LocalDate technologyDate;
/** @ApiModelProperty("从事本技术领域年限")
* 从事本技术领域年限
*/
private Double technologyYear; private Double technologyYear;
/** @ApiModelProperty("文化程度")
* 文化程度
*/
private String education; private String education;
/** @ApiModelProperty("（0删除，1正常）")
* （0删除，1正常） private Integer isDelete;
*/
private Boolean isDelete;
/** @ApiModelProperty("创建时间")
* 创建时间
*/
private LocalDateTime createTime; private LocalDateTime createTime;
/** @ApiModelProperty("修改时间")
* 修改时间
*/
private LocalDateTime updateTime; private LocalDateTime updateTime;
/** @ApiModelProperty("备注")
* 备注
*/
private String remark; private String remark;
public interface Status {
Boolean VALID = true;
Boolean LOCKED = false;
}
} }
cement-business/src/main/java/cn/wise/sc/cement/business/entity/Team.java
View file @ 9e9aae89
...@@ -10,6 +10,9 @@ import cn.wise.sc.cement.business.model.vo.TeamVo; ...@@ -10,6 +10,9 @@ import cn.wise.sc.cement.business.model.vo.TeamVo;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
...@@ -33,45 +36,35 @@ public class Team extends BaseEntity implements Serializable { ...@@ -33,45 +36,35 @@ public class Team extends BaseEntity implements Serializable {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
private Integer id; private Integer id;
/** @ApiModelProperty("检测项目")
* 检测项目
*/
private String name; private String name;
/** @ApiModelProperty("元素分组id")
* 元素分组id
*/
private Integer groupId; private Integer groupId;
/** @ApiModelProperty("元素分组名称")
* 元素分组名称
*/
private String groupName; private String groupName;
/** @ApiModelProperty("检测依据")
* 检测依据
*/
private String basis; private String basis;
/** @ApiModelProperty("收费标准")
* 收费标准
*/
private BigDecimal charge; private BigDecimal charge;
/** @ApiModelProperty("建议产值")
* 建议产值
*/
private BigDecimal proCharge; private BigDecimal proCharge;
/** @ApiModelProperty("资质范围")
* 资质范围
*/
private String qualifications; private String qualifications;
/** @ApiModelProperty("状态 0:禁用 1:激活")
* 状态 0:禁用 1:激活 private Integer status;
*/
private Boolean status; @ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("备注")
private String remark;
} }
cement-business/src/main/java/cn/wise/sc/cement/business/exception/FdfsException.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.exception;
/**
* 封装fastdfs的异常，使用运行时异常
*
* @author yuqih
* @author tobato
*
*/
public abstract class FdfsException extends RuntimeException {
/**
* serialVersionUID
*/
private static final long serialVersionUID = 1L;
protected FdfsException(String message) {
super(message);
}
/**
* @param message
* @param cause
*/
protected FdfsException(String message, Throwable cause) {
super(message, cause);
}
}
\ No newline at end of file
cement-business/src/main/java/cn/wise/sc/cement/business/exception/FdfsUnsupportStorePathException.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.exception;
/**
* 从Url解析StorePath文件路径对象错误
*
* @author wuyf
*
*/
public class FdfsUnsupportStorePathException extends FdfsException {
/**
* serialVersionUID
*/
private static final long serialVersionUID = 8116336411011152869L;
public FdfsUnsupportStorePathException(String message) {
super(message);
}
}
\ No newline at end of file
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/EntrustApprovalMapper.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.mapper;
import cn.wise.sc.cement.business.entity.EntrustApproval;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author ztw
* @since 2020-08-24
*/
public interface EntrustApprovalMapper extends BaseMapper<EntrustApproval> {
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/EntrustMapper.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.mapper;
import cn.wise.sc.cement.business.entity.Entrust;
import cn.wise.sc.cement.business.model.vo.EntrustVo;
import cn.wise.sc.cement.business.model.vo.ProjectVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import java.util.Map;
/**
* <p>
* Mapper 接口
* </p>
*
* @author ztw
* @since 2020-08-24
*/
public interface EntrustMapper extends BaseMapper<Entrust> {
IPage<EntrustVo> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
EntrustVo getDetail(Integer id);
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SampleCheckMapper.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.mapper;
import cn.wise.sc.cement.business.entity.SampleCheck;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author ztw
* @since 2020-08-24
*/
public interface SampleCheckMapper extends BaseMapper<SampleCheck> {
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SampleCheckTeamMapper.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.mapper;
import cn.wise.sc.cement.business.entity.SampleCheckTeam;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author ztw
* @since 2020-08-24
*/
public interface SampleCheckTeamMapper extends BaseMapper<SampleCheckTeam> {
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SampleDistributionMapper.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.mapper;
import cn.wise.sc.cement.business.entity.SampleDistribution;
import cn.wise.sc.cement.business.model.vo.SampleDistributionTeamVo;
import cn.wise.sc.cement.business.model.vo.SampleDistributionVo;
import cn.wise.sc.cement.business.model.vo.SampleHandleVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* <p>
* Mapper 接口
* </p>
*
* @author ztw
* @since 2020-08-24
*/
public interface SampleDistributionMapper extends BaseMapper<SampleDistribution> {
IPage<SampleDistributionVo> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
List<SampleDistributionTeamVo> getDistributionTeamList(Integer sampleId);
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SampleHandleMapper.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.mapper;
import cn.wise.sc.cement.business.entity.SampleHandle;
import cn.wise.sc.cement.business.model.vo.EntrustVo;
import cn.wise.sc.cement.business.model.vo.SampleHandleVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import java.util.Map;
/**
* <p>
* Mapper 接口
* </p>
*
* @author ztw
* @since 2020-08-24
*/
public interface SampleHandleMapper extends BaseMapper<SampleHandle> {
IPage<SampleHandleVo> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SampleMapper.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.mapper;
import cn.wise.sc.cement.business.entity.Sample;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author ztw
* @since 2020-08-24
*/
public interface SampleMapper extends BaseMapper<Sample> {
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SampleTmpMapper.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.mapper;
import cn.wise.sc.cement.business.entity.SampleTmp;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author ztw
* @since 2020-08-24
*/
public interface SampleTmpMapper extends BaseMapper<SampleTmp> {
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SysLogsMapper.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.mapper;
import cn.wise.sc.cement.business.entity.SysLogs;
import cn.wise.sc.cement.business.model.vo.EntrustVo;
import cn.wise.sc.cement.business.model.vo.LogVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import java.util.Map;
/**
* <p>
* Mapper 接口
* </p>
*
* @author ztw
* @since 2020-08-24
*/
public interface SysLogsMapper extends BaseMapper<SysLogs> {
IPage<LogVo> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SysPostMapper.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.mapper;
import cn.wise.sc.cement.business.entity.SysPost;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author ztw
* @since 2020-08-25
*/
public interface SysPostMapper extends BaseMapper<SysPost> {
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/ClientMapper.xml
View file @ 9e9aae89
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
<sql id="where"> <sql id="where">
<where> <where>
<if test="params.status != null and params.status != ''"> <if test="params.status != null">
and t.status = #{params.status} and t.status = #{params.status}
</if> </if>
<if test="params.region != null and params.region != ''"> <if test="params.region != null and params.region != ''">
and t.region = #{params.region} and t.region like concat('%', #{params.region}, '%')
</if> </if>
<if test="params.principal != null and params.principal != ''"> <if test="params.principal != null and params.principal != ''">
and t.principal like concat('%', #{params.principal}, '%') and t.principal like concat('%', #{params.principal}, '%')
......
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EntrustApprovalMapper.xml 0 → 100644
View file @ 9e9aae89
<?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.EntrustApprovalMapper">
</mapper>
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EntrustMapper.xml 0 → 100644
View file @ 9e9aae89
<?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.EntrustMapper">
<sql id="where">
<where>
and e.is_delete = 1
<if test="params.startDate != null and params.startDate != ''">
and DATE(e.entrust_date) &gt;= #{params.startDate}
</if>
<if test="params.endDate != null and params.endDate != ''">
and DATE(e.entrust_date) &lt;= #{params.endDate}
</if>
<if test="params.status != null">
and e.status = #{params.status}
</if>
<if test="params.clientId != null and params.clientId != ''">
and e.client_id = #{params.clientId}
</if>
<if test="params.projectName != null and params.projectName != ''">
and p.name like concat('%', #{params.projectName}, '%')
</if>
</where>
</sql>
<select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.EntrustVo">
select e.*, p.name as projectName, c.name as clientName, su.name as userName,
(
CASE e.status
WHEN 0 THEN '未审批'
WHEN 1 THEN '未通过'
ELSE '已通过'
END
) as statusValue
from entrust e
left join project p on p.id = e.project_id
left join client c on c.id = e.client_id
left join sys_user su on su.id = e.user_id
<include refid="where" />
order by e.create_time desc
</select>
<select id="getDetail" resultType="cn.wise.sc.cement.business.model.vo.EntrustVo">
select e.*, p.name as projectName, c.name as clientName, su.name as userName,
su.phone as userPhone, su.fax as userFax
from entrust e
left join project p on p.id = e.project_id
left join client c on c.id = e.client_id
left join sys_user su on su.id = e.user_id
where e.id = #{id}
</select>
</mapper>
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleCheckMapper.xml 0 → 100644
View file @ 9e9aae89
<?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.SampleCheckMapper">
</mapper>
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleCheckTeamMapper.xml 0 → 100644
View file @ 9e9aae89
<?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.SampleCheckTeamMapper">
</mapper>
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleDistributionMapper.xml 0 → 100644
View file @ 9e9aae89
<?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.SampleDistributionMapper">
<sql id="where">
<where>
<if test="params.startDate != null and params.startDate != ''">
and DATE(e.create_time) &gt;= #{params.startDate}
</if>
<if test="params.endDate != null and params.endDate != ''">
and DATE(e.create_time) &lt;= #{params.endDate}
</if>
<if test="params.status != null">
and t.status = #{params.status}
</if>
<if test="params.clientId != null">
and e.client_id = #{params.clientId}
</if>
<if test="params.projectName != null and params.projectName != ''">
and p.name like concat('%', #{params.projectName}, '%')
</if>
<if test="params.userId != null">
and t.user_id = #{params.userId}
</if>
</where>
</sql>
<select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.SampleDistributionVo">
select t.*, p.id as projectId, p.name as projectName, p.code as projectCode,
e.id as entrustId, e.entrust_date as entrustDate, e.sample_num sampleNum,
su.name as userName
from sample_distribution 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
<include refid="where" />
order by t.create_time desc
</select>
<select id="getDistributionTeamList" resultType="cn.wise.sc.cement.business.model.vo.SampleDistributionTeamVo">
select t.id as distributionId, su.id as userId, su.name as userName, s.id as teamId, s.name as teamName
from sample_distribution t
left join sys_user su on su.id = t.user_id
left join team s on s.id = t.team_id
where t.sample_id = #{sampleId}
order by t.id asc
</select>
</mapper>
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleHandleMapper.xml 0 → 100644
View file @ 9e9aae89
<?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.SampleHandleMapper">
<sql id="where">
<where>
<if test="params.startDate != null and params.startDate != ''">
and DATE(e.create_time) &gt;= #{params.startDate}
</if>
<if test="params.endDate != null and params.endDate != ''">
and DATE(e.create_time) &lt;= #{params.endDate}
</if>
<if test="params.status != null">
and t.status = #{params.status}
</if>
<if test="params.clientId != null">
and e.client_id = #{params.clientId}
</if>
<if test="params.projectName != null and params.projectName != ''">
and p.name like concat('%', #{params.projectName}, '%')
</if>
<if test="params.userId != null">
and t.user_id = #{params.userId}
</if>
</where>
</sql>
<select id="getPage" 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
<include refid="where" />
order by t.create_time desc
</select>
</mapper>
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleMapper.xml 0 → 100644
View file @ 9e9aae89
<?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.SampleMapper">
</mapper>
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleTmpMapper.xml 0 → 100644
View file @ 9e9aae89
<?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.SampleTmpMapper">
</mapper>
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SysLogsMapper.xml 0 → 100644
View file @ 9e9aae89
<?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.SysLogsMapper">
<sql id="where">
<where>
<if test="params.startDate != null and params.startDate != ''">
and DATE(t.create_time) &gt;= #{params.startDate}
</if>
<if test="params.endDate != null and params.endDate != ''">
and DATE(t.create_time) &lt;= #{params.endDate}
</if>
<if test="params.objType != null">
and t.obj_type = #{params.objType}
</if>
<if test="params.objId != null">
and t.obj_id = #{params.objId}
</if>
</where>
</sql>
<select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.LogVo">
select t.*,su.name as userName
from sys_logs t
left join sys_user su on su.id = t.user_id
<include refid="where" />
order by t.create_time desc
</select>
</mapper>
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SysPostMapper.xml 0 → 100644
View file @ 9e9aae89
<?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.SysPostMapper">
</mapper>
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SysUserMapper.xml
View file @ 9e9aae89
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<sql id="where"> <sql id="where">
<where> <where>
<if test="params.status != null and params.status != ''"> <if test="params.status != null ">
and su.status = #{params.status} and su.status = #{params.status}
</if> </if>
<if test="params.gourpId != null and params.gourpId != ''"> <if test="params.gourpId != null and params.gourpId != ''">
......
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/TeamMapper.xml
View file @ 9e9aae89
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<mapper namespace="cn.wise.sc.cement.business.mapper.TeamMapper"> <mapper namespace="cn.wise.sc.cement.business.mapper.TeamMapper">
<sql id="where"> <sql id="where">
<where> <where>
<if test="params.status != null and params.status != ''"> <if test="params.status != null">
and t.status = #{params.status} and t.status = #{params.status}
</if> </if>
<if test="params.groupName != null and params.groupName != ''"> <if test="params.groupName != null and params.groupName != ''">
......
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/ApprovalQuery.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDate;
import java.util.List;
/**
* @description:
* @author: ztw
* @create: 2020-08-07 14:58
**/
@Data
@ApiModel("委托评审请求")
public class ApprovalQuery {
@ApiModelProperty("委托表id")
private Integer id;
@ApiModelProperty("项目类型(常规项目，科研项目，质量控制项目)")
private String projectType;
@ApiModelProperty("样品及检测项列表")
private List<SampleQuery> sampleList;
@ApiModelProperty("是否同意 1同意，2拒绝")
private Integer isAgree;
@ApiModelProperty("审批意见")
private String auditReason;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/CheckQuery.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @description:
* @author: ztw
* @create: 2020-08-07 14:58
**/
@Data
@ApiModel("委托-校核请求")
public class CheckQuery {
@ApiModelProperty("委托表id")
private Integer id;
/**
* 样品原始数据
*/
@ApiModelProperty("样品原始数据列表")
private List<SampleCheckQuery> sampleCheckQueryList;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/DistributionQuery.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @description:
* @author: ztw
* @create: 2020-08-07 14:58
**/
@Data
@ApiModel("委托-派发请求")
public class DistributionQuery {
@ApiModelProperty("委托表id")
private Integer id;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("样品信息列表")
private List<SampleDistributionQuery> sampleDistributionQueryList;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/EntrustQuery.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
/**
* @description:
* @author: qh
* @create: 2020-08-07 14:58
**/
@Data
@ApiModel("委托请求")
public class EntrustQuery {
@ApiModelProperty("委托表id")
private Integer id;
@ApiModelProperty("项目id")
private Integer projectId;
@ApiModelProperty("项目编号")
private String projectCode;
@ApiModelProperty("委托单位id")
private Integer clientId;
@ApiModelProperty("送样人")
private String sendName;
@ApiModelProperty("送样人电话")
private String sendPhone;
@ApiModelProperty("委托日期")
private LocalDate entrustDate;
@ApiModelProperty("拟定完成日期")
private LocalDate finishDate;
@ApiModelProperty("样品数量")
private Integer sampleNum;
@ApiModelProperty("（1加急，0不加急）")
private Integer isUrgent;
@ApiModelProperty("剩余样品处理方法（0,取回，1由本所统一处置）")
private Integer handleMethod;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("样品及检测项列表")
private List<SampleTmpQuery> sampleTmpList;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/HandleQuery.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @description:
* @author: ztw
* @create: 2020-08-07 14:58
**/
@Data
@ApiModel("委托-样品处理请求")
public class HandleQuery {
@ApiModelProperty("委托表id")
private Integer id;
@ApiModelProperty("样品及检测项列表")
private List<SampleHandleQuery> sampleHandleQueryList;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/MethodQuery.java
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.query; package cn.wise.sc.cement.business.model.query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -13,9 +14,19 @@ import java.time.LocalDate; ...@@ -13,9 +14,19 @@ import java.time.LocalDate;
@Data @Data
public class MethodQuery { public class MethodQuery {
private Integer id; private Integer id;
private String name;
@ApiModelProperty("检测标准名")
private String name;
@ApiModelProperty("标准号")
private String standard; private String standard;
@ApiModelProperty("编号")
private String number; private String number;
@ApiModelProperty("实施日期")
private LocalDate doDate; private LocalDate doDate;
@ApiModelProperty("更新日期")
private LocalDate upDate; private LocalDate upDate;
} }
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/PostQuery.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
/**
* @description:
* @author: qh
* @create: 2020-08-07 14:58
**/
@Data
@ApiModel("职务请求")
public class PostQuery {
private Integer id;
@ApiModelProperty("职务名称")
private String name;
@ApiModelProperty("审批级别")
private Integer level;
@ApiModelProperty("备注")
private String remark;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/ProjectQuery.java
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.query; package cn.wise.sc.cement.business.model.query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/** /**
...@@ -10,7 +11,13 @@ import lombok.Data; ...@@ -10,7 +11,13 @@ import lombok.Data;
@Data @Data
public class ProjectQuery { public class ProjectQuery {
private Integer id; private Integer id;
private String name;
private String code; @ApiModelProperty("项目名")
private Integer clientId; private String name;
@ApiModelProperty(" 项目编号:客户自己填的")
private String code;
@ApiModelProperty("客户id")
private Integer clientId;
} }
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/RoleQuery.java
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.query; package cn.wise.sc.cement.business.model.query;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.time.LocalDate; import java.time.LocalDate;
...@@ -18,24 +19,13 @@ public class RoleQuery { ...@@ -18,24 +19,13 @@ public class RoleQuery {
private Integer id; private Integer id;
/** @ApiModelProperty("角色名称")
* 角色名称
*/
private String name; private String name;
/** @ApiModelProperty("备注")
* （0禁用，1启用）
*/
private Boolean status;
/**
* 备注
*/
private String remark; private String remark;
/** @ApiModelProperty("权限id数组")
* 权限id数组
*/
private List<Integer> permissionIds; private List<Integer> permissionIds;
......
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/SampleCheckQuery.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @description:
* @author: ztw
* @create: 2020-08-07 14:58
**/
@Data
@ApiModel("委托校核-样品原始数据请求")
public class SampleCheckQuery {
@ApiModelProperty("样品表d")
private Integer sampleId;
@ApiModelProperty("本所编号")
private String cementCode;
@ApiModelProperty("检测人员id")
private String userId;
@ApiModelProperty("检测人员姓名")
private String userName;
@ApiModelProperty("检测设备表id")
private Integer equipmentId;
@ApiModelProperty("检测设备名称")
private String equipmentName;
@ApiModelProperty("基本元素检测结果 json串")
private String baseResult;
@ApiModelProperty("比表面积校核结果 json串")
private String surfaceResult;
@ApiModelProperty("检测样品信息列表")
public List<SampleCheckTeamQuery> sampleCheckTeamQueryList;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/SampleCheckTeamQuery.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.query;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
*
* </p>
*
* @author ztw
* @since 2020-08-24
*/
@Data
@ApiModel("委托校核-检测样品")
public class SampleCheckTeamQuery {
/**
* 主键
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty("检测项目id（检测项目表）")
private Integer testItemId;
@ApiModelProperty("检测项目")
private String testItem;
/**
* 检测项目信息 json串
{"样重m":"40","K值":1.0274,"Vsio2":3.89,................}
*/
@ApiModelProperty("检测项目信息 json串")
private String testTeams;
@ApiModelProperty("备注")
private String remark;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/SampleDistributionQuery.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDate;
import java.util.List;
/**
* @description:
* @author: ztw
* @create: 2020-08-07 14:58
**/
@Data
@ApiModel("委托-样品派发请求")
public class SampleDistributionQuery {
/**
* 样品表d
*/
@ApiModelProperty("样品表d")
private Integer sampleId;
/**
* 检测项目信息
*/
@ApiModelProperty("检测项目信息列表")
public List<SampleDistributionTeamQuery> sampleDistributionTeamQueryList;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/SampleDistributionTeamQuery.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: ztw
* @create: 2020-08-07 14:58
**/
@Data
@ApiModel("委托-样品派发请求")
public class SampleDistributionTeamQuery {
@ApiModelProperty("检测项id")
private Integer TeamId;
@ApiModelProperty("检测人员id")
private Integer userId;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/SampleHandleQuery.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* @description:
* @author: ztw
* @create: 2020-08-07 14:58
**/
@Data
@ApiModel("委托-样品处理请求")
public class SampleHandleQuery {
@ApiModelProperty("样品表d")
private Integer sampleId;
@ApiModelProperty("处理人id")
private Integer userId;
@ApiModelProperty("处理项")
private String content;
@ApiModelProperty("要求完成日期(计划完成日期)")
private LocalDate planFinishDate;
@ApiModelProperty("备注")
private String remark;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/SampleQuery.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* @description:
* @author: ztw
* @create: 2020-08-07 14:58
**/
@Data
@ApiModel("委托评审-样品及检测项请求")
public class SampleQuery {
private Integer id;
@ApiModelProperty("来样编号（样品编号）")
private String sampleCode;
@ApiModelProperty("样品名")
private String name;
@ApiModelProperty("样品状态（粉、块状)")
private String sampleForm;
@ApiModelProperty("检测项id 例子：1、2、3")
private String 样品表d;
@ApiModelProperty("样品照片")
private String samplePhoto;
@ApiModelProperty("样品重量(kg)")
private BigDecimal weight;
@ApiModelProperty("(检测依据编号) 例子：01、23、15")
private String methodNumbers;
@ApiModelProperty(" 是否平行样（1是，0否）")
private Integer isParallel;
@ApiModelProperty("产值")
private BigDecimal outputValue;
@ApiModelProperty("委托表id")
private Integer entrustId;
@ApiModelProperty("备注")
private String remark;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/SampleTmpQuery.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* @description:
* @author: qh
* @create: 2020-08-07 14:58
**/
@Data
@ApiModel("样品及检测项请求")
public class SampleTmpQuery {
private Integer id;
@ApiModelProperty("来样编号（样品编号）")
private String sampleCode;
@ApiModelProperty("样品名")
private String name;
@ApiModelProperty("样品状态（粉、块状)")
private String sampleForm;
@ApiModelProperty("检测项id 例子：1、2、3")
private String teamIds;
@ApiModelProperty("样品照片")
private String samplePhoto;
@ApiModelProperty("样品重量(g)")
private BigDecimal weight;
@ApiModelProperty("(检测依据编号) 例子：01、23、15")
private String methodNumbers;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/TeamQuery.java
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.query; package cn.wise.sc.cement.business.model.query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -11,11 +12,27 @@ import java.math.BigDecimal; ...@@ -11,11 +12,27 @@ import java.math.BigDecimal;
**/ **/
@Data @Data
public class TeamQuery { public class TeamQuery {
private Integer id;
private String name; @ApiModelProperty("检测项表id")
private Integer id;
@ApiModelProperty("检测项目")
private String name;
@ApiModelProperty("元素分组id")
private Integer groupId; private Integer groupId;
@ApiModelProperty("检测依据")
private String basis; private String basis;
@ApiModelProperty("收费标准")
private BigDecimal charge; private BigDecimal charge;
@ApiModelProperty("建议产值")
private BigDecimal proCharge; private BigDecimal proCharge;
@ApiModelProperty("资质范围")
private String qualifications; private String qualifications;
} }
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/UserQuery.java
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.query; package cn.wise.sc.cement.business.model.query;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
...@@ -19,99 +20,52 @@ public class UserQuery { ...@@ -19,99 +20,52 @@ public class UserQuery {
private Integer id; private Integer id;
/** @ApiModelProperty("用户账号")
* 用户账号
*/
private String username; private String username;
/** @ApiModelProperty("真实姓名")
* 真实姓名
*/
private String name; private String name;
/** @ApiModelProperty("性别0女1男")
* 性别0女1男
*/
private Integer sex; private Integer sex;
/** @ApiModelProperty("部门id")
* 部门id
*/
private Integer groupId; private Integer groupId;
/** @ApiModelProperty("职务id")
* 职务id
*/
private Integer postId; private Integer postId;
/** @ApiModelProperty("微信号")
* 微信号
*/
private String wxId; private String wxId;
/** @ApiModelProperty("职称")
* 职称
*/
private String qualifications; private String qualifications;
/** @ApiModelProperty("工作年限")
* 状态（0禁用，1启用）
*/
private Boolean status;
/**
* 工作年限
*/
private Double workYear; private Double workYear;
/** @ApiModelProperty("手机号")
* 手机号
*/
private String phone; private String phone;
/** @ApiModelProperty("传真")
* 专业 private String fax;
*/
@ApiModelProperty("专业")
private String major; private String major;
/** @ApiModelProperty("邮箱")
* 邮箱
*/
private String email; private String email;
/** @ApiModelProperty("从事本技术领域日期")
* 从事本技术领域日期
*/
private LocalDate technologyDate; private LocalDate technologyDate;
/** @ApiModelProperty("从事本技术领域年限")
* 从事本技术领域年限
*/
private Double technologyYear; private Double technologyYear;
/** @ApiModelProperty("文化程度")
* 文化程度
*/
private String education; private String education;
/** @ApiModelProperty("备注")
* （0删除，1正常）
*/
private Boolean isDelete;
/**
* 创建时间
*/
private LocalDateTime createTime;
/**
* 修改时间
*/
private LocalDateTime updateTime;
/**
* 备注
*/
private String remark; private String remark;
......
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/ApprovalVo.java
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.vo; package cn.wise.sc.cement.business.model.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
...@@ -16,34 +17,22 @@ public class ApprovalVo { ...@@ -16,34 +17,22 @@ public class ApprovalVo {
private Integer id; private Integer id;
/** @ApiModelProperty("审批流程")
* 审批流程
*/
private String name; private String name;
/** @ApiModelProperty("审批人id")
* 审批人id
*/
private Integer userId; private Integer userId;
/** @ApiModelProperty("状态 0:禁用 1:激活")
* 状态 0:禁用 1:激活 private Integer status;
*/
private Boolean status;
/** @ApiModelProperty("创建时间")
* 创建时间
*/
private LocalDateTime createTime; private LocalDateTime createTime;
/** @ApiModelProperty("备注")
* 备注
*/
private String remark; private String remark;
/** @ApiModelProperty("审批人姓名")
* 审批人姓名
*/
private String userName; private String userName;
......
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/ClientVo.java
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.vo; package cn.wise.sc.cement.business.model.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
...@@ -17,33 +18,21 @@ public class ClientVo { ...@@ -17,33 +18,21 @@ public class ClientVo {
private Integer id; private Integer id;
/** @ApiModelProperty("委托单位名")
* 单位名
*/
private String name; private String name;
/** @ApiModelProperty("负责人")
* 负责人
*/
private String principal; private String principal;
/** @ApiModelProperty("负责人电话")
* 负责人电话
*/
private String principalPhone; private String principalPhone;
/** @ApiModelProperty("所在地区:xx省xx县xx")
* 所在地区:xx省xx县xx private String region;
*/
private String region;
/** @ApiModelProperty("状态 0:禁用 1:激活")
* 状态 0:禁用 1:激活 private Integer status;
*/
private String status;
/** @ApiModelProperty("项目数量")
* 项目名字
*/
private Integer projectNums; private Integer projectNums;
} }
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/EntrustVo.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.vo;
import cn.wise.sc.cement.business.model.query.SampleTmpQuery;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
/**
* @description:
* @author: ztw
* @create: 2020-08-07 14:58
**/
@Data
@ApiModel("委托Vo")
public class EntrustVo {
@ApiModelProperty("委托表id")
private Integer id;
@ApiModelProperty("项目id")
private Integer projectId;
@ApiModelProperty("项目名称")
private String projectName;
@ApiModelProperty("项目编号")
private String projectCode;
@ApiModelProperty("项目类型(常规项目，科研项目，质量控制项目)")
private String projectType;
@ApiModelProperty("委托人id")
private Integer userId;
@ApiModelProperty("委托人姓名")
private String userName;
@ApiModelProperty("委托人手机号码")
private String userPhone;
@ApiModelProperty("委托人传真")
private String userFax;
@ApiModelProperty("委托单位Id")
private Integer clientId;
@ApiModelProperty("委托单位姓名")
private String clientName;
@ApiModelProperty("委托日期")
private LocalDate entrustDate;
@ApiModelProperty("样品数量")
private Integer sampleNum;
@ApiModelProperty("状态（0未审批，1已通过，2未通过，3样品处理，4派发）")
private Integer status;
@ApiModelProperty("状态")
private String statusValue;
@ApiModelProperty("送样人姓名")
private String sendName;
@ApiModelProperty("送样人电话")
private String sendPhone;
@ApiModelProperty("拟定完成日期")
private LocalDate finishDate;
@ApiModelProperty("（1加急，0不加急）")
private Integer isUrgent;
@ApiModelProperty(" 剩余样品处理方法（0,取回，1由本所统一处置）")
private Integer handleMethod;
@ApiModelProperty("备注")
private String remark;
/**
* 样品及检测项
*/
@ApiModelProperty("样品临时列表")
private List<SampleTmpVo> sampleTmpList;
@ApiModelProperty("样品列表")
private List<SampleVo> sampleList;
@ApiModelProperty("检测项 只显示第一个样品的")
private String checkTeam;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/GroupVo.java
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.vo; package cn.wise.sc.cement.business.model.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.time.LocalDate; import java.time.LocalDate;
...@@ -17,29 +18,19 @@ public class GroupVo { ...@@ -17,29 +18,19 @@ public class GroupVo {
private Integer id; private Integer id;
/** @ApiModelProperty("工作组名称")
* 工作组名称
*/
private String name; private String name;
/** @ApiModelProperty("状态 0:禁用 1:激活")
* 状态 0:禁用 1:激活 private Integer status;
*/
private Boolean status;
/** @ApiModelProperty("创建时间")
* 创建时间
*/
private LocalDateTime createTime; private LocalDateTime createTime;
/** @ApiModelProperty("备注")
* 备注
*/
private String remark; private String remark;
/** @ApiModelProperty("组内人数")
* 组内人数
*/
private Integer members; private Integer members;
......
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/LogVo.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
/**
* @description:
* @author: ztw
* @create: 2020-08-07 14:58
**/
@Data
@ApiModel("日志Vo")
public class LogVo {
private Integer id;
/**
* 操作用户
*/
@ApiModelProperty("操作用户id")
private Integer userId;
@ApiModelProperty("操作用户姓名")
private String userName;
@ApiModelProperty("日志类型（1委托详情）")
private Integer objType;
@ApiModelProperty("对象表id（委托表id）")
private Integer objId;
@ApiModelProperty("操作内容")
private String module;
@ApiModelProperty("操作状态1成功,0失败")
private Integer flag;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("备注")
private String remark;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/ProjectVo.java
View file @ 9e9aae89
...@@ -2,6 +2,7 @@ package cn.wise.sc.cement.business.model.vo; ...@@ -2,6 +2,7 @@ package cn.wise.sc.cement.business.model.vo;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
...@@ -15,25 +16,18 @@ import java.io.Serializable; ...@@ -15,25 +16,18 @@ import java.io.Serializable;
@ApiModel("项目Vo") @ApiModel("项目Vo")
public class ProjectVo { public class ProjectVo {
@ApiModelProperty("项目id")
private Integer id; private Integer id;
/** @ApiModelProperty("项目名")
* 项目名
*/
private String name; private String name;
/** @ApiModelProperty("项目编号:客户自己填的")
* 项目编号:客户自己填的
*/
private String code; private String code;
/** @ApiModelProperty("委托单位名")
* 委托单位名
*/
private String clientName; private String clientName;
/** @ApiModelProperty("状态")
* 状态
*/
private String status; private String status;
} }
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleDistributionTeamVo.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: ztw
* @create: 2020-08-07 14:58
**/
@Data
@ApiModel("委托-样品派发Vo")
public class SampleDistributionTeamVo {
@ApiModelProperty("派发表id")
private Integer distributionId;
/**
* 检测项id
*/
@ApiModelProperty("检测项id")
private Integer teamId;
@ApiModelProperty("检测项名称")
private String teamName;
@ApiModelProperty("检测人员id")
private Integer userId;
@ApiModelProperty("检测人员姓名")
private Integer userName;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleDistributionVo.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDate;
/**
* @description:
* @author: ztw
* @create: 2020-08-27 14:58
**/
@Data
@ApiModel("委托派发Vo")
public class SampleDistributionVo {
@ApiModelProperty("派发表id")
private Integer id;
@ApiModelProperty("项目id")
private Integer projectId;
@ApiModelProperty("项目名称")
private String projectName;
@ApiModelProperty("项目编号")
private String projectCode;
@ApiModelProperty("委托表Id")
private Integer entrustId;
@ApiModelProperty("委托日期")
private LocalDate entrustDate;
@ApiModelProperty("样品数量")
private Integer sampleNum;
@ApiModelProperty("检测人员id")
private Integer userId;
@ApiModelProperty("检测人员姓名")
private String userName;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleHandleVo.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.vo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* @description:
* @author: ztw
* @create: 2020-08-27 14:58
**/
@Data
@ApiModel("样品处理Vo")
public class SampleHandleVo {
@ApiModelProperty("样品处理表id")
private Integer id;
@ApiModelProperty("项目id")
private Integer projectId;
@ApiModelProperty("项目名称")
private String projectName;
@ApiModelProperty("项目编号")
private String projectCode;
@ApiModelProperty("样品表d")
private Integer sampleId;
@ApiModelProperty("样品名称")
private String sampleName;
@ApiModelProperty("private String 来样编号（样品编号）")
private String sampleCode;
@ApiModelProperty("本所编号")
private String cementCode;
@ApiModelProperty("处理人员id")
private Integer userId;
@ApiModelProperty("处理人员姓名")
private String userName;
@ApiModelProperty("处理项")
private String content;
@ApiModelProperty("要求完成日期(计划完成日期)")
private LocalDate planFinishDate;
@ApiModelProperty("备注")
private String remark;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleTmpVo.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @description:
* @author: qh
* @create: 2020-08-07 14:58
**/
@Data
@ApiModel("样品及检测项 临时表Vo")
public class SampleTmpVo {
@ApiModelProperty("样品临时表id")
private Integer id;
@ApiModelProperty("来样编号（样品编号）")
private String sampleCode;
@ApiModelProperty("样品名")
private String name;
@ApiModelProperty("样品状态（粉、块状)")
private String sampleForm;
@ApiModelProperty("检测项id 例子：1、2、3")
private String teamIds;
@ApiModelProperty("检测项名称")
private String teamName;
@ApiModelProperty("样品照片")
private String samplePhoto;
@ApiModelProperty("样品重量(g)")
private BigDecimal weight;
@ApiModelProperty("(检测依据编号) 例子：01、23、15")
private String methodNumbers;
@ApiModelProperty("委托表id")
private Integer entrustId;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleVo.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
* @description:
* @author: qh
* @create: 2020-08-07 14:58
**/
@Data
@ApiModel("样品及检测项 正式表Vo")
public class SampleVo {
@ApiModelProperty("样品表id")
private Integer id;
@ApiModelProperty("来样编号（样品编号）")
private String sampleCode;
@ApiModelProperty("样品名")
private String name;
@ApiModelProperty("样品状态（粉、块状)")
private String sampleForm;
@ApiModelProperty("检测项id 例子：1、2、3")
private String teamIds;
@ApiModelProperty("检测项名称")
private String teamName;
@ApiModelProperty("样品照片")
private String samplePhoto;
@ApiModelProperty("样品重量(g)")
private BigDecimal weight;
@ApiModelProperty("(检测依据编号) 例子：01、23、15")
private String methodNumbers;
@ApiModelProperty("是否平行样（1是，0否）")
private Integer isParallel;
@ApiModelProperty("本所编号")
private String cementCode;
@ApiModelProperty("产值")
private BigDecimal outputValue;
@ApiModelProperty("委托表id")
private Integer entrustId;
@ApiModelProperty("检测项目列表")
private List<SampleDistributionTeamVo> sampleDistributionTeamVoList;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/TeamVo.java
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.vo; package cn.wise.sc.cement.business.model.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
...@@ -19,45 +20,31 @@ public class TeamVo extends BaseVo implements Serializable { ...@@ -19,45 +20,31 @@ public class TeamVo extends BaseVo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private Integer id;
/** @ApiModelProperty("检测项表id")
* 检测项目 private Integer id;
*/
@ApiModelProperty("检测项目")
private String name; private String name;
/** @ApiModelProperty("元素分组id")
* 分组
*/
private Integer groupId; private Integer groupId;
/** @ApiModelProperty("检测依据")
* 检测依据
*/
private String basis; private String basis;
/** @ApiModelProperty("收费标准")
* 收费标准
*/
private BigDecimal charge; private BigDecimal charge;
/** @ApiModelProperty("建议产值")
* 建议产值
*/
private BigDecimal proCharge; private BigDecimal proCharge;
/** @ApiModelProperty("资质范围")
* 资质范围
*/
private String qualifications; private String qualifications;
/** @ApiModelProperty("状态 0:禁用 1:激活")
* 状态 0:禁用 1:激活
*/
private String status; private String status;
/** @ApiModelProperty("分组名称")
* 分组名称
*/
private String groupName; private String groupName;
} }
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/UserVo.java
View file @ 9e9aae89
package cn.wise.sc.cement.business.model.vo; package cn.wise.sc.cement.business.model.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.time.LocalDate; import java.time.LocalDate;
...@@ -17,124 +18,76 @@ public class UserVo { ...@@ -17,124 +18,76 @@ public class UserVo {
private Integer id; private Integer id;
/** @ApiModelProperty("用户账号")
* 用户账号
*/
private String username; private String username;
/** @ApiModelProperty("真实姓名")
* 真实姓名
*/
private String name; private String name;
/** @ApiModelProperty("性别0女1男")
* 性别0女1男
*/
private Integer sex; private Integer sex;
/** @ApiModelProperty("部门id")
* 部门id
*/
private Integer groupId; private Integer groupId;
/** @ApiModelProperty("职务id")
* 职务id
*/
private Integer postId; private Integer postId;
/** @ApiModelProperty("微信号")
* 微信号
*/
private String wxId; private String wxId;
/** @ApiModelProperty("职称")
* 职称
*/
private String qualifications; private String qualifications;
/** @ApiModelProperty("状态（0禁用，1启用）")
* 状态（0禁用，1启用） private Integer status;
*/
private Boolean status;
/** @ApiModelProperty("工作年限")
* 工作年限
*/
private Double workYear; private Double workYear;
/** @ApiModelProperty("手机号")
* 手机号
*/
private String phone; private String phone;
/** @ApiModelProperty("传真")
* 传真
*/
private String fax; private String fax;
/** @ApiModelProperty("专业")
* 专业
*/
private String major; private String major;
/** @ApiModelProperty("邮箱")
* 邮箱
*/
private String email; private String email;
/** @ApiModelProperty("从事本技术领域日期")
* 从事本技术领域日期
*/
private LocalDate technologyDate; private LocalDate technologyDate;
/** @ApiModelProperty("从事本技术领域年限")
* 从事本技术领域年限
*/
private Double technologyYear; private Double technologyYear;
/** @ApiModelProperty("文化程度")
* 文化程度
*/
private String education; private String education;
/** @ApiModelProperty("（0删除，1正常）")
* （0删除，1正常） private Integer isDelete;
*/
private Boolean isDelete;
/** @ApiModelProperty("创建时间")
* 创建时间
*/
private LocalDateTime createTime; private LocalDateTime createTime;
/** @ApiModelProperty("修改时间")
* 修改时间
*/
private LocalDateTime updateTime; private LocalDateTime updateTime;
/** @ApiModelProperty("备注")
* 备注
*/
private String remark; private String remark;
/** @ApiModelProperty("组名称")
* 组名称
*/
private String groupName; private String groupName;
/** @ApiModelProperty("职务名称")
* 职务名称
*/
private String postName; private String postName;
/** @ApiModelProperty("角色id")
* 角色id
*/
private Integer roleId; private Integer roleId;
/** @ApiModelProperty("角色名称")
* 角色名称
*/
private String roleName; private String roleName;
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/IClientService.java
View file @ 9e9aae89
...@@ -61,7 +61,7 @@ public interface IClientService extends IService<Client> { ...@@ -61,7 +61,7 @@ public interface IClientService extends IService<Client> {
* @param id id * @param id id
* @return Boolean * @return Boolean
*/ */
BaseResponse<Boolean> status(Integer status, Integer id); BaseResponse<String> status(Integer status, Integer id);
/** /**
* 委托单位导出 * 委托单位导出
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/IEntrustApprovalService.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.service;
import cn.wise.sc.cement.business.entity.EntrustApproval;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author ztw
* @since 2020-08-24
*/
public interface IEntrustApprovalService extends IService<EntrustApproval> {
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/IEntrustService.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.service;
import cn.wise.sc.cement.business.entity.Entrust;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.*;
import cn.wise.sc.cement.business.model.vo.EntrustVo;
import cn.wise.sc.cement.business.model.vo.SampleDistributionVo;
import cn.wise.sc.cement.business.model.vo.SampleHandleVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author ztw
* @since 2020-08-24
*/
public interface IEntrustService extends IService<Entrust> {
BaseResponse<IPage<EntrustVo>> getPage(PageQuery pageQuery, String startDate, String endDate, Integer status,
Integer clientId, String projectName);
BaseResponse<Entrust> create(EntrustQuery query);
BaseResponse<EntrustVo> getDtail(Integer id);
BaseResponse<String> approval(ApprovalQuery query);
BaseResponse<String> handle(HandleQuery query);
BaseResponse<IPage<SampleHandleVo>> getSampleHandlePage(PageQuery pageQuery, String startDate, String endDate, Integer status,
Integer clientId, String projectName);
BaseResponse<String> acceptHandle(Integer id);
BaseResponse<String> finishHandle(Integer id);
BaseResponse<String> distribution(DistributionQuery query);
BaseResponse<IPage<SampleDistributionVo>> getSampleDistributionPage(PageQuery pageQuery, String startDate, String endDate, Integer status,
Integer clientId, String projectName);
BaseResponse<String> acceptDistribution(Integer id);
BaseResponse<String> finishDistribution(Integer id);
BaseResponse<String> check(CheckQuery query);
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/IProjectService.java
View file @ 9e9aae89
...@@ -62,7 +62,7 @@ public interface IProjectService extends IService<Project> { ...@@ -62,7 +62,7 @@ public interface IProjectService extends IService<Project> {
* @param id id * @param id id
* @return Boolean * @return Boolean
*/ */
BaseResponse<Boolean> status(Integer status, Integer id); BaseResponse<String> status(Integer status, Integer id);
/** /**
* 项目导出 * 项目导出
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/ISampleCheckService.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.service;
import cn.wise.sc.cement.business.entity.SampleCheck;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author ztw
* @since 2020-08-24
*/
public interface ISampleCheckService extends IService<SampleCheck> {
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/ISampleCheckTeamService.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.service;
import cn.wise.sc.cement.business.entity.SampleCheckTeam;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author ztw
* @since 2020-08-24
*/
public interface ISampleCheckTeamService extends IService<SampleCheckTeam> {
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/ISampleDistributionService.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.service;
import cn.wise.sc.cement.business.entity.SampleDistribution;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author ztw
* @since 2020-08-24
*/
public interface ISampleDistributionService extends IService<SampleDistribution> {
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/ISampleHandleService.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.service;
import cn.wise.sc.cement.business.entity.SampleHandle;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author ztw
* @since 2020-08-24
*/
public interface ISampleHandleService extends IService<SampleHandle> {
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/ISampleService.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.service;
import cn.wise.sc.cement.business.entity.Sample;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author ztw
* @since 2020-08-24
*/
public interface ISampleService extends IService<Sample> {
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/ISampleTmpService.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.service;
import cn.wise.sc.cement.business.entity.SampleTmp;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author ztw
* @since 2020-08-24
*/
public interface ISampleTmpService extends IService<SampleTmp> {
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/ISysLogsService.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.service;
import cn.wise.sc.cement.business.entity.SysLogs;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.vo.LogVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author ztw
* @since 2020-08-24
*/
public interface ISysLogsService extends IService<SysLogs> {
BaseResponse<IPage<LogVo>> getPage(PageQuery pageQuery, String startDate, String endDate, Integer objType, Integer objId);
void saveLog(Integer objType, Integer objId, String module, String remark);
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/ISysPostService.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.service;
import cn.wise.sc.cement.business.entity.SysPost;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.PostQuery;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author ztw
* @since 2020-08-25
*/
public interface ISysPostService extends IService<SysPost> {
BaseResponse<IPage<SysPost>> getPage(PageQuery pageQuery, String name);
BaseResponse<SysPost> create(PostQuery query);
BaseResponse<SysPost> update(PostQuery query);
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/ISysUserService.java
View file @ 9e9aae89
...@@ -27,7 +27,7 @@ public interface ISysUserService extends IService<SysUser> { ...@@ -27,7 +27,7 @@ public interface ISysUserService extends IService<SysUser> {
BaseResponse<SysUser> update(UserQuery query); BaseResponse<SysUser> update(UserQuery query);
BaseResponse<Boolean> status(Integer status, Integer id); BaseResponse<String> status(Integer status, Integer id);
BaseResponse<UserVo> findById(Integer id); BaseResponse<UserVo> findById(Integer id);
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/ITeamService.java
View file @ 9e9aae89
...@@ -57,7 +57,7 @@ public interface ITeamService extends IService<Team> { ...@@ -57,7 +57,7 @@ public interface ITeamService extends IService<Team> {
* @param id * @param id
* @return * @return
*/ */
BaseResponse<Boolean> status(Integer status, Integer id); BaseResponse<String> status(Integer status, Integer id);
/** /**
* 检测项导出 * 检测项导出
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/ClientServiceImpl.java
View file @ 9e9aae89
...@@ -78,7 +78,7 @@ public class ClientServiceImpl extends ServiceImpl<ClientMapper, Client> impleme ...@@ -78,7 +78,7 @@ public class ClientServiceImpl extends ServiceImpl<ClientMapper, Client> impleme
} }
Client create = new Client(); Client create = new Client();
BeanUtils.copyProperties(query, create); BeanUtils.copyProperties(query, create);
create.setStatus(true); create.setStatus(1);
clientMapper.insert(create); clientMapper.insert(create);
return BaseResponse.okData(create); return BaseResponse.okData(create);
} }
...@@ -103,13 +103,23 @@ public class ClientServiceImpl extends ServiceImpl<ClientMapper, Client> impleme ...@@ -103,13 +103,23 @@ public class ClientServiceImpl extends ServiceImpl<ClientMapper, Client> impleme
@Override @Override
@Transactional @Transactional
public BaseResponse<Boolean> status(Integer status, Integer id) { public BaseResponse<String> status(Integer status, Integer id) {
BusinessExceptionEnum.BAD_LICENCE_TYPE.assertNotNull(status); if(status == null || id == null){
BusinessExceptionEnum.BAD_LICENCE_TYPE.assertNotNull(id); return BaseResponse.errorMsg("参数错误!");
Client update = new Client(); }
update.setId(id); Client client = clientMapper.selectById(id);
update.setStatus(status == 1); if(client == null){
return BaseResponse.okData(this.updateById(update)); return BaseResponse.errorMsg("数据错误!");
}
client.setStatus(status);
clientMapper.updateById(client);
String result = "";
if(client.getStatus() == 1){
result = "已启用";
}else{
result = "已禁用";
}
return BaseResponse.okData(result);
} }
@Override @Override
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/CommonServiceImpl.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.service.impl;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.Date;
@Service
public class CommonServiceImpl {
/**
* 生成编号
* @param prefix 编号前缀: 申请编号SQ
* @param counts 当天申请数量 生成的编号+1
* @return
*/
public String createNo(String prefix, int counts){
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");//注意月份是MM
String date = sdf.format(new Date());
int nextNo = counts+1;
String tailNo = counts==0?"00"+nextNo:(counts<10?"00"+nextNo:(counts<100?"0"+nextNo:String.valueOf(nextNo)));
String applyNo = prefix+date+tailNo;
return applyNo;
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustApprovalServiceImpl.java 0 → 100644
View file @ 9e9aae89
package cn.wise.sc.cement.business.service.impl;
import cn.wise.sc.cement.business.entity.EntrustApproval;
import cn.wise.sc.cement.business.mapper.EntrustApprovalMapper;
import cn.wise.sc.cement.business.service.IEntrustApprovalService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 服务实现类
* </p>
*
* @author ztw
* @since 2020-08-24
*/
@Service
public class EntrustApprovalServiceImpl extends ServiceImpl<EntrustApprovalMapper, EntrustApproval> implements IEntrustApprovalService {
}
cement-business/src/main/resources/fastdfs-client.properties 0 → 100644
View file @ 9e9aae89
This diff is collapsed.
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