Skip to content

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

fix(改造告知 & 检验开通 & 报检)：stash

parent cd67743b
Show whitespace changes
Inline Side-by-side
Showing with 58 additions and 19 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgReformNoticeMapper.xml
View file @ 1f0fd664
......@@ -78,6 +78,9 @@
isn.receive_company_code AS receiveCompanyCode,
isn.receive_org_name AS receiveOrgName,
isn.receive_org_code AS receiveOrgCode,
isn.next_execute_ids as nextExecuteIds,
isn.promoter,
isn.notice_status AS noticeStatus,
ri.equ_code AS equRegisterCode,
ri.equ_list AS equList,
ri.equ_category AS equCategory,
......
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/JgReformNoticeServiceImpl.java
View file @ 1f0fd664
......@@ -7,6 +7,8 @@ import com.aspose.words.SaveFormat;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.jg.api.dto.ByteArrayMultipartFile;
import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNotice;
......@@ -44,6 +46,7 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
......@@ -106,7 +109,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
TzsServiceFeignClient tzsServiceFeignClient;
@Autowired
SupervisoryCodeInfoMapper supervisoryCodeInfoMapper;
@Autowired
private RedisUtils redisUtils;
public static byte[] file2byte(File file) {
try {
......@@ -215,7 +219,13 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
noticeDto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
JgReformNotice bean = new JgReformNotice();
BeanUtils.copyProperties(noticeDto, bean);
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
bean.setPromoter(reginParams.getUserModel().getUserId());
JgReformNoticeMapper.updateById(bean);
Boolean rollBack = "1".equals(op) ? true : false;
if (rollBack) {
JgReformNoticeMapper.updatePromoter(noticeDto.getSequenceNbr());
}
}
} catch (Exception e) {
log.error("提交失败：{}", e);
......@@ -446,7 +456,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
e.printStackTrace();
}
}
// ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
List<JgReformNotice> list = new ArrayList<>();
List<JgReformNoticeEq> equipList = new ArrayList<>();
deviceList.forEach(obj -> {
......@@ -467,6 +477,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
} else {
dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
}
dto.setPromoter(reginParams.getUserModel().getUserId());
list.add(dto);
equipList.add(jgRelationEquip);
});
......@@ -599,8 +610,11 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
FeignClientResult ajaxResult = Workflow.taskV2Client.rollBack(noticeDto.getInstanceId());
JgReformNotice JgReformNotice = this.baseMapper.selectById(noticeDto.getSequenceNbr());
if (ajaxResult.getStatus() == 200) {
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
JgReformNotice.setPromoter(reginParams.getUserModel().getUserId());
JgReformNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
JgReformNoticeMapper.updateById(JgReformNotice);
JgReformNoticeMapper.updatePromoter(JgReformNotice.getSequenceNbr());
}
}
......@@ -620,9 +634,9 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
queryWrapper.eq(JgReformNoticeEq::getEquipTransferId, dto.getSequenceNbr());
JgReformNoticeEq jgRelationEquip = JgReformNoticeEqMapper.selectOne(queryWrapper);
LambdaQueryWrapper<OtherInfo> queryWrapper1 = new LambdaQueryWrapper<>();
queryWrapper1.eq(OtherInfo::getRecord, jgRelationEquip.getEquId());
OtherInfo tzsJgOtherInfo = tzsJgOtherInfoMapper.selectOne(queryWrapper1);
// LambdaQueryWrapper<OtherInfo> queryWrapper1 = new LambdaQueryWrapper<>();
// queryWrapper1.eq(OtherInfo::getRecord, jgRelationEquip.getEquId());
// OtherInfo tzsJgOtherInfo = tzsJgOtherInfoMapper.selectOne(queryWrapper1);
LambdaQueryWrapper<RegistrationInfo> queryWrapper2 = new LambdaQueryWrapper<>();
queryWrapper2.eq(RegistrationInfo::getRecord, jgRelationEquip.getEquId());
......@@ -630,7 +644,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(JgReformNotice.getCity()).append(ym);
String equCode = stringBuffer.toString();
// String equCode = stringBuffer.toString();
// 只有安装设备需要
// String deviceRegistrationCode = iCreateCodeService.createDeviceRegistrationCode(equCode);
Map<String, Object> map = new HashMap<>();
......@@ -666,7 +680,13 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
JgReformNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
// JgReformNotice.setStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
}
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
JgReformNotice.setPromoter(reginParams.getUserModel().getUserId());
JgReformNoticeMapper.updateById(JgReformNotice);
Boolean rollBack = "1".equals(op) ? true : false;
if (rollBack) {
JgReformNoticeMapper.updatePromoter(JgReformNotice.getSequenceNbr());
}
}
// // 组装监管码
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcInspectionApplication.java
View file @ 1f0fd664
......@@ -173,4 +173,7 @@ public class JyjcInspectionApplication extends BaseEntity {
*/
@TableField(value = "promoter")
private String promoter;
@TableField(value = "create_user_id")
private String createUserId;
}
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcOpeningApplication.java
View file @ 1f0fd664
......@@ -123,4 +123,7 @@ public class JyjcOpeningApplication extends BaseEntity {
*/
@TableField(value = "promoter")
private String promoter;
@TableField(value = "create_user_id")
private String createUserId;
}
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionApplicationModel.java
View file @ 1f0fd664
package com.yeejoin.amos.boot.module.jyjc.api.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -154,4 +155,6 @@ public class JyjcInspectionApplicationModel extends BaseModel {
@ApiModelProperty(value = "发起人id用于撤回操作")
private String promoter;
@ApiModelProperty(value = "创建人ID")
private String createUserId;
}
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcOpeningApplicationModel.java
View file @ 1f0fd664
......@@ -82,6 +82,9 @@ public class JyjcOpeningApplicationModel extends BaseModel {
@ApiModelProperty(value = "发起人id用于撤回操作")
private String promoter;
@ApiModelProperty(value = "创建人ID")
private String createUserId;
/* ---------------- -------------- */
@ApiModelProperty (value = "企业资质信息")
List<TzBaseUnitLicenceDto> baseUnitLicences;
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml
View file @ 1f0fd664
......@@ -25,7 +25,8 @@
tzjia.status,
cdd2.NAME AS statusName,
tzjia.next_execute_ids as nextExecuteIds,
tzjia.promoter
tzjia.promoter,
tzjia.create_user_id
FROM
tz_jyjc_inspection_application AS tzjia
LEFT JOIN tz_base_enterprise_info tbei ON tbei.use_code = tzjia.application_unit_code
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcOpeningApplicationMapper.xml
View file @ 1f0fd664
......@@ -26,7 +26,8 @@
status_name,
workflow_active_key,
next_execute_ids,
promoter
promoter,
create_user_id
from tz_jyjc_opening_application
<where>
<if test="jyjcOpeningApplicationRequstDto.applicationSeq != '' and jyjcOpeningApplicationRequstDto.applicationSeq != null">
......
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 @ 1f0fd664
......@@ -114,7 +114,15 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
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());
// region 获取下一个流程节点的数据
Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(model.getProcessInstanceId());
String role = (String) nextNodeInfo.get("role");
model.setNextExecuteIds(role);
if (!org.springframework.util.ObjectUtils.isEmpty(model.getWorkflowRole())) {
model.setWorkflowRole(model.getWorkflowRole() + "," + role);
} else {
model.setWorkflowRole(role);
}
} catch (Exception e) {
e.printStackTrace();
}
......@@ -135,16 +143,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
model.setApplicationNo(codes.get(0));
model.setApplicationDate(new Date());
// region 获取下一个流程节点的数据
Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(model.getProcessInstanceId());
String role = (String) nextNodeInfo.get("role");
model.setNextExecuteIds(role);
model.setPromoter(reginParams.getUserModel().getUserId());
if (!org.springframework.util.ObjectUtils.isEmpty(model.getWorkflowRole())) {
model.setWorkflowRole(model.getWorkflowRole() + "," + role);
} else {
model.setWorkflowRole(role);
}
List<JyjcInspectionApplicationEquip> equipInfos = new ArrayList<>();
if (null != model.getEquip() && model.getEquip().size() > 0) {
......@@ -159,6 +159,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
equipInfos.add(equipInfo);
}
}
model.setCreateUserId(reginParams.getUserModel().getUserId());
model.setNumberOfEquip(equipInfos.size());
// endregion
model = this.createWithModel(model);
......
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 @ 1f0fd664
......@@ -115,8 +115,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
isUpdate = true;
}
}
if (enableStartFlow) {
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
if (enableStartFlow) {
if (StringUtils.isBlank(instanceId)) {
// 未开启过工作流则进行开启 startProcess
instanceId = startFlow("1");
......@@ -150,6 +150,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
model.setUnitCodeName(companyBo.getCompanyName());
List<String> codes = createCodeService.createApplicationFormCode(ApplicationFormTypeEnum.JY.getCode(), 1);
model.setApplicationSeq(codes.get(0));
model.setCreateUserId(reginParams.getUserModel().getUserId());
model = this.createWithModel(model);
return model;
} else {
......
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