Skip to content

A
amos-boot-biz
Commit eb824ed2 authored by yangyang's avatar yangyang
Browse files
Options

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

parents 19f8c327 fe7d5be4
Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 43 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgEquipTransferDto.java
View file @ eb824ed2
......@@ -110,4 +110,7 @@ public class JgEquipTransferDto extends BaseDto {
@ApiModelProperty(value = "设备地址")
private String concatenatedAddress;
@ApiModelProperty(value = "流程建议")
private String processAdvice;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgRegistrationHistoryDto.java
View file @ eb824ed2
package com.yeejoin.amos.boot.module.jg.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
*
*
* @author system_generator
* @date 2023-12-20
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="JgRegistrationHistoryDto", description="")
@EqualsAndHashCode (callSuper = true)
@ApiModel (value = "JgRegistrationHistoryDto", description = "")
public class JgRegistrationHistoryDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "创建人ID")
@ApiModelProperty (value = "创建人ID")
private String createUserId;
@ApiModelProperty(value = "创建时间")
@ApiModelProperty (value = "创建时间")
private Date createDate;
@ApiModelProperty(value = "使用登记编号")
@ApiModelProperty (value = "使用登记编号")
private String useRegistrationCode;
@ApiModelProperty(value = "登记类别(改造登记、移装登记)")
@ApiModelProperty (value = "登记类别(改造登记、移装登记)")
private String registrationClass;
@ApiModelProperty(value = "变更数据")
@ApiModelProperty (value = "变更数据")
private String changeData;
@ApiModelProperty(value = "设备监管码")
@ApiModelProperty (value = "设备监管码")
private String supervisoryCode;
@ApiModelProperty(value = "设备id")
@ApiModelProperty (value = "设备id")
private String equId;
@ApiModelProperty(value = "数据状态（新数据：new，历史数据：history）")
@ApiModelProperty (value = "数据状态（新数据：new，历史数据：history）")
private String status;
@ApiModelProperty(value = "当前单据Id")
@ApiModelProperty (value = "当前单据Id")
private String currentDocumentId;
@ApiModelProperty(value = "登记类型")
@ApiModelProperty (value = "登记类型")
private String registrationType;
@ApiModelProperty (value = "原有数据")
private String oldData;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgEquipTransfer.java
View file @ eb824ed2
......@@ -163,4 +163,6 @@ public class JgEquipTransfer extends BaseEntity {
@TableField(exist = false)
private String concatenatedAddress;
@TableField(exist = false)
private String processAdvice;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgRegistrationHistory.java
View file @ eb824ed2
package com.yeejoin.amos.boot.module.jg.api.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
......@@ -25,13 +26,13 @@ public class JgRegistrationHistory extends BaseEntity {
/**
* 创建人ID
*/
@TableField("create_user_id")
@TableField(value = "create_user_id", fill = FieldFill.INSERT_UPDATE)
private String createUserId;
/**
* 创建时间
*/
@TableField("create_date")
@TableField(value = "create_date", fill = FieldFill.INSERT_UPDATE)
private Date createDate;
/**
......@@ -82,4 +83,10 @@ public class JgRegistrationHistory extends BaseEntity {
@TableField("registration_type")
private String registrationType;
/**
* 原有数据
*/
@TableField("old_data")
private String oldData;
}
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 @ eb824ed2
......@@ -41,7 +41,15 @@ public enum WorkFlowStatusEnum {
CHANGE_SUBMIT("使用单位提交", "changeSubmit", "使用单位待提交", "一级受理已驳回", "使用单位提交已撤回"),
CHANGE_RECEIVE("一级受理", "changeReceive", "一级待受理", "二级受理已驳回", "一级受理已撤回"),
CHANGE_PRELIMINARY("二级受理", "changePreliminary", "二级待受理", "三级受理已驳回", "二级受理已撤回"),
CHANGE_REEXAMINE("三级受理", "changeReexamine", "三级待受理", "", "");
CHANGE_REEXAMINE("三级受理", "changeReexamine", "三级待受理", "", ""),
/**
* 移装变更登记流程
*/
TRANSFER_SUBMIT("使用单位提交", "transferSubmit", "使用单位待提交", "一级受理已驳回", "使用单位提交已撤回"),
TRANSFER_RECEIVE("一级受理", "transferReceive", "一级待受理", "二级受理已驳回", "一级受理已撤回"),
TRANSFER_PRELIMINARY("二级受理", "transferPreliminary", "二级待受理", "三级受理已驳回", "二级受理已撤回"),
TRANSFER_REEXAMINE("三级受理", "transferReexamine", "三级待受理","","");
private final String name;
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintenanceContractMapper.xml
View file @ eb824ed2
......@@ -162,6 +162,7 @@
</foreach>
</if>
</where>
order by apply_no desc
</select>
<select id="queryBySequenceNbr"
resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractDto">
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml
View file @ eb824ed2
......@@ -23,7 +23,8 @@
re.equ_id as equipId,
ur.apply_no as applyNo,
ur.next_execute_ids as nextExecuteIds,
ur.promoter
ur.promoter,
ur.supervisory_code as supervisoryCode
from tzs_jg_use_registration ur
LEFT JOIN tzs_jg_use_registration_eq re on ur.sequence_nbr = re.equip_transfer_id
LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD
......@@ -58,7 +59,9 @@
order by ur.rec_date desc
</select>
<select id="getDetail" resultType="java.util.Map">
SELECT jri.EQU_CODE as equCode,
SELECT
jri.RECORD as equipId,
jri.EQU_CODE as equCode,
-- (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
-- (SELECT name from tz_equipment_category where code = jri.EQU_LIST) as equList,
-- (SELECT name from tz_equipment_category where code = jri.EQU_DEFINE) as equDefine,
......@@ -87,12 +90,13 @@
</select>
<select id="getInspectDetail" resultType="java.util.Map">
SELECT INSPECT_TYPE as inspectType,
INSPECT_STAFF as inspctStaff,
INSPECT_STAFF as inspectStaff,
INSPECT_CONCLUSION as inspectConclusion,
INSPECT_ORG_NAME as inspectOrgName,
INSPECT_DATE as inspectDate,
NEXT_INSPECT_DATE as nextInspectDate,
INSPECT_REPORT as inspectReport
INSPECT_REPORT as inspectReport,
INSPECT_ORG_CODE as inspectOrgCode
from idx_biz_jg_inspection_detection_info
where RECORD = #{id}
ORDER BY INSPECT_DATE desc LIMIT 1
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgEquipTransferByWorkFlowController.java
View file @ eb824ed2
......@@ -39,7 +39,14 @@ public class JgEquipTransferByWorkFlowController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/accept")
@ApiOperation(httpMethod = "POST", value = "设备移交受理", notes = "设备移交受理")
public ResponseModel<JgEquipTransferDto> accept(@RequestBody JgEquipTransferDto jgEquipTransferDto, String op) {
public ResponseModel<JgEquipTransferDto> accept(@RequestBody Map<String, Object> model, String op) {
LinkedHashMap equipTransferInfo = (LinkedHashMap)model.get("model");
String opinion = (String)model.get("opinion");
if (Objects.isNull(equipTransferInfo)) {
throw new IllegalArgumentException("参数equipTransferInfo不能为空");
}
JgEquipTransferDto jgEquipTransferDto = JSON.parseObject(JSON.toJSONString(equipTransferInfo), JgEquipTransferDto.class);
jgEquipTransferDto.setProcessAdvice(opinion);
jgEquipTransferServiceImpl.accept(jgEquipTransferDto,op);
return ResponseHelper.buildResponse(null);
}
......
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 @ eb824ed2
......@@ -105,8 +105,8 @@ public class JgUseRegistrationController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getDetail")
public ResponseModel<Map<String, Object>> getDetail(@RequestParam("id") String id) {
return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getDetail(id));
public ResponseModel<Map<String, Object>> getDetail(@RequestParam("record") String record) {
return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getDetail(record));
}
@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/JgEquipTransferServiceImpl.java
View file @ eb824ed2
......@@ -31,7 +31,6 @@ import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.typroject.tyboot.core.foundation.context.RequestContext;
......@@ -52,8 +51,7 @@ import java.util.stream.Collectors;
@Service
public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,JgEquipTransfer, JgEquipTransferMapper> implements IJgEquipTransferService {
@Value("${workflow.process-definition-key.equip-transfer:}")
private String equipTransferProcessKey;
private static final String EQUIP_TRANSFER_PROCESS_KEY = "equipmentHandover";
private static final String SUBMIT_TYPE_FLOW = "1";
@Autowired
......@@ -98,7 +96,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
for (int i = 0; i<deviceList.size() ; i++
) {
ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
dto.setProcessDefinitionKey(equipTransferProcessKey);
dto.setProcessDefinitionKey(EQUIP_TRANSFER_PROCESS_KEY);
dto.setBusinessKey(String.valueOf(i));
list.add(dto);
}
......@@ -242,7 +240,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
public String startFlow(String businessKey) throws Exception {
// 重新开启工作流
ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
dto.setProcessDefinitionKey(equipTransferProcessKey);
dto.setProcessDefinitionKey(EQUIP_TRANSFER_PROCESS_KEY);
dto.setBusinessKey(StringUtils.defaultString(businessKey, "1"));
AjaxResult ajaxResult = Workflow.taskClient.startByVariable(dto);
......@@ -295,9 +293,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
handleJsonArrayFields(equipmentInfos.get(0), fields);
Map<String, Object> resultMap = new HashMap<>();
resultMap.put("transferInfo", equipmentInfos.get(0));
equipTransferInfo.forEach((key, value) -> resultMap.computeIfAbsent(key, k -> value));
resultMap.putAll(equipmentInfos.get(0));
resultMap.putAll(equipTransferInfo);
return resultMap;
}
......@@ -309,8 +306,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
private Map<String, Object> createEquipTransferInfo(JgEquipTransfer equipTransfer) {
Map<String, Object> equipTransferInfo = new HashMap<>(BeanUtil.beanToMap(equipTransfer));
//equipTransferInfo.put("useUnitCreditCode", equipTransfer.getUseUnitCreditCode() + "_" + equipTransfer.getUseUnitName());
//equipTransferInfo.put("installUnitCreditCode", equipTransfer.getInstallUnitCreditCode() + "_" + equipTransfer.getInstallUnitName());
equipTransferInfo.put("installUnitCreditCode", equipTransfer.getInstallUnitCreditCode() + "_" + equipTransfer.getInstallUnitName());
return equipTransferInfo;
}
......@@ -324,6 +320,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
String[] taskName = new String[]{"流程结束"};
String userId = RequestContext.getExeUserId();
JgEquipTransfer jgEquipTransfer = this.baseMapper.selectById(jgEquipTransferDto.getSequenceNbr());
jgEquipTransfer.setProcessAdvice(jgEquipTransferDto.getProcessAdvice());
// 组装设备注册代码
StringBuffer stringBuffer = new StringBuffer();
String ym = null;
......@@ -343,7 +340,6 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
if(roleList.isEmpty()) {
jgEquipTransfer.setApplyStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
jgEquipTransfer.setPromoter("");
//TODO
} else {
jgEquipTransfer.setNextExecuteIds(String.join(",", roleList));
if (!ObjectUtils.isEmpty(jgEquipTransfer.getInstanceStatus())) {
......@@ -357,8 +353,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
} else {
//驳回
jgEquipTransfer.setPromoter("");
jgEquipTransfer.setApplyStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
jgEquipTransfer.setInstanceStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
jgEquipTransfer.setApplyStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
}
updateById(jgEquipTransfer);
}
......@@ -411,7 +406,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
// 发起流程
if (!org.springframework.util.StringUtils.hasText(equipTransferDto.getInstanceId())) {
ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
dto.setProcessDefinitionKey(equipTransferProcessKey);
dto.setProcessDefinitionKey(EQUIP_TRANSFER_PROCESS_KEY);
dto.setBusinessKey("1");
try {
ajaxResult = Workflow.taskClient.startByVariable(dto);
......
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 @ eb824ed2
......@@ -42,10 +42,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.rdbms.service.BaseService;
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.*;
/**
* 服务实现类
......@@ -271,6 +268,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
if (!ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode())) {
// 生成使用登记证编号
jgUseRegistration.setUseRegistrationCode(getCode(jgUseRegistration.getSupervisoryCode()));
jgUseRegistration.setRegDate(new Date());
}
}
this.getBaseMapper().updateById(jgUseRegistration);
......@@ -386,7 +384,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
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"))));
detail.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
return detail;
}
......
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