Commit dc7661d3 authored by 李松's avatar 李松

更名变更登记业务调整

parent b6645dec
......@@ -9,7 +9,7 @@ import lombok.experimental.Accessors;
import java.util.Date;
/**
*
*
*
* @author system_generator
* @date 2023-12-25
......@@ -58,4 +58,15 @@ public class JgChangeRegistrationNameEq extends BaseEntity {
@TableField("create_user_name")
private String createUserName;
/**
* 使用登记证id
*/
@TableField("certificate_seq")
private String certificateSeq;
/**
* 使用登记证id
*/
@TableField("equip_info")
private String equipInfo;
}
......@@ -36,7 +36,9 @@
ur.create_user_id as createUserId,
ur.next_executor_ids as nextExecutorIds,
ur.next_execute_user_ids as nextExecuteUserIds,
ur.next_task_id as nextTaskId
ur.next_task_id as nextTaskId,
(SELECT group_concat(use_registration_code) from tzs_jg_use_registration_manage where sequence_nbr in (SELECT
certificate_seq from tzs_jg_change_registration_name_eq where name_change_registration_id = ur.sequence_nbr)) as certificateCodes
from tzs_jg_change_registration_name ur
<where>
and ur.is_delete = 0
......
......@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationNameDto;
import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationNameServiceImpl;
import io.swagger.annotations.Api;
......@@ -13,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
......@@ -95,7 +97,7 @@ public class JgChangeRegistrationNameController extends BaseController {
jgChangeRegistrationNameService.flowExecute(Long.valueOf(String.valueOf(jgScrapCancelDto.getSequenceNbr())),
jgScrapCancelDto.getInstanceId(),
String.valueOf(map.get("operate")),
String.valueOf(map.get("operate")),
String.valueOf(map.get("remark")),
String.valueOf(map.get("nextTaskId")));
return ResponseHelper.buildResponse("ok");
}
......@@ -131,6 +133,23 @@ public class JgChangeRegistrationNameController extends BaseController {
return ResponseHelper.buildResponse(jgChangeRegistrationNameService.queryBySequenceNbr(sequenceNbr));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getTableData")
@ApiOperation(httpMethod = "GET", value = "获取", notes = "根据sequenceNbr查询单个详情")
public ResponseModel<Map<String, Object>> getTableData(JgUseRegistrationManageDto dto) {
if (ValidationUtil.isEmpty(dto.getUseUnitCreditCode())) {
// 不传的话取当前登录单位的统一信用代码
dto.setUseUnitCreditCode(getSelectedOrgInfo().getCompany().getCompanyCode());
}
if (!ValidationUtil.isEmpty(dto.getReceiveCompanyCode())){
String[] codes = dto.getReceiveCompanyCode().split("_");
if (!ValidationUtil.isEmpty(codes)){
dto.setReceiveCompanyCode(codes[0]);
}
}
return ResponseHelper.buildResponse(jgChangeRegistrationNameService.getTableData(dto));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
......
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
......@@ -16,16 +17,23 @@ import com.yeejoin.amos.boot.module.jg.api.entity.*;
import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
import com.yeejoin.amos.boot.module.jg.api.mapper.*;
import com.yeejoin.amos.boot.module.jg.api.service.IJgCertificateChangeRecordEqService;
import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationNameService;
import com.yeejoin.amos.boot.module.jg.api.service.IJgRegistrationHistoryService;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
import com.yeejoin.amos.boot.module.ymt.api.common.DateUtils;
import com.yeejoin.amos.boot.module.ymt.api.common.StringUtil;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgOtherInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.UseInfo;
import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseEnterpriseInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.TzsUserInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.UseInfoMapper;
import com.yeejoin.amos.boot.module.ymt.flc.api.entity.RegUnitInfo;
import com.yeejoin.amos.boot.module.ymt.flc.api.feign.AccessFeignService;
import com.yeejoin.amos.boot.module.ymt.flc.api.mapper.RegUnitInfoMapper;
......@@ -47,11 +55,13 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
......@@ -116,12 +126,26 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
@Autowired
TzBaseEnterpriseInfoMapper baseEnterpriseInfoMapper;
private static String template = "来自企业(%s)的业务办理,【申请单号:%s】";
public final static String CHANGE_NAME = "更名变更";
public static String JG_COMAPNY_TYPE = "监管机构";
private static String template = "%s发起更名变更登记业务申请,【申请单号:%s】";
@Autowired
private JgRegistrationHistoryMapper jgRegistrationHistoryMapper;
@Autowired
private JgRegistrationHistoryServiceImpl jgRegistrationHistoryService;
@Autowired
private JgUseRegistrationManageServiceImpl jgUseRegistrationManageService;
@Autowired
private UseInfoMapper useInfoMapper;
@Autowired
private JgCertificateChangeRecordServiceImpl jgCertificateChangeRecordService;
@Autowired
private JgCertificateChangeRecordEqServiceImpl jgCertificateChangeRecordEqService;
@Transactional(rollbackFor = Exception.class)
public List<JgChangeRegistrationName> save2(String submitType, JSONObject requestParam) {
......@@ -129,6 +153,63 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
return Collections.singletonList(this.save(submitType, jgRegistrationInfoMap));
}
public void saveJgChangeRegistrationNameEq(Long registrationId, Object object, ReginParams reginParams) {
JSONArray objects = JSONObject.parseArray(object.toString());
ArrayList<JgChangeRegistrationNameEq> jgChangeRegistrationNameEqs = new ArrayList<>();
if (!ObjectUtils.isEmpty(objects)) {
List<JgUseRegistrationManageDto> jgUseRegistrationManageDtos = objects.toJavaList(JgUseRegistrationManageDto.class);
List<Long> collect = jgUseRegistrationManageDtos.stream().map(JgUseRegistrationManageDto::getSequenceNbr).collect(Collectors.toList());
List<JSONObject> jsonObjects = jgUseRegistrationManageService.queryEquByCertificateSeqList(collect);
jgUseRegistrationManageDtos.forEach(item -> {
JgChangeRegistrationNameEq jgChangeRegistrationNameEq = new JgChangeRegistrationNameEq();
jgChangeRegistrationNameEq.setNameChangeRegistrationId(registrationId.toString());
jgChangeRegistrationNameEq.setCreateDate(new Date());
jgChangeRegistrationNameEq.setCreateUserId(reginParams.getUserModel().getUserId());
jgChangeRegistrationNameEq.setCreateUserName(reginParams.getUserModel().getRealName());
jgChangeRegistrationNameEq.setCertificateSeq(item.getSequenceNbr().toString());
List<JSONObject> equipInfo = jsonObjects.stream().filter(a -> item.getUseRegistrationCode().equals(a.get("USE_ORG_CODE"))).collect(Collectors.toList());
jgChangeRegistrationNameEq.setEquipInfo(JSONObject.toJSONString(equipInfo));
jgChangeRegistrationNameEq.setIsInvalid("0");
jgChangeRegistrationNameEqs.add(jgChangeRegistrationNameEq);
});
}
if (!ObjectUtils.isEmpty(jgChangeRegistrationNameEqs)) {
LambdaQueryWrapper<JgChangeRegistrationNameEq> lambda = new QueryWrapper<JgChangeRegistrationNameEq>().lambda();
lambda.eq(JgChangeRegistrationNameEq::getNameChangeRegistrationId, registrationId);
jgChangeRegistrationNameEqService.remove(lambda);
jgChangeRegistrationNameEqService.saveBatch(jgChangeRegistrationNameEqs);
}
}
public void updateHistory(Map<String, JSONObject> map, String currentDocumentId) {
JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
lambda.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
lambda.eq(JgRegistrationHistory::getRegistrationClass, CHANGE_NAME);
Integer integer = jgRegistrationHistoryService.getBaseMapper().selectCount(lambda);
if (integer > 0) {
jgRegistrationHistory.setChangeData(JSON.toJSONString(map));
jgRegistrationHistoryService.update(jgRegistrationHistory, lambda);
} else {
jgRegistrationHistory.setChangeData(JSON.toJSONString(map));
jgRegistrationHistory.setStatus("new");
jgRegistrationHistory.setRegistrationClass(CHANGE_NAME);
jgRegistrationHistory.setCurrentDocumentId(currentDocumentId);
jgRegistrationHistoryService.save(jgRegistrationHistory);
}
}
public void updateEsData(List<String> ids, JgChangeRegistrationName jgChangeRegistrationName) {
// 更新es
HashMap<String, Map<String, Object>> objMap = new HashMap<>();
ids.forEach(item -> {
HashMap<String, Object> param = new HashMap<>();
param.put("USE_UNIT_NAME", jgChangeRegistrationName.getNewUseUnitName());
objMap.put(item, param);
});
tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
}
public JgChangeRegistrationName save(String submitType, Map<String, JSONObject> jgRegistrationInfoMap) {
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
......@@ -187,6 +268,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
dto.setNextTaskId(nextTaskId);
dto.setNextExecuteUserIds(nextUserIds);
dto.setAuditStatus(String.valueOf(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getPass()));
dto.setApplyDate(new Date());
} else {
dto.setAuditStatus(String.valueOf(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getPass()));
}
......@@ -195,6 +277,12 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
dto.setCreateUserId(RequestContext.getExeUserId());
dto.setCreateUserName(reginParams.getUserModel().getRealName());
this.save(dto);
// 新增业务关联设备表
if (!ObjectUtils.isEmpty(jgRegistrationInfo) && !ObjectUtils.isEmpty(jgRegistrationInfo.get("dataList"))) {
saveJgChangeRegistrationNameEq(dto.getSequenceNbr(), jgRegistrationInfo.get("dataList"), reginParams);
}
// 保存历史数据
updateHistory(jgRegistrationInfoMap, dto.getSequenceNbr().toString());
// 创建代办
this.createTaskModel(dto, taskName[0], submitType, nextUserIds);
if(StringUtil.isNotEmpty(dto.getInstanceId())){
......@@ -266,7 +354,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
dto.setChangeCertificate(null);
taskModelDto.setModel(dto);
//摘要 按原有规则组装
taskModelDto.setTaskContent(buildTaskContent(dto) + "待提交");
taskModelDto.setTaskContent(buildTaskContent(dto));
//申请单号
taskModelDto.setTaskCode(dto.getApplyNo());
//业务类型枚举code值
......@@ -288,7 +376,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
* @return 摘要
*/
private String buildTaskContent(JgChangeRegistrationName dto) {
return String.format(template, dto.getUseUnitCreditCode(), dto.getApplyNo());
return String.format(template, dto.getCreateUserName(), dto.getApplyNo());
}
......@@ -331,6 +419,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
jgChangeRegistrationName.setNextTaskId(nextTaskId);
jgChangeRegistrationName.setNextExecuteUserIds(nextUserIds);
jgChangeRegistrationName.setAuditStatus(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getPass());
jgChangeRegistrationName.setApplyDate(new Date());
// 创建待办
createTaskModel(jgChangeRegistrationName, taskName, "1", nextUserIds);
} else {
......@@ -681,63 +770,155 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
}
public void updateInfoOther(JgChangeRegistrationName jgChangeRegistrationName) {
LambdaQueryWrapper<JgChangeRegistrationNameEq> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(JgChangeRegistrationNameEq::getNameChangeRegistrationId, jgChangeRegistrationName.getSequenceNbr());
List<String> collect = jgChangeRegistrationNameEqService.list(wrapper).stream().map(JgChangeRegistrationNameEq::getEquId).collect(Collectors.toList());
if (CollUtil.isNotEmpty(collect)) {
LambdaUpdateWrapper<JgChangeRegistrationReformEq> updateWrapper1 = new LambdaUpdateWrapper<>();
updateWrapper1.in(JgChangeRegistrationReformEq::getEquId, collect);
updateWrapper1.ne(JgChangeRegistrationReformEq::getEquipTransferId, jgChangeRegistrationName.getSequenceNbr());
JgChangeRegistrationReformEq jgChangeRegistrationReformEq = new JgChangeRegistrationReformEq();
jgChangeRegistrationReformEq.setIsInvalid(Boolean.TRUE);
jgChangeRegistrationReformEqMapper.update(jgChangeRegistrationReformEq, updateWrapper1);
LambdaUpdateWrapper<JgChangeRegistrationTransferEq> updateWrapper2 = new LambdaUpdateWrapper<>();
updateWrapper2.in(JgChangeRegistrationTransferEq::getEquId, collect);
updateWrapper2.ne(JgChangeRegistrationTransferEq::getEquipTransferId, jgChangeRegistrationName.getSequenceNbr());
JgChangeRegistrationTransferEq jgChangeRegistrationTransferEq = new JgChangeRegistrationTransferEq();
jgChangeRegistrationReformEq.setIsInvalid(Boolean.TRUE);
jgChangeRegistrationTransferEqMapper.update(jgChangeRegistrationTransferEq, updateWrapper2);
LambdaUpdateWrapper<JgUseRegistrationEq> updateWrapper3 = new LambdaUpdateWrapper<>();
updateWrapper3.in(JgUseRegistrationEq::getEquId, collect);
updateWrapper3.ne(JgUseRegistrationEq::getEquipTransferId, jgChangeRegistrationName.getSequenceNbr());
JgUseRegistrationEq jgUseRegistrationEq = new JgUseRegistrationEq();
jgUseRegistrationEq.setIsInvalid(Boolean.TRUE);
jgUseRegistrationEqMapper.update(jgUseRegistrationEq, updateWrapper3);
LambdaUpdateWrapper<JgChangeRegistrationUnitEq> updateWrapper4 = new LambdaUpdateWrapper<>();
updateWrapper4.in(JgChangeRegistrationUnitEq::getEquId, collect);
updateWrapper4.ne(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId, jgChangeRegistrationName.getSequenceNbr());
JgChangeRegistrationUnitEq jgChangeRegistrationUnitEq = new JgChangeRegistrationUnitEq();
jgChangeRegistrationUnitEq.setIsInvalid("1");
jgChangeRegistrationUnitEqMapper.update(jgChangeRegistrationUnitEq, updateWrapper4);
LambdaUpdateWrapper<JgChangeRegistrationNameEq> updateWrapper5 = new LambdaUpdateWrapper<>();
updateWrapper5.in(JgChangeRegistrationNameEq::getEquId, collect);
updateWrapper5.ne(JgChangeRegistrationNameEq::getNameChangeRegistrationId, jgChangeRegistrationName.getSequenceNbr());
JgChangeRegistrationNameEq jgChangeRegistrationNameEq = new JgChangeRegistrationNameEq();
jgChangeRegistrationNameEq.setIsInvalid("1");
jgChangeRegistrationNameEqMapper.update(jgChangeRegistrationNameEq, updateWrapper5);
}
// LambdaQueryWrapper<JgChangeRegistrationNameEq> wrapper = new LambdaQueryWrapper<>();
// wrapper.eq(JgChangeRegistrationNameEq::getNameChangeRegistrationId, jgChangeRegistrationName.getSequenceNbr());
// List<String> collect = jgChangeRegistrationNameEqService.list(wrapper).stream().map(JgChangeRegistrationNameEq::getEquId).collect(Collectors.toList());
// if (CollUtil.isNotEmpty(collect)) {
// LambdaUpdateWrapper<JgChangeRegistrationReformEq> updateWrapper1 = new LambdaUpdateWrapper<>();
// updateWrapper1.in(JgChangeRegistrationReformEq::getEquId, collect);
// updateWrapper1.ne(JgChangeRegistrationReformEq::getEquipTransferId, jgChangeRegistrationName.getSequenceNbr());
// JgChangeRegistrationReformEq jgChangeRegistrationReformEq = new JgChangeRegistrationReformEq();
// jgChangeRegistrationReformEq.setIsInvalid(Boolean.TRUE);
// jgChangeRegistrationReformEqMapper.update(jgChangeRegistrationReformEq, updateWrapper1);
//
// LambdaUpdateWrapper<JgChangeRegistrationTransferEq> updateWrapper2 = new LambdaUpdateWrapper<>();
// updateWrapper2.in(JgChangeRegistrationTransferEq::getEquId, collect);
// updateWrapper2.ne(JgChangeRegistrationTransferEq::getEquipTransferId, jgChangeRegistrationName.getSequenceNbr());
// JgChangeRegistrationTransferEq jgChangeRegistrationTransferEq = new JgChangeRegistrationTransferEq();
// jgChangeRegistrationReformEq.setIsInvalid(Boolean.TRUE);
// jgChangeRegistrationTransferEqMapper.update(jgChangeRegistrationTransferEq, updateWrapper2);
//
// LambdaUpdateWrapper<JgUseRegistrationEq> updateWrapper3 = new LambdaUpdateWrapper<>();
// updateWrapper3.in(JgUseRegistrationEq::getEquId, collect);
// updateWrapper3.ne(JgUseRegistrationEq::getEquipTransferId, jgChangeRegistrationName.getSequenceNbr());
// JgUseRegistrationEq jgUseRegistrationEq = new JgUseRegistrationEq();
// jgUseRegistrationEq.setIsInvalid(Boolean.TRUE);
// jgUseRegistrationEqMapper.update(jgUseRegistrationEq, updateWrapper3);
//
// LambdaUpdateWrapper<JgChangeRegistrationUnitEq> updateWrapper4 = new LambdaUpdateWrapper<>();
// updateWrapper4.in(JgChangeRegistrationUnitEq::getEquId, collect);
// updateWrapper4.ne(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId, jgChangeRegistrationName.getSequenceNbr());
// JgChangeRegistrationUnitEq jgChangeRegistrationUnitEq = new JgChangeRegistrationUnitEq();
// jgChangeRegistrationUnitEq.setIsInvalid("1");
// jgChangeRegistrationUnitEqMapper.update(jgChangeRegistrationUnitEq, updateWrapper4);
//
// LambdaUpdateWrapper<JgChangeRegistrationNameEq> updateWrapper5 = new LambdaUpdateWrapper<>();
// updateWrapper5.in(JgChangeRegistrationNameEq::getEquId, collect);
// updateWrapper5.ne(JgChangeRegistrationNameEq::getNameChangeRegistrationId, jgChangeRegistrationName.getSequenceNbr());
// JgChangeRegistrationNameEq jgChangeRegistrationNameEq = new JgChangeRegistrationNameEq();
// jgChangeRegistrationNameEq.setIsInvalid("1");
// jgChangeRegistrationNameEqMapper.update(jgChangeRegistrationNameEq, updateWrapper5);
// }
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
LambdaUpdateWrapper<RegUnitInfo> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(RegUnitInfo::getUnitCode, jgChangeRegistrationName.getUseUnitCreditCode());
RegUnitInfo regUnitInfo = new RegUnitInfo();
regUnitInfo.setName(jgChangeRegistrationName.getNewUseUnitName());
regUnitInfoMapper.update(regUnitInfo, updateWrapper);
LambdaUpdateWrapper<TzBaseEnterpriseInfo> updateWrapper2 = new LambdaUpdateWrapper<>();
updateWrapper2.eq(TzBaseEnterpriseInfo::getUseCode, jgChangeRegistrationName.getUseUnitCreditCode());
TzBaseEnterpriseInfo tzBaseEnterpriseInfo = new TzBaseEnterpriseInfo();
regUnitInfo.setName(jgChangeRegistrationName.getNewUseUnitName());
tzBaseEnterpriseInfoMapper.update(tzBaseEnterpriseInfo, updateWrapper2);
//修改平台机构名称
try {
Privilege.companyClient.updateCompanyName(jgChangeRegistrationName.getUseUnitCreditCode(), jgChangeRegistrationName.getNewUseUnitName());
} catch (InnerInvokException e) {
throw new RuntimeException();
// 修改本次更名登记选择的使用登记证下的设备信息
List<JgChangeRegistrationNameEq> list = jgChangeRegistrationNameEqService.lambdaQuery().eq(JgChangeRegistrationNameEq::getNameChangeRegistrationId, jgChangeRegistrationName.getSequenceNbr()).list();
ArrayList<String> equipIds = new ArrayList<>();
list.forEach(item -> {
if (!ObjectUtils.isEmpty(item.getEquipInfo())) {
JSONArray objects = JSONObject.parseArray(item.getEquipInfo());
objects.forEach(info -> {
JSONObject jsonObject = JSONObject.parseObject(info.toString());
if (jsonObject.containsKey("SEQUENCE_NBR")) {
equipIds.add(jsonObject.get("SEQUENCE_NBR").toString());
}
});
}
});
if (!ObjectUtils.isEmpty(equipIds)) {
LambdaQueryWrapper<UseInfo> lambda = new QueryWrapper<UseInfo>().lambda();
lambda.eq(UseInfo::getUseUnitCreditCode, jgChangeRegistrationName.getUseUnitCreditCode());
lambda.in(UseInfo::getRecord, equipIds);
UseInfo useInfo = new UseInfo();
useInfo.setUseUnitName(jgChangeRegistrationName.getNewUseUnitName());
useInfoMapper.update(useInfo, lambda);
// 修改es中设备信息
updateEsData(equipIds, jgChangeRegistrationName);
}
// 修改证管理信息
List<String> collect = list.stream().map(JgChangeRegistrationNameEq::getCertificateSeq).collect(Collectors.toList());
LambdaQueryWrapper<JgUseRegistrationManage> lambda = new QueryWrapper<JgUseRegistrationManage>().lambda();
lambda.in(JgUseRegistrationManage::getSequenceNbr, collect);
JgUseRegistrationManage jgUseRegistrationManage = new JgUseRegistrationManage();
jgUseRegistrationManage.setUseUnitName(jgChangeRegistrationName.getNewUseUnitName());
jgUseRegistrationManageService.update(jgUseRegistrationManage, lambda);
// 业务流水生成
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeRegistrationName.getSequenceNbr()).one();
JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
JSONObject dataList = JSONObject.parseObject(jsonObject.get("jgRegistrationInfo").toString());
JSONArray objects = JSONObject.parseArray(dataList.get("dataList").toString());
ArrayList<JgCertificateChangeRecordEq> jgCertificateChangeRecordEqs = new ArrayList<>();
objects.forEach(useRegistration -> {
JSONObject object = JSONObject.parseObject(useRegistration.toString());
JgCertificateChangeRecord jgCertificateChangeRecord = new JgCertificateChangeRecord();
jgCertificateChangeRecord.setApplyNo(jgChangeRegistrationName.getApplyNo());
jgCertificateChangeRecord.setReceiveOrgName(jgChangeRegistrationName.getReceiveOrgName());
jgCertificateChangeRecord.setAuditPassDate(new Date());
jgCertificateChangeRecord.setRegType(CHANGE_NAME);
jgCertificateChangeRecord.setRegDate(jgChangeRegistrationName.getApplyDate());
jgCertificateChangeRecord.setChangeContent(jgChangeRegistrationName.getCreateUserName() + "办理了【" + CHANGE_NAME + "】," + "单号【" + jgChangeRegistrationName.getApplyNo() +
"】,原" + jgChangeRegistrationName.getUseUnitName() + "变更为" + jgChangeRegistrationName.getNewUseUnitName() + ",办理日期" + sdf.format(jgChangeRegistrationName.getAuditPassDate()));
jgCertificateChangeRecord.setRecUserId(jgChangeRegistrationName.getRecUserId());
jgCertificateChangeRecord.setRecDate(new Date());
jgCertificateChangeRecord.setCreateDate(new Date());
jgCertificateChangeRecord.setCreateUserId(jgChangeRegistrationName.getCreateUserId());
jgCertificateChangeRecord.setUseRegistrationCode(!ObjectUtils.isEmpty(object.get("useRegistrationCode")) ? object.get("useRegistrationCode").toString() : null);
jgCertificateChangeRecord.setCertificateNo(!ObjectUtils.isEmpty(object.get("certificateNo")) ? object.get("certificateNo").toString() : null);
jgCertificateChangeRecord.setUseUnitCreditCode(jgChangeRegistrationName.getUseUnitCreditCode());
jgCertificateChangeRecord.setUseUnitName(jgChangeRegistrationName.getUseUnitName());
jgCertificateChangeRecord.setEquCategory(!ObjectUtils.isEmpty(object.get("equCategoryCode")) ? object.get("equCategoryCode").toString() : null);
jgCertificateChangeRecord.setReceiveCompanyCode(jgChangeRegistrationName.getReceiveOrgCode());
// 保存证流水信息
jgCertificateChangeRecordService.save(jgCertificateChangeRecord);
// 生成证下设备流水信息
List<JgChangeRegistrationNameEq> record = list.stream().filter(a -> a.getCertificateSeq().equals(object.get("sequenceNbr"))).collect(Collectors.toList());
record.forEach(item -> {
if (!ObjectUtils.isEmpty(item.getEquipInfo())) {
JSONArray equList = JSONObject.parseArray(item.getEquipInfo());
equList.forEach(info -> {
JSONObject equInfo = JSONObject.parseObject(info.toString());
JgCertificateChangeRecordEq jgCertificateChangeRecordEq = new JgCertificateChangeRecordEq();
jgCertificateChangeRecordEq.setEquId(equInfo.get("SEQUENCE_NBR").toString());
jgCertificateChangeRecordEq.setChangeRecordId(jgCertificateChangeRecord.getSequenceNbr().toString());
jgCertificateChangeRecordEq.setProductCode(equInfo.get("FACTORY_NUM").toString());
jgCertificateChangeRecordEqs.add(jgCertificateChangeRecordEq);
});
}
});
});
// 保存设备流水信息
jgCertificateChangeRecordEqService.saveBatch(jgCertificateChangeRecordEqs);
// 当企业下所有使用登记证单位信息都改为最新的时候再去修改系统中单位信息
Integer count = jgUseRegistrationManageService.lambdaQuery().eq(JgUseRegistrationManage::getUseUnitCreditCode, jgChangeRegistrationName.getUseUnitCreditCode()).eq(JgUseRegistrationManage::getUseUnitName, jgChangeRegistrationName.getUseUnitName()).count();
if (count == 0) {
// 修改企业信息
LambdaUpdateWrapper<TzBaseEnterpriseInfo> updateWrapper2 = new LambdaUpdateWrapper<>();
updateWrapper2.eq(TzBaseEnterpriseInfo::getUseCode, jgChangeRegistrationName.getUseUnitCreditCode());
TzBaseEnterpriseInfo tzBaseEnterpriseInfo = new TzBaseEnterpriseInfo();
tzBaseEnterpriseInfo.setUseUnit(jgChangeRegistrationName.getNewUseUnitName());
tzBaseEnterpriseInfoMapper.update(tzBaseEnterpriseInfo, updateWrapper2);
//修改平台机构名称
try {
Privilege.companyClient.updateCompanyName(jgChangeRegistrationName.getUseUnitCreditCode(), jgChangeRegistrationName.getNewUseUnitName());
} catch (InnerInvokException e) {
throw new RuntimeException();
}
}
}
public Map<String, Object> getTableData(JgUseRegistrationManageDto dto) {
HashMap<String, Object> data = new HashMap<>();
List<JgUseRegistrationManageDto> jgUseRegistrationManageDtos = jgUseRegistrationManageService.queryByUseUnitCreditCode(dto);
data.put("dataList", jgUseRegistrationManageDtos);
return data;
}
public Map<String, Object> queryBySequenceNbr(Long sequenceNbr) {
......@@ -766,6 +947,13 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
BeanUtil.copyProperties(jgChangeRegistrationName, dtoMap);
dtoMap.put("changeCertificate", JSON.parseArray(jgChangeRegistrationName.getChangeCertificate()));
dtoMap.put("otherAccessories", JSON.parseArray(jgChangeRegistrationName.getOtherAccessories()));
// 查询历史数据中选择的使用登记证信息
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr).one();
if (!ObjectUtils.isEmpty(jgRegistrationHistory)) {
JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
JSONObject dataList = JSONObject.parseObject(jsonObject.get("jgRegistrationInfo").toString());
dtoMap.put("dataList", dataList.get("dataList"));
}
map.put("jgRegistrationInfo", dtoMap);
return map;
}
......
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