Merge remote-tracking branch 'origin/master'

feige

2024-11-05 b4895bdc5d9268e55c0023b92cc7c2d68ba33e46

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java

@@ -8,9 +8,13 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.MemoBook;
import com.ruoyi.domain.ZProperty;
import com.ruoyi.domain.ZfEconomy;
import com.ruoyi.service.MemoBookService;
import com.ruoyi.service.ZPropertyDownloadService;
import com.ruoyi.service.ZPropertyService;
import com.ruoyi.service.ZPropertyShareService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -39,6 +43,15 @@
    @Autowired
    private ZPropertyService zPropertyService;

    @Autowired
    private ZPropertyDownloadService zPropertyDownloadService;

    @Autowired
    private ZPropertyShareService zPropertyShareService;

    @Autowired
    private MemoBookService memoBookService;

    /**
     * 查询所有记录
     */
@@ -47,6 +60,11 @@
        Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
        Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
        return zPropertyService.selectDataList(zProperty,pageNum,pageSize);
    }

    @GetMapping("/type")
    public AjaxResult listType(){
        return zPropertyService.listType();
    }

    /**
@@ -60,7 +78,7 @@
    /**
     * 模板
     */
    @GetMapping("/model")
    @PostMapping("/model")
    public void getModel(HttpServletResponse response){
        ZProperty zProperty = new ZProperty();
        List<ZProperty> emptyList = Collections.singletonList(zProperty);
@@ -73,8 +91,18 @@
     */
//    @PreAuthorize("@ss.hasPermi('system:property:export')")
    @Log(title = "个人财产记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export/{ids}")
    public void export(HttpServletResponse response,@PathVariable Long[] ids)
    @PostMapping("/export")
    public void export(HttpServletResponse response)
    {
        List<ZProperty> list = zPropertyService.selectByCondition();
        log.info("导出记录为:{}",list);
        ExcelUtil<ZProperty> util = new ExcelUtil<>(ZProperty.class);
        util.exportExcel(response, list, "个人财产记录数据");
    }

    @Log(title = "个人财产记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export1/{ids}")
    public void export1(HttpServletResponse response,@PathVariable Long[] ids)
    {
        List<ZProperty> list = zPropertyService.selectByIds(ids);
        log.info("导出记录为:{}",list);
@@ -122,6 +150,15 @@
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        for (Long id: ids) {
            List<MemoBook> memoBookService1 =  memoBookService.selectByIdAFid(id,2026L);
            if (!memoBookService.removeByIds(memoBookService1))
                return AjaxResult.error();
        }

        if (! (zPropertyDownloadService.deleteData(ids) && zPropertyShareService.deleteByContentId(ids)  ) ){
            return AjaxResult.error();
        }
        return toAjax(zPropertyService.removeByIds(Arrays.asList(ids)));
    }