Skip to content

A
amos-boot-biz
Commit 37ddceaf authored by 刘林's avatar 刘林
Browse files
Options

fix(JG)：监管履历信息功能开发

parent f9d41ddc
Show whitespace changes
Inline Side-by-side
Showing with 137 additions and 36 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgResumeInfo.java
View file @ 37ddceaf
......@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.jg.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgResumeInfoController.java
View file @ 37ddceaf
......@@ -44,6 +44,18 @@ public class JgResumeInfoController extends BaseController {
}
/**
* 新增监管履历信息表
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/saveBatchResume")
@ApiOperation(httpMethod = "POST", value = "批量新增", notes = "批量新增")
public boolean saveBatchResume(@RequestBody List<JgResumeInfoDto> jgResumeInfoDtoList) {
return jgResumeInfoServiceImpl.saveBatchResume(jgResumeInfoDtoList);
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
......
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/JgMaintenanceContractServiceImpl.java
View file @ 37ddceaf
......@@ -81,6 +81,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
@Autowired
IJgInstallationNoticeService jrmInstallationNoticeService;
@Autowired
EmqKeeper emqKeeper;
@Autowired
private JgMaintenanceContractMapper maintenanceContractMapper;
@Autowired
private JgMaintenanceContractEqMapper maintenanceContractEqMapper;
......@@ -92,8 +94,6 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
private RedissonClient redissonClient;
@Autowired
private JgResumeInfoServiceImpl jgResumeInfoService;
@Autowired
EmqKeeper emqKeeper;
/**
* 分页查询
......@@ -130,7 +130,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
}
}
contractList = maintenanceContractMapper.getContractList(page, sortMap, dto, reginParams.getUserModel().getUserId());
List<JgMaintenanceContractDto> records = contractList.getRecords().stream().peek(x->x.setUnitType(company.getCompanyType())).collect(Collectors.toList());
List<JgMaintenanceContractDto> records = contractList.getRecords().stream().peek(x -> x.setUnitType(company.getCompanyType())).collect(Collectors.toList());
contractList.setRecords(records);
BeanUtils.copyProperties(contractList, result);
return result;
......@@ -297,6 +297,24 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
modelDto.setModel(taskMessageDto);
// 再插入新代办、数据待定
commonService.buildTaskModel(Collections.singletonList(modelDto));
// 新增人员履历消息表
LambdaQueryWrapper<JgMaintenanceContractEq> lambda = new QueryWrapper<JgMaintenanceContractEq>().lambda();
lambda.eq(JgMaintenanceContractEq::getEquipTransferId, contract.getSequenceNbr());
List<JgMaintenanceContractEq> jgMaintenanceContractEqList = jgMaintenanceContractEqService.getBaseMapper().selectList(lambda);
jgResumeInfoService.saveBatchResume(
jgMaintenanceContractEqList.stream()
.map(v -> JgResumeInfoDto.builder()
.applyNo(contract.getApplyNo())
.businessType(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName())
.businessId(String.valueOf(contract.getSequenceNbr()))
.equId(String.valueOf(v.getEquId()))
.approvalUnit(contract.getReceiveOrgName())
.approvalUnitCode(contract.getReceiveOrgCode())
.status("正常")
.routePath(taskV2Model.getRoutePath())
.build())
.collect(Collectors.toList())
);
}
......@@ -429,15 +447,6 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
equip.setEquId(String.valueOf(x.get("SEQUENCE_NBR")));
equip.setEquipTransferId(contract.getSequenceNbr().toString());
equipList.add(equip);
jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
.applyNo(contractDto.getApplyNo())
.businessType(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName())
.businessId(contract.getSequenceNbr() + "")
.equId(String.valueOf(x.get("record")))
.approvalUnit(contractDto.getReceiveOrgName())
.approvalUnitCode(contractDto.getReceiveOrgCode())
.status("正常")
.build());
});
// 保存关联设备信息
jgMaintenanceContractEqService.saveBatch(equipList);
......
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/JgResumeInfoServiceImpl.java
View file @ 37ddceaf
......@@ -5,9 +5,13 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgResumeInfoDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgResumeInfo;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgResumeInfoMapper;
import com.yeejoin.amos.boot.module.jg.api.service.IJgResumeInfoService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
/**
* 服务实现类
......@@ -30,4 +34,16 @@ public class JgResumeInfoServiceImpl extends BaseService<JgResumeInfoDto,JgResum
public List<JgResumeInfoDto> queryForJgResumeInfoList() {
return this.queryForList("" , false);
}
@Transactional
public boolean saveBatchResume(List<JgResumeInfoDto> jgResumeInfoDtoList) {
Collection<JgResumeInfo> jgResumeInfoCollection = jgResumeInfoDtoList.stream()
.map(dto -> {
JgResumeInfo info = new JgResumeInfo();
BeanUtils.copyProperties(dto, info);
return info;
})
.collect(Collectors.toList());
return this.saveBatch(jgResumeInfoCollection);
}
}
\ No newline at end of file
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 @ 37ddceaf
......@@ -693,23 +693,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
jgRelationEquipMapper.delete(new QueryWrapper<JgUseRegistrationEq>().lambda().eq(JgUseRegistrationEq::getEquipTransferId, useRegistration.getSequenceNbr()));
}
// 更新关联气瓶信息
equipmentLists.stream()
.map(x -> {
JgUseRegistrationEq equip = new JgUseRegistrationEq()
List<JgUseRegistrationEq> equipList = equipmentLists.stream()
.map(x -> new JgUseRegistrationEq()
.setEquId(String.valueOf(x.get("record")))
.setEquipTransferId(String.valueOf(useRegistration.getSequenceNbr()));
jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
.applyNo(useRegistration.getApplyNo())
.businessType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName()+"(单位)")
.businessId(String.valueOf(useRegistration.getSequenceNbr()))
.equId(String.valueOf(x.get("record")))
.approvalUnit(useRegistration.getReceiveOrgName())
.approvalUnitCode(useRegistration.getReceiveOrgCode())
.status("正常")
.build());
return equip;
})
.forEach(jgUseRegistrationEqService::save);
.setEquipTransferId(String.valueOf(useRegistration.getSequenceNbr())))
.collect(Collectors.toList());
// 保存关联设备信息
jgUseRegistrationEqService.saveBatch(equipList);
// 启动流程
if (!ObjectUtils.isEmpty(map.get("submit"))) {
......@@ -1019,14 +1009,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
taskMessageDto.setEquipId(String.valueOf(mapData.get("equipId")));
params.put("model", taskMessageDto);
TaskV2Model taskV2Model = commonServiceImpl.updateTaskModel(params);
jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
.applyNo(jgUseRegistration.getApplyNo())
.businessType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName() + "(台套)")
.businessType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName())
.businessId(jgUseRegistration.getSequenceNbr() + "")
.equId((String) mapData.get("equipId"))
.approvalUnit(jgUseRegistration.getReceiveOrgName())
.approvalUnitCode(jgUseRegistration.getReceiveOrgCode())
.approvalUnitCode(jgUseRegistration.getReceiveCompanyCode())
.status("正常")
.routePath(taskV2Model.getRoutePath())
.build());
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JgResumeInfoDto.java 0 → 100644
View file @ 37ddceaf
package com.yeejoin.amos.boot.module.jyjc.api.model;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
*
*
* @author system_generator
* @date 2024-05-29
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="JgResumeInfoDto", description="")
@Builder
public class JgResumeInfoDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "申请编号")
private String applyNo;
@ApiModelProperty(value = "业务状态")
private String status;
@ApiModelProperty(value = "业务id")
private String businessId;
@ApiModelProperty(value = "创建时间")
private Date createDate;
@ApiModelProperty(value = "创建人id ")
private String createUserId;
@ApiModelProperty(value = "创建人")
private String createUserName;
@ApiModelProperty(value = "设备ID")
private String equId;
@ApiModelProperty(value = "业务类型")
private String businessType;
@ApiModelProperty(value = "审批单位")
private String approvalUnit;
@ApiModelProperty(value = "审批单位Code")
private String approvalUnitCode;
@ApiModelProperty(value = "详情路径")
private String routePath;
}
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/feign/JgFeignClient.java
View file @ 37ddceaf
......@@ -3,10 +3,11 @@ package com.yeejoin.amos.boot.module.jyjc.biz.feign;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
import com.yeejoin.amos.boot.module.jyjc.api.model.JgResumeInfoDto;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
@FeignClient(contextId = "jyjc", name = "${tzsJg.feign.name:TZS-JG}", path = "jg", configuration = {MultipartSupportConfig.class})
......@@ -17,7 +18,12 @@ public interface JgFeignClient {
*
* */
@RequestMapping(value = "/equipment-register/page", method = RequestMethod.GET)
FeignClientResult<Page<JSONObject>> queryForPage(@RequestParam Map<String,Object> map);
FeignClientResult<Page<JSONObject>> queryForPage(@RequestParam Map<String, Object> map);
/***
* 设备注册信息分页查询
* */
@RequestMapping(value = "/jg-resume-info/saveBatchResume", method = RequestMethod.POST)
FeignClientResult<Boolean> saveBatchResume(@RequestBody List<JgResumeInfoDto> jgResumeInfoDtoList);
}
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/JyjcInspectionApplicationServiceImpl.java
View file @ 37ddceaf
......@@ -572,7 +572,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
}
this.updateById(entity);
BeanUtils.copyProperties(entity, model);
updateTaskModel(model);
TaskV2Model taskV2Model = updateTaskModel(model);
// 执行接收业务
JyjcInspectionApplicationModel inspectionApplicationModel = this.queryBySeq(sequenceNbr);
......@@ -583,7 +583,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
}
List<JyjcInspectionResult> resultModels = new ArrayList<>();
List<String> codes = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.JG.getCode(), applicationEquipModels.size()).getResult();
List<JgResumeInfoDto> jgResumeInfoDtoList = new ArrayList<>();
for (int i = 0; i < applicationEquipModels.size(); i++) {
JyjcInspectionResult resultModel = new JyjcInspectionResult();
resultModel.setInspectionUnitCode(inspectionApplicationModel.getInspectionUnitCode());
......@@ -608,8 +608,20 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
resultModel.setIsExistNc(false);
this.setResultTypeByBizType(resultModel, inspectionApplicationModel.getBizType());
resultModels.add(resultModel);
// 新增设备履历信息
jgResumeInfoDtoList.add(JgResumeInfoDto.builder()
.applyNo(entity.getApplicationNo())
.businessType(resultModel.getInspectionTypeName())
.businessId(String.valueOf(entity.getSequenceNbr()))
.equId(applicationEquipModels.get(i).getEquipUnicode())
.approvalUnit(inspectionApplicationModel.getInspectionUnitName())
.approvalUnitCode(inspectionApplicationModel.getInspectionUnitCode())
.status("正常")
.routePath(taskV2Model.getRoutePath())
.build());
}
inspectionResultService.saveOrUpdateBatch(resultModels);
jgFeignClient.saveBatchResume(jgResumeInfoDtoList);
this.pushInspectionApplication(inspectionApplicationModel);
}
......
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