移装告知 和 安装告知 列表api修改

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

@@ -71,10 +71,17 @@
             </if>
             <if test="type == 'supervision'">
                 AND tjtn.receive_org_code = #{orgCode}
+                AND tjtn.instance_id  is not null
             </if>
             <if test="type == 'company'">
                 AND tjtn.install_unit_credit_code = #{orgCode}
             </if>
+            <if test="type == 'testAdmin'">
+                ((AND tjtn.receive_org_code = #{orgCode}
+                AND tjtn.instance_id  is not null)
+                or
+                AND tjtn.install_unit_credit_code = #{orgCode})
+            </if>
         </where>
         ORDER BY
         tjtn.apply_no DESC

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

@@ -141,7 +141,7 @@ public class JgInstallationNoticeController extends BaseController {
     ) {
         Page<JgInstallationNotice> page = new Page<>(current, size);
         ReginParams reginParams = getSelectedOrgInfo();
-        type = (String) iJgInstallationNoticeService.getCompanyType().get("companyType");
+        type = (String) iJgInstallationNoticeService.getCompanyType().get("companyLevel");
         return ResponseHelper.buildResponse(iJgInstallationNoticeService.queryForJgInstallationNoticePage(page, model, type, reginParams));
     }
 

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

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgTransferNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgTransferNoticeService;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
@@ -49,6 +50,9 @@ public class JgTransferNoticeController extends BaseController {
     @Autowired
     private CommonServiceImpl commonServiceImpl;
 
+    @Autowired
+    private IJgInstallationNoticeService iJgInstallationNoticeService;
+
     /**
      * 新增移装造告知
      *
@@ -152,11 +156,7 @@ 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;
-        }
+        type = (String) iJgInstallationNoticeService.getCompanyType().get("companyLevel");
         return ResponseHelper.buildResponse(jgTransferNoticeService.queryForJgTransferNoticePage(page, model, type, reginParams));
     }