BUG 3131 3130 3129

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrgUsrSafeReportController.java

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.StringUtil;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -80,16 +81,18 @@ public class OrgUsrSafeReportController extends BaseController {
 	}
 
 	/**
-     * 根据sequenceNbr删除
+     * 根据ids删除
      *
-     * @param sequenceNbr 主键
+     * @param ids 主键
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
+    @DeleteMapping(value = "/{ids}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除机场单位消防安全报告", notes = "根据sequenceNbr删除机场单位消防安全报告")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(orgUsrSafeReportServiceImpl.removeById(sequenceNbr));
+    public ResponseModel deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "ids") String ids){
+		List<Long> seqs = StringUtil.String2LongList(ids);
+		orgUsrSafeReportServiceImpl.deleteBatchSeq(seqs);
+		return ResponseHelper.buildResponse(seqs);
     }
 
     /**
@@ -124,7 +127,7 @@ public class OrgUsrSafeReportController extends BaseController {
 	    page.setSize(size);
 	    return ResponseHelper.buildResponse(orgUsrSafeReportServiceImpl.queryForOrgUsrSafeReportPage(page,
 				orgUsrSafeReportDto.getName(),
-				orgUsrSafeReportDto.getType(),
+				orgUsrSafeReportDto.getTypeCode(),
 				orgUsrSafeReportDto.getTakeEffectYear(),
 				orgUsrSafeReportDto.getCompanyId()));
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/OrgUsrSafeReportServiceImpl.java

@@ -26,10 +26,10 @@ public class OrgUsrSafeReportServiceImpl extends BaseService<OrgUsrSafeReportDto
      */
     public Page<OrgUsrSafeReportDto> queryForOrgUsrSafeReportPage(Page<OrgUsrSafeReportDto> page,
                                                                   @Condition(Operator.like) String name,
-                                                                  String type,
+                                                                  String typeCode,
                                                                   Date  takeEffectYear,
                                                                   Long companyId)   {
-        return this.queryForPage(page, "rec_date", false, name,type,takeEffectYear,companyId);
+        return this.queryForPage(page, "rec_date", false, name,typeCode,takeEffectYear,companyId);
     }
 
     /**