Merge remote-tracking branch 'origin/master'

jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java

@@ -16,6 +16,7 @@ import com.jero.common.system.query.QueryGenerator;
 import com.jero.data.entity.DTO.PayCaseCommitteeDTO;
 import com.jero.data.entity.DTO.PayCaseCommitteeUpdateDTO;
 import com.jero.data.entity.PayCaseCommittee;
+import com.jero.data.mapper.PayCaseCommitteeSubitemMapper;
 import com.jero.data.service.IPayCaseCommitteeService;
 import com.jero.data.entity.PayCaseCommitteeSubitem;
 import com.jero.data.service.IPayCaseCommitteeSubitemService;
@@ -43,6 +44,9 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
 	private IPayCaseCommitteeService payCaseCommitteeService;
 	 @Autowired
 	 private IPayCaseCommitteeSubitemService payCaseCommitteeSubitemService;
+
+	 @Autowired
+	 private PayCaseCommitteeSubitemMapper payCaseCommitteeSubitemMapper;
 	
 	/**
 	 * 分页列表查询
@@ -127,14 +131,11 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		LambdaQueryWrapper<PayCaseCommitteeSubitem> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.eq(PayCaseCommitteeSubitem::getCommitteeId,id);
-		boolean b = payCaseCommitteeService.removeById(id);
-		if (b){
-			List<PayCaseCommitteeSubitem> list = payCaseCommitteeSubitemService.list(queryWrapper);
-			List<String> collect = list.stream().map(payCaseCommitteeSubitem -> payCaseCommitteeSubitem.getId()).collect(Collectors.toList());
-			payCaseCommitteeSubitemService.removeByIds(collect);
-		}else {
-			return Result.error("删除失败，参数错误");
+		List<PayCaseCommitteeSubitem> payCaseCommitteeSubitems = payCaseCommitteeSubitemMapper.selectList(queryWrapper);
+		if(payCaseCommitteeSubitems.size()>0){
+			return Result.error("群组下还有数据，不可删除!");
 		}
+		boolean b = payCaseCommitteeService.removeById(id);
 		return Result.OK("删除成功!");
 	}
 

jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java

@@ -21,12 +21,12 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
  /**
- * @Description: pay_file_download_record
+ * @Description: 资料下载记录
  * @Author: jeecg-boot
  * @Date:   2021-08-30
  * @Version: V1.0
  */
-@Api(tags="pay_file_download_record")
+@Api(tags="资料下载记录")
 @RestController
 @RequestMapping("/payFileDownloadRecord/payFileDownloadRecord")
 @Slf4j
@@ -43,8 +43,8 @@ public class PayFileDownloadRecordController extends JeroController<PayFileDownl
 	 * @param req
 	 * @return
 	 */
-	@AutoLog(value = "pay_file_download_record-分页列表查询")
-	@ApiOperation(value="pay_file_download_record-分页列表查询", notes="pay_file_download_record-分页列表查询")
+	@AutoLog(value = "资料下载记录-分页列表查询")
+	@ApiOperation(value="资料下载记录-分页列表查询", notes="资料下载记录-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<?> queryPageList(PayFileDownloadRecord payFileDownloadRecord,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -62,8 +62,8 @@ public class PayFileDownloadRecordController extends JeroController<PayFileDownl
 	 * @param payFileDownloadRecord
 	 * @return
 	 */
-	@AutoLog(value = "pay_file_download_record-添加")
-	@ApiOperation(value="pay_file_download_record-添加", notes="pay_file_download_record-添加")
+	@AutoLog(value = "资料下载记录-添加")
+	@ApiOperation(value="资料下载记录-添加", notes="资料下载记录-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody PayFileDownloadRecord payFileDownloadRecord) {
 		payFileDownloadRecordService.save(payFileDownloadRecord);
@@ -76,8 +76,8 @@ public class PayFileDownloadRecordController extends JeroController<PayFileDownl
 	 * @param payFileDownloadRecord
 	 * @return
 	 */
-	@AutoLog(value = "pay_file_download_record-编辑")
-	@ApiOperation(value="pay_file_download_record-编辑", notes="pay_file_download_record-编辑")
+	@AutoLog(value = "资料下载记录-编辑")
+	@ApiOperation(value="资料下载记录-编辑", notes="资料下载记录-编辑")
 	@PutMapping(value = "/edit")
 	public Result<?> edit(@RequestBody PayFileDownloadRecord payFileDownloadRecord) {
 		payFileDownloadRecordService.updateById(payFileDownloadRecord);
@@ -90,8 +90,8 @@ public class PayFileDownloadRecordController extends JeroController<PayFileDownl
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "pay_file_download_record-通过id删除")
-	@ApiOperation(value="pay_file_download_record-通过id删除", notes="pay_file_download_record-通过id删除")
+	@AutoLog(value = "资料下载记录-通过id删除")
+	@ApiOperation(value="资料下载记录-通过id删除", notes="资料下载记录-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		payFileDownloadRecordService.removeById(id);
@@ -104,8 +104,8 @@ public class PayFileDownloadRecordController extends JeroController<PayFileDownl
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "pay_file_download_record-批量删除")
-	@ApiOperation(value="pay_file_download_record-批量删除", notes="pay_file_download_record-批量删除")
+	@AutoLog(value = "资料下载记录-批量删除")
+	@ApiOperation(value="资料下载记录-批量删除", notes="资料下载记录-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.payFileDownloadRecordService.removeByIds(Arrays.asList(ids.split(",")));
@@ -118,8 +118,8 @@ public class PayFileDownloadRecordController extends JeroController<PayFileDownl
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "pay_file_download_record-通过id查询")
-	@ApiOperation(value="pay_file_download_record-通过id查询", notes="pay_file_download_record-通过id查询")
+	@AutoLog(value = "资料下载记录-通过id查询")
+	@ApiOperation(value="资料下载记录-通过id查询", notes="资料下载记录-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
 		PayFileDownloadRecord payFileDownloadRecord = payFileDownloadRecordService.getById(id);
@@ -137,7 +137,7 @@ public class PayFileDownloadRecordController extends JeroController<PayFileDownl
     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, PayFileDownloadRecord payFileDownloadRecord) {
-        return super.exportXls(request, payFileDownloadRecord, PayFileDownloadRecord.class, "pay_file_download_record");
+        return super.exportXls(request, payFileDownloadRecord, PayFileDownloadRecord.class, "资料下载记录");
     }
 
     /**

jero-boot-incoming-payment/src/main/java/com/jero/data/entity/FindByName.java

@@ -9,7 +9,7 @@ import java.util.List;
 @Data
 public class FindByName implements Serializable {
 
-    @ApiModelProperty(value = "主键")
+    @ApiModelProperty(value = "分标委主键")
     private java.lang.String id;
 
     @ApiModelProperty(value = "分标委名称")