安装改造Bug修复

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

@@ -49,6 +49,7 @@
             </if>
             <if test="type == 'supervision'">
                 AND isn.receive_org_credit_code = #{orgCode}
+                AND isn.instance_id  is not null
             </if>
             <if test="type == 'enterprise'">
                 AND isn.install_unit_credit_code = #{orgCode}

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

@@ -80,7 +80,7 @@ public class JgInstallationNoticeController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/delete")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除安装告知", notes = "根据sequenceNbr删除安装告知")
-    public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbr") Long[] sequenceNbr) {
+    public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
         return ResponseHelper.buildResponse(iJgInstallationNoticeService.removeById(sequenceNbr));
     }
 

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

@@ -501,6 +501,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
             dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
             dto.setEquList((String.valueOf(obj.get("EQU_CATEGORY"))));
+            dto.setEntrustingUnitName(dto.getUseUnitName());
             StringBuffer buffer = new StringBuffer();
             buffer.append(dto.getProvinceName()).append(dto.getCityName()).append(dto.getCountyName()).append(dto.getAddress());
             dto.setEquAddress(buffer.toString());