ugp后台添加监检部门、部门人员接收消息逻辑修改，openapi新增查询许可信息接口

amos-boot-data/amos-boot-data-openapi/pom.xml

@@ -29,7 +29,7 @@
 		<dependency>
 			<groupId>cn.com.vastdata</groupId>
 			<artifactId>vastbase</artifactId>
-			<version>1.0.0.1</version>
+			<version>1.0.0.2</version>
 		</dependency>
 		<!-- LOG4J -->
 		<dependency>

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/SuperviseController.java

@@ -22,7 +22,7 @@ import java.util.List;
  * @author Zhang Yingbin
  */
 @RestController
-@RequestMapping(value = "/openapijg/supervise")
+@RequestMapping(value = "/supervise")
 @Api(tags = "Supervise-监管业务数据接入")
 public class SuperviseController {
 
@@ -68,6 +68,8 @@ public class SuperviseController {
     @Autowired
     private InspectionInfoService inspectionInfoService;
 
+    @Autowired
+    private UnitLicenceService unitLicenceService;
 
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(value = "新增设计信息")
@@ -195,4 +197,11 @@ public class SuperviseController {
         return ResponseHelper.buildResponse(inspectionInfoService.saveInspectionInfo(inspectionInfo));
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(value = "查询许可信息")
+    @GetMapping(value = "/licenceInfo")
+    @RestEventTrigger(value = "openapiLogEventHandler")
+    public ResponseModel<List<UnitLicenceModel>> getLicenceInfo (@RequestParam String unitCode) {
+        return ResponseHelper.buildResponse(unitLicenceService.getLicenceInfo(unitCode));
+    }
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/UnitLicenceModel.java

+package com.yeejoin.amos.api.openapi.face.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 单位许可信息表
+ *
+ * @author duanwei
+ * @date 2022-11-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="TzUgpUnitLicence对象", description="单位许可信息表")
+public class UnitLicenceModel extends AbstractBaseModel {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "单位编码")
+    private String unitCode;
+
+    @ApiModelProperty(value = "单位名称")
+    private String unitName;
+
+    @ApiModelProperty(value = "许可地址")
+    private String licAddress;
+
+    @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 Date changeDate;
+
+    @ApiModelProperty(value = "许可方式/许可状态")
+    private String applyType;
+
+    @ApiModelProperty(value = "许可方式/许可状态code")
+    private String applyTypeCode;
+
+    @ApiModelProperty(value = "许可评审方式")
+    private String appraisalType;
+
+    @ApiModelProperty(value = "许可评审方式code")
+    private String appraisalTypeCode;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "许可项目/检验类型/设备品种编码")
+    private String itemCode;
+
+    @ApiModelProperty(value = "许可项目/检验类型/设备品种")
+    private String itemCodeName;
+
+    @ApiModelProperty(value = "许可子项目/检验项目/充装介质类别code")
+    private String subItemCode;
+
+    @ApiModelProperty(value = "许可子项目/检验项目/充装介质类别")
+    private String subItemName;
+
+    @ApiModelProperty(value = "许可参数/充装介质名称")
+    private String parameter;
+
+    @ApiModelProperty(value = "参数code")
+    private String parameterCode;
+
+    @ApiModelProperty(value = "固定检验地址")
+    private String itemAddress;
+
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/UnitLicenceService.java

+package com.yeejoin.amos.api.openapi.face.service;
+
+import com.yeejoin.amos.api.openapi.face.model.UnitLicenceModel;
+import com.yeejoin.amos.api.openapi.feign.TzsServiceFeignClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * @author ZhangYingBin
+ */
+@Service
+public class UnitLicenceService {
+    @Autowired
+    TzsServiceFeignClient tzsServiceFeignClient;
+    public List<UnitLicenceModel> getLicenceInfo (String unitCode){
+        while (unitCode.contains(" ")) {
+            unitCode = unitCode.replace(" ","");
+        }
+        return tzsServiceFeignClient.getLicenceByUnitCode(unitCode).getResult();
+    }
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/feign/TzsServiceFeignClient.java

@@ -2,11 +2,13 @@ package com.yeejoin.amos.api.openapi.feign;
 
 
 import com.yeejoin.amos.api.openapi.config.MultipartSupportConfig;
+import com.yeejoin.amos.api.openapi.face.model.UnitLicenceModel;
 import net.sf.json.JSONObject;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.List;
@@ -17,9 +19,9 @@ public interface TzsServiceFeignClient {
 
     /**
      * 根据企业名称查询许可信息
-     * @param companyNames 企业名称(多个)
+     * @param unitCode 企业唯一编码
      * @return
      */
-    @RequestMapping(value = "/baseUnitLicence/licences", method = RequestMethod.POST)
-    ResponseModel<List<JSONObject>> getLicenceByCompanyName(@RequestBody List<String> companyNames);
+    @RequestMapping(value = "/baseUnitLicence/licences", method = RequestMethod.GET)
+    ResponseModel<List<UnitLicenceModel>> getLicenceByUnitCode(@RequestParam String unitCode);
 }

amos-boot-data/amos-boot-data-openapi/src/main/resources/application-vb.properties

+spring.application.name=AMOS-API-OPENAPI
+server.servlet.context-path=/openapi
+server.port=11001
+# jdbc_config
+spring.datasource.driver-class-name=cn.com.vastbase.Driver
+spring.datasource.url=jdbc:vastbase://36.46.137.116:5432/per_tzs_amos_tzs_biz?currentSchema=amos_openapi_cyl
+spring.datasource.username=admin
+spring.datasource.password=Yeejoin@2023
+
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.minimum-idle=5
+spring.datasource.hikari.maximum-pool-size=15
+spring.datasource.hikari.auto-commit=true
+spring.datasource.hikari.idle-timeout=30000
+spring.datasource.hikari.pool-name=DatebookHikariCP
+spring.datasource.hikari.max-lifetime=1800000
+spring.datasource.hikari.connection-timeout=30000
+spring.datasource.hikari.connection-test-query=SELECT 1
+
+# REDIS (RedisProperties)
+spring.redis.database=1
+spring.redis.host=172.16.10.210
+spring.redis.port=6379
+spring.redis.password=yeejoin@2020
+spring.redis.lettuce.pool.max-active=200
+spring.redis.lettuce.pool.max-wait=-1
+spring.redis.lettuce.pool.max-idle=10
+spring.redis.lettuce.pool.min-idle=0
+spring.redis.expire.time=300
+
+#注册中心地址
+eureka.client.service-url.defaultZone =http://admin:a1234560@172.16.10.210:10001/eureka/
+eureka.instance.prefer-ip-address=true
+management.endpoint.health.show-details=always
+management.endpoints.web.exposure.include=*
+eureka.instance.health-check-url=http://172.16.10.210:${server.port}${server.servlet.context-path}/actuator/health
+eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
+eureka.instance.status-page-url=http://172.16.10.210:${server.port}${server.servlet.context-path}/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://172.16.10.210:${server.port}${server.servlet.context-path}/swagger-ui.html
+eureka.instance.ip-address = 172.16.3.34
+
+##emqx
+emqx.clean-session=true
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
+emqx.broker=tcp://172.16.10.210:1883
+emqx.client-user-name=super
+emqx.client-password=123456
+
+##biz custem properties
+biz.lxyd.lift.url=http://39.106.181.149:8088/elevatorapi
\ No newline at end of file

amos-boot-data/amos-boot-data-openapi/src/main/resources/application.properties

-spring.profiles.active=dev
+spring.profiles.active=vb
 server.compression.enabled=true
 spring.jackson.dateFormat=yyyy-MM-dd HH:mm:ss
 

amos-boot-data/amos-boot-data-openapi/src/main/resources/logback-vb.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+    <!-- 控制台输出 -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <!--    show parameters for hibernate sql 专为 Hibernate 定制
+    <logger name="org.hibernate.type.descriptor.sql.BasicBinder"  level="TRACE" />
+    <logger name="org.hibernate.type.descriptor.sql.BasicExtractor"  level="DEBUG" />
+    <logger name="org.hibernate.SQL" level="DEBUG" />
+    <logger name="org.hibernate.engine.QueryParameters" level="DEBUG" />
+    <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
+    -->
+    <!--myibatis log configure-->
+    <logger name="com.apache.ibatis" level="ERROR"/>
+    <logger name="java.sql.Connection" level="ERROR"/>
+    <logger name="java.sql.Statement" level="ERROR"/>
+    <logger name="java.sql.PreparedStatement" level="ERROR"/>
+    <logger name="com.baomidou" level="ERROR"/>
+    <logger name="org.springframework" level="INFO"/>
+    <logger name="org.apache.activemq" level="INFO"/>
+
+
+
+    <!-- 日志输出级别 -->
+    <root level="ERROR">
+        <appender-ref ref="STDOUT" />
+    </root>
+    <!--日志异步到数据库 -->
+    <!--<appender name="DB" class="ch.qos.logback.classic.db.DBAppender">-->
+    <!--&lt;!&ndash;日志异步到数据库 &ndash;&gt;-->
+    <!--<connectionSource class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
+    <!--&lt;!&ndash;连接池 &ndash;&gt;-->
+    <!--<dataSource class="com.mchange.v2.c3p0.ComboPooledDataSource">-->
+    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<url>jdbc:mysql://127.0.0.1:3306/databaseName</url>-->
+    <!--<user>root</user>-->
+    <!--<password>root</password>-->
+    <!--</dataSource>-->
+    <!--</connectionSource>-->
+    <!--</appender>-->
+</configuration>
\ No newline at end of file

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

@@ -37,4 +37,16 @@ public class TzBaseUnitLicenceController {
     public ResponseModel<List<TzBaseUnitLicence>> getLicenceByCompanyName(@RequestBody List<String> companyNames) {
         return  ResponseHelper.buildResponse(baseUnitLicenceService.getLicenceByCompanyName(companyNames));
     }
+
+    /**
+     * 根据企业统一信用代码查询许可信息
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @RequestMapping(value = "/licences", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "POST", value = "根据企业名称查询许可信息", notes = "根据企业名称查询许可信息")
+    public ResponseModel<List<TzBaseUnitLicence>> getLicenceByUnitCode(@RequestParam String unitCode) {
+        return  ResponseHelper.buildResponse(baseUnitLicenceService.getLicenceByUnitCode(unitCode));
+    }
 }

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

@@ -53,4 +53,16 @@ public class TzBaseUnitLicenceServiceImpl extends BaseService<TzBaseUnitLicenceD
         return list;
     }
 
+    public List<TzBaseUnitLicence> getLicenceByUnitCode(String unitCode) {
+        LambdaQueryWrapper<TzBaseEnterpriseInfo> wrap = new LambdaQueryWrapper<>();
+        wrap.eq(TzBaseEnterpriseInfo::getUseCode,unitCode);
+        TzBaseEnterpriseInfo tzBaseEnterpriseInfo = baseEnterpriseInfoService.getOne(wrap);
+        if(ValidationUtil.isEmpty(tzBaseEnterpriseInfo)){
+            return new ArrayList<>();
+        }
+        String companyName = tzBaseEnterpriseInfo.getUseUnit();
+        List<String> companyNames = new ArrayList<>();
+        companyNames.add(companyName);
+        return getLicenceByCompanyName(companyNames);
+    }
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/ProjectDto.java

@@ -188,7 +188,7 @@ public class ProjectDto  extends BaseDto {
     @TableField("latitude")
     private String latitude;
 
-    private String userId;
+    private List<String> userId;
     private String  context;
 
     List<Weld> weldList;

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/OrgServiceImpl.java

@@ -6,15 +6,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 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.utils.TreeParser;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgusrDataxDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
@@ -23,33 +19,23 @@ import com.yeejoin.amos.boot.module.common.biz.service.impl.DynamicFormInstanceS
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
-import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectResourceEnum;
 import com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant;
-import com.yeejoin.amos.boot.module.ugp.api.dto.CompanyDto;
-import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
-import com.yeejoin.amos.boot.module.ugp.api.entity.ProjectResource;
 import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
 import com.yeejoin.amos.component.robot.BadRequest;
-import com.yeejoin.amos.feign.privilege.Privilege;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
-import org.python.antlr.ast.If;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
-import org.typroject.tyboot.component.cache.Redis;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 
 
 import java.util.*;
 
 import static com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant.ORG_CODE_USER;
-import static org.typroject.tyboot.component.cache.Redis.redisTemplate;
 
 @Service
 public class OrgServiceImpl {
@@ -72,6 +58,9 @@ public class OrgServiceImpl {
     @Autowired
     CompanyServiceImpl companyServiceImpl;
 
+    @Value("${ugp.charge.role.seq}")
+    Long chargeRoleSeq;
+
     /**
      * 保存或更新orgUsr信息和FormInstance实体信息
      * sequenceNbr表示 若是更新动态表单，则传orgUsr表的sequenceNbr，
@@ -402,7 +391,8 @@ public class OrgServiceImpl {
         LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()));
         LambdaQueryWrapper<OrgUsr> wrapper1 = new LambdaQueryWrapper<>();
-        wrapper1.eq(OrgUsr :: getParentId,String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr())).eq(OrgUsr ::getBizOrgType, OrgEnum.部门.getKey());
+        wrapper1.likeRight(OrgUsr :: getBizOrgCode,String.valueOf(orgUsrServiceImpl.getOne(wrapper).getBizOrgCode()))
+                .eq(OrgUsr ::getBizOrgType, OrgEnum.部门.getKey());
         wrapper1.orderByDesc(OrgUsr::getRecDate);
         IPage<OrgUsr> list = orgUsrServiceImpl.page(page,wrapper1);
         List<Map> mapList = new ArrayList<>();
@@ -643,6 +633,7 @@ public class OrgServiceImpl {
      *
      */
     public void saveOrUpdateUser(JSONObject jsonObject, String orgType) {
+        boolean isCharge = false;
         String amosOrgId = jsonObject.getString("sequenceNbr");
         LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(OrgUsr::getAmosOrgId, amosOrgId)
@@ -667,6 +658,9 @@ public class OrgServiceImpl {
             }
         } else {
             companyId = jsonObject.getString("myParentId");
+            if(companyId.length()<10){
+                companyId = jsonObject.getString("companySeq");
+            }
         }
         if (!StringUtils.isEmpty(companyId)) {
             LambdaQueryWrapper<OrgUsr> wrapper2 = new LambdaQueryWrapper<>();
@@ -682,17 +676,25 @@ public class OrgServiceImpl {
             one.setBizOrgName(jsonObject.getString("companyName"));
             one.setOrgExpandAttr1(CompanyTypeEnum.registerNameMap.get(jsonObject.getString("companyType")));
         }
+        if(ValidationUtil.isEmpty(one.getBizOrgName())){
+            one.setBizOrgName(jsonObject.getString("departmentName"));
+        }
         if (StringUtils.isEmpty(one.getBizOrgCode())) {
             if (OrgEnum.公司.getKey().equals(orgType)) {
                 one.setBizOrgCode(!ObjectUtils.isEmpty(parentOne) ? parentOne.getBizOrgCode() + getOrgCodeStr() : getOrgCodeStr());
             } else if (OrgEnum.部门.getKey().equals(orgType)) {
                 one.setBizOrgCode(parentOne.getBizOrgCode() + getOrgCodeStr());
-            } else if (OrgEnum.普通人员.getKey().equals(orgType)) {
-                LambdaQueryWrapper<OrgUsr> wrapper3 = new LambdaQueryWrapper<>();
-                wrapper3.eq(OrgUsr::getAmosOrgId, companyId)
-                        .eq(OrgUsr::getIsDelete, Boolean.FALSE);
-                OrgUsr one1 = orgUsrServiceImpl.getOne(wrapper3);
-                one.setBizOrgCode(one1.getBizOrgCode() + getOrgCodeStr());
+            }
+        }
+        if (OrgEnum.普通人员.getKey().equals(orgType)) {
+            LambdaQueryWrapper<OrgUsr> wrapper3 = new LambdaQueryWrapper<>();
+            wrapper3.eq(OrgUsr::getAmosOrgId, companyId)
+                    .eq(OrgUsr::getIsDelete, Boolean.FALSE);
+            OrgUsr one1 = orgUsrServiceImpl.getOne(wrapper3);
+            one.setBizOrgCode(one1.getBizOrgCode() + getOrgCodeStr());
+            if (OrgEnum.部门.getKey().equals(one1.getBizOrgType())){
+                //向部门添加人员
+                isCharge = true;
             }
         }
         one.setAmosOrgId(amosOrgId);
@@ -702,6 +704,35 @@ public class OrgServiceImpl {
             one.setParentId(ObjectUtils.isEmpty(parentOne) ? null : String.valueOf(parentOne.getSequenceNbr()));
         }
         orgUsrServiceImpl.saveOrUpdate(one);
+        if (isCharge){
+            //向部门添加负责人
+            JSONArray roleSeqs = jsonObject.getJSONObject("orgRoleSeqs").getJSONArray(companyId);
+            LambdaQueryWrapper<OrgUsr> wrapper1 = new LambdaQueryWrapper<>();
+            wrapper1.eq(OrgUsr::getAmosOrgId,companyId);
+            OrgUsr orgUsr = orgUsrServiceImpl.getOne(wrapper1);
+            if(!ValidationUtil.isEmpty(orgUsr)) {
+                String deptId = String.valueOf(orgUsr.getSequenceNbr());
+                if (roleSeqs.contains(chargeRoleSeq)) {
+                    LambdaQueryWrapper<DynamicFormInstance> queryWrapper = new LambdaQueryWrapper<>();
+                    queryWrapper.eq(DynamicFormInstance::getFieldCode,"charge").eq(DynamicFormInstance::getInstanceId,deptId);
+                    DynamicFormInstance instance = alertFormValueServiceImpl.getOne(queryWrapper);
+                    String obj = instance.getFieldValue();
+                    List list = new ArrayList();
+                    if (!ValidationUtil.isEmpty(obj)) {
+                        list = JSON.parseArray(JSON.toJSONString(obj), ArrayList.class);
+                    }
+                    Long personId = one.getSequenceNbr();
+                    if (!list.contains(personId)) {
+                        list.add(personId);
+                    }
+                    instance.setFieldValue(JSON.toJSONString(list));
+                    alertFormValueServiceImpl.update(instance,queryWrapper);
+                }
+            }
+
+        }
+
+
         JSONObject jsonObjectFormColumn = new JSONObject();
         if (OrgEnum.公司.getKey().equals(orgType)) {
             jsonObjectFormColumn.put("name", jsonObject.getString("companyName"));

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectServiceImpl.java

@@ -541,15 +541,21 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
                    if (!ValidationUtil.isEmpty(insDepId)) {
                        Map map = orgService.getdetialInfo(insDepId);
                        String fieldValue = (String)map.get("charge");
-                       OrgUsr orgUsr = orgService.getOrgUsrById(fieldValue);
-                       FeignClientResult<List<AgencyUserModel>> listFeignClientResult = Privilege.agencyUserClient.queryByRealName(orgUsr.getBizOrgName());
-                       List<AgencyUserModel> resultList = listFeignClientResult.getResult();
-                       for (AgencyUserModel agencyUserModel : resultList) {
-                           if(orgUsr.getBizOrgName().equals(agencyUserModel.getRealName())) {
-                               String userId = agencyUserModel.getUserId();
-                               projectDto.setUserId(userId);
-                               break;
+                       if(!ValidationUtil.isEmpty(fieldValue)) {
+                           List<String> usrIds = JSON.parseArray(fieldValue,String.class);
+                           List<String> userIds = new ArrayList<>();
+                           for (String usrId: usrIds) {
+                               OrgUsr orgUsr = orgService.getOrgUsrById(usrId);
+                               FeignClientResult<List<AgencyUserModel>> listFeignClientResult = Privilege.agencyUserClient.queryByRealName(orgUsr.getBizOrgName());
+                               List<AgencyUserModel> resultList = listFeignClientResult.getResult();
+                               for (AgencyUserModel agencyUserModel : resultList) {
+                                   if (orgUsr.getBizOrgName().equals(agencyUserModel.getRealName())) {
+                                       String userId = agencyUserModel.getUserId();
+                                       userIds.add(userId);
+                                   }
+                               }
                            }
+                           projectDto.setUserId(userIds);
                        }
                    }
                }
@@ -564,7 +570,9 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
                        List<AgencyUserModel> resultList = listFeignClientResult.getResult();
                        for (AgencyUserModel agencyUserModel : resultList) {
                            String userId=agencyUserModel.getUserId();
-                           projectDto.setUserId(userId);
+                           List<String> userIds = new ArrayList<>();
+                           userIds.add(userId);
+                           projectDto.setUserId(userIds);
                        }
                    }
                }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/resources/application.properties

@@ -48,6 +48,7 @@ supervisionRoleId=1582983768581369857
 installationRoleId=1585099284334800898
 monitoringRoleId=1585099377079250946
 constructionRoleId=1585099241989107713
+ugp.charge.role.seq=1643178550355853314
 
 #??????????????
 mqtt.topic.weldUpdate = /ugp/weldUpdate