Skip to content

张雷 / skboot-zhongye

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

分数统计功能

1 个父辈 4246dd0d
内嵌 并排
正在显示 14 个修改的文件 包含 219 行增加 和 66 行删除
sk-base-common/src/main/java/com/skua/modules/system/service/impl/PgServiceImpl.java
......@@ -194,8 +194,8 @@ public class PgServiceImpl implements IPgService {
}
}
str.append("''");
String sql = "SELECT nm,v FROM "+deviceId+"_count WHERE nm IN ( "+str.toString()+" ) " +
" AND ts = ( SELECT max( ts ) FROM "+deviceId+"_count WHERE ts >= '"+start+"' AND ts <= '"+end+"' )";
String sql = "SELECT nm,ROUND(AVG(CAST(v AS NUMERIC)),2) AS v FROM "+deviceId+"_count WHERE nm IN ( "+str.toString()+" ) " +
" AND ts >= '"+start+"' AND ts <= '"+end+"' GROUP BY nm";
list = pgDb.queryForList(sql);
}catch (Exception e){
log.error("查询计算表出错");
......
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhMeetingController.java
......@@ -67,7 +67,6 @@ public class AjhMeetingController {
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@AutoLog(value = "会议通知-分页列表查询")
@ApiOperation(value="会议通知-分页列表查询", notes="会议通知-分页列表查询")
@GetMapping(value = "/list")
......@@ -83,6 +82,28 @@ public class AjhMeetingController {
return result;
}
@AutoLog(value = "会议通知-撤回")
@ApiOperation(value="会议通知-撤回", notes="会议通知-撤回")
@GetMapping(value = "/revoke")
public Result<AjhMeeting> revokeRecord(String id) {
Result<AjhMeeting> result = new Result<AjhMeeting>();
boolean ok = false;
AjhMeeting ajhMeeting = ajhMeetingService.getById(id);
if(ConvertUtils.isNotEmpty(ajhMeeting)){
ok = ajhMeetingService.revoke(ajhMeeting);
if(ok){
result.success("撤回成功！");
}else{
result.error500("撤回失败！已有机构发布通知！");
}
}else{
result.error500("撤回失败！通知不存在！");
}
result.setSuccess(ok);
result.setResult(ajhMeeting);
return result;
}
/**
* <pre>
* 添加
......@@ -119,8 +140,8 @@ public class AjhMeetingController {
@PostMapping(value = "/release")
public Result<AjhMeeting> release(@RequestBody AjhMeeting ajhMeeting) {
Result<AjhMeeting> result = new Result<AjhMeeting>();
boolean ok = false;
try {
boolean ok = false;
ajhMeeting.setSender(BaseContextHandler.getUserId());
ajhMeeting.setSendTime(new Date());
ajhMeeting.setSendStatus("1");//状态修改为已发布
......
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhMeetingSendController.java
......@@ -349,12 +349,15 @@ public class AjhMeetingSendController {
if(ajhMeetingSend != null ){
if(StringUtils.isNotEmpty(ajhMeetingSend.getMeetCompere())){
SysUser sysUser = userService.getById(ajhMeetingSend.getMeetCompere());
ajhMeetingSend.setMeetCompereName( sysUser.getRealname());
if(sysUser != null){
ajhMeetingSend.setMeetCompereName(sysUser.getRealname());
}
}
if(StringUtils.isNotEmpty(ajhMeetingSend.getDepartId()) && StringUtils.isEmpty(ajhMeetingSend.getDepartName())){
SysDepart depart = departService.getById(ajhMeetingSend.getDepartId());
ajhMeetingSend.setDepartName( depart.getDepartName());
if(depart != null){
ajhMeetingSend.setDepartName(depart.getDepartName());
}
}
}
if(ajhMeetingSend==null) {
......
sk-module-biz/src/main/java/com/skua/modules/ajh/service/IAjhMeetingService.java
......@@ -18,4 +18,6 @@ public interface IAjhMeetingService extends IService<AjhMeeting> {
IPage<AjhMeeting> queryPageList(Page<AjhMeeting> page, AjhMeeting ajhMeeting);
AjhMeetingVO getDataById(String id);
boolean revoke(AjhMeeting ajhMeeting);
}
......
sk-module-biz/src/main/java/com/skua/modules/ajh/service/impl/AjhMeetingServiceImpl.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.util.ConvertUtils;
import com.skua.modules.ajh.entity.AjhMeeting;
import com.skua.modules.ajh.entity.AjhMeetingSend;
import com.skua.modules.ajh.mapper.AjhMeetingMapper;
......@@ -40,51 +42,60 @@ public class AjhMeetingServiceImpl extends ServiceImpl<AjhMeetingMapper, AjhMeet
@Override
public void sendMeettingNotice(AjhMeeting ajhMeeting) {
//获取所有的有会议权限的用户
List<Map<String,String>> userList = ajhMeetingMapper.getMeetUsers(MEET_NOTICE_ROLE_CODE);
if(userList.size() > 0){
Map<String,String> departMap = new HashMap<>();
//获取所有的水厂
List<SysDepart> departList = sysDepartService.getFactoryList();
if(departList.size() > 0){
for (SysDepart depart: departList) {
departMap.put(depart.getId(),"factory");
}
Map<String,String> userMap = new HashMap<>();
for (Map<String,String> map: userList) {
userMap.put(map.get("departId"),map.get("userIds"));
}
//创建会议记录
String departs = ajhMeeting.getDepartIds();
String[] departIds = departs.split(",");
for (String depart : departIds) {
//只针对水厂进行通知
if(departMap.get(depart)!=null){
//创建厂区会议记录
AjhMeetingSend ajhMeetingSend = new AjhMeetingSend();
ajhMeetingSend.setMeetId(ajhMeeting.getId());
ajhMeetingSend.setMeetTitle(ajhMeeting.getMeetTitile());
ajhMeetingSend.setMinutesTemplate(ajhMeeting.getMinutesTemplate());
ajhMeetingSend.setMeetContent(ajhMeeting.getMeetContent());
ajhMeetingSend.setMeetTime(ajhMeeting.getStartTime()+"至"+ajhMeeting.getEndTime());
ajhMeetingSend.setMeetStatus(0);
ajhMeetingSend.setAcceptFlag("3");
ajhMeetingSend.setDepartId(depart);
ajhMeetingSendService.save(ajhMeetingSend);
//发送通知
if(userMap.get(depart) != null && ajhMeetingSend.getId() != null){
SystemNoticeVO systemNoticeVO = new SystemNoticeVO();
systemNoticeVO.setContent(ajhMeeting.getMeetContent());
systemNoticeVO.setDepartId(depart);
systemNoticeVO.setUserIds(userMap.get(depart));
systemNoticeUtils.meetNoticeMessage(systemNoticeVO,ajhMeetingSend.getId(),ajhMeetingSend.getMeetTitle(),"factory");
//判断是否已经创建完通知
QueryWrapper<AjhMeetingSend> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("meet_id",ajhMeeting.getId());
List<AjhMeetingSend> list = ajhMeetingSendService.getList(queryWrapper);
if(list.size() > 0){
for (AjhMeetingSend ajhMeetingSend : list) {
ajhMeetingSend.setSendStatus("0");
}
ajhMeetingSendService.saveOrUpdateBatch(list);
}else{
//获取所有的有会议权限的用户
List<Map<String,String>> userList = ajhMeetingMapper.getMeetUsers(MEET_NOTICE_ROLE_CODE);
if(userList.size() > 0){
Map<String,String> departMap = new HashMap<>();
//获取所有的水厂
List<SysDepart> departList = sysDepartService.getFactoryList();
if(departList.size() > 0){
for (SysDepart depart: departList) {
departMap.put(depart.getId(),"factory");
}
Map<String,String> userMap = new HashMap<>();
for (Map<String,String> map: userList) {
userMap.put(map.get("departId"),map.get("userIds"));
}
//创建会议记录
String departs = ajhMeeting.getDepartIds();
String[] departIds = departs.split(",");
for (String depart : departIds) {
//只针对水厂进行通知
if(departMap.get(depart)!=null){
//创建厂区会议记录
AjhMeetingSend ajhMeetingSend = new AjhMeetingSend();
ajhMeetingSend.setMeetId(ajhMeeting.getId());
ajhMeetingSend.setMeetTitle(ajhMeeting.getMeetTitile());
ajhMeetingSend.setMinutesTemplate(ajhMeeting.getMinutesTemplate());
ajhMeetingSend.setMeetContent(ajhMeeting.getMeetContent());
ajhMeetingSend.setMeetTime(ajhMeeting.getStartTime()+"至"+ajhMeeting.getEndTime());
ajhMeetingSend.setMeetStatus(0);
ajhMeetingSend.setAcceptFlag("3");
ajhMeetingSend.setDepartId(depart);
ajhMeetingSendService.save(ajhMeetingSend);
//发送通知
if(userMap.get(depart) != null && ajhMeetingSend.getId() != null){
SystemNoticeVO systemNoticeVO = new SystemNoticeVO();
systemNoticeVO.setContent(ajhMeeting.getMeetContent());
systemNoticeVO.setDepartId(depart);
systemNoticeVO.setUserIds(userMap.get(depart));
systemNoticeUtils.meetNoticeMessage(systemNoticeVO,ajhMeetingSend.getId(),ajhMeetingSend.getMeetTitle(),"factory");
}
}
}
}
}
}
}
@Override
......@@ -99,4 +110,20 @@ public class AjhMeetingServiceImpl extends ServiceImpl<AjhMeetingMapper, AjhMeet
AjhMeetingVO ajhMeeting = ajhMeetingMapper.getDataById(id);
return ajhMeeting;
}
@Override
public boolean revoke(AjhMeeting ajhMeeting) {
QueryWrapper<AjhMeetingSend> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("meet_id",ajhMeeting.getId());
List<AjhMeetingSend> list = ajhMeetingSendService.getList(queryWrapper);
for (AjhMeetingSend ajhMeetingSend : list) {
ajhMeetingSend.setSendStatus("2");
}
boolean ok = ajhMeetingSendService.saveOrUpdateBatch(list);
if(ok){
ajhMeeting.setSendStatus("0");//状态修改为未发布
ajhMeetingMapper.updateById(ajhMeeting);
}
return ok;
}
}
......
sk-module-biz/src/main/java/com/skua/modules/assessment/controller/DataAssessmentSocreMasterController.java
......@@ -11,6 +11,7 @@ import com.skua.core.util.ConvertUtils;
import com.skua.modules.assessment.entity.DataAssessmentSocreMaster;
import com.skua.modules.assessment.service.IDataAssessmentSocreMasterService;
import com.skua.modules.assessment.vo.DataAssessmentSocreMasterVO;
import com.skua.modules.emergency.entity.DangerousOperation;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
......@@ -93,7 +94,8 @@ public class DataAssessmentSocreMasterController {
QueryWrapper<DataAssessmentSocreMaster> query = new QueryWrapper<DataAssessmentSocreMaster>();
query.eq("report_id",dataAssessmentSocreMaster.getReportId());
query.eq("assessment_date",dataAssessmentSocreMaster.getAssessmentDate());
query.eq("assessment_user",dataAssessmentSocreMaster.getAssessmentUser());
query.eq(ConvertUtils.isNotEmpty(dataAssessmentSocreMaster.getAssessmentUser()),"assessment_user",dataAssessmentSocreMaster.getAssessmentUser());
query.eq("depart_id",dataAssessmentSocreMaster.getDepartId());
List<DataAssessmentSocreMaster> list = dataAssessmentSocreMasterService.list(query);
if(list!=null&&list.size()>0) {
result.setResult("yes");
......@@ -185,6 +187,25 @@ public class DataAssessmentSocreMasterController {
return result;
}
@AutoLog(value = "绩效考核基础信息-办结流程")
@ApiOperation(value = "绩效考核基础信息-办结流程", notes = "绩效考核基础信息-办结流程")
@PostMapping(value = "/complete-process")
public Result<DangerousOperation> completeProcess(@RequestBody DataAssessmentSocreMaster purchaseInfo) {
Result<DangerousOperation> result = new Result<>();
try {
boolean flag = dataAssessmentSocreMasterService.completeProcess(purchaseInfo);
if (flag) {
result.success("办结成功!");
} else {
result.error500("办结失败!");
}
} catch (Exception e) {
log.error(e.getMessage(), e);
result.error500("办结失败");
}
return result;
}
@AutoLog(value = "绩效考核基础信息-修改业务数据及流程数据")
@ApiOperation(value="绩效考核基础信息-修改业务数据及流程数据", notes="绩效考核基础信息-修改业务数据及流程数据")
@PostMapping(value = "/editAndModifyProcess")
......@@ -202,7 +223,7 @@ public class DataAssessmentSocreMasterController {
/**
* 通过id查询
* @param id
* @param businessId
* @return
*/
@AutoLog(value = "绩效考核基础信息-通过id查询")
......
sk-module-biz/src/main/java/com/skua/modules/assessment/service/IDataAssessmentSocreMasterService.java
......@@ -49,4 +49,5 @@ public interface IDataAssessmentSocreMasterService extends IService<DataAssessme
List<DataAssessmentSocreMasterVO> getAllData(DataAssessmentSocreMasterVO dataAssessmentSocreMasterVO);
boolean completeProcess(DataAssessmentSocreMaster purchaseInfo);
}
......
sk-module-biz/src/main/java/com/skua/modules/assessment/service/impl/DataAssessmentItemServiceImpl.java
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.skua.core.context.BaseContextHandler;
import com.skua.core.util.ConvertUtils;
import com.skua.core.util.UUIDGenerator;
import com.skua.modules.assessment.entity.DataAssessmentItem;
import com.skua.modules.assessment.entity.DataAssessmentMessage;
......@@ -223,12 +224,16 @@ public class DataAssessmentItemServiceImpl extends ServiceImpl<DataAssessmentIte
QueryWrapper<DataAssessmentSocreMaster> dataAssessmentSocreMasterQueryWrapper = new QueryWrapper<>();
dataAssessmentSocreMasterQueryWrapper.eq("report_id",reportId);
dataAssessmentSocreMasterQueryWrapper.eq("assessment_date",dataMonth);
dataAssessmentSocreMasterQueryWrapper.eq("assessment_user",userId);
DataAssessmentSocreMaster assessmentSocreMaster = dataAssessmentSocreMasterService.getOne(dataAssessmentSocreMasterQueryWrapper);
assessmentSocreMaster.setAssessmentScore(totalScore);
assessmentSocreMaster.setLeaderScore(dataAssessmentItemSubmitVO.getLeaderScore());
assessmentSocreMaster.setSelfScore(dataAssessmentItemSubmitVO.getSelfScore());
dataAssessmentSocreMasterService.updateById(assessmentSocreMaster);
dataAssessmentSocreMasterQueryWrapper.eq(ConvertUtils.isNotEmpty(factoryId),"depart_id",factoryId);
dataAssessmentSocreMasterQueryWrapper.eq(ConvertUtils.isNotEmpty(userId),"assessment_user",userId);
List<DataAssessmentSocreMaster> masterList = dataAssessmentSocreMasterService.list(dataAssessmentSocreMasterQueryWrapper);
if(masterList.size()>0){
DataAssessmentSocreMaster assessmentSocreMaster = masterList.get(0);
assessmentSocreMaster.setAssessmentScore(totalScore);
assessmentSocreMaster.setLeaderScore(dataAssessmentItemSubmitVO.getLeaderScore());
assessmentSocreMaster.setSelfScore(dataAssessmentItemSubmitVO.getSelfScore());
dataAssessmentSocreMasterService.updateById(assessmentSocreMaster);
}
}
}
}
......
sk-module-biz/src/main/java/com/skua/modules/assessment/service/impl/DataAssessmentSocreMasterServiceImpl.java
......@@ -6,6 +6,8 @@ import com.skua.modules.assessment.entity.DataAssessmentSocreMaster;
import com.skua.modules.assessment.mapper.DataAssessmentSocreMasterMapper;
import com.skua.modules.assessment.service.IDataAssessmentSocreMasterService;
import com.skua.modules.assessment.vo.DataAssessmentSocreMasterVO;
import com.skua.modules.emergency.entity.DangerousOperation;
import com.skua.modules.flow.business.service.FlowBusinessService;
import com.skua.modules.flow.business.service.IFlowService;
import com.skua.modules.flow.core.constant.ProcessConstant;
import com.skua.modules.flow.core.entity.BladeFlow;
......@@ -13,22 +15,31 @@ import com.skua.modules.flow.core.utils.FlowUtil;
import com.skua.modules.flow.support.Kv;
import com.skua.modules.flow.utils.Func;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
import com.skua.modules.safe.service.IEnvironmentTargetService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
/**
* 绩效考核评分基础信息
*/
@Service
public class DataAssessmentSocreMasterServiceImpl extends ServiceImpl<DataAssessmentSocreMasterMapper, DataAssessmentSocreMaster> implements IDataAssessmentSocreMasterService {
@Autowired
private IFlowService flowService;
@Autowired
private FlowBusinessService flowBusinessService;
@Autowired
private IEnvironmentTargetService environmentTargetService;
@Override
public Page<DataAssessmentSocreMasterVO> queryCustomPageList(Page<DataAssessmentSocreMasterVO> pageList,
......@@ -79,5 +90,22 @@ public class DataAssessmentSocreMasterServiceImpl extends ServiceImpl<DataAssess
return baseMapper.getAllData(dataAssessmentSocreMasterVO);
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean completeProcess(DataAssessmentSocreMaster assessmentSocreMaster) {
boolean flag = false;//返回结果
DataAssessmentSocreMaster dataAssessmentSocreMaster = baseMapper.selectById(assessmentSocreMaster.getId());
if(dataAssessmentSocreMaster!=null){
this.updateById(dataAssessmentSocreMaster);
//调用同意接口
flag = flowBusinessService.completeTask(ProcessConstant.PASS_KEY, assessmentSocreMaster.getFlow());
//同步分数入环保目标表 写死 安全环保责任状ID
if("1859413989066813442".equals(dataAssessmentSocreMaster.getReportId())||
"1872156241933414401".equals(dataAssessmentSocreMaster.getReportId())){
environmentTargetService.addOrEdit(dataAssessmentSocreMaster);
}
}
return flag;
}
}
......
sk-module-biz/src/main/java/com/skua/modules/safe/service/IEnvironmentTargetService.java
package com.skua.modules.safe.service;
import com.skua.modules.assessment.entity.DataAssessmentSocreMaster;
import com.skua.modules.safe.entity.EnvironmentTarget;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.scheduling.annotation.Async;
/**
* 安环环保目标
......@@ -9,4 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
public interface IEnvironmentTargetService extends IService<EnvironmentTarget> {
boolean checkData(String departId, String targetYear);
@Async
void addOrEdit(DataAssessmentSocreMaster dataAssessmentSocreMaster);
}
......
sk-module-biz/src/main/java/com/skua/modules/safe/service/impl/EnvironmentTargetServiceImpl.java
package com.skua.modules.safe.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.skua.modules.assessment.entity.DataAssessmentSocreMaster;
import com.skua.modules.safe.entity.EnvironmentTarget;
import com.skua.modules.safe.mapper.EnvironmentTargetMapper;
import com.skua.modules.safe.service.IEnvironmentTargetService;
import io.swagger.annotations.ApiModelProperty;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
......@@ -16,6 +20,9 @@ import java.util.List;
@Service
public class EnvironmentTargetServiceImpl extends ServiceImpl<EnvironmentTargetMapper, EnvironmentTarget> implements IEnvironmentTargetService {
@Autowired
private EnvironmentTargetMapper environmentTargetMapper;
/***
* 校验一个水厂一年只能提交一次数据
* @param departId
......@@ -32,5 +39,36 @@ public class EnvironmentTargetServiceImpl extends ServiceImpl<EnvironmentTargetM
}
return true;
}
@Override
public void addOrEdit(DataAssessmentSocreMaster dataAssessmentSocreMaster) {
EnvironmentTarget environmentTarget = new EnvironmentTarget();
environmentTarget.setDepartId(dataAssessmentSocreMaster.getDepartId());
environmentTarget.setTargetYear(dataAssessmentSocreMaster.getAssessmentDate());
//1859413989066813442 //安全环保目标责任状（约束指标） constraintScore
if("1859413989066813442".equals(dataAssessmentSocreMaster.getReportId())){
environmentTarget.setConstraintScore(dataAssessmentSocreMaster.getSelfScore());
}
//1872156241933414401 //安全环保目标责任状（责任指标） liabilityScore
if("1872156241933414401".equals(dataAssessmentSocreMaster.getReportId())){
environmentTarget.setLiabilityScore(dataAssessmentSocreMaster.getSelfScore());
}
QueryWrapper<EnvironmentTarget> queryWrapper = new QueryWrapper();
queryWrapper.eq("depart_id" ,dataAssessmentSocreMaster.getDepartId()) ;
queryWrapper.eq("target_year" ,dataAssessmentSocreMaster.getAssessmentDate()) ;
List<EnvironmentTarget> list = this.baseMapper.selectList(queryWrapper);
if (list != null && !list.isEmpty()) {
EnvironmentTarget oldEnvironmentTarget = list.get(0);
environmentTarget.setId(oldEnvironmentTarget.getId());
environmentTarget.setDepartAncestors(oldEnvironmentTarget.getDepartAncestors());
environmentTarget.setWorkerDeathNum(oldEnvironmentTarget.getWorkerDeathNum());
environmentTarget.setSuddenlyNum(oldEnvironmentTarget.getSuddenlyNum());
environmentTarget.setNewCaseNum(oldEnvironmentTarget.getNewCaseNum());
environmentTarget.setExamScore(oldEnvironmentTarget.getExamScore());
environmentTargetMapper.updateById(oldEnvironmentTarget);
}else{
environmentTargetMapper.insert(environmentTarget);
}
}
}
......
sk-module-datafill/src/main/java/com/skua/modules/job/DayDataSyncJob.java
......@@ -35,7 +35,7 @@ public class DayDataSyncJob implements Job {
private ISysFactoryDeviceService sysFactoryDeviceService;
@Autowired
private IReportDataService reportDataService;
private DecimalFormat df = new DecimalFormat("######0.0000");
private DecimalFormat df = new DecimalFormat("######0");
/**
* 若参数变量名修改 QuartzJobController中也需对应修改
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/entity/EquipmentRepair.java
package com.skua.modules.equipment.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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -13,7 +10,6 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.skua.core.aspect.annotation.Dict;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
......@@ -26,7 +22,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
@Accessors(chain = true)
@ApiModel(value="equipment_repair对象", description="设备报修维修")
public class EquipmentRepair {
/**id*/
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "id")
......@@ -35,7 +31,7 @@ public class EquipmentRepair {
@Excel(name = "设备id", width = 15)
@ApiModelProperty(value = "设备id")
private java.lang.String infoId;
@ApiModelProperty(value = "机构ID")
private java.lang.String departId;
/**报修人*/
......@@ -133,7 +129,7 @@ public class EquipmentRepair {
@Excel(name = "维修后图片", width = 15)
@ApiModelProperty(value = "维修后图片")
private java.lang.String maintenancePhoto;
@ApiModelProperty(value = "委外原因")
private java.lang.String outsourceReason;
/**委外单位*/
......@@ -168,6 +164,9 @@ public class EquipmentRepair {
@Excel(name = "委外附件", width = 15)
@ApiModelProperty(value = "委外附件")
private java.lang.String outsourceFilepath;
/**维修费用*/
@ApiModelProperty(value = "维修费用")
private java.lang.String totalCost;
/**验收人员*/
@Excel(name = "验收人员", width = 15)
@ApiModelProperty(value = "验收人员")
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/vo/EquipmentRepairVO.java
......@@ -34,7 +34,7 @@ public class EquipmentRepairVO extends FlowEntity {
private java.lang.String installPosition;
@ApiModelProperty(value = "设备类型")
private java.lang.String equipmentType;
@ApiModelProperty(value = "机构ID")
private java.lang.String departId;
@ApiModelProperty(value = "机构名称")
......@@ -49,12 +49,12 @@ public class EquipmentRepairVO extends FlowEntity {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "报修时间")
private java.util.Date repairDate;
@ApiModelProperty(value = "报修开始时间")
private java.lang.String repairStartDate;
@ApiModelProperty(value = "报修结束时间")
private java.lang.String repairEndDate;
/**故障内容*/
@Excel(name = "故障内容", width = 15)
@ApiModelProperty(value = "故障内容")
......@@ -122,6 +122,9 @@ public class EquipmentRepairVO extends FlowEntity {
@Excel(name = "维修用时", width = 15)
@ApiModelProperty(value = "维修用时")
private java.lang.Double costHour;
/**维修费用*/
@ApiModelProperty(value = "维修费用")
private java.lang.String totalCost;
/**故障原因*/
@Excel(name = "故障原因", width = 15)
@ApiModelProperty(value = "故障原因")
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!