Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/MaintenanceCompany.java

@@ -79,6 +79,19 @@ public class MaintenanceCompany extends BaseEntity {
 	@TableField("longitude")
     private String longitude;
 
+
+    /**
+     * amos平台id
+     */
+    @TableField("amos_org_id")
+    private String amosId;
+
+    /**
+     * amos账户名称
+     */
+    @TableField("amos_org_name")
+    private String amosName;
+
     /**
      * 动态表单实例id
      */

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java

@@ -83,7 +83,7 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
      */
     List< OrgUsrExcelDto> exportPersonToExcelByParentId(Long parentId);
 
-    List<OrgUsr> amosIdExist(String amosId);
+    int  amosIdExist(String amosId);
 
 
     void updatelistByParentId(String codex, String code);

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -627,12 +627,15 @@ GROUP BY
 
     </select>
 
-    <select id="amosIdExist" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
-        SELECT *
-        FROM cb_org_usr
-        WHERE is_delete = 0
-        and
-            amos_org_id = #{amosId}
+    <select id="amosIdExist" resultType="int">
+        select sum(num) from (
+
+        SELECT count(*) AS num FROM  cb_firefighters  WHERE amos_user_id  = #{amosId} and is_delete = 0
+
+        union all SELECT count(*) AS num FROM  cb_org_usr  WHERE amos_org_id  = #{amosId} and is_delete = 0
+
+        union all SELECT count(*) AS num FROM  cb_maintenance_company  WHERE amos_org_id  = #{amosId} and is_delete = 0
+                             ) AS total;
     </select>
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -1700,8 +1700,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	public Object amosIdExist(String amosId) {
-		List<OrgUsr> orgUsrs = orgUsrMapper.amosIdExist(amosId);
-		if (orgUsrs.size() > 0) {
+		int num = orgUsrMapper.amosIdExist(amosId);
+		if (num  > 0) {
 			return false;
 		}
 		return true;

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -2310,5 +2310,17 @@
         </sql>
     </changeSet>
 
+
+    <changeSet author="chenzhao" id="2021-12-04-cz-1">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="cb_maintenance_company"/>
+        </preConditions>
+        <comment>新增两个字段用来保存amos账户信息 </comment>
+        <sql>
+            ALTER TABLE `cb_maintenance_company` add amos_org_id varchar(100) COMMENT 'amos平台id';
+            ALTER TABLE `cb_maintenance_company` add amos_org_name varchar(30) COMMENT 'amos账户名称';
+        </sql>
+    </changeSet>
+
 </databaseChangeLog>