commandType
This commit is contained in:
parent
1dc7badb4d
commit
437490f293
2 changed files with 66 additions and 5 deletions
|
|
@ -266,6 +266,7 @@ export class CommandController extends Controller {
|
|||
|
||||
const [commands, total] = await this.commandRepository
|
||||
.createQueryBuilder("command")
|
||||
.leftJoinAndSelect("command.commandType", "commandType")
|
||||
.andWhere(
|
||||
new Brackets((qb) => {
|
||||
qb.orWhere(
|
||||
|
|
@ -343,6 +344,7 @@ export class CommandController extends Controller {
|
|||
commandYear: _data.commandYear,
|
||||
commandAffectDate: _data.commandAffectDate,
|
||||
commandExcecuteDate: _data.commandExcecuteDate,
|
||||
commandType: _data.commandType ? _data.commandType.code : null,
|
||||
assignFullName: null, //xxxxxxxxxxxxxxx
|
||||
createdFullName: _data.createdFullName,
|
||||
status: _data.status,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue