Skip to content

A
amos-boot-biz
Commit d6239b07 authored by chenzhao's avatar chenzhao
Browse files
Options

报检设备列表字段增加 接口调整 新增报检接口调整

parent 7a853cde
Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 22 deletions
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionApplicationEquipModel.java
View file @ d6239b07
......@@ -85,4 +85,20 @@ public class JyjcInspectionApplicationEquipModel extends BaseModel {
@ApiModelProperty(value = "使用单位统一信用代码")
private String useUnitCreditCode;
@ApiModelProperty(value = "品种")
private String equDefine;
@ApiModelProperty(value = "设备名称 ")
private String productName;
@ApiModelProperty(value = "品牌")
private String brandName;
@ApiModelProperty(value = "监管码")
private String superVisonryCode;
@ApiModelProperty(value = "型号")
private String equType;
@ApiModelProperty(value = "制造单位名称")
private String productUnitName;
@ApiModelProperty(value = "制造日期")
private String productDate;
// @ApiModelProperty(value = "使用年限")
// private String use;
}
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml
View file @ d6239b07
......@@ -77,13 +77,17 @@
use_org_code,
equ_code,
supervisory_code,
ibjri.BRAND_NAME,
ibjri.PRODUCT_NAME,
ibjoi.SUPERVISORY_CODE,
ibjri.BRAND_NAME brandName,
ibjri.PRODUCT_NAME productName,
ibjoi.SUPERVISORY_CODE as superVisonryCode,
ibjci.USC_UNIT_NAME as useUnitName,
ibjfi.PRODUCE_UNIT_NAME as productUnitName,
ibjfi.PRODUCE_DATE as productDate
from
idx_biz_jg_use_info ibjui
left join idx_biz_jg_register_info ibjri on ibjui.record = ibjri.record
left join idx_biz_jg_construction_info ibjci on ibjci.record = ibjri.record
left join idx_biz_jg_factory_info ibjfi on ibjci.record = ibjri.record
left join idx_biz_jg_other_info ibjoi on ibjui.record = ibjoi.record
left join amos_tzs_biz.tz_equipment_category tec on ibjri.equ_category = tec.code
left join amos_tzs_biz.tz_equipment_category tec1 on ibjri.equ_list = tec1.code
......
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 @ d6239b07
......@@ -5,14 +5,12 @@ import cn.hutool.core.map.MapBuilder;
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.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.enums.WorkFlowEnum;
import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationAttachment;
import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationEquip;
import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResult;
import com.yeejoin.amos.boot.module.jyjc.api.entity.*;
import com.yeejoin.amos.boot.module.jyjc.api.enums.DocumentEnum;
import com.yeejoin.amos.boot.module.jyjc.api.enums.FlowStatusEnum;
import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationMapper;
......@@ -25,6 +23,7 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.workflow.Workflow;
import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
import com.yeejoin.amos.feign.workflow.model.AjaxResult;
import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
import lombok.extern.slf4j.Slf4j;
......@@ -73,6 +72,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
JyjcInspectionApplicationPushLogServiceImpl jyjcInspectionApplicationPushLogService;
@Autowired
JyjcOpeningApplicationServiceImpl jyjcOpeningApplicationService;
@Autowired
WorkflowFeignService workflowFeignService;
......@@ -81,17 +82,45 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
//开启报检流程工作流
if (!model.getOperationType().equals("2")) {
if (model.getOperationType().equals("0")) {
JSONObject body = new JSONObject();
String businessKey = buildOrderNo();
body.put(WorkFlowEnum.BUSINESSKEY.getCode(), businessKey);
body.put(WorkFlowEnum.processDefinitionKey.getCode(), model.getProcessKey());
JSONObject jsonObject = workflowFeignService.startByVariable(body);
String processId = JSONObject.parseObject(JSONObject.toJSONString(jsonObject.get("data"))).getString("id");
model.setProcessInstanceId(processId);
ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
dto.setProcessDefinitionKey( model.getProcessKey());
dto.setBusinessKey(buildOrderNo());
// dto.setCompleteFirstTask(true);
// JSONObject body = new JSONObject();
// String businessKey = buildOrderNo();
// body.put(WorkFlowEnum.BUSINESSKEY.getCode(), businessKey);
// body.put(WorkFlowEnum.processDefinitionKey.getCode(), model.getProcessKey());
// body.put("completeFirstTask", Boolean.TRUE);
// dto.setCompleteFirstTask(true);
try {
FeignClientResult ajaxResult = Workflow.taskV2Client.startByVariable(dto);
String id = ((Map) ajaxResult.getResult()).get("id").toString();
model.setProcessInstanceId(id);
execueFlow(MapBuilder.<String, Object>create().put("op", "0").put("instanceId", id).put("comments", "").build());
} catch (Exception e) {
e.printStackTrace();
}
// JSONObject body = new JSONObject();
// String businessKey = buildOrderNo();
// body.put(WorkFlowEnum.BUSINESSKEY.getCode(), businessKey);
// body.put(WorkFlowEnum.processDefinitionKey.getCode(), model.getProcessKey());
// JSONObject jsonObject = workflowFeignService.startByVariable(body);
// String processId = JSONObject.parseObject(JSONObject.toJSONString(jsonObject.get("data"))).getString("id");
model.setStatus("已提交");
} else if (model.getOperationType().equals("1")) {
model.setStatus("草稿");
}
LambdaQueryWrapper<JyjcOpeningApplication> wa = new LambdaQueryWrapper<JyjcOpeningApplication>().eq(JyjcOpeningApplication::getUnitCode, model.getInspectionUnitCode()).eq(JyjcOpeningApplication::getStatus, FlowStatusEnum.HAVE_PROCESSED.getCode());
JyjcOpeningApplication jyjcOpeningApplication = jyjcOpeningApplicationService.getBaseMapper().selectOne(wa);
//检验检测结果方式
model.setResultType(jyjcOpeningApplication.getResultType());
model.setApplicationNo(UUID.randomUUID().toString());
model.setApplicationDate(new Date());
model = this.createWithModel(model);
......@@ -125,13 +154,14 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
//更新报检装备监管码
jyjcInspectionApplicationEquipService.getBaseMapper().deleteByApplicationSeq(model.getSequenceNbr());
if (model.getEquip().size() > 0) {
List<Map<String, Object>> equip = model.getEquip();
List<String> jgm = equip.stream().map(e -> e.get("equipUnicode").toString()).collect(Collectors.toList());
for (String s : jgm) {
JyjcInspectionApplicationEquip equipInfo = new JyjcInspectionApplicationEquip();
equipInfo.setApplicationSeq(model.getSequenceNbr());
equipInfo.setEquipUnicode(s);
jyjcInspectionApplicationEquipService.save(equipInfo);
// List<Map<String, Object>> equip = model.getEquip();
// List<String> jgm = equip.stream().map(e -> e.get("equipUnicode").toString()).collect(Collectors.toList());
List<JyjcInspectionApplicationEquip> equips = JSONObject.parseArray(JSON.toJSONString(model.getEquip()), JyjcInspectionApplicationEquip.class);
for (JyjcInspectionApplicationEquip equip : equips) {
equip.setApplicationSeq(model.getSequenceNbr());
jyjcInspectionApplicationEquipService.save(equip);
}
}
......
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