From 717be6a41702dc249906346cacdcb9de1ff00fde Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期四, 20 六月 2024 17:34:49 +0800
Subject: [PATCH] 企业来访添加
---
project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceEvaluateLogQueryBo.java | 13
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateServiceImpl.java | 8
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java | 6
project-enforce/src/main/resources/mapper/enforce/EnforceCompanyLogMapper.xml | 32 ++
project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceComplaintLogQueryBo.java | 13
project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateLogBo.java | 12
project-enforce/src/main/java/com/project/enforce/domain/EnforceCompanyLog.java | 98 ++++++
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceCompanyLogServiceImpl.java | 116 +++++++
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateController.java | 3
project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateService.java | 1
project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateBo.java | 8
project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceCompanyLogVo.java | 70 ++++
project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceComplaintLogVo.java | 13
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceComplaintLogController.java | 100 ++++++
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceCompanyLogController.java | 99 ++++++
project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceCompanyLogBo.java | 90 ++++++
project-enforce/src/main/java/com/project/enforce/mapper/EnforceCompanyLogMapper.java | 13
project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceCompanyLogQueryBo.java | 77 +++++
project-enforce/src/main/java/com/project/enforce/domain/EnforceComplaintLog.java | 11
project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateLogVo.java | 13
project-enforce/src/main/java/com/project/enforce/service/IEnforceCompanyLogService.java | 51 +++
project-enforce/src/main/java/com/project/enforce/domain/EnforceEvaluateLog.java | 27 +
project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceComplaintLogBo.java | 12
23 files changed, 849 insertions(+), 37 deletions(-)
diff --git a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceCompanyLogController.java b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceCompanyLogController.java
new file mode 100644
index 0000000..ffd014e
--- /dev/null
+++ b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceCompanyLogController.java
@@ -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);
+ }
+}
diff --git a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceComplaintLogController.java b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceComplaintLogController.java
new file mode 100644
index 0000000..b658a0e
--- /dev/null
+++ b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceComplaintLogController.java
@@ -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);
+ }
+}
diff --git a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateController.java b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateController.java
index b13bbd2..aafa6e7 100644
--- a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateController.java
+++ b/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);
}
+
}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/EnforceCompanyLog.java b/project-enforce/src/main/java/com/project/enforce/domain/EnforceCompanyLog.java
new file mode 100644
index 0000000..4921174
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/EnforceCompanyLog.java
@@ -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;
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/EnforceComplaintLog.java b/project-enforce/src/main/java/com/project/enforce/domain/EnforceComplaintLog.java
index 68b1881..b01f7e4 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/EnforceComplaintLog.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/EnforceComplaintLog.java
@@ -60,17 +60,22 @@
@ApiModelProperty("浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛�")
private String companyPhone;
+ @ApiModelProperty("鎵ц浜篿d")
+ private Long executeId;
+
+ @ApiModelProperty("鎵ц浜哄崟浣峣d")
+ 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("鎶曡瘔绫诲瀷")
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/EnforceEvaluateLog.java b/project-enforce/src/main/java/com/project/enforce/domain/EnforceEvaluateLog.java
index 1487646..4b701d2 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/EnforceEvaluateLog.java
+++ b/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("鎵ц浜篿d")
+ private Long executeId;
+
+ @ApiModelProperty("鎵ц浜哄崟浣峣d")
+ 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("璇勪环璇存槑")
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceCompanyLogBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceCompanyLogBo.java
new file mode 100644
index 0000000..4e25f7a
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceCompanyLogBo.java
@@ -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;
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceComplaintLogBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceComplaintLogBo.java
index dcaf252..1639001 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceComplaintLogBo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceComplaintLogBo.java
@@ -51,17 +51,23 @@
@ApiModelProperty("浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛�")
private String companyPhone;
+ @ApiModelProperty("鎵ц浜篿d")
+ private Long executeId;
+
+ @ApiModelProperty("鎵ц浜哄崟浣峣d")
+ 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("鎶曡瘔绫诲瀷")
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateBo.java
index 4bf83eb..d4a8dd9 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateBo.java
+++ b/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("鎵ф硶鍗昳d")
+ private Long orderId;
+
+ @ApiModelProperty("璇勪环澶囨敞")
+ private String questionRemark;
+
+ @ApiModelProperty("璇勪环闂埜")
private List<EnforceEvaluateQuestion> questionList;
}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateLogBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateLogBo.java
index cc4cede..01e1d25 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateLogBo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateLogBo.java
@@ -46,17 +46,23 @@
@ApiModelProperty("浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛�")
private String companyPhone;
+ @ApiModelProperty("鎵ц浜篿d")
+ private Long executeId;
+
+ @ApiModelProperty("鎵ц浜哄崟浣峣d")
+ private Long executeDeptId;
+
/** 鎵ц浜� */
@ApiModelProperty("鎵ц浜�")
- private Long executeUser;
+ private String executeUser;
/** 鎵ц浜虹數璇� */
@ApiModelProperty("鎵ц浜虹數璇�")
- private Long executePhone;
+ private String executePhone;
/** 鎵ц浜哄崟浣� */
@ApiModelProperty("鎵ц浜哄崟浣�")
- private Long executeDeptName;
+ private String executeDeptName;
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceCompanyLogQueryBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceCompanyLogQueryBo.java
new file mode 100644
index 0000000..55f2ce2
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceCompanyLogQueryBo.java
@@ -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;
+ /** 鎺掑簭鐨勬柟鍚慸esc鎴栬�卆sc */
+ @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;
+
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceComplaintLogQueryBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceComplaintLogQueryBo.java
index b87178e..42db15b 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceComplaintLogQueryBo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceComplaintLogQueryBo.java
@@ -54,15 +54,22 @@
/** 浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛� */
@ApiModelProperty("浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛�")
private String companyPhone;
+
+ @ApiModelProperty("鎵ц浜篿d")
+ private Long executeId;
+
+ @ApiModelProperty("鎵ц浜哄崟浣峣d")
+ 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;
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceEvaluateLogQueryBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceEvaluateLogQueryBo.java
index 616bc95..dd9f804 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceEvaluateLogQueryBo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceEvaluateLogQueryBo.java
@@ -50,15 +50,22 @@
/** 浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛� */
@ApiModelProperty("浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛�")
private String companyPhone;
+
+ @ApiModelProperty("鎵ц浜篿d")
+ private Long executeId;
+
+ @ApiModelProperty("鎵ц浜哄崟浣峣d")
+ 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;
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceCompanyLogVo.java b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceCompanyLogVo.java
new file mode 100644
index 0000000..0572bad
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceCompanyLogVo.java
@@ -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;
+
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceComplaintLogVo.java b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceComplaintLogVo.java
index 52fe0b6..6854c9d 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceComplaintLogVo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceComplaintLogVo.java
@@ -44,15 +44,22 @@
@Excel(name = "浼佷笟鑱旂郴浜虹數璇�" , readConverterExp = "璐�=鍙�")
@ApiModelProperty("浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛�")
private String companyPhone;
+
+ @ApiModelProperty("鎵ц浜篿d")
+ private Long executeId;
+
+ @ApiModelProperty("鎵ц浜哄崟浣峣d")
+ 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;
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateLogVo.java b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateLogVo.java
index 89cae37..0be1eda 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateLogVo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateLogVo.java
@@ -40,15 +40,22 @@
@Excel(name = "浼佷笟鑱旂郴浜虹數璇�" , readConverterExp = "璐�=鍙�")
@ApiModelProperty("浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛�")
private String companyPhone;
+
+ @ApiModelProperty("鎵ц浜篿d")
+ private Long executeId;
+
+ @ApiModelProperty("鎵ц浜哄崟浣峣d")
+ 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;
diff --git a/project-enforce/src/main/java/com/project/enforce/mapper/EnforceCompanyLogMapper.java b/project-enforce/src/main/java/com/project/enforce/mapper/EnforceCompanyLogMapper.java
new file mode 100644
index 0000000..328e61f
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/mapper/EnforceCompanyLogMapper.java
@@ -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> {
+
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/service/IEnforceCompanyLogService.java b/project-enforce/src/main/java/com/project/enforce/service/IEnforceCompanyLogService.java
new file mode 100644
index 0000000..94d98c5
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/service/IEnforceCompanyLogService.java
@@ -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);
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateService.java b/project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateService.java
index bf64516..e4d465c 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateService.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateService.java
@@ -27,4 +27,5 @@
EnforceEvaluateVo getInfo();
+
}
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceCompanyLogServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceCompanyLogServiceImpl.java
new file mode 100644
index 0000000..46f3290
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceCompanyLogServiceImpl.java
@@ -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;
+ }
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java
index a1083fb..08218c4 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java
+++ b/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()));
+ }
}
//鑾峰彇鏌ヨ鍙傛暟
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateServiceImpl.java
index 6744ad0..54dcde0 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateServiceImpl.java
+++ b/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;
}
+
+
}
diff --git a/project-enforce/src/main/resources/mapper/enforce/EnforceCompanyLogMapper.xml b/project-enforce/src/main/resources/mapper/enforce/EnforceCompanyLogMapper.xml
new file mode 100644
index 0000000..985f79e
--- /dev/null
+++ b/project-enforce/src/main/resources/mapper/enforce/EnforceCompanyLogMapper.xml
@@ -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>
\ No newline at end of file
--
Gitblit v1.9.1