Skip to content

A
amos-boot-biz
Commit 694f3033 authored by 王果's avatar 王果
Browse files
Options

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

parents 96f76240 ca9cb81d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 185 additions and 89 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 @ 694f3033
......@@ -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 @ 694f3033
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="")
public class JgRegistrationHistoryDto extends BaseDto {
@EqualsAndHashCode (callSuper = true)
@ApiModel (value = "JgRegistrationHistoryDto", description = "")
public class JgRegistrationHistoryDto extends BaseDto {
private static final long serialVersionUID = 1L;
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/dto/JgScrapCancelDto.java
View file @ 694f3033
......@@ -100,4 +100,10 @@ public class JgScrapCancelDto extends BaseDto {
*/
private String useUnitName;
/**
* 设备ID
*/
private String record;
}
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 @ 694f3033
......@@ -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 @ 694f3033
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 @ 694f3033
......@@ -3,6 +3,11 @@ package com.yeejoin.amos.boot.module.jg.api.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 使用登记状态西悉尼
*/
......@@ -22,8 +27,8 @@ public enum WorkFlowStatusEnum {
/**
* 维保流程
*/
MAIN_SUBMIT("使用单位提交", "mainSubmit", "使用单位待提交", "维保单位已驳回", "使用单位撤回"),
MAIN_RECEIVE("维保单位审核确认", "mainReceive", "维保单位待受理", "监管单位已驳回", "维保单位撤回"),
MAIN_SUBMIT("使用单位提交", "mainSubmit", "使用单位待提交", "维保单位已驳回", "使用单位已撤回"),
MAIN_RECEIVE("维保单位审核确认", "mainReceive", "维保单位待受理", "监管单位已驳回", "维保单位已撤回"),
MAIN_PRELIMINARY("监管单位审核", "mainPreliminary", "监管单位待受理", "", ""),
......@@ -41,7 +46,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;
......@@ -64,4 +77,29 @@ public enum WorkFlowStatusEnum {
}
return null;
}
public static List<Map<String, String>> getInfoList(String code) {
List<Map<String, String>> resultList = new ArrayList<>();
for (WorkFlowStatusEnum constants : values()) {
if (constants.getCode().startsWith(code)) {
HashMap<String, String> hashMap = new HashMap<>();
hashMap.put("name", constants.getPass());
hashMap.put("value", constants.getPass());
resultList.add(hashMap);
HashMap<String, String> hashMap1 = new HashMap<>();
hashMap1.put("name", constants.getReject());
hashMap1.put("value", constants.getReject());
resultList.add(hashMap1);
HashMap<String, String> hashMap2 = new HashMap<>();
hashMap2.put("name", constants.getRollBack());
hashMap2.put("value", constants.getRollBack());
resultList.add(hashMap2);
}
}
HashMap<String, String> hashMap = new HashMap<>();
hashMap.put("name", "已完成");
hashMap.put("value", "已完成");
resultList.add(hashMap);
return resultList;
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgChangeRegistrationReformEqMapper.java
View file @ 694f3033
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.api.mapper;
import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReformEq;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
/**
......@@ -14,4 +15,7 @@ import org.apache.ibatis.annotations.Update;
public interface JgChangeRegistrationReformEqMapper extends BaseMapper<JgChangeRegistrationReformEq> {
@Update("update tzs_jg_change_registration_reform_eq set is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id != #{currentDocumentId} ")
void updateEquipIsVaildByEquipIdAndCurrentDocumentId(@Param("equipId") String equipId, @Param("currentDocumentId") String currentDocumentId);
@Select("select equ_id from tzs_jg_change_registration_reform_eq where equip_transfer_id = #{currentDocumentId} ")
String selectEquipId(@Param("currentDocumentId") String currentDocumentId);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationReformMapper.xml
View file @ 694f3033
......@@ -19,7 +19,7 @@
jri.EQU_CODE as equCode,
use.USE_INNER_CODE as innerCode,
concat(use.PROVINCE_NAME,'-',use.CITY_NAME,'-',use.COUNTY_NAME) as place,
ur.instance_id as instanceId,
ifnull(ur.instance_id, '') as instanceId,
re.equ_id as equipId,
ur.apply_no as applyNo,
ifnull(ur.next_executor_ids,'') as nextExecutorIds,
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintenanceContractMapper.xml
View file @ 694f3033
......@@ -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/JgScrapCancelMapper.xml
View file @ 694f3033
......@@ -12,8 +12,8 @@
select ur.sequence_nbr as sequenceNbr,
ur.instance_id as instanceId,
ur.audit_status as auditStatus,
ur.rec_date as recDate,
ur.create_date as createDate,
DATE_FORMAT(ur.rec_date,'%Y-%m-%d') as recDate,
DATE_FORMAT(ur.create_date,'%Y-%m-%d') as createDate,
ur.receive_org_code as receiveOrgCode,
ur.receive_org_name as receiveOrgName,
ur.receive_company_code as receiveCompanyCode,
......@@ -25,7 +25,7 @@
ur.instance_status as instanceStatus,
ur.promoter,
ifnull(ur.next_execute_ids,'') as nextExecuteIds,
audit_pass_date as auditPassDate,
DATE_FORMAT(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
use.USE_UNIT_CREDIT_CODE as useUnitCreditCode,
ur.use_unit_name as useUnitName,
ur.use_unit_code as useUnitCode,
......@@ -49,13 +49,13 @@
<if test="dto.auditStatus != null and dto.auditStatus != ''">
and ur.audit_status = #{dto.auditStatus}
</if>
<!-- <if test="dto.equCode != null and dto.equCode != ''">-->
<!-- and jri.EQU_CODE like concat('%',#{dto.equCode},'%')-->
<!-- </if>-->
<!-- <if test="dto.useUnitName != null and dto.useUnitName != ''">-->
<!-- and use.USE_UNIT_NAME like concat('%',#{dto.useUnitName},'%')-->
<!-- </if>-->
<!-- -->
<if test="dto.applyNo != null and dto.applyNo != ''">
and ur.apply_no like concat('%',#{dto.applyNo},'%')
</if>
<if test="dto.cancelType != null and dto.cancelType != ''">
and ur.cancel_type = #{dto.cancelType}
</if>
<if test="roleIds != null and dto.type == 'supervision'">
<foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
ur.instance_status like concat('%',#{role},'%')
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml
View file @ 694f3033
......@@ -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/CommonController.java
View file @ 694f3033
......@@ -146,7 +146,7 @@ public class CommonController extends BaseController {
}
private Map<String, Object> mapPointTypeToMap(FlowStatusEnum e) {
if (FlowStatusEnum.TO_SUBMITTED.getCode() == e.getCode()) {
if (FlowStatusEnum.TO_SUBMITTED.getCode() == e.getCode() || FlowStatusEnum.TO_BE_DISCARD.getCode() == e.getCode()) {
return null;
}
Map<String, Object> record = new HashMap<>();
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationReformController.java
View file @ 694f3033
......@@ -114,7 +114,7 @@ public class JgChangeRegistrationReformController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "获取详情", notes = "获取详情")
@GetMapping(value = "/getDetail")
public ResponseModel<Map<String, Object>> getDetail(@RequestParam("currentDocumentId") String currentDocumentId,@RequestParam("equipId") String equipId) {
public ResponseModel<Map<String, Object>> getDetail(@RequestParam("currentDocumentId") String currentDocumentId,@RequestParam(value = "equipId",required = false) String equipId) {
return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getDetail(currentDocumentId,equipId));
}
......
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 @ 694f3033
......@@ -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/JgScrapCancelController.java
View file @ 694f3033
......@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.jg.api.dto.JgScrapCancelDto;
import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgScrapCancelServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -96,7 +97,7 @@ public class JgScrapCancelController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "列表全部数据查询", notes = "列表全部数据查询")
@PostMapping(value = "/getList")
public ResponseModel<Page<Map<String, Object>>> getList(JgScrapCancelDto dto,
public ResponseModel<Page<Map<String, Object>>> getList(@RequestBody JgScrapCancelDto dto,
@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size) {
Page<Map<String, Object>> page = new Page<>(current, size);
......@@ -131,4 +132,12 @@ public class JgScrapCancelController extends BaseController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "列表筛选办理状态下拉", notes = "列表筛选办理状态下拉")
@GetMapping(value = "/getAuditStatusList")
public ResponseModel<List<Map<String, String>>> getAuditStatusList(@RequestParam(value = "code") String code) {
return ResponseHelper.buildResponse(WorkFlowStatusEnum.getInfoList(code));
}
}
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 @ 694f3033
......@@ -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/JgChangeRegistrationReformServiceImpl.java
View file @ 694f3033
......@@ -106,20 +106,21 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
UseInfo useInfo = new UseInfo();
BeanUtil.copyProperties(map, useInfo);
String equipId = map.get("record").toString();
LambdaQueryWrapper<UseInfo> lambda = new QueryWrapper<UseInfo>().lambda();
lambda.eq(UseInfo::getRecord, map.get("record"));
lambda.eq(UseInfo::getRecord,equipId);
// 更新使用信息
useInfoMapper.update(useInfo, lambda);
InspectionDetectionInfo inspectionDetectionInfo = new InspectionDetectionInfo();
BeanUtil.copyProperties(map, inspectionDetectionInfo);
LambdaQueryWrapper<InspectionDetectionInfo> inspectionLambda = new QueryWrapper<InspectionDetectionInfo>().lambda();
inspectionLambda.eq(InspectionDetectionInfo::getRecord, map.get("record"));
inspectionLambda.eq(InspectionDetectionInfo::getRecord, equipId);
// 更新检验检测信息
inspectionDetectionInfoMapper.update(inspectionDetectionInfo, inspectionLambda);
// 使用登记信息
JgChangeRegistrationReform jgChangeRegistrationReform = new JgChangeRegistrationReform();
LambdaQueryWrapper<OtherInfo> otherLambda = new QueryWrapper<OtherInfo>().lambda();
otherLambda.eq(OtherInfo::getRecord, map.get("record"));
otherLambda.eq(OtherInfo::getRecord, equipId);
OtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
String supervisoryCode = otherInfo.getSupervisoryCode();
jgChangeRegistrationReform.setSupervisoryCode(supervisoryCode);
......@@ -154,7 +155,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
//登记类别
jgRegistrationHistory.setRegistrationClass("改造登记");
//设备id
jgRegistrationHistory.setEquId(map.get("record").toString());
jgRegistrationHistory.setEquId(equipId);
//修改数据
jgRegistrationHistory.setChangeData(JSONObject.toJSONString(map));
//设备监管码
......@@ -165,13 +166,13 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
jgChangeRegistrationReform.setUseUnitCreditCode(null);
jgChangeRegistrationReform.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
this.getBaseMapper().updateById(jgChangeRegistrationReform);
jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByEquidAndDocumentId(map.get("record").toString(), String.valueOf(map.get("sequenceNbr"))));
jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByEquidAndDocumentId(equipId, String.valueOf(map.get("sequenceNbr"))));
jgRegistrationHistoryMapper.updateById(jgRegistrationHistory);
} else {
// 业务管理设备信息保存
JgChangeRegistrationReformEq jgChangeRegistrationReformEq = new JgChangeRegistrationReformEq();
jgChangeRegistrationReformEq.setEquId(map.get("record").toString());
jgChangeRegistrationReformEq.setEquId(equipId);
List<String> applicationFormCode = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.GZBG.getCode(), 1);
jgChangeRegistrationReform.setApplyNo(applicationFormCode.get(0));
jgChangeRegistrationReform.setAuditStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
......@@ -186,7 +187,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
if (!ObjectUtils.isEmpty(map.get("submit"))) {
String instanceId = "";
if (map.containsKey("instanceId")) {
if (!ObjectUtils.isEmpty(map.get("instanceId"))) {
instanceId = map.get("instanceId").toString();
} else {
// 启动并执行流程
......@@ -425,14 +426,21 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
public Map<String, Object> getDetail(String currentDocumentId, String equipId) {
JgChangeRegistrationReform jgChangeRegistrationReform = this.getBaseMapper().selectById(currentDocumentId);
if(ObjectUtils.isEmpty(equipId)){
equipId = jgChangeRegistrationReformEqMapper.selectEquipId(currentDocumentId);
}
Map<String, Object> detail = JSONObject.parseObject(JSONObject.toJSONString(jgChangeRegistrationReform), Map.class);
Map<String, Object> originalData = new HashMap<>();
if ((detail.get("status").equals("已完成") || detail.get("status").equals("流程结束"))) {
originalData = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equipId);
originalData.remove("sequenceNbr");
detail.put("transformationQualityCertificate", JSONObject.parse(detail.get("transformationQualityCertificate").toString()));
detail.put("renovationSupervisioninspectionCertificate", JSONObject.parse(detail.get("renovationSupervisioninspectionCertificate").toString()));
if(!ObjectUtils.isEmpty(detail.get("transformationQualityCertificate"))){
detail.put("transformationQualityCertificate", JSONObject.parse(detail.get("transformationQualityCertificate").toString()));
}
if(!ObjectUtils.isEmpty(detail.get("renovationSupervisioninspectionCertificate"))){
detail.put("renovationSupervisioninspectionCertificate", JSONObject.parse(detail.get("renovationSupervisioninspectionCertificate").toString()));
}
} else {
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
.eq("equ_id", equipId)
......
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 @ 694f3033
......@@ -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/JgMaintenanceContractServiceImpl.java
View file @ 694f3033
......@@ -27,6 +27,7 @@ import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
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.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;
......@@ -315,7 +316,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
@Transactional
public void revocation(String instanceId) {
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
String taskName = "";
String taskCode = "";
JgMaintenanceContract jgMaintenanceContract = new JgMaintenanceContract();
LambdaQueryWrapper<JgMaintenanceContract> lambda = new QueryWrapper<JgMaintenanceContract>().lambda();
lambda.eq(JgMaintenanceContract::getInstanceId, instanceId);
......@@ -324,9 +325,13 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
workFlowFeginService.rollBack(instanceId);
JSONObject taskNoAuth = workFlowFeginService.getTaskNoAuth(instanceId);
JSONObject nextTask = JSON.parseObject(JSON.toJSONString(taskNoAuth.get("data")));
taskName = nextTask.getString("name");
taskCode = nextTask.getString("name");
if (!ObjectUtils.isEmpty(taskNoAuth.get("data"))) {
String nextTaskId = nextTask.getString("id");
FeignClientResult<JSONObject> nodeInfo = workFlowFeginService.getNodeInfo(nextTaskId);
JSONObject result = nodeInfo.getResult();
Map<String, Object> taskInfo = (Map<String, Object>) result.get("taskInfo");
taskCode = String.valueOf(taskInfo.get("taskDefinitionKey"));
AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
for (Object datum : data) {
......@@ -338,9 +343,9 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
} catch (Exception e) {
e.printStackTrace();
}
if (!ObjectUtils.isEmpty(taskName)) {
if (!ObjectUtils.isEmpty(taskCode)) {
jgMaintenanceContract.setStatus(MaintenceStatusEnum.getMessage(taskName).getRollBack());
jgMaintenanceContract.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getRollBack());
}
String join = String.join(",", roleList);
jgMaintenanceContract.setPromoter(reginParams.getUserModel().getUserId());
......@@ -381,7 +386,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
// 新增编辑
if ("add".equals(String.valueOf(map.get("pageType")))) {
contract.setStatus(SUBMIT_DATA.equals(submit) ? MaintenceStatusEnum.SUBMIT.getPass() : MaintenceStatusEnum.RECEIVE.getPass());
contract.setStatus(SUBMIT_DATA.equals(submit) ? WorkFlowStatusEnum.MAIN_SUBMIT.getPass() : WorkFlowStatusEnum.MAIN_RECEIVE.getPass());
this.save(contract);
} else {
this.getBaseMapper().updateById(contract);
......@@ -422,16 +427,20 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
public void updateExecuteIds(String instanceId, Long sequenceNbr, String operate){
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
String role = "";
String taskName = FlowStatusEnum.TO_BE_FINISHED.getName();
String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
ArrayList<String> roleList = new ArrayList<>();
JgMaintenanceContract jgMaintenanceContract = this.getBaseMapper().selectById(sequenceNbr);
try {
// 查询下节点任务
JSONObject taskNoAuth = workFlowFeginService.getTaskNoAuth(instanceId);
if (!ObjectUtils.isEmpty(taskNoAuth.get("data"))) {
JSONObject nextTask = JSON.parseObject(JSON.toJSONString(taskNoAuth.get("data")));
String nextTaskId = nextTask.getString("id");
taskName = nextTask.getString("name");
FeignClientResult<JSONObject> nodeInfo = workFlowFeginService.getNodeInfo(nextTaskId);
JSONObject result = nodeInfo.getResult();
Map<String, Object> taskInfo = (Map<String, Object>) result.get("taskInfo");
taskCode = String.valueOf(taskInfo.get("taskDefinitionKey"));
AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
for (Object datum : data) {
......@@ -443,7 +452,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
} catch (Exception e) {
e.printStackTrace();
}
if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(taskName)){
if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(taskCode)){
role= String.join(",", roleList);
jgMaintenanceContract.setNextExecuteIds(role);
jgMaintenanceContract.setPromoter(reginParams.getUserModel().getUserId());
......@@ -455,15 +464,15 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
}
if ("0".equals(operate)){
// 通过操作
jgMaintenanceContract.setStatus(MaintenceStatusEnum.getMessage(taskName).getPass());
jgMaintenanceContract.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
}else {
// 驳回操作
jgMaintenanceContract.setStatus(MaintenceStatusEnum.getMessage(taskName).getReject());
jgMaintenanceContract.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getReject());
jgMaintenanceContract.setPromoter(null);
}
}else {
jgMaintenanceContract.setStatus(taskName);
jgMaintenanceContract.setStatus(taskCode);
}
this.getBaseMapper().updateById(jgMaintenanceContract);
......
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 @ 694f3033
......@@ -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;
}
......
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 @ 694f3033
......@@ -76,9 +76,9 @@ public class JyjcOpeningApplicationController extends BaseController {
@ApiOperation(httpMethod = "PUT", value = "保存并提交", notes = "保存并提交")
public ResponseModel<JyjcOpeningApplicationModel> updateBySequenceNbrAndStartFlow(@RequestBody JyjcOpeningApplicationModel model, @RequestParam(value = "sequenceNbr", required = false) Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
if (ValidationUtil.isEmpty(model.getBaseUnitLicences()) || ValidationUtil.isEmpty(model.getUserInfos())) {
throw new BadRequest("企业资质信息和检验人员信息为空，无法提交！");
}
// if (ValidationUtil.isEmpty(model.getBaseUnitLicences()) || ValidationUtil.isEmpty(model.getUserInfos())) {
// throw new BadRequest("企业资质信息和检验人员信息为空，无法提交！");
// }
return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(model,true));
}
......
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 @ 694f3033
......@@ -341,7 +341,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
// 获取检验人员信息
QueryWrapper userInfoQueryWrapper = new QueryWrapper<>();
userInfoQueryWrapper.eq("unit_code", unitCode);
userInfoQueryWrapper.eq("is_delete", true);
userInfoQueryWrapper.eq("is_delete", false);
List<TzsUserInfo> userInfos = userInfoMapper.selectList(userInfoQueryWrapper);
if (!ValidationUtil.isEmpty(userInfos)) {
// List<String> codes = userInfos.stream()
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzBaseEnterpriseInfoController.java
View file @ 694f3033
......@@ -183,7 +183,7 @@ public class TzBaseEnterpriseInfoController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/info")
@ApiOperation(httpMethod = "GET", value = "查询企业端当前登录人所在企业详情", notes = "查询企业端当前登录人所在企业详情")
public ResponseModel<IPage<TzBaseEnterpriseInfoDto>> pageInfo(PageParam pageParam) {
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java
View file @ 694f3033
......@@ -231,12 +231,13 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
String roles = map.get("role").toString();
String status = map.get("status").toString();
String roleGroupCode = map.get("roleGroup").toString();
TzsUserInfo tzsUserInfo = tzsUserInfoMapper.selectById(sequenceNbr);
FeignClientResult<AgencyUserModel> userResult = null;
try {
AgencyUserModel agencyUserModel = new AgencyUserModel();
agencyUserModel.setUserName(loginName);
agencyUserModel.setRealName(loginName);
agencyUserModel.setRealName(tzsUserInfo.getName());
agencyUserModel.setLockStatus(status);
agencyUserModel.setPassword(pwd);
agencyUserModel.setRePassword(pwd);
......@@ -265,7 +266,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
});
//添加人员管理角色
TzsUserInfo tzsUserInfo = tzsUserInfoMapper.selectById(sequenceNbr);
String post = tzsUserInfo.getPost();
if(post.contains(PersonManageRoleEnum.code.getId().toString())){
String companyType = tzsUserInfoMapper.selectCompanyTypeById(companySeq);
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/biz/controller/RegUnitInfoController.java
View file @ 694f3033
......@@ -96,7 +96,7 @@ public class RegUnitInfoController extends BaseController {
return ResponseHelper.buildResponse(iRegUnitInfoService.submit(pageId, taskId, planInstanceId, topic, tableName, kv));
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/adminInfo", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "查询企业管理员信息", notes = "查询企业管理员信息")
public ResponseModel<RegUnitInfoDto> adminInfo() {
......
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