diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsMaintInstance.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsMaintInstance.java index 98053f3..e9c2f9f 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsMaintInstance.java +++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsMaintInstance.java @@ -28,10 +28,6 @@ public class DmsBillsMaintInstance extends DmsBaseEntity @Excel(name = "保养计划ID,关联dms_plan_maint的plan_maint_id") private Long planMaintId; - /** 工单流程ID，关联wf_process的wf_process_id - 已废弃审批流功能 */ - // @Excel(name = "工单流程ID，关联wf_process的wf_process_id") - // private Long wfProcessId; - /** 保养单号 */ @Excel(name = "保养单号") private String billsMaintCode; @@ -145,16 +141,6 @@ public class DmsBillsMaintInstance extends DmsBaseEntity { return planMaintId; } - // 已废弃审批流功能 - // public void setWfProcessId(Long wfProcessId) - // { - // this.wfProcessId = wfProcessId; - // } - - // public Long getWfProcessId() - // { - // return wfProcessId; - // } public void setBillsMaintCode(String billsMaintCode) { this.billsMaintCode = billsMaintCode; @@ -249,7 +235,6 @@ public class DmsBillsMaintInstance extends DmsBaseEntity return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("maintInstanceId", getMaintInstanceId()) .append("planMaintId", getPlanMaintId()) - // .append("wfProcessId", getWfProcessId()) // 已废弃审批流 .append("billsMaintCode", getBillsMaintCode()) .append("planBeginTime", getPlanBeginTime()) .append("realBeginTime", getRealBeginTime()) diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsMaintInstanceActivity.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsMaintInstanceActivity.java index d16ec4b..c70f56d 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsMaintInstanceActivity.java +++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsMaintInstanceActivity.java @@ -26,10 +26,6 @@ public class DmsMaintInstanceActivity extends DmsBaseEntity @Excel(name = "保养工单实例ID，关联dms_bills_maint_instance的maint_instance_id") private Long maintInstanceId; - /** 工单流程节点ID（关联wf_process_activity的process_activity_id） */ - @Excel(name = "工单流程节点ID", readConverterExp = "关=联wf_process_activity的process_activity_id") - private Long processActivityId; - /** 保养级别：1-日常保养；2-月度保养；3-年度保养;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的 */ @Excel(name = "保养级别：1-日常保养；2-月度保养；3-年度保养;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的") private Long maintLevel; @@ -121,15 +117,6 @@ public class DmsMaintInstanceActivity extends DmsBaseEntity { return maintInstanceId; } - public void setProcessActivityId(Long processActivityId) - { - this.processActivityId = processActivityId; - } - - public Long getProcessActivityId() - { - return processActivityId; - } public void setMaintLevel(Long maintLevel) { this.maintLevel = maintLevel; @@ -253,7 +240,6 @@ public class DmsMaintInstanceActivity extends DmsBaseEntity return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("instanceActivityId", getInstanceActivityId()) .append("maintInstanceId", getMaintInstanceId()) - .append("processActivityId", getProcessActivityId()) .append("maintLevel", getMaintLevel()) .append("maintGroup", getMaintGroup()) .append("maintSupervisor", getMaintSupervisor()) diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java index 699c653..9512601 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java +++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java @@ -101,6 +101,7 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS dmsBillsMaintInstance.setMaintGroup(dmsPlanMaint.getMaintGroup()); dmsBillsMaintInstance.setMaintSupervisor(dmsPlanMaint.getMaintSupervisor()); dmsBillsMaintInstance.setMaintLevel(dmsPlanMaint.getMaintLevel()); + dmsBillsMaintInstance.setRemark(dmsPlanMaint.getRemark()); Date lubeTime = dmsPlanMaint.getMaintTime(); Long timeLimit = dmsPlanMaint.getTimeLimit(); @@ -111,6 +112,10 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS int i = dmsBillsMaintInstanceMapper.insertDmsBillsMaintInstance(dmsBillsMaintInstance); DmsMaintInstanceActivity dmsMaintInstanceActivity = new DmsMaintInstanceActivity(); dmsMaintInstanceActivity.setMaintInstanceId(dmsBillsMaintInstance.getMaintInstanceId()); + dmsMaintInstanceActivity.setMaintGroup(dmsBillsMaintInstance.getMaintGroup()); + dmsMaintInstanceActivity.setMaintLevel(dmsBillsMaintInstance.getMaintLevel()); + dmsMaintInstanceActivity.setMaintSupervisor(dmsBillsMaintInstance.getMaintSupervisor()); + dmsMaintInstanceActivity.setRemark(dmsBillsMaintInstance.getRemark()); dmsMaintInstanceActivity.setProcessStepOrder(1L); int i1 = dmsMaintInstanceActivityMapper.insertDmsMaintInstanceActivity(dmsMaintInstanceActivity); batchInsertDmsBillsMaintDetail(dmsPlanMaint, dmsBillsMaintInstance.getMaintInstanceId()); @@ -201,6 +206,7 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS dmsMaintInstanceActivity.setMaintGroup(dmsBillsMaintInstance.getMaintGroup()); dmsMaintInstanceActivity.setMaintLevel(dmsBillsMaintInstance.getMaintLevel()); dmsMaintInstanceActivity.setMaintSupervisor(dmsBillsMaintInstance.getMaintSupervisor()); + dmsMaintInstanceActivity.setRemark(dmsBillsMaintInstance.getRemark()); dmsMaintInstanceActivity.setProcessStepOrder(1l); dmsMaintInstanceActivity.setProcessHandleStatus("1"); dmsMaintInstanceActivityMapper.insertDmsMaintInstanceActivity(dmsMaintInstanceActivity); @@ -473,6 +479,7 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS instance.setMaintGroup(dmsPlanMaint.getMaintGroup()); instance.setMaintSupervisor(dmsPlanMaint.getMaintSupervisor()); instance.setMaintLevel(dmsPlanMaint.getMaintLevel()); + instance.setRemark(dmsPlanMaint.getRemark()); instance.setIsFlag(1L); // 创建人优先使用计划的创建人，若无则使用-1L表示系统自动创建 instance.setCreateBy(dmsPlanMaint.getCreateBy() != null ? dmsPlanMaint.getCreateBy() : -1L); @@ -496,6 +503,10 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS // 创建工单实例节点（第一步） DmsMaintInstanceActivity activity = new DmsMaintInstanceActivity(); activity.setMaintInstanceId(instance.getMaintInstanceId()); + activity.setMaintGroup(instance.getMaintGroup()); + activity.setMaintLevel(instance.getMaintLevel()); + activity.setMaintSupervisor(instance.getMaintSupervisor()); + activity.setRemark(instance.getRemark()); activity.setProcessStepOrder(1L); activity.setProcessHandleStatus("3"); // 已完成 dmsMaintInstanceActivityMapper.insertDmsMaintInstanceActivity(activity); diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBaseStationProjectMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBaseStationProjectMapper.xml index 85270d4..2fae56f 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsBaseStationProjectMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsBaseStationProjectMapper.xml @@ -31,9 +31,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and dbsp.maint_station_id = #{maintStationId} and dbsp.maint_project_id = #{maintProjectId} - and dbmp.maint_project_name like concat('%', #{maintProjectName}, '%') - and dbms.maint_station_name like concat('%', #{maintStationName}, '%') - and dbms.maint_station_code like concat('%', #{maintStationCode}, '%') + and dbmp.maint_project_name like '%' || #{maintProjectName} || '%' + and dbms.maint_station_name like '%' || #{maintStationName} || '%' + and dbms.maint_station_code like '%' || #{maintStationCode} || '%' @@ -64,7 +64,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update dms_base_station_project maint_project_id = #{maintProjectId}, - maint_project_name = #{maintProjectName}, where maint_station_id = #{maintStationId} @@ -93,11 +92,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into dms_base_station_project(maint_station_id,maint_project_id) - values - - (#{item.maintStationId},#{item.maintProjectId}) - + insert all + + into dms_base_station_project(maint_station_id, maint_project_id) + values (#{item.maintStationId}, #{item.maintProjectId}) + + select 1 from dual - \ No newline at end of file + diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintDetailMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintDetailMapper.xml index d778904..b9c5912 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintDetailMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintDetailMapper.xml @@ -12,7 +12,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -39,7 +38,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" maint_standard_id, operation_description, maint_status, - is_flag, remark, create_by, create_time, @@ -59,7 +57,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and maint_standard_id = #{maintStandardId} and operation_description = #{operationDescription} and maint_status = #{maintStatus} - and is_flag = #{isFlag} @@ -81,7 +78,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" maint_standard_id, operation_description, maint_status, - is_flag, remark, create_by, create_time, @@ -98,7 +94,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{maintStandardId}, #{operationDescription}, #{maintStatus}, - #{isFlag}, #{remark}, #{createBy}, #{createTime}, @@ -118,7 +113,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" maint_standard_id = #{maintStandardId}, operation_description = #{operationDescription}, maint_status = #{maintStatus}, - is_flag = #{isFlag}, remark = #{remark}, create_by = #{createBy}, create_time = #{createTime}, @@ -188,7 +182,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" maint_standard_id, operation_description, maint_status, - is_flag, remark, create_by, create_time, diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintDetailProjectMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintDetailProjectMapper.xml index d1d2ce8..46d4d78 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintDetailProjectMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintDetailProjectMapper.xml @@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bills_maint_detail_id = #{billsMaintDetailId} and maint_project_id = #{maintProjectId} - and maint_project_name like concat('%', #{maintProjectName}, '%') + and maint_project_name like '%' || #{maintProjectName} || '%' and maint_project_desc = #{maintProjectDesc} and maint_project_status = #{maintProjectStatus} @@ -98,4 +98,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{maintDetailProjectId} - \ No newline at end of file + diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml index d08ee7f..fc439d3 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml @@ -7,8 +7,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - @@ -32,22 +30,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select a.maint_instance_id, a.plan_maint_id, - -- a.wf_process_id, -- 已废弃审批流 a.bills_maint_code, + a.maint_group, + a.maint_supervisor, + a.maint_level, a.plan_begin_time, a.real_begin_time, a.plan_end_time, a.real_end_time, a.maint_status, a.maint_comp_rate, + a.remark, a.create_by, a.create_time, a.update_by, - a.update_time, - b.maint_supervisor, - b.remark + a.update_time from - dms_bills_maint_instance a left join dms_plan_maint b on a.plan_maint_id = b.plan_maint_id + dms_bills_maint_instance a - select - dbmi.maint_instance_id, - dbmi.plan_maint_id, - -- dbmi.wf_process_id, -- 已废弃审批流 - dbmi.bills_maint_code, - dbmi.plan_begin_time, - dbmi.real_begin_time, - dbmi.plan_end_time, - dbmi.real_end_time, - dbmi.maint_status, - dbmi.maint_comp_rate, - dbmi.create_by, - dbmi.create_time, - a.maint_level, - a.maint_group, - a.maint_supervisor - from - dms_bills_maint_instance dbmi left join dms_plan_maint a on dbmi.plan_maint_id = a.plan_maint_id - - - and dbmi.maint_status in (${maintStatusStr}) - - order by dbmi.create_time desc limit 1 + select * from ( + select + dbmi.maint_instance_id, + dbmi.plan_maint_id, + dbmi.bills_maint_code, + dbmi.maint_group, + dbmi.maint_supervisor, + dbmi.maint_level, + dbmi.plan_begin_time, + dbmi.real_begin_time, + dbmi.plan_end_time, + dbmi.real_end_time, + dbmi.maint_status, + dbmi.maint_comp_rate, + dbmi.remark, + dbmi.create_by, + dbmi.create_time, + dbmi.update_by, + dbmi.update_time + from + dms_bills_maint_instance dbmi + + and dbmi.maint_status in (${maintStatusStr}) + + order by dbmi.create_time desc + ) where rownum = 1 diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsMaintInstanceActivityMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsMaintInstanceActivityMapper.xml index 422de16..20a7990 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsMaintInstanceActivityMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsMaintInstanceActivityMapper.xml @@ -7,7 +7,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -27,14 +26,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select instance_activity_id, maint_instance_id, process_activity_id, maint_level, maint_group, maint_supervisor, process_handle_resolution, remark, process_handle_status, process_step_order, start_time, end_time, handle_user_id, handle_by, handle_time, create_by, create_time, transfer_user_id, attr1 from dms_maint_instance_activity + select instance_activity_id, maint_instance_id, maint_level, maint_group, maint_supervisor, process_handle_resolution, remark, process_handle_status, process_step_order, start_time, end_time, handle_user_id, handle_by, handle_time, create_by, create_time, transfer_user_id, attr1 from dms_maint_instance_activity