Skip to content

A
amos-boot-biz
Commit 88b4d200 authored by LiuLin's avatar LiuLin
Browse files
Options

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

parents 5c02680a a84cf57f
Show whitespace changes
Inline Side-by-side
Showing with 282 additions and 125 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/JgMaintenanceContractDto.java
View file @ 88b4d200
......@@ -62,19 +62,35 @@ public class JgMaintenanceContractDto extends BaseDto {
@ApiModelProperty(value = "维保合同结束日期")
private Date informEnd;
@ApiModelProperty(value = "管理员id")
@ApiModelProperty(value = "安全管理员id")
private String maintenanceManagerId;
@ApiModelProperty(value = "管理员姓名")
@ApiModelProperty(value = "安全管理员姓名")
private String maintenanceManagerName;
@ApiModelProperty(value = "安全管理员姓名联系方式")
private String maintenanceManagerPhone;
@ApiModelProperty(value = "维保负责人一id")
private String maintenanceManagerOneId;
@ApiModelProperty(value = "维保负责人一姓名")
private String maintenanceManagerOneName;
@ApiModelProperty(value = "维保负责人一联系方式")
private String maintenanceManagerOnePhone;
@ApiModelProperty(value = "维保负责人二id")
private String maintenanceManagerTwoId;
@ApiModelProperty(value = "维保负责人二姓名")
private String maintenanceManagerTwoName;
@ApiModelProperty(value = "维保负责人二联系方式")
private String maintenanceManagerTwoPhone;
@ApiModelProperty(value = "紧急救援电话")
private String emergencyCall;
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgTransferNoticeDto.java
View file @ 88b4d200
......@@ -36,6 +36,9 @@ public class JgTransferNoticeDto extends BaseDto {
@ApiModelProperty(value = "告知状态")
private String noticeStatus;
@ApiModelProperty(value = "告知状态")
private String noticeStatusDesc;
@ApiModelProperty(value = "施工单位统一信用代码")
private String installUnitCreditCode;
......@@ -173,6 +176,9 @@ public class JgTransferNoticeDto extends BaseDto {
@ApiModelProperty(value = "完整地址")
private String fullAddress;
@ApiModelProperty(value = "userId")
private String promoter;
public String getFullAddress() {
return (StringUtils.isEmpty(this.provinceName) ? "" : this.provinceName)
+ (StringUtils.isEmpty(this.cityName) ? "" : this.cityName)
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgMaintenanceContract.java
View file @ 88b4d200
......@@ -101,17 +101,23 @@ public class JgMaintenanceContract extends BaseEntity {
private Date informEnd;
/**
* 管理员id
* 安全管理员id
*/
@TableField("maintenance_manager_id")
private String maintenanceManagerId;
/**
* 管理员id
* 安全管理员姓名
*/
@TableField("maintenance_manager_name")
private String maintenanceManagerName;
/**
* 安全管理员姓名联系方式
*/
@TableField("maintenance_manager_phone")
private String maintenanceManagerPhone;
/**
* 维保负责人一id
......@@ -120,6 +126,18 @@ public class JgMaintenanceContract extends BaseEntity {
private String maintenanceManagerOneId;
/**
* 维保负责人一姓名
*/
@TableField("maintenance_manager_one_name")
private String maintenanceManagerOneName;
/**
* 维保负责人一联系方式
*/
@TableField("maintenance_manager_one_phone")
private String maintenanceManagerOnePhone;
/**
* 维保负责人二id
*/
@TableField("maintenance_manager_two_id")
......@@ -127,6 +145,19 @@ public class JgMaintenanceContract extends BaseEntity {
/**
* 维保负责人二姓名
*/
@TableField("maintenance_manager_two_name")
private String maintenanceManagerTwoName;
/**
* 维保负责人二联系方式
*/
@TableField("maintenance_manager_two_phone")
private String maintenanceManagerTwoPhone;
/**
* 紧急救援电话
*/
@TableField("emergency_call")
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgTransferNotice.java
View file @ 88b4d200
......@@ -279,4 +279,7 @@ public class JgTransferNotice extends BaseEntity {
@TableField("province_name")
private String provinceName;
@TableField("promoter")
private String promoter;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintainNoticeMapper.xml
View file @ 88b4d200
......@@ -55,8 +55,8 @@
</if>
</if>
<if test="type == 'supervision'">
AND (tjmn.notice_status in ('6612', '6613', '6614') or tjmn.status in('6614') )
AND tjmn.receive_org_credit_code = #{orgCode}
AND (tjmn.notice_status in ('6612', '6613', '6614') )
AND tjmn.receive_org_code = #{orgCode}
</if>
<if test="type == 'enterprise'">
AND tjmn.install_unit_credit_code = #{orgCode}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgReformNoticeMapper.xml
View file @ 88b4d200
......@@ -49,7 +49,7 @@
</if>
<if test="type == 'supervision'">
AND isn.notice_status in ('6612', '6613', '6614')
AND isn.receive_org_credit_code = #{orgCode}
<!-- AND isn.receive_org_code = #{orgCode}-->
<!-- AND (isn.notice_status in ('6612', '6613', '6614') or isn.status in('6614') )-->
</if>
<if test="orgCode != null and orgCode != ''">
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgTransferNoticeMapper.xml
View file @ 88b4d200
......@@ -12,12 +12,13 @@
tjtn.address AS address,
tjtn.notice_status AS noticeStatus,
tjtn.install_unit_name AS installUnitName,
tjtn.province AS provinceName,
tjtn.city AS cityName,
tjtn.county AS countyName,
tjtn.province_name AS provinceName,
tjtn.city_name AS cityName,
tjtn.county_name AS countyName,
tjtn.instance_id AS instanceId,
tjtn.transfer_type AS transferType,
tjtn.plan_date AS planDate
tjtn.plan_date AS planDate,
tjtn.promoter AS promoter
FROM
tzs_jg_transfer_notice tjtn
<where>
......@@ -38,11 +39,18 @@
<if test="param.noticeStatus != null and param.noticeStatus != ''">
AND tjtn.notice_status = #{param.noticeStatus}
</if>
<if test="param.transferType != null and param.transferType != '' and param.transferType == '10002'">
AND tjtn.transfer_type = '区内移装'
</if>
<if test="param.transferType != null and param.transferType != '' and param.transferType == '10003'">
AND tjtn.transfer_type = '跨区移装'
</if>
</if>
<if test="type == 'supervision'">
AND (tjtn.notice_status in ('6612', '6613', '6614') or tjtn.status in('6614') )
AND tjtn.notice_status in ('6612', '6613', '6614')
AND tjtn.receive_org_code = #{orgCode}
</if>
<if test="orgCode != null and orgCode != ''">
<if test="type == 'enterprise'">
AND tjtn.install_unit_credit_code = #{orgCode}
</if>
</where>
......@@ -71,9 +79,10 @@
tjtn.construction_contract AS constructionContract,
tjtn.transfer_type AS transferType,
tjtn.factory_use_site_street AS factoryUseSiteStreet,
tjtn.province AS provinceName,
tjtn.city AS cityName,
tjtn.county AS countyName,
tjtn.province_name AS provinceName,
tjtn.city_name AS cityName,
tjtn.county_name AS countyName,
tjtn.promoter AS promoter,
ri.equ_list AS equList,
ri.equ_category AS equCategory,
ri.EQU_DEFINE AS equDefine,
......@@ -110,7 +119,7 @@
ui.ADDRESS AS useUnitAddress
FROM
tzs_jg_transfer_notice tjtn
LEFT JOIN tzs_jg_installation_notice_eq re ON re.equip_transfer_id = tjtn.sequence_nbr
LEFT JOIN tzs_jg_transfer_notice_eq re ON re.equip_transfer_id = tjtn.sequence_nbr
LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgTransferNoticeByWorkFlowController.java 0 → 100644
View file @ 88b4d200
package com.yeejoin.amos.boot.module.jg.biz.controller;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.yeejoin.amos.boot.module.jg.api.dto.JgTransferNoticeDto;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgTransferNoticeServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Objects;
/**
* 移装告知
*
* @author system_generator
* @date 2023-12-12
*/
@RestController
@Api(tags = "移装告知工作流相关Api")
@RequestMapping(value = "/jg-transfer-workflow")
public class JgTransferNoticeByWorkFlowController {
@Autowired
JgTransferNoticeServiceImpl jgTransferNoticeService;
/**
* 提交
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/submit")
@ApiOperation(httpMethod = "POST", value = "移装告知提交", notes = "移装告知提交")
public ResponseModel<JgTransferNoticeDto> submit(@RequestBody JgTransferNoticeDto model, String op) {
// TODO 发起移装告知流程
// jgInstallationNoticeServiceImpl.submit(model, op);
return ResponseHelper.buildResponse(model);
}
/**
* 撤销
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/cancel")
@ApiOperation(httpMethod = "POST", value = "移装告知撤销", notes = "移装告知撤销")
public ResponseModel<JgTransferNoticeDto> cancel(@RequestBody Map<String, Object> model) {
JgTransferNoticeDto installationInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("transferNoticeInfo")), JgTransferNoticeDto.class, true);
if (Objects.isNull(installationInfo)) {
throw new IllegalArgumentException("参数transferNoticeInfo不能为空");
}
jgTransferNoticeService.cancel(installationInfo);
return ResponseHelper.buildResponse(installationInfo);
}
/**
* 受理
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/accept")
@ApiOperation(httpMethod = "POST", value = "移装告知受理", notes = "移装告知受理")
public ResponseModel<JgTransferNoticeDto> accept(@RequestBody Map<String, Object> model, String op) {
// TODO 受理移装告知流程
LinkedHashMap model1 = (LinkedHashMap)model.get("model");
LinkedHashMap installationInfo = (LinkedHashMap)model1.get("transferNoticeInfo");
JgTransferNoticeDto JgTransferNoticeDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgTransferNoticeDto.class);
jgTransferNoticeService.accept(JgTransferNoticeDto,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/JgTransferNoticeController.java
View file @ 88b4d200
......@@ -65,12 +65,12 @@ public class JgTransferNoticeController extends BaseController {
@RequestParam String submitType,
@RequestBody Map<String, Object> model,
@RequestParam(value = "op", required = false) String op) {
JgTransferNoticeDto transferNoticeInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("transferInfo")), JgTransferNoticeDto.class, true);
JgTransferNoticeDto transferNoticeInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("transferNoticeInfo")), JgTransferNoticeDto.class, true);
if (Objects.isNull(transferNoticeInfo)) {
throw new IllegalArgumentException("参数transferInfo不能为空");
}
Object o = ((LinkedHashMap<?, ?>) model.get("transferInfo")).get("proxyStatementAttachment");
Object o1 = ((LinkedHashMap<?, ?>) model.get("transferInfo")).get("installContractAttachment");
Object o = ((LinkedHashMap<?, ?>) model.get("transferNoticeInfo")).get("proxyStatementAttachmentList");
Object o1 = ((LinkedHashMap<?, ?>) model.get("transferNoticeInfo")).get("installContractAttachmentList");
transferNoticeInfo.setConstructionContractList((List<Map<String, Object>>) o);
transferNoticeInfo.setPowerOfAttorneyList((List<Map<String, Object>>) o1);
return ResponseHelper.buildResponse(jgTransferNoticeService.updateTransferNotice(submitType, transferNoticeInfo, op));
......
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/IdxBizJgRegisterInfoServiceImpl.java
View file @ 88b4d200
......@@ -19,6 +19,7 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.CategoryOtherInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.SuperviseInfoMapper;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import org.apache.commons.collections.CollectionUtils;
import org.apache.lucene.queryparser.classic.QueryParser;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse;
......@@ -197,89 +198,89 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
}
return resultMap;
}
private Map<String, Object> getStringObjectMap(String record) {
Map<String, Object> objMap = new HashMap<>();
//使用信息
IdxBizJgUseInfo useInfo = idxBizJgUseInfoService.getOneData(record);
if (!ValidationUtil.isEmpty(useInfo)) {
Map<String, Object> useInfoMap = new HashMap<>();
String[] fields = null;
useInfoMap = this.convertCamelToUnderscore(useInfo, fields);
Map<String, Object> useInfoMap = convertCamelToUnderscore(useInfo, null);
useInfoMap.put("USEINFO_SEQ", useInfo.getSequenceNbr());
objMap.putAll(useInfoMap);
}
//设计制造
IdxBizJgDesignInfo designInfo = iIdxBizJgDesignInfoService.getOneData(record);
if (!ValidationUtil.isEmpty(designInfo)) {
Map<String, Object> designInfoMap = new HashMap<>();
String[] fields = {"DESIGN_DOC", "DESIGN_STANDARD"};
designInfoMap = this.convertCamelToUnderscore(designInfo, fields);
Map<String, Object> designInfoMap = convertCamelToUnderscore(designInfo, fields);
designInfoMap.put("DESIGNINFO_SEQ", designInfo.getSequenceNbr());
objMap.putAll(designInfoMap);
}
//制造信息
IdxBizJgFactoryInfo factoryInfo = iIdxBizJgFactoryInfoService.getOneData(record);
if (!ValidationUtil.isEmpty(factoryInfo)) {
Map<String, Object> factoryInfoMap = new HashMap<>();
String[] fields = {"FACTORY_STANDARD", "PRODUCT_QUALITY_YIELD_PROVE", "INS_USE_MAINTAIN_EXPLAIN"};
factoryInfoMap = this.convertCamelToUnderscore(factoryInfo, fields);
Map<String, Object> factoryInfoMap = convertCamelToUnderscore(factoryInfo, fields);
String imported = factoryInfo.getImported();
if("0".equals(imported)){
factoryInfoMap.put("IMPORTED_DESC","否");
}else if("1".equals(imported)){
factoryInfoMap.put("IMPORTED_DESC","是");
}
factoryInfoMap.put("FACTORYINFO_SEQ", factoryInfo.getSequenceNbr());
objMap.putAll(factoryInfoMap);
}
//施工信息
IdxBizJgConstructionInfo constructionInfo = iIdxBizJgConstructionInfoService.getOneData(record);
if (!ValidationUtil.isEmpty(constructionInfo)) {
Map<String, Object> constructionInfoMap = new HashMap<>();
String[] fields = null;
constructionInfoMap = this.convertCamelToUnderscore(constructionInfo, fields);
Map<String, Object> constructionInfoMap = convertCamelToUnderscore(constructionInfo, null);
constructionInfoMap.put("CONSTRUCTIONINFO_SEQ", constructionInfo.getSequenceNbr());
objMap.putAll(constructionInfoMap);
}
//注册登记
IdxBizJgRegisterInfo registerInfo = this.getOne(new QueryWrapper<IdxBizJgRegisterInfo>().eq("RECORD", record));
if (!ValidationUtil.isEmpty(registerInfo)) {
Map<String, Object> registerInfoMap = new HashMap<>();
String[] fields = {"PRODUCT_PHOTO"};
registerInfoMap = this.convertCamelToUnderscore(registerInfo, fields);
Map<String, Object> registerInfoMap = convertCamelToUnderscore(registerInfo, fields);
registerInfoMap.put("REGISTERINFO_SEQ", registerInfo.getSequenceNbr());
registerInfoMap.put("SEQUENCE_NBR", registerInfo.getSequenceNbr());
String equCategory = registerInfo.getEquCategory();//设备类别
String equDefine = registerInfo.getEquDefine();//设备品种
List<EquipmentCategory> categoryList1 = commonService.getEquipmentCategoryList(equCategory, null);
if(CollectionUtils.isNotEmpty(categoryList1)){
registerInfoMap.put("EQU_CATEGORY_DESC",categoryList1.get(0).getName());
}
List<EquipmentCategory> categoryList2 = commonService.getEquipmentCategoryList(equDefine, null);
if(CollectionUtils.isNotEmpty(categoryList2)){
registerInfoMap.put("EQU_DEFINE_DESC",categoryList2.get(0).getName());
}
objMap.putAll(registerInfoMap);
}
//维保备案
IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo = iIdxBizJgMaintenanceRecordInfoService.getOneData(record);
if (!ValidationUtil.isEmpty(maintenanceRecordInfo)) {
Map<String, Object> maintenanceRecordInfoMap = new HashMap<>();
String[] fields = null;
maintenanceRecordInfoMap = this.convertCamelToUnderscore(maintenanceRecordInfo, fields);
Map<String, Object> maintenanceRecordInfoMap = convertCamelToUnderscore(maintenanceRecordInfo, null);
maintenanceRecordInfoMap.put("MAINTENANCERECORDINFO_SEQ", maintenanceRecordInfo.getSequenceNbr());
objMap.putAll(maintenanceRecordInfoMap);
}
//监督管理
IdxBizJgSupervisionInfo supervisionInfo = iIdxBizJgSupervisionInfoService.getOneData(record);
if (!ValidationUtil.isEmpty(supervisionInfo)) {
Map<String, Object> supervisionInfoMap = new HashMap<>();
String[] fields = null;
supervisionInfoMap = this.convertCamelToUnderscore(supervisionInfo, fields);
Map<String, Object> supervisionInfoMap = convertCamelToUnderscore(supervisionInfo, null);
supervisionInfoMap.put("SUPERVISIONINFO_SEQ", supervisionInfo.getSequenceNbr());
objMap.putAll(supervisionInfoMap);
}
//其他信息
IdxBizJgOtherInfo otherInfo = iIdxBizJgOtherInfoService.getOneData(record);
if (!ValidationUtil.isEmpty(otherInfo)) {
Map<String, Object> otherInfoMap = new HashMap<>();
String[] fields = null;
otherInfoMap = this.convertCamelToUnderscore(otherInfo, fields);
Map<String, Object> otherInfoMap = convertCamelToUnderscore(otherInfo, null);
otherInfoMap.put("OTHERINFO_SEQ", otherInfo.getSequenceNbr());
objMap.putAll(otherInfoMap);
}
//检验检测
IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = iIdxBizJgInspectionDetectionInfoService.getOneData(record);
if (!ValidationUtil.isEmpty(inspectionDetectionInfo)) {
Map<String, Object> inspectionDetectionInfoMap = new HashMap<>();
String[] fields = {"INSPECT_REPORT"};
inspectionDetectionInfoMap = this.convertCamelToUnderscore(inspectionDetectionInfo, fields);
Map<String, Object> inspectionDetectionInfoMap = convertCamelToUnderscore(inspectionDetectionInfo, fields);
inspectionDetectionInfoMap.put("INSPECTIONDETECTIONINFO_SEQ", inspectionDetectionInfo.getSequenceNbr());
objMap.putAll(inspectionDetectionInfoMap);
}
......@@ -287,9 +288,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
//电梯
IdxBizJgTechParamsElevator elevator = iIdxBizJgTechParamsElevatorService.getOneData(record);
if (!ValidationUtil.isEmpty(elevator)) {
Map<String, Object> elevatorMap = new HashMap<>();
String[] fields = {"EXPLOSIONPROOF_SIGN_COMPLETE"};
elevatorMap = this.convertCamelToUnderscore(elevator, fields);
Map<String, Object> elevatorMap = convertCamelToUnderscore(elevator, fields);
elevatorMap.put("ELEVATOR_SEQ", elevator.getSequenceNbr());
objMap.putAll(elevatorMap);
}
......@@ -304,18 +304,14 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
//主要零部件
IdxBizJgMainParts mainParts = iIdxBizJgMainPartsService.getOneData(record);
if (!ValidationUtil.isEmpty(mainParts)) {
Map<String, Object> mainPartsMap = new HashMap<>();
String[] fields = null;
mainPartsMap = this.convertCamelToUnderscore(mainParts, fields);
Map<String, Object> mainPartsMap = convertCamelToUnderscore(mainParts, null);
mainPartsMap.put("MAINPARTS_SEQ", mainParts.getSequenceNbr());
objMap.putAll(mainPartsMap);
}
//安全附件
IdxBizJgProtectionDevices protectionDevices = iIdxBizJgProtectionDevicesService.getOneData(record);
if (!ValidationUtil.isEmpty(protectionDevices)) {
Map<String, Object> protectionDevicesMap = new HashMap<>();
String[] fields = null;
protectionDevicesMap = this.convertCamelToUnderscore(protectionDevices, fields);
Map<String, Object> protectionDevicesMap = convertCamelToUnderscore(protectionDevices, null);
protectionDevicesMap.put("PROTECTIONDEVICES_SEQ", protectionDevices.getSequenceNbr());
objMap.putAll(protectionDevicesMap);
}
......
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/JgTransferNoticeServiceImpl.java
View file @ 88b4d200
......@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.JgTransferNoticeDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
......@@ -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.typroject.tyboot.core.restful.utils.ResponseModel;
......@@ -86,6 +89,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
TzsServiceFeignClient tzsServiceFeignClient;
@Autowired
SupervisoryCodeInfoMapper supervisoryCodeInfoMapper;
@Autowired
RedisUtils redisUtils;
public static byte[] file2byte(File file) {
try {
......@@ -120,21 +125,28 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
transferNotice.put("city", notice.getCity() + "_" + notice.getCityName());
transferNotice.put("county", notice.getCounty() + "_" + notice.getCountyName());
transferNotice.put("useUnitCreditCode", notice.getUseUnitCreditCode() + "_" + notice.getUseUnitName());
transferNotice.put("receiveOrgCode", notice.getReceiveOrgCode() + "_" + notice.getReceiveOrgName());
if(!ValidationUtil.isEmpty(notice.getFactoryUseSiteStreet()) && !ValidationUtil.isEmpty(notice.getStreetName())) {
transferNotice.put("factoryUseSiteStreet", notice.getFactoryUseSiteStreet() + "_" + notice.getStreetName());
}
String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard",
"productQualityYieldProve", "insUseMaintainExplain", "inspectReport",
"proxyStatementAttachment", "installContractAttachment", "powerOfAttorneyList", "constructionContractList", "deviceList"};
"proxyStatementAttachment", "installContractAttachment", "powerOfAttorney", "constructionContract"};
// 设备信息
List<Map<String, Object>> equipmentInfos = jgTransferNoticeMapper.queryEquipInformation(sequenceNbr);
for (String s : fields) {
if (transferNotice.containsKey(s)) {
if ("powerOfAttorney".equalsIgnoreCase(s)) {
transferNotice.put("powerOfAttorneyList", JSON.parseArray(transferNotice.get(s).toString()));
} else if ("constructionContract".equalsIgnoreCase(s)) {
transferNotice.put("constructionContractList", JSON.parseArray(transferNotice.get(s).toString()));
} else {
transferNotice.put(s, JSON.parseArray(transferNotice.get(s).toString()));
}
}
if (equipmentInfos.get(0).containsKey(s)) {
equipmentInfos.get(0).put(s, JSON.parseArray(equipmentInfos.get(0).get(s).toString()));
}
......@@ -212,7 +224,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
// word转pdf
File pdfFile;
try {
pdfFile = this.wordToPdf("maintain-notification-report.ftl", placeholders);
pdfFile = this.wordToPdf("transfer-notification-report.ftl", placeholders);
} catch (Exception e) {
throw new RuntimeException(e);
}
......@@ -275,19 +287,20 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
*/
@SuppressWarnings({"rawtypes", "Duplicates"})
public JgTransferNoticeDto updateTransferNotice(String submitType, JgTransferNoticeDto noticeDto, String op) {
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
if (Objects.isNull(noticeDto) || StringUtils.isEmpty(submitType)) {
throw new IllegalArgumentException("参数不能为空");
}
// 字段转换
this.convertField(noticeDto);
noticeDto.setPromoter(reginParams.getUserModel().getUserId());
if (SUBMIT_TYPE_FLOW.equals(submitType)) {
AjaxResult ajaxResult;
// 发起流程
if (!StringUtils.hasText(noticeDto.getInstanceId())) {
ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
dto.setProcessDefinitionKey("maintainNotification");
dto.setProcessDefinitionKey("transferNotification");
dto.setBusinessKey("1");
try {
ajaxResult = Workflow.taskClient.startByVariable(dto);
......@@ -335,11 +348,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
*/
public Page<JgTransferNoticeDto> queryForJgTransferNoticePage(Page<JgTransferNotice> page, JgTransferNoticeDto model, String type, ReginParams reginParams) {
String orgCode;
if (type.equals("enterprise")) {
orgCode = reginParams.getCompany().getCompanyCode();
} else {
orgCode = reginParams.getCompany().getOrgCode();
}
Page<JgTransferNotice> noticePage = jgTransferNoticeMapper.queryForPage(page, model, type, orgCode);
......@@ -351,7 +360,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
BeanUtils.copyProperties(notice, noticeDto);
if (Objects.nonNull(notice.getNoticeStatus())) {
String noticeStatusDesc = FlowStatusEnum.getNameByType(Long.valueOf(notice.getNoticeStatus()));
noticeDto.setNoticeStatus(noticeStatusDesc);
noticeDto.setNoticeStatusDesc(noticeStatusDesc);
}
return noticeDto;
}).collect(java.util.stream.Collectors.toList());
......@@ -382,7 +391,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
}
// 获取告知单号
List<String> applyNoList = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.AZGZ.getCode(), deviceList.size());
List<String> applyNoList = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.YZGZ.getCode(), deviceList.size());
if (CollectionUtils.isEmpty(applyNoList)) {
return;
}
......@@ -426,6 +435,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
BeanUtils.copyProperties(model, dto);
int i = deviceList.indexOf(obj);
String applyNo = applyNoList.get(i);
dto.setPromoter(reginParams.getUserModel().getUserId());
dto.setApplyNo(applyNo);
dto.setNoticeDate(new Date());
dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
......@@ -455,12 +465,12 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
private void convertField(JgTransferNoticeDto model) {
// 处理图片
if (!ValidationUtil.isEmpty(model.getPowerOfAttorneyList())) {
model.setPowerOfAttorney(JSON.toJSONString(model.getPowerOfAttorneyList()));
}
if (!ValidationUtil.isEmpty(model.getConstructionContractList())) {
if(!ValidationUtil.isEmpty(model.getConstructionContractList())) {
model.setConstructionContract(JSON.toJSONString(model.getConstructionContractList()));
}
if(!ValidationUtil.isEmpty(model.getPowerOfAttorneyList())) {
model.setPowerOfAttorney(JSON.toJSONString(model.getPowerOfAttorneyList()));
}
// 分割省市区字段
String province = model.getProvince();
......@@ -468,7 +478,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
String[] provinceList = province.split("_");
if (provinceList.length > 1) {
model.setProvince(provinceList[0]);
model.setProvince(provinceList[1]);
model.setProvinceName(provinceList[1]);
}
}
......@@ -477,7 +487,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
String[] cityList = city.split("_");
if (cityList.length > 1) {
model.setCity(cityList[0]);
model.setCity(cityList[1]);
model.setCityName(cityList[1]);
}
}
......@@ -486,7 +496,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
String[] countyList = county.split("_");
if (countyList.length > 1) {
model.setCounty(countyList[0]);
model.setCounty(countyList[1]);
model.setCountyName(countyList[1]);
}
}
......@@ -508,15 +518,15 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
model.setReceiveOrgName(receiveOrgIdList[1]);
}
}
String inspectUnitId = model.getInspectionUnitCreditCode();
if (!ObjectUtils.isEmpty(inspectUnitId)) {
String[] inspectUnitIdList = inspectUnitId.split("_");
if (inspectUnitIdList.length > 1) {
model.setInspectionUnitCreditCode(inspectUnitIdList[0]);
model.setInspectionUnitName(inspectUnitIdList[1]);
}
}
//
// String inspectUnitId = model.getInspectUnitId();
// if (!ObjectUtils.isEmpty(inspectUnitId)) {
// String[] inspectUnitIdList = inspectUnitId.split("_");
// if (inspectUnitIdList.length > 1) {
// model.setInspectUnitId(inspectUnitIdList[0]);
// model.setInspectUnitName(inspectUnitIdList[1]);
// }
// }
String factoryUseSiteStreet = model.getFactoryUseSiteStreet();
if (!ObjectUtils.isEmpty(factoryUseSiteStreet)) {
......@@ -574,60 +584,61 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
}
public void accept(JgTransferNoticeDto dto, String op) {
JgTransferNotice JgTransferNotice = this.jgTransferNoticeMapper.selectById(dto.getSequenceNbr());
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
JgTransferNotice jgTransferNotice = this.jgTransferNoticeMapper.selectById(dto.getSequenceNbr());
// 组装设备注册代码
StringBuffer stringBuffer = new StringBuffer();
String ym = null;
try {
ym = DateUtils.dateFormat(new Date(), DateUtils.DATE_PATTERN_MM);
} catch (ParseException e) {
log.error("日期转换失败：{}", e);
}
LambdaQueryWrapper<JgTransferNoticeEq> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(JgTransferNoticeEq::getEquipTransferId, dto.getSequenceNbr());
JgTransferNoticeEq jgRelationEquip = jgTransferNoticeEqMapper.selectOne(queryWrapper);
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());
RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(JgTransferNotice.getCity()).append(ym);
String equCode = stringBuffer.toString();
String deviceRegistrationCode = iCreateCodeService.createDeviceRegistrationCode(equCode);
Map<String, Object> map = new HashMap<>();
map.put("cityCode", JgTransferNotice.getCity());
map.put("countyCode", JgTransferNotice.getCounty());
map.put("equCategory", tzsJgRegistrationInfo.getEquCategory());
// map.put("isXiXian", JgTransferNotice.getIsXixian() == null ? "0" : JgTransferNotice.getIsXixian());
Map<String, Object> mapCode;
ResponseModel<Map<String, Object>> code = tzsServiceFeignClient.createCode(map);
mapCode = code.getResult();
// StringBuffer stringBuffer = new StringBuffer();
// String ym = null;
// try {
// ym = DateUtils.dateFormat(new Date(), DateUtils.DATE_PATTERN_MM);
// } catch (ParseException e) {
// log.error("日期转换失败：{}", e);
// }
LambdaQueryWrapper<SupervisoryCodeInfo> queryWrapper3 = new LambdaQueryWrapper<>();
queryWrapper3.eq(SupervisoryCodeInfo::getSupervisoryCode, mapCode.get("superviseCode").toString());
SupervisoryCodeInfo supervisoryCodeInfo = supervisoryCodeInfoMapper.selectOne(queryWrapper3);
supervisoryCodeInfo.setStatus("1");
supervisoryCodeInfoMapper.updateById(supervisoryCodeInfo);
// LambdaQueryWrapper<JgTransferNoticeEq> queryWrapper = new LambdaQueryWrapper<>();
// queryWrapper.eq(JgTransferNoticeEq::getEquipTransferId, dto.getSequenceNbr());
// JgTransferNoticeEq jgRelationEquip = jgTransferNoticeEqMapper.selectOne(queryWrapper);
//
// 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());
// RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
//
//
// stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(JgTransferNotice.getCity()).append(ym);
// String equCode = stringBuffer.toString();
// String deviceRegistrationCode = iCreateCodeService.createDeviceRegistrationCode(equCode);
// Map<String, Object> map = new HashMap<>();
// map.put("cityCode", JgTransferNotice.getCity());
// map.put("countyCode", JgTransferNotice.getCounty());
// map.put("equCategory", tzsJgRegistrationInfo.getEquCategory());
//// map.put("isXiXian", JgTransferNotice.getIsXixian() == null ? "0" : JgTransferNotice.getIsXixian());
// Map<String, Object> mapCode;
// ResponseModel<Map<String, Object>> code = tzsServiceFeignClient.createCode(map);
// mapCode = code.getResult();
//
// LambdaQueryWrapper<SupervisoryCodeInfo> queryWrapper3 = new LambdaQueryWrapper<>();
// queryWrapper3.eq(SupervisoryCodeInfo::getSupervisoryCode, mapCode.get("superviseCode").toString());
// SupervisoryCodeInfo supervisoryCodeInfo = supervisoryCodeInfoMapper.selectOne(queryWrapper3);
// supervisoryCodeInfo.setStatus("1");
// supervisoryCodeInfoMapper.updateById(supervisoryCodeInfo);
// boolean submit = submit(JgTransferNotice, op);
// if(submit) {
boolean submit = submit(jgTransferNotice, op);
if(submit) {
jgTransferNotice.setPromoter(reginParams.getUserModel().getUserId());
if("0".equals(op)) {
JgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.HAVE_PROCESSED.getCode()));
jgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.HAVE_PROCESSED.getCode()));
// this.generateMaintainNoticeReport(JgTransferNotice.getSequenceNbr());
} else {
JgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
JgTransferNotice.setInstanceStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
jgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
jgTransferNotice.setInstanceStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
}
jgTransferNoticeMapper.updateById(jgTransferNotice);
}
jgTransferNoticeMapper.updateById(JgTransferNotice);
// }
// // 组装监管码
// String division = "";
......
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