diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java index b7e3acc..88ee4c9 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -297,7 +297,7 @@ public class SupCertController { return ResultVOUtils.success("成功"); } - @AuthRuleAnnotation("") +// @AuthRuleAnnotation("") @PostMapping("/sup/info/insertCompanyCert") @Log(title = "资质证书", businessType = BusinessType.INSERT) public BaseResponse cptInsertCompanyCert(@RequestBody SupCertEntity supCertEntity) { diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java index 5709a35..efe2ffb 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java @@ -51,7 +51,7 @@ public class SupCertSetController { @AuthRuleAnnotation("") - @PostMapping("/sup/cert/set/add") + @PostMapping("/directToCpt/sup/cert/set/add") @Log(title = "资质证书", businessType = BusinessType.INSERT) public BaseResponse addCertSet(@RequestBody SupCertSetEntity supCertSetEntity) { if (supCertSetEntity == null) { @@ -79,7 +79,7 @@ public class SupCertSetController { @AuthRuleAnnotation("") - @PostMapping("/sup/cert/set/update") + @PostMapping("/directToCpt/sup/cert/set/update") @Log(title = "资质证书", businessType = BusinessType.UPDATE) public BaseResponse updateCertSet(@RequestBody SupCertSetEntity supCertSetEntity) { if (CollUtil.isNotEmpty(supCertSetEntity.getFlbmList())) { @@ -102,7 +102,7 @@ public class SupCertSetController { @AuthRuleAnnotation("") - @PostMapping("/sup/cert/set/delete") + @PostMapping("/directToCpt/sup/cert/set/delete") @Log(title = "资质证书", businessType = BusinessType.DELETE) public BaseResponse deleteCertSet(@RequestBody DeleteRequest deleteRequest) { diff --git a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java index 882d97c..695a227 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java @@ -122,8 +122,8 @@ public class SupManufacturerController { @AuthRuleAnnotation("") @GetMapping("/directToCpt/sup/manufacturer/getCompanyBySup") public BaseResponse getCompanyBySup(FilterSupManufacturerRequest filterSupManufacturerRequest) { - filterSupManufacturerRequest.setCustomerId(getCompanyId()); - System.out.println("111111111111111111111111111111111111:"+getCompanyId()); + filterSupManufacturerRequest.setCustomerId(getCustomerId()); + System.out.println("111111111111111111111111111111111111:"+getCustomerId()); List companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest); PageInfo pageInfo = new PageInfo<>(companyEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -237,7 +237,6 @@ public class SupManufacturerController { public BaseResponse directToCptAddCompany(@RequestBody SupManufacturerEntity supManufacturerEntity) { String customerId = getCustomerId(); -// String customerId = getCustomerId(); supManufacturerEntity.setCustomerId(customerId); //判断用户名和社会信用代码不能重复 FilterSupManufacturerRequest filterSupManufacturerRequest = new FilterSupManufacturerRequest(); diff --git a/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java b/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java index b73abaf..36fbcc9 100644 --- a/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java +++ b/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java @@ -315,10 +315,10 @@ public class UserRegisterController extends BaseController { userRegisterEntity.setId(Long.valueOf(registComPerResponse.getId())); userRegisterEntity.setCheckStatus(registComPerResponse.getCheckStatus()); userCompanyEntity.setId(Long.valueOf(registComPerResponse.getUcId())); - userCompanyEntity.setCustomerId(registComPerResponse.getUcId()); +// userCompanyEntity.setCustomerId(registComPerResponse.getUcId()); userCompanyEntity.setCheckStatus(registComPerResponse.getCheckStatus()); userCompanyEntity.setReason(registComPerResponse.getReason()); - userCompanyEntity.setAuditStatus(Integer.valueOf(company.getCheckStatus())); +// userCompanyEntity.setAuditStatus(Integer.valueOf(company.getCheckStatus())); String queueName = "fanout_" + userCompanyEntity.getId() + ""; rabbitQueueService.createQueue(queueName); userRegisterService.updateById(userRegisterEntity); diff --git a/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java b/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java index d98b370..dcab232 100644 --- a/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java +++ b/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java @@ -102,6 +102,9 @@ public class TraceOrderController extends BaseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } TraceTaskNoticeEntity taskNoticeEntity = traceTaskNoticeService.getById(traceOrderUploadRequest.getTaskId()); + if (taskNoticeEntity == null) { + return ResultVOUtils.error(500, "任务已过期！"); + } TraceOrderEntity traceOrderEntity = new TraceOrderEntity(); BeanUtils.copyProperties(traceOrderUploadRequest, traceOrderEntity); traceOrderEntity.setCompanyIdFk(taskNoticeEntity.getCompanyIdFk()); @@ -119,16 +122,21 @@ public class TraceOrderController extends BaseController { if (StrUtil.isNotEmpty(traceOrderEntity.getToCorpCreditNum()) && !traceOrderEntity.getToCorpCreditNum().equals(userCompanyEntity.getCreditNum())) { UserCompanyEntity toUserCompanyEntity = userCompanyService.getOne(new QueryWrapper().eq("creditNum", traceOrderEntity.getToCorpCreditNum()), false); - TraceTaskNoticeEntity nextNotity = traceTaskNoticeService.findTask(2, traceOrderEntity.getTraceProductIdFk(), toUserCompanyEntity.getId()); - if (nextNotity == null) { - TraceProductDetailEntity traceProductDetailEntity = traceProductDetailService.getById(traceOrderEntity.getTraceProductIdFk()); - nextNotity = udiTraceService.createTraceNotice(2, traceProductDetailEntity, toUserCompanyEntity.getId()); - udiTraceService.pushDelayExpireTask(nextNotity); - udiTraceService.pushMq(nextNotity, toUserCompanyEntity.getId()); - } else if (nextNotity.getStatus() == 4) { - //任务超时未处理，重新推送消息 - udiTraceService.pushMq(nextNotity, toUserCompanyEntity.getId()); + if (toUserCompanyEntity != null) { + TraceTaskNoticeEntity nextNotity = traceTaskNoticeService.findTask(2, traceOrderEntity.getTraceProductIdFk(), toUserCompanyEntity.getId()); + if (nextNotity == null) { + TraceProductDetailEntity traceProductDetailEntity = traceProductDetailService.getById(traceOrderEntity.getTraceProductIdFk()); + nextNotity = udiTraceService.createTraceNotice(2, traceProductDetailEntity, toUserCompanyEntity.getId()); + udiTraceService.pushDelayExpireTask(nextNotity); + udiTraceService.pushMq(nextNotity, toUserCompanyEntity.getId()); + } else if (nextNotity.getStatus() == 4) { + //任务超时未处理，重新推送消息 + udiTraceService.pushMq(nextNotity, toUserCompanyEntity.getId()); + } + } else { + log.error("未找到下一家企业"); } + } diff --git a/src/main/java/com/glxp/api/controller/trace/TraceTaskController.java b/src/main/java/com/glxp/api/controller/trace/TraceTaskController.java index 13347bf..df486d3 100644 --- a/src/main/java/com/glxp/api/controller/trace/TraceTaskController.java +++ b/src/main/java/com/glxp/api/controller/trace/TraceTaskController.java @@ -1,15 +1,19 @@ package com.glxp.api.controller.trace; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.basic.BasicUdiProductEntity; import com.glxp.api.entity.trace.TraceTaskNoticeEntity; +import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.trace.TraceDlTaskRequest; import com.glxp.api.req.trace.TraceTaskDetailRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.trace.TraceTaskDlResponse; import com.glxp.api.service.trace.TraceTaskHistoryService; +import com.glxp.api.service.trace.TraceTaskNoticeService; import com.glxp.api.service.trace.TraceTaskService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -17,6 +21,8 @@ import io.swagger.annotations.ApiResponses; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; @@ -38,7 +44,8 @@ public class TraceTaskController { @Resource TraceTaskHistoryService traceTaskHistoryService; - + @Resource + TraceTaskNoticeService traceTaskNoticeService; //任务列表 @ApiOperation(value = "查询任务列表", response = TraceTaskDlResponse.class) @@ -84,4 +91,29 @@ public class TraceTaskController { pageSimpleResponse.setList(traceTaskDlResponses); return ResultVOUtils.success(pageSimpleResponse); } + + //任务列表删除 + @ApiOperation(value = "任务列表删除", response = BaseResponse.class) + @AuthRuleAnnotation("udi/trace/task/delete") + @PostMapping("udi/trace/task/delete") + public BaseResponse deleteTask(@RequestBody DeleteRequest deleteRequest) { + + traceTaskNoticeService.removeById(deleteRequest.getId()); + return ResultVOUtils.success("删除成功！"); + } + + //历史任务列表删除 + @ApiOperation(value = "历史任务列表删除", response = BaseResponse.class) + @AuthRuleAnnotation("udi/trace/task/deleteTaskList") + @PostMapping("udi/trace/task/deleteTaskList") + public BaseResponse deleteTaskList(@RequestBody DeleteRequest deleteRequest) { + + traceTaskHistoryService.removeById(deleteRequest.getId()); + return ResultVOUtils.success("删除成功！"); + } + + + + + } diff --git a/src/main/java/com/glxp/api/controller/trace/UdiTraceController.java b/src/main/java/com/glxp/api/controller/trace/UdiTraceController.java index b02fb3f..a4c61cc 100644 --- a/src/main/java/com/glxp/api/controller/trace/UdiTraceController.java +++ b/src/main/java/com/glxp/api/controller/trace/UdiTraceController.java @@ -290,97 +290,97 @@ public class UdiTraceController extends BaseController { } - /** - * 客户端根据任务上传出入库单据 - * - * @param traceOrderUploadRequest - * @param bindingResult - * @return - */ - @Transactional - @ApiOperation(value = "客户端根据任务上传出入库单据", response = BaseResponse.class) - @AuthRuleAnnotation("udi/trace/order/upload") - @PostMapping("udi/trace/order/upload") - public BaseResponse uploadOrder(@RequestBody TraceOrderUploadRequest traceOrderUploadRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - - TraceTaskNoticeEntity taskNoticeEntity = traceTaskNoticeService.getById(traceOrderUploadRequest.getTaskId()); - if (taskNoticeEntity == null) { - return ResultVOUtils.error(500, "任务已过期，或任务不存在！"); - } - - //清空历史数据 - traceOrderService.deleteByCompanyId(taskNoticeEntity.getProdudctRecordIdFk(), taskNoticeEntity.getCompanyIdFk()); - - TraceOrderEntity traceOrderEntity = new TraceOrderEntity(); - BeanUtils.copyProperties(traceOrderUploadRequest, traceOrderEntity); - traceOrderEntity.setId(IdUtil.getSnowflakeNextId()); - traceOrderEntity.setUpdateTime(new Date()); - traceOrderService.save(traceOrderEntity); - - //设置任务已完成 - taskNoticeEntity.setStatus(3); - traceTaskNoticeService.updateById(taskNoticeEntity); - udiTraceService.pushDelayRemoveTask(taskNoticeEntity); - return ResultVOUtils.success("上传成功"); - } - - - /** - * 客户端根据任务上传生产关联关系信息 - * - * @param traceManuOrderUploadRequest - * @param bindingResult - * @return - */ - @Transactional - @ApiOperation(value = "客户端根据任务上传生产关联关系信息", response = BaseResponse.class) - @AuthRuleAnnotation("udi/trace/manuOrder/upload") - @PostMapping("udi/trace/manuOrder/upload") - public BaseResponse uploadManuOrder(@RequestBody TraceManuOrderUploadRequest traceManuOrderUploadRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - - - TraceTaskNoticeEntity taskNoticeEntity = traceTaskNoticeService.getById(traceManuOrderUploadRequest.getTaskId()); - if (taskNoticeEntity == null) { - return ResultVOUtils.error(500, "任务已过期，或任务不存在！"); - } - - //清除历史数据 - TraceManuOrderEntity originOrder = traceManuOrderService.findByBillNo(traceManuOrderUploadRequest.getBillNo(), taskNoticeEntity.getProdudctRecordIdFk(), taskNoticeEntity.getCompanyIdFk()); - if (originOrder != null) { - traceManuOrderService.removeById(originOrder.getId()); - traceManuCodeRelService.remove(new QueryWrapper().eq("manuOrderIdFk", originOrder.getId())); - } - - //新增生产订单 - TraceManuOrderEntity traceManuOrderEntity = new TraceManuOrderEntity(); - BeanUtils.copyProperties(traceManuOrderUploadRequest, traceManuOrderEntity); - traceManuOrderEntity.setId(IdUtil.getSnowflakeNextId()); - traceManuOrderService.save(traceManuOrderEntity); - - //新增订单关联明细 - List traceManuDetailRequests = traceManuOrderUploadRequest.getDetails(); - if (CollUtil.isNotEmpty(traceManuDetailRequests)) { - for (TraceManuDetailRequest traceManuDetailRequest : traceManuDetailRequests) { - TraceManuCodeRelEntity traceManuCodeRelEntity = new TraceManuCodeRelEntity(); - BeanUtils.copyProperties(traceManuDetailRequest, traceManuCodeRelEntity); - traceManuCodeRelEntity.setId(IdUtil.getSnowflakeNextId()); - traceManuCodeRelEntity.setManuOrderIdFk(traceManuOrderEntity.getId()); - traceManuOrderService.save(traceManuOrderEntity); - } - } - - //设置任务已完成 - taskNoticeEntity.setStatus(3); - traceTaskNoticeService.updateById(taskNoticeEntity); - udiTraceService.pushDelayRemoveTask(taskNoticeEntity); - - return ResultVOUtils.success("上传成功"); - } +// /** +// * 客户端根据任务上传出入库单据 +// * +// * @param traceOrderUploadRequest +// * @param bindingResult +// * @return +// */ +// @Transactional +// @ApiOperation(value = "客户端根据任务上传出入库单据", response = BaseResponse.class) +// @AuthRuleAnnotation("udi/trace/order/upload") +// @PostMapping("udi/trace/order/upload") +// public BaseResponse uploadOrder(@RequestBody TraceOrderUploadRequest traceOrderUploadRequest, BindingResult bindingResult) { +// if (bindingResult.hasErrors()) { +// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); +// } +// +// TraceTaskNoticeEntity taskNoticeEntity = traceTaskNoticeService.getById(traceOrderUploadRequest.getTaskId()); +// if (taskNoticeEntity == null) { +// return ResultVOUtils.error(500, "任务已过期，或任务不存在！"); +// } +// +// //清空历史数据 +// traceOrderService.deleteByCompanyId(taskNoticeEntity.getProdudctRecordIdFk(), taskNoticeEntity.getCompanyIdFk()); +// +// TraceOrderEntity traceOrderEntity = new TraceOrderEntity(); +// BeanUtils.copyProperties(traceOrderUploadRequest, traceOrderEntity); +// traceOrderEntity.setId(IdUtil.getSnowflakeNextId()); +// traceOrderEntity.setUpdateTime(new Date()); +// traceOrderService.save(traceOrderEntity); +// +// //设置任务已完成 +// taskNoticeEntity.setStatus(3); +// traceTaskNoticeService.updateById(taskNoticeEntity); +// udiTraceService.pushDelayRemoveTask(taskNoticeEntity); +// return ResultVOUtils.success("上传成功"); +// } +// +// +// /** +// * 客户端根据任务上传生产关联关系信息 +// * +// * @param traceManuOrderUploadRequest +// * @param bindingResult +// * @return +// */ +// @Transactional +// @ApiOperation(value = "客户端根据任务上传生产关联关系信息", response = BaseResponse.class) +// @AuthRuleAnnotation("udi/trace/manuOrder/upload") +// @PostMapping("udi/trace/manuOrder/upload") +// public BaseResponse uploadManuOrder(@RequestBody TraceManuOrderUploadRequest traceManuOrderUploadRequest, BindingResult bindingResult) { +// if (bindingResult.hasErrors()) { +// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); +// } +// +// +// TraceTaskNoticeEntity taskNoticeEntity = traceTaskNoticeService.getById(traceManuOrderUploadRequest.getTaskId()); +// if (taskNoticeEntity == null) { +// return ResultVOUtils.error(500, "任务已过期，或任务不存在！"); +// } +// +// //清除历史数据 +// TraceManuOrderEntity originOrder = traceManuOrderService.findByBillNo(traceManuOrderUploadRequest.getBillNo(), taskNoticeEntity.getProdudctRecordIdFk(), taskNoticeEntity.getCompanyIdFk()); +// if (originOrder != null) { +// traceManuOrderService.removeById(originOrder.getId()); +// traceManuCodeRelService.remove(new QueryWrapper().eq("manuOrderIdFk", originOrder.getId())); +// } +// +// //新增生产订单 +// TraceManuOrderEntity traceManuOrderEntity = new TraceManuOrderEntity(); +// BeanUtils.copyProperties(traceManuOrderUploadRequest, traceManuOrderEntity); +// traceManuOrderEntity.setId(IdUtil.getSnowflakeNextId()); +// traceManuOrderService.save(traceManuOrderEntity); +// +// //新增订单关联明细 +// List traceManuDetailRequests = traceManuOrderUploadRequest.getDetails(); +// if (CollUtil.isNotEmpty(traceManuDetailRequests)) { +// for (TraceManuDetailRequest traceManuDetailRequest : traceManuDetailRequests) { +// TraceManuCodeRelEntity traceManuCodeRelEntity = new TraceManuCodeRelEntity(); +// BeanUtils.copyProperties(traceManuDetailRequest, traceManuCodeRelEntity); +// traceManuCodeRelEntity.setId(IdUtil.getSnowflakeNextId()); +// traceManuCodeRelEntity.setManuOrderIdFk(traceManuOrderEntity.getId()); +// traceManuOrderService.save(traceManuOrderEntity); +// } +// } +// +// //设置任务已完成 +// taskNoticeEntity.setStatus(3); +// traceTaskNoticeService.updateById(taskNoticeEntity); +// udiTraceService.pushDelayRemoveTask(taskNoticeEntity); +// +// return ResultVOUtils.success("上传成功"); +// } } diff --git a/src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java b/src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java index 4c1ee6b..48fc6f6 100644 --- a/src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java +++ b/src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; -import java.time.LocalDate; import java.util.Date; import io.swagger.annotations.ApiModel; @@ -105,242 +104,13 @@ public class UserCompanyEntity implements Serializable { @TableField(value = "`reason`") private String reason; - - private String customerId; - - private String classes; - - /** - * 地址 - */ - private String area; - - /** - * 详细地址 - */ - private String detailAddr; - - /** - * 应用码x - */ - private String appId; - - /** - * 授权码x - */ - private String appSecret; - - /** - * 联系人 - */ - private String contacts; - - /** - * 联系电话 - */ - private String mobile; - - /** - * 电话 - */ - private String tel; - - /** - * 邮箱 - */ - private String email; - - private String areaCode; - - /** - * 企业唯一标识x - */ - private String refEntId; - - /** - * 企业IDx - */ - private String entId; - - /** - * 入网标识【0非入网1入网2入驻马上放心】x - */ - private Integer networkType; - - /** - * 绑定appkey外键IDx - */ - private Integer certIdFk; - - /** - * 所属总部x - */ - private String parentCompany; - - /** - * 所属总部Idx - */ - private String parentIdFk; - - /** - * 法人证件类型：1：身份证 - */ - private String contactsPapersType; - - /** - * 法人证件号码 - */ - private String contactsPapersCode; - - /** - * 登记状态：1：续存（在营，开业，在册），2：吊销，3：注销，4：迁出 - */ - private String registerStatus; - - /** - * 经营许可证号（Ⅲ类） - */ - private String jyxkzh; - - /** - * 经营许可证发证机关 - */ - private String jyxkzfzjg; - - /** - * 经营许可证有效期至 - */ - private LocalDate jyxkzyxq; - /** - * 经营备案凭证号（Ⅱ类） + * 在线状态 1：在线；2：离线 */ - private String jybapzh; - - /** - * 经营备案部门 - */ - private String jybabm; - - /** - * 发证日期 - */ - @TableField("fzrq") - private Date fzrq; - - /** - * 税号 - */ - private String suihao; - - /** - * 开户行 - */ - private String kaihuhang; - - /** - * 开户账号 - */ - private String kaihuzhanghao; - - /** - * 审核状态 0：草稿，4：申请变更，3：允许变更，5：拒绝变更，6：未审核，1：通过，2：不通过 - */ - private Integer auditStatus; - - /** - * 文件路径 - */ - private String filePath; - - /** - * 文件路径 - */ - private String filePath2; - - /** - * 文件路径 - */ - private String filePath3; - - /** - * 文件路径 - */ - private String filePath4; - - /** - * 往来单位外键 - */ - private String unitIdFk; - - /** - * 创建人 - */ - private String createBy; - - /** - * 审核时间 - */ - private Date auditTime; - - /** - * 审核意见 - */ - private String auditComment; - - /** - * 保存状态（1.草稿保存，2.已提交保存) - */ - - private Integer editStatus; - - - - /** - * 备注 - */ - - private String remark; - - /** - * 创建人 - */ - - private String createUser; - - /** - * 创建时间 - */ - - private Date createTime; - - /** - * 更新人 - */ - - private String updateUser; - - /** - * 更新时间 - */ - - private Date updateTime; - - - private String auditor; - - - private String roleId; - - + @ApiModelProperty(value = "在线状态 1：在线；2：离线") @TableField(exist = false) - private String failCout; - @TableField(exist = false) - private String passCout; - @TableField(exist = false) - private String productFailCout; - @TableField(exist = false) - private String prouctPassCout; + private Integer onLineStatus; private static final long serialVersionUID = 1L; } + diff --git a/src/main/java/com/glxp/api/entity/trace/TraceTaskNoticeEntity.java b/src/main/java/com/glxp/api/entity/trace/TraceTaskNoticeEntity.java index 01bd866..8b4cdab 100644 --- a/src/main/java/com/glxp/api/entity/trace/TraceTaskNoticeEntity.java +++ b/src/main/java/com/glxp/api/entity/trace/TraceTaskNoticeEntity.java @@ -19,7 +19,7 @@ import lombok.Data; */ @Data @ApiModel("任务公告表") -@TableName(value = "trace_task_notice") +@TableName(value = "trace_task_notice", autoResultMap = true) public class TraceTaskNoticeEntity implements Serializable { @ApiModelProperty(value = "主键") @TableId(value = "id", type = IdType.INPUT) @@ -53,20 +53,20 @@ public class TraceTaskNoticeEntity implements Serializable { @TableField(value = "companyIdFk") private Long companyIdFk; + /** + * 注册企业统一社会信用号 + */ + @ApiModelProperty(value = "注册企业统一社会信用号") + @TableField(value = "creditNum") + private String creditNum; + /** * 医疗器械注册人 - * */ @ApiModelProperty(value = "医疗器械注册人") @TableField(value = "ylqxzcrbarmc") private String ylqxzcrbarmc; - /** - * 医疗器械注册人统一社会信用号 - */ - @ApiModelProperty(value = "医疗器械注册人统一社会信用号") - @TableField(value = "creditNum") - private String creditNum; /** * 产品名称 diff --git a/src/main/java/com/glxp/api/res/trace/TraceTaskDlResponse.java b/src/main/java/com/glxp/api/res/trace/TraceTaskDlResponse.java index e19c3fd..b0a8487 100644 --- a/src/main/java/com/glxp/api/res/trace/TraceTaskDlResponse.java +++ b/src/main/java/com/glxp/api/res/trace/TraceTaskDlResponse.java @@ -110,5 +110,6 @@ public class TraceTaskDlResponse { @ApiModelProperty(value = "任务更新时间") private Date updateTime; + private String companyName; } diff --git a/src/main/java/com/glxp/api/service/trace/TraceTaskHistoryService.java b/src/main/java/com/glxp/api/service/trace/TraceTaskHistoryService.java index b7d8207..a89d5e7 100644 --- a/src/main/java/com/glxp/api/service/trace/TraceTaskHistoryService.java +++ b/src/main/java/com/glxp/api/service/trace/TraceTaskHistoryService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.trace; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.trace.TraceTaskNoticeMapper; import com.glxp.api.req.trace.TraceTaskDetailRequest; @@ -28,4 +29,6 @@ public class TraceTaskHistoryService extends ServiceImpl diff --git a/src/main/resources/mybatis/mapper/trace/TraceTaskNoticeMapper.xml b/src/main/resources/mybatis/mapper/trace/TraceTaskNoticeMapper.xml index c2d9480..19a49b6 100644 --- a/src/main/resources/mybatis/mapper/trace/TraceTaskNoticeMapper.xml +++ b/src/main/resources/mybatis/mapper/trace/TraceTaskNoticeMapper.xml @@ -1,29 +1,35 @@ + + + +