diff --git a/omp/mybatis-gen/config.properties b/omp/mybatis-gen/config.properties
new file mode 100644
index 0000000000000000000000000000000000000000..b65369f49201f45b3ecc1238a5a741b8cd437d90
--- /dev/null
+++ b/omp/mybatis-gen/config.properties
@@ -0,0 +1,7 @@
+jdbc.driver=com.mysql.cj.jdbc.Driver
+jdbc.url=jdbc:mysql://121.4.218.235:3306/omp_repaire
+jdbc.user=root
+jdbc.password=beian123@$
+
+target.model.package=com.platform.omp.admin.dataobject
+target.client.package=com.platform.omp.admin.mapper
diff --git a/omp/mybatis-gen/config.xml b/omp/mybatis-gen/config.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0f137435f9214022179b4a78e40898d7ff18d9ff
--- /dev/null
+++ b/omp/mybatis-gen/config.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/omp/mybatis-gen/gen.bat b/omp/mybatis-gen/gen.bat
new file mode 100644
index 0000000000000000000000000000000000000000..1bb316db0add9fb349a48d1587f248f354fe760e
--- /dev/null
+++ b/omp/mybatis-gen/gen.bat
@@ -0,0 +1,6 @@
+@ECHO OFF
+del /f /s /q ..\spcore-dao\src\main\resources\mappers\auto
+md ..\spcore-dao\src\main\resources\mappers\auto
+java -cp .;mybatis-generator-core-1.3.3-SNAPSHOT-baidu.jar org.mybatis.generator.api.ShellRunner -configfile config.xml -overwrite
+pause
+@ECHO ON
diff --git a/omp/mybatis-gen/gen.sh b/omp/mybatis-gen/gen.sh
new file mode 100644
index 0000000000000000000000000000000000000000..6e7b877464f54915c4f053baff0e426280a273e0
--- /dev/null
+++ b/omp/mybatis-gen/gen.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+rm -rf ../src/main/resources/mapper/auto
+mkdir -p ../src/main/resources/mapper/auto
+mkdir -p ../src/main/java
+java -cp .:mybatis-generator-core-1.3.3-SNAPSHOT-baidu.jar org.mybatis.generator.api.ShellRunner -configfile config.xml -overwrite
+echo "\033[32m Gen SUCCESSFUL!!! \033[0m"
diff --git a/omp/mybatis-gen/mybatis-generator-core-1.3.3-SNAPSHOT-baidu.jar b/omp/mybatis-gen/mybatis-generator-core-1.3.3-SNAPSHOT-baidu.jar
new file mode 100644
index 0000000000000000000000000000000000000000..7a51990200dc126ebf55af2f8c3cc6ab793fa6c2
Binary files /dev/null and b/omp/mybatis-gen/mybatis-generator-core-1.3.3-SNAPSHOT-baidu.jar differ
diff --git a/omp/mybatis-gen/mysql-connector-java-5.1.26.jar b/omp/mybatis-gen/mysql-connector-java-5.1.26.jar
new file mode 100644
index 0000000000000000000000000000000000000000..043469f26f8cf1f545e56900909abf9f60f7c233
Binary files /dev/null and b/omp/mybatis-gen/mysql-connector-java-5.1.26.jar differ
diff --git a/omp/mybatis-gen/mysql-connector-java-8.0.20.jar b/omp/mybatis-gen/mysql-connector-java-8.0.20.jar
new file mode 100644
index 0000000000000000000000000000000000000000..f4bd73914919d75fb50b58075de6a846e3f7b7d8
Binary files /dev/null and b/omp/mybatis-gen/mysql-connector-java-8.0.20.jar differ
diff --git a/omp/src/main/java/com/platform/omp/OperationalModule/shiftManagementFlow/controller/RotationController.java b/omp/src/main/java/com/platform/omp/OperationalModule/shiftManagementFlow/controller/RotationController.java
new file mode 100644
index 0000000000000000000000000000000000000000..d490dd52671c4bc1ba2866d2e131ad01f20074d1
--- /dev/null
+++ b/omp/src/main/java/com/platform/omp/OperationalModule/shiftManagementFlow/controller/RotationController.java
@@ -0,0 +1,58 @@
+package com.platform.omp.OperationalModule.shiftManagementFlow.controller;
+
+import com.platform.omp.admin.dataobject.RotationDo;
+import com.platform.omp.admin.dto.RotationDto;
+import com.platform.omp.admin.dto.RotationQueryDto;
+import com.platform.omp.admin.service.RotationService;
+import com.platform.omp.common.utils.PageTableRequest;
+import com.platform.omp.common.utils.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 交接班管理
+ * */
+@RestController
+@Api(tags = "交接班管理")
+@RequestMapping("/rotation")
+public class RotationController {
+
+ @Autowired
+ private RotationService rotationService;
+
+ @PostMapping("/query")
+ @ApiOperation("分页查询交接班信息")
+ public Result query(PageTableRequest pageTableRequest, @RequestBody RotationQueryDto rotationQueryDto){
+ return rotationService.queryWithPage(pageTableRequest.getOffset(), pageTableRequest.getLimit(), rotationQueryDto);
+ }
+
+ @PostMapping("/relief/{id}")
+ @ApiOperation("接班")
+ public Result relief(@PathVariable String id){
+ rotationService.relief(id);
+ return Result.ok();
+ }
+
+ @PostMapping("/add")
+ @ApiOperation("新增交接班记录")
+ public Result add(@RequestBody RotationDo rotationDo){
+ rotationService.add(rotationDo);
+ return Result.ok();
+ }
+
+ @PostMapping("/update")
+ @ApiOperation("修改交接班记录")
+ public Result update(@RequestBody RotationDo rotationDo){
+ rotationService.update(rotationDo);
+ return Result.ok();
+ }
+
+ @PostMapping("/view")
+ @ApiOperation("交接班记录详情")
+ public Result view(@PathVariable String id){
+ return Result.ok().data(rotationService.view(id));
+ }
+
+}
diff --git a/omp/src/main/java/com/platform/omp/activiti/controller/InjureController.java b/omp/src/main/java/com/platform/omp/activiti/controller/InjureController.java
index e2eb5b3aaae35566462509f7e4ee30a290d82e81..104617ab0bd7135dac7a43618725d242e7aec2d4 100644
--- a/omp/src/main/java/com/platform/omp/activiti/controller/InjureController.java
+++ b/omp/src/main/java/com/platform/omp/activiti/controller/InjureController.java
@@ -7,10 +7,13 @@ import com.platform.omp.activiti.mapper.LeaveApplyMapper;
import com.platform.omp.activiti.pagemodel.*;
import com.platform.omp.activiti.pagemodel.Process;
import com.platform.omp.activiti.po.ActiviDCustomerinjure;
+import com.platform.omp.activiti.po.Customerinjureprocess;
import com.platform.omp.activiti.po.LeaveApply;
import com.platform.omp.activiti.service.InjureActivitiService;
import com.platform.omp.activiti.service.LeaveService;
import com.platform.omp.activiti.service.SystemService;
+import com.platform.omp.activiti.vo.CustomerInjureProcessPesponseVo;
+import com.platform.omp.activiti.vo.CustomerInjureProcessVo;
import com.platform.omp.common.utils.PageTableRequest;
import com.platform.omp.common.utils.Result;
import com.platform.omp.security.dto.JwtUserDto;
@@ -96,29 +99,29 @@ public class InjureController {
//添加根据id查询流程状态,当为处理中或者已完成时候,不可再进行提交流程
if (StringUtils.isNotEmpty(dCustomerinjure.getId())) {
DCustomerinjureEntity resultEntity = injureActivitiService.queryDCustomerinjureById(dCustomerinjure);
- String checkstate = resultEntity.getCheckstate();
//判断审核状态 0:待提交,1:审核中,2:审核未通过,3.审核已通过4.已完成,5.审核不通过需要调整
- if (!checkstate.equals("0") || !checkstate.equals("5")) {
+ if (Objects.nonNull(resultEntity)) {
return Result.error().data("该客伤信息已提交,请务重复提交");
}
}
injureActivitiService.startWorkflow(dCustomerinjure, userid, variables);
+
return Result.ok().data("sucess");
}
- @ApiOperation("客伤信息审核")
+ @ApiOperation("客伤信息流程")
@PreAuthorize("hasAnyAuthority('activiti:injurereview')")
- @RequestMapping(value = "/injureInforeview/{processInstanceId}", method = RequestMethod.POST)
+ @RequestMapping(value = "/injureInforeview", method = RequestMethod.POST)
@ResponseBody
- public Result injureInfoReview(@PathVariable("processInstanceId") String processInstanceId, String approve, String userId) {
+ public Result injureInfoReview(@RequestBody CustomerInjureProcessVo injureProcessVo) {
String userid = getUserid();
Result result = Result.ok().data("success");
//需要判断登录人是否有该权限
// List injure1 = taskservice.createTaskQuery().processInstanceId(processInstanceId).taskAssignee(injureInApprove).list();
// List injure2 = taskservice.createTaskQuery().processDefinitionKey("injure").taskCandidateUser(injureInApprove).list();
//Task injure = taskservice.createTaskQuery().processInstanceId(processInstanceId).singleResult();
- Task injureTask = taskservice.createTaskQuery().processDefinitionKey("injure").processInstanceId(processInstanceId).taskCandidateUser(userId).singleResult();
+ Task injureTask = taskservice.createTaskQuery().processDefinitionKey("injure").processInstanceId(injureProcessVo.getProcessInstanceId()).taskCandidateUser(injureProcessVo.getUserID()).singleResult();
//TODO 修改流程图中文为英文名, 然后根据任务英文名进行分步骤处理 流程节点, 统一这一个方法处理所有流程节点的走向
//todo 问题点: 客伤列表显示逻辑 1.提交人显示自己提交的列表信息,上级部门显示该部门下所有提交记录,以此类推
//todo 当流程结束,显示每个流程节点信息,办理按钮隐藏,只有查看按钮, 流程没有结束继续走流程
@@ -137,32 +140,32 @@ public class InjureController {
String taskName = injureTask.getName();
switch (taskName) {
case "injurereviewprocess":
- result = injureActivitiService.injurereviewprocess(injureTask, processInstanceId, approve, userid);
+ result = injureActivitiService.injurereviewprocess(injureTask, injureProcessVo);
break;
case "injureJudgmentProcess":
- result = injureActivitiService.injureJudgmentProcess(injureTask, userid);
+ result = injureActivitiService.injureJudgmentProcess(injureTask, injureProcessVo);
break;
case "injuretResponsibilityprocess":
- result = injureActivitiService.injuretResponsibilityprocess(injureTask, processInstanceId, approve, userid);
+ result = injureActivitiService.injuretResponsibilityprocess(injureTask, injureProcessVo);
break;
case "responsibilityconformprocess":
- result = injureActivitiService.responsibilityconformprocess(injureTask, processInstanceId, approve, userid);
+ result = injureActivitiService.responsibilityconformprocess(injureTask, injureProcessVo);
break;
case "stationreviewprocess":
- result = injureActivitiService.stationreviewprocess(injureTask, processInstanceId, approve, userid);
+ result = injureActivitiService.stationreviewprocess(injureTask, injureProcessVo);
break;
case "appealhandlingprocess":
- result = injureActivitiService.appealhandlingprocess(injureTask, processInstanceId, approve);
+ result = injureActivitiService.appealhandlingprocess(injureTask, injureProcessVo);
break;
}
} else {
//提示暂无任务
- result = Result.ok().data("任务已经办理");
+ result = Result.ok().data("任务已办理完成");
}
return result;
}
@@ -190,39 +193,6 @@ public class InjureController {
return result;
}
-
- @ApiOperation("客伤流程审核列表")
- @RequestMapping(value = "/injuretasklist", method = RequestMethod.POST)
- @PreAuthorize("hasAnyAuthority('activiti:Injuretasklist')")
- @ResponseBody
- public Result injuretasklist(PageTableRequest pageTableRequest, String taskName) {
- String username = getUserid();
- //username="xiaohuo";
- pageTableRequest.countOffset();
- List results = injureActivitiService.getpagedepttask(username, taskName, pageTableRequest.getOffset(), pageTableRequest.getLimit());
- //获取总个数
- int totalsize = injureActivitiService.getalldepttask(username, taskName);
- /* List tasks = new ArrayList();
- for (LeaveApply apply : results) {
- LeaveTask task = new LeaveTask();
- task.setApply_time(apply.getApply_time());
- task.setUser_id(apply.getUser_id());
- task.setEnd_time(apply.getEnd_time());
- task.setId(apply.getId());
- task.setLeave_type(apply.getLeave_type());
- task.setProcess_instance_id(apply.getProcess_instance_id());
- task.setProcessdefid(apply.getTask().getProcessDefinitionId());
- task.setReason(apply.getReason());
- task.setStart_time(apply.getStart_time());
- task.setTaskcreatetime(apply.getTask().getCreateTime());
- task.setTaskid(apply.getTask().getId());
- task.setTaskname(apply.getTask().getName());
- tasks.add(task);
- }*/
-
- return null;
- }
-
@ApiOperation("查询已部署工作流列表")
@PreAuthorize("hasAnyAuthority('activiti:getprocesslists')")
@RequestMapping(value = "/getprocesslists", method = RequestMethod.POST)
@@ -324,11 +294,20 @@ public class InjureController {
@ApiOperation("使用流程实例编号获取历史流程数据")
@RequestMapping(value = "/processinfo", method = RequestMethod.POST)
@ResponseBody
- public List processinfo(@RequestParam("instanceid") String instanceid) {
+ public Result processinfo(@RequestParam("instanceid") String instanceid) {
//todo 添加客伤流程审核表,表字段: taskid,审核人,审核状态,客伤主键id,instanceid,审核节点名称
+ List resultList = new ArrayList<>();
+
List his = histiryservice.createHistoricActivityInstanceQuery()
.processInstanceId(instanceid).orderByHistoricActivityInstanceStartTime().asc().list();
- return his;
+ for (HistoricActivityInstance hisInstance : his) {
+ String activityName = hisInstance.getActivityName();
+ CustomerInjureProcessPesponseVo customerinjureprocess = injureActivitiService.queryCustomerInjureProcess(activityName, instanceid);
+ if (Objects.nonNull(customerinjureprocess)){
+ resultList.add(customerinjureprocess);
+ }
+ }
+ return Result.ok().count(Long.valueOf(resultList.size())).data(resultList);
}
@ApiOperation("使用业务号获取历史流程数据")
diff --git a/omp/src/main/java/com/platform/omp/activiti/mapper/CustomerinjureprocessMapper.java b/omp/src/main/java/com/platform/omp/activiti/mapper/CustomerinjureprocessMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..8d5f879fefeb4aee50cb6bc998ecc2e08dc42907
--- /dev/null
+++ b/omp/src/main/java/com/platform/omp/activiti/mapper/CustomerinjureprocessMapper.java
@@ -0,0 +1,15 @@
+package com.platform.omp.activiti.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.platform.omp.activiti.po.Customerinjureprocess;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface CustomerinjureprocessMapper extends BaseMapper {
+ int insert(Customerinjureprocess record);
+
+ int insertSelective(Customerinjureprocess record);
+}
\ No newline at end of file
diff --git a/omp/src/main/java/com/platform/omp/activiti/po/Customerinjureprocess.java b/omp/src/main/java/com/platform/omp/activiti/po/Customerinjureprocess.java
new file mode 100644
index 0000000000000000000000000000000000000000..90e42b8ef28437d39be78df4bbc5828bff9372fd
--- /dev/null
+++ b/omp/src/main/java/com/platform/omp/activiti/po/Customerinjureprocess.java
@@ -0,0 +1,77 @@
+package com.platform.omp.activiti.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * customerInjureProcess
+ *
+ * @author
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("客伤审核流程表")
+@TableName(value = "customerInjureProcess")
+public class Customerinjureprocess implements Serializable {
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("主键id")
+ private long id;
+
+ /**
+ * 部门id
+ */
+ @ApiModelProperty("部门id")
+ private String deptid;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty("用户id")
+ private String userId;
+
+ /**
+ * 流程节点:(工作流程节点状态(injureInfo:信息填报,injurereviewprocess:客伤审核,injureApplyAjustment:申请调整,injureJudgmentProcess:有效处理判定,injuretResponsibilityprocess:有责客伤情况判定,responsibilityconformprocess:责任人申诉/确认,stationreviewprocess:站区审核,appealhandlingprocess:申诉处理)
+ */
+ @ApiModelProperty("流程节点:(工作流程节点状态(injureInfo:信息填报,injurereviewprocess:客伤审核,injureApplyAjustment:申请调整,injureJudgmentProcess:有效处理判定,injuretResponsibilityprocess:有责客伤情况判定,responsibilityconformprocess:责任人申诉/确认,stationreviewprocess:站区审核,appealhandlingprocess:申诉处理)")
+ private String injureprocess;
+
+ /**
+ * 流程id
+ */
+ @ApiModelProperty("流程id")
+ private String instanceid;
+
+ /**
+ * 节点状态(true:通过,false:未通过)
+ */
+ @ApiModelProperty("节点状态(true:通过,false:未通过)")
+ private String status;
+
+ /**
+ * 办理时间
+ */
+ @ApiModelProperty("办理时间")
+ private Date createtime;
+ /**
+ * 每个流程的处置说明
+ */
+ @ApiModelProperty("每个流程的处置说明")
+ @TableField(value = "")
+ private String reviewComments;
+
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/omp/src/main/java/com/platform/omp/activiti/service/InjureActivitiService.java b/omp/src/main/java/com/platform/omp/activiti/service/InjureActivitiService.java
index 5e2496f8baeb0a644b78e9175cf5ac51330747fa..516951dde01a8b6efba2506882f4b48f1d81c22d 100644
--- a/omp/src/main/java/com/platform/omp/activiti/service/InjureActivitiService.java
+++ b/omp/src/main/java/com/platform/omp/activiti/service/InjureActivitiService.java
@@ -3,6 +3,9 @@ package com.platform.omp.activiti.service;
import com.platform.omp.OperationalModule.customerInjure.entity.DCustomerinjure;
import com.platform.omp.OperationalModule.customerInjure.entity.DCustomerinjureEntity;
import com.platform.omp.activiti.po.ActiviDCustomerinjure;
+import com.platform.omp.activiti.po.Customerinjureprocess;
+import com.platform.omp.activiti.vo.CustomerInjureProcessPesponseVo;
+import com.platform.omp.activiti.vo.CustomerInjureProcessVo;
import com.platform.omp.common.utils.Result;
import org.activiti.engine.task.Task;
@@ -83,50 +86,45 @@ public interface InjureActivitiService {
* 客伤审核
*
* @param injureTask
- * @param processInstanceId
- * @param approve
*/
- Result injurereviewprocess(Task injureTask, String processInstanceId, String approve, String userid);
+ Result injurereviewprocess(Task injureTask, CustomerInjureProcessVo injureProcessVo);
/**
* 有效处理判定
* @param injureTask
- * @param userid
*/
- Result injureJudgmentProcess(Task injureTask, String userid);
+ Result injureJudgmentProcess(Task injureTask, CustomerInjureProcessVo injureProcessVo);
/**
* 有责客伤情况判定
* @param injureTask
- * @param processInstanceId
- * @param approve
- * @param userid
*/
- Result injuretResponsibilityprocess(Task injureTask, String processInstanceId, String approve, String userid);
+ Result injuretResponsibilityprocess(Task injureTask, CustomerInjureProcessVo injureProcessVo);
/**
* 责任人申诉/确认
* @param injureTask
- * @param processInstanceId
- * @param approve
- * @param userid
*/
- Result responsibilityconformprocess(Task injureTask, String processInstanceId, String approve, String userid);
+ Result responsibilityconformprocess(Task injureTask, CustomerInjureProcessVo injureProcessVo);
/**
* 站区审核
* @param injureTask
- * @param processInstanceId
- * @param approve
- * @param userid
+
*/
- Result stationreviewprocess(Task injureTask, String processInstanceId, String approve, String userid);
+ Result stationreviewprocess(Task injureTask, CustomerInjureProcessVo injureProcessVo);
/**
* 申诉处理
* @param injureTask
- * @param processInstanceId
- * @param approve
+
+ */
+ Result appealhandlingprocess(Task injureTask, CustomerInjureProcessVo injureProcessVo);
+
+ /**
+ * 根据流程节点id和节点名称查询节点详情信息
+ * @param activityName
+ * @param instanceid
*/
- Result appealhandlingprocess(Task injureTask, String processInstanceId, String approve);
+ CustomerInjureProcessPesponseVo queryCustomerInjureProcess(String activityName, String instanceid);
}
diff --git a/omp/src/main/java/com/platform/omp/activiti/service/impl/InjureActivitiServiceImpl.java b/omp/src/main/java/com/platform/omp/activiti/service/impl/InjureActivitiServiceImpl.java
index dc2471130cf1076c4502da545098da15f52a9c55..326fb049759b65b01a78e54a0d4cee95aaeb76c2 100644
--- a/omp/src/main/java/com/platform/omp/activiti/service/impl/InjureActivitiServiceImpl.java
+++ b/omp/src/main/java/com/platform/omp/activiti/service/impl/InjureActivitiServiceImpl.java
@@ -7,13 +7,19 @@ import com.github.pagehelper.PageHelper;
import com.platform.omp.OperationalModule.customerInjure.dao.DCustomerinjureDao;
import com.platform.omp.OperationalModule.customerInjure.entity.DCustomerinjure;
import com.platform.omp.OperationalModule.customerInjure.entity.DCustomerinjureEntity;
+import com.platform.omp.activiti.mapper.CustomerinjureprocessMapper;
import com.platform.omp.activiti.po.ActiviDCustomerinjure;
+import com.platform.omp.activiti.po.Customerinjureprocess;
import com.platform.omp.activiti.po.LeaveApply;
import com.platform.omp.activiti.service.InjureActivitiService;
+import com.platform.omp.activiti.vo.CustomerInjureProcessPesponseVo;
+import com.platform.omp.activiti.vo.CustomerInjureProcessVo;
+import com.platform.omp.admin.entity.MyUser;
import com.platform.omp.common.mapper.DCustomerinjureMapper;
import com.platform.omp.common.utils.ActivitiConstants;
import com.platform.omp.common.utils.Result;
import com.platform.omp.common.utils.ResultCode;
+import com.platform.omp.security.dto.JwtUserDto;
import lombok.extern.slf4j.Slf4j;
import org.activiti.engine.IdentityService;
import org.activiti.engine.RuntimeService;
@@ -22,6 +28,7 @@ import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.Task;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -49,6 +56,8 @@ public class InjureActivitiServiceImpl implements InjureActivitiService {
@Resource
TaskService taskservice;
+ @Autowired
+ private CustomerinjureprocessMapper customerinjureprocessMapper;
@Autowired
private DCustomerinjureDao dCustomerinjureDao;
@@ -83,6 +92,17 @@ public class InjureActivitiServiceImpl implements InjureActivitiService {
dCustomerinjure.setCheckstate(ActivitiConstants.REVIEWING);
dCustomerinjure.setId(entity.getId());
dCustomerinjureDao.updateByPrimaryKeySelective(dCustomerinjure);
+ MyUser currentuser = getCurrentuser();
+ Customerinjureprocess injureprocess = Customerinjureprocess.builder()
+ .injureprocess("StartEvent")
+ .createtime(new Date())
+ .deptid(String.valueOf(currentuser.getDeptId()))
+ .instanceid(instanceid)
+ .status("true")
+ .userId(userid)
+ .build();
+ //客伤信息录入
+ customerinjureprocessMapper.insert(injureprocess);
}
/**
@@ -218,22 +238,22 @@ public class InjureActivitiServiceImpl implements InjureActivitiService {
* 客伤审核
*
* @param injureTask
- * @param processInstanceId
- * @param approve
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public Result injurereviewprocess(Task injureTask, String processInstanceId, String approve, String userid) {
+ public Result injurereviewprocess(Task injureTask, CustomerInjureProcessVo injureProcessVo) {
try {
Map variables = new HashMap();
- variables.put("injureInApprove", approve);
- variables.put("injureJudgment", "1,7789,5238");
- taskservice.claim(injureTask.getId(), userid);
+ variables.put("injureInApprove", injureProcessVo.getApprove());
+ variables.put("injureJudgment", "1"); //todo 获取上层节点用户id
+ taskservice.claim(injureTask.getId(), injureProcessVo.getUserID());
taskservice.complete(injureTask.getId(), variables);
- if (approve.equals("false")) {
+ if (injureProcessVo.getApprove().equals("false")) {
//修改该条客伤状态为待调整
- updateInjureCheckState(processInstanceId, "5");
+ updateInjureCheckState(injureProcessVo.getProcessInstanceId(), "5");
}
+ //添加流程节点信息和审核意见
+ insertCustomerInjureProcess(injureProcessVo, "injurereviewprocess");
} catch (Exception e) {
log.error("injurereviewprocessERROR:{}", e.getMessage());
taskservice.setAssignee(injureTask.getId(), null); // 异常时候,可以维护, 针对此次任务id,将值设置为null,就是归还组任务
@@ -243,20 +263,42 @@ public class InjureActivitiServiceImpl implements InjureActivitiService {
return Result.success("客伤审核完成");
}
+ /**
+ * 添加流程节点信息
+ *
+ * @param injureProcessVo
+ * @param process
+ */
+ private void insertCustomerInjureProcess(CustomerInjureProcessVo injureProcessVo, String process) {
+ MyUser currentuser = getCurrentuser();
+ Customerinjureprocess injureprocess = Customerinjureprocess.builder()
+ .injureprocess(process)
+ .createtime(new Date())
+ .deptid(String.valueOf(currentuser.getDeptId()))
+ .instanceid(injureProcessVo.getProcessInstanceId())
+ .reviewComments(injureProcessVo.getReviewComments())
+ .status(injureProcessVo.getApprove())
+ .userId(injureProcessVo.getUserID())
+ .build();
+ //流程节点信息录入
+ customerinjureprocessMapper.insert(injureprocess);
+ }
+
/**
* 有效处理判定
*
* @param injureTask
- * @param userid
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public Result injureJudgmentProcess(Task injureTask, String userid) {
+ public Result injureJudgmentProcess(Task injureTask, CustomerInjureProcessVo injureProcessVo) {
try {
Map judgmentProcessVariables = new HashMap();
- judgmentProcessVariables.put("injuretResponsibility", userid);
- taskservice.claim(injureTask.getId(), userid);
+ judgmentProcessVariables.put("injuretResponsibility", "1"); // todo 获取上层节点用户id
+ taskservice.claim(injureTask.getId(), injureProcessVo.getUserID());
taskservice.complete(injureTask.getId(), judgmentProcessVariables);
+ //添加流程节点信息和有效处理判定说明
+ insertCustomerInjureProcess(injureProcessVo, "injureJudgmentProcess");
} catch (Exception e) {
log.error("injureJudgmentProcessERROR:{}", e.getMessage());
taskservice.setAssignee(injureTask.getId(), null); // 异常时候,可以维护, 针对此次任务id,将值设置为null,就是归还组任务
@@ -270,22 +312,21 @@ public class InjureActivitiServiceImpl implements InjureActivitiService {
* 有责客伤情况判定
*
* @param injureTask
- * @param processInstanceId
- * @param approve
- * @param userid
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public Result injuretResponsibilityprocess(Task injureTask, String processInstanceId, String approve, String userid) {
+ public Result injuretResponsibilityprocess(Task injureTask, CustomerInjureProcessVo injureProcessVo) {
try {
Map injuretResponsibilityVariables = new HashMap();
- injuretResponsibilityVariables.put("responsibilityconform", userid);
- injuretResponsibilityVariables.put("injureJudgmentApprove", approve);
- taskservice.claim(injureTask.getId(), userid);
+ injuretResponsibilityVariables.put("responsibilityconform", "1"); //todo 获取上层节点用户id
+ injuretResponsibilityVariables.put("injureJudgmentApprove", injureProcessVo.getApprove());
+ taskservice.claim(injureTask.getId(), injureProcessVo.getUserID());
taskservice.complete(injureTask.getId(), injuretResponsibilityVariables);
- if (approve.equals("false")) {
- updateInjureCheckState(processInstanceId, "4");
+ if (injureProcessVo.getApprove().equals("false")) {
+ updateInjureCheckState(injureProcessVo.getProcessInstanceId(), "4");
}
+ //添加流程节点信息和有责客伤情况判定说明
+ insertCustomerInjureProcess(injureProcessVo, "injuretResponsibilityprocess");
} catch (Exception e) {
log.error("injuretResponsibilityprocessERROR:{}", e.getMessage());
taskservice.setAssignee(injureTask.getId(), null); // 异常时候,可以维护, 针对此次任务id,将值设置为null,就是归还组任务
@@ -299,22 +340,21 @@ public class InjureActivitiServiceImpl implements InjureActivitiService {
* 责任人申诉/确认
*
* @param injureTask
- * @param processInstanceId
- * @param approve
- * @param userid
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public Result responsibilityconformprocess(Task injureTask, String processInstanceId, String approve, String userid) {
+ public Result responsibilityconformprocess(Task injureTask, CustomerInjureProcessVo injureProcessVo) {
try {
Map conformVariables = new HashMap();
- conformVariables.put("conformer", approve);
- conformVariables.put("stationreview", userid);
- taskservice.claim(injureTask.getId(), userid);
+ conformVariables.put("conformer", injureProcessVo.getApprove());
+ conformVariables.put("stationreview", "1"); //todo 获取上层节点用户id
+ taskservice.claim(injureTask.getId(), injureProcessVo.getUserID());
taskservice.complete(injureTask.getId(), conformVariables);
- if (approve.equals("false")) {
- updateInjureCheckState(processInstanceId, "4");
+ if (injureProcessVo.getApprove().equals("false")) {
+ updateInjureCheckState(injureProcessVo.getProcessInstanceId(), "4");
}
+ //添加流程节点信息和责任人申诉/确认说明
+ insertCustomerInjureProcess(injureProcessVo, "responsibilityconformprocess");
} catch (Exception e) {
log.error("responsibilityconformprocessERROR:{}", e.getMessage());
taskservice.setAssignee(injureTask.getId(), null); // 异常时候,可以维护, 针对此次任务id,将值设置为null,就是归还组任务
@@ -328,19 +368,18 @@ public class InjureActivitiServiceImpl implements InjureActivitiService {
* 站区审核
*
* @param injureTask
- * @param processInstanceId
- * @param approve
- * @param userid
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public Result stationreviewprocess(Task injureTask, String processInstanceId, String approve, String userid) {
+ public Result stationreviewprocess(Task injureTask, CustomerInjureProcessVo injureProcessVo) {
try {
Map stationReviewVariables = new HashMap();
- stationReviewVariables.put("stationconform", approve);
- stationReviewVariables.put("appealhandling", userid);
- taskservice.claim(injureTask.getId(), userid);
+ stationReviewVariables.put("stationconform", injureProcessVo.getApprove());
+ stationReviewVariables.put("appealhandling", "1");//todo 获取上层节点用户id
+ taskservice.claim(injureTask.getId(), injureProcessVo.getUserID());
taskservice.complete(injureTask.getId(), stationReviewVariables);
+ //添加流程节点信息和站区审核说明
+ insertCustomerInjureProcess(injureProcessVo, "stationreviewprocess");
} catch (Exception e) {
log.error("stationreviewprocessERROR:{}", e.getMessage());
taskservice.setAssignee(injureTask.getId(), null); // 异常时候,可以维护, 针对此次任务id,将值设置为null,就是归还组任务
@@ -354,21 +393,21 @@ public class InjureActivitiServiceImpl implements InjureActivitiService {
* 申诉处理
*
* @param injureTask
- * @param processInstanceId
- * @param approve
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public Result appealhandlingprocess(Task injureTask, String processInstanceId, String approve) {
+ public Result appealhandlingprocess(Task injureTask, CustomerInjureProcessVo injureProcessVo) {
try {
Map appealhandlVariables = new HashMap();
- appealhandlVariables.put("appealhander", approve);
- if (approve.equals("true")) {
- updateInjureCheckState(processInstanceId, "4");
+ appealhandlVariables.put("appealhander", injureProcessVo.getApprove());
+ if (injureProcessVo.getApprove().equals("true")) {
+ updateInjureCheckState(injureProcessVo.getProcessInstanceId(), "4");
taskservice.complete(injureTask.getId(), appealhandlVariables);
} else {
taskservice.complete(injureTask.getId(), appealhandlVariables);
}
+ //添加流程节点信息和申诉处理说明
+ insertCustomerInjureProcess(injureProcessVo, "appealhandlingprocess");
} catch (Exception e) {
log.error("appealhandlingprocessERROR:{}", e.getMessage());
taskservice.setAssignee(injureTask.getId(), null); // 异常时候,可以维护, 针对此次任务id,将值设置为null,就是归还组任务
@@ -378,4 +417,35 @@ public class InjureActivitiServiceImpl implements InjureActivitiService {
return Result.success("申诉处理完成");
}
+
+ /**
+ * 获取当前登录用户
+ *
+ * @return
+ */
+ private MyUser getCurrentuser() {
+ JwtUserDto jwtUserDto = (JwtUserDto) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+ return jwtUserDto.getMyUser();
+ }
+
+ /**
+ * 根据流程节点id和节点名称查询节点详情信息
+ *
+ * @param activityName
+ * @param instanceid
+ */
+ @Override
+ public CustomerInjureProcessPesponseVo queryCustomerInjureProcess(String activityName, String instanceid) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("injureProcess", activityName);
+ queryWrapper.eq("instanceId", instanceid);
+ Customerinjureprocess customerinjureprocess = customerinjureprocessMapper.selectOne(queryWrapper);
+ if (Objects.nonNull(customerinjureprocess)) {
+ CustomerInjureProcessPesponseVo processPesponseVo = new CustomerInjureProcessPesponseVo();
+ BeanUtil.copyProperties(customerinjureprocess, processPesponseVo);
+ processPesponseVo.setEmpName("admin");
+ return processPesponseVo;
+ }
+ return null;
+ }
}
diff --git a/omp/src/main/java/com/platform/omp/activiti/vo/CustomerInjureProcessPesponseVo.java b/omp/src/main/java/com/platform/omp/activiti/vo/CustomerInjureProcessPesponseVo.java
new file mode 100644
index 0000000000000000000000000000000000000000..b208dc595ec94d3d6b13c4cc433a92415e35a74f
--- /dev/null
+++ b/omp/src/main/java/com/platform/omp/activiti/vo/CustomerInjureProcessPesponseVo.java
@@ -0,0 +1,73 @@
+package com.platform.omp.activiti.vo;
+
+
+import com.platform.omp.admin.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("客伤流程节点实体类")
+public class CustomerInjureProcessPesponseVo implements Serializable {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("主键id")
+ private long id;
+
+ /**
+ * 部门id
+ */
+ @ApiModelProperty("部门id")
+ private String deptid;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty("用户id")
+ private String userId;
+
+ /**
+ * 流程节点:(工作流程节点状态(injureInfo:信息填报,injurereviewprocess:客伤审核,injureApplyAjustment:申请调整,injureJudgmentProcess:有效处理判定,injuretResponsibilityprocess:有责客伤情况判定,responsibilityconformprocess:责任人申诉/确认,stationreviewprocess:站区审核,appealhandlingprocess:申诉处理)
+ */
+ @ApiModelProperty("流程节点:(工作流程节点状态(injureInfo:信息填报,injurereviewprocess:客伤审核,injureApplyAjustment:申请调整,injureJudgmentProcess:有效处理判定,injuretResponsibilityprocess:有责客伤情况判定,responsibilityconformprocess:责任人申诉/确认,stationreviewprocess:站区审核,appealhandlingprocess:申诉处理)")
+ @Dict(dictId = "injureprocess")
+ private String injureprocess;
+
+ /**
+ * 流程id
+ */
+ @ApiModelProperty("流程id")
+ private String instanceid;
+
+ /**
+ * 节点状态(true:通过,false:未通过)
+ */
+ @ApiModelProperty("节点状态(true:通过,false:未通过)")
+ private String status;
+
+ /**
+ * 办理时间
+ */
+ @ApiModelProperty("办理时间")
+ private Date createtime;
+ /**
+ * 每个流程的处置说明
+ */
+ @ApiModelProperty("每个流程的处置说明")
+ private String reviewComments;
+
+ @ApiModelProperty("用户名")
+ private String empName;
+
+}
diff --git a/omp/src/main/java/com/platform/omp/activiti/vo/CustomerInjureProcessVo.java b/omp/src/main/java/com/platform/omp/activiti/vo/CustomerInjureProcessVo.java
new file mode 100644
index 0000000000000000000000000000000000000000..8662853585dbab0d6896ad68bc67f833c730d0ed
--- /dev/null
+++ b/omp/src/main/java/com/platform/omp/activiti/vo/CustomerInjureProcessVo.java
@@ -0,0 +1,32 @@
+package com.platform.omp.activiti.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel(value = "客伤审核流程实体类", description = "客伤审核流程实体类")
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class CustomerInjureProcessVo implements Serializable {
+
+ @ApiModelProperty(value = "审核人id")
+ private String userID;
+ @ApiModelProperty(value = "工作流实例id")
+ private String processInstanceId;
+ @ApiModelProperty(value = "审核状态 true: 通过,false 不通过")
+ private String approve;
+ @ApiModelProperty(value = "指定人id")
+ private String designatPersonId;
+ @ApiModelProperty(value = "审核意见")
+ private String reviewComments;
+
+
+}
diff --git a/omp/src/main/java/com/platform/omp/admin/annotation/DictAspect.java b/omp/src/main/java/com/platform/omp/admin/annotation/DictAspect.java
index 4453297f6689128878e814841f8af91877b9ee22..ec4889ad1da7e0c859f1730749f017488b6b5c22 100644
--- a/omp/src/main/java/com/platform/omp/admin/annotation/DictAspect.java
+++ b/omp/src/main/java/com/platform/omp/admin/annotation/DictAspect.java
@@ -44,7 +44,8 @@ public class DictAspect {
/**
* 切点,切入 controller 包下面的所有方法
*/
- @Pointcut("execution( * com.platform.omp.OperationalModule..*controller.*.*(..))")
+ @Pointcut("execution( * com.platform.omp.OperationalModule..*controller.*.*(..))" +
+ "|| execution( * com.platform.omp..*controller.*.*(..))")
public void dict() {
}
diff --git a/omp/src/main/java/com/platform/omp/admin/dataobject/RotationDo.java b/omp/src/main/java/com/platform/omp/admin/dataobject/RotationDo.java
new file mode 100644
index 0000000000000000000000000000000000000000..68d6c6b633ab7305d52278d06095ba6170dd1a71
--- /dev/null
+++ b/omp/src/main/java/com/platform/omp/admin/dataobject/RotationDo.java
@@ -0,0 +1,318 @@
+package com.platform.omp.admin.dataobject;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+@ApiModel(value="交接班信息", description="交接班信息")
+public class RotationDo {
+
+ @ApiModelProperty("id")
+ private String id;
+
+ @ApiModelProperty("所属组织ID")
+ private Integer deptid;
+
+ @ApiModelProperty("组织编号")
+ private String deptNo;
+
+ @ApiModelProperty("位置信息ID")
+ private String expositiontypeid;
+
+ @ApiModelProperty("位置编号")
+ private String positionno;
+
+ @ApiModelProperty("类型")
+ private String type;
+
+ @ApiModelProperty("岗位名称")
+ private String postname;
+
+ @ApiModelProperty("值班班次:A1白班,A2夜班")
+ private String dutytype;
+
+ @ApiModelProperty("值班人")
+ private String dutystaff;
+
+ @ApiModelProperty("值班人工号")
+ private String dutyjobnum;
+
+ @ApiModelProperty("值班开始时间")
+ private Date dutystartdate;
+
+ @ApiModelProperty("交班时间")
+ private Date dutyenddate;
+
+ @ApiModelProperty("审核意见")
+ private String checkopinion;
+
+ @ApiModelProperty("审核状态")
+ private String checkstate;
+
+ @ApiModelProperty("审核人工号")
+ private String checkerjobnum;
+
+ @ApiModelProperty("审核人")
+ private String checker;
+
+ @ApiModelProperty("审核时间")
+ private Date checkdate;
+
+ @ApiModelProperty("接班人")
+ private String successor;
+
+ @ApiModelProperty("接班人工号")
+ private String successorjobnum;
+
+ @ApiModelProperty("接班时间")
+ private Date rotationtime;
+
+ @ApiModelProperty("状态")
+ private String state;
+
+ @ApiModelProperty("备注")
+ private String remarks;
+
+ @ApiModelProperty("创建人工号")
+ private String creatornum;
+
+ @ApiModelProperty("创建人")
+ private String creatorname;
+
+ @ApiModelProperty("创建时间")
+ private Date createtime;
+
+ @ApiModelProperty("最后修改人工号")
+ private String lastupdatenum;
+
+ @ApiModelProperty("最后修改人")
+ private String lastupdate;
+
+ @ApiModelProperty("最后修改时间")
+ private Date lastupdatetime;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id == null ? null : id.trim();
+ }
+
+ public Integer getDeptid() {
+ return deptid;
+ }
+
+ public void setDeptid(Integer deptid) {
+ this.deptid = deptid;
+ }
+
+ public String getDeptNo() {
+ return deptNo;
+ }
+
+ public void setDeptNo(String deptNo) {
+ this.deptNo = deptNo == null ? null : deptNo.trim();
+ }
+
+ public String getExpositiontypeid() {
+ return expositiontypeid;
+ }
+
+ public void setExpositiontypeid(String expositiontypeid) {
+ this.expositiontypeid = expositiontypeid == null ? null : expositiontypeid.trim();
+ }
+
+ public String getPositionno() {
+ return positionno;
+ }
+
+ public void setPositionno(String positionno) {
+ this.positionno = positionno == null ? null : positionno.trim();
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type == null ? null : type.trim();
+ }
+
+ public String getPostname() {
+ return postname;
+ }
+
+ public void setPostname(String postname) {
+ this.postname = postname == null ? null : postname.trim();
+ }
+
+ public String getDutytype() {
+ return dutytype;
+ }
+
+ public void setDutytype(String dutytype) {
+ this.dutytype = dutytype == null ? null : dutytype.trim();
+ }
+
+ public String getDutystaff() {
+ return dutystaff;
+ }
+
+ public void setDutystaff(String dutystaff) {
+ this.dutystaff = dutystaff == null ? null : dutystaff.trim();
+ }
+
+ public String getDutyjobnum() {
+ return dutyjobnum;
+ }
+
+ public void setDutyjobnum(String dutyjobnum) {
+ this.dutyjobnum = dutyjobnum == null ? null : dutyjobnum.trim();
+ }
+
+ public Date getDutystartdate() {
+ return dutystartdate;
+ }
+
+ public void setDutystartdate(Date dutystartdate) {
+ this.dutystartdate = dutystartdate;
+ }
+
+ public Date getDutyenddate() {
+ return dutyenddate;
+ }
+
+ public void setDutyenddate(Date dutyenddate) {
+ this.dutyenddate = dutyenddate;
+ }
+
+ public String getCheckopinion() {
+ return checkopinion;
+ }
+
+ public void setCheckopinion(String checkopinion) {
+ this.checkopinion = checkopinion == null ? null : checkopinion.trim();
+ }
+
+ public String getCheckstate() {
+ return checkstate;
+ }
+
+ public void setCheckstate(String checkstate) {
+ this.checkstate = checkstate == null ? null : checkstate.trim();
+ }
+
+ public String getCheckerjobnum() {
+ return checkerjobnum;
+ }
+
+ public void setCheckerjobnum(String checkerjobnum) {
+ this.checkerjobnum = checkerjobnum == null ? null : checkerjobnum.trim();
+ }
+
+ public String getChecker() {
+ return checker;
+ }
+
+ public void setChecker(String checker) {
+ this.checker = checker == null ? null : checker.trim();
+ }
+
+ public Date getCheckdate() {
+ return checkdate;
+ }
+
+ public void setCheckdate(Date checkdate) {
+ this.checkdate = checkdate;
+ }
+
+ public String getSuccessor() {
+ return successor;
+ }
+
+ public void setSuccessor(String successor) {
+ this.successor = successor == null ? null : successor.trim();
+ }
+
+ public String getSuccessorjobnum() {
+ return successorjobnum;
+ }
+
+ public void setSuccessorjobnum(String successorjobnum) {
+ this.successorjobnum = successorjobnum == null ? null : successorjobnum.trim();
+ }
+
+ public Date getRotationtime() {
+ return rotationtime;
+ }
+
+ public void setRotationtime(Date rotationtime) {
+ this.rotationtime = rotationtime;
+ }
+
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state == null ? null : state.trim();
+ }
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks == null ? null : remarks.trim();
+ }
+
+ public String getCreatornum() {
+ return creatornum;
+ }
+
+ public void setCreatornum(String creatornum) {
+ this.creatornum = creatornum == null ? null : creatornum.trim();
+ }
+
+ public String getCreatorname() {
+ return creatorname;
+ }
+
+ public void setCreatorname(String creatorname) {
+ this.creatorname = creatorname == null ? null : creatorname.trim();
+ }
+
+ public Date getCreatetime() {
+ return createtime;
+ }
+
+ public void setCreatetime(Date createtime) {
+ this.createtime = createtime;
+ }
+
+ public String getLastupdatenum() {
+ return lastupdatenum;
+ }
+
+ public void setLastupdatenum(String lastupdatenum) {
+ this.lastupdatenum = lastupdatenum == null ? null : lastupdatenum.trim();
+ }
+
+ public String getLastupdate() {
+ return lastupdate;
+ }
+
+ public void setLastupdate(String lastupdate) {
+ this.lastupdate = lastupdate == null ? null : lastupdate.trim();
+ }
+
+ public Date getLastupdatetime() {
+ return lastupdatetime;
+ }
+
+ public void setLastupdatetime(Date lastupdatetime) {
+ this.lastupdatetime = lastupdatetime;
+ }
+}
\ No newline at end of file
diff --git a/omp/src/main/java/com/platform/omp/admin/dataobject/RotationDoExample.java b/omp/src/main/java/com/platform/omp/admin/dataobject/RotationDoExample.java
new file mode 100644
index 0000000000000000000000000000000000000000..715eda3852ce45ee933cbafa7aecf92e9a5c84ae
--- /dev/null
+++ b/omp/src/main/java/com/platform/omp/admin/dataobject/RotationDoExample.java
@@ -0,0 +1,2111 @@
+package com.platform.omp.admin.dataobject;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class RotationDoExample {
+ protected String orderByClause;
+
+ protected boolean distinct;
+
+ protected int startIndex;
+
+ protected int pageSize;
+
+ protected List oredCriteria;
+
+ public RotationDoExample() {
+ oredCriteria = new ArrayList();
+ }
+
+ public void setOrderByClause(String orderByClause) {
+ this.orderByClause = orderByClause;
+ }
+
+ public String getOrderByClause() {
+ return orderByClause;
+ }
+
+ public void setDistinct(boolean distinct) {
+ this.distinct = distinct;
+ }
+
+ public boolean isDistinct() {
+ return distinct;
+ }
+
+ public void setStartIndex(int startIndex) {
+ this.startIndex = startIndex;
+ }
+
+ public int getStartIndex() {
+ return startIndex;
+ }
+
+ public void setPageSize(int pageSize) {
+ this.pageSize = pageSize;
+ }
+
+ public int getPageSize() {
+ return pageSize;
+ }
+
+ public List getOredCriteria() {
+ return oredCriteria;
+ }
+
+ public void or(Criteria criteria) {
+ oredCriteria.add(criteria);
+ }
+
+ public Criteria or() {
+ Criteria criteria = createCriteriaInternal();
+ oredCriteria.add(criteria);
+ return criteria;
+ }
+
+ public Criteria createCriteria() {
+ Criteria criteria = createCriteriaInternal();
+ if (oredCriteria.size() == 0) {
+ oredCriteria.add(criteria);
+ }
+ return criteria;
+ }
+
+ protected Criteria createCriteriaInternal() {
+ Criteria criteria = new Criteria();
+ return criteria;
+ }
+
+ public void clear() {
+ oredCriteria.clear();
+ orderByClause = null;
+ distinct = false;
+ }
+
+ protected abstract static class GeneratedCriteria {
+ protected List criteria;
+
+ protected GeneratedCriteria() {
+ super();
+ criteria = new ArrayList();
+ }
+
+ public boolean isValid() {
+ return criteria.size() > 0;
+ }
+
+ public List getAllCriteria() {
+ return criteria;
+ }
+
+ public List getCriteria() {
+ return criteria;
+ }
+
+ protected void addCriterion(String condition) {
+ if (condition == null) {
+ throw new RuntimeException("Value for condition cannot be null");
+ }
+ criteria.add(new Criterion(condition));
+ }
+
+ protected void addCriterion(String condition, Object value, String property) {
+ if (value == null) {
+ throw new RuntimeException("Value for " + property + " cannot be null");
+ }
+ criteria.add(new Criterion(condition, value));
+ }
+
+ protected void addCriterion(String condition, Object value1, Object value2, String property) {
+ if (value1 == null || value2 == null) {
+ throw new RuntimeException("Between values for " + property + " cannot be null");
+ }
+ criteria.add(new Criterion(condition, value1, value2));
+ }
+
+ public Criteria andIdIsNull() {
+ addCriterion("ID is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdIsNotNull() {
+ addCriterion("ID is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdEqualTo(String value) {
+ addCriterion("ID =", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotEqualTo(String value) {
+ addCriterion("ID <>", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdGreaterThan(String value) {
+ addCriterion("ID >", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdGreaterThanOrEqualTo(String value) {
+ addCriterion("ID >=", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdLessThan(String value) {
+ addCriterion("ID <", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdLessThanOrEqualTo(String value) {
+ addCriterion("ID <=", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdLike(String value) {
+ addCriterion("ID like", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotLike(String value) {
+ addCriterion("ID not like", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdIn(List values) {
+ addCriterion("ID in", values, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotIn(List values) {
+ addCriterion("ID not in", values, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdBetween(String value1, String value2) {
+ addCriterion("ID between", value1, value2, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotBetween(String value1, String value2) {
+ addCriterion("ID not between", value1, value2, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptidIsNull() {
+ addCriterion("DeptID is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptidIsNotNull() {
+ addCriterion("DeptID is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptidEqualTo(Integer value) {
+ addCriterion("DeptID =", value, "deptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptidNotEqualTo(Integer value) {
+ addCriterion("DeptID <>", value, "deptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptidGreaterThan(Integer value) {
+ addCriterion("DeptID >", value, "deptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptidGreaterThanOrEqualTo(Integer value) {
+ addCriterion("DeptID >=", value, "deptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptidLessThan(Integer value) {
+ addCriterion("DeptID <", value, "deptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptidLessThanOrEqualTo(Integer value) {
+ addCriterion("DeptID <=", value, "deptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptidIn(List values) {
+ addCriterion("DeptID in", values, "deptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptidNotIn(List values) {
+ addCriterion("DeptID not in", values, "deptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptidBetween(Integer value1, Integer value2) {
+ addCriterion("DeptID between", value1, value2, "deptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptidNotBetween(Integer value1, Integer value2) {
+ addCriterion("DeptID not between", value1, value2, "deptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptNoIsNull() {
+ addCriterion("DEPT_NO is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptNoIsNotNull() {
+ addCriterion("DEPT_NO is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptNoEqualTo(String value) {
+ addCriterion("DEPT_NO =", value, "deptNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptNoNotEqualTo(String value) {
+ addCriterion("DEPT_NO <>", value, "deptNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptNoGreaterThan(String value) {
+ addCriterion("DEPT_NO >", value, "deptNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptNoGreaterThanOrEqualTo(String value) {
+ addCriterion("DEPT_NO >=", value, "deptNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptNoLessThan(String value) {
+ addCriterion("DEPT_NO <", value, "deptNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptNoLessThanOrEqualTo(String value) {
+ addCriterion("DEPT_NO <=", value, "deptNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptNoLike(String value) {
+ addCriterion("DEPT_NO like", value, "deptNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptNoNotLike(String value) {
+ addCriterion("DEPT_NO not like", value, "deptNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptNoIn(List values) {
+ addCriterion("DEPT_NO in", values, "deptNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptNoNotIn(List values) {
+ addCriterion("DEPT_NO not in", values, "deptNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptNoBetween(String value1, String value2) {
+ addCriterion("DEPT_NO between", value1, value2, "deptNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptNoNotBetween(String value1, String value2) {
+ addCriterion("DEPT_NO not between", value1, value2, "deptNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andExpositiontypeidIsNull() {
+ addCriterion("EXPOSITIONTYPEID is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andExpositiontypeidIsNotNull() {
+ addCriterion("EXPOSITIONTYPEID is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andExpositiontypeidEqualTo(String value) {
+ addCriterion("EXPOSITIONTYPEID =", value, "expositiontypeid");
+ return (Criteria) this;
+ }
+
+ public Criteria andExpositiontypeidNotEqualTo(String value) {
+ addCriterion("EXPOSITIONTYPEID <>", value, "expositiontypeid");
+ return (Criteria) this;
+ }
+
+ public Criteria andExpositiontypeidGreaterThan(String value) {
+ addCriterion("EXPOSITIONTYPEID >", value, "expositiontypeid");
+ return (Criteria) this;
+ }
+
+ public Criteria andExpositiontypeidGreaterThanOrEqualTo(String value) {
+ addCriterion("EXPOSITIONTYPEID >=", value, "expositiontypeid");
+ return (Criteria) this;
+ }
+
+ public Criteria andExpositiontypeidLessThan(String value) {
+ addCriterion("EXPOSITIONTYPEID <", value, "expositiontypeid");
+ return (Criteria) this;
+ }
+
+ public Criteria andExpositiontypeidLessThanOrEqualTo(String value) {
+ addCriterion("EXPOSITIONTYPEID <=", value, "expositiontypeid");
+ return (Criteria) this;
+ }
+
+ public Criteria andExpositiontypeidLike(String value) {
+ addCriterion("EXPOSITIONTYPEID like", value, "expositiontypeid");
+ return (Criteria) this;
+ }
+
+ public Criteria andExpositiontypeidNotLike(String value) {
+ addCriterion("EXPOSITIONTYPEID not like", value, "expositiontypeid");
+ return (Criteria) this;
+ }
+
+ public Criteria andExpositiontypeidIn(List values) {
+ addCriterion("EXPOSITIONTYPEID in", values, "expositiontypeid");
+ return (Criteria) this;
+ }
+
+ public Criteria andExpositiontypeidNotIn(List values) {
+ addCriterion("EXPOSITIONTYPEID not in", values, "expositiontypeid");
+ return (Criteria) this;
+ }
+
+ public Criteria andExpositiontypeidBetween(String value1, String value2) {
+ addCriterion("EXPOSITIONTYPEID between", value1, value2, "expositiontypeid");
+ return (Criteria) this;
+ }
+
+ public Criteria andExpositiontypeidNotBetween(String value1, String value2) {
+ addCriterion("EXPOSITIONTYPEID not between", value1, value2, "expositiontypeid");
+ return (Criteria) this;
+ }
+
+ public Criteria andPositionnoIsNull() {
+ addCriterion("POSITIONNO is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andPositionnoIsNotNull() {
+ addCriterion("POSITIONNO is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andPositionnoEqualTo(String value) {
+ addCriterion("POSITIONNO =", value, "positionno");
+ return (Criteria) this;
+ }
+
+ public Criteria andPositionnoNotEqualTo(String value) {
+ addCriterion("POSITIONNO <>", value, "positionno");
+ return (Criteria) this;
+ }
+
+ public Criteria andPositionnoGreaterThan(String value) {
+ addCriterion("POSITIONNO >", value, "positionno");
+ return (Criteria) this;
+ }
+
+ public Criteria andPositionnoGreaterThanOrEqualTo(String value) {
+ addCriterion("POSITIONNO >=", value, "positionno");
+ return (Criteria) this;
+ }
+
+ public Criteria andPositionnoLessThan(String value) {
+ addCriterion("POSITIONNO <", value, "positionno");
+ return (Criteria) this;
+ }
+
+ public Criteria andPositionnoLessThanOrEqualTo(String value) {
+ addCriterion("POSITIONNO <=", value, "positionno");
+ return (Criteria) this;
+ }
+
+ public Criteria andPositionnoLike(String value) {
+ addCriterion("POSITIONNO like", value, "positionno");
+ return (Criteria) this;
+ }
+
+ public Criteria andPositionnoNotLike(String value) {
+ addCriterion("POSITIONNO not like", value, "positionno");
+ return (Criteria) this;
+ }
+
+ public Criteria andPositionnoIn(List values) {
+ addCriterion("POSITIONNO in", values, "positionno");
+ return (Criteria) this;
+ }
+
+ public Criteria andPositionnoNotIn(List values) {
+ addCriterion("POSITIONNO not in", values, "positionno");
+ return (Criteria) this;
+ }
+
+ public Criteria andPositionnoBetween(String value1, String value2) {
+ addCriterion("POSITIONNO between", value1, value2, "positionno");
+ return (Criteria) this;
+ }
+
+ public Criteria andPositionnoNotBetween(String value1, String value2) {
+ addCriterion("POSITIONNO not between", value1, value2, "positionno");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeIsNull() {
+ addCriterion("Type is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeIsNotNull() {
+ addCriterion("Type is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeEqualTo(String value) {
+ addCriterion("Type =", value, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeNotEqualTo(String value) {
+ addCriterion("Type <>", value, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeGreaterThan(String value) {
+ addCriterion("Type >", value, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeGreaterThanOrEqualTo(String value) {
+ addCriterion("Type >=", value, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeLessThan(String value) {
+ addCriterion("Type <", value, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeLessThanOrEqualTo(String value) {
+ addCriterion("Type <=", value, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeLike(String value) {
+ addCriterion("Type like", value, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeNotLike(String value) {
+ addCriterion("Type not like", value, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeIn(List values) {
+ addCriterion("Type in", values, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeNotIn(List values) {
+ addCriterion("Type not in", values, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeBetween(String value1, String value2) {
+ addCriterion("Type between", value1, value2, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andTypeNotBetween(String value1, String value2) {
+ addCriterion("Type not between", value1, value2, "type");
+ return (Criteria) this;
+ }
+
+ public Criteria andPostnameIsNull() {
+ addCriterion("PostName is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andPostnameIsNotNull() {
+ addCriterion("PostName is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andPostnameEqualTo(String value) {
+ addCriterion("PostName =", value, "postname");
+ return (Criteria) this;
+ }
+
+ public Criteria andPostnameNotEqualTo(String value) {
+ addCriterion("PostName <>", value, "postname");
+ return (Criteria) this;
+ }
+
+ public Criteria andPostnameGreaterThan(String value) {
+ addCriterion("PostName >", value, "postname");
+ return (Criteria) this;
+ }
+
+ public Criteria andPostnameGreaterThanOrEqualTo(String value) {
+ addCriterion("PostName >=", value, "postname");
+ return (Criteria) this;
+ }
+
+ public Criteria andPostnameLessThan(String value) {
+ addCriterion("PostName <", value, "postname");
+ return (Criteria) this;
+ }
+
+ public Criteria andPostnameLessThanOrEqualTo(String value) {
+ addCriterion("PostName <=", value, "postname");
+ return (Criteria) this;
+ }
+
+ public Criteria andPostnameLike(String value) {
+ addCriterion("PostName like", value, "postname");
+ return (Criteria) this;
+ }
+
+ public Criteria andPostnameNotLike(String value) {
+ addCriterion("PostName not like", value, "postname");
+ return (Criteria) this;
+ }
+
+ public Criteria andPostnameIn(List values) {
+ addCriterion("PostName in", values, "postname");
+ return (Criteria) this;
+ }
+
+ public Criteria andPostnameNotIn(List values) {
+ addCriterion("PostName not in", values, "postname");
+ return (Criteria) this;
+ }
+
+ public Criteria andPostnameBetween(String value1, String value2) {
+ addCriterion("PostName between", value1, value2, "postname");
+ return (Criteria) this;
+ }
+
+ public Criteria andPostnameNotBetween(String value1, String value2) {
+ addCriterion("PostName not between", value1, value2, "postname");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutytypeIsNull() {
+ addCriterion("DutyType is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutytypeIsNotNull() {
+ addCriterion("DutyType is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutytypeEqualTo(String value) {
+ addCriterion("DutyType =", value, "dutytype");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutytypeNotEqualTo(String value) {
+ addCriterion("DutyType <>", value, "dutytype");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutytypeGreaterThan(String value) {
+ addCriterion("DutyType >", value, "dutytype");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutytypeGreaterThanOrEqualTo(String value) {
+ addCriterion("DutyType >=", value, "dutytype");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutytypeLessThan(String value) {
+ addCriterion("DutyType <", value, "dutytype");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutytypeLessThanOrEqualTo(String value) {
+ addCriterion("DutyType <=", value, "dutytype");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutytypeLike(String value) {
+ addCriterion("DutyType like", value, "dutytype");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutytypeNotLike(String value) {
+ addCriterion("DutyType not like", value, "dutytype");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutytypeIn(List values) {
+ addCriterion("DutyType in", values, "dutytype");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutytypeNotIn(List values) {
+ addCriterion("DutyType not in", values, "dutytype");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutytypeBetween(String value1, String value2) {
+ addCriterion("DutyType between", value1, value2, "dutytype");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutytypeNotBetween(String value1, String value2) {
+ addCriterion("DutyType not between", value1, value2, "dutytype");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystaffIsNull() {
+ addCriterion("DutyStaff is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystaffIsNotNull() {
+ addCriterion("DutyStaff is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystaffEqualTo(String value) {
+ addCriterion("DutyStaff =", value, "dutystaff");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystaffNotEqualTo(String value) {
+ addCriterion("DutyStaff <>", value, "dutystaff");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystaffGreaterThan(String value) {
+ addCriterion("DutyStaff >", value, "dutystaff");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystaffGreaterThanOrEqualTo(String value) {
+ addCriterion("DutyStaff >=", value, "dutystaff");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystaffLessThan(String value) {
+ addCriterion("DutyStaff <", value, "dutystaff");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystaffLessThanOrEqualTo(String value) {
+ addCriterion("DutyStaff <=", value, "dutystaff");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystaffLike(String value) {
+ addCriterion("DutyStaff like", value, "dutystaff");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystaffNotLike(String value) {
+ addCriterion("DutyStaff not like", value, "dutystaff");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystaffIn(List values) {
+ addCriterion("DutyStaff in", values, "dutystaff");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystaffNotIn(List values) {
+ addCriterion("DutyStaff not in", values, "dutystaff");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystaffBetween(String value1, String value2) {
+ addCriterion("DutyStaff between", value1, value2, "dutystaff");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystaffNotBetween(String value1, String value2) {
+ addCriterion("DutyStaff not between", value1, value2, "dutystaff");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyjobnumIsNull() {
+ addCriterion("DutyJobNum is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyjobnumIsNotNull() {
+ addCriterion("DutyJobNum is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyjobnumEqualTo(String value) {
+ addCriterion("DutyJobNum =", value, "dutyjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyjobnumNotEqualTo(String value) {
+ addCriterion("DutyJobNum <>", value, "dutyjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyjobnumGreaterThan(String value) {
+ addCriterion("DutyJobNum >", value, "dutyjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyjobnumGreaterThanOrEqualTo(String value) {
+ addCriterion("DutyJobNum >=", value, "dutyjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyjobnumLessThan(String value) {
+ addCriterion("DutyJobNum <", value, "dutyjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyjobnumLessThanOrEqualTo(String value) {
+ addCriterion("DutyJobNum <=", value, "dutyjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyjobnumLike(String value) {
+ addCriterion("DutyJobNum like", value, "dutyjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyjobnumNotLike(String value) {
+ addCriterion("DutyJobNum not like", value, "dutyjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyjobnumIn(List values) {
+ addCriterion("DutyJobNum in", values, "dutyjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyjobnumNotIn(List values) {
+ addCriterion("DutyJobNum not in", values, "dutyjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyjobnumBetween(String value1, String value2) {
+ addCriterion("DutyJobNum between", value1, value2, "dutyjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyjobnumNotBetween(String value1, String value2) {
+ addCriterion("DutyJobNum not between", value1, value2, "dutyjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystartdateIsNull() {
+ addCriterion("DutyStartDate is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystartdateIsNotNull() {
+ addCriterion("DutyStartDate is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystartdateEqualTo(Date value) {
+ addCriterion("DutyStartDate =", value, "dutystartdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystartdateNotEqualTo(Date value) {
+ addCriterion("DutyStartDate <>", value, "dutystartdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystartdateGreaterThan(Date value) {
+ addCriterion("DutyStartDate >", value, "dutystartdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystartdateGreaterThanOrEqualTo(Date value) {
+ addCriterion("DutyStartDate >=", value, "dutystartdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystartdateLessThan(Date value) {
+ addCriterion("DutyStartDate <", value, "dutystartdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystartdateLessThanOrEqualTo(Date value) {
+ addCriterion("DutyStartDate <=", value, "dutystartdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystartdateIn(List values) {
+ addCriterion("DutyStartDate in", values, "dutystartdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystartdateNotIn(List values) {
+ addCriterion("DutyStartDate not in", values, "dutystartdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystartdateBetween(Date value1, Date value2) {
+ addCriterion("DutyStartDate between", value1, value2, "dutystartdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutystartdateNotBetween(Date value1, Date value2) {
+ addCriterion("DutyStartDate not between", value1, value2, "dutystartdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyenddateIsNull() {
+ addCriterion("DutyEndDate is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyenddateIsNotNull() {
+ addCriterion("DutyEndDate is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyenddateEqualTo(Date value) {
+ addCriterion("DutyEndDate =", value, "dutyenddate");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyenddateNotEqualTo(Date value) {
+ addCriterion("DutyEndDate <>", value, "dutyenddate");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyenddateGreaterThan(Date value) {
+ addCriterion("DutyEndDate >", value, "dutyenddate");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyenddateGreaterThanOrEqualTo(Date value) {
+ addCriterion("DutyEndDate >=", value, "dutyenddate");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyenddateLessThan(Date value) {
+ addCriterion("DutyEndDate <", value, "dutyenddate");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyenddateLessThanOrEqualTo(Date value) {
+ addCriterion("DutyEndDate <=", value, "dutyenddate");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyenddateIn(List values) {
+ addCriterion("DutyEndDate in", values, "dutyenddate");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyenddateNotIn(List values) {
+ addCriterion("DutyEndDate not in", values, "dutyenddate");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyenddateBetween(Date value1, Date value2) {
+ addCriterion("DutyEndDate between", value1, value2, "dutyenddate");
+ return (Criteria) this;
+ }
+
+ public Criteria andDutyenddateNotBetween(Date value1, Date value2) {
+ addCriterion("DutyEndDate not between", value1, value2, "dutyenddate");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckopinionIsNull() {
+ addCriterion("CheckOpinion is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckopinionIsNotNull() {
+ addCriterion("CheckOpinion is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckopinionEqualTo(String value) {
+ addCriterion("CheckOpinion =", value, "checkopinion");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckopinionNotEqualTo(String value) {
+ addCriterion("CheckOpinion <>", value, "checkopinion");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckopinionGreaterThan(String value) {
+ addCriterion("CheckOpinion >", value, "checkopinion");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckopinionGreaterThanOrEqualTo(String value) {
+ addCriterion("CheckOpinion >=", value, "checkopinion");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckopinionLessThan(String value) {
+ addCriterion("CheckOpinion <", value, "checkopinion");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckopinionLessThanOrEqualTo(String value) {
+ addCriterion("CheckOpinion <=", value, "checkopinion");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckopinionLike(String value) {
+ addCriterion("CheckOpinion like", value, "checkopinion");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckopinionNotLike(String value) {
+ addCriterion("CheckOpinion not like", value, "checkopinion");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckopinionIn(List values) {
+ addCriterion("CheckOpinion in", values, "checkopinion");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckopinionNotIn(List values) {
+ addCriterion("CheckOpinion not in", values, "checkopinion");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckopinionBetween(String value1, String value2) {
+ addCriterion("CheckOpinion between", value1, value2, "checkopinion");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckopinionNotBetween(String value1, String value2) {
+ addCriterion("CheckOpinion not between", value1, value2, "checkopinion");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckstateIsNull() {
+ addCriterion("CheckState is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckstateIsNotNull() {
+ addCriterion("CheckState is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckstateEqualTo(String value) {
+ addCriterion("CheckState =", value, "checkstate");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckstateNotEqualTo(String value) {
+ addCriterion("CheckState <>", value, "checkstate");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckstateGreaterThan(String value) {
+ addCriterion("CheckState >", value, "checkstate");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckstateGreaterThanOrEqualTo(String value) {
+ addCriterion("CheckState >=", value, "checkstate");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckstateLessThan(String value) {
+ addCriterion("CheckState <", value, "checkstate");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckstateLessThanOrEqualTo(String value) {
+ addCriterion("CheckState <=", value, "checkstate");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckstateLike(String value) {
+ addCriterion("CheckState like", value, "checkstate");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckstateNotLike(String value) {
+ addCriterion("CheckState not like", value, "checkstate");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckstateIn(List values) {
+ addCriterion("CheckState in", values, "checkstate");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckstateNotIn(List values) {
+ addCriterion("CheckState not in", values, "checkstate");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckstateBetween(String value1, String value2) {
+ addCriterion("CheckState between", value1, value2, "checkstate");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckstateNotBetween(String value1, String value2) {
+ addCriterion("CheckState not between", value1, value2, "checkstate");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerjobnumIsNull() {
+ addCriterion("CheckerJobNum is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerjobnumIsNotNull() {
+ addCriterion("CheckerJobNum is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerjobnumEqualTo(String value) {
+ addCriterion("CheckerJobNum =", value, "checkerjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerjobnumNotEqualTo(String value) {
+ addCriterion("CheckerJobNum <>", value, "checkerjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerjobnumGreaterThan(String value) {
+ addCriterion("CheckerJobNum >", value, "checkerjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerjobnumGreaterThanOrEqualTo(String value) {
+ addCriterion("CheckerJobNum >=", value, "checkerjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerjobnumLessThan(String value) {
+ addCriterion("CheckerJobNum <", value, "checkerjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerjobnumLessThanOrEqualTo(String value) {
+ addCriterion("CheckerJobNum <=", value, "checkerjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerjobnumLike(String value) {
+ addCriterion("CheckerJobNum like", value, "checkerjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerjobnumNotLike(String value) {
+ addCriterion("CheckerJobNum not like", value, "checkerjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerjobnumIn(List values) {
+ addCriterion("CheckerJobNum in", values, "checkerjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerjobnumNotIn(List values) {
+ addCriterion("CheckerJobNum not in", values, "checkerjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerjobnumBetween(String value1, String value2) {
+ addCriterion("CheckerJobNum between", value1, value2, "checkerjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerjobnumNotBetween(String value1, String value2) {
+ addCriterion("CheckerJobNum not between", value1, value2, "checkerjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerIsNull() {
+ addCriterion("Checker is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerIsNotNull() {
+ addCriterion("Checker is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerEqualTo(String value) {
+ addCriterion("Checker =", value, "checker");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerNotEqualTo(String value) {
+ addCriterion("Checker <>", value, "checker");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerGreaterThan(String value) {
+ addCriterion("Checker >", value, "checker");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerGreaterThanOrEqualTo(String value) {
+ addCriterion("Checker >=", value, "checker");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerLessThan(String value) {
+ addCriterion("Checker <", value, "checker");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerLessThanOrEqualTo(String value) {
+ addCriterion("Checker <=", value, "checker");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerLike(String value) {
+ addCriterion("Checker like", value, "checker");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerNotLike(String value) {
+ addCriterion("Checker not like", value, "checker");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerIn(List values) {
+ addCriterion("Checker in", values, "checker");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerNotIn(List values) {
+ addCriterion("Checker not in", values, "checker");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerBetween(String value1, String value2) {
+ addCriterion("Checker between", value1, value2, "checker");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckerNotBetween(String value1, String value2) {
+ addCriterion("Checker not between", value1, value2, "checker");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckdateIsNull() {
+ addCriterion("CheckDate is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckdateIsNotNull() {
+ addCriterion("CheckDate is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckdateEqualTo(Date value) {
+ addCriterion("CheckDate =", value, "checkdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckdateNotEqualTo(Date value) {
+ addCriterion("CheckDate <>", value, "checkdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckdateGreaterThan(Date value) {
+ addCriterion("CheckDate >", value, "checkdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckdateGreaterThanOrEqualTo(Date value) {
+ addCriterion("CheckDate >=", value, "checkdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckdateLessThan(Date value) {
+ addCriterion("CheckDate <", value, "checkdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckdateLessThanOrEqualTo(Date value) {
+ addCriterion("CheckDate <=", value, "checkdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckdateIn(List values) {
+ addCriterion("CheckDate in", values, "checkdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckdateNotIn(List values) {
+ addCriterion("CheckDate not in", values, "checkdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckdateBetween(Date value1, Date value2) {
+ addCriterion("CheckDate between", value1, value2, "checkdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andCheckdateNotBetween(Date value1, Date value2) {
+ addCriterion("CheckDate not between", value1, value2, "checkdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorIsNull() {
+ addCriterion("Successor is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorIsNotNull() {
+ addCriterion("Successor is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorEqualTo(String value) {
+ addCriterion("Successor =", value, "successor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorNotEqualTo(String value) {
+ addCriterion("Successor <>", value, "successor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorGreaterThan(String value) {
+ addCriterion("Successor >", value, "successor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorGreaterThanOrEqualTo(String value) {
+ addCriterion("Successor >=", value, "successor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorLessThan(String value) {
+ addCriterion("Successor <", value, "successor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorLessThanOrEqualTo(String value) {
+ addCriterion("Successor <=", value, "successor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorLike(String value) {
+ addCriterion("Successor like", value, "successor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorNotLike(String value) {
+ addCriterion("Successor not like", value, "successor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorIn(List values) {
+ addCriterion("Successor in", values, "successor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorNotIn(List values) {
+ addCriterion("Successor not in", values, "successor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorBetween(String value1, String value2) {
+ addCriterion("Successor between", value1, value2, "successor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorNotBetween(String value1, String value2) {
+ addCriterion("Successor not between", value1, value2, "successor");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorjobnumIsNull() {
+ addCriterion("SuccessorJobNum is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorjobnumIsNotNull() {
+ addCriterion("SuccessorJobNum is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorjobnumEqualTo(String value) {
+ addCriterion("SuccessorJobNum =", value, "successorjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorjobnumNotEqualTo(String value) {
+ addCriterion("SuccessorJobNum <>", value, "successorjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorjobnumGreaterThan(String value) {
+ addCriterion("SuccessorJobNum >", value, "successorjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorjobnumGreaterThanOrEqualTo(String value) {
+ addCriterion("SuccessorJobNum >=", value, "successorjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorjobnumLessThan(String value) {
+ addCriterion("SuccessorJobNum <", value, "successorjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorjobnumLessThanOrEqualTo(String value) {
+ addCriterion("SuccessorJobNum <=", value, "successorjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorjobnumLike(String value) {
+ addCriterion("SuccessorJobNum like", value, "successorjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorjobnumNotLike(String value) {
+ addCriterion("SuccessorJobNum not like", value, "successorjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorjobnumIn(List values) {
+ addCriterion("SuccessorJobNum in", values, "successorjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorjobnumNotIn(List values) {
+ addCriterion("SuccessorJobNum not in", values, "successorjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorjobnumBetween(String value1, String value2) {
+ addCriterion("SuccessorJobNum between", value1, value2, "successorjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andSuccessorjobnumNotBetween(String value1, String value2) {
+ addCriterion("SuccessorJobNum not between", value1, value2, "successorjobnum");
+ return (Criteria) this;
+ }
+
+ public Criteria andRotationtimeIsNull() {
+ addCriterion("RotationTime is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andRotationtimeIsNotNull() {
+ addCriterion("RotationTime is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andRotationtimeEqualTo(Date value) {
+ addCriterion("RotationTime =", value, "rotationtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andRotationtimeNotEqualTo(Date value) {
+ addCriterion("RotationTime <>", value, "rotationtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andRotationtimeGreaterThan(Date value) {
+ addCriterion("RotationTime >", value, "rotationtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andRotationtimeGreaterThanOrEqualTo(Date value) {
+ addCriterion("RotationTime >=", value, "rotationtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andRotationtimeLessThan(Date value) {
+ addCriterion("RotationTime <", value, "rotationtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andRotationtimeLessThanOrEqualTo(Date value) {
+ addCriterion("RotationTime <=", value, "rotationtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andRotationtimeIn(List values) {
+ addCriterion("RotationTime in", values, "rotationtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andRotationtimeNotIn(List values) {
+ addCriterion("RotationTime not in", values, "rotationtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andRotationtimeBetween(Date value1, Date value2) {
+ addCriterion("RotationTime between", value1, value2, "rotationtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andRotationtimeNotBetween(Date value1, Date value2) {
+ addCriterion("RotationTime not between", value1, value2, "rotationtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateIsNull() {
+ addCriterion("State is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateIsNotNull() {
+ addCriterion("State is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateEqualTo(String value) {
+ addCriterion("State =", value, "state");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateNotEqualTo(String value) {
+ addCriterion("State <>", value, "state");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateGreaterThan(String value) {
+ addCriterion("State >", value, "state");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateGreaterThanOrEqualTo(String value) {
+ addCriterion("State >=", value, "state");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateLessThan(String value) {
+ addCriterion("State <", value, "state");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateLessThanOrEqualTo(String value) {
+ addCriterion("State <=", value, "state");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateLike(String value) {
+ addCriterion("State like", value, "state");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateNotLike(String value) {
+ addCriterion("State not like", value, "state");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateIn(List values) {
+ addCriterion("State in", values, "state");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateNotIn(List values) {
+ addCriterion("State not in", values, "state");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateBetween(String value1, String value2) {
+ addCriterion("State between", value1, value2, "state");
+ return (Criteria) this;
+ }
+
+ public Criteria andStateNotBetween(String value1, String value2) {
+ addCriterion("State not between", value1, value2, "state");
+ return (Criteria) this;
+ }
+
+ public Criteria andRemarksIsNull() {
+ addCriterion("Remarks is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andRemarksIsNotNull() {
+ addCriterion("Remarks is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andRemarksEqualTo(String value) {
+ addCriterion("Remarks =", value, "remarks");
+ return (Criteria) this;
+ }
+
+ public Criteria andRemarksNotEqualTo(String value) {
+ addCriterion("Remarks <>", value, "remarks");
+ return (Criteria) this;
+ }
+
+ public Criteria andRemarksGreaterThan(String value) {
+ addCriterion("Remarks >", value, "remarks");
+ return (Criteria) this;
+ }
+
+ public Criteria andRemarksGreaterThanOrEqualTo(String value) {
+ addCriterion("Remarks >=", value, "remarks");
+ return (Criteria) this;
+ }
+
+ public Criteria andRemarksLessThan(String value) {
+ addCriterion("Remarks <", value, "remarks");
+ return (Criteria) this;
+ }
+
+ public Criteria andRemarksLessThanOrEqualTo(String value) {
+ addCriterion("Remarks <=", value, "remarks");
+ return (Criteria) this;
+ }
+
+ public Criteria andRemarksLike(String value) {
+ addCriterion("Remarks like", value, "remarks");
+ return (Criteria) this;
+ }
+
+ public Criteria andRemarksNotLike(String value) {
+ addCriterion("Remarks not like", value, "remarks");
+ return (Criteria) this;
+ }
+
+ public Criteria andRemarksIn(List values) {
+ addCriterion("Remarks in", values, "remarks");
+ return (Criteria) this;
+ }
+
+ public Criteria andRemarksNotIn(List values) {
+ addCriterion("Remarks not in", values, "remarks");
+ return (Criteria) this;
+ }
+
+ public Criteria andRemarksBetween(String value1, String value2) {
+ addCriterion("Remarks between", value1, value2, "remarks");
+ return (Criteria) this;
+ }
+
+ public Criteria andRemarksNotBetween(String value1, String value2) {
+ addCriterion("Remarks not between", value1, value2, "remarks");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornumIsNull() {
+ addCriterion("CreatorNum is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornumIsNotNull() {
+ addCriterion("CreatorNum is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornumEqualTo(String value) {
+ addCriterion("CreatorNum =", value, "creatornum");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornumNotEqualTo(String value) {
+ addCriterion("CreatorNum <>", value, "creatornum");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornumGreaterThan(String value) {
+ addCriterion("CreatorNum >", value, "creatornum");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornumGreaterThanOrEqualTo(String value) {
+ addCriterion("CreatorNum >=", value, "creatornum");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornumLessThan(String value) {
+ addCriterion("CreatorNum <", value, "creatornum");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornumLessThanOrEqualTo(String value) {
+ addCriterion("CreatorNum <=", value, "creatornum");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornumLike(String value) {
+ addCriterion("CreatorNum like", value, "creatornum");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornumNotLike(String value) {
+ addCriterion("CreatorNum not like", value, "creatornum");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornumIn(List values) {
+ addCriterion("CreatorNum in", values, "creatornum");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornumNotIn(List values) {
+ addCriterion("CreatorNum not in", values, "creatornum");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornumBetween(String value1, String value2) {
+ addCriterion("CreatorNum between", value1, value2, "creatornum");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornumNotBetween(String value1, String value2) {
+ addCriterion("CreatorNum not between", value1, value2, "creatornum");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornameIsNull() {
+ addCriterion("CreatorName is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornameIsNotNull() {
+ addCriterion("CreatorName is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornameEqualTo(String value) {
+ addCriterion("CreatorName =", value, "creatorname");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornameNotEqualTo(String value) {
+ addCriterion("CreatorName <>", value, "creatorname");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornameGreaterThan(String value) {
+ addCriterion("CreatorName >", value, "creatorname");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornameGreaterThanOrEqualTo(String value) {
+ addCriterion("CreatorName >=", value, "creatorname");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornameLessThan(String value) {
+ addCriterion("CreatorName <", value, "creatorname");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornameLessThanOrEqualTo(String value) {
+ addCriterion("CreatorName <=", value, "creatorname");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornameLike(String value) {
+ addCriterion("CreatorName like", value, "creatorname");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornameNotLike(String value) {
+ addCriterion("CreatorName not like", value, "creatorname");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornameIn(List values) {
+ addCriterion("CreatorName in", values, "creatorname");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornameNotIn(List values) {
+ addCriterion("CreatorName not in", values, "creatorname");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornameBetween(String value1, String value2) {
+ addCriterion("CreatorName between", value1, value2, "creatorname");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatornameNotBetween(String value1, String value2) {
+ addCriterion("CreatorName not between", value1, value2, "creatorname");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeIsNull() {
+ addCriterion("CreateTime is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeIsNotNull() {
+ addCriterion("CreateTime is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeEqualTo(Date value) {
+ addCriterion("CreateTime =", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeNotEqualTo(Date value) {
+ addCriterion("CreateTime <>", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeGreaterThan(Date value) {
+ addCriterion("CreateTime >", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeGreaterThanOrEqualTo(Date value) {
+ addCriterion("CreateTime >=", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeLessThan(Date value) {
+ addCriterion("CreateTime <", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeLessThanOrEqualTo(Date value) {
+ addCriterion("CreateTime <=", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeIn(List values) {
+ addCriterion("CreateTime in", values, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeNotIn(List values) {
+ addCriterion("CreateTime not in", values, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeBetween(Date value1, Date value2) {
+ addCriterion("CreateTime between", value1, value2, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeNotBetween(Date value1, Date value2) {
+ addCriterion("CreateTime not between", value1, value2, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatenumIsNull() {
+ addCriterion("LastUpdateNum is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatenumIsNotNull() {
+ addCriterion("LastUpdateNum is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatenumEqualTo(String value) {
+ addCriterion("LastUpdateNum =", value, "lastupdatenum");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatenumNotEqualTo(String value) {
+ addCriterion("LastUpdateNum <>", value, "lastupdatenum");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatenumGreaterThan(String value) {
+ addCriterion("LastUpdateNum >", value, "lastupdatenum");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatenumGreaterThanOrEqualTo(String value) {
+ addCriterion("LastUpdateNum >=", value, "lastupdatenum");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatenumLessThan(String value) {
+ addCriterion("LastUpdateNum <", value, "lastupdatenum");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatenumLessThanOrEqualTo(String value) {
+ addCriterion("LastUpdateNum <=", value, "lastupdatenum");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatenumLike(String value) {
+ addCriterion("LastUpdateNum like", value, "lastupdatenum");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatenumNotLike(String value) {
+ addCriterion("LastUpdateNum not like", value, "lastupdatenum");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatenumIn(List values) {
+ addCriterion("LastUpdateNum in", values, "lastupdatenum");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatenumNotIn(List values) {
+ addCriterion("LastUpdateNum not in", values, "lastupdatenum");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatenumBetween(String value1, String value2) {
+ addCriterion("LastUpdateNum between", value1, value2, "lastupdatenum");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatenumNotBetween(String value1, String value2) {
+ addCriterion("LastUpdateNum not between", value1, value2, "lastupdatenum");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdateIsNull() {
+ addCriterion("LastUpdate is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdateIsNotNull() {
+ addCriterion("LastUpdate is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdateEqualTo(String value) {
+ addCriterion("LastUpdate =", value, "lastupdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdateNotEqualTo(String value) {
+ addCriterion("LastUpdate <>", value, "lastupdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdateGreaterThan(String value) {
+ addCriterion("LastUpdate >", value, "lastupdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdateGreaterThanOrEqualTo(String value) {
+ addCriterion("LastUpdate >=", value, "lastupdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdateLessThan(String value) {
+ addCriterion("LastUpdate <", value, "lastupdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdateLessThanOrEqualTo(String value) {
+ addCriterion("LastUpdate <=", value, "lastupdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdateLike(String value) {
+ addCriterion("LastUpdate like", value, "lastupdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdateNotLike(String value) {
+ addCriterion("LastUpdate not like", value, "lastupdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdateIn(List values) {
+ addCriterion("LastUpdate in", values, "lastupdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdateNotIn(List values) {
+ addCriterion("LastUpdate not in", values, "lastupdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdateBetween(String value1, String value2) {
+ addCriterion("LastUpdate between", value1, value2, "lastupdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdateNotBetween(String value1, String value2) {
+ addCriterion("LastUpdate not between", value1, value2, "lastupdate");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatetimeIsNull() {
+ addCriterion("LastUpdateTime is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatetimeIsNotNull() {
+ addCriterion("LastUpdateTime is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatetimeEqualTo(Date value) {
+ addCriterion("LastUpdateTime =", value, "lastupdatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatetimeNotEqualTo(Date value) {
+ addCriterion("LastUpdateTime <>", value, "lastupdatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatetimeGreaterThan(Date value) {
+ addCriterion("LastUpdateTime >", value, "lastupdatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatetimeGreaterThanOrEqualTo(Date value) {
+ addCriterion("LastUpdateTime >=", value, "lastupdatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatetimeLessThan(Date value) {
+ addCriterion("LastUpdateTime <", value, "lastupdatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatetimeLessThanOrEqualTo(Date value) {
+ addCriterion("LastUpdateTime <=", value, "lastupdatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatetimeIn(List values) {
+ addCriterion("LastUpdateTime in", values, "lastupdatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatetimeNotIn(List values) {
+ addCriterion("LastUpdateTime not in", values, "lastupdatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatetimeBetween(Date value1, Date value2) {
+ addCriterion("LastUpdateTime between", value1, value2, "lastupdatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andLastupdatetimeNotBetween(Date value1, Date value2) {
+ addCriterion("LastUpdateTime not between", value1, value2, "lastupdatetime");
+ return (Criteria) this;
+ }
+ }
+
+ public static class Criteria extends GeneratedCriteria {
+
+ protected Criteria() {
+ super();
+ }
+ }
+
+ public static class Criterion {
+ private String condition;
+
+ private Object value;
+
+ private Object secondValue;
+
+ private boolean noValue;
+
+ private boolean singleValue;
+
+ private boolean betweenValue;
+
+ private boolean listValue;
+
+ private String typeHandler;
+
+ public String getCondition() {
+ return condition;
+ }
+
+ public Object getValue() {
+ return value;
+ }
+
+ public Object getSecondValue() {
+ return secondValue;
+ }
+
+ public boolean isNoValue() {
+ return noValue;
+ }
+
+ public boolean isSingleValue() {
+ return singleValue;
+ }
+
+ public boolean isBetweenValue() {
+ return betweenValue;
+ }
+
+ public boolean isListValue() {
+ return listValue;
+ }
+
+ public String getTypeHandler() {
+ return typeHandler;
+ }
+
+ protected Criterion(String condition) {
+ super();
+ this.condition = condition;
+ this.typeHandler = null;
+ this.noValue = true;
+ }
+
+ protected Criterion(String condition, Object value, String typeHandler) {
+ super();
+ this.condition = condition;
+ this.value = value;
+ this.typeHandler = typeHandler;
+ if (value instanceof List>) {
+ this.listValue = true;
+ } else {
+ this.singleValue = true;
+ }
+ }
+
+ protected Criterion(String condition, Object value) {
+ this(condition, value, null);
+ }
+
+ protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+ super();
+ this.condition = condition;
+ this.value = value;
+ this.secondValue = secondValue;
+ this.typeHandler = typeHandler;
+ this.betweenValue = true;
+ }
+
+ protected Criterion(String condition, Object value, Object secondValue) {
+ this(condition, value, secondValue, null);
+ }
+ }
+}
\ No newline at end of file
diff --git a/omp/src/main/java/com/platform/omp/admin/dto/RotationDto.java b/omp/src/main/java/com/platform/omp/admin/dto/RotationDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..be7a7d54b2aa58178ea2341ee917fb069b4ea1cb
--- /dev/null
+++ b/omp/src/main/java/com/platform/omp/admin/dto/RotationDto.java
@@ -0,0 +1,66 @@
+package com.platform.omp.admin.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class RotationDto {
+
+ private String id;
+
+ private Integer deptid;
+
+ private String deptNo;
+
+ private String expositiontypeid;
+
+ private String positionno;
+
+ private String type;
+
+ private String postname;
+
+ private String dutytype;
+
+ private String dutystaff;
+
+ private String dutyjobnum;
+
+ private Date dutystartdate;
+
+ private Date dutyenddate;
+
+ private String checkopinion;
+
+ private String checkstate;
+
+ private String checkerjobnum;
+
+ private String checker;
+
+ private Date checkdate;
+
+ private String successor;
+
+ private String successorjobnum;
+
+ private Date rotationtime;
+
+ private String state;
+
+ private String remarks;
+
+ private String creatornum;
+
+ private String creatorname;
+
+ private Date createtime;
+
+ private String lastupdatenum;
+
+ private String lastupdate;
+
+ private Date lastupdatetime;
+
+}
diff --git a/omp/src/main/java/com/platform/omp/admin/dto/RotationQueryDto.java b/omp/src/main/java/com/platform/omp/admin/dto/RotationQueryDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..b41335fded854e3042a4ffdc27aa79a423b0806e
--- /dev/null
+++ b/omp/src/main/java/com/platform/omp/admin/dto/RotationQueryDto.java
@@ -0,0 +1,46 @@
+package com.platform.omp.admin.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value="交接班查询", description="交接班查询")
+public class RotationQueryDto {
+
+ @ApiModelProperty("值班人")
+ private String dutyStaff;
+
+ @ApiModelProperty("值班人工号")
+ private String dutyJobNum;
+
+ @ApiModelProperty("接班人")
+ private String successor;
+
+ @ApiModelProperty("接班人工号")
+ private String successorJobNum;
+
+ @ApiModelProperty("班次")
+ private String dutyType;
+
+ @ApiModelProperty("岗位名称")
+ private String postName;
+
+ @ApiModelProperty("岗位编号")
+ private String postNo;
+
+ @ApiModelProperty("值班时间范围——开始")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date dutyDateBegin;
+
+ @ApiModelProperty("值班时间范围——结束")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date dutyDateEnd;
+
+}
diff --git a/omp/src/main/java/com/platform/omp/admin/entity/MyDictDetail.java b/omp/src/main/java/com/platform/omp/admin/entity/MyDictDetail.java
index 0cb0d3ef330bf82ae5a31ce206ea366112e25f88..2bc546aea40e4653c2b7f0d065c376ff8bac769d 100644
--- a/omp/src/main/java/com/platform/omp/admin/entity/MyDictDetail.java
+++ b/omp/src/main/java/com/platform/omp/admin/entity/MyDictDetail.java
@@ -1,5 +1,7 @@
package com.platform.omp.admin.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -20,12 +22,13 @@ import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-@ApiModel(value="SysDict对象", description="数据字典")
-public class MyDictDetail {
+@ApiModel(value = "SysDict对象", description = "数据字典")
+public class MyDictDetail {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
+ @TableId(value = "id", type = IdType.AUTO)
private Integer Id;
@ApiModelProperty(value = "字典id")
diff --git a/omp/src/main/java/com/platform/omp/admin/enums/DutyTypeEnum.java b/omp/src/main/java/com/platform/omp/admin/enums/DutyTypeEnum.java
new file mode 100644
index 0000000000000000000000000000000000000000..e718be88d296b1f21268ddd44c1724ca64a2d808
--- /dev/null
+++ b/omp/src/main/java/com/platform/omp/admin/enums/DutyTypeEnum.java
@@ -0,0 +1,32 @@
+package com.platform.omp.admin.enums;
+
+public enum DutyTypeEnum {
+ DAY_WORK_DUTY("A1", "白班"),
+ NIGHT_WORK_DUTY("A2", "白班");
+ ;
+
+ private String code;
+
+ private String description;
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ DutyTypeEnum(String code, String description) {
+ this.code = code;
+ this.description = description;
+ }
+}
diff --git a/omp/src/main/java/com/platform/omp/admin/mapper/RotationDoMapper.java b/omp/src/main/java/com/platform/omp/admin/mapper/RotationDoMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..0b889d62d3a273b528678818958766dd9d68780d
--- /dev/null
+++ b/omp/src/main/java/com/platform/omp/admin/mapper/RotationDoMapper.java
@@ -0,0 +1,43 @@
+package com.platform.omp.admin.mapper;
+
+import com.platform.omp.admin.dataobject.RotationDo;
+import com.platform.omp.admin.dataobject.RotationDoExample;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@Mapper
+public interface RotationDoMapper {
+ int countByExample(RotationDoExample example);
+
+ int deleteByExample(RotationDoExample example);
+
+ int deleteByPrimaryKey(String id);
+
+ int insert(RotationDo record);
+
+ int insertSelective(RotationDo record);
+
+ List selectByExample(RotationDoExample example);
+
+ RotationDo selectByPrimaryKey(String id);
+
+ List selectByExampleWithPaging(RotationDoExample example);
+
+ int updateByExampleSelective(@Param("record") RotationDo record, @Param("example") RotationDoExample example);
+
+ int updateByExample(@Param("record") RotationDo record, @Param("example") RotationDoExample example);
+
+ int updateByPrimaryKeySelective(RotationDo record);
+
+ int updateByPrimaryKey(RotationDo record);
+
+ List selectByExampleForUpdate(RotationDoExample example);
+
+ RotationDo selectByPrimaryKeyForUpdate(String id);
+
+ int insertBatch(List record);
+}
\ No newline at end of file
diff --git a/omp/src/main/java/com/platform/omp/admin/service/RotationService.java b/omp/src/main/java/com/platform/omp/admin/service/RotationService.java
new file mode 100644
index 0000000000000000000000000000000000000000..e8283b49f392e6dbcb41f39047d200d4709c9948
--- /dev/null
+++ b/omp/src/main/java/com/platform/omp/admin/service/RotationService.java
@@ -0,0 +1,19 @@
+package com.platform.omp.admin.service;
+
+import com.platform.omp.admin.dataobject.RotationDo;
+import com.platform.omp.admin.dto.RotationDto;
+import com.platform.omp.admin.dto.RotationQueryDto;
+import com.platform.omp.common.utils.Result;
+
+public interface RotationService {
+
+ Result queryWithPage(Integer offset, Integer limit, RotationQueryDto rotationQueryDto);
+
+ void relief(String id);
+
+ void add(RotationDo rotationDo);
+
+ void update(RotationDo rotationDo);
+
+ RotationDo view(String id);
+}
diff --git a/omp/src/main/java/com/platform/omp/admin/service/impl/RotationServiceImpl.java b/omp/src/main/java/com/platform/omp/admin/service/impl/RotationServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..632db17fbff98b2aaadd4e4056a7f05e6e3609a6
--- /dev/null
+++ b/omp/src/main/java/com/platform/omp/admin/service/impl/RotationServiceImpl.java
@@ -0,0 +1,90 @@
+package com.platform.omp.admin.service.impl;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.platform.omp.OperationalModule.customerInjure.entity.DCustomerinjure;
+import com.platform.omp.admin.dataobject.RotationDo;
+import com.platform.omp.admin.dataobject.RotationDoExample;
+import com.platform.omp.admin.dto.RotationDto;
+import com.platform.omp.admin.dto.RotationQueryDto;
+import com.platform.omp.admin.mapper.RotationDoMapper;
+import com.platform.omp.admin.service.RotationService;
+import com.platform.omp.common.exceptionhandler.MyException;
+import com.platform.omp.common.utils.Result;
+import com.platform.omp.common.utils.ResultCode;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class RotationServiceImpl implements RotationService {
+
+ @Autowired
+ private RotationDoMapper rotationDoMapper;
+
+
+ @Override
+ public Result queryWithPage(Integer offset, Integer limit, RotationQueryDto rotationQueryDto) {
+ Page page = PageHelper.offsetPage(offset, limit);
+ DCustomerinjure dCustomerinjure = new DCustomerinjure();
+ RotationDoExample rotationDoExample = new RotationDoExample();
+ //todo 根据登陆人角色权限组装查询参数
+ List rotationDos = rotationDoMapper.selectByExample(rotationDoExample);
+
+ return Result.ok().count(page.getTotal()).data(rotationDos).code(ResultCode.SUCCESS);
+ }
+
+ @Override
+ public void relief(String id) {
+ RotationDo rotationDo = rotationDoMapper.selectByPrimaryKey(id);
+ //todo 权限和状态判断
+ if(rotationDo == null){
+ throw new MyException(ResultCode.BAD_REQUEST, "交接班信息不存在");
+ }
+ rotationDo = new RotationDo();
+ rotationDo.setId(id);
+ rotationDo.setState("");
+ //todo 登陆人信息
+ rotationDo.setSuccessor("");
+ rotationDo.setSuccessorjobnum("");
+ rotationDo.setLastupdatenum("");
+ rotationDo.setLastupdate("");
+ rotationDo.setLastupdatetime(new Date());
+ if(rotationDoMapper.updateByPrimaryKeySelective(rotationDo) < 1){
+ throw new MyException(ResultCode.BAD_REQUEST, "接班失败");
+ };
+ // todo 生成新的交接班记录
+ rotationDo = new RotationDo();
+ if(rotationDoMapper.insertSelective(rotationDo) < 1){
+ throw new MyException(ResultCode.BAD_REQUEST, "接班失败");
+ }
+ }
+
+ @Override
+ public void add(RotationDo rotationDo) {
+ //todo 登陆人信息
+ rotationDo.setCreatetime(new Date());
+ if(rotationDoMapper.insertSelective(rotationDo) < 1){
+ throw new MyException(ResultCode.BAD_REQUEST, "接班失败");
+ }
+ //暂时先不创建审批
+ }
+
+ @Override
+ public void update(RotationDo rotationDo) {
+ //todo 登陆人信息
+ rotationDo.setSuccessor("");
+ rotationDo.setSuccessorjobnum("");
+ rotationDo.setLastupdatenum("");
+ rotationDo.setLastupdate("");
+ rotationDo.setLastupdatetime(new Date());
+ rotationDoMapper.updateByPrimaryKeySelective(rotationDo);
+ }
+
+ @Override
+ public RotationDo view(String id) {
+ return rotationDoMapper.selectByPrimaryKey(id);
+ }
+}
diff --git a/omp/src/main/java/com/platform/omp/common/config/SwaggerConfig.java b/omp/src/main/java/com/platform/omp/common/config/SwaggerConfig.java
index 3459a192bfcdf3049667e5832988dce5cb36c273..74d6a90ce88c5f2186e7fe954fbcc5e5513d506d 100644
--- a/omp/src/main/java/com/platform/omp/common/config/SwaggerConfig.java
+++ b/omp/src/main/java/com/platform/omp/common/config/SwaggerConfig.java
@@ -93,6 +93,37 @@ public class SwaggerConfig {
.globalOperationParameters(pars);
}
+ @Bean
+ public Docket createRestApiWorkRemind() {
+ List pars = getParameters();
+ return new Docket(DocumentationType.SWAGGER_2)
+ .apiInfo(webApiInfo())
+ .groupName("站务工作流管理模块")
+ .select()
+ // 扫描所有有注解的api,用这种方式更灵活
+ //.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+ .apis(RequestHandlerSelectors.basePackage("com.platform.omp.OperationalModule.workreminddefault.controller"))
+ .paths(PathSelectors.any())
+ .paths(Predicates.not(PathSelectors.regex("/error.*")))
+ .build()
+ .globalOperationParameters(pars);
+ }
+
+ @Bean
+ public Docket createRestApiShiftManager() {
+ List pars = getParameters();
+ return new Docket(DocumentationType.SWAGGER_2)
+ .apiInfo(webApiInfo())
+ .groupName("交接班管理")
+ .select()
+ // 扫描所有有注解的api,用这种方式更灵活
+ //.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+ .apis(RequestHandlerSelectors.basePackage("com.platform.omp.OperationalModule.shiftManagementFlow.controller"))
+ .paths(PathSelectors.any())
+ .paths(Predicates.not(PathSelectors.regex("/error.*")))
+ .build()
+ .globalOperationParameters(pars);
+ }
@Bean
public Docket createRestApiActiviti() {
List pars = getParameters();
diff --git a/omp/src/main/resources/application.yml b/omp/src/main/resources/application.yml
index 86e6c4ef561893abceef74c636afb15bdf7eb5b4..b6ac975c2030455992eebe5db8ed7bb8592fb0ad 100644
--- a/omp/src/main/resources/application.yml
+++ b/omp/src/main/resources/application.yml
@@ -17,7 +17,7 @@ spring:
datasource:
driver:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://121.4.218.235:3306/omp_repaire?serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+ url: jdbc:mysql://121.4.218.235:3306/ompsystem?serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
username: root
password: beian123@$
type: com.alibaba.druid.pool.DruidDataSource
diff --git a/omp/src/main/resources/mapper/activiti/CustomerinjureprocessMapper.xml b/omp/src/main/resources/mapper/activiti/CustomerinjureprocessMapper.xml
new file mode 100644
index 0000000000000000000000000000000000000000..14f85ae95e1cdd00784447cdc3945ad9dd826eb5
--- /dev/null
+++ b/omp/src/main/resources/mapper/activiti/CustomerinjureprocessMapper.xml
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ insert into customerInjureProcess (ID, DeptID, user_id,
+ injureProcess, instanceId, `status`,
+ CreateTime)
+ values (#{id,jdbcType=INTEGER}, #{deptid,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR},
+ #{injureprocess,jdbcType=VARCHAR}, #{instanceid,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
+ #{createtime,jdbcType=TIMESTAMP})
+
+
+ insert into customerInjureProcess
+
+
+ ID,
+
+
+ DeptID,
+
+
+ user_id,
+
+
+ injureProcess,
+
+
+ instanceId,
+
+
+ `status`,
+
+
+ CreateTime,
+
+
+
+
+ #{id,jdbcType=INTEGER},
+
+
+ #{deptid,jdbcType=VARCHAR},
+
+
+ #{userId,jdbcType=VARCHAR},
+
+
+ #{injureprocess,jdbcType=VARCHAR},
+
+
+ #{instanceid,jdbcType=VARCHAR},
+
+
+ #{status,jdbcType=INTEGER},
+
+
+ #{createtime,jdbcType=TIMESTAMP},
+
+
+
+
\ No newline at end of file
diff --git a/omp/src/main/resources/mapper/auto/RotationDoMapper.xml b/omp/src/main/resources/mapper/auto/RotationDoMapper.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b2e389a7aab55478178f0dd677db3b49a38c6d71
--- /dev/null
+++ b/omp/src/main/resources/mapper/auto/RotationDoMapper.xml
@@ -0,0 +1,1270 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ and ${criterion.condition}
+
+
+ and ${criterion.condition} #{criterion.value}
+
+
+ and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+
+
+ and ${criterion.condition}
+
+ #{listItem}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ and ${criterion.condition}
+
+
+ and ${criterion.condition} #{criterion.value}
+
+
+ and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+
+
+ and ${criterion.condition}
+
+ #{listItem}
+
+
+
+
+
+
+
+
+
+
+ ID, DeptID, DEPT_NO, EXPOSITIONTYPEID, POSITIONNO, Type, PostName, DutyType, DutyStaff,
+ DutyJobNum, DutyStartDate, DutyEndDate, CheckOpinion, CheckState, CheckerJobNum,
+ Checker, CheckDate, Successor, SuccessorJobNum, RotationTime, State, Remarks, CreatorNum,
+ CreatorName, CreateTime, LastUpdateNum, LastUpdate, LastUpdateTime
+
+
+
+
+ delete from R_Rotation
+ where ID = #{id,jdbcType=VARCHAR}
+
+
+
+ delete from R_Rotation
+
+
+
+
+
+ insert into R_Rotation (ID, DeptID, DEPT_NO,
+ EXPOSITIONTYPEID, POSITIONNO, Type,
+ PostName, DutyType, DutyStaff,
+ DutyJobNum, DutyStartDate, DutyEndDate,
+ CheckOpinion, CheckState, CheckerJobNum,
+ Checker, CheckDate, Successor,
+ SuccessorJobNum, RotationTime, State,
+ Remarks, CreatorNum, CreatorName,
+ CreateTime, LastUpdateNum, LastUpdate,
+ LastUpdateTime)
+ values (#{id,jdbcType=VARCHAR}, #{deptid,jdbcType=INTEGER}, #{deptNo,jdbcType=VARCHAR},
+ #{expositiontypeid,jdbcType=VARCHAR}, #{positionno,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
+ #{postname,jdbcType=VARCHAR}, #{dutytype,jdbcType=VARCHAR}, #{dutystaff,jdbcType=VARCHAR},
+ #{dutyjobnum,jdbcType=VARCHAR}, #{dutystartdate,jdbcType=TIMESTAMP}, #{dutyenddate,jdbcType=TIMESTAMP},
+ #{checkopinion,jdbcType=VARCHAR}, #{checkstate,jdbcType=VARCHAR}, #{checkerjobnum,jdbcType=VARCHAR},
+ #{checker,jdbcType=VARCHAR}, #{checkdate,jdbcType=TIMESTAMP}, #{successor,jdbcType=VARCHAR},
+ #{successorjobnum,jdbcType=VARCHAR}, #{rotationtime,jdbcType=TIMESTAMP}, #{state,jdbcType=VARCHAR},
+ #{remarks,jdbcType=VARCHAR}, #{creatornum,jdbcType=VARCHAR}, #{creatorname,jdbcType=VARCHAR},
+ #{createtime,jdbcType=TIMESTAMP}, #{lastupdatenum,jdbcType=VARCHAR}, #{lastupdate,jdbcType=VARCHAR},
+ #{lastupdatetime,jdbcType=TIMESTAMP})
+
+
+ insert into R_Rotation
+
+
+ ID,
+
+
+ DeptID,
+
+
+ DEPT_NO,
+
+
+ EXPOSITIONTYPEID,
+
+
+ POSITIONNO,
+
+
+ Type,
+
+
+ PostName,
+
+
+ DutyType,
+
+
+ DutyStaff,
+
+
+ DutyJobNum,
+
+
+ DutyStartDate,
+
+
+ DutyEndDate,
+
+
+ CheckOpinion,
+
+
+ CheckState,
+
+
+ CheckerJobNum,
+
+
+ Checker,
+
+
+ CheckDate,
+
+
+ Successor,
+
+
+ SuccessorJobNum,
+
+
+ RotationTime,
+
+
+ State,
+
+
+ Remarks,
+
+
+ CreatorNum,
+
+
+ CreatorName,
+
+
+ CreateTime,
+
+
+ LastUpdateNum,
+
+
+ LastUpdate,
+
+
+ LastUpdateTime,
+
+
+
+
+ #{id,jdbcType=VARCHAR},
+
+
+ #{deptid,jdbcType=INTEGER},
+
+
+ #{deptNo,jdbcType=VARCHAR},
+
+
+ #{expositiontypeid,jdbcType=VARCHAR},
+
+
+ #{positionno,jdbcType=VARCHAR},
+
+
+ #{type,jdbcType=VARCHAR},
+
+
+ #{postname,jdbcType=VARCHAR},
+
+
+ #{dutytype,jdbcType=VARCHAR},
+
+
+ #{dutystaff,jdbcType=VARCHAR},
+
+
+ #{dutyjobnum,jdbcType=VARCHAR},
+
+
+ #{dutystartdate,jdbcType=TIMESTAMP},
+
+
+ #{dutyenddate,jdbcType=TIMESTAMP},
+
+
+ #{checkopinion,jdbcType=VARCHAR},
+
+
+ #{checkstate,jdbcType=VARCHAR},
+
+
+ #{checkerjobnum,jdbcType=VARCHAR},
+
+
+ #{checker,jdbcType=VARCHAR},
+
+
+ #{checkdate,jdbcType=TIMESTAMP},
+
+
+ #{successor,jdbcType=VARCHAR},
+
+
+ #{successorjobnum,jdbcType=VARCHAR},
+
+
+ #{rotationtime,jdbcType=TIMESTAMP},
+
+
+ #{state,jdbcType=VARCHAR},
+
+
+ #{remarks,jdbcType=VARCHAR},
+
+
+ #{creatornum,jdbcType=VARCHAR},
+
+
+ #{creatorname,jdbcType=VARCHAR},
+
+
+ #{createtime,jdbcType=TIMESTAMP},
+
+
+ #{lastupdatenum,jdbcType=VARCHAR},
+
+
+ #{lastupdate,jdbcType=VARCHAR},
+
+
+ #{lastupdatetime,jdbcType=TIMESTAMP},
+
+
+
+
+
+ update R_Rotation
+
+
+ ID = #{record.id,jdbcType=VARCHAR},
+
+
+ DeptID = #{record.deptid,jdbcType=INTEGER},
+
+
+ DEPT_NO = #{record.deptNo,jdbcType=VARCHAR},
+
+
+ EXPOSITIONTYPEID = #{record.expositiontypeid,jdbcType=VARCHAR},
+
+
+ POSITIONNO = #{record.positionno,jdbcType=VARCHAR},
+
+
+ Type = #{record.type,jdbcType=VARCHAR},
+
+
+ PostName = #{record.postname,jdbcType=VARCHAR},
+
+
+ DutyType = #{record.dutytype,jdbcType=VARCHAR},
+
+
+ DutyStaff = #{record.dutystaff,jdbcType=VARCHAR},
+
+
+ DutyJobNum = #{record.dutyjobnum,jdbcType=VARCHAR},
+
+
+ DutyStartDate = #{record.dutystartdate,jdbcType=TIMESTAMP},
+
+
+ DutyEndDate = #{record.dutyenddate,jdbcType=TIMESTAMP},
+
+
+ CheckOpinion = #{record.checkopinion,jdbcType=VARCHAR},
+
+
+ CheckState = #{record.checkstate,jdbcType=VARCHAR},
+
+
+ CheckerJobNum = #{record.checkerjobnum,jdbcType=VARCHAR},
+
+
+ Checker = #{record.checker,jdbcType=VARCHAR},
+
+
+ CheckDate = #{record.checkdate,jdbcType=TIMESTAMP},
+
+
+ Successor = #{record.successor,jdbcType=VARCHAR},
+
+
+ SuccessorJobNum = #{record.successorjobnum,jdbcType=VARCHAR},
+
+
+ RotationTime = #{record.rotationtime,jdbcType=TIMESTAMP},
+
+
+ State = #{record.state,jdbcType=VARCHAR},
+
+
+ Remarks = #{record.remarks,jdbcType=VARCHAR},
+
+
+ CreatorNum = #{record.creatornum,jdbcType=VARCHAR},
+
+
+ CreatorName = #{record.creatorname,jdbcType=VARCHAR},
+
+
+ CreateTime = #{record.createtime,jdbcType=TIMESTAMP},
+
+
+ LastUpdateNum = #{record.lastupdatenum,jdbcType=VARCHAR},
+
+
+ LastUpdate = #{record.lastupdate,jdbcType=VARCHAR},
+
+
+ LastUpdateTime = #{record.lastupdatetime,jdbcType=TIMESTAMP},
+
+
+
+
+
+
+
+ update R_Rotation
+ set ID = #{record.id,jdbcType=VARCHAR},
+ DeptID = #{record.deptid,jdbcType=INTEGER},
+ DEPT_NO = #{record.deptNo,jdbcType=VARCHAR},
+ EXPOSITIONTYPEID = #{record.expositiontypeid,jdbcType=VARCHAR},
+ POSITIONNO = #{record.positionno,jdbcType=VARCHAR},
+ Type = #{record.type,jdbcType=VARCHAR},
+ PostName = #{record.postname,jdbcType=VARCHAR},
+ DutyType = #{record.dutytype,jdbcType=VARCHAR},
+ DutyStaff = #{record.dutystaff,jdbcType=VARCHAR},
+ DutyJobNum = #{record.dutyjobnum,jdbcType=VARCHAR},
+ DutyStartDate = #{record.dutystartdate,jdbcType=TIMESTAMP},
+ DutyEndDate = #{record.dutyenddate,jdbcType=TIMESTAMP},
+ CheckOpinion = #{record.checkopinion,jdbcType=VARCHAR},
+ CheckState = #{record.checkstate,jdbcType=VARCHAR},
+ CheckerJobNum = #{record.checkerjobnum,jdbcType=VARCHAR},
+ Checker = #{record.checker,jdbcType=VARCHAR},
+ CheckDate = #{record.checkdate,jdbcType=TIMESTAMP},
+ Successor = #{record.successor,jdbcType=VARCHAR},
+ SuccessorJobNum = #{record.successorjobnum,jdbcType=VARCHAR},
+ RotationTime = #{record.rotationtime,jdbcType=TIMESTAMP},
+ State = #{record.state,jdbcType=VARCHAR},
+ Remarks = #{record.remarks,jdbcType=VARCHAR},
+ CreatorNum = #{record.creatornum,jdbcType=VARCHAR},
+ CreatorName = #{record.creatorname,jdbcType=VARCHAR},
+ CreateTime = #{record.createtime,jdbcType=TIMESTAMP},
+ LastUpdateNum = #{record.lastupdatenum,jdbcType=VARCHAR},
+ LastUpdate = #{record.lastupdate,jdbcType=VARCHAR},
+ LastUpdateTime = #{record.lastupdatetime,jdbcType=TIMESTAMP}
+
+
+
+
+
+ update R_Rotation
+
+
+ DeptID = #{deptid,jdbcType=INTEGER},
+
+
+ DEPT_NO = #{deptNo,jdbcType=VARCHAR},
+
+
+ EXPOSITIONTYPEID = #{expositiontypeid,jdbcType=VARCHAR},
+
+
+ POSITIONNO = #{positionno,jdbcType=VARCHAR},
+
+
+ Type = #{type,jdbcType=VARCHAR},
+
+
+ PostName = #{postname,jdbcType=VARCHAR},
+
+
+ DutyType = #{dutytype,jdbcType=VARCHAR},
+
+
+ DutyStaff = #{dutystaff,jdbcType=VARCHAR},
+
+
+ DutyJobNum = #{dutyjobnum,jdbcType=VARCHAR},
+
+
+ DutyStartDate = #{dutystartdate,jdbcType=TIMESTAMP},
+
+
+ DutyEndDate = #{dutyenddate,jdbcType=TIMESTAMP},
+
+
+ CheckOpinion = #{checkopinion,jdbcType=VARCHAR},
+
+
+ CheckState = #{checkstate,jdbcType=VARCHAR},
+
+
+ CheckerJobNum = #{checkerjobnum,jdbcType=VARCHAR},
+
+
+ Checker = #{checker,jdbcType=VARCHAR},
+
+
+ CheckDate = #{checkdate,jdbcType=TIMESTAMP},
+
+
+ Successor = #{successor,jdbcType=VARCHAR},
+
+
+ SuccessorJobNum = #{successorjobnum,jdbcType=VARCHAR},
+
+
+ RotationTime = #{rotationtime,jdbcType=TIMESTAMP},
+
+
+ State = #{state,jdbcType=VARCHAR},
+
+
+ Remarks = #{remarks,jdbcType=VARCHAR},
+
+
+ CreatorNum = #{creatornum,jdbcType=VARCHAR},
+
+
+ CreatorName = #{creatorname,jdbcType=VARCHAR},
+
+
+ CreateTime = #{createtime,jdbcType=TIMESTAMP},
+
+
+ LastUpdateNum = #{lastupdatenum,jdbcType=VARCHAR},
+
+
+ LastUpdate = #{lastupdate,jdbcType=VARCHAR},
+
+
+ LastUpdateTime = #{lastupdatetime,jdbcType=TIMESTAMP},
+
+
+ where ID = #{id,jdbcType=VARCHAR}
+
+
+ update R_Rotation
+ set DeptID = #{deptid,jdbcType=INTEGER},
+ DEPT_NO = #{deptNo,jdbcType=VARCHAR},
+ EXPOSITIONTYPEID = #{expositiontypeid,jdbcType=VARCHAR},
+ POSITIONNO = #{positionno,jdbcType=VARCHAR},
+ Type = #{type,jdbcType=VARCHAR},
+ PostName = #{postname,jdbcType=VARCHAR},
+ DutyType = #{dutytype,jdbcType=VARCHAR},
+ DutyStaff = #{dutystaff,jdbcType=VARCHAR},
+ DutyJobNum = #{dutyjobnum,jdbcType=VARCHAR},
+ DutyStartDate = #{dutystartdate,jdbcType=TIMESTAMP},
+ DutyEndDate = #{dutyenddate,jdbcType=TIMESTAMP},
+ CheckOpinion = #{checkopinion,jdbcType=VARCHAR},
+ CheckState = #{checkstate,jdbcType=VARCHAR},
+ CheckerJobNum = #{checkerjobnum,jdbcType=VARCHAR},
+ Checker = #{checker,jdbcType=VARCHAR},
+ CheckDate = #{checkdate,jdbcType=TIMESTAMP},
+ Successor = #{successor,jdbcType=VARCHAR},
+ SuccessorJobNum = #{successorjobnum,jdbcType=VARCHAR},
+ RotationTime = #{rotationtime,jdbcType=TIMESTAMP},
+ State = #{state,jdbcType=VARCHAR},
+ Remarks = #{remarks,jdbcType=VARCHAR},
+ CreatorNum = #{creatornum,jdbcType=VARCHAR},
+ CreatorName = #{creatorname,jdbcType=VARCHAR},
+ CreateTime = #{createtime,jdbcType=TIMESTAMP},
+ LastUpdateNum = #{lastupdatenum,jdbcType=VARCHAR},
+ LastUpdate = #{lastupdate,jdbcType=VARCHAR},
+ LastUpdateTime = #{lastupdatetime,jdbcType=TIMESTAMP}
+ where ID = #{id,jdbcType=VARCHAR}
+
+
+
+
+ insert into R_Rotation (ID, DeptID, DEPT_NO,
+ EXPOSITIONTYPEID, POSITIONNO,
+ Type, PostName, DutyType,
+ DutyStaff, DutyJobNum, DutyStartDate,
+ DutyEndDate, CheckOpinion,
+ CheckState, CheckerJobNum,
+ Checker, CheckDate, Successor,
+ SuccessorJobNum, RotationTime,
+ State, Remarks, CreatorNum,
+ CreatorName, CreateTime,
+ LastUpdateNum, LastUpdate,
+ LastUpdateTime)
+ values
+
+ (#{index.id,jdbcType=VARCHAR}, #{index.deptid,jdbcType=INTEGER}, #{index.deptNo,jdbcType=VARCHAR},
+ #{index.expositiontypeid,jdbcType=VARCHAR}, #{index.positionno,jdbcType=VARCHAR},
+ #{index.type,jdbcType=VARCHAR}, #{index.postname,jdbcType=VARCHAR}, #{index.dutytype,jdbcType=VARCHAR},
+ #{index.dutystaff,jdbcType=VARCHAR}, #{index.dutyjobnum,jdbcType=VARCHAR}, #{index.dutystartdate,jdbcType=TIMESTAMP},
+ #{index.dutyenddate,jdbcType=TIMESTAMP}, #{index.checkopinion,jdbcType=VARCHAR},
+ #{index.checkstate,jdbcType=VARCHAR}, #{index.checkerjobnum,jdbcType=VARCHAR},
+ #{index.checker,jdbcType=VARCHAR}, #{index.checkdate,jdbcType=TIMESTAMP}, #{index.successor,jdbcType=VARCHAR},
+ #{index.successorjobnum,jdbcType=VARCHAR}, #{index.rotationtime,jdbcType=TIMESTAMP},
+ #{index.state,jdbcType=VARCHAR}, #{index.remarks,jdbcType=VARCHAR}, #{index.creatornum,jdbcType=VARCHAR},
+ #{index.creatorname,jdbcType=VARCHAR}, #{index.createtime,jdbcType=TIMESTAMP},
+ #{index.lastupdatenum,jdbcType=VARCHAR}, #{index.lastupdate,jdbcType=VARCHAR},
+ #{index.lastupdatetime,jdbcType=TIMESTAMP})
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ and ${criterion.condition}
+
+
+ and ${criterion.condition} #{criterion.value}
+
+
+ and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+
+
+ and ${criterion.condition}
+
+ #{listItem}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ and ${criterion.condition}
+
+
+ and ${criterion.condition} #{criterion.value}
+
+
+ and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+
+
+ and ${criterion.condition}
+
+ #{listItem}
+
+
+
+
+
+
+
+
+
+
+ ID, DeptID, DEPT_NO, EXPOSITIONTYPEID, POSITIONNO, Type, PostName, DutyType, DutyStaff,
+ DutyJobNum, DutyStartDate, DutyEndDate, CheckOpinion, CheckState, CheckerJobNum,
+ Checker, CheckDate, Successor, SuccessorJobNum, RotationTime, State, Remarks, CreatorNum,
+ CreatorName, CreateTime, LastUpdateNum, LastUpdate, LastUpdateTime
+
+
+
+
+ delete from R_Rotation
+ where ID = #{id,jdbcType=VARCHAR}
+
+
+
+ delete from R_Rotation
+
+
+
+
+
+ insert into R_Rotation (ID, DeptID, DEPT_NO,
+ EXPOSITIONTYPEID, POSITIONNO, Type,
+ PostName, DutyType, DutyStaff,
+ DutyJobNum, DutyStartDate, DutyEndDate,
+ CheckOpinion, CheckState, CheckerJobNum,
+ Checker, CheckDate, Successor,
+ SuccessorJobNum, RotationTime, State,
+ Remarks, CreatorNum, CreatorName,
+ CreateTime, LastUpdateNum, LastUpdate,
+ LastUpdateTime)
+ values (#{id,jdbcType=VARCHAR}, #{deptid,jdbcType=INTEGER}, #{deptNo,jdbcType=VARCHAR},
+ #{expositiontypeid,jdbcType=VARCHAR}, #{positionno,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
+ #{postname,jdbcType=VARCHAR}, #{dutytype,jdbcType=VARCHAR}, #{dutystaff,jdbcType=VARCHAR},
+ #{dutyjobnum,jdbcType=VARCHAR}, #{dutystartdate,jdbcType=TIMESTAMP}, #{dutyenddate,jdbcType=TIMESTAMP},
+ #{checkopinion,jdbcType=VARCHAR}, #{checkstate,jdbcType=VARCHAR}, #{checkerjobnum,jdbcType=VARCHAR},
+ #{checker,jdbcType=VARCHAR}, #{checkdate,jdbcType=TIMESTAMP}, #{successor,jdbcType=VARCHAR},
+ #{successorjobnum,jdbcType=VARCHAR}, #{rotationtime,jdbcType=TIMESTAMP}, #{state,jdbcType=VARCHAR},
+ #{remarks,jdbcType=VARCHAR}, #{creatornum,jdbcType=VARCHAR}, #{creatorname,jdbcType=VARCHAR},
+ #{createtime,jdbcType=TIMESTAMP}, #{lastupdatenum,jdbcType=VARCHAR}, #{lastupdate,jdbcType=VARCHAR},
+ #{lastupdatetime,jdbcType=TIMESTAMP})
+
+
+ insert into R_Rotation
+
+
+ ID,
+
+
+ DeptID,
+
+
+ DEPT_NO,
+
+
+ EXPOSITIONTYPEID,
+
+
+ POSITIONNO,
+
+
+ Type,
+
+
+ PostName,
+
+
+ DutyType,
+
+
+ DutyStaff,
+
+
+ DutyJobNum,
+
+
+ DutyStartDate,
+
+
+ DutyEndDate,
+
+
+ CheckOpinion,
+
+
+ CheckState,
+
+
+ CheckerJobNum,
+
+
+ Checker,
+
+
+ CheckDate,
+
+
+ Successor,
+
+
+ SuccessorJobNum,
+
+
+ RotationTime,
+
+
+ State,
+
+
+ Remarks,
+
+
+ CreatorNum,
+
+
+ CreatorName,
+
+
+ CreateTime,
+
+
+ LastUpdateNum,
+
+
+ LastUpdate,
+
+
+ LastUpdateTime,
+
+
+
+
+ #{id,jdbcType=VARCHAR},
+
+
+ #{deptid,jdbcType=INTEGER},
+
+
+ #{deptNo,jdbcType=VARCHAR},
+
+
+ #{expositiontypeid,jdbcType=VARCHAR},
+
+
+ #{positionno,jdbcType=VARCHAR},
+
+
+ #{type,jdbcType=VARCHAR},
+
+
+ #{postname,jdbcType=VARCHAR},
+
+
+ #{dutytype,jdbcType=VARCHAR},
+
+
+ #{dutystaff,jdbcType=VARCHAR},
+
+
+ #{dutyjobnum,jdbcType=VARCHAR},
+
+
+ #{dutystartdate,jdbcType=TIMESTAMP},
+
+
+ #{dutyenddate,jdbcType=TIMESTAMP},
+
+
+ #{checkopinion,jdbcType=VARCHAR},
+
+
+ #{checkstate,jdbcType=VARCHAR},
+
+
+ #{checkerjobnum,jdbcType=VARCHAR},
+
+
+ #{checker,jdbcType=VARCHAR},
+
+
+ #{checkdate,jdbcType=TIMESTAMP},
+
+
+ #{successor,jdbcType=VARCHAR},
+
+
+ #{successorjobnum,jdbcType=VARCHAR},
+
+
+ #{rotationtime,jdbcType=TIMESTAMP},
+
+
+ #{state,jdbcType=VARCHAR},
+
+
+ #{remarks,jdbcType=VARCHAR},
+
+
+ #{creatornum,jdbcType=VARCHAR},
+
+
+ #{creatorname,jdbcType=VARCHAR},
+
+
+ #{createtime,jdbcType=TIMESTAMP},
+
+
+ #{lastupdatenum,jdbcType=VARCHAR},
+
+
+ #{lastupdate,jdbcType=VARCHAR},
+
+
+ #{lastupdatetime,jdbcType=TIMESTAMP},
+
+
+
+
+
+ update R_Rotation
+
+
+ ID = #{record.id,jdbcType=VARCHAR},
+
+
+ DeptID = #{record.deptid,jdbcType=INTEGER},
+
+
+ DEPT_NO = #{record.deptNo,jdbcType=VARCHAR},
+
+
+ EXPOSITIONTYPEID = #{record.expositiontypeid,jdbcType=VARCHAR},
+
+
+ POSITIONNO = #{record.positionno,jdbcType=VARCHAR},
+
+
+ Type = #{record.type,jdbcType=VARCHAR},
+
+
+ PostName = #{record.postname,jdbcType=VARCHAR},
+
+
+ DutyType = #{record.dutytype,jdbcType=VARCHAR},
+
+
+ DutyStaff = #{record.dutystaff,jdbcType=VARCHAR},
+
+
+ DutyJobNum = #{record.dutyjobnum,jdbcType=VARCHAR},
+
+
+ DutyStartDate = #{record.dutystartdate,jdbcType=TIMESTAMP},
+
+
+ DutyEndDate = #{record.dutyenddate,jdbcType=TIMESTAMP},
+
+
+ CheckOpinion = #{record.checkopinion,jdbcType=VARCHAR},
+
+
+ CheckState = #{record.checkstate,jdbcType=VARCHAR},
+
+
+ CheckerJobNum = #{record.checkerjobnum,jdbcType=VARCHAR},
+
+
+ Checker = #{record.checker,jdbcType=VARCHAR},
+
+
+ CheckDate = #{record.checkdate,jdbcType=TIMESTAMP},
+
+
+ Successor = #{record.successor,jdbcType=VARCHAR},
+
+
+ SuccessorJobNum = #{record.successorjobnum,jdbcType=VARCHAR},
+
+
+ RotationTime = #{record.rotationtime,jdbcType=TIMESTAMP},
+
+
+ State = #{record.state,jdbcType=VARCHAR},
+
+
+ Remarks = #{record.remarks,jdbcType=VARCHAR},
+
+
+ CreatorNum = #{record.creatornum,jdbcType=VARCHAR},
+
+
+ CreatorName = #{record.creatorname,jdbcType=VARCHAR},
+
+
+ CreateTime = #{record.createtime,jdbcType=TIMESTAMP},
+
+
+ LastUpdateNum = #{record.lastupdatenum,jdbcType=VARCHAR},
+
+
+ LastUpdate = #{record.lastupdate,jdbcType=VARCHAR},
+
+
+ LastUpdateTime = #{record.lastupdatetime,jdbcType=TIMESTAMP},
+
+
+
+
+
+
+
+ update R_Rotation
+ set ID = #{record.id,jdbcType=VARCHAR},
+ DeptID = #{record.deptid,jdbcType=INTEGER},
+ DEPT_NO = #{record.deptNo,jdbcType=VARCHAR},
+ EXPOSITIONTYPEID = #{record.expositiontypeid,jdbcType=VARCHAR},
+ POSITIONNO = #{record.positionno,jdbcType=VARCHAR},
+ Type = #{record.type,jdbcType=VARCHAR},
+ PostName = #{record.postname,jdbcType=VARCHAR},
+ DutyType = #{record.dutytype,jdbcType=VARCHAR},
+ DutyStaff = #{record.dutystaff,jdbcType=VARCHAR},
+ DutyJobNum = #{record.dutyjobnum,jdbcType=VARCHAR},
+ DutyStartDate = #{record.dutystartdate,jdbcType=TIMESTAMP},
+ DutyEndDate = #{record.dutyenddate,jdbcType=TIMESTAMP},
+ CheckOpinion = #{record.checkopinion,jdbcType=VARCHAR},
+ CheckState = #{record.checkstate,jdbcType=VARCHAR},
+ CheckerJobNum = #{record.checkerjobnum,jdbcType=VARCHAR},
+ Checker = #{record.checker,jdbcType=VARCHAR},
+ CheckDate = #{record.checkdate,jdbcType=TIMESTAMP},
+ Successor = #{record.successor,jdbcType=VARCHAR},
+ SuccessorJobNum = #{record.successorjobnum,jdbcType=VARCHAR},
+ RotationTime = #{record.rotationtime,jdbcType=TIMESTAMP},
+ State = #{record.state,jdbcType=VARCHAR},
+ Remarks = #{record.remarks,jdbcType=VARCHAR},
+ CreatorNum = #{record.creatornum,jdbcType=VARCHAR},
+ CreatorName = #{record.creatorname,jdbcType=VARCHAR},
+ CreateTime = #{record.createtime,jdbcType=TIMESTAMP},
+ LastUpdateNum = #{record.lastupdatenum,jdbcType=VARCHAR},
+ LastUpdate = #{record.lastupdate,jdbcType=VARCHAR},
+ LastUpdateTime = #{record.lastupdatetime,jdbcType=TIMESTAMP}
+
+
+
+
+
+ update R_Rotation
+
+
+ DeptID = #{deptid,jdbcType=INTEGER},
+
+
+ DEPT_NO = #{deptNo,jdbcType=VARCHAR},
+
+
+ EXPOSITIONTYPEID = #{expositiontypeid,jdbcType=VARCHAR},
+
+
+ POSITIONNO = #{positionno,jdbcType=VARCHAR},
+
+
+ Type = #{type,jdbcType=VARCHAR},
+
+
+ PostName = #{postname,jdbcType=VARCHAR},
+
+
+ DutyType = #{dutytype,jdbcType=VARCHAR},
+
+
+ DutyStaff = #{dutystaff,jdbcType=VARCHAR},
+
+
+ DutyJobNum = #{dutyjobnum,jdbcType=VARCHAR},
+
+
+ DutyStartDate = #{dutystartdate,jdbcType=TIMESTAMP},
+
+
+ DutyEndDate = #{dutyenddate,jdbcType=TIMESTAMP},
+
+
+ CheckOpinion = #{checkopinion,jdbcType=VARCHAR},
+
+
+ CheckState = #{checkstate,jdbcType=VARCHAR},
+
+
+ CheckerJobNum = #{checkerjobnum,jdbcType=VARCHAR},
+
+
+ Checker = #{checker,jdbcType=VARCHAR},
+
+
+ CheckDate = #{checkdate,jdbcType=TIMESTAMP},
+
+
+ Successor = #{successor,jdbcType=VARCHAR},
+
+
+ SuccessorJobNum = #{successorjobnum,jdbcType=VARCHAR},
+
+
+ RotationTime = #{rotationtime,jdbcType=TIMESTAMP},
+
+
+ State = #{state,jdbcType=VARCHAR},
+
+
+ Remarks = #{remarks,jdbcType=VARCHAR},
+
+
+ CreatorNum = #{creatornum,jdbcType=VARCHAR},
+
+
+ CreatorName = #{creatorname,jdbcType=VARCHAR},
+
+
+ CreateTime = #{createtime,jdbcType=TIMESTAMP},
+
+
+ LastUpdateNum = #{lastupdatenum,jdbcType=VARCHAR},
+
+
+ LastUpdate = #{lastupdate,jdbcType=VARCHAR},
+
+
+ LastUpdateTime = #{lastupdatetime,jdbcType=TIMESTAMP},
+
+
+ where ID = #{id,jdbcType=VARCHAR}
+
+
+ update R_Rotation
+ set DeptID = #{deptid,jdbcType=INTEGER},
+ DEPT_NO = #{deptNo,jdbcType=VARCHAR},
+ EXPOSITIONTYPEID = #{expositiontypeid,jdbcType=VARCHAR},
+ POSITIONNO = #{positionno,jdbcType=VARCHAR},
+ Type = #{type,jdbcType=VARCHAR},
+ PostName = #{postname,jdbcType=VARCHAR},
+ DutyType = #{dutytype,jdbcType=VARCHAR},
+ DutyStaff = #{dutystaff,jdbcType=VARCHAR},
+ DutyJobNum = #{dutyjobnum,jdbcType=VARCHAR},
+ DutyStartDate = #{dutystartdate,jdbcType=TIMESTAMP},
+ DutyEndDate = #{dutyenddate,jdbcType=TIMESTAMP},
+ CheckOpinion = #{checkopinion,jdbcType=VARCHAR},
+ CheckState = #{checkstate,jdbcType=VARCHAR},
+ CheckerJobNum = #{checkerjobnum,jdbcType=VARCHAR},
+ Checker = #{checker,jdbcType=VARCHAR},
+ CheckDate = #{checkdate,jdbcType=TIMESTAMP},
+ Successor = #{successor,jdbcType=VARCHAR},
+ SuccessorJobNum = #{successorjobnum,jdbcType=VARCHAR},
+ RotationTime = #{rotationtime,jdbcType=TIMESTAMP},
+ State = #{state,jdbcType=VARCHAR},
+ Remarks = #{remarks,jdbcType=VARCHAR},
+ CreatorNum = #{creatornum,jdbcType=VARCHAR},
+ CreatorName = #{creatorname,jdbcType=VARCHAR},
+ CreateTime = #{createtime,jdbcType=TIMESTAMP},
+ LastUpdateNum = #{lastupdatenum,jdbcType=VARCHAR},
+ LastUpdate = #{lastupdate,jdbcType=VARCHAR},
+ LastUpdateTime = #{lastupdatetime,jdbcType=TIMESTAMP}
+ where ID = #{id,jdbcType=VARCHAR}
+
+
+
+
+ insert into R_Rotation (ID, DeptID, DEPT_NO,
+ EXPOSITIONTYPEID, POSITIONNO,
+ Type, PostName, DutyType,
+ DutyStaff, DutyJobNum, DutyStartDate,
+ DutyEndDate, CheckOpinion,
+ CheckState, CheckerJobNum,
+ Checker, CheckDate, Successor,
+ SuccessorJobNum, RotationTime,
+ State, Remarks, CreatorNum,
+ CreatorName, CreateTime,
+ LastUpdateNum, LastUpdate,
+ LastUpdateTime)
+ values
+
+ (#{index.id,jdbcType=VARCHAR}, #{index.deptid,jdbcType=INTEGER}, #{index.deptNo,jdbcType=VARCHAR},
+ #{index.expositiontypeid,jdbcType=VARCHAR}, #{index.positionno,jdbcType=VARCHAR},
+ #{index.type,jdbcType=VARCHAR}, #{index.postname,jdbcType=VARCHAR}, #{index.dutytype,jdbcType=VARCHAR},
+ #{index.dutystaff,jdbcType=VARCHAR}, #{index.dutyjobnum,jdbcType=VARCHAR}, #{index.dutystartdate,jdbcType=TIMESTAMP},
+ #{index.dutyenddate,jdbcType=TIMESTAMP}, #{index.checkopinion,jdbcType=VARCHAR},
+ #{index.checkstate,jdbcType=VARCHAR}, #{index.checkerjobnum,jdbcType=VARCHAR},
+ #{index.checker,jdbcType=VARCHAR}, #{index.checkdate,jdbcType=TIMESTAMP}, #{index.successor,jdbcType=VARCHAR},
+ #{index.successorjobnum,jdbcType=VARCHAR}, #{index.rotationtime,jdbcType=TIMESTAMP},
+ #{index.state,jdbcType=VARCHAR}, #{index.remarks,jdbcType=VARCHAR}, #{index.creatornum,jdbcType=VARCHAR},
+ #{index.creatorname,jdbcType=VARCHAR}, #{index.createtime,jdbcType=TIMESTAMP},
+ #{index.lastupdatenum,jdbcType=VARCHAR}, #{index.lastupdate,jdbcType=VARCHAR},
+ #{index.lastupdatetime,jdbcType=TIMESTAMP})
+
+
+
\ No newline at end of file