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

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

@@ -780,6 +780,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     // 使用信息表更新是否西咸
                     IdxBizJgUseInfo useInfo = useInfoService.getOneData(jgRelationEquip.getEquId());
                     if (!ObjectUtils.isEmpty(useInfo)) {
+                        useInfo.setUseUnitCreditCode(jgInstallationNotice.getUseUnitCreditCode());
+                        useInfo.setUseUnitName(jgInstallationNotice.getUseUnitName());
                         useInfo.setIsNotXiXian(jgInstallationNotice.getIsXixian() == null ? "0" : jgInstallationNotice.getIsXixian());
                         useInfoService.saveOrUpdateData(useInfo);
                     }

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

@@ -328,7 +328,6 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             jyjcOpeningApplicationModel = new JyjcOpeningApplicationModel();
             unitCode = reginParams.getCompany().getCompanyCode();
         }
-        // unitCode = "91611103MAC4Q1EG7B"; // 测试用，之后务必删除！！！
         QueryWrapper enterpriseInfoQueryWrapper = new QueryWrapper<>();
         enterpriseInfoQueryWrapper.eq("use_code", unitCode);
         TzBaseEnterpriseInfo baseUnitLicenceEntity = enterpriseInfoMapper.selectOne(enterpriseInfoQueryWrapper);
@@ -363,7 +362,10 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         // 获取检验人员信息
         QueryWrapper userInfoQueryWrapper = new QueryWrapper<>();
         userInfoQueryWrapper.eq("unit_code", unitCode);
-        userInfoQueryWrapper.eq("is_delete", false);
+        if (StringUtils.isBlank(jyjcOpeningApplicationModel.getWorkflowProstanceId())) {
+            // 如果未开启流程则只查询未被删除的用户
+            userInfoQueryWrapper.eq("is_delete", false);
+        }
         List<TzsUserInfo> userInfos = userInfoMapper.selectList(userInfoQueryWrapper);
         if (!ValidationUtil.isEmpty(userInfos)) {
             // List<String> codes = userInfos.stream()

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

-spring.application.name=TZS-JYJC-YY
+spring.application.name=TZS-JYJC
 server.servlet.context-path=/jyjc
 server.port=12000
 spring.profiles.active=dev