移装告知列表合并

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

@@ -55,10 +55,22 @@
                     AND tjtn.transfer_type = '跨区移装'
                 </if>
             </if>
+<!--            <if test="type == 'supervision'">-->
+<!--                AND tjtn.receive_org_code = #{orgCode} AND tjtn.instance_id IS NOT NULL-->
+<!--            </if>-->
+<!--            <if test="type == 'enterprise'">-->
+<!--                AND tjtn.install_unit_credit_code = #{orgCode}-->
+<!--            </if>-->
+
+            <if test="roleIds != null and type == 'supervision'">
+                <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
+                    tjtn.instance_status like concat('%',#{role},'%')
+                </foreach>
+            </if>
             <if test="type == 'supervision'">
-                AND tjtn.receive_org_code = #{orgCode} AND tjtn.instance_id IS NOT NULL
+                AND tjtn.receive_org_code = #{orgCode}
             </if>
-            <if test="type == 'enterprise'">
+            <if test="type == 'company'">
                 AND tjtn.install_unit_credit_code = #{orgCode}
             </if>
         </where>

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

@@ -145,6 +145,11 @@ public class JgTransferNoticeController extends BaseController {
     ) {
         Page<JgTransferNotice> page = new Page<>(current, size);
         ReginParams reginParams = getSelectedOrgInfo();
+        if (reginParams.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)){
+            type = BaseController.COMPANY_TYPE_COMPANY;
+        }else {
+            type = BaseController.COMPANY_TYPE_SUPERVISION;
+        }
         return ResponseHelper.buildResponse(jgTransferNoticeService.queryForJgTransferNoticePage(page, model, type, reginParams));
     }