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/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationReformDto.java

@@ -5,7 +5,9 @@ import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
+import java.util.List;
 
 /**
  * 改造变更登记
@@ -15,7 +17,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="JgChangeRegistrationReformDto", description="改造变更登记")
+@ApiModel(value = "JgChangeRegistrationReformDto", description = "改造变更登记")
 public class JgChangeRegistrationReformDto extends BaseDto {
 
     private static final long serialVersionUID = 1L;
@@ -108,4 +110,11 @@ public class JgChangeRegistrationReformDto  extends BaseDto {
     @ApiModelProperty(value = "任务发起人id")
     private String promoter;
 
+
+    private List<String> roleIds;
+
+    private String dataType;
+
+    private String unitCode;
+
 }

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 改造变更登记

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/FlowStatusEnum.java

-package com.yeejoin.amos.boot.module.jg.api.enums;
-
-/**
- * 办理状态枚举
- */
-public enum  FlowStatusEnum {
-
-    /**
-     * 待提交
-     */
-    TO_BE_SUBMITTED(6610, "待提交"),
-    /**
-     * 已提交
-     */
-    SUBMITTED(6611, "已提交"),
-    /**
-     * 待受理
-     */
-    TO_BE_PROCESSED(6612, "待受理"),
-    /**
-     * 已办理
-     */
-    HAVE_PROCESSED(6613, "已办理"),
-
-    /**
-     * 已驳回
-     */
-    REJECTED(6614, "已驳回"),
-
-    /**
-     * 已撤回
-     */
-    ROBACK(6615, "已撤回");
-
-    private final int code;
-
-    private final String name;
-
-    FlowStatusEnum(int code, String name) {
-        this.code = code;
-        this.name = name;
-    }
-
-    public static String getNameByType(Long code) {
-        String name = null;
-        for (FlowStatusEnum enumOne : FlowStatusEnum.values()) {
-            if (enumOne.getCode() == code) {
-                name = enumOne.getName();
-                break;
-            }
-        }
-        return name;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public String getName() {
-        return name;
-    }
-}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgChangeRegistrationReformEqMapper.java

@@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Update;
  * @date 2023-12-20
  */
 public interface JgChangeRegistrationReformEqMapper extends BaseMapper<JgChangeRegistrationReformEq> {
-    @Update("update jg_change_registration_reform set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id = #{currentDocumentId} ")
+    @Update("update jg_change_registration_reform set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id != #{currentDocumentId} ")
     void updateEquipIsVaildByEquipIdAndCurrentDocumentId(@Param("equipId") String equipId, @Param("currentDocumentId") String currentDocumentId);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgChangeRegistrationReformMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -17,7 +18,7 @@ import java.util.Map;
  * @date 2023-12-20
  */
 public interface JgChangeRegistrationReformMapper extends BaseMapper<JgChangeRegistrationReform> {
-    Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page, @Param("dto") JgUseRegistrationDto dto , @Param("roleIds") List<String> roleIds);
+    Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page, @Param("dto") JgChangeRegistrationReformDto dto , @Param("roleIds") List<String> roleIds);
 
     Map<String, Object> getDetail(@Param("id")String id);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgChangeRegistrationTransferEqMapper.java

@@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Update;
  * @date 2023-12-20
  */
 public interface JgChangeRegistrationTransferEqMapper extends BaseMapper<JgChangeRegistrationTransferEq> {
-    @Update("update tzs_jg_change_registration_transfer_eq set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id = #{currentDocumentId} ")
+    @Update("update tzs_jg_change_registration_transfer_eq set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id != #{currentDocumentId} ")
     void updateEquipIsVaildByEquipIdAndCurrentDocumentId(@Param("equipId") String equipId,@Param("currentDocumentId") String currentDocumentId);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationEqMapper.java

@@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Update;
  * @date 2023-12-18
  */
 public interface JgUseRegistrationEqMapper extends BaseMapper<JgUseRegistrationEq> {
-    @Update("update tzs_jg_use_registration_eq set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id = #{currentDocumentId} ")
+    @Update("update tzs_jg_use_registration_eq set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id != #{currentDocumentId} ")
     void updateEquipIsVaildByEquipIdAndCurrentDocumentId(@Param("equipId") String equipId, @Param("currentDocumentId") String currentDocumentId);
 }

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

@@ -31,15 +31,15 @@
 
         <where>
             and  ur.is_delete = 0
-            <if test="dto.equCategory != null and dto.equCategory != ''">
-                and jri.EQU_CATEGORY = #{dto.equCategory}
-            </if>
+<!--            <if test="dto.equCategory != null and dto.equCategory != ''">-->
+<!--                and jri.EQU_CATEGORY = #{dto.equCategory}-->
+<!--            </if>-->
             <if test="dto.auditStatus != null and dto.auditStatus != ''">
                 and ur.audit_status = #{dto.auditStatus}
             </if>
-            <if test="dto.equCode != null and dto.equCode != ''">
-                and jri.EQU_CODE like concat('%',#{dto.equCode},'%')
-            </if>
+<!--            <if test="dto.equCode != null and dto.equCode != ''">-->
+<!--                and jri.EQU_CODE like concat('%',#{dto.equCode},'%')-->
+<!--            </if>-->
             <if test="dto.useUnitName != null and dto.useUnitName != ''">
                 and  ur.use_unit_name like concat('%',#{dto.useUnitName},'%')
             </if>

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

@@ -44,7 +44,6 @@
                 </if>
             </if>
             <if test="type == 'supervision'">
-                AND (isn.notice_status in ('6612', '6613', '6610')  )
                 AND isn.receive_org_credit_code = #{orgCode}
             </if>
             <if test="type == 'enterprise'">

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

@@ -2,7 +2,9 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -75,8 +77,8 @@ public class JgChangeRegistrationReformController extends BaseController {
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/deleteMessage")
-	@ApiOperation(httpMethod = "POST", value = "批量删除", notes = "批量删除")
+	@PostMapping(value = "/delete")
+	@ApiOperation(httpMethod = "POST", value = "删除", notes = "删除")
 	public ResponseModel<Object> deleteMessage(@RequestParam("id") Long id) {
 		ArrayList<Long> ids = new ArrayList<>();
 		ids.add(id);
@@ -87,7 +89,7 @@ public class JgChangeRegistrationReformController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
 	@GetMapping(value = "/getList")
-	public ResponseModel<Page<Map<String, Object>>> getList(JgUseRegistrationDto dto,
+	public ResponseModel<Page<Map<String, Object>>> getList(JgChangeRegistrationReformDto dto,
 															@RequestParam(value = "current") int current,
 															@RequestParam(value = "size") int size) {
 		Page<Map<String, Object>> page = new Page<>(current, size);
@@ -97,7 +99,7 @@ public class JgChangeRegistrationReformController extends BaseController {
 
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+	@ApiOperation(httpMethod = "GET", value = "获取设备列表", notes = "获取设备列表")
 	@GetMapping(value = "/getEquipList")
 	public ResponseModel<Page<Map<String, Object>>> getEquipList(
 			@RequestParam(value = "current") int current,
@@ -110,14 +112,14 @@ public class JgChangeRegistrationReformController extends BaseController {
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+	@ApiOperation(httpMethod = "GET", value = "获取详情", notes = "获取详情")
 	@GetMapping(value = "/getDetail")
 	public ResponseModel<Map<String, Object>> getDetail(@RequestParam("id") String id) {
 		return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getDetail(id));
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+	@ApiOperation(httpMethod = "GET", value = "获取使用单位code及name", notes = "获取使用单位code及name")
 	@GetMapping(value = "/getMessage")
 	public ResponseModel<Map<String, Object>> getMessage() {
 		ReginParams selectedOrgInfo = getSelectedOrgInfo();

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgEquipTransferController.java

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;
+import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
 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.List;
+import java.util.Map;
+
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgEquipTransferServiceImpl;
 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 com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto;
@@ -34,83 +40,61 @@ public class JgEquipTransferController extends BaseController {
 	/**
 	 * 新增设备移交
 	 *
-     * @return
+	 * @return s
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增设备移交", notes = "新增设备移交")
-	public ResponseModel<JgEquipTransferDto> save(@RequestBody JgEquipTransferDto model) {
-	    model = jgEquipTransferServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
+	public ResponseModel<String> save(@RequestBody JSONObject map) {
+		jgEquipTransferServiceImpl.save(map);
+		return ResponseHelper.buildResponse("ok");
 	}
 
 	/**
-     * 根据sequenceNbr更新
+	 * 批量删除
 	 *
-     * @param sequenceNbr 主键
-     * @return
+	 * @param ids 主键
+	 * @return ResponseModel
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新设备移交", notes = "根据sequenceNbr更新设备移交")
-	public ResponseModel<JgEquipTransferDto> updateBySequenceNbrJgEquipTransfer(@RequestBody JgEquipTransferDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.updateWithModel(model));
+	@DeleteMapping(value = "/deleteBatch")
+	@ApiOperation(httpMethod = "POST", value = "批量删除设备移交", notes = "批量删除设备移交")
+	public ResponseModel<Object> deleteBySequenceNbr(@RequestParam String ids) {
+		if (StringUtils.isEmpty(ids)) {
+			throw new RuntimeException("请选择需要删除的行！");
 		}
-
-	/**
-     * 根据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(jgEquipTransferServiceImpl.removeById(sequenceNbr));
+		return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.removeByIds(Arrays.asList(ids.split(","))));
 	}
 
 	/**
 	 * 根据sequenceNbr查询
 	 *
 	 * @param sequenceNbr 主键
-     * @return
+	 * @return Map
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个设备移交",  notes = "根据sequenceNbr查询单个设备移交")
-	public ResponseModel<JgEquipTransferDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.queryBySeq(sequenceNbr));
+	@GetMapping(value = "/details")
+	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个设备移交", notes = "根据sequenceNbr查询单个设备移交")
+	public ResponseModel<Map<String, Map<String, Object>>> selectOne(@RequestParam Long sequenceNbr) {
+		return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.queryBySequenceNbr(sequenceNbr));
 	}
 
 	/**
 	 * 列表分页查询
 	 *
 	 * @param current 当前页
-     * @param current 每页大小
-     * @return
+	 * @param size    每页大小
+	 * @return Page
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "设备移交分页查询",  notes = "设备移交分页查询")
-	public ResponseModel<Page<JgEquipTransferDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<JgEquipTransferDto> page = new Page<JgEquipTransferDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.queryForJgEquipTransferPage(page));
-	}
-
-	/**
-	 * 列表全部数据查询
-     *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "设备移交列表全部数据查询",   notes = "设备移交列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<JgEquipTransferDto>> selectForList() {
-	    return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.queryForJgEquipTransferList());
+	@ApiOperation(httpMethod = "GET", value = "设备移交分页查询", notes = "设备移交分页查询")
+	public ResponseModel<Page<JgEquipTransferDto>> queryForPage(@RequestParam(value = "current") int current,
+																@RequestParam(value = "size") int size,
+																@ApiParam(value = "类型：enterprise-企业端、supervision-监管端", required = true) @RequestParam(value = "type", defaultValue = "enterprise") String type,
+																@RequestBody(required = false) JgEquipTransferDto dto) {
+		Page<JgEquipTransfer> page = new Page<>(current, size);
+		return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.queryForJgEquipTransferPage(page, dto, type, getSelectedOrgInfo()));
 	}
 }
+

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgInstallationByWorkFlowController.java

@@ -42,6 +42,7 @@ public class JgInstallationByWorkFlowController {
      *
      * @return
      */
+    @Deprecated
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/submit")
     @ApiOperation(httpMethod = "POST", value = "安装告知提交", notes = "安装告知提交")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationController.java

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
-import com.yeejoin.amos.boot.module.jg.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
-import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;

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

@@ -91,7 +91,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     /**
      * 分页查询
      */
-    public Page<Map<String, Object>> getList(JgUseRegistrationDto dto, Page<Map<String, Object>> page, List<String> roleIds) {
+    public Page<Map<String, Object>> getList(JgChangeRegistrationReformDto dto, Page<Map<String, Object>> page, List<String> roleIds) {
         Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds);
         return listPage;
     }

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipTransferMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgEquipTransferService;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto;
+import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
+import org.springframework.beans.BeanUtils;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * 设备移交服务实现类
@@ -16,18 +24,63 @@ import java.util.List;
  * @date 2023-12-20
  */
 @Service
-public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,JgEquipTransfer,JgEquipTransferMapper> implements IJgEquipTransferService {
-    /**
-     * 分页查询
-     */
-    public Page<JgEquipTransferDto> queryForJgEquipTransferPage(Page<JgEquipTransferDto> page)   {
-        return this.queryForPage(page, null, false);
+public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,JgEquipTransfer, JgEquipTransferMapper> implements IJgEquipTransferService {
+    @Override
+    public Page<JgEquipTransferDto> queryForJgEquipTransferPage(Page<JgEquipTransfer> page, JgEquipTransferDto dto, String type, ReginParams reginParams) {
+
+        Page<JgEquipTransfer> equipTransferPage = this.baseMapper.queryForPage(page, dto, type, reginParams.getCompany().getCompanyCode());
+
+        Page<JgEquipTransferDto> equipTransferDtoPage = new Page<>();
+        BeanUtils.copyProperties(equipTransferPage, equipTransferDtoPage, "records");
+        List<JgEquipTransferDto> records = equipTransferPage.getRecords().stream().map(transfer -> {
+            JgEquipTransferDto equipTransferDto = new JgEquipTransferDto();
+            BeanUtils.copyProperties(transfer, equipTransferDto);
+            if (Objects.nonNull(transfer.getApplyStatus())) {
+                equipTransferDto.setApplyStatusDesc(FlowStatusEnum.getNameByType(Long.valueOf(transfer.getApplyStatus())));
             }
+            return equipTransferDto;
+        }).collect(java.util.stream.Collectors.toList());
+        equipTransferDtoPage.setRecords(records);
 
-    /**
-     * 列表查询 示例
-     */
-    public List<JgEquipTransferDto> queryForJgEquipTransferList()   {
-        return this.queryForList("" , false);
+        return equipTransferDtoPage;
+    }
+
+    @Override
+    public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr) {
+        JgEquipTransfer equipTransfer = this.baseMapper.selectById(sequenceNbr);
+
+        if (Objects.isNull(equipTransfer)) {
+            return null;
+        }
+
+        Map<String, Object> equipTransferInfo = createEquipTransferInfo(equipTransfer);
+
+        String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard",
+                "productQualityYieldProve", "insUseMaintainExplain", "inspectReport",
+                "proxyStatementAttachment", "installContractAttachment"};
+
+        List<Map<String, Object>> equipmentInfos = this.baseMapper.queryEquipInformation(sequenceNbr);
+
+        handleJsonArrayFields(equipTransferInfo, fields);
+        handleJsonArrayFields(equipmentInfos.get(0), fields);
+
+        Map<String, Map<String, Object>> result = new HashMap<>();
+        result.put("installationInfo", equipTransferInfo);
+        result.put("equipmentInfo", equipmentInfos.get(0));
+
+        return result;
+    }
+
+    private Map<String, Object> createEquipTransferInfo(JgEquipTransfer equipTransfer) {
+        Map<String, Object> equipTransferInfo = new HashMap<>(BeanUtil.beanToMap(equipTransfer));
+        equipTransferInfo.put("useUnitCreditCode", equipTransfer.getUseUnitCreditCode() + "_" + equipTransfer.getUseUnitName());
+        equipTransferInfo.put("installUnitCreditCode", equipTransfer.getInstallUnitCreditCode() + "_" + equipTransfer.getInstallUnitName());
+        return equipTransferInfo;
+    }
+
+    private void handleJsonArrayFields(Map<String, Object> map, String[] fields) {
+        for (String field : fields) {
+            map.computeIfPresent(field, (key, value) -> JSON.parseArray(value.toString()));
+        }
     }
 }
\ 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/JgInstallationNoticeServiceImpl.java

@@ -5,17 +5,14 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.aspose.words.SaveFormat;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.module.jg.api.dto.ByteArrayMultipartFile;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNoticeEq;
-import com.yeejoin.amos.boot.module.jg.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
@@ -26,6 +23,7 @@ import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
 import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
 import com.yeejoin.amos.boot.module.ymt.api.entity.SupervisoryCodeInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;

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

@@ -16,7 +16,6 @@ import com.yeejoin.amos.boot.module.jg.api.dto.ByteArrayMultipartFile;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNoticeEq;
-import com.yeejoin.amos.boot.module.jg.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintainNoticeEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintainNoticeMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintainNoticeService;
@@ -26,6 +25,7 @@ import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
 import com.yeejoin.amos.boot.module.ymt.api.entity.OtherInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;

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

@@ -8,16 +8,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 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.JgMaintenanceContractDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContract;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContractEq;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
-import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.MaintenanceEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.UseStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractEqMapper;
@@ -26,6 +22,7 @@ import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintenanceContractService
 import com.yeejoin.amos.boot.module.jg.api.vo.JgMaintenanceContractVo;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;

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

@@ -13,19 +13,15 @@ import com.yeejoin.amos.boot.module.jg.api.dto.ByteArrayMultipartFile;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNoticeEq;
-import com.yeejoin.amos.boot.module.jg.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgReformNoticeEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgReformNoticeMapper;
-import com.yeejoin.amos.boot.module.jg.api.mapper.JgReformNoticeMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgReformNoticeService;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
 import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
-import com.yeejoin.amos.boot.module.ymt.api.entity.OtherInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.SupervisoryCodeInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
@@ -51,7 +47,6 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.io.File;
 import java.io.FileInputStream;

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

@@ -4,27 +4,22 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.aspose.words.SaveFormat;
-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;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNoticeEq;
-import com.yeejoin.amos.boot.module.jg.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgTransferNoticeEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgTransferNoticeMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgTransferNoticeService;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
 import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
-import com.yeejoin.amos.boot.module.ymt.api.entity.OtherInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.SupervisoryCodeInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
@@ -49,13 +44,11 @@ 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;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.text.ParseException;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;

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

 package com.yeejoin.amos.boot.module.jyjc.biz.controller;
 
-import cn.hutool.core.map.MapBuilder;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
-import com.yeejoin.amos.boot.module.jyjc.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationRequstDto;
 import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
+import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.privilege.model.GroupModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -10,23 +10,21 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.enums.WorkFlowEnum;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.*;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.DocumentEnum;
-import com.yeejoin.amos.boot.module.jyjc.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.ResultStatusEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationEquipMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.model.*;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionApplicationService;
-import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
 import com.yeejoin.amos.boot.module.jyjc.biz.feign.JgFeignClient;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.handler.JyjcInspectionApplicationHandlerFactory;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.workflow.Workflow;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapBuilder;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.netflix.loadbalancer.RetryRule;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
-import com.yeejoin.amos.boot.module.jyjc.api.common.CommonConstants;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
-import com.yeejoin.amos.boot.module.jyjc.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcOpeningApplicationMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcGeographicModel;
@@ -30,6 +25,7 @@ import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseUnitLicenceMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzsUserInfoMapper;
@@ -45,7 +41,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
-import org.thymeleaf.expression.Ids;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -53,10 +48,8 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 
 import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 

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

-package com.yeejoin.amos.boot.module.jyjc.api.enums;
+package com.yeejoin.amos.boot.module.ymt.api.enums;
+
+import lombok.Getter;
 
 /**
- * 办理状态枚举
+ * 流程办理状态统一枚举
  */
+@Getter
 public enum FlowStatusEnum {
-
     /**
      * 待提交
      */
-    TO_BE_SUBMITTED(6610, "未提交"),
-    /**
-     * 已提交
-     */
-    SUBMITTED(6611, "已提交"),
+    TO_BE_SUBMITTED(6610, "待提交"),
+
     /**
      * 待受理
      */
     TO_BE_PROCESSED(6612, "待受理"),
-    /**
-     * 已办理
-     */
-    HAVE_PROCESSED(6613, "已办理"),
 
     /**
      * 已驳回
@@ -60,11 +55,4 @@ public enum  FlowStatusEnum {
         return name;
     }
 
-    public int getCode() {
-        return code;
-    }
-
-    public String getName() {
-        return name;
-    }
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/GenerateCodeServiceImpl.java

@@ -31,6 +31,7 @@ public class GenerateCodeServiceImpl implements IGenerateCodeService {
     private static final String LOCK_KEY_SUPERVISORY = "sequence_lock_supervisory";
     private static final String SEQUENCE_TYPE_UR = "%05d";
     private static final String SEQUENCE_TYPE = "%07d";
+    private static final long LOCK_EXPIRATION_SECONDS = 60;
     private final RedisTemplate<String, String> redisTemplate;
     private String rulePrefix = "";
 
@@ -140,7 +141,7 @@ public class GenerateCodeServiceImpl implements IGenerateCodeService {
      */
     public List<String> generateBatchSequence(String sequenceKey, int batchSize) {
         // 使用分布式锁，确保在并发情况下只有一个线程能够生成顺序码
-        Boolean lockAcquired = redisTemplate.opsForValue().setIfAbsent(LOCK_KEY_AF, LOCK_VALUE);
+        Boolean lockAcquired = obtainLock(LOCK_KEY_AF);
         if (Boolean.TRUE.equals(lockAcquired)) {
             try {
                 // 获取当前顺序码
@@ -166,7 +167,7 @@ public class GenerateCodeServiceImpl implements IGenerateCodeService {
 
                 return sequenceList;
             } finally {
-                redisTemplate.delete(LOCK_KEY_AF);
+                releaseLock(LOCK_KEY_AF);
             }
         } else {
             // 获取锁失败，可以选择重试或采取其他策略
@@ -309,7 +310,12 @@ public class GenerateCodeServiceImpl implements IGenerateCodeService {
      * @return bool
      */
     private Boolean obtainLock(String lockKey) {
-        return redisTemplate.opsForValue().setIfAbsent(lockKey, LOCK_VALUE);
+        Boolean lockAcquired = redisTemplate.opsForValue().setIfAbsent(lockKey, LOCK_VALUE);
+        if (lockAcquired != null && lockAcquired) {
+            redisTemplate.expire(lockKey, LOCK_EXPIRATION_SECONDS, TimeUnit.SECONDS);
+        }
+
+        return lockAcquired;
     }
 
     /**