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

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

@@ -126,4 +126,10 @@ public class FeedbackSuggestions extends BaseEntity {
     @TableField(value = "files" ,exist = false)
     private String companySeq;
 
+    /**
+     * 单位类型
+     */
+    @TableField(value = "companyType" ,exist = false)
+    private String companyType;
+
 }

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

@@ -13,4 +13,6 @@ public interface FeedbackSuggestionsMapper extends BaseMapper<FeedbackSuggestion
     String getCompanyNameByOrgCode(String orgCode);
 
     String getCompanySeqByCompanyCode(String companyCode);
+
+    String getCompanyTypeByCompanyCode(String companyCode);
 }

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

@@ -12,4 +12,10 @@
         FROM "amos_tzs_biz"."tz_base_enterprise_info"
         WHERE "use_code" = #{companyCode}
     </select>
+
+    <select id="getCompanyTypeByCompanyCode" resultType="java.lang.String">
+        SELECT unit_type as unitType
+        FROM "amos_tzs_biz"."tz_base_enterprise_info"
+        WHERE "use_code" = #{companyCode}
+    </select>
 </mapper>

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

@@ -130,6 +130,7 @@ public class FeedbackSuggestionsServiceImpl extends BaseService<FeedbackSuggesti
             suggestions.setProblemType(ProblemTypeEnum.getById(Integer.parseInt(suggestions.getProblemType())).getDescription());
             suggestions.setStatus("1".equals(suggestions.getStatus()) ? "已回复" : "待回复");
             suggestions.setFilesArr(JSONObject.parseArray(suggestions.getFiles()));
+            suggestions.setCompanyType(feedbackSuggestionsMapper.getCompanyTypeByCompanyCode(suggestions.getCompanyCode()));
             suggestions.setCompanySeq(feedbackSuggestionsMapper.getCompanySeqByCompanyCode(suggestions.getCompanyCode()));
         });
         return result;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/service/ITzsUserInfoService.java

@@ -90,4 +90,6 @@ public interface ITzsUserInfoService extends IService<TzsUserInfo> {
     List<DataDictionary> postByUnitType(CompanyBo company);
 
     List<DataDictionary> subPostByUnitType(CompanyBo company, String parentCode);
+
+    TzIndividualityDto individualityByCompanyCode(String companyCode);
 }

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

@@ -299,6 +299,13 @@ public class TzsUserInfoController extends BaseController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/individualityByCompanyCode")
+    @ApiOperation(httpMethod = "GET", value = "根据companyCode获取人主体信息", notes = "根据companyCode获取人主体信息")
+    public ResponseModel<TzIndividualityDto> individualityByCompanyCode(@RequestParam(value = "companyCode") String companyCode) {
+        return ResponseHelper.buildResponse(tzsUserInfoServiceImpl.individualityByCompanyCode(companyCode));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/individuality")
     @ApiOperation(httpMethod = "POST", value = "修改个人主体信息", notes = "修改个人主体信息")
     public ResponseModel<TzIndividualityDto> updateIndividualityInfo(@RequestBody TzIndividualityDto individualityDto) {

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

@@ -1792,4 +1792,17 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         });
         return result;
     }
+
+    @Override
+    public TzIndividualityDto individualityByCompanyCode(String companyCode) {
+        TzIndividualityDto individuality = new TzIndividualityDto();
+        TzBaseEnterpriseInfoDto baseEnterpriseInfoDto = baseEnterpriseInfoService.getInfoByUseCode(companyCode);
+        if (!ValidationUtil.isEmpty(baseEnterpriseInfoDto)) {
+            individuality = individualityMapper.getIndividualityInfo(baseEnterpriseInfoDto.getSequenceNbr());
+            individuality.setPhone(baseEnterpriseInfoDto.getContactPhone());
+            individuality.setGoverningBody(baseEnterpriseInfoDto.getGoverningBody());
+            individuality.setAddress(baseEnterpriseInfoDto.getAddress());
+        }
+        return individuality;
+    }
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/json/unitTypeLimitUserType.json

@@ -60,7 +60,7 @@
   "使用单位": {
     "6552": ["6713"],
     "6546": [],
-    "6550": [],
+    "6547": [],
     "6548": [],
     "6616": [],
     "6617": [],