Skip to content

A
amos-boot-biz
Commit 023a0e0c authored by litengwei's avatar litengwei
Browse files
Options

Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

parents 5da050fd 0627929c
Show whitespace changes
Inline Side-by-side
Showing with 91 additions and 52 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/WorkFlowStatusEnum.java
View file @ 023a0e0c
......@@ -18,7 +18,7 @@ public enum WorkFlowStatusEnum {
/**
* 使用登记流程
*/
USE_SUBMIT("使用单位提交", "useSubmit", "使用单位待提交", "一级受理已驳回", "使用单位提交已撤回"),
USE_SUBMIT("使用单位提交", "useSubmit", "使用单位待提交", "一级受理已驳回", "使用单位已撤回"),
USE_RECEIVE("一级受理", "useReceive", "一级待受理", "二级受理已驳回", "一级受理已撤回"),
USE_PRELIMINARY("二级受理", "usePreliminary", "二级待受理", "三级受理已驳回", "二级受理已撤回"),
USE_REEXAMINE("三级受理", "useReexamine", "三级待受理","",""),
......@@ -35,7 +35,7 @@ public enum WorkFlowStatusEnum {
/**
* 电梯注销
*/
CANCEL_SUBMIT("使用单位提交", "cancelSubmit", "使用单位待提交", "一级受理已驳回", "使用单位提交已撤回"),
CANCEL_SUBMIT("使用单位提交", "cancelSubmit", "使用单位待提交", "一级受理已驳回", "使用单位已撤回"),
CANCEL_RECEIVE("一级受理", "cancelReceive", "一级待受理", "二级受理已驳回", "一级受理已撤回"),
CANCEL_PRELIMINARY("二级受理", "cancelPreliminary", "二级待受理", "三级受理已驳回", "二级受理已撤回"),
CANCEL_REEXAMINE("三级受理", "cancelReexamine", "三级待受理", "", ""),
......@@ -43,7 +43,7 @@ public enum WorkFlowStatusEnum {
/**
* 改造登记流程
*/
CHANGE_SUBMIT("使用单位提交", "changeSubmit", "使用单位待提交", "一级受理已驳回", "使用单位提交已撤回"),
CHANGE_SUBMIT("使用单位提交", "changeSubmit", "使用单位待提交", "一级受理已驳回", "使用单位已撤回"),
CHANGE_RECEIVE("一级受理", "changeReceive", "一级待受理", "二级受理已驳回", "一级受理已撤回"),
CHANGE_PRELIMINARY("二级受理", "changePreliminary", "二级待受理", "三级受理已驳回", "二级受理已撤回"),
CHANGE_REEXAMINE("三级受理", "changeReexamine", "三级待受理", "", ""),
......@@ -51,7 +51,7 @@ public enum WorkFlowStatusEnum {
/**
* 移装变更登记流程
*/
TRANSFER_SUBMIT("使用单位提交", "transferSubmit", "使用单位待提交", "一级受理已驳回", "使用单位提交已撤回"),
TRANSFER_SUBMIT("使用单位提交", "transferSubmit", "使用单位待提交", "一级受理已驳回", "使用单位已撤回"),
TRANSFER_RECEIVE("一级受理", "transferReceive", "一级待受理", "二级受理已驳回", "一级受理已撤回"),
TRANSFER_PRELIMINARY("二级受理", "transferPreliminary", "二级待受理", "三级受理已驳回", "二级受理已撤回"),
TRANSFER_REEXAMINE("三级受理", "transferReexamine", "三级待受理","","");
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationReformMapper.xml
View file @ 023a0e0c
......@@ -10,10 +10,12 @@
<select id="getListPage" resultType="java.util.Map">
select ur.sequence_nbr as sequenceNbr,
ur.audit_status as auditStatus,
ur.reg_date as regDate,
ur.use_unit_name as useUnitName,
ur.use_registration_code as useRegistrationCode,
ur.status,
ur.receive_org_name as receiveOrgName,
DATE_FORMAT(ur.reg_date,'%Y-%m-%d') as regDate,
DATE_FORMAT(ur.rec_date,'%Y-%m-%d') as recDate,
(SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
jri.PRODUCT_NAME as productName,
jri.EQU_CODE as equCode,
......@@ -49,7 +51,7 @@
</foreach>
</if>
<if test="dto.dataType == 'jg' ">
and ur.receive_company_code = #{dto.unitCode}
and ur.receive_org_code = #{dto.unitCode}
</if>
<if test="dto.dataType == 'company' ">
and ur.use_unit_credit_code = #{dto.unitCode}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEquipTransferMapper.xml
View file @ 023a0e0c
......@@ -86,6 +86,7 @@
</if>
<if test="type == 'installUnit'">
AND jet.install_unit_credit_code = #{companyCode}
AND jet.instance_id is not null
</if>
</where>
ORDER BY jet.apply_date DESC
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgScrapCancelMapper.xml
View file @ 023a0e0c
......@@ -35,7 +35,7 @@
jri.EQU_CODE as equCode,
use.USE_INNER_CODE as innerCode,
use.ADDRESS as address,
concat(use.PROVINCE_NAME,'-',use.CITY_NAME,'-',use.COUNTY_NAME) as place,
CONCAT(use.PROVINCE_NAME,'', use.CITY_NAME, '', use.COUNTY_NAME, '', use.street_name, use.ADDRESS, '') AS place,
re.equ_id as equipId
from tzs_jg_scrap_cancel ur
LEFT JOIN tzs_jg_scrap_cancel_eq re on ur.sequence_nbr = re.equip_transfer_id
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml
View file @ 023a0e0c
......@@ -10,7 +10,7 @@
<select id="getListPage" resultType="java.util.Map">
select ur.sequence_nbr as sequenceNbr,
ur.audit_status as auditStatus,
ur.reg_date as regDate,
date_format(reg_date,'%Y-%m-%d') as regDate,
ur.use_unit_name as useUnitName,
ur.status,
ur.receive_org_name as receiveOrgName,
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationController.java
View file @ 023a0e0c
......@@ -103,10 +103,10 @@ public class JgUseRegistrationController extends BaseController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
@ApiOperation(httpMethod = "GET", value = "详情", notes = "详情")
@GetMapping(value = "/getDetail")
public ResponseModel<Map<String, Object>> getDetail(@RequestParam("record") String record) {
return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getDetail(record));
public ResponseModel<Map<String, Object>> getDetail(@RequestParam("record") String record, @RequestParam(value = "sequenceNbr", required = false) Long sequenceNbr) {
return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getDetail(record, sequenceNbr));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationReformServiceImpl.java
View file @ 023a0e0c
......@@ -40,10 +40,7 @@ import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* 改造变更登记服务实现类
......@@ -145,22 +142,30 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
jgChangeRegistrationReform.setInspectUnitName(reginParams.getCompany().getCompanyName());
}
if (map.containsKey("receiveCompanyCode")) {
jgChangeRegistrationReform.setReceiveCompanyCode(String.valueOf(map.getString("receiveCompanyCode")));
String receiveCompanyCode = String.valueOf(map.getString("receiveCompanyCode"));
jgChangeRegistrationReform.setReceiveCompanyCode(receiveCompanyCode);
jgChangeRegistrationReform.setReceiveOrgCode(receiveCompanyCode.split("_")[0]);
jgChangeRegistrationReform.setReceiveOrgName(receiveCompanyCode.split("_")[1]);
} else {
jgChangeRegistrationReform.setReceiveCompanyCode("610000");
}
JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
//使用登记编号
jgRegistrationHistory.setUseRegistrationCode(idxBizJgRegisterInfoMapper.getUseOrgCodeByEquip(map.get("record").toString()));
jgRegistrationHistory.setUseRegistrationCode(idxBizJgRegisterInfoMapper.getUseOrgCodeByEquip(equipId));
//登记类别
jgRegistrationHistory.setRegistrationClass("改造登记");
//设备id
jgRegistrationHistory.setEquId(equipId);
//修改数据
jgRegistrationHistory.setChangeData(JSONObject.toJSONString(map));
//保存历史数据
IdxBizJgTechParamsElevator idxBizJgTechParamsElevator = idxBizJgTechParamsElevatorMapper.selectOne(new QueryWrapper<IdxBizJgTechParamsElevator>().eq("RECORD", equipId));
jgRegistrationHistory.setOldData(JSONObject.toJSONString(idxBizJgTechParamsElevator));
//设备监管码
jgRegistrationHistory.setSupervisoryCode(supervisoryCode);
//数据状态
jgChangeRegistrationReform.setUseRegistrationCode(jgRegistrationHistory.getUseRegistrationCode());
jgRegistrationHistory.setStatus("new");
if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))) {
jgChangeRegistrationReform.setUseUnitCreditCode(null);
......@@ -177,6 +182,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
jgChangeRegistrationReform.setApplyNo(applicationFormCode.get(0));
jgChangeRegistrationReform.setAuditStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
jgChangeRegistrationReform.setRegDate(new Date());
this.save(jgChangeRegistrationReform);
jgChangeRegistrationReformEq.setEquipTransferId(jgChangeRegistrationReform.getSequenceNbr().toString());
jgChangeRegistrationReformEqMapper.insert(jgChangeRegistrationReformEq);
......@@ -271,7 +277,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
jgChangeRegistrationReform.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
jgChangeRegistrationReform.setStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
JgChangeRegistrationReformEq jgChangeRegistrationReformEq = jgChangeRegistrationReformEqMapper.selectOne(new QueryWrapper<JgChangeRegistrationReformEq>().eq("equip_transfer_id", jgChangeRegistrationReform.getSequenceNbr()));
updateTechparamsByEquIdAndCurrentDoucumentId(jgChangeRegistrationReformEq.getEquId(), jgChangeRegistrationReform.getSequenceNbr().toString(), jgChangeRegistrationReform.getSupervisoryCode());
String newUseRegistrationCertificateNumber = getCode(jgChangeRegistrationReform.getSupervisoryCode());
jgChangeRegistrationReform.setUseRegistrationCode(newUseRegistrationCertificateNumber);
updateTechparamsByEquIdAndCurrentDoucumentId(jgChangeRegistrationReformEq.getEquId(), jgChangeRegistrationReform.getSequenceNbr().toString(),newUseRegistrationCertificateNumber );
}
this.getBaseMapper().updateById(jgChangeRegistrationReform);
}
......@@ -472,8 +480,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
* @param equipId
* @param currentDocumentId
*/
public void updateTechparamsByEquIdAndCurrentDoucumentId(String equipId, String currentDocumentId, String supervisoryCode) {
String newUseRegistrationCertificateNumber = getCode(supervisoryCode);
public void updateTechparamsByEquIdAndCurrentDoucumentId(String equipId, String currentDocumentId, String newUseRegistrationCertificateNumber) {
IdxBizJgTechParamsElevator idxBizJgTechParamsElevator = idxBizJgTechParamsElevatorMapper.selectOne(new QueryWrapper<IdxBizJgTechParamsElevator>().eq("RECORD", equipId));
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
.eq("equ_id", equipId)
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgEquipTransferServiceImpl.java
View file @ 023a0e0c
package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.map.MapBuilder;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
......@@ -154,10 +153,14 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
String applyNo = applyNoList.get(i);
dto.setApplyNo(applyNo);
dto.setApplyDate(new Date());
if(SUBMIT_TYPE_FLOW.equals(submitType)) {
dto.setNextExecuteIds(String.join(",", roleListSecond));
dto.setInstanceStatus(String.join(",", roleListFirst));
dto.setPromoter(reginParams.getUserModel().getUserId());
dto.setApplyStatus(taskName[0]);
}
jgEquipTransferEq.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
jgEquipTransferEq.setEquipTransferId(applyNo);
if (!CollectionUtils.isEmpty(instanceIdList)) {
......@@ -194,27 +197,6 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
}
}
public Map<String, Object> getNextWorkflowNode(String instanceId) {
String role = "";
String taskName = "流程结束";
ArrayList<String> roleList = new ArrayList<>();
AjaxResult taskNoAuth = Workflow.taskClient.getTaskNoAuth(instanceId);
if (!org.springframework.util.ObjectUtils.isEmpty(taskNoAuth.get("data"))) {
JSONObject nextTask = JSON.parseObject(JSON.toJSONString(taskNoAuth.get("data")));
String nextTaskId = nextTask.getString("id");
taskName = nextTask.getString("name");
AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
for (Object datum : data) {
if (((Map) datum).containsKey("groupId")) {
roleList.add(((Map) datum).get("groupId").toString());
}
}
}
role = String.join(",", roleList);
return MapBuilder.<String, Object>create().put("taskName", taskName).put("role", role).build();
}
void getNext(ArrayList<String> roleListFirst, String instanceId, String[] taskName) {
AjaxResult aj = Workflow.taskClient.getTaskNoAuth(instanceId);
JSONObject taskNoAuth = JSON.parseObject(JSON.toJSONString(aj.get("data")));
......@@ -281,7 +263,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
return null;
}
Map<String, Object> equipTransferInfo = createEquipTransferInfo(equipTransfer);
Map<String, Object> equipTransferInfo = new HashMap<>();
String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard",
"productQualityYieldProve", "insUseMaintainExplain", "inspectReport",
......@@ -293,8 +275,9 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
handleJsonArrayFields(equipmentInfos.get(0), fields);
Map<String, Object> resultMap = new HashMap<>();
resultMap.putAll(equipmentInfos.get(0));
resultMap.putAll(equipTransferInfo);
resultMap.putAll(equipmentInfos.get(0));
resultMap.putAll(createEquipTransferInfo(equipTransfer));
return resultMap;
}
......@@ -387,6 +370,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
JgEquipTransfer equipTransfer = this.baseMapper.selectById(equipTransferInfo.getSequenceNbr());
if (ajaxResult.getStatus() == 200) {
equipTransfer.setApplyStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
equipTransfer.setPromoter("");
this.baseMapper.updateById(equipTransfer);
}
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgMaintainNoticeServiceImpl.java
View file @ 023a0e0c
......@@ -432,7 +432,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
TaskResultDTO dto = new TaskResultDTO();
dto.setResultCode("approvalStatus");
dto.setTaskId(taskId);
dto.setComment("提交流程");
// dto.setComment("提交流程");
HashMap<String, Object> map = new HashMap<>();
map.put("approvalStatus", "0");
dto.setVariable(map);
......@@ -605,7 +605,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
TaskResultDTO dto = new TaskResultDTO();
dto.setResultCode("approvalStatus");
dto.setTaskId(taskId);
dto.setComment("提交流程");
// dto.setComment("提交流程");
HashMap<String, Object> map = new HashMap<>();
map.put("approvalStatus", op);
dto.setVariable(map);
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgReformNoticeServiceImpl.java
View file @ 023a0e0c
......@@ -452,7 +452,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
TaskResultDTO dto = new TaskResultDTO();
dto.setResultCode("approvalStatus");
dto.setTaskId(taskId);
dto.setComment("提交流程");
dto.setComment("");
HashMap<String, Object> map = new HashMap<>();
map.put("approvalStatus", "0");
dto.setVariable(map);
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
View file @ 023a0e0c
......@@ -94,6 +94,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
LambdaQueryWrapper<InspectionDetectionInfo> inspectionLambda = new QueryWrapper<InspectionDetectionInfo>().lambda();
inspectionLambda.eq(InspectionDetectionInfo::getRecord, map.get("equipId"));
// 更新检验检测信息
inspectionDetectionInfo.setInspectReport(null);
inspectionDetectionInfoMapper.update(inspectionDetectionInfo, inspectionLambda);
// 使用登记信息
JgUseRegistration jgUseRegistration = new JgUseRegistration();
......@@ -373,18 +374,21 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
this.update(jgUseRegistration, lambda);
}
public Map<String, Object> getDetail(String id) {
public Map<String, Object> getDetail(String id, Long sequenceNbr) {
Map<String, Object> detail = this.baseMapper.getDetail(id);
Map<String, Object> inspectDetail = this.baseMapper.getInspectDetail(id);
Map<String, Object> useDetail = this.baseMapper.getUseDetail(id);
detail.putAll(inspectDetail);
detail.putAll(useDetail);
detail.putAll(useDetail);
detail.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto"))));
detail.put("factoryStandard", JSON.parse(String.valueOf(detail.get("factoryStandard"))));
detail.put("productQualityYieldProve", JSON.parse(String.valueOf(detail.get("productQualityYieldProve"))));
detail.put("insUseMaintainExplanin", JSON.parse(String.valueOf(detail.get("insUseMaintainExplanin"))));
detail.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
if (!ObjectUtils.isEmpty(sequenceNbr)){
JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(sequenceNbr);
detail.put("receiveOrgCode", jgUseRegistration.getReceiveCompanyCode());
}
return detail;
}
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcOpeningApplicationController.java
View file @ 023a0e0c
......@@ -76,9 +76,10 @@ public class JyjcOpeningApplicationController extends BaseController {
@ApiOperation(httpMethod = "PUT", value = "保存并提交", notes = "保存并提交")
public ResponseModel<JyjcOpeningApplicationModel> updateBySequenceNbrAndStartFlow(@RequestBody JyjcOpeningApplicationModel model, @RequestParam(value = "sequenceNbr", required = false) Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
// if (ValidationUtil.isEmpty(model.getBaseUnitLicences()) || ValidationUtil.isEmpty(model.getUserInfos())) {
// throw new BadRequest("企业资质信息和检验人员信息为空，无法提交！");
// }
JyjcOpeningApplicationModel jyjcOpeningApplicationModel = jyjcOpeningApplicationServiceImpl.queryDetail(sequenceNbr);
if (jyjcOpeningApplicationModel == null || ValidationUtil.isEmpty(jyjcOpeningApplicationModel.getBaseUnitLicences()) || ValidationUtil.isEmpty(jyjcOpeningApplicationModel.getUserInfos())) {
throw new BadRequest("企业资质信息和检验人员信息为空，无法提交！");
}
return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(model,true));
}
......@@ -246,4 +247,23 @@ public class JyjcOpeningApplicationController extends BaseController {
public ResponseModel<List<TzBaseEnterpriseInfo>> getInspectionUnitList() {
return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.getInspectionUnitList());
}
/**
* 作废
*
*
* @param
* @return {@link ResponseModel< List< TzBaseEnterpriseInfo>>}
* @author yangyang
* @throws
* @date 2023/12/22 16:13
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/discard")
@ApiOperation(httpMethod = "PUT", value = "作废", notes = "作废")
public ResponseModel<Boolean> doDiscard(@RequestBody Map<String,Object> params) {
String sequenceNbr = (String) params.get("sequenceNbr");
String remark = (String) params.get("remark");
return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.doDiscard(Long.parseLong(sequenceNbr), remark));
}
}
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java
View file @ 023a0e0c
......@@ -236,6 +236,26 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
return this.update(updateWrapper);
}
public Boolean doDiscard(Long sequenceNbr, String remark) {
if (sequenceNbr == null) {
throw new BadRequest("sequenceNbr不能为空！");
}
JyjcOpeningApplication jyjcOpeningApplication = jyjcOpeningApplicationMapper.selectById(sequenceNbr);
if (jyjcOpeningApplication == null) {
return false;
}
if (!String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()).equals(jyjcOpeningApplication.getStatus())) {
throw new BadRequest("只有已完成的申请单才可以作废！");
}
UpdateWrapper<JyjcOpeningApplication> updateWrapper = new UpdateWrapper<>();
updateWrapper
.set("status", FlowStatusEnum.TO_BE_DISCARD.getCode())
.set("status_name", FlowStatusEnum.TO_BE_DISCARD.getName())
.set("remark", remark)
.eq("SEQUENCE_NBR", sequenceNbr);
return this.update(updateWrapper);
}
/**
* 分页查询
......
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