Skip to content

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

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

parents d6239b07 b9c4cde3
Show whitespace changes
Inline Side-by-side
Showing with 78 additions and 45 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgInstallationNoticeMapper.xml
View file @ 07e85c38
......@@ -99,7 +99,7 @@
ui.ADDRESS AS useUnitAddress
FROM
tzs_jg_installation_notice isn
LEFT JOIN tzs_jg_relation_equip re ON re.business_id = isn.sequence_nbr
LEFT JOIN tzs_jg_installation_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr
LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equip_id
LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equip_id
LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equip_id
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/InspectionResultTypeEnum.java 0 → 100644
View file @ 07e85c38
package com.yeejoin.amos.boot.module.jyjc.api.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 检验结果
* <p>
* ProjectName: amos-boot-biz
* PackageName: com.yeejoin.amos.boot.module.jyjc.api.enums
*
* @author yangyang
* @version v1.0
* @date 2023/12/18 14:13
*/
@Getter
@AllArgsConstructor
public enum InspectionResultTypeEnum {
INPUT("input","录入"),
INTEGRATED("integrated","集成");
private String code;
private String name;
}
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 @ 07e85c38
......@@ -56,6 +56,9 @@ public class JyjcInspectionApplicationEquipModel extends BaseModel {
@ApiModelProperty(value = "设备种类名称")
private String equListName;
@ApiModelProperty(value = "设备品种")
private String equDefine;
@ApiModelProperty(value = "使用登记证编号")
private String useOrgCode;
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionApplicationController.java
View file @ 07e85c38
......@@ -194,10 +194,10 @@ public class JyjcInspectionApplicationController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST",value = "接收", notes = "接收")
@PostMapping(value = "/flow/{type}/receive")
public ResponseModel<HashMap<String,String>> execueFlow(@PathVariable(value = "type") String type, @RequestBody Map<String, Object> params) {
public ResponseModel<HashMap<String, String>> execueFlow(@PathVariable(value = "type") String type, @RequestBody Map<String, Object> params) {
params.put("type", type);
jyjcInspectionApplicationServiceImpl.doReceive(params);
HashMap<String,String> result =new HashMap<>();
HashMap<String, String> result = new HashMap<>();
result.put("result","success");
return ResponseHelper.buildResponse(result);
}
......@@ -215,8 +215,8 @@ public class JyjcInspectionApplicationController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "退回", notes = "退回")
@PostMapping(value = "/flow/reject")
public void doRejectFlow(@RequestBody Map<String,Object> params) {
jyjcInspectionApplicationServiceImpl.doReject(params);
public ResponseModel<Boolean> doRejectFlow(@RequestBody Map<String,Object> params) {
return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.doReject(params));
}
/**
......@@ -232,8 +232,8 @@ public class JyjcInspectionApplicationController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "撤回", notes = "撤回")
@GetMapping(value = "/flow/rollback")
public void doRollbackFlow(@RequestParam("sequenceNbr") String sequenceNbr) {
jyjcInspectionApplicationServiceImpl.doRollback(sequenceNbr);
public ResponseModel<Boolean> doRollbackFlow(@RequestParam("sequenceNbr") String sequenceNbr) {
return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.doRollback(sequenceNbr));
}
/**
* 查询指定设备种类的设备列表
......
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 @ 07e85c38
......@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
import com.yeejoin.amos.boot.module.jyjc.api.enums.FlowStatusEnum;
import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationRequstDto;
import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.GroupModel;
......@@ -231,4 +232,15 @@ public class JyjcOpeningApplicationController extends BaseController {
return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.selectForFlowStatusList());
}
/**
* 查询检验检测机构列表（基本信息及联系人）by 开通机构过滤
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getInspectionUnitList")
@ApiOperation(httpMethod = "GET", value = "查询检验检测机构列表（基本信息及联系人）", notes = "查询检验检测机构列表（基本信息及联系人）by 开通机构过滤")
public ResponseModel<List<TzBaseEnterpriseInfo>> getInspectionUnitList() {
return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.getInspectionUnitList());
}
}
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 @ 07e85c38
......@@ -13,11 +13,13 @@ import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
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.enums.ResultStatusEnum;
import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationMapper;
import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationAttachmentModel;
import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel;
import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionApplicationService;
import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.handler.JyjcInspectionApplicationHandlerFactory;
import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
......@@ -278,13 +280,17 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
resultModel.setInspectionUnitCode(inspectionApplicationModel.getInspectionUnitCode());
resultModel.setApplicationNo(inspectionApplicationModel.getApplicationNo());
resultModel.setApplicationUnitCode(inspectionApplicationModel.getApplicationUnitCode());
resultModel.setResultStatus("未出");
resultModel.setResultStatus(ResultStatusEnum.NO_RESULT.getCode());
resultModel.setApplicationDate(inspectionApplicationModel.getApplicationDate());
resultModel.setResultType(inspectionApplicationModel.getResultType());
// 解析设备
resultModel.setBizType(inspectionApplicationModel.getBizType());
resultModel.setResultNo(codes.get(i));
resultModel.setEquipUnicode(applicationEquipModels.get(i).getEquipUnicode());//设备唯一标识
resultModel.setEquDefine(applicationEquipModels.get(i).getEquDefine());
resultModel.setEquCategory(applicationEquipModels.get(i).getEquCategory());
resultModel.setEquList(applicationEquipModels.get(i).getEquList());
resultModels.add(resultModel);
}
inspectionResultService.saveOrUpdateBatch(resultModels);
// 通知对应的检验机构
......@@ -301,11 +307,12 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
* @author yangyang
* @date 2023/12/15 15:14
*/
public void doReject(Map<String, Object> params) {
public Boolean doReject(Map<String, Object> params) {
execueFlow(params);
String instanceId = Optional.ofNullable(params.get("instanceId")).orElse("").toString();
params.put("status", FlowStatusEnum.REJECTED.getCode() + "");
updateModelByInstanceId(instanceId, params);
return true;
}
/**
......@@ -316,7 +323,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
String instanceId = params.get("instanceId").toString();
String comments = params.get("comments").toString();
try {
AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
AjaxResult ajaxResult = Workflow.taskClient.getTaskNoAuth(instanceId);
log.info("getTaskNoAuth result => {}", ajaxResult);
JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
String taskId = dataObject.getString("id");
//组装信息
......@@ -341,23 +349,25 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
/**
* 撤回流程办理单
*/
public void doRollback(String sequenceNbr) {
JSONObject jsonObject;
public Boolean doRollback(String sequenceNbr) {
JyjcInspectionApplicationModel inspectionApplicationModel = this.queryBySeq(Long.valueOf(sequenceNbr));
if (inspectionApplicationModel == null) {
log.warn("JyjcInspectionApplicationModel Not Found！sequenceNbr => " + sequenceNbr);
return;
return false;
}
try {
// 撤回流程
jsonObject = workflowHelper.rollBack(inspectionApplicationModel.getProcessInstanceId());
if (ObjectUtils.isEmpty(jsonObject)) {
JSONObject jsonObject = workflowHelper.rollBack(inspectionApplicationModel.getProcessInstanceId());
if (ObjectUtils.isEmpty(jsonObject) || 200 != jsonObject.getInteger("status")) {
// size = 6
throw new BaseException("撤回工作流错误");
}
updateModelByInstanceId(inspectionApplicationModel.getProcessInstanceId(), MapBuilder.<String, Object>create().put("status", FlowStatusEnum.REJECTED.getCode() + "").build());
updateModelByInstanceId(inspectionApplicationModel.getProcessInstanceId(), MapBuilder.<String, Object>create().put("status", FlowStatusEnum.ROLLBACK.getCode() + "").build());
return true;
} catch (Exception e) {
e.printStackTrace();
log.error("撤回工作流错误, => {}", inspectionApplicationModel.getProcessInstanceId(), e);
return false;
}
}
......
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 @ 07e85c38
......@@ -405,34 +405,6 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
dataObject.put("nodeInfo", nodeInfo.getResult());
return dataObject;
}
//
// /**
// * JY+年（4位）+月（2位）+日（2位）+序列号（3位
// *
// * @param
// * @return {@link java.lang.String}
// * @throws
// * @author yangyang
// * @date 2023/12/13 22:30
// */
// private String buildApplicationSeq() {
// String sdf = new SimpleDateFormat("yyyyMMdd").format(new Date());
// long increment = redisUtils.incr(CommonConstants.OPEN_APPLICATION_SEQ_KEY, 1);
// if (increment == 0) {
// redisUtils.expire(CommonConstants.OPEN_APPLICATION_SEQ_KEY, nextDay());
// }
// return CommonConstants.APPLICATION_SEQ_PREFIX + sdf + String.format("%03d", increment);
// }
//
// private long nextDay() {
// Calendar calendar = Calendar.getInstance();
// calendar.set(Calendar.HOUR_OF_DAY, 0);
// calendar.set(Calendar.MINUTE, 0);
// calendar.set(Calendar.SECOND, 0);
// calendar.set(Calendar.MILLISECOND, 0);
// calendar.add(Calendar.DAY_OF_MONTH, 1);
// return (calendar.getTimeInMillis() - System.currentTimeMillis()) / 1000;
// }
public List<Map<String, Object>> selectForFlowStatusList() {
return Arrays.stream(FlowStatusEnum.values()).map(this::mapPointTypeToMap).collect(Collectors.toList());
......@@ -456,4 +428,14 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
deleteBatchByIds(ids);
return true;
}
public List<TzBaseEnterpriseInfo> getInspectionUnitList() {
List<TzBaseEnterpriseInfo> tzBaseEnterpriseInfos = enterpriseInfoMapper.getInspectionUnitList(CommonserviceImpl.UNIT_TYPE);
if (ValidationUtil.isEmpty(tzBaseEnterpriseInfos)) {
return Collections.EMPTY_LIST;
}
List<String> unitCodes = this.lambdaQuery().select(JyjcOpeningApplication::getUnitCode).list().stream().map(JyjcOpeningApplication::getUnitCode).collect(Collectors.toList());
// 根据开通机构过滤
return tzBaseEnterpriseInfos.stream().filter(o -> StringUtils.isNotBlank(o.getUseCode()) && unitCodes.contains(o.getUseCode())).collect(Collectors.toList());
}
}
\ No newline at end of file
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