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

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

@@ -1412,6 +1412,13 @@
         select sum(inUseNumber) from (
                  select count(1) as inUseNumber
                  from
+                     tzs_jg_certificate_replenish a
+                 where a.use_registration_code = #{code}
+                   AND a.is_delete = 0
+                   AND a.apply_status != '6617'
+                 UNION
+                 select count(1) as inUseNumber
+                 from
                      tzs_jg_change_registration_reform a
                  where a.use_registration_code = #{code}
                    AND a.is_delete = 0

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

@@ -2,31 +2,24 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 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.*;
-import java.util.stream.Collectors;
-
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgCertificateReplenishServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.component.event.RestEventTrigger;
+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 org.springframework.beans.factory.annotation.Autowired;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.web.bind.annotation.*;
-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 java.util.List;
+import java.util.Map;
 
 import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgCertificateReplenishServiceImpl.*;
 
@@ -52,6 +45,7 @@ public class JgCertificateReplenishController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/queryEquByCertificateSeqList")
     @ApiOperation(httpMethod = "GET", value = "根据证的sequenceNbr 批量查询证下面的所有设备", notes = "根据证的sequenceNbr 批量查询证下面的所有设备")
+    @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<Map<String, Object>> queryEquByCertificateSeqList(@RequestParam(value = "record") String sequenceNbr) {
         return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.queryEquByCertSeq(sequenceNbr));
     }
@@ -64,6 +58,7 @@ public class JgCertificateReplenishController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+    @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<List<JgCertificateReplenish>> save(@RequestBody JSONObject jsonObject) {
         return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.save(jsonObject));
     }
@@ -74,6 +69,7 @@ public class JgCertificateReplenishController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/update")
     @ApiOperation(httpMethod = "POST", value = "根据sequenceNbr更新补证登记单", notes = "根据sequenceNbr更新补证登记单")
+    @RestEventTrigger(value = "operateLogRestEventHandler")
     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));
@@ -85,6 +81,7 @@ public class JgCertificateReplenishController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/accept")
     @ApiOperation(httpMethod = "POST", value = "补证登记受理", notes = "补证登记受理")
+    @RestEventTrigger(value = "operateLogRestEventHandler")
     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));
@@ -102,6 +99,7 @@ public class JgCertificateReplenishController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/page")
     @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
+    @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<Page<JgCertificateReplenish>> queryForPage(JgCertificateReplenishDto dto,
                                                                     @RequestParam(value = "current") int current,
                                                                     @RequestParam(value = "size") int size) {
@@ -119,6 +117,7 @@ public class JgCertificateReplenishController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/cancel")
     @ApiOperation(httpMethod = "POST", value = "撤回", notes = "撤回")
+    @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<JgCertificateReplenishDto> cancel(@RequestBody JgCertificateReplenishDto dto) {
         jgCertificateReplenishServiceImpl.cancel(dto);
         return ResponseHelper.buildResponse(null);
@@ -133,6 +132,7 @@ public class JgCertificateReplenishController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/details")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单据", notes = "根据sequenceNbr查询单据")
+    @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<Map<String, Object>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
         return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.queryBySequenceNbr(sequenceNbr));
     }
@@ -146,34 +146,17 @@ public class JgCertificateReplenishController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
         return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.removeCertRepBySequenceNbr(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());
-    // }
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "PUT", value = "补证登记作废", notes = "补证登记作废")
+    @PutMapping(value = "/void")
+    @RestEventTrigger(value = "operateLogRestEventHandler")
+    public ResponseModel<JgCertificateReplenish> voidApplication(@RequestBody JgCertificateReplenishDto certDto) {
+        JgCertificateReplenish result = jgCertificateReplenishServiceImpl.voidApplication(certDto.getSequenceNbr(), certDto.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/impl/JgCertificateReplenishServiceImpl.java

@@ -959,4 +959,47 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
         jgRegistrationHistoryService.getBaseMapper().update(null, new LambdaUpdateWrapper<JgRegistrationHistory>().eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr).set(JgRegistrationHistory::getIsDelete, true));
         return Boolean.TRUE;
     }
+
+    @GlobalTransactional(rollbackFor = Exception.class)
+    public JgCertificateReplenish voidApplication(Long sequenceNbr, String cancelReason) {
+        JgCertificateReplenish certRep = this.baseMapper.selectById(sequenceNbr);
+        String oldApplyStatus = certRep.getApplyStatus();
+        certRep.setApplyStatus(String.valueOf(FlowStatusEnum.TO_BE_DISCARD.getCode()));
+        certRep.setCancelReason(cancelReason);
+        certRep.setCancelDate(new Date());
+        certRep.setCancelUserId(RequestContext.getExeUserId());
+        certRep.setNextExecuteUserIds(null);
+        certRep.setPromoter(null);
+        this.updateById(certRep);
+        this.processElseDataByStatus(Objects.requireNonNull(FlowStatusEnum.getEumByCode(Integer.parseInt(oldApplyStatus))), certRep);
+        return certRep;
+    }
+
+    private void processElseDataByStatus(FlowStatusEnum oldApplyStatus, JgCertificateReplenish certRep) {
+        switch (oldApplyStatus) {
+            // 待提交
+            case TO_BE_SUBMITTED:
+                // 删除暂存时生成的待办
+                commonService.deleteTaskModel(certRep.getSequenceNbr() + "", certRep.getInstanceId());
+                break;
+            // 已完成
+            case TO_BE_FINISHED:
+                // 1.删除写入到证管理表的补证日期
+                this.deleteCertManageReissueDate(certRep);
+                break;
+            // 流程中（驳回、撤回等）
+            default:
+                // 删除待办
+                commonService.deleteTaskModel(certRep.getSequenceNbr() + "", certRep.getInstanceId());
+                // 清空redis
+                this.delRepeatUseEquipData(certRep.getSequenceNbr(), certRep.getApplyStatus(), certRep.getUseUnitCode());
+        }
+    }
+
+    private void deleteCertManageReissueDate(JgCertificateReplenish certRep) {
+        registrationManageService.update(new LambdaUpdateWrapper<JgUseRegistrationManage>()
+                .eq(JgUseRegistrationManage::getUseRegistrationCode, certRep.getUseRegistrationCode())
+                .set(JgUseRegistrationManage::getReissueDate, null));
+    }
+
 }
\ No newline at end of file

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

@@ -189,10 +189,6 @@ public class ShCarServiceImpl extends BaseService<ShCar, ShCar, ShCarMapper> imp
         return this.baseMapper.alreadyExist(value) > 0;
     }
 
-    public static void main(String[] args) {
-        System.out.println(Boolean.parseBoolean("false"));
-    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean claim(String claimOneself, Map<String, Object> paramMap) {