diff --git a/src/main/java/com/ccsens/ptccsens/api/DeliverController.java b/src/main/java/com/ccsens/ptccsens/api/DeliverController.java new file mode 100644 index 0000000..16e1106 --- /dev/null +++ b/src/main/java/com/ccsens/ptccsens/api/DeliverController.java @@ -0,0 +1,134 @@ +package com.ccsens.ptccsens.api; + + +import com.ccsens.ptccsens.annotation.MustLogin; +import com.ccsens.ptccsens.bean.dto.DeliverDto; +import com.ccsens.ptccsens.bean.vo.DeliverVo; +import com.ccsens.ptccsens.service.IDeliverService; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + + +/** + * @author AUSU + */ +@Api(tags = "交付物相关" ) +@RestController +@RequestMapping("/deliver") +@Slf4j +public class DeliverController { + + @Resource + private IDeliverService deliverService; + + @MustLogin + @ApiOperation(value = "查询所有成员", notes = "") + @RequestMapping(value = "/queryChecker", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> queryChecker(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + log.info("查询所有成员--{}",params); + List checkers = deliverService.queryChecker(params.getParam(), params.getUserId()); + log.info("返回所有成员--{}",checkers); + return JsonResponse.newInstance().ok(checkers); + } + + @MustLogin + @ApiOperation(value = "修改交付物标题名称(给任务添加交付物)", notes = "") + @RequestMapping(value = "/saveDeliver", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse saveDeliver(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + log.info("给任务添加交付物--{}",params); + deliverService.saveDeliver(params.getParam(), params.getUserId()); + return JsonResponse.newInstance().ok(); + } + + @MustLogin + @ApiOperation(value = "查看任务下的交付物", notes = "") + @RequestMapping(value = "/getDeliver", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse getDeliver(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + log.info("查看任务下的交付物--{}",params); + DeliverVo.DeliverOfTask deliverOfTask = deliverService.getDeliver(params.getParam(), params.getUserId()); + log.info("任务下的交付物信息--{}",deliverOfTask); + return JsonResponse.newInstance().ok(deliverOfTask); + } + + @MustLogin + @ApiOperation(value = "提交交付物信息", notes = "") + @RequestMapping(value = "/submitDeliver", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse submitDeliver(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + log.info("查看任务下的交付物--{}",params); + deliverService.submitDeliver(params.getParam(), params.getUserId()); + return JsonResponse.newInstance().ok(); + } + + @MustLogin + @ApiOperation(value = "检查交付物", notes = "") + @RequestMapping(value = "/checkDeliver", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse checkDeliver(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + log.info("查看任务下的交付物--{}",params); + deliverService.checkDeliver(params.getParam(), params.getUserId()); + return JsonResponse.newInstance().ok(); + } + + @MustLogin + @ApiOperation(value = "查看交付物上传记录", notes = "查看所有记录倒叙查看") + @RequestMapping(value = "/queryRecord", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse queryRecord(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + log.info("查看交付物上传记录--{}",params); + DeliverVo.QueryDeliverRecord queryDeliverRecord = deliverService.queryRecord(params.getParam(), params.getUserId()); + log.info("返回交付物上传记录"); + return JsonResponse.newInstance().ok(queryDeliverRecord); + } + + @MustLogin + @ApiOperation(value = "查看本次提交的交付物的所有审核记录", notes = "查看所有记录倒叙查看") + @RequestMapping(value = "/queryCheckLog", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> queryCheckLog(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + log.info("查看交付物上传记录--{}",params); + List checkerInfos = deliverService.queryCheckLog(params.getParam(), params.getUserId()); + log.info("交付物上传记录--{}",checkerInfos); + return JsonResponse.newInstance().ok(checkerInfos); + } + +// @MustLogin +// @ApiOperation(value = "提交交付物", notes = "") +// @RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) +// public JsonResponse saveDeliver(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ +// deliverService.saveDeliver(params.getParam(),params.getUserId()); +// return JsonResponse.newInstance().ok(); +// } +// +// @MustLogin +// @ApiOperation(value = "查询任务的交付物历史记录", notes = "") +// @RequestMapping(value = "/queryDeliverOfTask", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) +// public JsonResponse> queryDeliverOfTask(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ +// List deliverOfTask = deliverService.queryDeliverOfTask(params.getParam(), params.getUserId()); +// return JsonResponse.newInstance().ok(deliverOfTask); +// } +// +// @MustLogin +// @ApiOperation(value = "检查交付物", notes = "") +// @RequestMapping(value = "/checkDeliver", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) +// public JsonResponse checkDeliver(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ +// deliverService.checkDeliver(params.getParam(),params.getUserId()); +// return JsonResponse.newInstance().ok(); +// } +// +// @MustLogin +// @ApiOperation(value = "查询项目的交付物历史记录", notes = "") +// @RequestMapping(value = "/queryDeliverOfProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) +// public JsonResponse> queryDeliverOfProject(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ +// PageInfo deliverOfProject = deliverService.queryDeliverOfProject(params.getParam(), params.getUserId()); +// return JsonResponse.newInstance().ok(deliverOfProject); +// } +} diff --git a/src/main/java/com/ccsens/ptccsens/api/OcrController.java b/src/main/java/com/ccsens/ptccsens/api/OcrController.java index 3746a75..657d681 100644 --- a/src/main/java/com/ccsens/ptccsens/api/OcrController.java +++ b/src/main/java/com/ccsens/ptccsens/api/OcrController.java @@ -1,13 +1,15 @@ package com.ccsens.ptccsens.api; import cn.hutool.core.codec.Base64; +import cn.hutool.core.io.FileUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ImageUtil; import com.ccsens.ptccsens.bean.dto.ProjectFinanceDto; import com.ccsens.ptccsens.bean.vo.OcrVo; import com.ccsens.ptccsens.bean.vo.ProjectFinanceVo; import com.ccsens.ptccsens.service.IOcrService; import com.ccsens.ptccsens.util.BasicsConstant; -import com.ccsens.util.JsonResponse; +import com.ccsens.util.*; import com.ccsens.util.baidu.BaiDuDto; import com.ccsens.util.baidu.BaiDuUtil; import com.ccsens.util.baidu.BaiDuVo; @@ -24,8 +26,10 @@ import javax.annotation.Resource; import javax.imageio.ImageIO; import javax.servlet.http.Part; import java.io.ByteArrayOutputStream; +import java.io.File; import java.io.IOException; import java.text.ParseException; +import java.util.Date; /** @@ -48,7 +52,25 @@ public class OcrController { ByteArrayOutputStream out = new ByteArrayOutputStream(); ImageUtil.scale(ImageIO.read(part.getInputStream()), out, 1f); String img = Base64.encode(out.toByteArray()); - OcrVo.BillInfo billInfo = ocrService.identifyBill(img); + //保存文件 +// String extName = FileUtil.extName(part.getSubmittedFileName()); +// String dir = PropUtil.path + File.separator + Constant.OrcImg.FILE_DIR; +// String extraPath = DateUtil.format(new Date(), "yyyyMMdd"); +// String path = extraPath + File.separator+firstAidInfo.getId()+firstAidInfo.getName()+File.separator+ IdUtil.simpleUUID() + "." + extName; +// //转成file +// File saveFile = new File(dir + extraPath); +// if (!saveFile.exists()) { +// saveFile.mkdirs(); +// } +// String fullPath = dir + File.separator + path; +// FileUtil.writeFromStream(file.getInputStream(), fullPath); + //1.上传文件 + String allowedExts = BasicsConstant.FILE_TYPE_IMG; + String dir = PropUtil.path; + String path = UploadFileUtil_Servlet3.uploadFile(part, allowedExts, dir); + String realPath = PropUtil.imgDomain+""+path; + log.info("文件保存路径:{}",realPath); + OcrVo.BillInfo billInfo = ocrService.identifyBill(img,realPath); log.info("图像识别结束：{}", billInfo); return JsonResponse.newInstance().ok(billInfo); } diff --git a/src/main/java/com/ccsens/ptccsens/api/ProjectFinanceController.java b/src/main/java/com/ccsens/ptccsens/api/ProjectFinanceController.java index ed04f0e..b6a64fb 100644 --- a/src/main/java/com/ccsens/ptccsens/api/ProjectFinanceController.java +++ b/src/main/java/com/ccsens/ptccsens/api/ProjectFinanceController.java @@ -93,4 +93,14 @@ public class ProjectFinanceController { log.info("查看所有的费用申请结束:{}",financeOfProjectList); return JsonResponse.newInstance().ok(financeOfProjectList); } + + @MustLogin + @ApiOperation(value = "时间财务图-统计", notes = "") + @RequestMapping(value = "/timeFinancialChart", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> timeFinancialChart(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + log.info("查看所有的费用申请开始{}",params); + List timeFinancialChart = projectFinanceService.timeFinancialChart(params.getParam(),params.getUserId()); + log.info("查看所有的费用申请结束:{}",timeFinancialChart); + return JsonResponse.newInstance().ok(timeFinancialChart); + } } diff --git a/src/main/java/com/ccsens/ptccsens/api/finance/FinanceController.java b/src/main/java/com/ccsens/ptccsens/api/finance/FinanceController.java index 394b0c0..a42578c 100644 --- a/src/main/java/com/ccsens/ptccsens/api/finance/FinanceController.java +++ b/src/main/java/com/ccsens/ptccsens/api/finance/FinanceController.java @@ -34,12 +34,12 @@ public class FinanceController { @Resource private IFinanceService financeService; - @MustLogin + @ApiOperation(value = "通过任务id查看任务关联的财务信息", notes = "") @RequestMapping(value = "/getByTask", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse getByTask(@ApiParam @Validated @RequestBody QueryDto params) { log.info("通过任务id查看任务关联的财务信息：{}",params); - FinanceVo.FinanceItem item = financeService.getByTask(params.getParam(), params.getUserId()); + FinanceVo.FinanceItem item = financeService.getByTask(params.getParam()); log.info("通过任务id查看任务关联的财务信息结束：{}", item); return JsonResponse.newInstance().ok(item); } @@ -88,4 +88,32 @@ public class FinanceController { log.info("查看当前用户的费用申请历史信息（奖金）结束:{}", history); return JsonResponse.newInstance().ok(history); } + + @MustLogin + @ApiOperation(value = "成员财务图", notes = "") + @RequestMapping(value = "/memberFinance", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse memberFinance(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("成员财务图：{}",params); + List memberFinances = financeService.queryMemberFinance(params.getParam(), params.getUserId()); + log.info("成员财务图结束:{}", memberFinances); + return JsonResponse.newInstance().ok(memberFinances); + } + @MustLogin + @ApiOperation(value = "任务支出图", notes = "") + @RequestMapping(value = "/taskExpense", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse taskExpense(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("任务支出图：{}",params); + List taskExpenses = financeService.queryTaskExpense(params.getParam(), params.getUserId()); + log.info("任务支出图结束:{}", taskExpenses); + return JsonResponse.newInstance().ok(taskExpenses); + } + @MustLogin + @ApiOperation(value = "名目支出统计", notes = "") + @RequestMapping(value = "/rowExpense", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse rowExpense(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("名目支出统计：{}",params); + List RowExpense = financeService.queryRowExpense(params.getParam(), params.getUserId()); + log.info("名目支出统计结束:{}", RowExpense); + return JsonResponse.newInstance().ok(RowExpense); + } } diff --git a/src/main/java/com/ccsens/ptccsens/bean/dto/DeliverDto.java b/src/main/java/com/ccsens/ptccsens/bean/dto/DeliverDto.java index 2cbf39e..7b2fa93 100644 --- a/src/main/java/com/ccsens/ptccsens/bean/dto/DeliverDto.java +++ b/src/main/java/com/ccsens/ptccsens/bean/dto/DeliverDto.java @@ -4,7 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.*; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.List; diff --git a/src/main/java/com/ccsens/ptccsens/bean/dto/FinanceDto.java b/src/main/java/com/ccsens/ptccsens/bean/dto/FinanceDto.java index 84f9850..8eadf13 100644 --- a/src/main/java/com/ccsens/ptccsens/bean/dto/FinanceDto.java +++ b/src/main/java/com/ccsens/ptccsens/bean/dto/FinanceDto.java @@ -42,6 +42,7 @@ public class FinanceDto { @NotNull @ApiModelProperty("所属部门") private String department; + @NotNull @ApiModelProperty("所属项目id") private Long projectId; @ApiModelProperty("所属任务id") @@ -135,4 +136,27 @@ public class FinanceDto { @ApiModelProperty("每页的数量，默认10，最大100") private int pageSize = 10; } + + @Data + @ApiModel("财务-成员财务-请求") + public static class MemberFinance { + @NotNull + @ApiModelProperty("所属项目id") + private Long projectId; + } + + @Data + @ApiModel("财务-任务支出-请求") + public static class TaskExpense { + @NotNull + @ApiModelProperty("所属项目id") + private Long projectId; + } + @Data + @ApiModel("财务-名目支出-请求") + public static class RowExpense { + @NotNull + @ApiModelProperty("所属项目id") + private Long projectId; + } } diff --git a/src/main/java/com/ccsens/ptccsens/bean/dto/ProjectFinanceDto.java b/src/main/java/com/ccsens/ptccsens/bean/dto/ProjectFinanceDto.java index c890841..713ad7b 100644 --- a/src/main/java/com/ccsens/ptccsens/bean/dto/ProjectFinanceDto.java +++ b/src/main/java/com/ccsens/ptccsens/bean/dto/ProjectFinanceDto.java @@ -93,4 +93,12 @@ public class ProjectFinanceDto { @ApiModelProperty("每页的数量") private Integer pageSize = 10; } + + @Data + @ApiModel("时间财务图-入参") + public static class TimeFinancialChart { + @NotNull + @ApiModelProperty("项目id") + private Long projectId; + } } diff --git a/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliver.java b/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliver.java new file mode 100644 index 0000000..c9b68b2 --- /dev/null +++ b/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliver.java @@ -0,0 +1,106 @@ +package com.ccsens.ptccsens.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class PluDeliver implements Serializable { + private Long id; + + private Long taskSubId; + + private String name; + + private String description; + + private Long operator; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getTaskSubId() { + return taskSubId; + } + + public void setTaskSubId(Long taskSubId) { + this.taskSubId = taskSubId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name == null ? null : name.trim(); + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description == null ? null : description.trim(); + } + + public Long getOperator() { + return operator; + } + + public void setOperator(Long operator) { + this.operator = operator; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", taskSubId=").append(taskSubId); + sb.append(", name=").append(name); + sb.append(", description=").append(description); + sb.append(", operator=").append(operator); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverExample.java b/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverExample.java new file mode 100644 index 0000000..0bc6b60 --- /dev/null +++ b/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverExample.java @@ -0,0 +1,701 @@ +package com.ccsens.ptccsens.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class PluDeliverExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public PluDeliverExample() { + 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 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(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", 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(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andTaskSubIdIsNull() { + addCriterion("task_sub_id is null"); + return (Criteria) this; + } + + public Criteria andTaskSubIdIsNotNull() { + addCriterion("task_sub_id is not null"); + return (Criteria) this; + } + + public Criteria andTaskSubIdEqualTo(Long value) { + addCriterion("task_sub_id =", value, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdNotEqualTo(Long value) { + addCriterion("task_sub_id <>", value, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdGreaterThan(Long value) { + addCriterion("task_sub_id >", value, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdGreaterThanOrEqualTo(Long value) { + addCriterion("task_sub_id >=", value, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdLessThan(Long value) { + addCriterion("task_sub_id <", value, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdLessThanOrEqualTo(Long value) { + addCriterion("task_sub_id <=", value, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdIn(List values) { + addCriterion("task_sub_id in", values, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdNotIn(List values) { + addCriterion("task_sub_id not in", values, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdBetween(Long value1, Long value2) { + addCriterion("task_sub_id between", value1, value2, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdNotBetween(Long value1, Long value2) { + addCriterion("task_sub_id not between", value1, value2, "taskSubId"); + return (Criteria) this; + } + + public Criteria andNameIsNull() { + addCriterion("name is null"); + return (Criteria) this; + } + + public Criteria andNameIsNotNull() { + addCriterion("name is not null"); + return (Criteria) this; + } + + public Criteria andNameEqualTo(String value) { + addCriterion("name =", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotEqualTo(String value) { + addCriterion("name <>", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThan(String value) { + addCriterion("name >", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThanOrEqualTo(String value) { + addCriterion("name >=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThan(String value) { + addCriterion("name <", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThanOrEqualTo(String value) { + addCriterion("name <=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLike(String value) { + addCriterion("name like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotLike(String value) { + addCriterion("name not like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameIn(List values) { + addCriterion("name in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List values) { + addCriterion("name not in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameBetween(String value1, String value2) { + addCriterion("name between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andNameNotBetween(String value1, String value2) { + addCriterion("name not between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andDescriptionIsNull() { + addCriterion("description is null"); + return (Criteria) this; + } + + public Criteria andDescriptionIsNotNull() { + addCriterion("description is not null"); + return (Criteria) this; + } + + public Criteria andDescriptionEqualTo(String value) { + addCriterion("description =", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotEqualTo(String value) { + addCriterion("description <>", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionGreaterThan(String value) { + addCriterion("description >", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionGreaterThanOrEqualTo(String value) { + addCriterion("description >=", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLessThan(String value) { + addCriterion("description <", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLessThanOrEqualTo(String value) { + addCriterion("description <=", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLike(String value) { + addCriterion("description like", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotLike(String value) { + addCriterion("description not like", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionIn(List values) { + addCriterion("description in", values, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotIn(List values) { + addCriterion("description not in", values, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionBetween(String value1, String value2) { + addCriterion("description between", value1, value2, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotBetween(String value1, String value2) { + addCriterion("description not between", value1, value2, "description"); + return (Criteria) this; + } + + public Criteria andOperatorIsNull() { + addCriterion("operator is null"); + return (Criteria) this; + } + + public Criteria andOperatorIsNotNull() { + addCriterion("operator is not null"); + return (Criteria) this; + } + + public Criteria andOperatorEqualTo(Long value) { + addCriterion("operator =", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotEqualTo(Long value) { + addCriterion("operator <>", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorGreaterThan(Long value) { + addCriterion("operator >", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorGreaterThanOrEqualTo(Long value) { + addCriterion("operator >=", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorLessThan(Long value) { + addCriterion("operator <", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorLessThanOrEqualTo(Long value) { + addCriterion("operator <=", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorIn(List values) { + addCriterion("operator in", values, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotIn(List values) { + addCriterion("operator not in", values, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorBetween(Long value1, Long value2) { + addCriterion("operator between", value1, value2, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotBetween(Long value1, Long value2) { + addCriterion("operator not between", value1, value2, "operator"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + 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/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverRecord.java b/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverRecord.java new file mode 100644 index 0000000..fa62903 --- /dev/null +++ b/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverRecord.java @@ -0,0 +1,106 @@ +package com.ccsens.ptccsens.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class PluDeliverRecord implements Serializable { + private Long id; + + private Long deliverId; + + private Long submitTime; + + private Long memberId; + + private Long operator; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getDeliverId() { + return deliverId; + } + + public void setDeliverId(Long deliverId) { + this.deliverId = deliverId; + } + + public Long getSubmitTime() { + return submitTime; + } + + public void setSubmitTime(Long submitTime) { + this.submitTime = submitTime; + } + + public Long getMemberId() { + return memberId; + } + + public void setMemberId(Long memberId) { + this.memberId = memberId; + } + + public Long getOperator() { + return operator; + } + + public void setOperator(Long operator) { + this.operator = operator; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", deliverId=").append(deliverId); + sb.append(", submitTime=").append(submitTime); + sb.append(", memberId=").append(memberId); + sb.append(", operator=").append(operator); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverRecordCheck.java b/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverRecordCheck.java new file mode 100644 index 0000000..79910c0 --- /dev/null +++ b/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverRecordCheck.java @@ -0,0 +1,95 @@ +package com.ccsens.ptccsens.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class PluDeliverRecordCheck implements Serializable { + private Long id; + + private Long deliverRecordId; + + private Long checkerId; + + private Long operator; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getDeliverRecordId() { + return deliverRecordId; + } + + public void setDeliverRecordId(Long deliverRecordId) { + this.deliverRecordId = deliverRecordId; + } + + public Long getCheckerId() { + return checkerId; + } + + public void setCheckerId(Long checkerId) { + this.checkerId = checkerId; + } + + public Long getOperator() { + return operator; + } + + public void setOperator(Long operator) { + this.operator = operator; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", deliverRecordId=").append(deliverRecordId); + sb.append(", checkerId=").append(checkerId); + sb.append(", operator=").append(operator); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverRecordCheckExample.java b/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverRecordCheckExample.java new file mode 100644 index 0000000..242a78f --- /dev/null +++ b/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverRecordCheckExample.java @@ -0,0 +1,621 @@ +package com.ccsens.ptccsens.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class PluDeliverRecordCheckExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public PluDeliverRecordCheckExample() { + 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 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(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", 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(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdIsNull() { + addCriterion("deliver_record_id is null"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdIsNotNull() { + addCriterion("deliver_record_id is not null"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdEqualTo(Long value) { + addCriterion("deliver_record_id =", value, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdNotEqualTo(Long value) { + addCriterion("deliver_record_id <>", value, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdGreaterThan(Long value) { + addCriterion("deliver_record_id >", value, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdGreaterThanOrEqualTo(Long value) { + addCriterion("deliver_record_id >=", value, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdLessThan(Long value) { + addCriterion("deliver_record_id <", value, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdLessThanOrEqualTo(Long value) { + addCriterion("deliver_record_id <=", value, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdIn(List values) { + addCriterion("deliver_record_id in", values, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdNotIn(List values) { + addCriterion("deliver_record_id not in", values, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdBetween(Long value1, Long value2) { + addCriterion("deliver_record_id between", value1, value2, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdNotBetween(Long value1, Long value2) { + addCriterion("deliver_record_id not between", value1, value2, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andCheckerIdIsNull() { + addCriterion("checker_id is null"); + return (Criteria) this; + } + + public Criteria andCheckerIdIsNotNull() { + addCriterion("checker_id is not null"); + return (Criteria) this; + } + + public Criteria andCheckerIdEqualTo(Long value) { + addCriterion("checker_id =", value, "checkerId"); + return (Criteria) this; + } + + public Criteria andCheckerIdNotEqualTo(Long value) { + addCriterion("checker_id <>", value, "checkerId"); + return (Criteria) this; + } + + public Criteria andCheckerIdGreaterThan(Long value) { + addCriterion("checker_id >", value, "checkerId"); + return (Criteria) this; + } + + public Criteria andCheckerIdGreaterThanOrEqualTo(Long value) { + addCriterion("checker_id >=", value, "checkerId"); + return (Criteria) this; + } + + public Criteria andCheckerIdLessThan(Long value) { + addCriterion("checker_id <", value, "checkerId"); + return (Criteria) this; + } + + public Criteria andCheckerIdLessThanOrEqualTo(Long value) { + addCriterion("checker_id <=", value, "checkerId"); + return (Criteria) this; + } + + public Criteria andCheckerIdIn(List values) { + addCriterion("checker_id in", values, "checkerId"); + return (Criteria) this; + } + + public Criteria andCheckerIdNotIn(List values) { + addCriterion("checker_id not in", values, "checkerId"); + return (Criteria) this; + } + + public Criteria andCheckerIdBetween(Long value1, Long value2) { + addCriterion("checker_id between", value1, value2, "checkerId"); + return (Criteria) this; + } + + public Criteria andCheckerIdNotBetween(Long value1, Long value2) { + addCriterion("checker_id not between", value1, value2, "checkerId"); + return (Criteria) this; + } + + public Criteria andOperatorIsNull() { + addCriterion("operator is null"); + return (Criteria) this; + } + + public Criteria andOperatorIsNotNull() { + addCriterion("operator is not null"); + return (Criteria) this; + } + + public Criteria andOperatorEqualTo(Long value) { + addCriterion("operator =", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotEqualTo(Long value) { + addCriterion("operator <>", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorGreaterThan(Long value) { + addCriterion("operator >", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorGreaterThanOrEqualTo(Long value) { + addCriterion("operator >=", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorLessThan(Long value) { + addCriterion("operator <", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorLessThanOrEqualTo(Long value) { + addCriterion("operator <=", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorIn(List values) { + addCriterion("operator in", values, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotIn(List values) { + addCriterion("operator not in", values, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorBetween(Long value1, Long value2) { + addCriterion("operator between", value1, value2, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotBetween(Long value1, Long value2) { + addCriterion("operator not between", value1, value2, "operator"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + 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/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverRecordCheckLog.java b/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverRecordCheckLog.java new file mode 100644 index 0000000..c55b131 --- /dev/null +++ b/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverRecordCheckLog.java @@ -0,0 +1,129 @@ +package com.ccsens.ptccsens.bean.po; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +public class PluDeliverRecordCheckLog implements Serializable { + private Long id; + + private Long recordCheckId; + + private BigDecimal score; + + private String remark; + + private Byte checkStatus; + + private Long time; + + private Long operator; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getRecordCheckId() { + return recordCheckId; + } + + public void setRecordCheckId(Long recordCheckId) { + this.recordCheckId = recordCheckId; + } + + public BigDecimal getScore() { + return score; + } + + public void setScore(BigDecimal score) { + this.score = score; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark == null ? null : remark.trim(); + } + + public Byte getCheckStatus() { + return checkStatus; + } + + public void setCheckStatus(Byte checkStatus) { + this.checkStatus = checkStatus; + } + + public Long getTime() { + return time; + } + + public void setTime(Long time) { + this.time = time; + } + + public Long getOperator() { + return operator; + } + + public void setOperator(Long operator) { + this.operator = operator; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", recordCheckId=").append(recordCheckId); + sb.append(", score=").append(score); + sb.append(", remark=").append(remark); + sb.append(", checkStatus=").append(checkStatus); + sb.append(", time=").append(time); + sb.append(", operator=").append(operator); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverRecordCheckLogExample.java b/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverRecordCheckLogExample.java new file mode 100644 index 0000000..792a20b --- /dev/null +++ b/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverRecordCheckLogExample.java @@ -0,0 +1,812 @@ +package com.ccsens.ptccsens.bean.po; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class PluDeliverRecordCheckLogExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public PluDeliverRecordCheckLogExample() { + 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 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(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", 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(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andRecordCheckIdIsNull() { + addCriterion("record_check_id is null"); + return (Criteria) this; + } + + public Criteria andRecordCheckIdIsNotNull() { + addCriterion("record_check_id is not null"); + return (Criteria) this; + } + + public Criteria andRecordCheckIdEqualTo(Long value) { + addCriterion("record_check_id =", value, "recordCheckId"); + return (Criteria) this; + } + + public Criteria andRecordCheckIdNotEqualTo(Long value) { + addCriterion("record_check_id <>", value, "recordCheckId"); + return (Criteria) this; + } + + public Criteria andRecordCheckIdGreaterThan(Long value) { + addCriterion("record_check_id >", value, "recordCheckId"); + return (Criteria) this; + } + + public Criteria andRecordCheckIdGreaterThanOrEqualTo(Long value) { + addCriterion("record_check_id >=", value, "recordCheckId"); + return (Criteria) this; + } + + public Criteria andRecordCheckIdLessThan(Long value) { + addCriterion("record_check_id <", value, "recordCheckId"); + return (Criteria) this; + } + + public Criteria andRecordCheckIdLessThanOrEqualTo(Long value) { + addCriterion("record_check_id <=", value, "recordCheckId"); + return (Criteria) this; + } + + public Criteria andRecordCheckIdIn(List values) { + addCriterion("record_check_id in", values, "recordCheckId"); + return (Criteria) this; + } + + public Criteria andRecordCheckIdNotIn(List values) { + addCriterion("record_check_id not in", values, "recordCheckId"); + return (Criteria) this; + } + + public Criteria andRecordCheckIdBetween(Long value1, Long value2) { + addCriterion("record_check_id between", value1, value2, "recordCheckId"); + return (Criteria) this; + } + + public Criteria andRecordCheckIdNotBetween(Long value1, Long value2) { + addCriterion("record_check_id not between", value1, value2, "recordCheckId"); + return (Criteria) this; + } + + public Criteria andScoreIsNull() { + addCriterion("score is null"); + return (Criteria) this; + } + + public Criteria andScoreIsNotNull() { + addCriterion("score is not null"); + return (Criteria) this; + } + + public Criteria andScoreEqualTo(BigDecimal value) { + addCriterion("score =", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreNotEqualTo(BigDecimal value) { + addCriterion("score <>", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreGreaterThan(BigDecimal value) { + addCriterion("score >", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("score >=", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreLessThan(BigDecimal value) { + addCriterion("score <", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreLessThanOrEqualTo(BigDecimal value) { + addCriterion("score <=", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreIn(List values) { + addCriterion("score in", values, "score"); + return (Criteria) this; + } + + public Criteria andScoreNotIn(List values) { + addCriterion("score not in", values, "score"); + return (Criteria) this; + } + + public Criteria andScoreBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("score between", value1, value2, "score"); + return (Criteria) this; + } + + public Criteria andScoreNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("score not between", value1, value2, "score"); + return (Criteria) this; + } + + public Criteria andRemarkIsNull() { + addCriterion("remark is null"); + return (Criteria) this; + } + + public Criteria andRemarkIsNotNull() { + addCriterion("remark is not null"); + return (Criteria) this; + } + + public Criteria andRemarkEqualTo(String value) { + addCriterion("remark =", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotEqualTo(String value) { + addCriterion("remark <>", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThan(String value) { + addCriterion("remark >", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThanOrEqualTo(String value) { + addCriterion("remark >=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThan(String value) { + addCriterion("remark <", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThanOrEqualTo(String value) { + addCriterion("remark <=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLike(String value) { + addCriterion("remark like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotLike(String value) { + addCriterion("remark not like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkIn(List values) { + addCriterion("remark in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotIn(List values) { + addCriterion("remark not in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkBetween(String value1, String value2) { + addCriterion("remark between", value1, value2, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotBetween(String value1, String value2) { + addCriterion("remark not between", value1, value2, "remark"); + return (Criteria) this; + } + + public Criteria andCheckStatusIsNull() { + addCriterion("check_status is null"); + return (Criteria) this; + } + + public Criteria andCheckStatusIsNotNull() { + addCriterion("check_status is not null"); + return (Criteria) this; + } + + public Criteria andCheckStatusEqualTo(Byte value) { + addCriterion("check_status =", value, "checkStatus"); + return (Criteria) this; + } + + public Criteria andCheckStatusNotEqualTo(Byte value) { + addCriterion("check_status <>", value, "checkStatus"); + return (Criteria) this; + } + + public Criteria andCheckStatusGreaterThan(Byte value) { + addCriterion("check_status >", value, "checkStatus"); + return (Criteria) this; + } + + public Criteria andCheckStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("check_status >=", value, "checkStatus"); + return (Criteria) this; + } + + public Criteria andCheckStatusLessThan(Byte value) { + addCriterion("check_status <", value, "checkStatus"); + return (Criteria) this; + } + + public Criteria andCheckStatusLessThanOrEqualTo(Byte value) { + addCriterion("check_status <=", value, "checkStatus"); + return (Criteria) this; + } + + public Criteria andCheckStatusIn(List values) { + addCriterion("check_status in", values, "checkStatus"); + return (Criteria) this; + } + + public Criteria andCheckStatusNotIn(List values) { + addCriterion("check_status not in", values, "checkStatus"); + return (Criteria) this; + } + + public Criteria andCheckStatusBetween(Byte value1, Byte value2) { + addCriterion("check_status between", value1, value2, "checkStatus"); + return (Criteria) this; + } + + public Criteria andCheckStatusNotBetween(Byte value1, Byte value2) { + addCriterion("check_status not between", value1, value2, "checkStatus"); + return (Criteria) this; + } + + public Criteria andTimeIsNull() { + addCriterion("time is null"); + return (Criteria) this; + } + + public Criteria andTimeIsNotNull() { + addCriterion("time is not null"); + return (Criteria) this; + } + + public Criteria andTimeEqualTo(Long value) { + addCriterion("time =", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeNotEqualTo(Long value) { + addCriterion("time <>", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeGreaterThan(Long value) { + addCriterion("time >", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeGreaterThanOrEqualTo(Long value) { + addCriterion("time >=", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeLessThan(Long value) { + addCriterion("time <", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeLessThanOrEqualTo(Long value) { + addCriterion("time <=", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeIn(List values) { + addCriterion("time in", values, "time"); + return (Criteria) this; + } + + public Criteria andTimeNotIn(List values) { + addCriterion("time not in", values, "time"); + return (Criteria) this; + } + + public Criteria andTimeBetween(Long value1, Long value2) { + addCriterion("time between", value1, value2, "time"); + return (Criteria) this; + } + + public Criteria andTimeNotBetween(Long value1, Long value2) { + addCriterion("time not between", value1, value2, "time"); + return (Criteria) this; + } + + public Criteria andOperatorIsNull() { + addCriterion("operator is null"); + return (Criteria) this; + } + + public Criteria andOperatorIsNotNull() { + addCriterion("operator is not null"); + return (Criteria) this; + } + + public Criteria andOperatorEqualTo(Long value) { + addCriterion("operator =", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotEqualTo(Long value) { + addCriterion("operator <>", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorGreaterThan(Long value) { + addCriterion("operator >", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorGreaterThanOrEqualTo(Long value) { + addCriterion("operator >=", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorLessThan(Long value) { + addCriterion("operator <", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorLessThanOrEqualTo(Long value) { + addCriterion("operator <=", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorIn(List values) { + addCriterion("operator in", values, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotIn(List values) { + addCriterion("operator not in", values, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorBetween(Long value1, Long value2) { + addCriterion("operator between", value1, value2, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotBetween(Long value1, Long value2) { + addCriterion("operator not between", value1, value2, "operator"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + 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/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverRecordExample.java b/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverRecordExample.java new file mode 100644 index 0000000..64bccef --- /dev/null +++ b/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverRecordExample.java @@ -0,0 +1,681 @@ +package com.ccsens.ptccsens.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class PluDeliverRecordExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public PluDeliverRecordExample() { + 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 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(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", 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(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andDeliverIdIsNull() { + addCriterion("deliver_id is null"); + return (Criteria) this; + } + + public Criteria andDeliverIdIsNotNull() { + addCriterion("deliver_id is not null"); + return (Criteria) this; + } + + public Criteria andDeliverIdEqualTo(Long value) { + addCriterion("deliver_id =", value, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdNotEqualTo(Long value) { + addCriterion("deliver_id <>", value, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdGreaterThan(Long value) { + addCriterion("deliver_id >", value, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdGreaterThanOrEqualTo(Long value) { + addCriterion("deliver_id >=", value, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdLessThan(Long value) { + addCriterion("deliver_id <", value, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdLessThanOrEqualTo(Long value) { + addCriterion("deliver_id <=", value, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdIn(List values) { + addCriterion("deliver_id in", values, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdNotIn(List values) { + addCriterion("deliver_id not in", values, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdBetween(Long value1, Long value2) { + addCriterion("deliver_id between", value1, value2, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdNotBetween(Long value1, Long value2) { + addCriterion("deliver_id not between", value1, value2, "deliverId"); + return (Criteria) this; + } + + public Criteria andSubmitTimeIsNull() { + addCriterion("submit_time is null"); + return (Criteria) this; + } + + public Criteria andSubmitTimeIsNotNull() { + addCriterion("submit_time is not null"); + return (Criteria) this; + } + + public Criteria andSubmitTimeEqualTo(Long value) { + addCriterion("submit_time =", value, "submitTime"); + return (Criteria) this; + } + + public Criteria andSubmitTimeNotEqualTo(Long value) { + addCriterion("submit_time <>", value, "submitTime"); + return (Criteria) this; + } + + public Criteria andSubmitTimeGreaterThan(Long value) { + addCriterion("submit_time >", value, "submitTime"); + return (Criteria) this; + } + + public Criteria andSubmitTimeGreaterThanOrEqualTo(Long value) { + addCriterion("submit_time >=", value, "submitTime"); + return (Criteria) this; + } + + public Criteria andSubmitTimeLessThan(Long value) { + addCriterion("submit_time <", value, "submitTime"); + return (Criteria) this; + } + + public Criteria andSubmitTimeLessThanOrEqualTo(Long value) { + addCriterion("submit_time <=", value, "submitTime"); + return (Criteria) this; + } + + public Criteria andSubmitTimeIn(List values) { + addCriterion("submit_time in", values, "submitTime"); + return (Criteria) this; + } + + public Criteria andSubmitTimeNotIn(List values) { + addCriterion("submit_time not in", values, "submitTime"); + return (Criteria) this; + } + + public Criteria andSubmitTimeBetween(Long value1, Long value2) { + addCriterion("submit_time between", value1, value2, "submitTime"); + return (Criteria) this; + } + + public Criteria andSubmitTimeNotBetween(Long value1, Long value2) { + addCriterion("submit_time not between", value1, value2, "submitTime"); + return (Criteria) this; + } + + public Criteria andMemberIdIsNull() { + addCriterion("member_id is null"); + return (Criteria) this; + } + + public Criteria andMemberIdIsNotNull() { + addCriterion("member_id is not null"); + return (Criteria) this; + } + + public Criteria andMemberIdEqualTo(Long value) { + addCriterion("member_id =", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotEqualTo(Long value) { + addCriterion("member_id <>", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdGreaterThan(Long value) { + addCriterion("member_id >", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdGreaterThanOrEqualTo(Long value) { + addCriterion("member_id >=", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdLessThan(Long value) { + addCriterion("member_id <", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdLessThanOrEqualTo(Long value) { + addCriterion("member_id <=", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdIn(List values) { + addCriterion("member_id in", values, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotIn(List values) { + addCriterion("member_id not in", values, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdBetween(Long value1, Long value2) { + addCriterion("member_id between", value1, value2, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotBetween(Long value1, Long value2) { + addCriterion("member_id not between", value1, value2, "memberId"); + return (Criteria) this; + } + + public Criteria andOperatorIsNull() { + addCriterion("operator is null"); + return (Criteria) this; + } + + public Criteria andOperatorIsNotNull() { + addCriterion("operator is not null"); + return (Criteria) this; + } + + public Criteria andOperatorEqualTo(Long value) { + addCriterion("operator =", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotEqualTo(Long value) { + addCriterion("operator <>", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorGreaterThan(Long value) { + addCriterion("operator >", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorGreaterThanOrEqualTo(Long value) { + addCriterion("operator >=", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorLessThan(Long value) { + addCriterion("operator <", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorLessThanOrEqualTo(Long value) { + addCriterion("operator <=", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorIn(List values) { + addCriterion("operator in", values, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotIn(List values) { + addCriterion("operator not in", values, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorBetween(Long value1, Long value2) { + addCriterion("operator between", value1, value2, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotBetween(Long value1, Long value2) { + addCriterion("operator not between", value1, value2, "operator"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + 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/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverRecordFile.java b/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverRecordFile.java new file mode 100644 index 0000000..99ab300 --- /dev/null +++ b/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverRecordFile.java @@ -0,0 +1,117 @@ +package com.ccsens.ptccsens.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class PluDeliverRecordFile implements Serializable { + private Long id; + + private Long deliverRecordId; + + private Long fileId; + + private String fileName; + + private String filePath; + + private Long operator; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getDeliverRecordId() { + return deliverRecordId; + } + + public void setDeliverRecordId(Long deliverRecordId) { + this.deliverRecordId = deliverRecordId; + } + + public Long getFileId() { + return fileId; + } + + public void setFileId(Long fileId) { + this.fileId = fileId; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName == null ? null : fileName.trim(); + } + + public String getFilePath() { + return filePath; + } + + public void setFilePath(String filePath) { + this.filePath = filePath == null ? null : filePath.trim(); + } + + public Long getOperator() { + return operator; + } + + public void setOperator(Long operator) { + this.operator = operator; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", deliverRecordId=").append(deliverRecordId); + sb.append(", fileId=").append(fileId); + sb.append(", fileName=").append(fileName); + sb.append(", filePath=").append(filePath); + sb.append(", operator=").append(operator); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverRecordFileExample.java b/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverRecordFileExample.java new file mode 100644 index 0000000..2580e4a --- /dev/null +++ b/src/main/java/com/ccsens/ptccsens/bean/po/PluDeliverRecordFileExample.java @@ -0,0 +1,761 @@ +package com.ccsens.ptccsens.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class PluDeliverRecordFileExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public PluDeliverRecordFileExample() { + 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 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(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", 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(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdIsNull() { + addCriterion("deliver_record_id is null"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdIsNotNull() { + addCriterion("deliver_record_id is not null"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdEqualTo(Long value) { + addCriterion("deliver_record_id =", value, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdNotEqualTo(Long value) { + addCriterion("deliver_record_id <>", value, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdGreaterThan(Long value) { + addCriterion("deliver_record_id >", value, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdGreaterThanOrEqualTo(Long value) { + addCriterion("deliver_record_id >=", value, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdLessThan(Long value) { + addCriterion("deliver_record_id <", value, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdLessThanOrEqualTo(Long value) { + addCriterion("deliver_record_id <=", value, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdIn(List values) { + addCriterion("deliver_record_id in", values, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdNotIn(List values) { + addCriterion("deliver_record_id not in", values, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdBetween(Long value1, Long value2) { + addCriterion("deliver_record_id between", value1, value2, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdNotBetween(Long value1, Long value2) { + addCriterion("deliver_record_id not between", value1, value2, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andFileIdIsNull() { + addCriterion("file_id is null"); + return (Criteria) this; + } + + public Criteria andFileIdIsNotNull() { + addCriterion("file_id is not null"); + return (Criteria) this; + } + + public Criteria andFileIdEqualTo(Long value) { + addCriterion("file_id =", value, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdNotEqualTo(Long value) { + addCriterion("file_id <>", value, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdGreaterThan(Long value) { + addCriterion("file_id >", value, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdGreaterThanOrEqualTo(Long value) { + addCriterion("file_id >=", value, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdLessThan(Long value) { + addCriterion("file_id <", value, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdLessThanOrEqualTo(Long value) { + addCriterion("file_id <=", value, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdIn(List values) { + addCriterion("file_id in", values, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdNotIn(List values) { + addCriterion("file_id not in", values, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdBetween(Long value1, Long value2) { + addCriterion("file_id between", value1, value2, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdNotBetween(Long value1, Long value2) { + addCriterion("file_id not between", value1, value2, "fileId"); + return (Criteria) this; + } + + public Criteria andFileNameIsNull() { + addCriterion("file_name is null"); + return (Criteria) this; + } + + public Criteria andFileNameIsNotNull() { + addCriterion("file_name is not null"); + return (Criteria) this; + } + + public Criteria andFileNameEqualTo(String value) { + addCriterion("file_name =", value, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameNotEqualTo(String value) { + addCriterion("file_name <>", value, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameGreaterThan(String value) { + addCriterion("file_name >", value, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameGreaterThanOrEqualTo(String value) { + addCriterion("file_name >=", value, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameLessThan(String value) { + addCriterion("file_name <", value, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameLessThanOrEqualTo(String value) { + addCriterion("file_name <=", value, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameLike(String value) { + addCriterion("file_name like", value, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameNotLike(String value) { + addCriterion("file_name not like", value, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameIn(List values) { + addCriterion("file_name in", values, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameNotIn(List values) { + addCriterion("file_name not in", values, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameBetween(String value1, String value2) { + addCriterion("file_name between", value1, value2, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameNotBetween(String value1, String value2) { + addCriterion("file_name not between", value1, value2, "fileName"); + return (Criteria) this; + } + + public Criteria andFilePathIsNull() { + addCriterion("file_path is null"); + return (Criteria) this; + } + + public Criteria andFilePathIsNotNull() { + addCriterion("file_path is not null"); + return (Criteria) this; + } + + public Criteria andFilePathEqualTo(String value) { + addCriterion("file_path =", value, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathNotEqualTo(String value) { + addCriterion("file_path <>", value, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathGreaterThan(String value) { + addCriterion("file_path >", value, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathGreaterThanOrEqualTo(String value) { + addCriterion("file_path >=", value, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathLessThan(String value) { + addCriterion("file_path <", value, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathLessThanOrEqualTo(String value) { + addCriterion("file_path <=", value, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathLike(String value) { + addCriterion("file_path like", value, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathNotLike(String value) { + addCriterion("file_path not like", value, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathIn(List values) { + addCriterion("file_path in", values, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathNotIn(List values) { + addCriterion("file_path not in", values, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathBetween(String value1, String value2) { + addCriterion("file_path between", value1, value2, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathNotBetween(String value1, String value2) { + addCriterion("file_path not between", value1, value2, "filePath"); + return (Criteria) this; + } + + public Criteria andOperatorIsNull() { + addCriterion("operator is null"); + return (Criteria) this; + } + + public Criteria andOperatorIsNotNull() { + addCriterion("operator is not null"); + return (Criteria) this; + } + + public Criteria andOperatorEqualTo(Long value) { + addCriterion("operator =", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotEqualTo(Long value) { + addCriterion("operator <>", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorGreaterThan(Long value) { + addCriterion("operator >", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorGreaterThanOrEqualTo(Long value) { + addCriterion("operator >=", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorLessThan(Long value) { + addCriterion("operator <", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorLessThanOrEqualTo(Long value) { + addCriterion("operator <=", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorIn(List values) { + addCriterion("operator in", values, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotIn(List values) { + addCriterion("operator not in", values, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorBetween(Long value1, Long value2) { + addCriterion("operator between", value1, value2, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotBetween(Long value1, Long value2) { + addCriterion("operator not between", value1, value2, "operator"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + 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/src/main/java/com/ccsens/ptccsens/bean/vo/FinanceVo.java b/src/main/java/com/ccsens/ptccsens/bean/vo/FinanceVo.java index 67b26e6..1c19228 100644 --- a/src/main/java/com/ccsens/ptccsens/bean/vo/FinanceVo.java +++ b/src/main/java/com/ccsens/ptccsens/bean/vo/FinanceVo.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.List; /** @@ -86,6 +87,8 @@ public class FinanceVo { private String remark; @ApiModelProperty("总金额") private Long money; + @ApiModelProperty("申请时间") + private Long applyTime; @ApiModelProperty("发票信息") private List invoiceList; @ApiModelProperty("审核人ID") @@ -142,5 +145,50 @@ public class FinanceVo { private Long submitTime; @ApiModelProperty("当前状态:0待审批 1已通过 2已驳回 3待放款 4:放款待确认 5已确认") private byte applyType; + @ApiModelProperty("备注") + private String remark; + } + + @Data + @ApiModel("财务-成员财务统计-返回") + public static class MemberFinance{ + @ApiModelProperty("成员ID") + private Long memberId; + @ApiModelProperty("成员名") + private String memberName; + @ApiModelProperty("金额，单位：分") + private Long money; + @ApiModelProperty("占比，保留两位小数") + private BigDecimal percentage; + } + + @Data + @ApiModel("财务-任务支出-返回") + public static class TaskExpense { + @ApiModelProperty("任务ID") + private Long taskDetailId; + @ApiModelProperty("财务信息id") + private Long financeId; + @ApiModelProperty("任务名") + private String taskName; + @ApiModelProperty("金额，单位：分") + private Long money; + @ApiModelProperty("占比，保留两位小数") + private BigDecimal percentage; + @ApiModelProperty("追加预算，单位：分") + private Long budget; + } + + @Data + @ApiModel("财务-名目支出-返回") + public static class RowExpense { + @ApiModelProperty("名目ID") + private Long rowId; + @ApiModelProperty("名目") + private String rowName; + @ApiModelProperty("金额，单位：分") + private Long money; + @ApiModelProperty("占比，保留两位小数") + private BigDecimal percentage; } } diff --git a/src/main/java/com/ccsens/ptccsens/bean/vo/OcrVo.java b/src/main/java/com/ccsens/ptccsens/bean/vo/OcrVo.java index 464b1a2..67419c4 100644 --- a/src/main/java/com/ccsens/ptccsens/bean/vo/OcrVo.java +++ b/src/main/java/com/ccsens/ptccsens/bean/vo/OcrVo.java @@ -14,12 +14,14 @@ public class OcrVo { @ApiModelProperty("发票代码") private String invoiceCode; @ApiModelProperty("发票号码") - private String invoiceNum; + private String invoiceNumber; @ApiModelProperty("金额") - private Long totalAmount; + private Long money; @ApiModelProperty("税额") - private Long totalTax; + private Long taxMoney; @ApiModelProperty("开票时间") - private Long invoiceDate; + private Long invoiceTime; + @ApiModelProperty("发票url") + private String url; } } diff --git a/src/main/java/com/ccsens/ptccsens/bean/vo/ProjectFinanceVo.java b/src/main/java/com/ccsens/ptccsens/bean/vo/ProjectFinanceVo.java index 0e637e9..a2d962e 100644 --- a/src/main/java/com/ccsens/ptccsens/bean/vo/ProjectFinanceVo.java +++ b/src/main/java/com/ccsens/ptccsens/bean/vo/ProjectFinanceVo.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.apache.poi.ss.usermodel.charts.ChartData; import java.util.List; @@ -131,4 +132,22 @@ public class ProjectFinanceVo { @ApiModelProperty("类目名") private String categoryName; } + + @Data + @ApiModel("时间财务图-返参") + public static class TimeFinancialChart { + @ApiModelProperty("时间") + private String time; + @ApiModelProperty("数据") + private List data; + } + @Data + @ApiModel("时间财务图-具体数据") + public static class ChartData { + @ApiModelProperty("任务名称") + private String name; + @ApiModelProperty("支出") + private Long expend; + } + } diff --git a/src/main/java/com/ccsens/ptccsens/persist/dao/FinanceDao.java b/src/main/java/com/ccsens/ptccsens/persist/dao/FinanceDao.java index 1941197..41032f5 100644 --- a/src/main/java/com/ccsens/ptccsens/persist/dao/FinanceDao.java +++ b/src/main/java/com/ccsens/ptccsens/persist/dao/FinanceDao.java @@ -82,4 +82,27 @@ public interface FinanceDao { * @return 历史数据 */ List queryPersonalHistory(@Param("param") FinanceDto.PersonalHistory param, @Param("userId") Long userId); + + /** + * 查询成员财务信息 + * @param projectId 项目ID + * @param userId 操作者 + * @return 成员财务 + */ + List queryMemberFinance(@Param("projectId") Long projectId, @Param("userId") Long userId); + + /** + * 查询任务支出信息 + * @param projectId 项目ID + * @param userId 操作者 + * @return 任务支出信息 + */ + List queryTaskExpense(@Param("projectId") Long projectId, @Param("userId") Long userId); + /** + * 查询名目支出信息 + * @param projectId 项目ID + * @param userId 操作者 + * @return 名目支出信息 + */ + List queryRowExpense(@Param("projectId") Long projectId, @Param("userId") Long userId); } diff --git a/src/main/java/com/ccsens/ptccsens/persist/dao/PluDeliverDao.java b/src/main/java/com/ccsens/ptccsens/persist/dao/PluDeliverDao.java new file mode 100644 index 0000000..9940067 --- /dev/null +++ b/src/main/java/com/ccsens/ptccsens/persist/dao/PluDeliverDao.java @@ -0,0 +1,37 @@ +package com.ccsens.ptccsens.persist.dao; + +import com.ccsens.ptccsens.bean.vo.DeliverVo; +import com.ccsens.ptccsens.persist.mapper.PluDeliverMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author 逗 + */ +public interface PluDeliverDao extends PluDeliverMapper { + + /** + * 查询任务下的交付物信息 + * @param taskId 任务id + * @param userId userId + * @return 返回最后一条提交记录 + */ + DeliverVo.DeliverOfTask getDeliverByTask(@Param("taskId") Long taskId, @Param("userId") Long userId); + + /** + * 查询交付物所有的提交记录 + * @param deliverId 交付物id + * @param userId userId + * @return 返回所有记录 + */ + DeliverVo.QueryDeliverRecord queryDeliverRecord(@Param("deliverId") Long deliverId, @Param("userId") Long userId); + + /** + * 查找交付物的所有检查记录 + * @param deliverRecordId 交付物提交记录 + * @param userId userId + * @return 返回所有检查记录 + */ + List queryCheckLog(@Param("deliverRecordId") Long deliverRecordId, @Param("userId") Long userId); +} diff --git a/src/main/java/com/ccsens/ptccsens/persist/dao/PluFinanceApplyDao.java b/src/main/java/com/ccsens/ptccsens/persist/dao/PluFinanceApplyDao.java index d61d8eb..1444d90 100644 --- a/src/main/java/com/ccsens/ptccsens/persist/dao/PluFinanceApplyDao.java +++ b/src/main/java/com/ccsens/ptccsens/persist/dao/PluFinanceApplyDao.java @@ -36,4 +36,11 @@ public interface PluFinanceApplyDao extends PluFinanceMapper { * @return 所有的费用申请 */ List queryAllMoneyApply(@Param("projectId") Long projectId); + + /** + * 时间财务图-统计 + * @param projectId 项目id + * @return 时间财务图 + */ + List timeFinancialChart(@Param("projectId") Long projectId); } diff --git a/src/main/java/com/ccsens/ptccsens/persist/dao/ProRoleTaskDao.java b/src/main/java/com/ccsens/ptccsens/persist/dao/ProRoleTaskDao.java index daf8a7d..0578ead 100644 --- a/src/main/java/com/ccsens/ptccsens/persist/dao/ProRoleTaskDao.java +++ b/src/main/java/com/ccsens/ptccsens/persist/dao/ProRoleTaskDao.java @@ -27,13 +27,13 @@ public interface ProRoleTaskDao extends ProRoleTaskMapper { // */ // void insertAllRoleTask(@Param("roleTaskList") List newRoleTaskList); // -// /** -// * 查询我负责的任务 -// * @param taskDetailId 任务详情id -// * @param userOfRoles 角色id列表 -// * @return 角色任务id -// */ -// List isMyTask(@Param("taskDetailId") Long taskDetailId, @Param("roleIdList") List userOfRoles); + /** + * 查询我负责的任务 + * @param taskDetailId 任务详情id + * @param userOfRoles 角色id列表 + * @return 角色任务id + */ + List isMyTask(@Param("taskDetailId") Long taskDetailId, @Param("roleIdList") List userOfRoles); /** * 根据任务id查找任务下的检查人 diff --git a/src/main/java/com/ccsens/ptccsens/persist/mapper/PluDeliverMapper.java b/src/main/java/com/ccsens/ptccsens/persist/mapper/PluDeliverMapper.java new file mode 100644 index 0000000..46b6a03 --- /dev/null +++ b/src/main/java/com/ccsens/ptccsens/persist/mapper/PluDeliverMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.ptccsens.persist.mapper; + +import com.ccsens.ptccsens.bean.po.PluDeliver; +import com.ccsens.ptccsens.bean.po.PluDeliverExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface PluDeliverMapper { + long countByExample(PluDeliverExample example); + + int deleteByExample(PluDeliverExample example); + + int deleteByPrimaryKey(Long id); + + int insert(PluDeliver record); + + int insertSelective(PluDeliver record); + + List selectByExample(PluDeliverExample example); + + PluDeliver selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") PluDeliver record, @Param("example") PluDeliverExample example); + + int updateByExample(@Param("record") PluDeliver record, @Param("example") PluDeliverExample example); + + int updateByPrimaryKeySelective(PluDeliver record); + + int updateByPrimaryKey(PluDeliver record); +} \ No newline at end of file diff --git a/src/main/java/com/ccsens/ptccsens/persist/mapper/PluDeliverRecordCheckLogMapper.java b/src/main/java/com/ccsens/ptccsens/persist/mapper/PluDeliverRecordCheckLogMapper.java new file mode 100644 index 0000000..ec4db0c --- /dev/null +++ b/src/main/java/com/ccsens/ptccsens/persist/mapper/PluDeliverRecordCheckLogMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.ptccsens.persist.mapper; + +import com.ccsens.ptccsens.bean.po.PluDeliverRecordCheckLog; +import com.ccsens.ptccsens.bean.po.PluDeliverRecordCheckLogExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface PluDeliverRecordCheckLogMapper { + long countByExample(PluDeliverRecordCheckLogExample example); + + int deleteByExample(PluDeliverRecordCheckLogExample example); + + int deleteByPrimaryKey(Long id); + + int insert(PluDeliverRecordCheckLog record); + + int insertSelective(PluDeliverRecordCheckLog record); + + List selectByExample(PluDeliverRecordCheckLogExample example); + + PluDeliverRecordCheckLog selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") PluDeliverRecordCheckLog record, @Param("example") PluDeliverRecordCheckLogExample example); + + int updateByExample(@Param("record") PluDeliverRecordCheckLog record, @Param("example") PluDeliverRecordCheckLogExample example); + + int updateByPrimaryKeySelective(PluDeliverRecordCheckLog record); + + int updateByPrimaryKey(PluDeliverRecordCheckLog record); +} \ No newline at end of file diff --git a/src/main/java/com/ccsens/ptccsens/persist/mapper/PluDeliverRecordCheckMapper.java b/src/main/java/com/ccsens/ptccsens/persist/mapper/PluDeliverRecordCheckMapper.java new file mode 100644 index 0000000..a5cfa15 --- /dev/null +++ b/src/main/java/com/ccsens/ptccsens/persist/mapper/PluDeliverRecordCheckMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.ptccsens.persist.mapper; + +import com.ccsens.ptccsens.bean.po.PluDeliverRecordCheck; +import com.ccsens.ptccsens.bean.po.PluDeliverRecordCheckExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface PluDeliverRecordCheckMapper { + long countByExample(PluDeliverRecordCheckExample example); + + int deleteByExample(PluDeliverRecordCheckExample example); + + int deleteByPrimaryKey(Long id); + + int insert(PluDeliverRecordCheck record); + + int insertSelective(PluDeliverRecordCheck record); + + List selectByExample(PluDeliverRecordCheckExample example); + + PluDeliverRecordCheck selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") PluDeliverRecordCheck record, @Param("example") PluDeliverRecordCheckExample example); + + int updateByExample(@Param("record") PluDeliverRecordCheck record, @Param("example") PluDeliverRecordCheckExample example); + + int updateByPrimaryKeySelective(PluDeliverRecordCheck record); + + int updateByPrimaryKey(PluDeliverRecordCheck record); +} \ No newline at end of file diff --git a/src/main/java/com/ccsens/ptccsens/persist/mapper/PluDeliverRecordFileMapper.java b/src/main/java/com/ccsens/ptccsens/persist/mapper/PluDeliverRecordFileMapper.java new file mode 100644 index 0000000..afd7db7 --- /dev/null +++ b/src/main/java/com/ccsens/ptccsens/persist/mapper/PluDeliverRecordFileMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.ptccsens.persist.mapper; + +import com.ccsens.ptccsens.bean.po.PluDeliverRecordFile; +import com.ccsens.ptccsens.bean.po.PluDeliverRecordFileExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface PluDeliverRecordFileMapper { + long countByExample(PluDeliverRecordFileExample example); + + int deleteByExample(PluDeliverRecordFileExample example); + + int deleteByPrimaryKey(Long id); + + int insert(PluDeliverRecordFile record); + + int insertSelective(PluDeliverRecordFile record); + + List selectByExample(PluDeliverRecordFileExample example); + + PluDeliverRecordFile selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") PluDeliverRecordFile record, @Param("example") PluDeliverRecordFileExample example); + + int updateByExample(@Param("record") PluDeliverRecordFile record, @Param("example") PluDeliverRecordFileExample example); + + int updateByPrimaryKeySelective(PluDeliverRecordFile record); + + int updateByPrimaryKey(PluDeliverRecordFile record); +} \ No newline at end of file diff --git a/src/main/java/com/ccsens/ptccsens/persist/mapper/PluDeliverRecordMapper.java b/src/main/java/com/ccsens/ptccsens/persist/mapper/PluDeliverRecordMapper.java new file mode 100644 index 0000000..9c405a5 --- /dev/null +++ b/src/main/java/com/ccsens/ptccsens/persist/mapper/PluDeliverRecordMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.ptccsens.persist.mapper; + +import com.ccsens.ptccsens.bean.po.PluDeliverRecord; +import com.ccsens.ptccsens.bean.po.PluDeliverRecordExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface PluDeliverRecordMapper { + long countByExample(PluDeliverRecordExample example); + + int deleteByExample(PluDeliverRecordExample example); + + int deleteByPrimaryKey(Long id); + + int insert(PluDeliverRecord record); + + int insertSelective(PluDeliverRecord record); + + List selectByExample(PluDeliverRecordExample example); + + PluDeliverRecord selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") PluDeliverRecord record, @Param("example") PluDeliverRecordExample example); + + int updateByExample(@Param("record") PluDeliverRecord record, @Param("example") PluDeliverRecordExample example); + + int updateByPrimaryKeySelective(PluDeliverRecord record); + + int updateByPrimaryKey(PluDeliverRecord record); +} \ No newline at end of file diff --git a/src/main/java/com/ccsens/ptccsens/service/DeliverService.java b/src/main/java/com/ccsens/ptccsens/service/DeliverService.java index c20991d..ddc5a22 100644 --- a/src/main/java/com/ccsens/ptccsens/service/DeliverService.java +++ b/src/main/java/com/ccsens/ptccsens/service/DeliverService.java @@ -1,8 +1,18 @@ package com.ccsens.ptccsens.service; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.ObjectUtil; import com.ccsens.ptccsens.bean.dto.DeliverDto; +import com.ccsens.ptccsens.bean.po.*; import com.ccsens.ptccsens.bean.vo.DeliverVo; -import com.ccsens.ptccsens.persist.dao.ProDeliverDao; +import com.ccsens.ptccsens.persist.dao.*; +import com.ccsens.ptccsens.persist.mapper.PluDeliverRecordCheckLogMapper; +import com.ccsens.ptccsens.persist.mapper.PluDeliverRecordCheckMapper; +import com.ccsens.ptccsens.persist.mapper.PluDeliverRecordFileMapper; +import com.ccsens.ptccsens.persist.mapper.PluDeliverRecordMapper; +import com.ccsens.ptccsens.util.BasicsCodeError; +import com.ccsens.util.exception.BaseException; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -11,16 +21,395 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; +/** + * @author AUSU + */ @Slf4j @Service -@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) +@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class) public class DeliverService implements IDeliverService { + @Resource + private ProMemberDao memberDao; + @Resource + private ProTaskSubDao taskSubDao; @Resource private ProDeliverDao deliverDao; + @Resource + private ProRoleTaskDao roleTaskDao; + @Resource + private ProRoleMemberDao roleMemberDao; + @Resource + private Snowflake snowflake; + @Resource + private PluDeliverDao pluDeliverDao; + @Resource + private PluDeliverRecordMapper deliverRecordMapper; + @Resource + private PluDeliverRecordFileMapper deliverRecordFileMapper; + @Resource + private PluDeliverRecordCheckMapper deliverRecordCheckMapper; + @Resource + private PluDeliverRecordCheckLogMapper checkLogMapper; @Override public List queryChecker(DeliverDto.QueryChecker params, Long userId) { return deliverDao.queryChecker(params.getProjectId(),userId); } + + @Override + public void saveDeliver(DeliverDto.SaveDeliver param, Long userId) { + verifyTaskAndUserId(param.getTaskId(), param.getProjectId(), userId); + //查找任务关联的交付物信息 + PluDeliverExample deliverExample = new PluDeliverExample(); + deliverExample.createCriteria().andTaskSubIdEqualTo(param.getTaskId()); + List pluDelivers = pluDeliverDao.selectByExample(deliverExample); + if(CollectionUtil.isNotEmpty(pluDelivers)){ + PluDeliver pluDeliver = pluDelivers.get(0); + pluDeliver.setName(param.getDeliverName()); + pluDeliverDao.updateByPrimaryKeySelective(pluDeliver); + }else { + //添加交付物信息 + PluDeliver pluDeliver = new PluDeliver(); + pluDeliver.setId(snowflake.nextId()); + pluDeliver.setTaskSubId(param.getTaskId()); + pluDeliver.setName(param.getDeliverName()); + pluDeliverDao.insertSelective(pluDeliver); + } + } + + + @Override + public DeliverVo.DeliverOfTask getDeliver(DeliverDto.GetTaskDeliver param, Long userId) { + //验证任务是否存在 + verifyTaskAndUserId(param.getTaskId(),null,null); + //查询任务的交付物信息 + return pluDeliverDao.getDeliverByTask(param.getTaskId(),userId); + } + + @Override + public void submitDeliver(DeliverDto.SubmitDeliver param, Long userId) { + //检查交付物是否存在 + PluDeliver pluDeliver = pluDeliverDao.selectByPrimaryKey(param.getDeliverId()); + if(ObjectUtil.isNull(pluDeliver)){ + throw new BaseException(BasicsCodeError.NOT_DELIVER); + } + //检查当前用户是否是任务负责人 + Long memberIdByUserId = verifyTaskAndUserId(pluDeliver.getTaskSubId(), param.getProjectId(), userId); + //添加交付物提交记录 + PluDeliverRecord deliverRecord = new PluDeliverRecord(); + deliverRecord.setId(snowflake.nextId()); + deliverRecord.setDeliverId(pluDeliver.getId()); + deliverRecord.setMemberId(memberIdByUserId); + deliverRecord.setSubmitTime(System.currentTimeMillis()); + deliverRecordMapper.insertSelective(deliverRecord); + //添加提交的文件信息 + if(CollectionUtil.isNotEmpty(param.getFileList())){ + param.getFileList().forEach(filePath ->{ + PluDeliverRecordFile deliverRecordFile = new PluDeliverRecordFile(); + deliverRecordFile.setId(snowflake.nextId()); + deliverRecordFile.setDeliverRecordId(deliverRecord.getId()); + deliverRecordFile.setFilePath(filePath); + deliverRecordFileMapper.insertSelective(deliverRecordFile); + }); + } + //添加检查人信息 + if(CollectionUtil.isNotEmpty(param.getCheckerList())){ + param.getCheckerList().forEach(checkerId ->{ + PluDeliverRecordCheck recordCheck = new PluDeliverRecordCheck(); + recordCheck.setId(snowflake.nextId()); + recordCheck.setCheckerId(checkerId); + recordCheck.setDeliverRecordId(deliverRecord.getId()); + deliverRecordCheckMapper.insertSelective(recordCheck); + }); + } + } + + @Override + public void checkDeliver(DeliverDto.CheckDeliver param, Long userId) { + //检查交付物提交记录是否存在 + PluDeliverRecord deliverRecord = deliverRecordMapper.selectByPrimaryKey(param.getDeliverRecordId()); + if(ObjectUtil.isNull(deliverRecord)){ + throw new BaseException(BasicsCodeError.NOT_DELIVER); + } + //查找当前用户的成员id + Long userOfMemberId = memberDao.findUserOfMemberId(param.getProjectId(), userId); + if (ObjectUtil.isNull(userOfMemberId)) { + throw new BaseException(BasicsCodeError.NO_POWER); + } + //检查当前用户是否是交付物的检查人 + PluDeliverRecordCheckExample recordCheckExample = new PluDeliverRecordCheckExample(); + recordCheckExample.createCriteria().andCheckerIdEqualTo(userOfMemberId).andDeliverRecordIdEqualTo(param.getDeliverRecordId()); + List pluDeliverRecordChecks = deliverRecordCheckMapper.selectByExample(recordCheckExample); + if(CollectionUtil.isEmpty(pluDeliverRecordChecks)){ + throw new BaseException(BasicsCodeError.NO_POWER); + } + PluDeliverRecordCheck deliverRecordCheck = pluDeliverRecordChecks.get(0); + //添加检查记录 + PluDeliverRecordCheckLog checkLog = new PluDeliverRecordCheckLog(); + checkLog.setId(snowflake.nextId()); + checkLog.setRecordCheckId(deliverRecordCheck.getId()); + checkLog.setCheckStatus(param.getType()); + checkLog.setRemark(param.getRemark()); + checkLog.setScore(param.getScore()); + checkLog.setTime(System.currentTimeMillis()); + checkLogMapper.insertSelective(checkLog); + } + + @Override + public DeliverVo.QueryDeliverRecord queryRecord(DeliverDto.QueryRecord param, Long userId) { + //验证交付物是否存在 + PluDeliver pluDeliver = pluDeliverDao.selectByPrimaryKey(param.getDeliverId()); + if(ObjectUtil.isNull(pluDeliver)){ + throw new BaseException(BasicsCodeError.NOT_DELIVER); + } + //查询交付物信息 + return pluDeliverDao.queryDeliverRecord(param.getDeliverId(),userId); + } + + @Override + public List queryCheckLog(DeliverDto.QueryCheckLog param, Long userId) { + //验证提交记录是否存在 + PluDeliverRecord deliverRecord = deliverRecordMapper.selectByPrimaryKey(param.getDeliverRecordId()); + if(ObjectUtil.isNull(deliverRecord)){ + throw new BaseException(BasicsCodeError.NOT_DELIVER); + } + //查找检查人的所有检查记录 倒叙排列 + return pluDeliverDao.queryCheckLog(param.getDeliverRecordId(),userId); + } + + /** + * 验证任务是否存在， + * 如果userId和projectId不为空，则校验该用户是否是任务的负责人 + * @param taskId 任务分解id + * @param projectId 项目id + * @param userId userId + * @return 返回成员id + */ + private Long verifyTaskAndUserId(Long taskId, Long projectId, Long userId) { + Long memberId = null; + //验证任务是否存在 + ProTaskSub taskSub = taskSubDao.selectByPrimaryKey(taskId); + if (ObjectUtil.isNull(taskSub)) { + throw new BaseException(BasicsCodeError.NOT_TASK); + } + if(ObjectUtil.isNotNull(userId) && ObjectUtil.isNotNull(projectId)){ + //查找当前用户的成员id + Long userOfMemberId = memberDao.findUserOfMemberId(projectId, userId); + if (ObjectUtil.isNull(userOfMemberId)) { + throw new BaseException(BasicsCodeError.NO_POWER); + } + memberId = userOfMemberId; + //查找当前用户所属的角色 + List userOfRoles = roleMemberDao.findMemberOfRoleIds(userOfMemberId); + //查看是否是我负责的任务 + if (CollectionUtil.isNotEmpty(userOfRoles)) { + List isMyTask = roleTaskDao.isMyTask(taskSub.getTaskDetailId(), userOfRoles); + if (CollectionUtil.isEmpty(isMyTask)) { + throw new BaseException(BasicsCodeError.NO_POWER); + } + }else { + throw new BaseException(BasicsCodeError.NO_POWER); + } + } + return memberId; + } + + + +// @Override +// public void saveDeliver(DeliverDto.SaveDeliver params, Long userId) throws Exception { +//// if (CollectionUtil.isEmpty(params.getCheckerList())) { +//// throw new BaseException(CommonCodeError.CHECKER_DONT_NULL); +//// } +// //检查项目是否存在 +// CProjectVo.ProjectInfo projectById = projectDao.findProjectById(params.getProjectId()); +// if (ObjectUtil.isNull(projectById)) { +// throw new BaseException(CommonCodeError.PROJECT_NOT_FOUND); +// } +// //检查任务是否存在 +// ProTaskSub taskSub = taskSubDao.selectByPrimaryKey(params.getTaskSubId()); +// if (ObjectUtil.isNull(taskSub)) { +// throw new BaseException(CommonCodeError.NOT_TASK); +// } +// //查找当前用户的成员id +// Long userOfMemberId = memberDao.findUserOfMemberId(params.getProjectId(), userId); +// if (ObjectUtil.isNull(userOfMemberId)) { +// throw new BaseException(CommonCodeError.NO_POWER); +// } +// //查找当前用户所属的角色 +// List userOfRoles = roleMemberDao.findMemberOfRoleIds(userOfMemberId); +// //查看是否是我负责的任务 +// if (CollectionUtil.isNotEmpty(userOfRoles)) { +// List isMyTask = roleTaskDao.isMyTask(taskSub.getTaskDetailId(), userOfRoles); +// if (CollectionUtil.isEmpty(isMyTask)) { +// throw new BaseException(CommonCodeError.NO_POWER); +// } +// }else { +// throw new BaseException(CommonCodeError.NO_POWER); +// } +// //添加交付物信息 +// ProDeliver proDeliver = new ProDeliver(); +// proDeliver.setId(snowflake.nextId()); +// proDeliver.setTaskSubId(params.getTaskSubId()); +// proDeliver.setMemberId(userOfMemberId); +// proDeliver.setContent(params.getContent()); +//// proDeliver.setFileId(params.getFileId()); +//// proDeliver.setFilePath(params.getFilePath()); +// proDeliver.setProjectId(params.getProjectId()); +// proDeliver.setTime(System.currentTimeMillis()); +// deliverDao.insertSelective(proDeliver); +// //添加交付物检查信息 +// for (Long checkerId : params.getCheckerList()) { +// ProDeliverChecker deliverChecker = new ProDeliverChecker(); +// deliverChecker.setId(snowflake.nextId()); +// deliverChecker.setDeliverId(proDeliver.getId()); +// deliverChecker.setMemberId(checkerId); +// deliverChecker.setStatus((byte)0); +// deliverCheckerDao.insertSelective(deliverChecker); +// } +// //添加交付物文件信息 +// if(CollectionUtil.isNotEmpty(params.getFileInfoList())){ +// params.getFileInfoList().forEach(fileInfo -> { +// ProDeliverFile proDeliverFile = new ProDeliverFile(); +// proDeliverFile.setId(snowflake.nextId()); +// proDeliverFile.setFileId(fileInfo.getFileId()); +// proDeliverFile.setDeliverId(proDeliver.getId()); +// proDeliverFile.setFileName(fileInfo.getName()); +// proDeliverFile.setFilePath(fileInfo.getPath()); +// proDeliverFileMapper.insertSelective(proDeliverFile); +// }); +// } +// //TODO 发送消息 +// sendToDeliverUploadMessage(params, userId, taskSub.getTaskDetailId(), proDeliver.getId()); +// } + +// public void sendToDeliverUploadMessage(DeliverDto.SaveDeliver params, Long userId, Long taskDetailId, Long deliverId) throws Exception { +// //获取任务所属的角色id +// List roleIdList = roleDao.getRoleIdByTaskDetailId(taskDetailId); +// //获取成员id和成员名 +// CMemberVo.MemberIdAndName memberIdAndName = memberDao.getByUserIdAndProjectId(params.getProjectId(), userId); +// Long memberId = null; +// String memberName = null; +// if(ObjectUtil.isNotNull(memberIdAndName)){ +// memberId = memberIdAndName.getId(); +// memberName = memberIdAndName.getName(); +// } +// //发送的消息内容 +// DeliverMessageWithUpload message = new DeliverMessageWithUpload(params.getTaskSubId(), +// taskDetailId,deliverId,roleIdList,memberId,memberName); +// //通过成员id批量获取userId +// List userIdList = memberDao.queryUserIdByMemberId(params.getCheckerList()); +// if(CollectionUtil.isNotEmpty(userIdList)){ +// //获取接受者的userId +// Set userIdSet = new HashSet<>(userIdList); +// //封装成inMessage +// InMessage inMessage = new InMessage(); +// inMessage.setToDomain(MessageConstant.DomainType.User); +// inMessage.setTos(userIdSet); +// inMessage.setData(JacksonUtil.beanToJson(message)); +// log.info("发送消息--上传交付物--：{}",inMessage); +// rabbitTemplate.convertAndSend(RabbitMQConfig.MESSAGE_QUEUE_NAME, +// JacksonUtil.beanToJson(inMessage)); +// } +// } +// +// +// @Override +// public List queryDeliverOfTask(DeliverDto.QueryDeliverOfTask params, Long userId) { +// ProTaskSub taskSub = taskSubDao.selectByPrimaryKey(params.getTaskSubId()); +// if (ObjectUtil.isNull(taskSub)) { +// throw new BaseException(CommonCodeError.NOT_TASK); +// } +// Long userOfMemberId = memberDao.findUserOfMemberId(params.getProjectId(), userId); +// List deliverOfTask = deliverDao.queryDeliverOfTask(params.getTaskSubId(),userOfMemberId); +//// if (CollectionUtil.isNotEmpty(deliverOfTask)) { +//// +//// // 判断检查人是否是当前用户 +//// for (DeliverVo.DeliverOfTask deliver : deliverOfTask) { +//// if (CollectionUtil.isNotEmpty(deliver.getCheckerList())) { +//// for (DeliverVo.CheckerInfo checkerInfo : deliver.getCheckerList()) { +//// checkerInfo.setIsMine((byte)0); +//// if (checkerInfo.getCheckerId().equals(userOfMemberId)){ +//// checkerInfo.setIsMine((byte)1); +//// } +//// } +//// } +//// } +//// } +// return deliverOfTask; +// } +// +// +// @Override +// public void checkDeliver(DeliverDto.CheckDeliver params, Long userId) throws Exception { +// Long userOfMemberId = memberDao.findUserOfMemberId(params.getProjectId(), userId); +// ProDeliverChecker deliverChecker = deliverCheckerDao.selectByPrimaryKey(params.getCheckId()); +// if (!userOfMemberId.equals(deliverChecker.getMemberId())) { +// throw new BaseException(CommonCodeError.NO_POWER); +// } +// ProDeliverChecker deliverCheck = new ProDeliverChecker(); +// deliverCheck.setId(params.getCheckId()); +// deliverCheck.setStatus(params.getStatus()); +// deliverCheck.setRemark(params.getRemark()); +// deliverCheck.setScore(params.getScore()); +// deliverCheckerDao.updateByPrimaryKeySelective(deliverCheck); +// //TODO 发送消息 +// sendToDeliverCheckerMessage(deliverChecker.getDeliverId(),params.getProjectId(),userId); +// } +// +// private void sendToDeliverCheckerMessage(Long deliverId, Long projectId, Long userId) throws Exception { +// Long subTaskId = null; +// Long taskDetailId = null; +// List roleIdList = null; +// Long memberId = null; +// String memberName = null; +// //获取任务信息 +// ProDeliver deliver = deliverDao.selectByPrimaryKey(deliverId); +// if(ObjectUtil.isNotNull(deliver)){ +// subTaskId = deliver.getTaskSubId(); +// ProTaskSub taskSub = taskSubDao.selectByPrimaryKey(deliver.getTaskSubId()); +// if(ObjectUtil.isNotNull(taskSub)){ +// taskDetailId = taskSub.getTaskDetailId(); +// //获取任务所属的角色id +// roleIdList = roleDao.getRoleIdByTaskDetailId(taskDetailId); +// } +// } +// //获取成员id和成员名 +// CMemberVo.MemberIdAndName memberIdAndName = memberDao.getByUserIdAndProjectId(projectId, userId); +// if(ObjectUtil.isNotNull(memberIdAndName)){ +// memberId = memberIdAndName.getId(); +// memberName = memberIdAndName.getName(); +// } +// //发送的消息内容 +// DeliverMessageWithChecker checkerMessage = new DeliverMessageWithChecker(subTaskId,taskDetailId,deliverId,roleIdList,memberId,memberName); +// //获取上传者的userId（消息接收者） +// ProMember uploadMember = memberDao.selectByPrimaryKey(deliver.getMemberId()); +// if(ObjectUtil.isNotNull(uploadMember)){ +// Set userIdSet = new HashSet<>(); +// userIdSet.add(uploadMember.getUserId().toString()); +// //封装成inMessage +// InMessage inMessage = new InMessage(); +// inMessage.setToDomain(MessageConstant.DomainType.User); +// inMessage.setTos(userIdSet); +// inMessage.setData(JacksonUtil.beanToJson(checkerMessage)); +// log.info("发送消息--检查交付物--：{}",inMessage); +// rabbitTemplate.convertAndSend(RabbitMQConfig.MESSAGE_QUEUE_NAME, +// JacksonUtil.beanToJson(inMessage)); +// } +// } +// +// +// @Override +// public PageInfo queryDeliverOfProject(DeliverDto.QueryDeliverOfProject params, Long userId) { +// CProjectVo.ProjectInfo projectById = projectDao.findProjectById(params.getProjectId()); +// if (ObjectUtil.isNull(projectById)) { +// throw new BaseException(CommonCodeError.PROJECT_NOT_FOUND); +// } +// Long userOfMemberId = memberDao.findUserOfMemberId(params.getProjectId(), userId); +// PageHelper.startPage(params.getPageNum(),params.getPageSize()); +// List deliverOfTask = deliverDao.queryDeliverOfProject(params.getProjectId(),userOfMemberId); +// return new PageInfo<>(deliverOfTask); +// } + } diff --git a/src/main/java/com/ccsens/ptccsens/service/FinanceService.java b/src/main/java/com/ccsens/ptccsens/service/FinanceService.java index 97b0e4b..c839357 100644 --- a/src/main/java/com/ccsens/ptccsens/service/FinanceService.java +++ b/src/main/java/com/ccsens/ptccsens/service/FinanceService.java @@ -2,6 +2,7 @@ package com.ccsens.ptccsens.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Snowflake; +import com.alibaba.fastjson.JSONArray; import com.ccsens.ptccsens.bean.dto.FinanceDto; import com.ccsens.ptccsens.bean.po.*; import com.ccsens.ptccsens.bean.vo.FinanceVo; @@ -19,6 +20,7 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; @@ -49,7 +51,7 @@ public class FinanceService implements IFinanceService { @Override - public FinanceVo.FinanceItem getByTask(FinanceDto.TaskId param, Long userId) { + public FinanceVo.FinanceItem getByTask(FinanceDto.TaskId param) { FinanceVo.FinancePrepare prepare = financeDao.getPrepareByTaskId(param.getTaskDetailId()); List expenses = financeDao.getExpenseByTaskId(param.getTaskDetailId()); final FinanceVo.FinanceItem item = new FinanceVo.FinanceItem(); @@ -88,15 +90,20 @@ public class FinanceService implements IFinanceService { if (CollectionUtil.isEmpty(proMembers)) { throw new BaseException(BasicsCodeError.NOT_MEMBER_SHEET); } - // 查找对应的预算信息 - PluFinanceExample financeExample = new PluFinanceExample(); - financeExample.createCriteria().andTaskIdEqualTo(param.getTaskDetailId()); - financeExample.setOrderByClause("id desc limit 1"); - List pluFinances = pluFinanceMapper.selectByExample(financeExample); - log.info("财务预算信息：{}", pluFinances); - if (CollectionUtil.isEmpty(pluFinances)) { - throw new BaseException(BasicsCodeError.FINANCE_NOT_FOUND); + PluFinance pluFinance = null; + if (param.getTaskDetailId() != null && param.getTaskDetailId() != 0) { + // 查找对应的预算信息 + PluFinanceExample financeExample = new PluFinanceExample(); + financeExample.createCriteria().andTaskIdEqualTo(param.getTaskDetailId()); + financeExample.setOrderByClause("id desc limit 1"); + List pluFinances = pluFinanceMapper.selectByExample(financeExample); + log.info("财务预算信息：{}", pluFinances); + if (CollectionUtil.isEmpty(pluFinances)) { + throw new BaseException(BasicsCodeError.FINANCE_NOT_FOUND); + } + pluFinance = pluFinances.get(0); } + // 计算总金额和发票金额是否一致 if (CollectionUtil.isNotEmpty(param.getInvoiceList())) { long invoiceTotal = 0L; @@ -113,7 +120,7 @@ public class FinanceService implements IFinanceService { apply.setId(snowflake.nextId()); apply.setMemberId(proMembers.get(0).getId()); apply.setTaskId(param.getTaskDetailId()); - apply.setFinanceId(pluFinances.get(0).getId()); + apply.setFinanceId(pluFinance == null ? 0 : pluFinance.getId()); apply.setApplyTime(System.currentTimeMillis()); apply.setInvoice(CollectionUtil.isEmpty(param.getInvoiceList()) ? BasicsConstant.Finance.INVOICE_UPLOAD_NO : BasicsConstant.Finance.INVOICE_UPLOAD_YES); pluFinanceApplyMapper.insertSelective(apply); @@ -208,4 +215,55 @@ public class FinanceService implements IFinanceService { List list = financeDao.queryPersonalHistory(param, userId); return new PageInfo<>(list); } + + @Override + public List queryMemberFinance(FinanceDto.MemberFinance param, Long userId) { + + List memberFinances = financeDao.queryMemberFinance(param.getProjectId(), userId); + if (CollectionUtil.isEmpty(memberFinances)) { + return memberFinances; + } + long total = 0; + for (FinanceVo.MemberFinance memberFinance: memberFinances) { + total += memberFinance.getMoney(); + } + long finalTotal = total; + memberFinances.forEach(memberFinance -> { + // BigDecimal.ROUND_HALF_DOWN：五舍六入，ROUND_HALF_UP：四舍五入，为避免超过100%，选择了五舍六入 + memberFinance.setPercentage(new BigDecimal(memberFinance.getMoney()*100.0/ finalTotal).setScale(2, BigDecimal.ROUND_HALF_DOWN)); + }); + return memberFinances; + } + + @Override + public List queryTaskExpense(FinanceDto.TaskExpense param, Long userId) { + List taskExpenses = financeDao.queryTaskExpense(param.getProjectId(), userId); + long total = 0; + for (FinanceVo.TaskExpense taskExpense: taskExpenses) { + total += taskExpense.getMoney(); + } + long finalTotal = total; + taskExpenses.forEach(taskExpense -> { + // BigDecimal.ROUND_HALF_DOWN：五舍六入，ROUND_HALF_UP：四舍五入，为避免超过100%，选择了五舍六入 + taskExpense.setPercentage(new BigDecimal(taskExpense.getMoney()*100.0/ finalTotal).setScale(2, BigDecimal.ROUND_HALF_DOWN)); + }); + return taskExpenses; + } + + @Override + public List queryRowExpense(FinanceDto.RowExpense param, Long userId) { + List rowExpenses = financeDao.queryRowExpense(param.getProjectId(), userId); + long total = 0; + for (FinanceVo.RowExpense rowExpense: rowExpenses) { + total += rowExpense.getMoney(); + } + long finalTotal = total; + rowExpenses.forEach(rowExpense -> { + // BigDecimal.ROUND_HALF_DOWN：五舍六入，ROUND_HALF_UP：四舍五入，为避免超过100%，选择了五舍六入 + rowExpense.setPercentage(new BigDecimal(rowExpense.getMoney()*100.0/ finalTotal).setScale(2, BigDecimal.ROUND_HALF_DOWN)); + }); + return rowExpenses; + } + + } diff --git a/src/main/java/com/ccsens/ptccsens/service/IDeliverService.java b/src/main/java/com/ccsens/ptccsens/service/IDeliverService.java index a4bb33e..64fe564 100644 --- a/src/main/java/com/ccsens/ptccsens/service/IDeliverService.java +++ b/src/main/java/com/ccsens/ptccsens/service/IDeliverService.java @@ -1,11 +1,16 @@ package com.ccsens.ptccsens.service; + import com.ccsens.ptccsens.bean.dto.DeliverDto; import com.ccsens.ptccsens.bean.vo.DeliverVo; import java.util.List; +/** + * @author AUSU + */ public interface IDeliverService { + /** * 查询所有检查人 * @param params 项目id @@ -13,4 +18,79 @@ public interface IDeliverService { * @return 检查人列表 */ List queryChecker(DeliverDto.QueryChecker params, Long userId); + + /** + * 添加交付物 + * @param param 交付物名称和任务id + * @param userId userID + */ + void saveDeliver(DeliverDto.SaveDeliver param, Long userId); + + /** + * 查看任务下的交付物信息 + * @param param 任务id + * @param userId userId + * @return 返回交付物信息 + */ + DeliverVo.DeliverOfTask getDeliver(DeliverDto.GetTaskDeliver param, Long userId); + + /** + * 提交交付物内容 + * @param param 文件检查人等 + * @param userId userId + */ + void submitDeliver(DeliverDto.SubmitDeliver param, Long userId); + + /** + * 检查交付物提交记录 + * @param param 检查信息 + * @param userId userId + */ + void checkDeliver(DeliverDto.CheckDeliver param, Long userId); + + /** + * 查看交付物提交记录 + * @param param 交付物id + * @param userId userId + * @return 返回提交记录 + */ + DeliverVo.QueryDeliverRecord queryRecord(DeliverDto.QueryRecord param, Long userId); + + /** + * 查看交付物的检查记录 + * @param param 交付物提交记录id + * @param userId userId + * @return 返回所有检查记录倒叙排列 + */ + List queryCheckLog(DeliverDto.QueryCheckLog param, Long userId); + +// /** +// * 提交交付物 +// * @param params 项目id +// * @param userId 用户id +// */ +// void saveDeliver(DeliverDto.SaveDeliver params, Long userId) throws Exception; +// +// /** +// * 查询任务的交付物历史记录 +// * @param params 任务分解id +// * @param userId 用户id +// * @return 检查人列表 +// */ +// List queryDeliverOfTask(DeliverDto.QueryDeliverOfTask params, Long userId); +// +// /** +// * 检查交付物 +// * @param params 检查记录id +// * @param userId 当前登录用户 +// */ +// void checkDeliver(DeliverDto.CheckDeliver params, Long userId) throws Exception; +// +// /** +// * 查询项目的交付物历史记录 +// * @param params 项目id +// * @param userId 用户id +// * @return 检查人列表 +// */ +// PageInfo queryDeliverOfProject(DeliverDto.QueryDeliverOfProject params, Long userId); } diff --git a/src/main/java/com/ccsens/ptccsens/service/IFinanceService.java b/src/main/java/com/ccsens/ptccsens/service/IFinanceService.java index 196a3e1..ca3812c 100644 --- a/src/main/java/com/ccsens/ptccsens/service/IFinanceService.java +++ b/src/main/java/com/ccsens/ptccsens/service/IFinanceService.java @@ -13,10 +13,9 @@ public interface IFinanceService { /** * 根据任务ID查询 * @param param 任务ID - * @param userId 操作人ID * @return 财务条 */ - FinanceVo.FinanceItem getByTask(FinanceDto.TaskId param, Long userId); + FinanceVo.FinanceItem getByTask(FinanceDto.TaskId param); /** * 查询费用申请类型 @@ -55,4 +54,28 @@ public interface IFinanceService { * @return 历史信息 */ PageInfo queryPersonalHistory(FinanceDto.PersonalHistory param, Long userId); + + /** + * 查询项目成员申请财务图 + * @param param 项目 + * @param userId 操作人信息 + * @return 成员财务图 + */ + List queryMemberFinance(FinanceDto.MemberFinance param, Long userId); + + /** + * 查询任务支出 + * @param param 项目 + * @param userId 操作人信息 + * @return 任务支出 + */ + List queryTaskExpense(FinanceDto.TaskExpense param, Long userId); + + /** + * 名目支出统计 + * @param param 项目 + * @param userId 操作人信息 + * @return 名目支出 + */ + List queryRowExpense(FinanceDto.RowExpense param, Long userId); } diff --git a/src/main/java/com/ccsens/ptccsens/service/IOcrService.java b/src/main/java/com/ccsens/ptccsens/service/IOcrService.java index aefc14b..daacfab 100644 --- a/src/main/java/com/ccsens/ptccsens/service/IOcrService.java +++ b/src/main/java/com/ccsens/ptccsens/service/IOcrService.java @@ -8,7 +8,8 @@ public interface IOcrService { /** * 发票识别 * @param img 发表base64 + * @param realPath 文件路径 * @return 识别结果 */ - OcrVo.BillInfo identifyBill(String img) throws ParseException; + OcrVo.BillInfo identifyBill(String img,String realPath) throws ParseException; } diff --git a/src/main/java/com/ccsens/ptccsens/service/IProjectFinanceService.java b/src/main/java/com/ccsens/ptccsens/service/IProjectFinanceService.java index e39835b..dc9c3b1 100644 --- a/src/main/java/com/ccsens/ptccsens/service/IProjectFinanceService.java +++ b/src/main/java/com/ccsens/ptccsens/service/IProjectFinanceService.java @@ -5,6 +5,8 @@ import com.ccsens.ptccsens.bean.vo.ProjectFinanceVo; import com.github.pagehelper.Page; import com.github.pagehelper.PageInfo; +import java.util.List; + /** * @author AUSU */ @@ -54,4 +56,12 @@ public interface IProjectFinanceService { * @return 项目下所有的费用申请 */ PageInfo queryAllMoneyApply(ProjectFinanceDto.QueryAllMoneyApply param, Long userId); + + /** + * 时间财务图-统计 + * @param param 入参 + * @param userId 用户id + * @return 时间财务图 + */ + List timeFinancialChart(ProjectFinanceDto.TimeFinancialChart param, Long userId); } diff --git a/src/main/java/com/ccsens/ptccsens/service/OcrService.java b/src/main/java/com/ccsens/ptccsens/service/OcrService.java index 45e42ba..dfd5dfb 100644 --- a/src/main/java/com/ccsens/ptccsens/service/OcrService.java +++ b/src/main/java/com/ccsens/ptccsens/service/OcrService.java @@ -3,10 +3,12 @@ package com.ccsens.ptccsens.service; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import com.ccsens.ptccsens.bean.vo.OcrVo; +import com.ccsens.ptccsens.util.BasicsCodeError; import com.ccsens.ptccsens.util.BasicsConstant; import com.ccsens.util.baidu.BaiDuDto; import com.ccsens.util.baidu.BaiDuUtil; import com.ccsens.util.baidu.BaiDuVo; +import com.ccsens.util.exception.BaseException; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -22,7 +24,7 @@ import java.text.SimpleDateFormat; public class OcrService implements IOcrService{ @Override - public OcrVo.BillInfo identifyBill(String img) throws ParseException { + public OcrVo.BillInfo identifyBill(String img, String realPath) throws ParseException { // 图像识别 BaiDuDto.GeneralBasic basic = new BaiDuDto.GeneralBasic(); basic.setImage(img); @@ -38,10 +40,11 @@ public class OcrService implements IOcrService{ if (CollectionUtil.isNotEmpty(words.getWordsResult())) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd"); BeanUtil.copyProperties(words.getWordsResult().get(0),billInfo); - billInfo.setTotalAmount(new BigDecimal(words.getWordsResult().get(0).getTotalAmount()).multiply(BigDecimal.valueOf(100)).longValue()); - billInfo.setTotalTax(new BigDecimal(words.getWordsResult().get(0).getTotalTax()).multiply(BigDecimal.valueOf(100)).longValue()); - billInfo.setInvoiceDate(sdf.parse(words.getWordsResult().get(0).getInvoiceDate()).getTime()); - + billInfo.setInvoiceNumber(words.getWordsResult().get(0).getInvoiceNum()); + billInfo.setMoney(new BigDecimal(words.getWordsResult().get(0).getTotalAmount()).multiply(BigDecimal.valueOf(100)).longValue()); + billInfo.setTaxMoney(new BigDecimal(words.getWordsResult().get(0).getTotalTax()).multiply(BigDecimal.valueOf(100)).longValue()); + billInfo.setInvoiceTime(sdf.parse(words.getWordsResult().get(0).getInvoiceDate()).getTime()); + billInfo.setUrl(realPath); } // personMsg.toMsg(words.getWordsResult()); return billInfo; diff --git a/src/main/java/com/ccsens/ptccsens/service/ProjectFinanceService.java b/src/main/java/com/ccsens/ptccsens/service/ProjectFinanceService.java index 94429aa..835b3db 100644 --- a/src/main/java/com/ccsens/ptccsens/service/ProjectFinanceService.java +++ b/src/main/java/com/ccsens/ptccsens/service/ProjectFinanceService.java @@ -203,4 +203,9 @@ public class ProjectFinanceService implements IProjectFinanceService{ return new PageInfo<>(allMoneyApplyList); } + + @Override + public List timeFinancialChart(ProjectFinanceDto.TimeFinancialChart param, Long userId) { + return pluFinanceApplyDao.timeFinancialChart(param.getProjectId()); + } } diff --git a/src/main/java/com/ccsens/ptccsens/util/BasicsCodeError.java b/src/main/java/com/ccsens/ptccsens/util/BasicsCodeError.java index 930fbb2..f806f0a 100644 --- a/src/main/java/com/ccsens/ptccsens/util/BasicsCodeError.java +++ b/src/main/java/com/ccsens/ptccsens/util/BasicsCodeError.java @@ -41,10 +41,13 @@ public class BasicsCodeError extends CodeError { public static final Code CHECK_EXISTED = new Code(528,"您已经提交过审核结果了，无需重复提交。", true); public static final Code TASK_DONT_EXIT = new Code(530,"任务不存在请检查后重试", true); public static final Code FINANCE_NOT_FOUND = new Code(529,"没有找到任务对应的财务预算信息，请修改后重新提交申请。", true); + public static final Code IMG_ERROR = new Code(530,"请上传正确的发票图片", true); public static final Code NOT_PERMISSION = new Code(529,"没有权限!", true); public static final Code ROLE_ERROR = new Code(530,"角色信息错误!", true); public static final Code PROJECT_NOT_FOUND = new Code(531,"项目不存在,请检查后再试!", true); + public static final Code NOT_DELIVER = new Code(532,"找不到对应的交付物", true); + public static final Code NOT_TASK = new Code(533,"未找到对应任务", true); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 55e9745..2a5c9ef 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -48,4 +48,4 @@ notGatewayUrl: http://101.201.226.163:7320/v1.0 file: path: /home/ptccsens/server/uploads/ domain: https://test.tall.wiki/gateway/ptccsens - imgDomain: https://test.tall.wiki/gateway/ptccsens/uploads/ + imgDomain: https://test.tall.wiki/gateway/ptccsens/v1.0/uploads/ diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 035b3e7..fb06b38 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -37,4 +37,4 @@ apiUrl: http://www.tall.wiki/ file: path: /home/ptccsens/server/uploads/ domain: https://www.tall.wiki/gateway/ptccsens - imgDomain: https://www.tall.wiki/gateway/ptccsens/uploads/ + imgDomain: https://www.tall.wiki/gateway/ptccsens/v1.0/uploads/ diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index bac9719..b1f179e 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -45,4 +45,4 @@ eureka: file: path: /home/ptccsens/server/uploads/ domain: https://test.tall.wiki/gateway/ptccsens - imgDomain: https://test.tall.wiki/gateway/ptccsens/uploads/ + imgDomain: https://test.tall.wiki/gateway/ptccsens/v1.0/uploads/ diff --git a/src/main/resources/mapper_dao/FinanceDao.xml b/src/main/resources/mapper_dao/FinanceDao.xml index da696bb..cc86f2e 100644 --- a/src/main/resources/mapper_dao/FinanceDao.xml +++ b/src/main/resources/mapper_dao/FinanceDao.xml @@ -48,7 +48,8 @@ a.row_id AS rowId, t3.NAME AS rowName, a.remark, - a.money + a.money, + a.apply_time as applyTime FROM t_plu_finance_apply a left join t_pro_task_detail p on a.project_id = p.id AND p.rec_status = 0 @@ -121,7 +122,8 @@ a.submit_name as submitName, a.money as money, a.apply_time as submitTime, - a.apply_type as applyType + a.apply_type as applyType, + a.remark FROM t_plu_finance_apply a LEFT JOIN t_pro_task_detail d ON a.task_id = d.id @@ -143,9 +145,76 @@ AND t.NAME = '奖金' - AND t.NAME != '奖金' + AND (t.NAME != '奖金' OR t.`name` is NULL) AND a.rec_status = 0 + + + \ No newline at end of file diff --git a/src/main/resources/mapper_dao/PluDeliverDao.xml b/src/main/resources/mapper_dao/PluDeliverDao.xml new file mode 100644 index 0000000..d0b7c7d --- /dev/null +++ b/src/main/resources/mapper_dao/PluDeliverDao.xml @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper_dao/PluFinanceApplyDao.xml b/src/main/resources/mapper_dao/PluFinanceApplyDao.xml index 48e3958..20939b5 100644 --- a/src/main/resources/mapper_dao/PluFinanceApplyDao.xml +++ b/src/main/resources/mapper_dao/PluFinanceApplyDao.xml @@ -101,5 +101,45 @@ AND ft2.rec_status = 0 + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper_dao/ProRoleTaskDao.xml b/src/main/resources/mapper_dao/ProRoleTaskDao.xml index 5bc4534..fcdb981 100644 --- a/src/main/resources/mapper_dao/ProRoleTaskDao.xml +++ b/src/main/resources/mapper_dao/ProRoleTaskDao.xml @@ -40,19 +40,19 @@ - - - - - - - - - - - + + select + + distinct + + + from t_plu_deliver + + + + + order by ${orderByClause} + + + + + delete from t_plu_deliver + where id = #{id,jdbcType=BIGINT} + + + delete from t_plu_deliver + + + + + + insert into t_plu_deliver (id, task_sub_id, name, + description, operator, created_at, + updated_at, rec_status) + values (#{id,jdbcType=BIGINT}, #{taskSubId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, + #{description,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) + + + insert into t_plu_deliver + + + id, + + + task_sub_id, + + + name, + + + description, + + + operator, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{taskSubId,jdbcType=BIGINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{description,jdbcType=VARCHAR}, + + + #{operator,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_plu_deliver + + + id = #{record.id,jdbcType=BIGINT}, + + + task_sub_id = #{record.taskSubId,jdbcType=BIGINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + operator = #{record.operator,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_plu_deliver + set id = #{record.id,jdbcType=BIGINT}, + task_sub_id = #{record.taskSubId,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=VARCHAR}, + operator = #{record.operator,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_plu_deliver + + + task_sub_id = #{taskSubId,jdbcType=BIGINT}, + + + name = #{name,jdbcType=VARCHAR}, + + + description = #{description,jdbcType=VARCHAR}, + + + operator = #{operator,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_plu_deliver + set task_sub_id = #{taskSubId,jdbcType=BIGINT}, + name = #{name,jdbcType=VARCHAR}, + description = #{description,jdbcType=VARCHAR}, + operator = #{operator,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/src/main/resources/mapper_raw/PluDeliverRecordCheckLogMapper.xml b/src/main/resources/mapper_raw/PluDeliverRecordCheckLogMapper.xml new file mode 100644 index 0000000..fe07c8b --- /dev/null +++ b/src/main/resources/mapper_raw/PluDeliverRecordCheckLogMapper.xml @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + 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, record_check_id, score, remark, check_status, time, operator, created_at, updated_at, + rec_status + + + + + delete from t_plu_deliver_record_check_log + where id = #{id,jdbcType=BIGINT} + + + delete from t_plu_deliver_record_check_log + + + + + + insert into t_plu_deliver_record_check_log (id, record_check_id, score, + remark, check_status, time, + operator, created_at, updated_at, + rec_status) + values (#{id,jdbcType=BIGINT}, #{recordCheckId,jdbcType=BIGINT}, #{score,jdbcType=DECIMAL}, + #{remark,jdbcType=VARCHAR}, #{checkStatus,jdbcType=TINYINT}, #{time,jdbcType=BIGINT}, + #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, + #{recStatus,jdbcType=TINYINT}) + + + insert into t_plu_deliver_record_check_log + + + id, + + + record_check_id, + + + score, + + + remark, + + + check_status, + + + time, + + + operator, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{recordCheckId,jdbcType=BIGINT}, + + + #{score,jdbcType=DECIMAL}, + + + #{remark,jdbcType=VARCHAR}, + + + #{checkStatus,jdbcType=TINYINT}, + + + #{time,jdbcType=BIGINT}, + + + #{operator,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_plu_deliver_record_check_log + + + id = #{record.id,jdbcType=BIGINT}, + + + record_check_id = #{record.recordCheckId,jdbcType=BIGINT}, + + + score = #{record.score,jdbcType=DECIMAL}, + + + remark = #{record.remark,jdbcType=VARCHAR}, + + + check_status = #{record.checkStatus,jdbcType=TINYINT}, + + + time = #{record.time,jdbcType=BIGINT}, + + + operator = #{record.operator,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_plu_deliver_record_check_log + set id = #{record.id,jdbcType=BIGINT}, + record_check_id = #{record.recordCheckId,jdbcType=BIGINT}, + score = #{record.score,jdbcType=DECIMAL}, + remark = #{record.remark,jdbcType=VARCHAR}, + check_status = #{record.checkStatus,jdbcType=TINYINT}, + time = #{record.time,jdbcType=BIGINT}, + operator = #{record.operator,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_plu_deliver_record_check_log + + + record_check_id = #{recordCheckId,jdbcType=BIGINT}, + + + score = #{score,jdbcType=DECIMAL}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + check_status = #{checkStatus,jdbcType=TINYINT}, + + + time = #{time,jdbcType=BIGINT}, + + + operator = #{operator,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_plu_deliver_record_check_log + set record_check_id = #{recordCheckId,jdbcType=BIGINT}, + score = #{score,jdbcType=DECIMAL}, + remark = #{remark,jdbcType=VARCHAR}, + check_status = #{checkStatus,jdbcType=TINYINT}, + time = #{time,jdbcType=BIGINT}, + operator = #{operator,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/src/main/resources/mapper_raw/PluDeliverRecordCheckMapper.xml b/src/main/resources/mapper_raw/PluDeliverRecordCheckMapper.xml new file mode 100644 index 0000000..628abc4 --- /dev/null +++ b/src/main/resources/mapper_raw/PluDeliverRecordCheckMapper.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + 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, deliver_record_id, checker_id, operator, created_at, updated_at, rec_status + + + + + delete from t_plu_deliver_record_check + where id = #{id,jdbcType=BIGINT} + + + delete from t_plu_deliver_record_check + + + + + + insert into t_plu_deliver_record_check (id, deliver_record_id, checker_id, + operator, created_at, updated_at, + rec_status) + values (#{id,jdbcType=BIGINT}, #{deliverRecordId,jdbcType=BIGINT}, #{checkerId,jdbcType=BIGINT}, + #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, + #{recStatus,jdbcType=TINYINT}) + + + insert into t_plu_deliver_record_check + + + id, + + + deliver_record_id, + + + checker_id, + + + operator, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{deliverRecordId,jdbcType=BIGINT}, + + + #{checkerId,jdbcType=BIGINT}, + + + #{operator,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_plu_deliver_record_check + + + id = #{record.id,jdbcType=BIGINT}, + + + deliver_record_id = #{record.deliverRecordId,jdbcType=BIGINT}, + + + checker_id = #{record.checkerId,jdbcType=BIGINT}, + + + operator = #{record.operator,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_plu_deliver_record_check + set id = #{record.id,jdbcType=BIGINT}, + deliver_record_id = #{record.deliverRecordId,jdbcType=BIGINT}, + checker_id = #{record.checkerId,jdbcType=BIGINT}, + operator = #{record.operator,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_plu_deliver_record_check + + + deliver_record_id = #{deliverRecordId,jdbcType=BIGINT}, + + + checker_id = #{checkerId,jdbcType=BIGINT}, + + + operator = #{operator,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_plu_deliver_record_check + set deliver_record_id = #{deliverRecordId,jdbcType=BIGINT}, + checker_id = #{checkerId,jdbcType=BIGINT}, + operator = #{operator,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/src/main/resources/mapper_raw/PluDeliverRecordFileMapper.xml b/src/main/resources/mapper_raw/PluDeliverRecordFileMapper.xml new file mode 100644 index 0000000..81c2332 --- /dev/null +++ b/src/main/resources/mapper_raw/PluDeliverRecordFileMapper.xml @@ -0,0 +1,276 @@ + + + + + + + + + + + + + + + + + + + + + + + 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, deliver_record_id, file_id, file_name, file_path, operator, created_at, updated_at, + rec_status + + + + + delete from t_plu_deliver_record_file + where id = #{id,jdbcType=BIGINT} + + + delete from t_plu_deliver_record_file + + + + + + insert into t_plu_deliver_record_file (id, deliver_record_id, file_id, + file_name, file_path, operator, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{deliverRecordId,jdbcType=BIGINT}, #{fileId,jdbcType=BIGINT}, + #{fileName,jdbcType=VARCHAR}, #{filePath,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_plu_deliver_record_file + + + id, + + + deliver_record_id, + + + file_id, + + + file_name, + + + file_path, + + + operator, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{deliverRecordId,jdbcType=BIGINT}, + + + #{fileId,jdbcType=BIGINT}, + + + #{fileName,jdbcType=VARCHAR}, + + + #{filePath,jdbcType=VARCHAR}, + + + #{operator,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_plu_deliver_record_file + + + id = #{record.id,jdbcType=BIGINT}, + + + deliver_record_id = #{record.deliverRecordId,jdbcType=BIGINT}, + + + file_id = #{record.fileId,jdbcType=BIGINT}, + + + file_name = #{record.fileName,jdbcType=VARCHAR}, + + + file_path = #{record.filePath,jdbcType=VARCHAR}, + + + operator = #{record.operator,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_plu_deliver_record_file + set id = #{record.id,jdbcType=BIGINT}, + deliver_record_id = #{record.deliverRecordId,jdbcType=BIGINT}, + file_id = #{record.fileId,jdbcType=BIGINT}, + file_name = #{record.fileName,jdbcType=VARCHAR}, + file_path = #{record.filePath,jdbcType=VARCHAR}, + operator = #{record.operator,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_plu_deliver_record_file + + + deliver_record_id = #{deliverRecordId,jdbcType=BIGINT}, + + + file_id = #{fileId,jdbcType=BIGINT}, + + + file_name = #{fileName,jdbcType=VARCHAR}, + + + file_path = #{filePath,jdbcType=VARCHAR}, + + + operator = #{operator,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_plu_deliver_record_file + set deliver_record_id = #{deliverRecordId,jdbcType=BIGINT}, + file_id = #{fileId,jdbcType=BIGINT}, + file_name = #{fileName,jdbcType=VARCHAR}, + file_path = #{filePath,jdbcType=VARCHAR}, + operator = #{operator,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/src/main/resources/mapper_raw/PluDeliverRecordMapper.xml b/src/main/resources/mapper_raw/PluDeliverRecordMapper.xml new file mode 100644 index 0000000..4253db4 --- /dev/null +++ b/src/main/resources/mapper_raw/PluDeliverRecordMapper.xml @@ -0,0 +1,258 @@ + + + + + + + + + + + + + + + + + + + + + + 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, deliver_id, submit_time, member_id, operator, created_at, updated_at, rec_status + + + + + delete from t_plu_deliver_record + where id = #{id,jdbcType=BIGINT} + + + delete from t_plu_deliver_record + + + + + + insert into t_plu_deliver_record (id, deliver_id, submit_time, + member_id, operator, created_at, + updated_at, rec_status) + values (#{id,jdbcType=BIGINT}, #{deliverId,jdbcType=BIGINT}, #{submitTime,jdbcType=BIGINT}, + #{memberId,jdbcType=BIGINT}, #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) + + + insert into t_plu_deliver_record + + + id, + + + deliver_id, + + + submit_time, + + + member_id, + + + operator, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{deliverId,jdbcType=BIGINT}, + + + #{submitTime,jdbcType=BIGINT}, + + + #{memberId,jdbcType=BIGINT}, + + + #{operator,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_plu_deliver_record + + + id = #{record.id,jdbcType=BIGINT}, + + + deliver_id = #{record.deliverId,jdbcType=BIGINT}, + + + submit_time = #{record.submitTime,jdbcType=BIGINT}, + + + member_id = #{record.memberId,jdbcType=BIGINT}, + + + operator = #{record.operator,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_plu_deliver_record + set id = #{record.id,jdbcType=BIGINT}, + deliver_id = #{record.deliverId,jdbcType=BIGINT}, + submit_time = #{record.submitTime,jdbcType=BIGINT}, + member_id = #{record.memberId,jdbcType=BIGINT}, + operator = #{record.operator,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_plu_deliver_record + + + deliver_id = #{deliverId,jdbcType=BIGINT}, + + + submit_time = #{submitTime,jdbcType=BIGINT}, + + + member_id = #{memberId,jdbcType=BIGINT}, + + + operator = #{operator,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_plu_deliver_record + set deliver_id = #{deliverId,jdbcType=BIGINT}, + submit_time = #{submitTime,jdbcType=BIGINT}, + member_id = #{memberId,jdbcType=BIGINT}, + operator = #{operator,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/src/main/resources/mbg.xml b/src/main/resources/mbg.xml index f2b34d3..a45700a 100644 --- a/src/main/resources/mbg.xml +++ b/src/main/resources/mbg.xml @@ -83,13 +83,18 @@ -
+ +
+
+
+
+