改造变更登记开发

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationReformDto.java

@@ -157,4 +157,14 @@ public class JgChangeRegistrationReformDto extends BaseDto {
     @ApiModelProperty(value = "设备地址")
     private String equAddress;
 
+    @ApiModelProperty(value = "作废原因")
+    private String cancelReason;
+
+
+    @ApiModelProperty(value = "作废日期")
+    private Date cancelDate;
+
+    @ApiModelProperty(value = "作废人员id")
+    private String cancelUserId;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationReform.java

@@ -259,4 +259,22 @@ public class JgChangeRegistrationReform extends BaseEntity {
      */
     @TableField("receive_company_org_code")
     private String receiveCompanyOrgCode;
+
+    /**
+     * 作废原因
+     */
+    @TableField("cancel_reason")
+    private String cancelReason;
+
+    /**
+     * 作废日期
+     */
+    @TableField("cancel_date")
+    private Date cancelDate;
+
+    /**
+     * 作废人员id
+     */
+    @TableField("cancel_user_id")
+    private String cancelUserId;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationReformMapper.xml

@@ -33,6 +33,7 @@
         ur.next_task_id as nextTaskId,
         ur.create_user_id as createUserId,
         oi.CODE96333 as code96333,
+        ur.cancel_reason as cancelReason,
         (SELECT name from tz_equipment_category ec WHERE ec.code = jri.EQU_LIST) AS equList,
         (select name from tz_equipment_category ec WHERE ec.code = jri.EQU_DEFINE) AS equDefine
         from tzs_jg_change_registration_reform ur

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

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationReformServiceImpl;
 import io.swagger.annotations.Api;
@@ -40,7 +41,6 @@ public class JgChangeRegistrationReformController extends BaseController {
 
     /**
      * 新增改造变更登记
-     *
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
@@ -48,6 +48,7 @@ public class JgChangeRegistrationReformController extends BaseController {
     public ResponseModel<Object> save(@RequestBody JSONObject map) {
         return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.save(map));
     }
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/flowExecute")
     @ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
@@ -59,6 +60,7 @@ public class JgChangeRegistrationReformController extends BaseController {
                 String.valueOf(map.get("nextTaskId")));
         return ResponseHelper.buildResponse("ok");
     }
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/withdraw")
     @ApiOperation(httpMethod = "POST", value = "撤回", notes = "撤回")
@@ -91,20 +93,20 @@ public class JgChangeRegistrationReformController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
     @GetMapping(value = "/getList")
     public ResponseModel<Page<Map<String, Object>>> getList(JgChangeRegistrationReformDto dto,
-															@RequestParam(value = "sort",required = false) String sort,
+                                                            @RequestParam(value = "sort", required = false) String sort,
                                                             @RequestParam(value = "current") int current,
                                                             @RequestParam(value = "size") int size) {
         Page<Map<String, Object>> page = new Page<>(current, size);
         ReginParams reginParams = getSelectedOrgInfo();
-		if(reginParams.getCompany().getLevel().equals(COMPANY_TYPE_COMPANY)){
+        if (reginParams.getCompany().getLevel().equals(COMPANY_TYPE_COMPANY)) {
             dto.setDataType(COMPANY_TYPE_COMPANY);
             dto.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
         } else {
             dto.setDataType(COMPANY_TYPE_SUPERVISION);
             dto.setReceiveOrgCode(reginParams.getCompany().getCompanyCode());
         }
-		Page<Map<String, Object>> list = jgChangeRegistrationReformServiceImpl.getList(dto,sort, page, dto.getRoleIds());
-		list.getRecords().forEach(x-> x.put("companyType",reginParams.getCompany().getCompanyType()));
+        Page<Map<String, Object>> list = jgChangeRegistrationReformServiceImpl.getList(dto, sort, page, dto.getRoleIds());
+        list.getRecords().forEach(x -> x.put("companyType", reginParams.getCompany().getCompanyType()));
         return ResponseHelper.buildResponse(list);
     }
 
@@ -112,12 +114,13 @@ 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(value = "equipId",required = false) String equipId) {
-		return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getDetail(currentDocumentId,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));
     }
 
     /**
      * 改造登记-导出使用登记证
+     *
      * @param response    返回
      * @param sequenceNbr 主键
      * @param printType   打印类型，0-正常打印，1-套打（默认0）
@@ -126,19 +129,19 @@ public class JgChangeRegistrationReformController extends BaseController {
     @GetMapping(value = "/export")
     @ApiOperation(httpMethod = "GET", value = "改造登记-导出使用登记证", notes = "改造登记-导出使用登记证")
     public void exportImageZip(HttpServletResponse response, @RequestParam("sequenceNbr") String sequenceNbr,
-							   @RequestParam(value = "printType", defaultValue = "0") String printType){
+                               @RequestParam(value = "printType", defaultValue = "0") String printType) {
         jgChangeRegistrationReformServiceImpl.exportUseRegistrationCertificate(sequenceNbr, response, printType);
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping (value = "/getEquDetail")
+    @GetMapping(value = "/getEquDetail")
     @ApiOperation(httpMethod = "GET", value = "根据使用登记证查询设备详情(前端组件默认传参record)", notes = "根据使用登记证查询设备详情")
     public ResponseModel<Map<String, Object>> getEquDetail(@RequestParam String record) {
         return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getEquDetail(record));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping (value = "/getUseRegistrationCodeData")
+    @GetMapping(value = "/getUseRegistrationCodeData")
     @ApiOperation(httpMethod = "GET", value = "获取当前企业，某接收机构审批的使用登记证信息", notes = "获取当前企业，某接收机构审批的使用登记证信息")
     public ResponseModel<Page<JgUseRegistrationManageDto>> getUseRegistrationCodeData(
             @RequestParam(value = "current") int current,
@@ -164,24 +167,24 @@ public class JgChangeRegistrationReformController extends BaseController {
             dto.setReceiveCompanyCode(info.getCompany().getCompanyCode());
         }
         // 新增时使用EQU_LIST_CODE，适配组件，适配原有表单
-		if (!ObjectUtils.isEmpty(EQU_LIST_CODE)){
+        if (!ObjectUtils.isEmpty(EQU_LIST_CODE)) {
             dto.setEquListCode(EQU_LIST_CODE);
         }
         // 流程页面使用equList，适配组件，适配原有表单
-		if (!ObjectUtils.isEmpty(equList)){
+        if (!ObjectUtils.isEmpty(equList)) {
             dto.setEquListCode(equList);
         }
         // 流程页面使用登记证号筛选，适配组件，适配原有表单
-		if (!ObjectUtils.isEmpty(useRegistrationCode)){
+        if (!ObjectUtils.isEmpty(useRegistrationCode)) {
             dto.setUseRegistrationCode(useRegistrationCode);
         }
         // 流程页面使用equList，适配组件，适配原有表单
-		if (!ObjectUtils.isEmpty(EQU_CATEGORY_CODE)){
+        if (!ObjectUtils.isEmpty(EQU_CATEGORY_CODE)) {
             dto.setEquCategoryCode(EQU_CATEGORY_CODE);
         }
-		if (!ValidationUtil.isEmpty(receiveCompanyCode)){
+        if (!ValidationUtil.isEmpty(receiveCompanyCode)) {
             String[] codes = receiveCompanyCode.split("_");
-			if (!ValidationUtil.isEmpty(codes)){
+            if (!ValidationUtil.isEmpty(codes)) {
                 dto.setReceiveCompanyCode(codes[0]);
             }
         }
@@ -194,4 +197,12 @@ public class JgChangeRegistrationReformController extends BaseController {
         dto.setCertificateStatus("1".equals(transferType) ? "已注销" : "已登记");
         return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getUseRegistrationCodeData(page, dto));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "PUT", value = "改造变更登记作废", notes = "改造变更登记作废")
+    @PutMapping(value = "/cancel/application")
+    public ResponseModel<JgChangeRegistrationReform> cancelApplication(@RequestBody JgChangeRegistrationReformDto registrationReformDto) {
+        JgChangeRegistrationReform result = jgChangeRegistrationReformServiceImpl.cancelApplication(registrationReformDto.getSequenceNbr(), registrationReformDto.getCancelReason());
+        return ResponseHelper.buildResponse(result);
+    }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IIdxBizJgTechParamsBoilerService.java

 package com.yeejoin.amos.boot.module.jg.biz.service;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsBoiler;
 
 /**
@@ -9,7 +10,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsBoiler;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IIdxBizJgTechParamsBoilerService {
+public interface IIdxBizJgTechParamsBoilerService extends IService<IdxBizJgTechParamsBoiler> {
 
     void saveOrUpdateData(IdxBizJgTechParamsBoiler boiler);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IIdxBizJgTechParamsElevatorService.java

 package com.yeejoin.amos.boot.module.jg.biz.service;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsElevator;
 
 /**
@@ -9,7 +10,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsElevator;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IIdxBizJgTechParamsElevatorService {
+public interface IIdxBizJgTechParamsElevatorService extends IService<IdxBizJgTechParamsElevator> {
 
     boolean saveOrUpdateData(IdxBizJgTechParamsElevator techParamsElevator);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IIdxBizJgTechParamsLiftingService.java

 package com.yeejoin.amos.boot.module.jg.biz.service;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsLifting;
 
 /**
@@ -9,7 +10,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsLifting;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IIdxBizJgTechParamsLiftingService {
+public interface IIdxBizJgTechParamsLiftingService extends IService<IdxBizJgTechParamsLifting> {
 
     void saveOrUpdateData(IdxBizJgTechParamsLifting lifting);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IIdxBizJgTechParamsPipelineService.java

 package com.yeejoin.amos.boot.module.jg.biz.service;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsPipeline;
 
 /**
@@ -9,7 +10,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsPipeline;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IIdxBizJgTechParamsPipelineService {
+public interface IIdxBizJgTechParamsPipelineService extends IService<IdxBizJgTechParamsPipeline> {
 
     void saveOrUpdateData(IdxBizJgTechParamsPipeline pipeline);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IIdxBizJgTechParamsRidesService.java

 package com.yeejoin.amos.boot.module.jg.biz.service;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsRides;
 
 /**
@@ -9,7 +10,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsRides;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IIdxBizJgTechParamsRidesService {
+public interface IIdxBizJgTechParamsRidesService extends IService<IdxBizJgTechParamsRides> {
 
     void saveOrUpdateData(IdxBizJgTechParamsRides rides);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IIdxBizJgTechParamsRopewayService.java

 package com.yeejoin.amos.boot.module.jg.biz.service;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsRopeway;
 
 /**
@@ -9,7 +10,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsRopeway;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IIdxBizJgTechParamsRopewayService {
+public interface IIdxBizJgTechParamsRopewayService extends IService<IdxBizJgTechParamsRopeway> {
 
     void saveOrUpdateData(IdxBizJgTechParamsRopeway ropeway);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IIdxBizJgTechParamsVehicleService.java

 package com.yeejoin.amos.boot.module.jg.biz.service;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsVehicle;
 
 /**
@@ -9,7 +10,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsVehicle;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IIdxBizJgTechParamsVehicleService {
+public interface IIdxBizJgTechParamsVehicleService extends IService<IdxBizJgTechParamsVehicle> {
 
     void saveOrUpdateData(IdxBizJgTechParamsVehicle vehicle);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IIdxBizJgTechParamsVesselService.java

 package com.yeejoin.amos.boot.module.jg.biz.service;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsVessel;
 
 /**
@@ -9,7 +10,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsVessel;
  * @author system_generator
  * @date 2023-08-17
  */
-public interface IIdxBizJgTechParamsVesselService {
+public interface IIdxBizJgTechParamsVesselService extends IService<IdxBizJgTechParamsVessel> {
 
     void saveOrUpdateData(IdxBizJgTechParamsVessel vessel);
 

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

@@ -1135,7 +1135,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
      * @param fieldType 返回字段类型【CamelCase:驼峰命名，“”：纯大写加下划线】
      * @return
      */
-    private Map<String, Object> getEquipParamsMap(String record, String fieldType, String equipCode) {
+    public Map<String, Object> getEquipParamsMap(String record, String fieldType, String equipCode) {
 
         Map<String, Object> objMap = new HashMap<>();
         if (EquipmentClassifityEnum.DT.getCode().equals(equipCode)) {

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionResultController.java

@@ -190,7 +190,7 @@ public class JyjcInspectionResultController extends BaseController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "检验类型-按照身份查询", notes = "\"检验类型-按照身份查询")
+    @ApiOperation(httpMethod = "GET", value = "检验类型-按照身份查询", notes = "检验类型-按照身份查询")
     @GetMapping(value = "/inspectType/list")
     public ResponseModel<List<DictionarieModel>> inspectTypeListByPerson(){
         return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.inspectTypeListByPerson(getSelectedOrgInfo()));

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/EquipmentClassifityEnum.java

@@ -49,4 +49,13 @@ public enum EquipmentClassifityEnum {
         }
         return "";
     }
+
+    public static EquipmentClassifityEnum getOne(String code){
+        for (EquipmentClassifityEnum value : EquipmentClassifityEnum.values()) {
+            if (value.getCode().equals(code)){
+                return value;
+            }
+        }
+        return null;
+    }
 }