Commit c6e8a7ce authored by 韩桐桐's avatar 韩桐桐

feat(设备注销):下一节点可执行人

parent 19269446
...@@ -112,4 +112,7 @@ public class JgScrapCancelDto extends BaseDto { ...@@ -112,4 +112,7 @@ public class JgScrapCancelDto extends BaseDto {
*/ */
private String record; private String record;
@ApiModelProperty(value = "下一节点可执行人")
private String nextExecuteUserIds;
} }
...@@ -142,4 +142,10 @@ public class JgScrapCancel extends BaseEntity { ...@@ -142,4 +142,10 @@ public class JgScrapCancel extends BaseEntity {
@TableField("supervisory_code") @TableField("supervisory_code")
private String supervisoryCode; private String supervisoryCode;
/**
* 下一节点可执行人
*/
@TableField("next_execute_user_ids")
private String nextExecuteUserIds;
} }
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
<mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgScrapCancelMapper"> <mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgScrapCancelMapper">
<update id="updatePromoter"> <update id="updatePromoter">
UPDATE tzs_jg_scrap_cancel set promoter = null UPDATE tzs_jg_scrap_cancel
set promoter = null
where sequence_nbr = #{id} where sequence_nbr = #{id}
</update> </update>
...@@ -24,12 +25,15 @@ ...@@ -24,12 +25,15 @@
ur.remark, ur.remark,
ur.instance_status as instanceStatus, ur.instance_status as instanceStatus,
ur.promoter, ur.promoter,
ur.next_execute_user_ids as nextExecuteUserIds,
ur.supervisory_code as supervisoryCode,
ur.next_task_id as nextTaskId,
ifnull(ur.next_execute_ids,'') as nextExecuteIds, ifnull(ur.next_execute_ids,'') as nextExecuteIds,
DATE_FORMAT(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate, DATE_FORMAT(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
use.USE_UNIT_CREDIT_CODE as useUnitCreditCode, use.USE_UNIT_CREDIT_CODE as useUnitCreditCode,
ur.use_unit_name as useUnitName, ur.use_unit_name as useUnitName,
ur.use_unit_code as useUnitCode, ur.use_unit_code as useUnitCode,
(SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory, (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
jri.EQU_DEFINE as equDefine, jri.EQU_DEFINE as equDefine,
jri.PRODUCT_NAME as productName, jri.PRODUCT_NAME as productName,
jri.EQU_CODE as equCode, jri.EQU_CODE as equCode,
...@@ -38,14 +42,14 @@ ...@@ -38,14 +42,14 @@
CONCAT(use.PROVINCE_NAME,'', use.CITY_NAME, '', use.COUNTY_NAME, '', use.street_name, use.ADDRESS, '') AS place, CONCAT(use.PROVINCE_NAME,'', use.CITY_NAME, '', use.COUNTY_NAME, '', use.street_name, use.ADDRESS, '') AS place,
re.equ_id as equipId re.equ_id as equipId
from tzs_jg_scrap_cancel ur from tzs_jg_scrap_cancel ur
LEFT JOIN tzs_jg_scrap_cancel_eq re on ur.sequence_nbr = re.equip_transfer_id LEFT JOIN tzs_jg_scrap_cancel_eq re on ur.sequence_nbr = re.equip_transfer_id
LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD
LEFT JOIN idx_biz_jg_use_info use on re.equ_id = use.RECORD LEFT JOIN idx_biz_jg_use_info use on re.equ_id = use.RECORD
<where> <where>
and ur.is_delete = 0 and ur.is_delete = 0
<!-- <if test="dto.equCategory != null and dto.equCategory != ''">--> <!-- <if test="dto.equCategory != null and dto.equCategory != ''">-->
<!-- and jri.EQU_CATEGORY = #{dto.equCategory}--> <!-- and jri.EQU_CATEGORY = #{dto.equCategory}-->
<!-- </if>--> <!-- </if>-->
<if test="dto.auditStatus != null and dto.auditStatus != ''"> <if test="dto.auditStatus != null and dto.auditStatus != ''">
and ur.audit_status = #{dto.auditStatus} and ur.audit_status = #{dto.auditStatus}
</if> </if>
...@@ -53,7 +57,7 @@ ...@@ -53,7 +57,7 @@
and ur.apply_no like concat('%',#{dto.applyNo},'%') and ur.apply_no like concat('%',#{dto.applyNo},'%')
</if> </if>
<if test="dto.cancelType != null and dto.cancelType != ''"> <if test="dto.cancelType != null and dto.cancelType != ''">
and ur.cancel_type = #{dto.cancelType} and ur.cancel_type = #{dto.cancelType}
</if> </if>
<if test="roleIds != null and dto.type == 'supervision'"> <if test="roleIds != null and dto.type == 'supervision'">
...@@ -67,31 +71,31 @@ ...@@ -67,31 +71,31 @@
<if test="dto.type == 'enterprise' "> <if test="dto.type == 'enterprise' ">
and ur.use_unit_code = #{orgCode} and ur.use_unit_code = #{orgCode}
</if> </if>
<!-- <if test="dto.type == 'enterprise'">--> <!-- <if test="dto.type == 'enterprise'">-->
<!-- AND use.USE_UNIT_CREDIT_CODE = #{orgCode}--> <!-- AND use.USE_UNIT_CREDIT_CODE = #{orgCode}-->
<!-- </if>--> <!-- </if>-->
</where> </where>
order by ur.rec_date desc order by ur.rec_date desc
</select> </select>
<select id="getDetail" resultType="java.util.Map"> <select id="getDetail" resultType="java.util.Map">
SELECT jri.EQU_CODE as equCode, SELECT jri.EQU_CODE as equCode,
-- (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory, -- (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
-- (SELECT name from tz_equipment_category where code = jri.EQU_LIST) as equList, -- (SELECT name from tz_equipment_category where code = jri.EQU_LIST) as equList,
-- (SELECT name from tz_equipment_category where code = jri.EQU_DEFINE) as equDefine, -- (SELECT name from tz_equipment_category where code = jri.EQU_DEFINE) as equDefine,
jri.EQU_CATEGORY as equCategory, jri.EQU_CATEGORY as equCategory,
jri.EQU_LIST as equList, jri.EQU_LIST as equList,
jri.EQU_DEFINE as equDefine, jri.EQU_DEFINE as equDefine,
jri.PRODUCT_NAME as productName, jri.PRODUCT_NAME as productName,
jri.EQU_TYPE as equType, jri.EQU_TYPE as equType,
jri.PRODUCT_PHOTO as proDuctPhoto, jri.PRODUCT_PHOTO as proDuctPhoto,
jfi.FACTORY_NUM as factoryNum, jfi.FACTORY_NUM as factoryNum,
jfi.PRODUCE_UNIT_NAME as produceUnitName, jfi.PRODUCE_UNIT_NAME as produceUnitName,
jfi.PRODUCE_DATE as produceDate, jfi.PRODUCE_DATE as produceDate,
jfi.FACTORY_STANDARD as factoryStandard, jfi.FACTORY_STANDARD as factoryStandard,
jfi.PRODUCT_QUALITY_YIELD_PROVE as productQualityYieldProve, jfi.PRODUCT_QUALITY_YIELD_PROVE as productQualityYieldProve,
jfi.INS_USE_MAINTAIN_EXPLAIN as insUseMaintainExplanin, jfi.INS_USE_MAINTAIN_EXPLAIN as insUseMaintainExplanin,
jci.USC_UNIT_NAME as uscUnitName, jci.USC_UNIT_NAME as uscUnitName,
jci.USC_UNIT_CREDIT_CODE as uscUnitCreditCode jci.USC_UNIT_CREDIT_CODE as uscUnitCreditCode
from idx_biz_jg_register_info jri from idx_biz_jg_register_info jri
LEFT JOIN idx_biz_jg_factory_info jfi on jri.RECORD = jfi.RECORD LEFT JOIN idx_biz_jg_factory_info jfi on jri.RECORD = jfi.RECORD
...@@ -99,7 +103,6 @@ ...@@ -99,7 +103,6 @@
where jri.RECORD = #{id} where jri.RECORD = #{id}
</select> </select>
<select id="getInspectDetail" resultType="java.util.Map"> <select id="getInspectDetail" resultType="java.util.Map">
SELECT INSPECT_TYPE as inspectType, SELECT INSPECT_TYPE as inspectType,
...@@ -111,27 +114,29 @@ ...@@ -111,27 +114,29 @@
INSPECT_REPORT as inspectReport INSPECT_REPORT as inspectReport
from idx_biz_jg_inspection_detection_info from idx_biz_jg_inspection_detection_info
where RECORD = #{id} where RECORD = #{id}
ORDER BY INSPECT_DATE desc LIMIT 1 ORDER BY INSPECT_DATE desc
LIMIT 1
</select> </select>
<select id="getUseDetail" resultType="java.util.Map"> <select id="getUseDetail" resultType="java.util.Map">
SELECT USE_UNIT_NAME as useUnitName, SELECT USE_UNIT_NAME as useUnitName,
USE_UNIT_CREDIT_CODE as useUnitCreditCode, USE_UNIT_CREDIT_CODE as useUnitCreditCode,
USE_PLACE as usePlace, USE_PLACE as usePlace,
SAFETY_MANAGER as safetyManager, SAFETY_MANAGER as safetyManager,
PHONE as phone, PHONE as phone,
ESTATE_UNIT_NAME as estateUnitName, ESTATE_UNIT_NAME as estateUnitName,
ESTATE_UNIT_CREDIT_CODE as estateUnitCreditCode, ESTATE_UNIT_CREDIT_CODE as estateUnitCreditCode,
ADDRESS as address, ADDRESS as address,
PROVINCE as province, PROVINCE as province,
CITY as city, CITY as city,
COUNTY as county, COUNTY as county,
USE_INNER_CODE as useInnerCode USE_INNER_CODE as useInnerCode
FROM "idx_biz_jg_use_info" where RECORD = #{id} FROM "idx_biz_jg_use_info"
where RECORD = #{id}
</select> </select>
<select id="getEquipListPage" resultType="java.util.Map"> <select id="getEquipListPage" resultType="java.util.Map">
SELECT jri.EQU_CODE as equCode, SELECT jri.EQU_CODE as equCode,
jri.RECORD as id, jri.RECORD as id,
(SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory, (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
(SELECT name from tz_equipment_category where code = jri.EQU_LIST) as equList, (SELECT name from tz_equipment_category where code = jri.EQU_LIST) as equList,
jfi.FACTORY_NUM as factoryNum, jfi.FACTORY_NUM as factoryNum,
...@@ -155,65 +160,62 @@ ...@@ -155,65 +160,62 @@
</select> </select>
<select id="queryEquipInformation" resultType="java.util.Map"> <select id="queryEquipInformation" resultType="java.util.Map">
select select ur.sequence_nbr AS sequenceNbr,
ur.sequence_nbr AS sequenceNbr, ur.instance_id as instanceId,
ur.instance_id as instanceId, ur.audit_status as auditStatus,
ur.audit_status as auditStatus, ur.rec_date as regDate,
ur.rec_date as regDate, ur.receive_org_code as receiveOrgCode,
ur.receive_org_code as receiveOrgCode, ur.receive_org_name as receiveOrgName,
ur.receive_org_name as receiveOrgName, ur.receive_company_code as receiveCompanyCode,
ur.receive_company_code as receiveCompanyCode, ur.cancel_certificate as cancelCertificate,
ur.cancel_certificate as cancelCertificate, ur.cancel_type as cancelType,
ur.cancel_type as cancelType, ur.apply_no as applyNo,
ur.apply_no as applyNo, ur.status,
ur.status, ur.remark,
ur.remark, ur.instance_status as instanceStatus,
ur.instance_status as instanceStatus, ur.promoter,
ur.promoter, ri.equ_list AS equList,
ri.equ_list AS equList, ri.equ_category AS equCategory,
ri.equ_category AS equCategory, ri.EQU_DEFINE AS equDefine,
ri.EQU_DEFINE AS equDefine, ri.product_name AS productName,
ri.product_name AS productName, ri.brand_name AS brandName,
ri.brand_name AS brandName, ri.equ_type AS equType,
ri.equ_type AS equType, ri.equ_price AS equPrice,
ri.equ_price AS equPrice, ri.product_photo AS productPhoto,
ri.product_photo AS productPhoto, di.design_unit_credit_code AS designUnitCreditCode,
di.design_unit_credit_code AS designUnitCreditCode, di.design_unit_name AS designUnitName,
di.design_unit_name AS designUnitName, di.design_license_num AS designLicenseNum,
di.design_license_num AS designLicenseNum, di.design_use_date AS designUseDate,
di.design_use_date AS designUseDate, di.design_date AS designDate,
di.design_date AS designDate, di.drawing_do AS drawingDo,
di.drawing_do AS drawingDo, di.appraisal_unit AS appraisalUnit,
di.appraisal_unit AS appraisalUnit, di.appraisal_date AS appraisalDate,
di.appraisal_date AS appraisalDate, di.design_doc AS designDoc,
di.design_doc AS designDoc, di.design_standard AS designStandard,
di.design_standard AS designStandard, fi.produce_unit_credit_code AS produceUnitCreditCode,
fi.produce_unit_credit_code AS produceUnitCreditCode, fi.produce_unit_name AS produceUnitName,
fi.produce_unit_name AS produceUnitName, fi.produce_license_num AS produceLicenseNum,
fi.produce_license_num AS produceLicenseNum, fi.factory_num AS factoryNum,
fi.factory_num AS factoryNum, fi.produce_date AS produceDate,
fi.produce_date AS produceDate, fi.imported AS imported,
fi.imported AS imported, fi.produce_country AS produceCountry,
fi.produce_country AS produceCountry, fi.factory_standard AS factoryStandard,
fi.factory_standard AS factoryStandard, fi.product_quality_yield_prove AS productQualityYieldProve,
fi.product_quality_yield_prove AS productQualityYieldProve, fi.ins_use_maintain_explain AS insUseMaintainExplain,
fi.ins_use_maintain_explain AS insUseMaintainExplain, ui.safety_manager AS safetyManager,
ui.safety_manager AS safetyManager, ui.phone AS safetyManagerPhone,
ui.phone AS safetyManagerPhone, ui.PROVINCE_NAME AS useUnitProvinceName,
ui.PROVINCE_NAME AS useUnitProvinceName, ui.CITY_NAME AS useUnitCityName,
ui.CITY_NAME AS useUnitCityName, ui.COUNTY_NAME AS useUnitCountyName,
ui.COUNTY_NAME AS useUnitCountyName, ui.ADDRESS AS useUnitAddress
ui.ADDRESS AS useUnitAddress FROM tzs_jg_scrap_cancel ur
FROM LEFT JOIN tzs_jg_scrap_cancel_eq re ON re.equip_transfer_id = ur.sequence_nbr
tzs_jg_scrap_cancel ur LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
LEFT JOIN tzs_jg_scrap_cancel_eq re ON re.equip_transfer_id = ur.sequence_nbr LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id WHERE ur.sequence_nbr = #{sequenceNbr}
LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id LIMIT 1
WHERE
ur.sequence_nbr = #{sequenceNbr}
LIMIT 1
</select> </select>
</mapper> </mapper>
...@@ -236,6 +236,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -236,6 +236,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
if (!StringUtils.isEmpty(instanceId)) { if (!StringUtils.isEmpty(instanceId)) {
dto.setInstanceId(instanceId); dto.setInstanceId(instanceId);
dto.setNextTaskId(nextTaskId); dto.setNextTaskId(nextTaskId);
dto.setNextExecuteUserIds(nextUserIds);
dto.setAuditStatus(String.valueOf(WorkFlowStatusEnum.CANCEL_RECEIVE.getPass())); dto.setAuditStatus(String.valueOf(WorkFlowStatusEnum.CANCEL_RECEIVE.getPass()));
} else { } else {
dto.setAuditStatus(String.valueOf(WorkFlowStatusEnum.CANCEL_SUBMIT.getPass())); dto.setAuditStatus(String.valueOf(WorkFlowStatusEnum.CANCEL_SUBMIT.getPass()));
...@@ -359,6 +360,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -359,6 +360,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
jgScrapCancelDto.setInstanceId(instanceId); jgScrapCancelDto.setInstanceId(instanceId);
jgScrapCancelDto.setNextExecuteIds(String.join(",", roleListNext)); jgScrapCancelDto.setNextExecuteIds(String.join(",", roleListNext));
jgScrapCancelDto.setNextTaskId(nextTaskId); jgScrapCancelDto.setNextTaskId(nextTaskId);
jgScrapCancelDto.setNextExecuteUserIds(nextUserIds);
jgScrapCancelDto.setAuditStatus(WorkFlowStatusEnum.CANCEL_RECEIVE.getPass()); jgScrapCancelDto.setAuditStatus(WorkFlowStatusEnum.CANCEL_RECEIVE.getPass());
// 创建待办 // 创建待办
JgScrapCancel bean = new JgScrapCancel(); JgScrapCancel bean = new JgScrapCancel();
...@@ -386,6 +388,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -386,6 +388,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
jgScrapCancelDto.setNextExecuteIds(String.join(",", roleListNext)); jgScrapCancelDto.setNextExecuteIds(String.join(",", roleListNext));
jgScrapCancelDto.setAuditStatus(String.valueOf(WorkFlowStatusEnum.CANCEL_RECEIVE.getPass())); jgScrapCancelDto.setAuditStatus(String.valueOf(WorkFlowStatusEnum.CANCEL_RECEIVE.getPass()));
jgScrapCancelDto.setNextTaskId(nextTaskId); jgScrapCancelDto.setNextTaskId(nextTaskId);
// 更新下一步可执行人
jgScrapCancelDto.setNextExecuteUserIds(nextUserIds);
executeOneStep(jgScrapCancelDto, taskName, nextUserIds, op); executeOneStep(jgScrapCancelDto, taskName, nextUserIds, op);
} }
JgScrapCancel cancel = new JgScrapCancel(); JgScrapCancel cancel = new JgScrapCancel();
...@@ -517,6 +521,10 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -517,6 +521,10 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
jgScrapCancel.setAuditStatus(WorkFlowStatusEnum.getMessage(workflowResultDto.getNextTaskCode()).getRollBack()); jgScrapCancel.setAuditStatus(WorkFlowStatusEnum.getMessage(workflowResultDto.getNextTaskCode()).getRollBack());
} }
jgScrapCancel.setNextTaskId(workflowResultDto.getNextTaskId()); jgScrapCancel.setNextTaskId(workflowResultDto.getNextTaskId());
List<WorkflowResultDto> workflowResultDtos = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO));
// 更新下一步可执行人
String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
jgScrapCancel.setNextExecuteUserIds(nextUserIds);
jgScrapCancel.setPromoter(reginParams.getUserModel().getUserId()); jgScrapCancel.setPromoter(reginParams.getUserModel().getUserId());
jgScrapCancel.setNextExecuteIds(Objects.isNull(workflowResultDto) ? null : workflowResultDto.getNextExecutorRoleIds()); jgScrapCancel.setNextExecuteIds(Objects.isNull(workflowResultDto) ? null : workflowResultDto.getNextExecutorRoleIds());
this.update(jgScrapCancel, lambda); this.update(jgScrapCancel, lambda);
...@@ -575,6 +583,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -575,6 +583,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
jgScrapCancel.setPromoter(RequestContext.getExeUserId()); jgScrapCancel.setPromoter(RequestContext.getExeUserId());
jgScrapCancel.setInstanceId(instanceId); jgScrapCancel.setInstanceId(instanceId);
jgScrapCancel.setNextTaskId(nextTaskId); jgScrapCancel.setNextTaskId(nextTaskId);
// 更新下一步可执行人
jgScrapCancel.setNextExecuteUserIds(nextUserIds);
if (!ObjectUtils.isEmpty(jgScrapCancel.getInstanceStatus())) { if (!ObjectUtils.isEmpty(jgScrapCancel.getInstanceStatus())) {
jgScrapCancel.setInstanceStatus(jgScrapCancel.getInstanceStatus() + "," + String.join(",", roleListNext)); jgScrapCancel.setInstanceStatus(jgScrapCancel.getInstanceStatus() + "," + String.join(",", roleListNext));
} else { } else {
...@@ -595,6 +605,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -595,6 +605,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
} else { } else {
jgScrapCancel.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName()); jgScrapCancel.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
jgScrapCancel.setAuditPassDate(new Date()); jgScrapCancel.setAuditPassDate(new Date());
// 完成时 下一步骤可执行人清空
jgScrapCancel.setNextExecuteUserIds("");
// 修改业务信息 // 修改业务信息
updateInfoOther(jgScrapCancel); updateInfoOther(jgScrapCancel);
JgScrapCancelDto scrapCancelDto = new JgScrapCancelDto(); JgScrapCancelDto scrapCancelDto = new JgScrapCancelDto();
......
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