888

whywhyo

2023-05-08 a2cc89fdd214c1a350d1f5b06447c155c47a5c25

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

@@ -9,8 +9,10 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.service.IZfPropertyService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
@@ -24,6 +26,7 @@
 * @Author Jin_quan Ou
 * @Date 2023-03-09 10:18
 */
@Slf4j
@RestController
@RequestMapping("/family/property")
public class ZfPropertyController extends BaseController
@@ -35,20 +38,8 @@
    public AjaxResult  listAll(ZfProperty zfProperty){
        Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
        Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
        return zfPropertyService.selectUserList(zfProperty,pageNum,pageSize);
        return zfPropertyService.selectPropertyList(zfProperty, pageNum, pageSize);
    }

//    /**
//     * 查询家庭资产记录列表
//     */
////    @PreAuthorize("@ss.hasPermi('system:property:list')")
//    @GetMapping("/list")
//    public TableDataInfo list(ZfProperty zfProperty)
//    {
//        startPage();
//        List<ZfProperty> list = zfPropertyService.selectZfPropertyList(zfProperty);
//        return getDataTable(list);
//    }

    /**
     * 导出家庭资产记录列表
@@ -59,10 +50,22 @@
    public void export(HttpServletResponse response,ZfProperty zfProperty)
    {
        List<ZfProperty> list = zfPropertyService.selectByCondition(zfProperty);
        ExcelUtil<ZfProperty> util = new ExcelUtil<ZfProperty>(ZfProperty.class);
        log.info("导出记录为:{}",list);
        ExcelUtil<ZfProperty> util = new ExcelUtil<>(ZfProperty.class);
        util.exportExcel(response, list, "家庭资产记录数据");
    }
//

    /**
     * 导入家庭资产记录列表
     */
    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
    @PostMapping("/importData")
    public AjaxResult importData(@RequestParam("excelImport")MultipartFile file) throws Exception
    {
        return zfPropertyService.importExcel(file);
    }

    /**
     * 获取家庭资产记录详细信息
     */
@@ -81,7 +84,7 @@
    @PostMapping
    public AjaxResult add(@RequestBody ZfProperty zfProperty)
    {
        return toAjax(zfPropertyService.save(zfProperty));
        return zfPropertyService.addData2(zfProperty);
    }

    /**