Commit ca8fdf0f by “zcwang”

modify: 工单查询工单id非必传

parent f4c06b2b
...@@ -70,14 +70,13 @@ CREATE TABLE `TB_YX_QC_CHANGE_RECORD` ...@@ -70,14 +70,13 @@ CREATE TABLE `TB_YX_QC_CHANGE_RECORD`
`change_result_desc` varchar(550) NOT NULL DEFAULT '' COMMENT '结论说明', `change_result_desc` varchar(550) NOT NULL DEFAULT '' COMMENT '结论说明',
`remark` varchar(550) NOT NULL DEFAULT '' COMMENT '备注', `remark` varchar(550) NOT NULL DEFAULT '' COMMENT '备注',
`creator` varchar(50) NOT NULL DEFAULT '' COMMENT '创建人邮箱', `creator` varchar(50) NOT NULL DEFAULT '' COMMENT '创建人邮箱',
`todo_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '待办id',
`auto_submit_email` int(2) NOT NULL DEFAULT '0' COMMENT '自动提交发送邮件', `auto_submit_email` int(2) NOT NULL DEFAULT '0' COMMENT '自动提交发送邮件',
`create_time` bigint(20) NOT NULL DEFAULT '0' COMMENT '创建时间', `create_time` bigint(20) NOT NULL DEFAULT '0' COMMENT '创建时间',
`update_time` bigint(20) NOT NULL DEFAULT '0' COMMENT '更新时间', `update_time` bigint(20) NOT NULL DEFAULT '0' COMMENT '更新时间',
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
KEY `key_flow_id` (`flow_id`) USING BTREE COMMENT '变更工单id普通索引', KEY `key_flow_id` (`flow_id`) USING BTREE COMMENT '变更工单id普通索引',
KEY `key_email` (`auto_submit_email`) KEY `key_email` (`auto_submit_email`)
) ENGINE=InnoDB AUTO_INCREMENT=194 DEFAULT CHARSET=utf8 COMMENT='变更工单记录表' ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='变更工单记录表'
CREATE TABLE `TB_YX_QC_CHANGE_FILE` CREATE TABLE `TB_YX_QC_CHANGE_FILE`
( (
......
...@@ -1140,7 +1140,10 @@ public class ChangeFlowBiz { ...@@ -1140,7 +1140,10 @@ public class ChangeFlowBiz {
} }
changeFlowVO.setChangeSupplier(c.getChangeSupplier()); changeFlowVO.setChangeSupplier(c.getChangeSupplier());
changeFlowVO.setChangeState(c.getState() == 3 ? ChangeStatusEnum.IN.getStatus() : c.getState()); changeFlowVO.setChangeState(c.getState() == 3 ? ChangeStatusEnum.IN.getStatus() : c.getState());
changeFlowVO.setChangeCreator(c.getCreator()); // 同舟端展示供应商id
changeFlowVO.setChangeCreator(
CreateSourceEnum.TONG_ZHOU.getType().equals(c.getCreateSource()) ? c.getCreateSupplier()
: c.getCreator());
String participateChangeExecDepartment = c.getParticipateChangeExecDepartment(); String participateChangeExecDepartment = c.getParticipateChangeExecDepartment();
if (StringUtils.isNotBlank(participateChangeExecDepartment)) { if (StringUtils.isNotBlank(participateChangeExecDepartment)) {
changeFlowVO.setExecDepartmentStrList(JSON.parseArray(participateChangeExecDepartment, String.class)); changeFlowVO.setExecDepartmentStrList(JSON.parseArray(participateChangeExecDepartment, String.class));
......
...@@ -92,7 +92,7 @@ public class ChangeFlowController { ...@@ -92,7 +92,7 @@ public class ChangeFlowController {
@RequestParam(name = "changeExecDepartment", required = false) String changeExecDepartment, @RequestParam(name = "changeExecDepartment", required = false) String changeExecDepartment,
@RequestParam(name = "startTime", required = false) Long startTime, @RequestParam(name = "startTime", required = false) Long startTime,
@RequestParam(name = "endTime", required = false) Long endTime, @RequestParam(name = "endTime", required = false) Long endTime,
@RequestParam(name = "flowId") Long flowId) { @RequestParam(name = "flowId", required = false) Long flowId) {
ChangeFlowListQueryReq changeFlowListQueryReq = new ChangeFlowListQueryReq(); ChangeFlowListQueryReq changeFlowListQueryReq = new ChangeFlowListQueryReq();
changeFlowListQueryReq.setItemId(itemId); changeFlowListQueryReq.setItemId(itemId);
changeFlowListQueryReq.setSupplier(supplier); changeFlowListQueryReq.setSupplier(supplier);
......
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