Commit 7a245959 authored by wujiang's avatar wujiang

提交整改单回显

parent 2bc1b34a
...@@ -97,7 +97,12 @@ public class HygfRectificationOrder extends BaseEntity { ...@@ -97,7 +97,12 @@ public class HygfRectificationOrder extends BaseEntity {
*/ */
@TableField("rectification_source") @TableField("rectification_source")
private String rectificationSource; private String rectificationSource;
/**
* 整改来源
*/
@TableField(exist = false)
private String rectificationSourceName;
/** /**
* 整改历史意见 * 整改历史意见
......
...@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.controller; ...@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.hygf.api.Enum.RectificationOrderEnum; import com.yeejoin.amos.boot.module.hygf.api.Enum.RectificationOrderEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.RectificationRoleEnum;
import com.yeejoin.amos.boot.module.hygf.api.entity.HygfRectificationOrder; import com.yeejoin.amos.boot.module.hygf.api.entity.HygfRectificationOrder;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -106,8 +107,11 @@ public class HygfRectificationOrderController extends BaseController { ...@@ -106,8 +107,11 @@ public class HygfRectificationOrderController extends BaseController {
@GetMapping(value = "/{sequenceNbr}") @GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个审核单", notes = "根据sequenceNbr查询单个审核单") @ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个审核单", notes = "根据sequenceNbr查询单个审核单")
public ResponseModel<HygfRectificationOrder> selectOne(@PathVariable Long sequenceNbr) { public ResponseModel<HygfRectificationOrder> selectOne(@PathVariable Long sequenceNbr) {
HygfRectificationOrder hygfRectificationOrder = hygfRectificationOrderServiceImpl.getBaseMapper().selectById(sequenceNbr);
return ResponseHelper.buildResponse(hygfRectificationOrderServiceImpl.getBaseMapper().selectById(sequenceNbr));
RectificationRoleEnum enums = RectificationRoleEnum.getNodeByName(hygfRectificationOrder.getRectificationSource());
hygfRectificationOrder.setRectificationSourceName(enums!=null?enums.name():null);
return ResponseHelper.buildResponse(hygfRectificationOrder);
} }
/** /**
......
...@@ -2,9 +2,9 @@ exception.debug=true ...@@ -2,9 +2,9 @@ exception.debug=true
## DB properties: ## DB properties:
spring.datasource.dynamic.primary= mysql-service spring.datasource.dynamic.primary= mysql-service
spring.datasource.mysql-service.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.mysql-service.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.mysql-service.jdbc-url=jdbc:mysql://47.92.234.253:3306/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8 spring.datasource.mysql-service.jdbc-url=jdbc:mysql://47.92.234.253:13306/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.mysql-service.username=root spring.datasource.mysql-service.username=root
spring.datasource.mysql-service.password=Yeejoin@2020 spring.datasource.mysql-service.password=Yeejoin_1234
spring.datasource.mysql-service.type=com.zaxxer.hikari.HikariDataSource spring.datasource.mysql-service.type=com.zaxxer.hikari.HikariDataSource
#最小连接 #最小连接
spring.datasource.mysql-service.minimum-idle: 5 spring.datasource.mysql-service.minimum-idle: 5
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment