Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
336744f7 由 张雷
选项

通知记录功能修改

1 个父辈 87763050
内嵌 并排
正在显示 15 个修改的文件 包含 492 行增加 和 21 行删除
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhMeetingReceiptController.java
......@@ -95,8 +95,7 @@ public class AjhMeetingReceiptController {
@GetMapping(value = "/get")
public Result<IPage<AjhMeetingReceiptVO>> getPageList(AjhMeetingReceiptVO ajhMeetingReceiptVO,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
Result<IPage<AjhMeetingReceiptVO>> result = new Result<IPage<AjhMeetingReceiptVO>>();
Page<AjhMeetingReceiptVO> page = new Page<AjhMeetingReceiptVO>(pageNo, pageSize);
IPage<AjhMeetingReceiptVO> pageList = ajhMeetingReceiptService.get(page, ajhMeetingReceiptVO);
......
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhMeetingSendController.java
......@@ -81,14 +81,49 @@ public class AjhMeetingSendController {
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<AjhMeetingSend>> result = new Result<IPage<AjhMeetingSend>>();
QueryWrapper<AjhMeetingSend> queryWrapper = QueryGenerator.initQueryWrapper(ajhMeetingSend, req.getParameterMap());
QueryWrapper<AjhMeetingSend> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(ConvertUtils.isNotEmpty(ajhMeetingSend.getDepartId()),"depart_id",ajhMeetingSend.getDepartId());
queryWrapper.eq(ConvertUtils.isNotEmpty(ajhMeetingSend.getMeetStatus()),"meet_status",ajhMeetingSend.getMeetStatus());
queryWrapper.eq(ConvertUtils.isNotEmpty(ajhMeetingSend.getSendStatus()),"send_status",ajhMeetingSend.getSendStatus());
queryWrapper.like(ConvertUtils.isNotEmpty(ajhMeetingSend.getMeetTitle()),"meet_title",ajhMeetingSend.getMeetTitle());
queryWrapper.between(ConvertUtils.isNotEmpty(ajhMeetingSend.getMeetStartTime()),"meet_start_time",
ajhMeetingSend.getMeetStartTime()+" 00:00:00",ajhMeetingSend.getMeetEndTime()+" 23:59:59");
Page<AjhMeetingSend> page = new Page<AjhMeetingSend>(pageNo, pageSize);
IPage<AjhMeetingSend> pageList = ajhMeetingSendService.page(page, queryWrapper);
IPage<AjhMeetingSend> pageList = ajhMeetingSendService.queryPage(page, queryWrapper);
result.setSuccess(true);
result.setResult(pageList);
return result;
}
@AutoLog(value = "会议记录-数量统计")
@ApiOperation(value="会议记录-数量统计", notes="会议记录-数量统计")
@GetMapping(value = "/count")
public Result<Map<String,Object>> queryCount(AjhMeetingSend ajhMeetingSend) {
Result<Map<String,Object>> result = new Result<Map<String,Object>>();
QueryWrapper<AjhMeetingSend> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(ConvertUtils.isNotEmpty(ajhMeetingSend.getDepartId()),"depart_id",ajhMeetingSend.getDepartId());
queryWrapper.eq(ConvertUtils.isNotEmpty(ajhMeetingSend.getMeetStatus()),"meet_status",ajhMeetingSend.getMeetStatus());
queryWrapper.eq(ConvertUtils.isNotEmpty(ajhMeetingSend.getSendStatus()),"send_status",ajhMeetingSend.getSendStatus());
queryWrapper.like(ConvertUtils.isNotEmpty(ajhMeetingSend.getMeetTitle()),"meet_title",ajhMeetingSend.getMeetTitle());
queryWrapper.between(ConvertUtils.isNotEmpty(ajhMeetingSend.getMeetStartTime()),"meet_start_time",
ajhMeetingSend.getMeetStartTime()+" 00:00:00",ajhMeetingSend.getMeetEndTime()+" 23:59:59");
Map<String,Object> map = new HashMap<>();
int yes = 0;int no = 0;
List<AjhMeetingSend> list = ajhMeetingSendService.list(queryWrapper);
for (AjhMeetingSend bean : list) {
if("0".equals(bean.getSendStatus())){
no++;
}else if("1".equals(bean.getSendStatus())){
yes++;
}else{}
}
map.put("yes", yes);
map.put("no", no);
result.setSuccess(true);
result.setResult(map);
return result;
}
/**
* <pre>
* 添加
......
sk-module-biz/src/main/java/com/skua/modules/ajh/entity/AjhMeetingSend.java
......@@ -31,7 +31,6 @@ public class AjhMeetingSend {
@ApiModelProperty(value = "主键")
private String id;
/**会议ID*/
@Excel(name = "会议ID", width = 15)
@ApiModelProperty(value = "会议ID")
private String meetId;
/**机构ID*/
......@@ -111,30 +110,33 @@ public class AjhMeetingSend {
@Dict(dicCode = "meetting_status")
private Integer meetStatus;
/**创建人*/
@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 createTime;
/**更新人*/
@Excel(name = "更新人", width = 15)
@ApiModelProperty(value = "更新人")
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;
/**附件*/
/**机构名称*/
@TableField(exist = false)
@ApiModelProperty(value = "机构名称")
private java.lang.String departName;
/**邀请人数*/
@TableField(exist = false)
@ApiModelProperty(value = "邀请人数")
private java.lang.String inviteNum;
/**参与人数*/
@TableField(exist = false)
@ApiModelProperty(value = "参与人数")
private java.lang.String particNum;
}
......
sk-module-biz/src/main/java/com/skua/modules/ajh/mapper/AjhMeetingSendMapper.java
package com.skua.modules.ajh.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.core.api.vo.LoginUser;
import com.skua.modules.ajh.entity.AjhMeetingSend;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
......@@ -25,8 +28,9 @@ public interface AjhMeetingSendMapper extends BaseMapper<AjhMeetingSend> {
*/
public AjhMeetingSend queryByMeetId(@Param("meetId") String meetId);
@Select("SELECT *,IFNULL( r.count, 0 ) AS invite_num,IFNULL( a.count, 0 ) AS partic_num " +
" FROM ajh_meeting_send " +
" LEFT JOIN ( SELECT count( id ) count, meets_id FROM ajh_meeting_receipt GROUP BY meets_id ) r ON r.meets_id = id " +
" LEFT JOIN ( SELECT count( id ) count, meets_id FROM ajh_meeting_attend GROUP BY meets_id ) a ON a.meets_id = id ${ew.customSqlSegment}")
List<AjhMeetingSend> getListByWrapper(Page page,@Param("ew") QueryWrapper<AjhMeetingSend> queryWrapper);
}
......
sk-module-biz/src/main/java/com/skua/modules/ajh/service/IAjhMeetingSendService.java
package com.skua.modules.ajh.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.modules.ajh.entity.AjhMeetingSend;
import com.baomidou.mybatisplus.extension.service.IService;
import com.skua.modules.ajh.vo.AjhMeetingVO;
......@@ -30,4 +33,6 @@ public interface IAjhMeetingSendService extends IService<AjhMeetingSend> {
* @return
*/
public AjhMeetingSend queryByMeetId(String meetId);
IPage<AjhMeetingSend> queryPage(Page<AjhMeetingSend> page, QueryWrapper<AjhMeetingSend> queryWrapper);
}
......
sk-module-biz/src/main/java/com/skua/modules/ajh/service/impl/AjhMeetingSendServiceImpl.java
package com.skua.modules.ajh.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.core.api.vo.LoginUser;
import com.skua.modules.ajh.entity.AjhMeetingAttend;
import com.skua.modules.ajh.entity.AjhMeetingMinutes;
......@@ -170,4 +173,11 @@ public class AjhMeetingSendServiceImpl extends ServiceImpl<AjhMeetingSendMapper,
public AjhMeetingSend queryByMeetId(String meetId){
return ajhMeetingSendMapper.queryByMeetId( meetId );
}
@Override
public IPage<AjhMeetingSend> queryPage(Page<AjhMeetingSend> page, QueryWrapper<AjhMeetingSend> queryWrapper) {
List<AjhMeetingSend> list = ajhMeetingSendMapper.getListByWrapper(page, queryWrapper);
page.setRecords(list);
return page;
}
}
......
sk-module-biz/src/main/java/com/skua/modules/material/controller/MaterialInfoController.java
......@@ -66,7 +66,6 @@ public class MaterialInfoController {
* @param materialInfo
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "厂区资料管理-分页列表查询")
......@@ -74,8 +73,7 @@ public class MaterialInfoController {
@GetMapping(value = "/list")
public Result<IPage<MaterialInfo>> queryPageList(MaterialInfo materialInfo,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
String departIds = null;
Result<IPage<MaterialInfo>> result = new Result<IPage<MaterialInfo>>();
Page<MaterialInfo> page = new Page<MaterialInfo>(pageNo, pageSize);
......
sk-module-biz/src/main/java/com/skua/modules/material/mapper/xml/MaterialInfoMapper.xml
......@@ -68,5 +68,8 @@
<if test="materialInfo.facInformationName!=null and materialInfo.facInformationName!=''">
and fac_information_name like CONCAT(CONCAT('%', #{materialInfo.facInformationName}),'%')
</if>
<if test="materialInfo.rulesType!=null and materialInfo.rulesType!=''">
and rules_type like CONCAT(CONCAT('%', #{materialInfo.rulesType}),'%')
</if>
</select>
</mapper>
......
sk-module-datafill/src/main/java/com/skua/modules/custom/mapper/xml/FCustomReportDatasetMapper.xml
......@@ -189,18 +189,27 @@
v9.CSPH as csph,
v9.CSTN as cstn,
v9.CSZL as cstp,
v9.JSSS as jsss,
v9.CSSS as csss,
v3.qt5,v3.qt4,v3.qt3,v3.qt2,v3.qt1,
v3.scqk5,v3.scqk4,v3.scqk3,v3.scqk2,v3.scqk1,
v3.id,v3.zwncb,v3.tnlgyy,v3.sjtnl,
v3.lltnl,v3.wnndgyy,v3.zsjwnnd,v3.llwnnd,v3.yjyy,v3.dhyy,
v8.dlhj,v8.yjhl,v8.wnl,
v2.zclsl,v2.rjclsl
v2.zclsl,v2.rjclsl,
t.target_power as dsdhnmb,
round(v8.dlhj/(v2.zclsl*10000),2) as dsdhzsj,
'' as dsdhdb,
t.target_drug as yjnmb,
round(v8.yjhl/(v2.zclsl*10000),2) as yjzsj,
'' as yjdb,
f.pro_scale as sjgm
FROM
sys_depart d
LEFT JOIN (SELECT * FROM view_30a8 WHERE depart_id = #{departId} AND time = #{dataTime} AND zs = #{week}) v3 on v3.depart_id = d.id
LEFT JOIN (SELECT
ROUND(AVG(JSCOD),2) JSCOD,ROUND(AVG(JSAD),2) JSAD,ROUND(AVG(JSPH),2) JSPH,ROUND(AVG(JSZD),2) JSZD,ROUND(AVG(JSZL),2) JSZL,
ROUND(AVG(CSCOD),2) CSCOD,ROUND(AVG(CSAD),2) CSAD,ROUND(AVG(CSPH),2) CSPH,ROUND(AVG(CSTN),2) CSTN,ROUND(AVG(CSZL),2) CSZL,
ROUND(AVG(JSCOD),2) JSCOD,ROUND(AVG(JSAD),2) JSAD,ROUND(AVG(JSPH),2) JSPH,ROUND(AVG(JSZD),2) JSZD,ROUND(AVG(JSZL),2) JSZL,ROUND(AVG(JSSS),2) JSSS,
ROUND(AVG(CSCOD),2) CSCOD,ROUND(AVG(CSAD),2) CSAD,ROUND(AVG(CSPH),2) CSPH,ROUND(AVG(CSTN),2) CSTN,ROUND(AVG(CSZL),2) CSZL,ROUND(AVG(CSSS),2) CSSS,
depart_id
FROM view_9bff
WHERE depart_id = #{departId} AND time &gt;= #{startDate} AND time &lt;= #{endDate} ) v9 on v9.depart_id = d.id
......@@ -216,6 +225,8 @@
depart_id
FROM view_2119
WHERE depart_id = #{departId} AND time &gt;= #{startDate} AND time &lt;= #{endDate} ) v2 on v2.depart_id = d.id
LEFT JOIN sys_factory_info f on f.depart_id = d.id
LEFT JOIN report_target_config t on t.depart_id = d.id
WHERE
d.id = #{departId}
</select>
......
sk-module-system/src/main/java/com/skua/modules/system/controller/SysFactoryUserDataController.java 0 → 100644
package com.skua.modules.system.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.service.ISequenceService;
import com.skua.core.util.ConvertUtils;
import com.skua.modules.system.entity.SysFactoryUserData;
import com.skua.modules.system.service.ISysFactoryUserDataService;
import java.util.Date;
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;
/**
* 人员证书管理
*/
@Slf4j
@Api(tags="人员证书管理")
@RestController
@RequestMapping("/system/sysFactoryUserData")
public class SysFactoryUserDataController {
@Autowired
private ISysFactoryUserDataService sysFactoryUserDataService;
/**
* <pre>
* 分页列表查询
* </pre>
* @param sysFactoryUserData
* @param pageNo
* @param pageSize
* @param req
* @return
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@AutoLog(value = "人员证书管理-分页列表查询")
@ApiOperation(value="人员证书管理-分页列表查询", notes="人员证书管理-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<SysFactoryUserData>> queryPageList(SysFactoryUserData sysFactoryUserData,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<SysFactoryUserData>> result = new Result<IPage<SysFactoryUserData>>();
QueryWrapper<SysFactoryUserData> queryWrapper = QueryGenerator.initQueryWrapper(sysFactoryUserData, req.getParameterMap());
Page<SysFactoryUserData> page = new Page<SysFactoryUserData>(pageNo, pageSize);
IPage<SysFactoryUserData> pageList = sysFactoryUserDataService.page(page, queryWrapper);
result.setSuccess(true);
result.setResult(pageList);
return result;
}
/**
* <pre>
* 添加
* </pre>
* @param sysFactoryUserData
* @return
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@AutoLog(value = "人员证书管理-添加")
@ApiOperation(value="人员证书管理-添加", notes="人员证书管理-添加")
@PostMapping(value = "/add")
public Result<SysFactoryUserData> add(@RequestBody SysFactoryUserData sysFactoryUserData) {
Result<SysFactoryUserData> result = new Result<SysFactoryUserData>();
try {
sysFactoryUserDataService.save(sysFactoryUserData);
result.success("添加成功！");
} catch (Exception e) {
log.error(e.getMessage(),e);
result.error500("操作失败");
}
return result;
}
/**
* <pre>
* 编辑
* </pre>
* @param sysFactoryUserData
* @return
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@AutoLog(value = "人员证书管理-编辑")
@ApiOperation(value="人员证书管理-编辑", notes="人员证书管理-编辑")
@PutMapping(value = "/edit")
public Result<SysFactoryUserData> edit(@RequestBody SysFactoryUserData sysFactoryUserData) {
Result<SysFactoryUserData> result = new Result<SysFactoryUserData>();
SysFactoryUserData sysFactoryUserDataEntity = sysFactoryUserDataService.getById(sysFactoryUserData.getId());
if(sysFactoryUserDataEntity==null) {
result.error500("未找到对应实体");
}else {
boolean ok = sysFactoryUserDataService.updateById(sysFactoryUserData);
//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 {
sysFactoryUserDataService.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<SysFactoryUserData> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
Result<SysFactoryUserData> result = new Result<SysFactoryUserData>();
if(ids==null || "".equals(ids.trim())) {
result.error500("参数不识别！");
}else {
this.sysFactoryUserDataService.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<SysFactoryUserData> queryById(@RequestParam(name="id",required=true) String id) {
Result<SysFactoryUserData> result = new Result<SysFactoryUserData>();
SysFactoryUserData sysFactoryUserData = sysFactoryUserDataService.getById(id);
if(sysFactoryUserData==null) {
result.error500("未找到对应实体");
}else {
result.setResult(sysFactoryUserData);
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<SysFactoryUserData> queryWrapper = null;
try {
String paramsStr = request.getParameter("paramsStr");
if (ConvertUtils.isNotEmpty(paramsStr)) {
String deString = URLDecoder.decode(paramsStr, "UTF-8");
SysFactoryUserData sysFactoryUserData = JSON.parseObject(deString, SysFactoryUserData.class);
queryWrapper = QueryGenerator.initQueryWrapper(sysFactoryUserData, request.getParameterMap());
}
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
//Step.2 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
List<SysFactoryUserData> pageList = sysFactoryUserDataService.list(queryWrapper);
//导出文件名称
mv.addObject(NormalExcelConstants.FILE_NAME, "人员证书管理列表");
mv.addObject(NormalExcelConstants.CLASS, SysFactoryUserData.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<SysFactoryUserData> listSysFactoryUserDatas = ExcelImportUtil.importExcel(file.getInputStream(), SysFactoryUserData.class, params);
sysFactoryUserDataService.saveBatch(listSysFactoryUserDatas);
return Result.ok("文件导入成功！数据行数:" + listSysFactoryUserDatas.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-system/src/main/java/com/skua/modules/system/entity/SysFactoryUserData.java 0 → 100644
package com.skua.modules.system.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
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("sys_factory_user_data")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="sys_factory_user_data对象", description="人员证书管理")
public class SysFactoryUserData {
/**主键*/
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "主键")
private String id;
/**成员ID*/
@Excel(name = "成员ID", width = 15)
@ApiModelProperty(value = "成员ID")
@Dict(dicCode = "id",dictTable = "sys_user",dicText = "realname")
private String userId;
/**证件名称*/
@Excel(name = "证件名称", width = 15)
@ApiModelProperty(value = "证件名称")
private String certifiesName;
/**证件类型*/
@Excel(name = "证件类型", width = 15)
@ApiModelProperty(value = "证件类型")
@Dict(dicCode = "certifies_type")
private String certifiesType;
/**附件*/
@Excel(name = "附件", width = 15)
@ApiModelProperty(value = "附件")
private String certifiesFile;
/**到期时间*/
@Excel(name = "到期时间", width = 15)
@ApiModelProperty(value = "到期时间")
private String endTime;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private String remark;
/**上传人*/
@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 createTime;
/**更新人*/
@Excel(name = "更新人", width = 15)
@ApiModelProperty(value = "更新人")
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;
/**厂站ID*/
@Excel(name = "厂站ID", width = 15)
@ApiModelProperty(value = "厂站ID")
private String createDept;
/**delFlag*/
@Excel(name = "delFlag", width = 15)
@ApiModelProperty(value = "delFlag")
private Integer delFlag;
}
sk-module-system/src/main/java/com/skua/modules/system/mapper/SysFactoryUserDataMapper.java 0 → 100644
package com.skua.modules.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.skua.modules.system.entity.SysFactoryUserData;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 人员证书管理
*/
public interface SysFactoryUserDataMapper extends BaseMapper<SysFactoryUserData> {
}
sk-module-system/src/main/java/com/skua/modules/system/mapper/xml/SysFactoryUserDataMapper.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.system.mapper.SysFactoryUserDataMapper">
</mapper>
\ No newline at end of file
sk-module-system/src/main/java/com/skua/modules/system/service/ISysFactoryUserDataService.java 0 → 100644
package com.skua.modules.system.service;
import com.skua.modules.system.entity.SysFactoryUserData;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* 人员证书管理
*/
public interface ISysFactoryUserDataService extends IService<SysFactoryUserData> {
}
sk-module-system/src/main/java/com/skua/modules/system/service/impl/SysFactoryUserDataServiceImpl.java 0 → 100644
package com.skua.modules.system.service.impl;
import com.skua.modules.system.entity.SysFactoryUserData;
import com.skua.modules.system.mapper.SysFactoryUserDataMapper;
import com.skua.modules.system.service.ISysFactoryUserDataService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* 人员证书管理
*/
@Service
public class SysFactoryUserDataServiceImpl extends ServiceImpl<SysFactoryUserDataMapper, SysFactoryUserData> implements ISysFactoryUserDataService {
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!