Merge branch 'develop_tzs_register' of…

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

@@ -848,7 +848,7 @@
                             AND "WHETHER_VEHICLE_CYLINDER" = '1' )
           AND "FACTORY_NUM" = #{factoryNum}
         <if test="sequenceNbr != null and sequenceNbr !=''">
-          AND "SEQUENCE_NBR" <![CDATA[ <> ]]> #{sequenceNbr}
+          AND "RECORD" <![CDATA[ <> ]]> #{sequenceNbr}
         </if>
     </select>
 </mapper>

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

@@ -246,7 +246,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
     private void checkFactoryNumUniqueness(LinkedHashMap equipmentInfoForm) {
         // 车用气瓶业务里面的 出厂编号/产品编码 校验唯一性（产品编号在车用气瓶范围内全局唯一）
-        Integer factoryNum = commonMapper.checkFactoryNumUniquenessForVehicleCylinder((String) equipmentInfoForm.get(FACTORY_NUM), (String) equipmentInfoForm.get(SEQUENCE_NBR));
+        Integer factoryNum = commonMapper.checkFactoryNumUniquenessForVehicleCylinder((String) equipmentInfoForm.get(FACTORY_NUM), (String) equipmentInfoForm.get(RECORD));
         if (factoryNum > 0) {
             throw new BadRequest("出厂编号/产品编码 已存在，请重新输入！");
         }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/vo/TzsUserInfoVo.java

@@ -139,4 +139,9 @@ public class TzsUserInfoVo {
      */
     @ApiModelProperty(value = "其他附件")
     private List<?> otherAccessories;
+
+    /**
+    * 单位类型
+    * */
+    private String companyType;
 }

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

@@ -13,10 +13,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.tcm.api.dto.*;
 import com.yeejoin.amos.boot.module.tcm.api.entity.*;
-import com.yeejoin.amos.boot.module.tcm.api.enums.EquipmentClassifityEnum;
-import com.yeejoin.amos.boot.module.tcm.api.enums.PersonManageRoleEnum;
-import com.yeejoin.amos.boot.module.tcm.api.enums.TwoStipulateGroupEnum;
-import com.yeejoin.amos.boot.module.tcm.api.enums.UnitTypeEnum;
+import com.yeejoin.amos.boot.module.tcm.api.enums.*;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsBaseIndividualityMapper;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserEquipMapper;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserInfoMapper;
@@ -212,6 +209,8 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         tzsUserInfoVo.setProfile(ObjectUtils.isEmpty(tzsUserInfo.getProfile()) ? null : JSON.parseArray(tzsUserInfo.getProfile()));
         tzsUserInfoVo.setAppointDoc(ObjectUtils.isEmpty(tzsUserInfo.getAppointDoc()) ? null : JSON.parseArray(tzsUserInfo.getAppointDoc()));
         tzsUserInfoVo.setOtherAccessories(ObjectUtils.isEmpty(tzsUserInfo.getOtherAccessories()) ? null : JSON.parseArray(tzsUserInfo.getOtherAccessories()));
+        String companyType = getUnitType();
+        tzsUserInfoVo.setCompanyType(companyType.contains("个人主体") ? "individual" : "no-individual");
         maps.put("userInfo", tzsUserInfoVo);
 //        LambdaQueryWrapper<TzsUserQualifications> lambda = new QueryWrapper<TzsUserQualifications>().lambda();
 //        lambda.eq(TzsUserQualifications::getUserInfoId, id);
@@ -378,6 +377,14 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         return tzsUserInfoMapper.getArrangementStatistic(companyCode);
     }
 
+    public String getUnitType() {
+        List<CompanyModel> companyModels = FeignUtil.remoteCall(() -> Privilege.companyClient.queryListByChild(RequestContext.getExeUserId()));
+        if (companyModels.isEmpty()) {
+            return "";
+        }
+        return companyModels.get(0).getCompanyType();
+    }
+
     @Override
     public Map<String, Object> getCompanyType() {
         Map<String, Object> result = new HashMap<>();