fix(检验检测开通)：1.新增状态显示名称（冗余字段）；2. 流程枚举字段+页面按钮权限控制

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcOpeningApplication.java

@@ -79,7 +79,11 @@ public class JyjcOpeningApplication extends BaseEntity {
      */
 	@TableField("status")
     private String status;
-
+    /**
+     * 状态
+     */
+    @TableField("status_name")
+    private String statusName;
     /**
      * 备注
      */

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

+package com.yeejoin.amos.boot.module.jyjc.api.enums;
+
+/**
+ * 办理状态枚举
+ */
+public enum  FlowStatusEnum {
+
+    /**
+     * 待提交
+     */
+    TO_BE_SUBMITTED(6610, "待提交"),
+    /**
+     * 已提交
+     */
+    SUBMITTED(6611, "已提交"),
+    /**
+     * 待受理
+     */
+    TO_BE_PROCESSED(6612, "待受理"),
+    /**
+     * 已办理
+     */
+    HAVE_PROCESSED(6613, "已办理"),
+
+    /**
+     * 已驳回
+     */
+    REJECTED(6614, "已驳回");
+
+    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;
+    }
+}
\ No newline at end of file

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

-package com.yeejoin.amos.boot.module.jyjc.api.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 检验检测开通流程执行状态
- * <p>
- * ProjectName: amos-boot-biz
- * PackageName: com.yeejoin.amos.boot.module.jyjc.api.enums
- *
- * @author yangyang
- * @version v1.0
- * @date 2023/12/14 21:56
- */
-@Getter
-@AllArgsConstructor
-public enum OpeningApplicationStatusEnums {
-
-    START("start", "启动"),
-    EXCUTING("excuting", "执行中"),
-    REJECT("reject", "驳回"),
-    WITHDRAW("withdraw", "撤回"),
-    COMPLETE("complete", "完成");
-
-    private String code;
-
-    private String name;
-}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcOpeningApplicationModel.java

@@ -52,6 +52,9 @@ public class JyjcOpeningApplicationModel extends BaseModel {
     @ApiModelProperty (value = "状态")
     private String status;
 
+    @ApiModelProperty (value = "状态Name")
+    private String statusName;
+
     @ApiModelProperty (value = "备注")
     private String remark;
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcOpeningApplicationMapper.xml

@@ -22,7 +22,8 @@
         apply_time,
         workflow_prostance_id,
         workflow_role,
-        unit_code_name
+        unit_code_name,
+        status_name
         from tz_jyjc_opening_application
         <where>
             <if test="jyjcOpeningApplicationModel.applicationSeq != '' and jyjcOpeningApplicationModel.applicationSeq != null">

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

@@ -4,29 +4,24 @@ 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.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.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.OpeningApplicationStatusEnums;
+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.service.IJyjcOpeningApplicationService;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel;
 import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
-import com.yeejoin.amos.boot.module.jyjc.biz.config.CommonException;
 import com.yeejoin.amos.boot.module.jyjc.biz.feign.WorkflowFeignClient;
-import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseUnitLicenceDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzsUserInfo;
-import com.yeejoin.amos.boot.module.tcm.api.enums.LicenceTypeEnum;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzBaseUnitLicenceMapper;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserInfoMapper;
@@ -37,8 +32,6 @@ import com.yeejoin.amos.feign.workflow.model.AjaxResult;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import org.apache.commons.lang3.ObjectUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
-import org.bouncycastle.cert.ocsp.Req;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
@@ -48,7 +41,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.exception.instance.BadRequest;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
@@ -110,9 +102,13 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                     String roleGroups = executorArray.stream().map(json -> Optional.ofNullable(((LinkedHashMap) json).get("groupId")).orElse("").toString()).collect(Collectors.joining(","));
                     model.setWorkflowRole(roleGroups);
                 }
-                model.setStatus(OpeningApplicationStatusEnums.START.getCode());
+                model.setStatus(FlowStatusEnum.SUBMITTED.getCode() + "");
+                model.setStatusName(FlowStatusEnum.SUBMITTED.getName());
                 // model.setStatus(!ValidationUtil.isEmpty(dataObject) && !ValidationUtil.isEmpty(dataObject.get("status")) ? String.valueOf(dataObject.get("status")) : "");
                 model.setWorkflowProstanceId(instanceId);
+            } else {
+                model.setStatus(FlowStatusEnum.TO_BE_SUBMITTED.getCode() + "");
+                model.setStatusName(FlowStatusEnum.TO_BE_SUBMITTED.getName());
             }
             if (model.getSequenceNbr() == null) {
                 CompanyBo companyBo = commonserviceImpl.getReginParamsOfCurrentUser().getCompany();
@@ -132,7 +128,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
 
     @Transactional (rollbackFor = {Exception.class, BaseException.class})
     public JyjcOpeningApplicationModel resubmit(JyjcOpeningApplicationModel model) {
-        model.setStatus(OpeningApplicationStatusEnums.EXCUTING.getCode());
+        model.setStatus(FlowStatusEnum.SUBMITTED.getCode() + "");
+        model.setStatusName(FlowStatusEnum.SUBMITTED.getName());
         model = this.updateWithModel(model);
         execueFlow("0", model.getWorkflowProstanceId(), "");
         return model;
@@ -149,6 +146,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         entity.setWorkflowRole(getWorkflowRoleGroups(taskJson));
         // entity.setStatus(getWorkflowStatus(taskJson));
         entity.setStatus(status);
+        entity.setStatusName(FlowStatusEnum.getNameByType(Long.parseLong(status)));
         this.updateById(entity);
     }
 
@@ -287,7 +285,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
 
             }
 
-            updateModelByInstanceId(instanceId, "0".equals(op) ? OpeningApplicationStatusEnums.EXCUTING.getCode() : OpeningApplicationStatusEnums.REJECT.getCode());
+            updateModelByInstanceId(instanceId, "0".equals(op) ? FlowStatusEnum.HAVE_PROCESSED.getCode() + "" : FlowStatusEnum.REJECTED.getCode() + "");
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -303,7 +301,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             if (ObjectUtils.isEmpty(ajaxResult1)) {
 
             }
-            updateModelByInstanceId(instanceId, OpeningApplicationStatusEnums.WITHDRAW.getCode());
+            updateModelByInstanceId(instanceId, FlowStatusEnum.REJECTED.getCode() + "");
         } catch (Exception e) {
             e.printStackTrace();
         }