Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
5af91b6d 由 康伟
选项

kangwei ： 药剂入库相关接口 

            健康档案接口
            安环目标接口
1 个父辈 b4852c8b
全部展开
内嵌 并排
正在显示 21 个修改的文件 包含 619 行增加 和 28 行删除
sk-module-biz/pom.xml
......@@ -85,10 +85,10 @@
</exclusions>
</dependency>
<!-- online form -->
<dependency>
<!--<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-mqtt</artifactId>
</dependency>
</dependency>-->
<!-- 节假日 start -->
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
......
sk-module-biz/src/main/java/com/skua/modules/erp/controller/DistributContractController.java
......@@ -75,7 +75,7 @@ public class DistributContractController {
@AutoLog(value = "erp分销合同-列表查询")
@ApiOperation(value="erp分销合同-分页列表查询", notes="erp分销合同-分页列表查询")
@ApiOperation(value="erp分销合同-列表查询", notes="erp分销合同-列表查询")
@GetMapping(value = "/disContractList")
public Result<List<DistributContract>> queryPageList(DistributContract distributContract,
HttpServletRequest req) {
......
sk-module-biz/src/main/java/com/skua/modules/erp/controller/MaterialAcceptanceFormController.java
......@@ -94,9 +94,18 @@ public class MaterialAcceptanceFormController {
public Result<MaterialAcceptanceForm> add(@RequestBody MaterialAcceptanceForm materialAcceptanceForm) {
Result<MaterialAcceptanceForm> result = new Result<MaterialAcceptanceForm>();
try {
materialAcceptanceForm.setConfirmStatus("1");
/*materialAcceptanceForm.setConfirmStatus("1");
if(StringUtils.isNotBlank(materialAcceptanceForm.getSenderSign()) && StringUtils.isNotBlank(materialAcceptanceForm.getReceiverSign()) ){
materialAcceptanceForm.setConfirmStatus("2");
}*/
if(StringUtils.isNotBlank(materialAcceptanceForm.getReceiverSign())){
materialAcceptanceForm.setConfirmStatus("1");
}
if(StringUtils.isNotBlank(materialAcceptanceForm.getSenderSign())){
materialAcceptanceForm.setConfirmStatus("2");
}
if(StringUtils.isNotBlank(materialAcceptanceForm.getSenderSign()) && StringUtils.isNotBlank(materialAcceptanceForm.getReceiverSign()) ){
materialAcceptanceForm.setConfirmStatus("9");
}
materialAcceptanceFormService.save(materialAcceptanceForm);
result.success("添加成功！");
......@@ -120,16 +129,26 @@ public class MaterialAcceptanceFormController {
@PutMapping(value = "/edit")
public Result<MaterialAcceptanceForm> edit(@RequestBody MaterialAcceptanceForm materialAcceptanceForm) {
Result<MaterialAcceptanceForm> result = new Result<MaterialAcceptanceForm>();
/* */
if(StringUtils.isNotBlank(materialAcceptanceForm.getReceiverSign())){
materialAcceptanceForm.setConfirmStatus("1");
}
if(StringUtils.isNotBlank(materialAcceptanceForm.getSenderSign())){
materialAcceptanceForm.setConfirmStatus("2");
}
if(StringUtils.isNotBlank(materialAcceptanceForm.getSenderSign()) && StringUtils.isNotBlank(materialAcceptanceForm.getReceiverSign()) ){
materialAcceptanceForm.setConfirmStatus("9");
}
MaterialAcceptanceForm materialAcceptanceFormEntity = materialAcceptanceFormService.getById(materialAcceptanceForm.getId());
if(materialAcceptanceFormEntity==null) {
result.error500("未找到对应实体");
//result.error500("未找到对应实体");
materialAcceptanceFormService.save(materialAcceptanceForm);
}else {
boolean ok = materialAcceptanceFormService.updateById(materialAcceptanceForm);
//TODO 返回false说明什么？
if(ok) {
result.success("修改成功!");
}
materialAcceptanceFormService.updateById(materialAcceptanceForm);
}
//TODO 返回false说明什么？
result.success("修改成功!");
return result;
}
......@@ -171,11 +190,12 @@ public class MaterialAcceptanceFormController {
Result<MaterialAcceptanceForm> result = new Result<MaterialAcceptanceForm>();
MaterialAcceptanceForm materialAcceptanceForm = materialAcceptanceFormService.getById(id);
if(materialAcceptanceForm==null) {
result.error500("未找到对应实体");
}else {
result.setResult(materialAcceptanceForm);
result.setSuccess(true);
//result.error500("未找到对应实体");
materialAcceptanceForm = new MaterialAcceptanceForm();
materialAcceptanceForm.setId(id);
}
result.setResult(materialAcceptanceForm);
result.setSuccess(true);
return result;
}
@AutoLog(value = "erp--物料验收单-送货/供方人员签字")
......@@ -187,10 +207,7 @@ public class MaterialAcceptanceFormController {
if(materialAcceptanceFormEntity==null) {
result.error500("未找到对应实体");
}else {
acceptanceForm.setConfirmStatus("1");
if(StringUtils.isNotBlank(acceptanceForm.getSenderSign()) && StringUtils.isNotBlank(acceptanceForm.getReceiverSign()) ){
acceptanceForm.setConfirmStatus("2");
}
acceptanceForm.setConfirmStatus("2");
boolean ok = materialAcceptanceFormService.updateById(acceptanceForm);
//TODO 返回false说明什么？
if(ok) {
......@@ -209,9 +226,6 @@ public class MaterialAcceptanceFormController {
result.error500("未找到对应实体");
}else {
acceptanceForm.setConfirmStatus("1");
if(StringUtils.isNotBlank(acceptanceForm.getSenderSign()) && StringUtils.isNotBlank(acceptanceForm.getReceiverSign()) ){
acceptanceForm.setConfirmStatus("2");
}
boolean ok = materialAcceptanceFormService.updateById(acceptanceForm);
//TODO 返回false说明什么？
if(ok) {
......
sk-module-biz/src/main/java/com/skua/modules/erp/controller/MaterialINController.java
......@@ -81,7 +81,21 @@ public class MaterialINController {
result.setResult(pageList);
return result;
}
@AutoLog(value = "erp--物料(药剂)入库-集团审核列表")
@ApiOperation(value="erp--物料(药剂)入库-集团审核列表", notes="erp--物料(药剂)入库-集团审核列表")
@GetMapping(value = "/handleList")
public Result<IPage<MaterialIN>> handleList(MaterialIN materialIN,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<MaterialIN>> result = new Result<IPage<MaterialIN>>();
QueryWrapper<MaterialIN> queryWrapper = QueryGenerator.initQueryWrapper(materialIN, req.getParameterMap());
Page<MaterialIN> page = new Page<MaterialIN>(pageNo, pageSize);
IPage<MaterialIN> pageList = materialINService.page(page, queryWrapper);
result.setSuccess(true);
result.setResult(pageList);
return result;
}
/**
* <pre>
* 添加
......
sk-module-biz/src/main/java/com/skua/modules/erp/controller/PurchaseContractController.java
......@@ -57,7 +57,23 @@ public class PurchaseContractController {
result.setResult(pageList);
return result;
}
@AutoLog(value = "erp采购合同-集团审核列表")
@ApiOperation(value="erp采购合同-集团审核列表", notes="erp采购合同-集团审核列表")
@GetMapping(value = "/handleList")
public Result<IPage<ERPPurchaseContract>> handleList(ERPPurchaseContract ERPPurchaseContract,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<ERPPurchaseContract>> result = new Result<IPage<ERPPurchaseContract>>();
QueryWrapper<ERPPurchaseContract> queryWrapper = QueryGenerator.initQueryWrapper(ERPPurchaseContract, req.getParameterMap());
Page<ERPPurchaseContract> page = new Page<ERPPurchaseContract>(pageNo, pageSize);
// 需要添加条件判断
IPage<ERPPurchaseContract> pageList = purchaseContractService.page(page, queryWrapper);
result.setSuccess(true);
result.setResult(pageList);
return result;
}
@AutoLog(value = "erp采购合同-有权限的采购合同集合")
@ApiOperation(value="erp采购合同-有权限的采购合同集合", notes="erp采购合同-有权限的采购合同集合")
......
sk-module-biz/src/main/java/com/skua/modules/erp/entity/MaterialAcceptanceForm.java
......@@ -58,9 +58,8 @@ public class MaterialAcceptanceForm {
@Excel(name = "收货人员签字", width = 15)
@ApiModelProperty(value = "收货人员签字")
private String receiverSign;
/**确认状态 0 未确认、1 部分确认、2全部确认*/
@Excel(name = "确认状态 0 未确认、1 部分确认、2全部确认", width = 15)
@ApiModelProperty(value = "确认状态 0 未确认、1 部分确认、2全部确认")
@ApiModelProperty(value = "确认状态 0 未确认、1 收货签字、2 送货方签字 、9 全部确认")
@Dict( dicCode="purchase_confirm_status")
private String confirmStatus;
/**分享地址*/
......
sk-module-biz/src/main/java/com/skua/modules/erp/entity/MaterialIN.java
......@@ -62,17 +62,19 @@ public class MaterialIN {
@Excel(name = "物料类别", width = 15)
@ApiModelProperty(value = "物料类别")
@Dict(dictTable = "equipment_sparepart_type", dicCode="id", dicText = "item_text")
private String sparepartType;
/**物料编号*/
@Excel(name = "物料编号", width = 15)
@ApiModelProperty(value = "物料编号")
@Dict(dictTable = "equipment_sparepart_supplies", dicCode="id", dicText = "sparepart_name")
private String sparepartId;
/**药剂(物料)名称*/
@Excel(name = "药剂(物料)名称", width = 15)
@ApiModelProperty(value = "药剂(物料)名称")
private String sparepartName;
@ApiModelProperty(value = "物料类别")
@ApiModelProperty(value = "物料编码")
private String sparepartCode;
/**规格型号*/
@Excel(name = "规格型号", width = 15)
......@@ -85,11 +87,12 @@ public class MaterialIN {
/**数量*/
@Excel(name = "数量", width = 15)
@ApiModelProperty(value = "数量")
private String materialNum;
private String purchaseNum;
/**供应商编号*/
@Excel(name = "供应商编号", width = 15)
@ApiModelProperty(value = "供应商编号")
@Dict(dictTable = "equipment_sparepart_supplies", dicCode="id", dicText = "sparepart_name")
private String supplierId;
/**货号*/
@Excel(name = "货号", width = 15)
......
sk-module-biz/src/main/java/com/skua/modules/safe/controller/HealthRecordsController.java 0 → 100644
package com.skua.modules.safe.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.skua.core.api.vo.Result;
import com.skua.core.aspect.annotation.AutoLog;
import com.skua.core.context.BaseContextHandler;
import com.skua.core.query.QueryGenerator;
import com.skua.core.util.ConvertUtils;
import com.skua.modules.safe.entity.HealthRecords;
import com.skua.modules.safe.service.IHealthRecordsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/**
* <pre>
* 健康档案
* </pre>
* @author 开发者姓名
* @version V0.1, 开发时间
*/
@Slf4j
@Api(tags="健康档案")
@RestController("webHealthRecordsController")
@RequestMapping("/web/safe/healthRecords")
public class HealthRecordsController {
@Autowired
private IHealthRecordsService healthRecordsService;
/**
* <pre>
* 分页列表查询
* </pre>
* @param healthRecords
* @param pageNo
* @param pageSize
* @param req
* @return
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@AutoLog(value = "健康档案-分页列表查询")
@ApiOperation(value="健康档案-分页列表查询", notes="健康档案-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<HealthRecords>> queryPageList(HealthRecords healthRecords,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<HealthRecords>> result = new Result<IPage<HealthRecords>>();
QueryWrapper<HealthRecords> queryWrapper = QueryGenerator.initQueryWrapper(healthRecords, req.getParameterMap());
Page<HealthRecords> page = new Page<HealthRecords>(pageNo, pageSize);
//queryWrapper.eq("depart_id", BaseContextHandler.getRealDepartId());
queryWrapper.in("depart_id", BaseContextHandler.getDeparts().split(","));
IPage<HealthRecords> pageList = healthRecordsService.page(page, queryWrapper);
result.setSuccess(true);
result.setResult(pageList);
return result;
}
/**
* <pre>
* 添加
* </pre>
* @param healthRecords
* @return
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@AutoLog(value = "健康档案-添加")
@ApiOperation(value="健康档案-添加", notes="健康档案-添加")
@PostMapping(value = "/add")
public Result<HealthRecords> add(@RequestBody HealthRecords healthRecords) {
Result<HealthRecords> result = new Result<HealthRecords>();
try {
healthRecordsService.save(healthRecords);
result.success("添加成功！");
} catch (Exception e) {
log.error(e.getMessage(),e);
result.error500("操作失败");
}
return result;
}
/**
* <pre>
* 编辑
* </pre>
* @param healthRecords
* @return
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@AutoLog(value = "健康档案-编辑")
@ApiOperation(value="健康档案-编辑", notes="健康档案-编辑")
@PutMapping(value = "/edit")
public Result<HealthRecords> edit(@RequestBody HealthRecords healthRecords) {
Result<HealthRecords> result = new Result<HealthRecords>();
HealthRecords healthRecordsEntity = healthRecordsService.getById(healthRecords.getId());
if(healthRecordsEntity==null) {
result.error500("未找到对应实体");
}else {
boolean ok = healthRecordsService.updateById(healthRecords);
//TODO 返回false说明什么？
if(ok) {
result.success("修改成功!");
}
}
return result;
}
/**
* <pre>
* 通过id删除
* </pre>
* @param id
* @return
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@AutoLog(value = "健康档案-通过id删除")
@ApiOperation(value="健康档案-通过id删除", notes="健康档案-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
try {
healthRecordsService.removeById(id);
} catch (Exception e) {
log.error("删除失败",e.getMessage());
return Result.error("删除失败!");
}
return Result.ok("删除成功!");
}
/**
* <pre>
* 批量删除
* </pre>
* @param ids
* @return
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@AutoLog(value = "健康档案-批量删除")
@ApiOperation(value="健康档案-批量删除", notes="健康档案-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<HealthRecords> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
Result<HealthRecords> result = new Result<HealthRecords>();
if(ids==null || "".equals(ids.trim())) {
result.error500("参数不识别！");
}else {
this.healthRecordsService.removeByIds(Arrays.asList(ids.split(",")));
result.success("删除成功!");
}
return result;
}
/**
* <pre>
* 通过id查询
* </pre>
* @param id
* @return
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@AutoLog(value = "健康档案-通过id查询")
@ApiOperation(value="健康档案-通过id查询", notes="健康档案-通过id查询")
@GetMapping(value = "/queryById")
public Result<HealthRecords> queryById(@RequestParam(name="id",required=true) String id) {
Result<HealthRecords> result = new Result<HealthRecords>();
HealthRecords healthRecords = healthRecordsService.getById(id);
if(healthRecords==null) {
result.error500("未找到对应实体");
}else {
result.setResult(healthRecords);
result.setSuccess(true);
}
return result;
}
/**
* <pre>
* 导出excel
* </pre>
* @param request
* @param response
* @return
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
// Step.1 组装查询条件
QueryWrapper<HealthRecords> queryWrapper = null;
try {
String paramsStr = request.getParameter("paramsStr");
if (ConvertUtils.isNotEmpty(paramsStr)) {
String deString = URLDecoder.decode(paramsStr, "UTF-8");
HealthRecords healthRecords = JSON.parseObject(deString, HealthRecords.class);
queryWrapper = QueryGenerator.initQueryWrapper(healthRecords, request.getParameterMap());
}
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
//Step.2 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
List<HealthRecords> pageList = healthRecordsService.list(queryWrapper);
//导出文件名称
mv.addObject(NormalExcelConstants.FILE_NAME, "健康档案列表");
mv.addObject(NormalExcelConstants.CLASS, HealthRecords.class);
mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("健康档案列表数据", "导出人:Jeecg", "导出信息"));
mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
return mv;
}
/**
* <pre>
* 通过excel导入数据
* </pre>
* @param request
* @param response
* @return
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();// 获取上传文件对象
ImportParams params = new ImportParams();
params.setTitleRows(2);
params.setHeadRows(1);
params.setNeedSave(true);
try {
List<HealthRecords> listHealthRecordss = ExcelImportUtil.importExcel(file.getInputStream(), HealthRecords.class, params);
healthRecordsService.saveBatch(listHealthRecordss);
return Result.ok("文件导入成功！数据行数:" + listHealthRecordss.size());
} catch (Exception e) {
log.error(e.getMessage(),e);
return Result.error("文件导入失败:"+e.getMessage());
} finally {
try {
file.getInputStream().close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
return Result.ok("文件导入失败！");
}
}
sk-module-biz/src/main/java/com/skua/modules/safe/entity/AccidentCase.java
......@@ -20,10 +20,10 @@ import org.jeecgframework.poi.excel.annotation.Excel;
* 事故案例库
*/
@Data
@TableName("safe_accident_case")
@TableName("safety_accident_case")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="safe_accident_case对象", description="事故案例库")
@ApiModel(value="safety_accident_case对象", description="事故案例库")
public class AccidentCase {
/**id*/
......
sk-module-biz/src/main/java/com/skua/modules/safe/entity/EnvironmentTarget.java 0 → 100644
package com.skua.modules.safe.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import com.skua.core.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* 安环环保目标
*/
@Data
@TableName("safety_environment_target")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="safety_environment_target对象", description="安环环保目标")
public class EnvironmentTarget {
/**主键id*/
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "主键id")
private String id;
/**所属厂站*/
@Excel(name = "所属厂站", width = 15)
@ApiModelProperty(value = "所属厂站")
@Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
private String departId;
/**祖级列表*/
@Excel(name = "祖级列表", width = 15)
@ApiModelProperty(value = "祖级列表")
private String departAncestors;
/**目标年度*/
@Excel(name = "目标年度", width = 15)
@ApiModelProperty(value = "目标年度")
private String targetYear;
/**生成安全工亡责任事务*/
@Excel(name = "生成安全工亡责任事务", width = 15)
@ApiModelProperty(value = "生成安全工亡责任事务")
private String workerDeathNum;
/**突发环境事件*/
@Excel(name = "突发环境事件", width = 15)
@ApiModelProperty(value = "突发环境事件")
private String suddenlyNum;
/**新增职业病病例*/
@Excel(name = "新增职业病病例", width = 15)
@ApiModelProperty(value = "新增职业病病例")
private String newCaseNum;
/**考核分数*/
@Excel(name = "考核分数", width = 15)
@ApiModelProperty(value = "考核分数")
private String examScore;
/**创建人Id*/
@Excel(name = "创建人Id", width = 15)
@ApiModelProperty(value = "创建人Id")
private String createBy;
/**创建时间*/
@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**修改人Id*/
@Excel(name = "修改人Id", width = 15)
@ApiModelProperty(value = "修改人Id")
private String updateBy;
/**修改时间*/
@Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "修改时间")
private Date updateTime;
/**删除标识*/
@Excel(name = "删除标识", width = 15)
@ApiModelProperty(value = "删除标识")
private Integer delFlag;
}
sk-module-biz/src/main/java/com/skua/modules/safe/entity/HealthRecords.java 0 → 100644
package com.skua.modules.safe.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import com.skua.core.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* 健康档案
*/
@Data
@TableName("safety_health_records")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="safety_health_records对象", description="健康档案")
public class HealthRecords {
/**主键*/
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "主键")
private String id;
/**所属厂站*/
@Excel(name = "所属厂站", width = 15)
@ApiModelProperty(value = "所属厂站")
@Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
private String departId;
/**祖级列表*/
@Excel(name = "祖级列表", width = 15)
@ApiModelProperty(value = "祖级列表")
private String departAncestors;
/**用户编号*/
@Excel(name = "用户编号", width = 15)
@ApiModelProperty(value = "用户编号")
private String userId;
/**检查地点*/
@Excel(name = "检查地点", width = 15)
@ApiModelProperty(value = "检查地点")
private String inspectPlace;
/**检查结果*/
@Excel(name = "检查结果", width = 15)
@ApiModelProperty(value = "检查结果")
private String inspectResult;
/**检查报告*/
@Excel(name = "检查报告", width = 15)
@ApiModelProperty(value = "检查报告")
private String inspectReportFile;
/**异常情况以及处理意见*/
@Excel(name = "异常情况以及处理意见", width = 15)
@ApiModelProperty(value = "异常情况以及处理意见")
private String proposal;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private String remark;
/**创建时间*/
@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**创建人*/
@Excel(name = "创建人", width = 15)
@ApiModelProperty(value = "创建人")
private String createBy;
/**修改时间*/
@Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "修改时间")
private Date updateTime;
/**修改人*/
@Excel(name = "修改人", width = 15)
@ApiModelProperty(value = "修改人")
private String updateBy;
}
sk-module-biz/src/main/java/com/skua/modules/safe/mapper/EnvironmentTargetMapper.java 0 → 100644
package com.skua.modules.safe.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.skua.modules.safe.entity.EnvironmentTarget;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 安环环保目标
*/
public interface EnvironmentTargetMapper extends BaseMapper<EnvironmentTarget> {
}
sk-module-biz/src/main/java/com/skua/modules/safe/mapper/HealthRecordsMapper.java 0 → 100644
package com.skua.modules.safe.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.skua.modules.safe.entity.HealthRecords;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 健康档案
*/
public interface HealthRecordsMapper extends BaseMapper<HealthRecords> {
}
sk-module-biz/src/main/java/com/skua/modules/safe/mapper/xml/EnvironmentTargetMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.skua.modules.safe.mapper.EnvironmentTargetMapper">
</mapper>
\ No newline at end of file
sk-module-biz/src/main/java/com/skua/modules/safe/mapper/xml/HealthRecordsMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.skua.modules.safe.mapper.HealthRecordsMapper">
</mapper>
\ No newline at end of file
sk-module-biz/src/main/java/com/skua/modules/safe/service/IEnvironmentTargetService.java 0 → 100644
package com.skua.modules.safe.service;
import com.skua.modules.safe.entity.EnvironmentTarget;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* 安环环保目标
*/
public interface IEnvironmentTargetService extends IService<EnvironmentTarget> {
}
sk-module-biz/src/main/java/com/skua/modules/safe/service/IHealthRecordsService.java 0 → 100644
package com.skua.modules.safe.service;
import com.skua.modules.safe.entity.HealthRecords;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* 健康档案
*/
public interface IHealthRecordsService extends IService<HealthRecords> {
}
sk-module-biz/src/main/java/com/skua/modules/safe/service/impl/EnvironmentTargetServiceImpl.java 0 → 100644
package com.skua.modules.safe.service.impl;
import com.skua.modules.safe.entity.EnvironmentTarget;
import com.skua.modules.safe.mapper.EnvironmentTargetMapper;
import com.skua.modules.safe.service.IEnvironmentTargetService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* 安环环保目标
*/
@Service
public class EnvironmentTargetServiceImpl extends ServiceImpl<EnvironmentTargetMapper, EnvironmentTarget> implements IEnvironmentTargetService {
}
sk-module-biz/src/main/java/com/skua/modules/safe/service/impl/HealthRecordsServiceImpl.java 0 → 100644
package com.skua.modules.safe.service.impl;
import com.skua.modules.safe.entity.HealthRecords;
import com.skua.modules.safe.mapper.HealthRecordsMapper;
import com.skua.modules.safe.service.IHealthRecordsService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* 健康档案
*/
@Service
public class HealthRecordsServiceImpl extends ServiceImpl<HealthRecordsMapper, HealthRecords> implements IHealthRecordsService {
}
sk-module-system/src/main/java/com/skua/config/ShiroConfig.java
......@@ -59,6 +59,10 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/sys/common/view/**", "anon");//图片预览不限制token
filterChainDefinitionMap.put("/sys/common/download/**", "anon");//文件下载不限制token
filterChainDefinitionMap.put("/sys/common/pdf/**", "anon");//pdf预览
filterChainDefinitionMap.put("/web/erp/materialAcceptanceForm/queryById", "anon");//采购入库,送货方查询验货单
filterChainDefinitionMap.put("/web/erp/materialAcceptanceForm/senderSign", "anon");//采购入库,送货方签名
filterChainDefinitionMap.put("/web/erp/materialIN/queryById", "anon");//采购入库,查询采购入库信息
filterChainDefinitionMap.put("/generic/**", "anon");//pdf预览需要文件
filterChainDefinitionMap.put("/generic/**", "anon");//pdf预览需要文件
filterChainDefinitionMap.put("/", "anon");
filterChainDefinitionMap.put("/doc.html", "anon");
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!