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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/BaseController.java

@@ -52,6 +52,11 @@ public class BaseController {
     protected ReginParams getSelectedOrgInfo() {
         return JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
     }
+
+    protected String getCompanyCode() {
+         String unitCode = getSelectedOrgInfo().getCompany().getCompanyCode();
+         return unitCode.contains("_") ? unitCode.substring(unitCode.indexOf("_") + 1) : unitCode;
+    }
     
 
 	/**

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/BaseEnterpriseCertDto.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.common.api.entity.BaseEnterpriseCert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 单位资质证书表
+ *
+ * @author system_generator
+ * @date 2025-07-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "BaseEnterpriseCertDto", description = "单位资质证书表")
+public class BaseEnterpriseCertDto extends BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "单位编码")
+    private String unitCode;
+
+    @ApiModelProperty(value = "证书类型")
+    private String certType;
+
+    @ApiModelProperty(value = "证书类型code")
+    private String certTypeCode;
+
+    @ApiModelProperty(value = "证书编号（核准证编号）")
+    private String certNo;
+
+    @ApiModelProperty(value = "有效期至")
+    private Date expiryDate;
+
+    @ApiModelProperty(value = "发证日期")
+    private Date issueDate;
+
+    @ApiModelProperty(value = "发证机关")
+    private String approvedOrgan;
+
+    @ApiModelProperty(value = "发证机关code")
+    private String approvedOrganCode;
+
+    @ApiModelProperty(value = "企业资质证书照片")
+    private String qualificationCertificateAttachment;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "许可项目信息code")
+    List<String> itemCodes;
+
+}

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/BaseEnterpriseCert.java

+package com.yeejoin.amos.boot.module.common.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 单位资质证书表
+ *
+ * @author system_generator
+ * @date 2025-07-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_base_enterprise_cert")
+public class BaseEnterpriseCert extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单位编码
+     */
+	@TableField("unit_code")
+    private String unitCode;
+
+    /**
+     * 证书类型
+     */
+	@TableField("cert_type")
+    private String certType;
+
+    /**
+     * 证书类型code
+     */
+	@TableField("cert_type_code")
+    private String certTypeCode;
+
+    /**
+     * 证书编号（核准证编号）
+     */
+	@TableField("cert_no")
+    private String certNo;
+
+    /**
+     * 有效期至
+     */
+	@TableField("expiry_date")
+    private Date expiryDate;
+
+    /**
+     * 发证日期
+     */
+	@TableField("issue_date")
+    private Date issueDate;
+
+    /**
+     * 发证机关
+     */
+	@TableField("approved_organ")
+    private String approvedOrgan;
+
+    /**
+     * 发证机关code
+     */
+	@TableField("approved_organ_code")
+    private String approvedOrganCode;
+
+    /**
+     * 企业资质证书照片
+     */
+	@TableField("qualification_certificate_attachment")
+    private String qualificationCertificateAttachment;
+
+    /**
+     * 备注
+     */
+	@TableField("remark")
+    private String remark;
+
+}

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/BaseEnterpriseCertMapper.java

+package com.yeejoin.amos.boot.module.common.api.mapper;
+
+import com.yeejoin.amos.boot.module.common.api.entity.BaseEnterpriseCert;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 单位资质证书表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2025-07-21
+ */
+public interface BaseEnterpriseCertMapper extends BaseMapper<BaseEnterpriseCert> {
+
+}

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IBaseEnterpriseCertService.java

+package com.yeejoin.amos.boot.module.common.api.service;
+
+
+/**
+ * 单位资质证书表接口类
+ *
+ * @author system_generator
+ * @date 2025-07-21
+ */
+public interface IBaseEnterpriseCertService {
+
+}

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/resources/mapper/BaseEnterpriseCertMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.BaseEnterpriseCertMapper">
+
+</mapper>

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/BaseEnterpriseCertController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+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.List;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.BaseEnterpriseCertServiceImpl;
+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.common.api.dto.BaseEnterpriseCertDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 单位资质证书表
+ *
+ * @author system_generator
+ * @date 2025-07-21
+ */
+@RestController
+@Api(tags = "单位资质证书表Api")
+@RequestMapping(value = "/base-enterprise-cert")
+public class BaseEnterpriseCertController extends BaseController {
+
+    @Autowired
+    BaseEnterpriseCertServiceImpl baseEnterpriseCertServiceImpl;
+
+    /**
+     * 新增单位资质证书表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增单位资质证书表", notes = "新增单位资质证书表")
+	public ResponseModel<BaseEnterpriseCertDto> save(@RequestBody BaseEnterpriseCertDto model) {
+	    model = baseEnterpriseCertServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新单位资质证书表", notes = "根据sequenceNbr更新单位资质证书表")
+	public ResponseModel<BaseEnterpriseCertDto> updateBySequenceNbrBaseEnterpriseCert(@RequestBody BaseEnterpriseCertDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(baseEnterpriseCertServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据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(baseEnterpriseCertServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个单位资质证书表",  notes = "根据sequenceNbr查询单个单位资质证书表")
+	public ResponseModel<BaseEnterpriseCertDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(baseEnterpriseCertServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "单位资质证书表分页查询",  notes = "单位资质证书表分页查询")
+	public ResponseModel<Page<BaseEnterpriseCertDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<BaseEnterpriseCertDto> page = new Page<BaseEnterpriseCertDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(baseEnterpriseCertServiceImpl.queryForBaseEnterpriseCertPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "单位资质证书表列表全部数据查询",   notes = "单位资质证书表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<BaseEnterpriseCertDto>> selectForList() {
+	    return ResponseHelper.buildResponse(baseEnterpriseCertServiceImpl.queryForBaseEnterpriseCertList());
+	}
+}

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

+package com.yeejoin.amos.boot.module.common.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.common.api.entity.BaseEnterpriseCert;
+import com.yeejoin.amos.boot.module.common.api.mapper.BaseEnterpriseCertMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IBaseEnterpriseCertService;
+import com.yeejoin.amos.boot.module.common.api.dto.BaseEnterpriseCertDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 单位资质证书表服务实现类
+ *
+ * @author system_generator
+ * @date 2025-07-21
+ */
+@Service
+public class BaseEnterpriseCertServiceImpl extends BaseService<BaseEnterpriseCertDto,BaseEnterpriseCert,BaseEnterpriseCertMapper> implements IBaseEnterpriseCertService {
+    /**
+     * 分页查询
+     */
+    public Page<BaseEnterpriseCertDto> queryForBaseEnterpriseCertPage(Page<BaseEnterpriseCertDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<BaseEnterpriseCertDto> queryForBaseEnterpriseCertList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

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

@@ -79,7 +79,16 @@ public enum WorkFlowStatusEnum {
      * 停用启用流程
      */
     ENABLE_SUBMIT("使用单位提交", "enableSubmit", "待提交", "已驳回", "已撤回"),
-    ENABLE_RECEIVE("监管受理", "enableReceive", "待受理", "", "");
+    ENABLE_RECEIVE("监管受理", "enableReceive", "待受理", "", ""),
+
+
+    /**
+     * 检验检测业务开通流程
+     */
+    OPENING_APPLICATION_SUBMIT("开通申请提交", "openingApplicationSubmit", "开通申请待提交", "资料校对受理已退回", "申请单位已撤回"),
+    OPENING_APPLICATION_RECEIVE("资料校对", "openingApplicationReceive", "资料校对待受理", "业务开通确认已退回", "资料校对受理已撤回"),
+    OPENING_APPLICATION_PRELIMINARY("系统对接", "openingApplicationPreliminary", "系统对接中", "", "系统对接受理已撤回"),
+    OPENING_APPLICATION_REEXAMINE("业务开通确认", "openingApplicationReexamine", "业务开通确认待受理", "", "");
 
 
     private final String name;

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

@@ -2251,7 +2251,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             commonServiceImpl.saveExecuteFlowData2Redis(instanceId, this.buildInstanceRuntimeData(data));
             this.clearDataForCheckEquipRepeatUsed(data);
         } catch (InterruptedException e) {
-            e.printStackTrace();
+           log.error(e.getMessage(), e);
         } finally {
             if (lock.isHeldByCurrentThread()) {
                 lock.unlock();

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/common/BizCommonConstant.java

@@ -7,8 +7,25 @@ package com.yeejoin.amos.boot.module.jyjc.api.common;
  */
 public interface BizCommonConstant {
 
-	/**
-	 * 所有平台企业数据redisKey
-	 */
-	String COMPANY_TREE_REDIS_KEY = "REGULATOR_UNIT_TREE";
+    /**
+     * 所有平台企业数据redisKey
+     */
+    String COMPANY_TREE_REDIS_KEY = "REGULATOR_UNIT_TREE";
+
+
+    /**
+     * 检验检测人员信息
+     */
+    String JYJC_USER_LIST_KEY = "jyjcUserInfos";
+
+
+    /**
+     * 检验检测区域负责人信息
+     */
+    String CHAGRE_USER_LIST_KEY = "chargeUserInfos";
+
+    /**
+     * 资质信息key
+     */
+    String UNIT_LICENCE_KEY = "baseUnitLicences";
 }

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

@@ -82,17 +82,20 @@ public class JyjcOpeningApplication extends BaseEntity {
      */
 	@TableField("status")
     private String status;
-    /**
-     * 状态
-     */
-    @TableField("status_name")
-    private String statusName;
+
     /**
      * 备注
      */
 	@TableField("remark")
     private String remark;
 
+
+    /**
+     * 状态
+     */
+    @Deprecated
+    @TableField("status_name")
+    private String statusName;
     /**
      * 申请时间
      */
@@ -147,4 +150,10 @@ public class JyjcOpeningApplication extends BaseEntity {
      */
     @TableField(value = "open_biz_type")
     private String openBizType;
+
+    /**
+     * 机构分类
+     */
+    @TableField(value = "agency_classify")
+    private String agencyClassify;
 }

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

+package com.yeejoin.amos.boot.module.jyjc.api.enums;
+
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+/**
+ * @author Administrator
+ */
+@Getter
+public enum OpenBizTypeEnumV2 {
+
+    /**
+     * 业务类型
+     */
+    JY("jy", "检验机构", "检验业务"),
+    JC("jc", "检测机构", "检测业务"),
+    SYDW("jc-sydw", "使用单位", "使用单位电梯检测"),
+    AGW("jc-agw", "安装改造维修单位", "安改维电梯检测");
+
+    private String code;
+
+    private String unitType;
+
+    private String description;
+
+
+    private OpenBizTypeEnumV2(String code, String unitType, String description) {
+        this.code = code;
+        this.unitType = unitType;
+        this.description = description;
+    }
+
+    public static OpenBizTypeEnumV2 getOneByCode(String code) {
+        Optional<OpenBizTypeEnumV2> op = Arrays.stream(OpenBizTypeEnumV2.values()).filter(e -> e.getCode().equals(code)).findFirst();
+        return op.orElse(null);
+    }
+
+    public static OpenBizTypeEnumV2 getOneByUnitType(String unitType) {
+        Optional<OpenBizTypeEnumV2> op = Arrays.stream(OpenBizTypeEnumV2.values()).filter(e -> e.getUnitType().equals(unitType)).findFirst();
+        return op.orElse(null);
+    }
+}

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

+package com.yeejoin.amos.boot.module.jyjc.api.enums;
+
+/**
+ * 人员类型
+ */
+public enum PersonTypeEnum {
+    jy,
+    jc,
+    charge
+}

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
-import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseUnitLicenceDto;
+import com.yeejoin.amos.boot.module.common.api.dto.BaseEnterpriseCertDto;
 import com.yeejoin.amos.boot.module.ymt.api.vo.TzsUserInfoVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -44,6 +44,7 @@ public class JyjcOpeningApplicationModel extends BaseModel {
     @ApiModelProperty(value = "申请单号")
     private String applicationSeq;
 
+    @Deprecated
     @ApiModelProperty(value = "检验结果方式")
     private String resultType;
 
@@ -58,6 +59,7 @@ public class JyjcOpeningApplicationModel extends BaseModel {
     @ApiModelProperty(value = "状态")
     private String status;
 
+    @Deprecated
     @ApiModelProperty(value = "状态Name")
     private String statusName;
 
@@ -86,12 +88,12 @@ public class JyjcOpeningApplicationModel extends BaseModel {
     @ApiModelProperty(value = "创建人ID")
     private String createUserId;
 
+    @ApiModelProperty(value = "检验检测人员信息")
+    List<TzsUserInfoVo> jyjcUserInfos;
 
-    @ApiModelProperty(value = "企业资质信息")
-    List<TzBaseUnitLicenceDto> baseUnitLicences;
+    @ApiModelProperty(value = "检验检测区域负责人信息")
+    List<TzsUserInfoVo> chargeUserInfos;
 
-    @ApiModelProperty(value = "检验人员信息")
-    List<TzsUserInfoVo> userInfos;
 
     @ApiModelProperty(value = "使用单位联系人")
     private String useContact;
@@ -135,4 +137,19 @@ public class JyjcOpeningApplicationModel extends BaseModel {
 
     @ApiModelProperty("开通的业务类型名称")
     private String openBizTypeName;
+
+    @ApiModelProperty("机构分类")
+    private String agencyClassify;
+
+    @ApiModelProperty(value = "企业资质证书信息")
+    List<BaseEnterpriseCertDto> baseUnitLicences;
+
+    @ApiModelProperty(value = "省内办公地址省#市#区")
+    private String officeRegion;
+
+    @ApiModelProperty(value = "省内详细办公地址")
+    private String officeAddress;
+
+    @ApiModelProperty(value = "单位所在地：陕西省内企业，省外企业")
+    private String dataSources;
 }

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.bean.BeanUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.BaseEnterpriseCertDto;
 import com.yeejoin.amos.boot.module.jyjc.api.dto.InspectionCompanyPublicityDto;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel;
@@ -25,9 +27,7 @@ import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
@@ -66,7 +66,11 @@ public class JyjcOpeningApplicationController extends BaseController {
             // 详情保存逻辑
             BeanUtil.copyProperties(model, jyjcOpeningApplicationModel);
         }
-        return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdate(jyjcOpeningApplicationModel));
+        if(model.containsKey("buniessInfo")){
+            List<BaseEnterpriseCertDto> baseEnterpriseCertDtos = JSONArray.parseArray(JSONObject.toJSONString(model.get("buniessInfo")), BaseEnterpriseCertDto.class);
+            jyjcOpeningApplicationModel.setBaseUnitLicences(baseEnterpriseCertDtos);
+        }
+        return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdate(jyjcOpeningApplicationModel, getCompanyCode()));
     }
 
 
@@ -80,14 +84,12 @@ public class JyjcOpeningApplicationController extends BaseController {
         } else {
             BeanUtil.copyProperties(jsonObject, model);
         }
-        model.setSequenceNbr(sequenceNbr);
-        if (sequenceNbr != null) {
-            JyjcOpeningApplicationModel jyjcOpeningApplicationModel = jyjcOpeningApplicationServiceImpl.queryDetail(sequenceNbr);
-            if (jyjcOpeningApplicationModel == null || ValidationUtil.isEmpty(jyjcOpeningApplicationModel.getBaseUnitLicences()) || ValidationUtil.isEmpty(jyjcOpeningApplicationModel.getUserInfos())) {
-                throw new BadRequest("企业资质信息和检验人员信息为空，无法提交！");
-            }
+        if(jsonObject.containsKey("buniessInfo")){
+            List<BaseEnterpriseCertDto> baseEnterpriseCertDtos = JSONArray.parseArray(JSONObject.toJSONString(jsonObject.get("buniessInfo")), BaseEnterpriseCertDto.class);
+            model.setBaseUnitLicences(baseEnterpriseCertDtos);
         }
-        JyjcOpeningApplicationModel data = jyjcOpeningApplicationServiceImpl.submitApplication(model);
+        model.setSequenceNbr(sequenceNbr);
+        JyjcOpeningApplicationModel data = jyjcOpeningApplicationServiceImpl.submitApplication(model, getCompanyCode());
         return ResponseHelper.buildResponse(Collections.singletonList(data));
     }
 
@@ -168,10 +170,9 @@ public class JyjcOpeningApplicationController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "POST", value = "接收或者驳回业务开通申请", notes = "接收或者驳回业务开通申请")
+    @ApiOperation(httpMethod = "POST", value = "流程节点执行", notes = "流程节点执行")
     @PostMapping(value = "/execueFlow")
-    public ResponseModel<HashMap<String, String>> execueFlow(@RequestBody Map<String, Object> params) {
-
+    public ResponseModel<HashMap<String, String>> executeFlow(@RequestBody Map<String, Object> params) {
         jyjcOpeningApplicationServiceImpl.executeFlow(params);
         HashMap<String, String> result = new HashMap<>();
         result.put("result", "success");
@@ -189,7 +190,7 @@ public class JyjcOpeningApplicationController extends BaseController {
     public ResponseModel<Object> overflow(@RequestParam("sequenceNbr") String sequenceNbr,
                                           @RequestParam("instanceId") String instanceId,
                                           @RequestParam("nextTaskId") String nextTaskId) {
-        return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.stopFlow(sequenceNbr, instanceId, nextTaskId));
+        return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.rollBackFlow(sequenceNbr, instanceId, nextTaskId));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -263,8 +264,7 @@ public class JyjcOpeningApplicationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/user-list")
     @ApiOperation(httpMethod = "GET", value = "查询指定公司、指定人员类型的人员列表,默认当前登录人所在公司", notes = "查询指定公司、指定人员类型的人员列表,默认当前登录人所在公司")
-    public ResponseModel<List<TzsUserInfoVo>> getBizUserInfosByUnitCode(@ApiParam(value = "公司编码") @RequestParam(required = false) String unitCode,
-                                                                        @ApiParam(value = "人员类型", allowableValues = "jy,jc") @RequestParam String personType) {
+    public ResponseModel<List<TzsUserInfoVo>> getBizUserInfosByUnitCode(@ApiParam(value = "公司编码") @RequestParam(required = false) String unitCode, @ApiParam(value = "人员类型", allowableValues = "jy,jc") @RequestParam String personType) {
         if (StringUtils.isEmpty(unitCode)) {
             ReginParams reginParams = getSelectedOrgInfo();
             unitCode = reginParams.getCompany().getCompanyCode();
@@ -273,6 +273,13 @@ public class JyjcOpeningApplicationController extends BaseController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/v2/users")
+    @ApiOperation(httpMethod = "GET", value = "查询当前登录人、指定人员类型的人员map结构", notes = "查询当前登录人、指定人员类型的人员map结构，key为jyjcUserInfos代表检验检测人员，chargeUserInfos为检验检测区域负责人")
+    public ResponseModel<Map<String, List<TzsUserInfoVo>>> getBizUserInfosByUnitCodeV2(@ApiParam(value = "人员类型", allowableValues = "jy,jc,charge" , defaultValue = "jy,jc,charge") @RequestParam String personType) {
+        return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.getUserListByUnitCodeAndPostV2(getCompanyCode(), personType));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/user-map")
     @ApiOperation(httpMethod = "GET", value = "查询指定公司、指定人员类型的人员列表,默认当前登录人所在公司，map", notes = "查询指定公司、指定人员类型的人员列表,默认当前登录人所在公司，map")
     public ResponseModel<Map<String, List<TzsUserInfoVo>>> getBizUserInfosByUnitCodeMap(@ApiParam(value = "公司编码") @RequestParam(required = false) String unitCode,
@@ -297,6 +304,7 @@ public class JyjcOpeningApplicationController extends BaseController {
 
     /**
      * 检验业务开通列表导出
+     *
      * @param response
      * @param ids
      */
@@ -304,8 +312,8 @@ public class JyjcOpeningApplicationController extends BaseController {
     @GetMapping(value = "/exportdata")
     @ApiOperation(httpMethod = "GET", value = "检验业务开通列表导出", notes = "检验业务开通列表导出")
     public void dataExport(HttpServletResponse response, String ids) {
-        Assert.hasText(ids,"未选择导出数据");
-        jyjcOpeningApplicationServiceImpl.exportData(response,Arrays.asList(ids.split(",")));
+        Assert.hasText(ids, "未选择导出数据");
+        jyjcOpeningApplicationServiceImpl.exportData(response, Arrays.asList(ids.split(",")));
     }
 
 }

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

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -10,8 +11,11 @@ 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.entity.JgRegistrationHistory;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
+import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionHistory;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.OpenBizTypeEnum;
+import com.yeejoin.amos.boot.module.jyjc.api.enums.PersonTypeEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.model.InstanceRuntimeData;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
@@ -31,6 +35,7 @@ import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Optional;
 
@@ -52,6 +57,11 @@ public class CommonServiceImpl {
     @Value("${jc.user-post:66152}")
     private String jcUserPost;
 
+    @Value("${jyjc.charge.user-post:6667}")
+    private String chargeUserPost;
+
+
+
     @Autowired
     RedisUtils redisUtils;
     @Autowired
@@ -69,6 +79,9 @@ public class CommonServiceImpl {
     @Autowired
     private DataDictionaryServiceImpl dictionaryService;
 
+    @Resource
+    private JyjcInspectionHistoryServiceImpl inspectionHistoryService;
+
 
     /**
      * @return ReginParams
@@ -98,14 +111,13 @@ public class CommonServiceImpl {
 
     public void castPersonType2Post(LambdaQueryWrapper<TzsUserInfo> userInfoQueryWrapper, String personType) {
 
-        if (personType.contains(OpenBizTypeEnum.JY.getCode()) && personType.contains(OpenBizTypeEnum.JC.getCode())) {
-            userInfoQueryWrapper.and(w-> w.like(TzsUserInfo::getPost, jyUserPost).or().like(TzsUserInfo::getPost, jcUserPost));
+        if (personType.contains(PersonTypeEnum.jc.name()) && personType.contains(PersonTypeEnum.jy.name()) && personType.contains(PersonTypeEnum.charge.name())) {
+            userInfoQueryWrapper.and(w-> w.like(TzsUserInfo::getPost, jyUserPost).or().like(TzsUserInfo::getPost, jcUserPost).or().like(TzsUserInfo::getPost, chargeUserPost));
             return;
         }
         if (personType.equals(OpenBizTypeEnum.JY.getCode())) {
-            //userInfoQueryWrapper.like(TzsUserInfo::getPost, jcUserPost);
             userInfoQueryWrapper.like(TzsUserInfo::getPost, jyUserPost);
-
+            return;
         }
         if (personType.equals(OpenBizTypeEnum.JC.getCode())) {
             userInfoQueryWrapper.like(TzsUserInfo::getPost, jcUserPost);
@@ -187,6 +199,40 @@ public class CommonServiceImpl {
         redissonClient.getBucket(buildJcInstanceDataKey(instanceId)).set(instanceData);
     }
 
+    /**
+     * 根据流程状态name 获取流程状态code
+     *
+     * @param name 流程状态name
+     * @return 流程状态code
+     */
+    public Integer getDictionaryCodeByName(String name) {
+        List<DataDictionary> jggzzz = dictionaryService.getByType("JGGZZZ");
+        for (DataDictionary item : jggzzz) {
+            if (item.getName().equals(name)) {
+                return Integer.parseInt(item.getCode());
+            }
+        }
+        return null;
+    }
+
+    public void saveOrUpdateHistory(String type, JSONObject json, Long currentDocumentId) {
+        JyjcInspectionHistory jyjcInspectionHistory = new JyjcInspectionHistory();
+        LambdaQueryWrapper<JyjcInspectionHistory> lambda = new QueryWrapper<JyjcInspectionHistory>().lambda();
+        lambda.eq(JyjcInspectionHistory::getSSeq, currentDocumentId);
+        Integer integer = inspectionHistoryService.getBaseMapper().selectCount(lambda);
+        jyjcInspectionHistory.setHistoryData(json);
+        if (integer > 0) {
+            inspectionHistoryService.update(jyjcInspectionHistory, lambda);
+        } else {
+            jyjcInspectionHistory.setSType(type);
+            jyjcInspectionHistory.setSSeq(currentDocumentId);
+            inspectionHistoryService.save(jyjcInspectionHistory);
+        }
+    }
+
+
+
+
 
     /**
      * 撤回时校验流程是否已经执行

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/TzBaseEnterpriseInfo.java

@@ -213,4 +213,10 @@ public class TzBaseEnterpriseInfo extends BaseEntity {
      */
     @TableField(value = "org_code")
     protected String orgCode;
+
+    /**
+     * 完整地址
+     */
+    @TableField(value = "full_address")
+    private String fullAddress;
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/BaseUnitLicence.java

@@ -184,4 +184,9 @@ public class BaseUnitLicence extends BaseEntity {
      */
     private String licenceType;
 
+    /**
+     * 所属证书
+     */
+    private String enterpriseCertSeq;
+
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/TzBaseEnterpriseInfo.java

@@ -78,6 +78,9 @@ public class TzBaseEnterpriseInfo extends BaseEntity {
     @ApiModelProperty(value = "单位详细地址")
     private String address;
 
+    @ApiModelProperty(value = "完整地址")
+    private String fullAddress;
+
     @ApiModelProperty(value = "使用单位法人")
     private String legalPerson;
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/TzBaseUnitLicence.java

@@ -107,4 +107,10 @@ public class TzBaseUnitLicence extends BaseEntity {
     @ApiModelProperty(value = "资质类型编码（检验检测、其他）")
     private String licenceType;
 
+
+    /**
+     * 所属证书
+     */
+    private String enterpriseCertSeq;
+
 }