Skip to content

A
amos-boot-biz
Commit bf34b1b7 authored by 韩桐桐's avatar 韩桐桐
Browse files
Options

补证登记相关

parent 58bd9ce0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 55 deletions
2187e8af-e5bb-4326-a549-efc5d39f5151.doc 0 → 100644
View file @ bf34b1b7
This diff is collapsed.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgCertificateReplenishDto.java
View file @ bf34b1b7
package com.yeejoin.amos.boot.module.jg.api.dto;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yeejoin.amos.boot.module.ymt.api.dto.LicScheduleDto;
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 springfox.documentation.spring.web.json.Json;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* 使用登记表补证
......@@ -121,5 +126,7 @@ public class JgCertificateReplenishDto extends BaseDto {
@ApiModelProperty("是否车用气瓶1是，0不是（特种气瓶使用）")
private String whetherVehicleCylinder;
private String dataType;
private List<Map<String, Object>> equLists;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgCertificateReplenish.java
View file @ bf34b1b7
......@@ -2,9 +2,9 @@ package com.yeejoin.amos.boot.module.jg.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Builder;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/BusinessTypeEnum.java
View file @ bf34b1b7
......@@ -52,8 +52,9 @@ public enum BusinessTypeEnum {
JG_HISTORY_USAGE_REGISTRATION("119", "历史设备登记"),
JG_OVER_DESIGN_SERVICE_LIFE("120", "超设计使用年限登记");
JG_OVER_DESIGN_SERVICE_LIFE("120", "超设计使用年限登记"),
JG_REPLACEMENT_REGISTRATION("121", "补证登记");
private final String code;
private final String name;
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationManageMapper.xml
View file @ bf34b1b7
......@@ -90,8 +90,8 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and tjurm.equ_category_code = #{dto.equCategoryCode}
</if>
<if test="dto.equDefineCode != null and dto.equDefineCode != ''">
and tjurm.equ_define = #{dto.equDefineCode}
<if test="dto.equDefine != null and dto.equDefine != ''">
and tjurm.equ_define = #{dto.equDefine}
</if>
<if test="dto.equDefineCode != null and dto.equDefineCode != ''">
and tjurm.equ_define_code = #{dto.equDefineCode}
......
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 @ bf34b1b7
......@@ -24,6 +24,7 @@ import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgRegistrationHistorySer
import com.yeejoin.amos.boot.module.jg.biz.utils.CodeUtil;
import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
......@@ -834,4 +835,22 @@ public class CommonController extends BaseController {
public void getCertReplenishFormStream(HttpServletResponse response, @RequestBody JSONObject jsonObject) {
iJgCertificateReplenishService.getCertReplenishFormStream(jsonObject, response);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "使用登记表/补证申请表生成", notes = "使用登记表/补证申请表生成")
@PostMapping(value = "/getRegistrationOrCertReplenishFormUrl")
public ResponseModel<Map<String, Object>> getRegistrationOrCertReplenishFormUrl(@RequestBody JSONObject jsonObject) {
String formBusinessType = Objects.toString(jsonObject.get("formBusinessType"));
if (ApplicationFormTypeEnum.BZDJ.getBusinessCode().equals(formBusinessType)) {
return ResponseHelper.buildResponse(iJgCertificateReplenishService.getCertReplenishFormUrl(jsonObject));
}
if (ApplicationFormTypeEnum.SYDJ.getBusinessCode().equals(formBusinessType)) {
JSONObject formData = JSONObject.parseObject(JSONObject.toJSONString(jsonObject.get("formData")));
String manageType = String.valueOf(jsonObject.get("manageType"));
ReginParams selectedOrgInfo = getSelectedOrgInfo();
formData.put("userName", selectedOrgInfo.getUserModel().getRealName());
return ResponseHelper.buildResponse(commonService.getRegistrationFormUrl(manageType, formData));
}
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/JgCertificateReplenishController.java
View file @ bf34b1b7
package com.yeejoin.amos.boot.module.jg.biz.controller;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.module.jg.api.dto.JgCertificateReplenishDto;
import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgCertificateReplenish;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationManageServiceImpl;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgCertificateReplenishServiceImpl;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
......@@ -26,64 +35,37 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
* @date 2025-03-19
*/
@RestController
@Api(tags = "Api")
@Api(tags = "补证申请登记")
@RequiredArgsConstructor
@RequestMapping(value = "/jg-certificate-replenish")
public class JgCertificateReplenishController extends BaseController {
@Autowired
JgCertificateReplenishServiceImpl jgCertificateReplenishServiceImpl;
private final JgCertificateReplenishServiceImpl jgCertificateReplenishServiceImpl;
/**
* 新增
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel<JgCertificateReplenish> save(@RequestBody JgCertificateReplenish entity) {
entity = jgCertificateReplenishServiceImpl.createWithModel(entity);
return ResponseHelper.buildResponse(entity);
}
/**
* 根据sequenceNbr更新
* 根据证的sequenceNbr 批量查询证下面的所有设备
*
* @param sequenceNbr 主键
* @return
* @param sequenceNbr 证的sequenceNbr
* @return 证下的所有设备
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
public ResponseModel<JgCertificateReplenish> updateBySequenceNbrJgCertificateReplenish(@RequestBody JgCertificateReplenish entity, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
entity.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.updateWithModel(entity));
@GetMapping(value = "/queryEquByCertificateSeqList")
@ApiOperation(httpMethod = "GET", value = "根据证的sequenceNbr 批量查询证下面的所有设备", notes = "根据证的sequenceNbr 批量查询证下面的所有设备")
public ResponseModel<Map<String, Object>> queryEquByCertificateSeqList(@RequestParam(value = "record") String sequenceNbr) {
return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.queryEquByCertSeq(sequenceNbr));
}
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.removeById(sequenceNbr));
}
/**
* 根据sequenceNbr查询
* 新增
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
public ResponseModel<JgCertificateReplenish> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.queryBySeq(sequenceNbr));
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel<List<Map<String, Object>>> save(@RequestBody JSONObject jsonObject) {
return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.save(jsonObject));
}
/**
......@@ -96,23 +78,79 @@ public class JgCertificateReplenishController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
public ResponseModel<Page<JgCertificateReplenish>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
(value = "size") int size) {
public ResponseModel<Page<JgCertificateReplenish>> queryForPage(JgCertificateReplenishDto dto,
@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size) {
Page<JgCertificateReplenish> page = new Page<JgCertificateReplenish>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.queryForJgCertificateReplenishPage(page));
return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.queryForJgCertificateReplenishPage(page, dto));
}
/**
* 列表全部数据查询
* 撤回
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<JgCertificateReplenish>> selectForList() {
return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.queryForJgCertificateReplenishList());
@PostMapping(value = "/cancel")
@ApiOperation(httpMethod = "POST", value = "撤回", notes = "撤回")
public ResponseModel<JgCertificateReplenishDto> cancel(@RequestBody JgCertificateReplenishDto dto) {
jgCertificateReplenishServiceImpl.cancel(dto);
return ResponseHelper.buildResponse(null);
}
//
// /**
// * 根据sequenceNbr更新
// *
// * @param sequenceNbr 主键
// * @return
// */
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @PutMapping(value = "/{sequenceNbr}")
// @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
// public ResponseModel<JgCertificateReplenish> updateBySequenceNbrJgCertificateReplenish(@RequestBody JgCertificateReplenish entity, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
// entity.setSequenceNbr(sequenceNbr);
// return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.updateWithModel(entity));
// }
//
// /**
// * 根据sequenceNbr删除
// *
// * @param sequenceNbr 主键
// * @return
// */
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @DeleteMapping(value = "/{sequenceNbr}")
// @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
// public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
// return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.removeById(sequenceNbr));
// }
//
// /**
// * 根据sequenceNbr查询
// *
// * @param sequenceNbr 主键
// * @return
// */
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @GetMapping(value = "/{sequenceNbr}")
// @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
// public ResponseModel<JgCertificateReplenish> selectOne(@PathVariable Long sequenceNbr) {
// return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.queryBySeq(sequenceNbr));
// }
//
//
// /**
// * 列表全部数据查询
// *
// * @return
// */
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
// @GetMapping(value = "/list")
// public ResponseModel<List<JgCertificateReplenish>> selectForList() {
// return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.queryForJgCertificateReplenishList());
// }
}
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/CommonServiceImpl.java
View file @ bf34b1b7
......@@ -209,6 +209,8 @@ public class CommonServiceImpl implements ICommonService {
@Autowired
JgUseRegistrationServiceImpl jgUseRegistrationServiceImpl;
@Autowired
JgCertificateReplenishServiceImpl jgCertificateReplenishServiceImpl;
@Autowired
@Lazy
JgEquipTransferServiceImpl jgEquipTransferServiceImpl;
@Autowired
......@@ -1345,6 +1347,12 @@ public class CommonServiceImpl implements ICommonService {
noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
JSONObject jsonObject = new JSONObject(noticeObj);
return jgOverDesignServiceLifeService.saveOrUpdate(jsonObject, reginParams);
} else if (ApplicationFormTypeEnum.BZDJ.getBusinessCode().equals(type)) {
noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
JSONObject jsonObject = new JSONObject(noticeObj);
jsonObject.put(JgCertificateReplenishServiceImpl.SHOULD_SUBMIT, "1".equals(submitType) ? JgCertificateReplenishServiceImpl.SUBMITTED : JgCertificateReplenishServiceImpl.DRAFT);
jsonObject.putAll(useRegFormUploadObj);
return jgCertificateReplenishServiceImpl.save(jsonObject);
}
return null;
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/CertificateReplenish.ftl
View file @ bf34b1b7
......@@ -289,7 +289,7 @@
<w:szCs w:val="28"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr>
<w:t>${(useUnitAddress)!'——'}</w:t>
<w:t>${(equUseAddress)!'——'}</w:t>
</w:r>
</w:p>
</w:tc>
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/ApplicationFormTypeEnum.java
View file @ bf34b1b7
......@@ -21,6 +21,7 @@ public enum ApplicationFormTypeEnum {
AZGZ("AZGZ", "GZ_AZ"),//安装告知
WBBA("WBBA", "WB_BA"),//维保合同备案
SYDJ("SYDJ", "DJ_SY"),//使用登记
BZDJ("BZDJ", "DJ_BZ"),// 补证登记
SBYJ("SBYJ", "SB_YJ"),//设备移交
GZGZ("GZGZ", "GZ_GZ"),//改造告知
WXGZ("WXGZ", "GZ_WX"),//维修告知
......
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