企业来访添加

ZQN

2024-06-20 717be6a41702dc249906346cacdcb9de1ff00fde

企业来访添加

 project-admin/src/main/java/com/project/admin/controller/enforce/EnforceCompanyLogController.java

New file
@@ -0,0 +1,99 @@
package com.project.admin.controller.enforce;

import com.project.common.annotation.Log;
import com.project.common.annotation.RepeatSubmit;
import com.project.common.core.controller.BaseController;
import com.project.common.core.domain.AjaxResult;
import com.project.common.core.page.TableDataInfo;
import com.project.common.enums.BusinessType;
import com.project.common.utils.poi.ExcelUtil;
import com.project.enforce.domain.bo.editBo.EnforceCompanyLogBo;
import com.project.enforce.domain.bo.queryBo.EnforceCompanyLogQueryBo;
import com.project.enforce.domain.vo.EnforceCompanyLogVo;
import com.project.enforce.service.IEnforceCompanyLogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.Arrays;
import java.util.List;

/**
 * 企业来访记录Controller
 *
 * @author manton
 */
@Api(value = "企业来访记录控制器", tags = {"企业来访记录管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/enforce/company/log")
public class EnforceCompanyLogController extends BaseController {

    private final IEnforceCompanyLogService iEnforceCompanyLogService;


    @ApiOperation("查询企业来访记录列表")
    @GetMapping("/list")
    public TableDataInfo list(EnforceCompanyLogQueryBo bo)
    {
        startPage();
        List<EnforceCompanyLogVo> list = iEnforceCompanyLogService.queryList(bo);
        return getDataTable(list);
    }



    @ApiOperation("导出企业来访记录列表")
    //@PreAuthorize("@ss.hasPermi('enforce:log:export')")
    @Log(title = "企业来访记录", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    @RepeatSubmit
    public AjaxResult export(EnforceCompanyLogQueryBo bo)
    {
        List<EnforceCompanyLogVo> list = iEnforceCompanyLogService.queryList(bo);
        ExcelUtil<EnforceCompanyLogVo> util = new ExcelUtil<EnforceCompanyLogVo>(EnforceCompanyLogVo.class);
        return util.exportExcel(list, "企业来访记录");
    }

    @ApiOperation("获取企业来访记录详细信息")
    @GetMapping("/{id}")
    public AjaxResult getInfo(@PathVariable("id" ) Long id)
    {
        return AjaxResult.success(iEnforceCompanyLogService.queryById(id));
    }


    @ApiOperation("新增企业来访记录")
    //@PreAuthorize("@ss.hasPermi('enforce:log:add')")
    @Log(title = "企业来访记录", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody EnforceCompanyLogBo bo)
    {
        return toAjax(iEnforceCompanyLogService.insertByBo(bo) ? 1 : 0);
    }


    @ApiOperation("修改企业来访记录")
    //@PreAuthorize("@ss.hasPermi('enforce:log:edit')")
    @Log(title = "企业来访记录", businessType = BusinessType.UPDATE)
    @PostMapping("/upd")
    @RepeatSubmit
    public AjaxResult upd(@RequestBody EnforceCompanyLogBo bo)
    {
        return toAjax(iEnforceCompanyLogService.updateByBo(bo) ? 1 : 0);
    }


    @ApiOperation("删除企业来访记录")
    //@PreAuthorize("@ss.hasPermi('enforce:log:remove')")
    @Log(title = "企业来访记录" , businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @RepeatSubmit
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(iEnforceCompanyLogService.deleteByIds(Arrays.asList(ids)) ? 1 : 0);
    }
}

 project-admin/src/main/java/com/project/admin/controller/enforce/EnforceComplaintLogController.java

New file
@@ -0,0 +1,100 @@
package com.project.admin.controller.enforce;

import com.project.common.annotation.Log;
import com.project.common.annotation.RepeatSubmit;
import com.project.common.core.controller.BaseController;
import com.project.common.core.domain.AjaxResult;
import com.project.common.core.page.TableDataInfo;
import com.project.common.enums.BusinessType;
import com.project.common.utils.poi.ExcelUtil;
import com.project.enforce.domain.bo.editBo.EnforceComplaintLogBo;
import com.project.enforce.domain.bo.queryBo.EnforceComplaintLogQueryBo;
import com.project.enforce.domain.vo.EnforceComplaintLogVo;
import com.project.enforce.service.IEnforceComplaintLogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.Arrays;
import java.util.List;

/**
 * 投诉记录Controller
 *
 * @author manton
 */
@Api(value = "投诉记录控制器", tags = {"投诉记录管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/enforce/complaint/log")
public class EnforceComplaintLogController extends BaseController {

    private final IEnforceComplaintLogService iEnforceComplaintLogService;


    @ApiOperation("查询投诉记录列表")
    @GetMapping("/list")
    public TableDataInfo list(EnforceComplaintLogQueryBo bo)
    {
        startPage();
        List<EnforceComplaintLogVo> list = iEnforceComplaintLogService.queryList(bo);
        return getDataTable(list);
    }



    @ApiOperation("导出投诉记录列表")
    //@PreAuthorize("@ss.hasPermi('enforce:log:export')")
    @Log(title = "投诉记录", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    @RepeatSubmit
    public AjaxResult export(EnforceComplaintLogQueryBo bo)
    {
        List<EnforceComplaintLogVo> list = iEnforceComplaintLogService.queryList(bo);
        ExcelUtil<EnforceComplaintLogVo> util = new ExcelUtil<EnforceComplaintLogVo>(EnforceComplaintLogVo.class);
        return util.exportExcel(list, "投诉记录");
    }


    @ApiOperation("获取投诉记录详细信息")
    @GetMapping("/{id}")
    public AjaxResult getInfo(@PathVariable("id" ) Long id)
    {
        return AjaxResult.success(iEnforceComplaintLogService.queryById(id));
    }


    @ApiOperation("新增投诉记录")
    //@PreAuthorize("@ss.hasPermi('enforce:log:add')")
    @Log(title = "投诉记录", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody EnforceComplaintLogBo bo)
    {
        return toAjax(iEnforceComplaintLogService.insertByBo(bo) ? 1 : 0);
    }


    @ApiOperation("修改投诉记录")
    //@PreAuthorize("@ss.hasPermi('enforce:log:edit')")
    @Log(title = "投诉记录", businessType = BusinessType.UPDATE)
    @PostMapping("/upd")
    @RepeatSubmit
    public AjaxResult upd(@RequestBody EnforceComplaintLogBo bo)
    {
        return toAjax(iEnforceComplaintLogService.updateByBo(bo) ? 1 : 0);
    }


    @ApiOperation("删除投诉记录")
    //@PreAuthorize("@ss.hasPermi('enforce:log:remove')")
    @Log(title = "投诉记录" , businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @RepeatSubmit
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(iEnforceComplaintLogService.deleteByIds(Arrays.asList(ids)) ? 1 : 0);
    }
}

 project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateController.java

@@ -40,7 +40,7 @@

    @ApiOperation("保存执法评价")
    //@PreAuthorize("@ss.hasPermi('enforce:log:add')")
    @Log(title = "执法评价", businessType = BusinessType.INSERT)
    @Log(title = "执法评价设置", businessType = BusinessType.INSERT)
    @PostMapping("/save")
    @RepeatSubmit
    public AjaxResult save(@RequestBody EnforceEvaluateBo bo)
@@ -48,4 +48,5 @@
        return toAjax(enforceEvaluateService.save(bo) ? 1 : 0);
    }


}

 project-enforce/src/main/java/com/project/enforce/domain/EnforceCompanyLog.java

New file
@@ -0,0 +1,98 @@
package com.project.enforce.domain;

import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.project.common.core.domain.BaseDomain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;

import java.util.Date;
/**
 * 企业来访记录对象 enforce_company_log
 *
 * @author manton
 */
@EqualsAndHashCode(callSuper = true)
@Data
@NoArgsConstructor
@Accessors(chain = true)
@TableName("enforce_company_log")
@ApiModel("企业来访记录实体对象")
public class EnforceCompanyLog extends BaseDomain {

    private static final long serialVersionUID=1L;


    @TableId(value = "id")
    @ApiModelProperty("ID")
    private Long id;


    @ApiModelProperty("企业ID")
    private Long companyId;


    @ApiModelProperty("企业名")
    private String companyName;


    @ApiModelProperty("企业联系人")
    private String companyUser;


    @ApiModelProperty("企业联系人电话（账号）")
    private String companyPhone;


    @ApiModelProperty("来访目的")
    private String comeReason;


    @ApiModelProperty("来访内容")
    private String comeContent;


    @ApiModelProperty("来访人数")
    private Integer userNum;


    @ApiModelProperty("来访人")
    private Long comeId;


    @ApiModelProperty("来访人")
    private String comeUser;


    @ApiModelProperty("来访人电话")
    private String comePhone;


    @ApiModelProperty("执行人单位")
    private Long comeDeptId;


    @ApiModelProperty("执行人单位")
    private String comeDeptName;


    @ApiModelProperty("来访时间")
    private Date comeTime;













}

 project-enforce/src/main/java/com/project/enforce/domain/EnforceComplaintLog.java

@@ -60,17 +60,22 @@
    @ApiModelProperty("企业联系人电话（账号）")
    private String companyPhone;

    @ApiModelProperty("执行人id")
    private Long executeId;

    @ApiModelProperty("执行人单位id")
    private Long executeDeptId;

    @ApiModelProperty("执行人")
    private Long executeUser;
    private String executeUser;


    @ApiModelProperty("执行人电话")
    private Long executePhone;
    private String executePhone;


    @ApiModelProperty("执行人单位")
    private Long executeDeptName;
    private String executeDeptName;


    @ApiModelProperty("投诉类型")

 project-enforce/src/main/java/com/project/enforce/domain/EnforceEvaluateLog.java

@@ -1,16 +1,15 @@
package com.project.enforce.domain;

import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.project.common.core.domain.BaseDomain;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;

import java.math.BigDecimal;
/**
 * 执法评价记录对象 enforce_evaluate_log
 *
@@ -54,17 +53,23 @@
    @ApiModelProperty("企业联系人电话（账号）")
    private String companyPhone;

    @ApiModelProperty("执行人id")
    private Long executeId;

    @ApiModelProperty("执行人单位id")
    private Long executeDeptId;


    @ApiModelProperty("执行人")
    private Long executeUser;
    private String executeUser;


    @ApiModelProperty("执行人电话")
    private Long executePhone;
    private String executePhone;


    @ApiModelProperty("执行人单位")
    private Long executeDeptName;
    private String executeDeptName;


    @ApiModelProperty("评价说明")

 project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceCompanyLogBo.java

New file
@@ -0,0 +1,90 @@
package com.project.enforce.domain.bo.editBo;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * 企业来访记录编辑对象 enforce_company_log
 *
 * @author manton
 */

@Data
@ApiModel("企业来访记录操作对象")
public class EnforceCompanyLogBo {


    /** ID */
    @ApiModelProperty("ID")
    private Long id;

    /** 企业ID */
    @ApiModelProperty("企业ID")
    private Long companyId;

    /** 企业名 */
    @ApiModelProperty("企业名")
    private String companyName;

    /** 企业联系人 */
    @ApiModelProperty("企业联系人")
    private String companyUser;

    /** 企业联系人电话（账号） */
    @ApiModelProperty("企业联系人电话（账号）")
    private String companyPhone;

    /** 来访目的 */
    @ApiModelProperty("来访目的")
    private String comeReason;

    /** 来访内容 */
    @ApiModelProperty("来访内容")
    private String comeContent;

    /** 来访人数 */
    @ApiModelProperty("来访人数")
    private Integer userNum;

    /** 来访人 */
    @ApiModelProperty("来访人")
    private Long comeId;

    /** 来访人 */
    @ApiModelProperty("来访人")
    private String comeUser;

    /** 来访人电话 */
    @ApiModelProperty("来访人电话")
    private String comePhone;

    /** 执行人单位 */
    @ApiModelProperty("执行人单位")
    private Long comeDeptId;

    /** 执行人单位 */
    @ApiModelProperty("执行人单位")
    private String comeDeptName;

    /** 来访时间 */
    @ApiModelProperty("来访时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date comeTime;

    /** 更新人 */
    @ApiModelProperty("更新人")
    private String updateBy;

    /** 更新时间 */
    @ApiModelProperty("更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date updateTime;

    /** 备注 */
    @ApiModelProperty("备注")
    private String remark;
}

 project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceComplaintLogBo.java

@@ -51,17 +51,23 @@
    @ApiModelProperty("企业联系人电话（账号）")
    private String companyPhone;

    @ApiModelProperty("执行人id")
    private Long executeId;

    @ApiModelProperty("执行人单位id")
    private Long executeDeptId;

    /** 执行人 */
    @ApiModelProperty("执行人")
    private Long executeUser;
    private String executeUser;

    /** 执行人电话 */
    @ApiModelProperty("执行人电话")
    private Long executePhone;
    private String executePhone;

    /** 执行人单位 */
    @ApiModelProperty("执行人单位")
    private Long executeDeptName;
    private String executeDeptName;

    /** 投诉类型 */
    @ApiModelProperty("投诉类型")

 project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateBo.java

@@ -1,6 +1,7 @@
package com.project.enforce.domain.bo.editBo;

import com.project.enforce.domain.EnforceEvaluateQuestion;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;
@@ -16,6 +17,13 @@
public class EnforceEvaluateBo
{

    @ApiModelProperty("执法单id")
    private Long orderId;

    @ApiModelProperty("评价备注")
    private String questionRemark;

    @ApiModelProperty("评价问券")
    private List<EnforceEvaluateQuestion> questionList;

}

 project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateLogBo.java

@@ -46,17 +46,23 @@
    @ApiModelProperty("企业联系人电话（账号）")
    private String companyPhone;

    @ApiModelProperty("执行人id")
    private Long executeId;

    @ApiModelProperty("执行人单位id")
    private Long executeDeptId;

    /** 执行人 */
    @ApiModelProperty("执行人")
    private Long executeUser;
    private String executeUser;

    /** 执行人电话 */
    @ApiModelProperty("执行人电话")
    private Long executePhone;
    private String executePhone;

    /** 执行人单位 */
    @ApiModelProperty("执行人单位")
    private Long executeDeptName;
    private String executeDeptName;




 project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceCompanyLogQueryBo.java

New file
@@ -0,0 +1,77 @@
package com.project.enforce.domain.bo.queryBo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.project.common.core.domain.BaseQuery;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.util.Date;

/**
 * 企业来访记录分页查询对象 enforce_company_log
 *
 * @author manton
 */
@EqualsAndHashCode(callSuper = true)
@Data
@ApiModel("企业来访记录分页查询对象")
public class EnforceCompanyLogQueryBo extends BaseQuery{

    /** 分页大小 */
    @ApiModelProperty("分页大小")
    private Integer pageSize;
    /** 当前页数 */
    @ApiModelProperty("当前页数")
    private Integer pageNum;
    /** 排序列 */
    @ApiModelProperty("排序列")
    private String orderByColumn;
    /** 排序的方向desc或者asc */
    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
    private String isAsc;


    /** 企业ID */
    @ApiModelProperty("企业ID")
    private Long companyId;
    /** 企业名 */
    @ApiModelProperty("企业名")
    private String companyName;
    /** 企业联系人 */
    @ApiModelProperty("企业联系人")
    private String companyUser;
    /** 企业联系人电话（账号） */
    @ApiModelProperty("企业联系人电话（账号）")
    private String companyPhone;
    /** 来访目的 */
    @ApiModelProperty("来访目的")
    private String comeReason;
    /** 来访内容 */
    @ApiModelProperty("来访内容")
    private String comeContent;
    /** 来访人数 */
    @ApiModelProperty("来访人数")
    private Integer userNum;
    /** 来访人 */
    @ApiModelProperty("来访人")
    private Long comeId;
    /** 来访人 */
    @ApiModelProperty("来访人")
    private String comeUser;
    /** 来访人电话 */
    @ApiModelProperty("来访人电话")
    private String comePhone;
    /** 执行人单位 */
    @ApiModelProperty("执行人单位")
    private Long comeDeptId;
    /** 执行人单位 */
    @ApiModelProperty("执行人单位")
    private String comeDeptName;
    /** 来访时间 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty("来访时间")
    private Date comeTime;

}

 project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceComplaintLogQueryBo.java

@@ -54,15 +54,22 @@
    /** 企业联系人电话（账号） */
    @ApiModelProperty("企业联系人电话（账号）")
    private String companyPhone;

    @ApiModelProperty("执行人id")
    private Long executeId;

    @ApiModelProperty("执行人单位id")
    private Long executeDeptId;

    /** 执行人 */
    @ApiModelProperty("执行人")
    private Long executeUser;
    private String executeUser;
    /** 执行人电话 */
    @ApiModelProperty("执行人电话")
    private Long executePhone;
    private String executePhone;
    /** 执行人单位 */
    @ApiModelProperty("执行人单位")
    private Long executeDeptName;
    private String executeDeptName;
    /** 投诉类型 */
    @ApiModelProperty("投诉类型")
    private String complaintType;

 project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceEvaluateLogQueryBo.java

@@ -50,15 +50,22 @@
    /** 企业联系人电话（账号） */
    @ApiModelProperty("企业联系人电话（账号）")
    private String companyPhone;

    @ApiModelProperty("执行人id")
    private Long executeId;

    @ApiModelProperty("执行人单位id")
    private Long executeDeptId;

    /** 执行人 */
    @ApiModelProperty("执行人")
    private Long executeUser;
    private String executeUser;
    /** 执行人电话 */
    @ApiModelProperty("执行人电话")
    private Long executePhone;
    private String executePhone;
    /** 执行人单位 */
    @ApiModelProperty("执行人单位")
    private Long executeDeptName;
    private String executeDeptName;
    /** 评价说明 */
    @ApiModelProperty("评价说明")
    private String questionRemark;

 project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceCompanyLogVo.java

New file
@@ -0,0 +1,70 @@
package com.project.enforce.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.project.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;


/**
 * 企业来访记录视图对象 mall_package
 *
 * @author manton
 */
@Data
@ApiModel("企业来访记录视图对象")
public class EnforceCompanyLogVo {
    private static final long serialVersionUID = 1L;

    /** ID */
    @ApiModelProperty("ID")
    private Long id;

    @Excel(name = "企业ID")
    @ApiModelProperty("企业ID")
    private Long companyId;
    @Excel(name = "企业名")
    @ApiModelProperty("企业名")
    private String companyName;
    @Excel(name = "企业联系人")
    @ApiModelProperty("企业联系人")
    private String companyUser;
    @Excel(name = "企业联系人电话" , readConverterExp = "账=号")
    @ApiModelProperty("企业联系人电话（账号）")
    private String companyPhone;
    @Excel(name = "来访目的")
    @ApiModelProperty("来访目的")
    private String comeReason;
    @Excel(name = "来访内容")
    @ApiModelProperty("来访内容")
    private String comeContent;
    @Excel(name = "来访人数")
    @ApiModelProperty("来访人数")
    private Integer userNum;
    @Excel(name = "来访人")
    @ApiModelProperty("来访人")
    private Long comeId;
    @Excel(name = "来访人")
    @ApiModelProperty("来访人")
    private String comeUser;
    @Excel(name = "来访人电话")
    @ApiModelProperty("来访人电话")
    private String comePhone;
    @Excel(name = "执行人单位")
    @ApiModelProperty("执行人单位")
    private Long comeDeptId;
    @Excel(name = "执行人单位")
    @ApiModelProperty("执行人单位")
    private String comeDeptName;
    @Excel(name = "来访时间" , width = 30, dateFormat = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty("来访时间")
    private Date comeTime;
    @Excel(name = "备注")
    @ApiModelProperty("备注")
    private String remark;

}

 project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceComplaintLogVo.java

@@ -44,15 +44,22 @@
    @Excel(name = "企业联系人电话" , readConverterExp = "账=号")
    @ApiModelProperty("企业联系人电话（账号）")
    private String companyPhone;

    @ApiModelProperty("执行人id")
    private Long executeId;

    @ApiModelProperty("执行人单位id")
    private Long executeDeptId;

    @Excel(name = "执行人")
    @ApiModelProperty("执行人")
    private Long executeUser;
    private String executeUser;
    @Excel(name = "执行人电话")
    @ApiModelProperty("执行人电话")
    private Long executePhone;
    private String executePhone;
    @Excel(name = "执行人单位")
    @ApiModelProperty("执行人单位")
    private Long executeDeptName;
    private String executeDeptName;
    @Excel(name = "投诉类型")
    @ApiModelProperty("投诉类型")
    private String complaintType;

 project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateLogVo.java

@@ -40,15 +40,22 @@
    @Excel(name = "企业联系人电话" , readConverterExp = "账=号")
    @ApiModelProperty("企业联系人电话（账号）")
    private String companyPhone;

    @ApiModelProperty("执行人id")
    private Long executeId;

    @ApiModelProperty("执行人单位id")
    private Long executeDeptId;

    @Excel(name = "执行人")
    @ApiModelProperty("执行人")
    private Long executeUser;
    private String executeUser;
    @Excel(name = "执行人电话")
    @ApiModelProperty("执行人电话")
    private Long executePhone;
    private String executePhone;
    @Excel(name = "执行人单位")
    @ApiModelProperty("执行人单位")
    private Long executeDeptName;
    private String executeDeptName;
    @Excel(name = "评价说明")
    @ApiModelProperty("评价说明")
    private String questionRemark;

 project-enforce/src/main/java/com/project/enforce/mapper/EnforceCompanyLogMapper.java

New file
@@ -0,0 +1,13 @@
package com.project.enforce.mapper;

import com.project.enforce.domain.EnforceCompanyLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * 企业来访记录Mapper接口
 *
 * @author manton
 */
public interface EnforceCompanyLogMapper extends BaseMapper<EnforceCompanyLog> {

}

 project-enforce/src/main/java/com/project/enforce/service/IEnforceCompanyLogService.java

New file
@@ -0,0 +1,51 @@
package com.project.enforce.service;

import com.project.common.mybatis.IBaseService;
import com.project.enforce.domain.EnforceCompanyLog;
import com.project.enforce.domain.bo.editBo.EnforceCompanyLogBo;
import com.project.enforce.domain.bo.queryBo.EnforceCompanyLogQueryBo;
import com.project.enforce.domain.vo.EnforceCompanyLogVo;

import java.util.Collection;
import java.util.List;

/**
 * 企业来访记录Service接口
 *
 * @author manton
 */
public interface IEnforceCompanyLogService extends IBaseService<EnforceCompanyLog> {

    /**
     * 查询列表
     */
    List<EnforceCompanyLogVo> queryList(EnforceCompanyLogQueryBo bo);

    /**
     * 查询单个
     * @return  EnforceCompanyLogVo
     */
    EnforceCompanyLogVo queryById(Long id);


    /**
     * 根据新增业务对象插入企业来访记录
     * @param bo 企业来访记录新增业务对象
     * @return  true成功 false失败
     */
    Boolean insertByBo(EnforceCompanyLogBo bo);

    /**
     * 根据编辑业务对象修改企业来访记录
     * @param bo 企业来访记录编辑业务对象
     * @return  true成功 false失败
     */
    Boolean updateByBo(EnforceCompanyLogBo bo);

    /**
     * 校验并删除数据
     * @param ids 主键集合
     * @return  true成功 false失败
     */
    Boolean deleteByIds(Collection<Long> ids);
}

 project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateService.java

@@ -27,4 +27,5 @@
    EnforceEvaluateVo getInfo();



}

 project-enforce/src/main/java/com/project/enforce/service/impl/EnforceCompanyLogServiceImpl.java

New file
@@ -0,0 +1,116 @@
package com.project.enforce.service.impl;

import cn.hutool.core.convert.Convert;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.project.common.utils.StringUtils;
import com.project.enforce.domain.EnforceCompanyLog;
import com.project.enforce.domain.bo.editBo.EnforceCompanyLogBo;
import com.project.enforce.domain.bo.queryBo.EnforceCompanyLogQueryBo;
import com.project.enforce.domain.vo.EnforceCompanyLogVo;
import com.project.enforce.mapper.EnforceCompanyLogMapper;
import com.project.enforce.service.IEnforceCompanyLogService;
import com.project.system.service.ISysDeptService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.Collection;
import java.util.List;

/**
 * 企业来访记录Service业务层处理
 *
 * @author manton
 */
@Service
@RequiredArgsConstructor(onConstructor_ = @Autowired)
public class EnforceCompanyLogServiceImpl extends ServiceImpl<EnforceCompanyLogMapper, EnforceCompanyLog> implements IEnforceCompanyLogService {

    private final ISysDeptService deptService;

    @Override//列表查询
    public List<EnforceCompanyLogVo> queryList(EnforceCompanyLogQueryBo bo)
    {
        QueryWrapper<EnforceCompanyLog> qw = getQw(bo);
        List<EnforceCompanyLog> list = this.list(qw);
        return Convert.toList(EnforceCompanyLogVo.class , list);
    }

    @Override//id查询
    public EnforceCompanyLogVo queryById(Long id)
    {
        EnforceCompanyLog db = this.baseMapper.selectById(id);
        return Convert.convert(EnforceCompanyLogVo.class , db);
    }


    @Override//添加
    @Transactional
    public Boolean insertByBo(EnforceCompanyLogBo bo)
    {
        EnforceCompanyLog add = Convert.convert(EnforceCompanyLog.class, bo);
        validEntityBeforeSave(add);
        return this.save(add);
    }

    @Override//修改
    @Transactional
    public Boolean updateByBo(EnforceCompanyLogBo bo)
    {
        EnforceCompanyLog update = Convert.convert(EnforceCompanyLog.class, bo);
        validEntityBeforeSave(update);
        return this.updateById(update);
    }

    @Override//删除
    @Transactional
    public Boolean deleteByIds(Collection<Long> ids)
    {

        //做一些业务上的校验,判断是否需要校验

        return this.removeByIds(ids);
    }


//-------------------------------------------------------------------------------------

    //保存前校验
    private void validEntityBeforeSave(EnforceCompanyLog entity)
    {
        if (StringUtils.isEmpty(entity.getComeDeptName())){
            entity.setComeDeptName(deptService.getDeptAllName(entity.getComeDeptId()));
        }
    }

    //获取查询参数
    private QueryWrapper<EnforceCompanyLog> getQw(EnforceCompanyLogQueryBo bo)
    {
        QueryWrapper<EnforceCompanyLog> qw = Wrappers.query();

            qw.eq(bo.getCompanyId() != null, "company_id", bo.getCompanyId());
            qw.like(StringUtils.isNotEmpty(bo.getCompanyName()), "company_name", bo.getCompanyName());
            qw.eq(StringUtils.isNotEmpty(bo.getCompanyUser()), "company_user", bo.getCompanyUser());
            qw.eq(StringUtils.isNotEmpty(bo.getCompanyPhone()), "company_phone", bo.getCompanyPhone());
            qw.eq(StringUtils.isNotEmpty(bo.getComeReason()), "come_reason", bo.getComeReason());
            qw.eq(StringUtils.isNotEmpty(bo.getComeContent()), "come_content", bo.getComeContent());
            qw.eq(bo.getUserNum() != null, "user_num", bo.getUserNum());
            qw.eq(bo.getComeId() != null, "come_id", bo.getComeId());
            qw.eq(StringUtils.isNotEmpty(bo.getComeUser()), "come_user", bo.getComeUser());
            qw.eq(StringUtils.isNotEmpty(bo.getComePhone()), "come_phone", bo.getComePhone());
            qw.eq(bo.getComeDeptId() != null, "come_dept_id", bo.getComeDeptId());
            qw.like(StringUtils.isNotEmpty(bo.getComeDeptName()), "come_dept_name", bo.getComeDeptName());
            qw.eq(bo.getComeTime() != null, "come_time", bo.getComeTime());
        if (StringUtils.isNotEmpty(bo.getIsAsc()) && StringUtils.isNotEmpty(bo.getOrderByColumn())){
            if ("acs".equals(bo.getIsAsc())) {
                qw.orderByAsc(bo.getOrderByColumn());
            } else if ("desc".equals(bo.getIsAsc())) {
                qw.orderByDesc(bo.getOrderByColumn());
            }
        }
        return qw;
    }
}

 project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java

@@ -11,6 +11,7 @@
import com.project.enforce.domain.vo.EnforceComplaintLogVo;
import com.project.enforce.mapper.EnforceComplaintLogMapper;
import com.project.enforce.service.IEnforceComplaintLogService;
import com.project.system.service.ISysDeptService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -28,6 +29,7 @@
@RequiredArgsConstructor(onConstructor_ = @Autowired)
public class EnforceComplaintLogServiceImpl extends ServiceImpl<EnforceComplaintLogMapper, EnforceComplaintLog> implements IEnforceComplaintLogService {

    private final ISysDeptService deptService;


    @Override//列表查询
@@ -80,7 +82,9 @@
    //保存前校验
    private void validEntityBeforeSave(EnforceComplaintLog entity)
    {
        //做一些数据校验,如唯一约束
        if (StringUtils.isEmpty(entity.getExecuteDeptName())){
            entity.setExecuteDeptName(deptService.getDeptAllName(entity.getExecuteDeptId()));
        }
    }

    //获取查询参数

 project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateServiceImpl.java

@@ -6,9 +6,7 @@
import com.project.enforce.domain.EnforceEvaluateQuestion;
import com.project.enforce.domain.bo.editBo.EnforceEvaluateBo;
import com.project.enforce.domain.vo.EnforceEvaluateVo;
import com.project.enforce.service.IEnforceEvaluateAnswerService;
import com.project.enforce.service.IEnforceEvaluateQuestionService;
import com.project.enforce.service.IEnforceEvaluateService;
import com.project.enforce.service.*;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -30,6 +28,8 @@

    private final IEnforceEvaluateQuestionService questionService;
    private final IEnforceEvaluateAnswerService answerService;
    private final IEnforceOrderService orderService;
    private final IEnforceEvaluateLogService evaluateLogService;


    @Override//保存
@@ -86,4 +86,6 @@
        vo.setQuestionList(questionList);
        return vo;
    }


}

 project-enforce/src/main/resources/mapper/enforce/EnforceCompanyLogMapper.xml

New file
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.project.enforce.mapper.EnforceCompanyLogMapper">
    
    <resultMap type="EnforceCompanyLog" id="EnforceCompanyLogResult">
        <result property="id"    column="id"    />
        <result property="companyId"    column="company_id"    />
        <result property="companyName"    column="company_name"    />
        <result property="companyUser"    column="company_user"    />
        <result property="companyPhone"    column="company_phone"    />
        <result property="comeReason"    column="come_reason"    />
        <result property="comeContent"    column="come_content"    />
        <result property="userNum"    column="user_num"    />
        <result property="comeId"    column="come_id"    />
        <result property="comeUser"    column="come_user"    />
        <result property="comePhone"    column="come_phone"    />
        <result property="comeDeptId"    column="come_dept_id"    />
        <result property="comeDeptName"    column="come_dept_name"    />
        <result property="comeTime"    column="come_time"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
        <result property="remark"    column="remark"    />
        <result property="delFlag"    column="del_flag"    />
    </resultMap>



</mapper>