补证登记相关

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

@@ -91,9 +91,6 @@ public class JgCertificateReplenishDto extends BaseDto {
     @ApiModelProperty(value = "当前流程节点名称")
     private String taskName;
 
-    @ApiModelProperty(value = "流程状态")
-    private String instanceStatus;
-
     @ApiModelProperty(value = "下步执行角色/人id")
     private String nextExecuteIds;
 
@@ -129,4 +126,7 @@ public class JgCertificateReplenishDto extends BaseDto {
     private String dataType;
     private List<Map<String, Object>> equLists;
 
+    @ApiModelProperty("设备使用地址")
+    private String equUseAddress;
+
 }

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

@@ -2,11 +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.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
@@ -21,6 +19,7 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @AllArgsConstructor
+@NoArgsConstructor
 @Builder
 @TableName("tzs_jg_certificate_replenish")
 public class JgCertificateReplenish extends BaseEntity {
@@ -70,6 +69,18 @@ public class JgCertificateReplenish extends BaseEntity {
     private String applyStatus;
 
     /**
+     * 申请状态
+     */
+    @TableField(exist = false)
+    private String applyStatusDes;
+
+    /**
+     * 是否企业
+     */
+    @TableField(exist = false)
+    private Boolean isCompany;
+
+    /**
      * 使用单位统一信用代码
      */
     @TableField("use_unit_code")
@@ -121,6 +132,7 @@ public class JgCertificateReplenish extends BaseEntity {
      * 遗失或者损毁时间
      */
     @TableField("loss_damage_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date lossDamageTime;
 
     /**
@@ -154,12 +166,6 @@ public class JgCertificateReplenish extends BaseEntity {
     private String taskName;
 
     /**
-     * 流程状态
-     */
-    @TableField("instance_status")
-    private String instanceStatus;
-
-    /**
      * 下步执行角色/人id
      */
     @TableField("next_execute_ids")
@@ -225,4 +231,12 @@ public class JgCertificateReplenish extends BaseEntity {
     @TableField("whether_vehicle_cylinder")
     private String whetherVehicleCylinder;
 
+    /**
+     * 设备使用地址
+     */
+    @TableField("equ_use_address")
+    private String equUseAddress;
+
+    @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/JgCertificateReplenishEq.java

@@ -2,11 +2,8 @@ package com.yeejoin.amos.boot.module.jg.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.*;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
@@ -19,6 +16,7 @@ import java.util.Date;
  */
 @Data
 @AllArgsConstructor
+@NoArgsConstructor
 @Builder
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
+import com.alibaba.fastjson.JSON;
 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;
@@ -12,10 +13,7 @@ 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.*;
 import java.util.stream.Collectors;
 
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgCertificateReplenishServiceImpl;
@@ -30,6 +28,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 
+import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgCertificateReplenishServiceImpl.*;
+
 /**
  * @author system_generator
  * @date 2025-03-19
@@ -64,11 +64,35 @@ public class JgCertificateReplenishController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-    public ResponseModel<List<Map<String, Object>>> save(@RequestBody JSONObject jsonObject) {
+    public ResponseModel<List<JgCertificateReplenish>> save(@RequestBody JSONObject jsonObject) {
         return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.save(jsonObject));
     }
 
     /**
+     * 更新
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/update")
+    @ApiOperation(httpMethod = "POST", value = "根据sequenceNbr更新补证登记单", notes = "根据sequenceNbr更新补证登记单")
+    public ResponseModel<Object> updateBySequenceNbr(@RequestParam("submitType") String submitType,
+                                                     @RequestBody JSONObject jsonObject) {
+        return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.updateCertRep("0".equals(submitType) ? UPDDATE_NOT_SUBMIT : UPDDATE_SUBMIT, jsonObject));
+    }
+
+    /**
+     * 受理
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/accept")
+    @ApiOperation(httpMethod = "POST", value = "补证登记受理", notes = "补证登记受理")
+    public ResponseModel<JgEquipTransferDto> accept(@RequestParam(value = "operate") String operate, @RequestBody Map<String, Object> map) {
+        JSONObject model = JSON.parseObject(JSON.toJSONString(map.get(MODEL)));
+        model.put(PROCESS_ADVICE, map.get(PROCESS_ADVICE));
+        jgCertificateReplenishServiceImpl.accept("0".equals(operate) ? APPROVED : REJECTED, model);
+        return ResponseHelper.buildResponse(null);
+    }
+
+    /**
      * 列表分页查询
      *
      * @param current 当前页
@@ -99,33 +123,32 @@ public class JgCertificateReplenishController extends BaseController {
         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 Map
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/details")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单据", notes = "根据sequenceNbr查询单据")
+    public ResponseModel<Map<String, Object>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.queryBySequenceNbr(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.removeCertRepBySequenceNbr(sequenceNbr));
+    }
     //
     // /**
     //  * 根据sequenceNbr查询

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/JgCertificateReplenishEquipUsedCheckImpl.java

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgCertificateReplenishMapper;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgScrapCancelMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RBucket;
+import org.redisson.api.RedissonClient;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * @author Administrator
+ */
+@Component
+@Slf4j
+public class JgCertificateReplenishEquipUsedCheckImpl extends BaseEquipUsedCheckService {
+
+    private RedissonClient redissonClient;
+
+    private String bizType = "certReplenish";
+
+    private JgCertificateReplenishMapper mapper;
+
+    public JgCertificateReplenishEquipUsedCheckImpl(RedissonClient redissonClient, JgCertificateReplenishMapper mapper) {
+        this.redissonClient = redissonClient;
+        this.mapper = mapper;
+    }
+
+
+    @Override
+    public RedissonClient getRedisClient() {
+        return redissonClient;
+    }
+
+    @Override
+    public String getApplyBizType() {
+        return bizType;
+    }
+
+
+    @Override
+    public void init() {
+        // List<CompanyEquipCountDto> companyEquipCountDtos = mapper.queryForFlowingEquipList();
+        // companyEquipCountDtos.remove(null);
+        // companyEquipCountDtos.forEach(c -> {
+        //     RBucket<Set<String>> rBucket = redissonClient.getBucket(getFlowingEquipRedisKey(c.getCompanyCode(), bizType));
+        //     rBucket.set(Arrays.stream(c.getRecords().split(",")).collect(Collectors.toSet()));
+        // });
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -322,5 +322,23 @@
     "pageType": "look",
     "name": "超设计使用年限变更",
     "url": "/mixuap?appId=1742358052905971713&id=1897575052807794690&roleIds={roleIds}&userId={userId}&pageType=look"
-  }
+  },
+    {
+        "type": "121",
+        "pageType": "draft",
+        "name": "补证登记",
+        "url": "/mixuap?appId=1742358052905971713&id=1902274552956743682&roleIds={roleIds}&userId={userId}&pageType=edit"
+    },
+    {
+        "type": "121",
+        "pageType": "edit",
+        "name": "补证登记",
+        "url": "/mixuap?appId=1742358052905971713&id=1902274797757296642&roleIds={roleIds}&userId={userId}&pageType=edit"
+    },
+    {
+        "type": "121",
+        "pageType": "look",
+        "name": "补证登记",
+        "url": "/mixuap?appId=1742358052905971713&id=1902274797757296642&roleIds={roleIds}&userId={userId}&pageType=look"
+    }
 ]
\ No newline at end of file