From e7e9f6b33432d8a312a6b8cf0164fa095492d0fa Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 10 四月 2024 13:58:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/system/controller/SysDeptController.java | 6
ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java | 21 +
ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckRuleQuery.java | 39 ++
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwUnitVO.java | 13
ycl-server/src/main/java/com/ycl/platform/service/YwUnitService.java | 9
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java | 8
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 110 +++++-
ycl-server/src/main/resources/mapper/zgyw/CheckTemplateMapper.xml | 3
ycl-server/src/main/java/com/ycl/platform/mapper/CheckRuleMapper.java | 8
ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java | 13
ycl-server/src/main/resources/application-prod.yml | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java | 25 -
ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java | 14
ycl-server/src/main/java/com/ycl/system/service/ISysDeptService.java | 6
ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java | 20
ycl-pojo/src/main/java/com/ycl/system/entity/SysDept.java | 41 +-
ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java | 14
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRecord.java | 79 -----
ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java | 6
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 4
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 8
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java | 20 +
ycl-server/src/main/resources/mapper/system/SysDeptMapper.xml | 6
ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java | 79 +++++
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckRuleVO.java | 55 +++
ycl-server/src/main/resources/application-dev.yml | 2
ycl-server/src/main/java/com/ycl/platform/service/ICheckTemplateService.java | 15
ycl-server/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java | 19 +
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java | 10
ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java | 6
/dev/null | 0
ycl-server/src/main/resources/mapper/zgyw/CalculateRecordMapper.xml | 12
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java | 13
ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java | 8
ycl-server/src/main/java/com/ycl/platform/service/ReportService.java | 7
ycl-server/src/main/java/com/ycl/platform/mapper/CheckTemplateMapper.java | 5
ycl-server/src/main/java/com/ycl/platform/service/ICheckRuleService.java | 8
ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java | 21 +
document/需求确认书.docx | 0
ycl-server/src/main/java/com/ycl/platform/service/YwPeopleService.java | 7
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java | 98 ++++-
ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml | 40 +-
42 files changed, 638 insertions(+), 242 deletions(-)
diff --git "a/document/\350\207\252\350\264\241\351\241\271\347\233\256\344\273\273\345\212\241\345\210\206\351\205\215.xlsx" "b/document/\350\207\252\350\264\241\351\241\271\347\233\256\344\273\273\345\212\241\345\210\206\351\205\215.xlsx"
deleted file mode 100644
index e69de29..0000000
--- "a/document/\350\207\252\350\264\241\351\241\271\347\233\256\344\273\273\345\212\241\345\210\206\351\205\215.xlsx"
+++ /dev/null
diff --git "a/document/\351\234\200\346\261\202\347\241\256\350\256\244\344\271\2463.27.docx" "b/document/\351\234\200\346\261\202\347\241\256\350\256\244\344\271\246.docx"
similarity index 70%
rename from "document/\351\234\200\346\261\202\347\241\256\350\256\244\344\271\2463.27.docx"
rename to "document/\351\234\200\346\261\202\347\241\256\350\256\244\344\271\246.docx"
index 2b4b5aa..643e3e7 100644
--- "a/document/\351\234\200\346\261\202\347\241\256\350\256\244\344\271\2463.27.docx"
+++ "b/document/\351\234\200\346\261\202\347\241\256\350\256\244\344\271\246.docx"
Binary files differ
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRecord.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRecord.java
index 0431c81..d5af7c1 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRecord.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateRecord.java
@@ -3,6 +3,7 @@
import annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.system.entity.BaseEntity;
+import lombok.Data;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
@@ -15,6 +16,7 @@
* @author ruoyi
* @date 2024-04-03
*/
+@Data
public class CalculateRecord extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -37,7 +39,7 @@
/** 鎬绘湇鍔¤垂 */
@Excel(name = "鎬绘湇鍔¤垂")
- private BigDecimal totalMount;
+ private BigDecimal totalAmount;
/** 鎵ｅ噺鏈嶅姟璐� */
@Excel(name = "鎵ｅ噺鏈嶅姟璐�")
@@ -47,80 +49,5 @@
@Excel(name = "鑰冩牳鍒嗘暟")
private BigDecimal score;
- public void setId(Long id)
- {
- this.id = id;
- }
- public Long getId()
- {
- return id;
- }
- public void setDate(Date date)
- {
- this.date = date;
- }
-
- public Date getDate()
- {
- return date;
- }
- public void setRuleId(Long ruleId)
- {
- this.ruleId = ruleId;
- }
-
- public Long getRuleId()
- {
- return ruleId;
- }
- public void setUnitId(Long unitId)
- {
- this.unitId = unitId;
- }
-
- public Long getUnitId()
- {
- return unitId;
- }
- public void setTotalMount(BigDecimal totalMount)
- {
- this.totalMount = totalMount;
- }
-
- public BigDecimal getTotalMount()
- {
- return totalMount;
- }
- public void setDeductAmount(BigDecimal deductAmount)
- {
- this.deductAmount = deductAmount;
- }
-
- public BigDecimal getDeductAmount()
- {
- return deductAmount;
- }
- public void setScore(BigDecimal score)
- {
- this.score = score;
- }
-
- public BigDecimal getScore()
- {
- return score;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("date", getDate())
- .append("ruleId", getRuleId())
- .append("unitId", getUnitId())
- .append("totalMount", getTotalMount())
- .append("deductAmount", getDeductAmount())
- .append("score", getScore())
- .toString();
- }
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java
index 4c7442f..f2bb4b8 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java
@@ -24,7 +24,7 @@
/** 瑙勫垯缁嗗垯 */
@Excel(name = "瑙勫垯缁嗗垯")
- private String ruleDetail;
+ private String ruleIndex;
/** 瑙勫垯绫诲瀷 */
@Excel(name = "瑙勫垯绫诲瀷")
@@ -37,10 +37,6 @@
/** 瑙勫垯鎻忚堪 */
@Excel(name = "瑙勫垯鎻忚堪")
private String ruleDescription;
-
- /** 瀹℃牳鐘舵�� */
- @Excel(name = "瀹℃牳鐘舵��")
- private Long auditState;
/** 鍚敤鐘舵�� */
@Excel(name = "鍚敤鐘舵��")
@@ -67,14 +63,14 @@
{
return ruleName;
}
- public void setRuleDetail(String ruleDetail)
+ public void setRuleIndex(String ruleIndex)
{
- this.ruleDetail = ruleDetail;
+ this.ruleIndex = ruleIndex;
}
- public String getRuleDetail()
+ public String getRuleIndex()
{
- return ruleDetail;
+ return ruleIndex;
}
public void setRuleCategory(Long ruleCategory)
{
@@ -103,15 +99,7 @@
{
return ruleDescription;
}
- public void setAuditState(Long auditState)
- {
- this.auditState = auditState;
- }
- public Long getAuditState()
- {
- return auditState;
- }
public void setState(Long state)
{
this.state = state;
@@ -136,11 +124,10 @@
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("ruleName", getRuleName())
- .append("ruleDetail", getRuleDetail())
+ .append("ruleIndex", getRuleIndex())
.append("ruleCategory", getRuleCategory())
.append("examineCategory", getExamineCategory())
.append("ruleDescription", getRuleDescription())
- .append("auditState", getAuditState())
.append("state", getState())
.append("createTime", getCreateTime())
.append("updateTime", getUpdateTime())
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java
index 86ada19..599437a 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java
@@ -2,14 +2,13 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.util.Date;
-
import com.ycl.platform.base.AbsEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
+
+import java.util.Date;
/**
* 鎶ュ
@@ -56,6 +55,14 @@
@TableField("error_type")
private String errorType;
+ @ApiModelProperty("鐘舵��")
+ @TableField("status")
+ private Integer status;
+
+ @ApiModelProperty("瀹℃牳鎰忚")
+ @TableField("audit_opinion")
+ private String auditOpinion;
+
@ApiModelProperty("鐢熸晥鏃堕棿")
@TableField("begin_create_time")
private Date beginCreateTime;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java
index b06fd74..10bf0ff 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java
@@ -58,6 +58,12 @@
@ApiModelProperty("鏁呴殰绫诲瀷")
private String errorType;
+ @ApiModelProperty("瀹℃牳鎰忚")
+ private String auditOpinion;
+
+ @ApiModelProperty("鐘舵��")
+ private Integer status;
+
public static Report getEntityByForm(@NonNull ReportForm form, Report entity) {
if(entity == null) {
entity = new Report();
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java
index 95a5a34..ff2fd40 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java
@@ -26,7 +26,7 @@
@ApiModel(value = "WorkOrder琛ㄥ崟", description = "宸ュ崟琛ㄥ崟")
public class WorkOrderForm extends AbsForm {
- @NotBlank(message = "宸ュ崟鍙蜂笉鑳戒负绌�", groups = {Add.class, Update.class})
+ // @NotBlank(message = "宸ュ崟鍙蜂笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("宸ュ崟鍙�")
private String workOrderNo;
@@ -34,23 +34,31 @@
@ApiModelProperty("杩愮淮鍗曚綅")
private Integer unitId;
- @NotNull(message = "杩愮淮浜哄憳涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @NotBlank(message = "宸ュ崟鏉ユ簮涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("宸ュ崟鏉ユ簮")
+ private String source;
+
+ @NotNull(message = "鏁呴殰绫诲瀷涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("鏁呴殰绫诲瀷")
+ private String errorType;
+
+ // @NotNull(message = "杩愮淮浜哄憳涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("杩愮淮浜哄憳")
private Integer ywPeopleId;
- @NotNull(message = "杩愮淮澶勭悊鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ // @NotNull(message = "杩愮淮澶勭悊鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("杩愮淮澶勭悊鏃堕棿")
private LocalDateTime ywHandleTime;
- @NotBlank(message = "杩愮淮缁撴灉涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ // @NotBlank(message = "杩愮淮缁撴灉涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("杩愮淮缁撴灉")
private String ywResult;
- @NotBlank(message = "杩愮淮鎯呭喌涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ // @NotBlank(message = "杩愮淮鎯呭喌涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("杩愮淮鎯呭喌")
private String ywCondition;
- @NotBlank(message = "杩愮淮妫�娴嬬粨鏋滀笉鑳戒负绌�", groups = {Add.class, Update.class})
+ // @NotBlank(message = "杩愮淮妫�娴嬬粨鏋滀笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("杩愮淮妫�娴嬬粨鏋�")
private String ywCheckResult;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckRuleQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckRuleQuery.java
new file mode 100644
index 0000000..24fd731
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckRuleQuery.java
@@ -0,0 +1,39 @@
+package com.ycl.platform.domain.query;
+
+import annotation.Excel;
+import com.ycl.platform.base.AbsQuery;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 涓嬪彂宸ュ崟鏌ヨ
+ *
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "鑰冩牳瑙勫垯绠＄悊", description = "鑰冩牳瑙勫垯绠＄悊")
+public class CheckRuleQuery extends AbsQuery {
+ /**
+ * 妯℃澘id
+ */
+ private Integer templateId;
+ /**
+ * 瀹℃牳鐘舵��
+ */
+ private Integer auditState;
+ /**
+ * 瑙勫垯鍚嶇О
+ */
+ private String ruleName;
+ /**
+ * 瑙勫垯绫诲瀷
+ */
+ private Integer ruleCategory;
+ /**
+ * 鑰冩牳绫诲瀷
+ */
+ private Integer examineCategory;
+
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java
new file mode 100644
index 0000000..388afbd
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java
@@ -0,0 +1,79 @@
+package com.ycl.platform.domain.query;
+
+import annotation.Excel;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ycl.platform.base.AbsQuery;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "瑙勫垯妯℃澘鏌ヨ", description = "瑙勫垯妯℃澘鏌ヨ")
+public class CheckTemplateQuery extends AbsQuery {
+ /** */
+ private Long id;
+
+ /** 妯℃澘鍚嶇О */
+ @Excel(name = "妯℃澘鍚嶇О")
+ private String templateName;
+
+ /** 璋冩暣绯绘暟 */
+ @Excel(name = "璋冩暣绯绘暟")
+ private Long adjustCoefficient;
+
+ /** 璋冩暣鏂瑰紡锛氫箻闄� */
+ @Excel(name = "璋冩暣鏂瑰紡锛氫箻闄�")
+ private String adjustWay;
+
+ /** 鑰冩牳绫诲瀷 */
+ @Excel(name = "鑰冩牳绫诲瀷")
+ private Long examineCategory;
+
+ /** 鍚敤/鍋滅敤 */
+ @Excel(name = "鍚敤/鍋滅敤")
+ private String status;
+
+ /** 鍖哄幙 */
+ @Excel(name = "鍖哄幙")
+ private List deptId;
+
+ /** 鍒涘缓浜篿d */
+ private Long createUser;
+
+ /** 鍒涘缓浜哄鍚� */
+ @Excel(name = "鍒涘缓浜哄鍚�")
+ private String createUserName;
+
+ /** */
+ private Long updateUser;
+
+ /** */
+ @Excel(name = "")
+ private String updateUserName;
+
+ /** 閫昏緫鍒犻櫎 */
+ private String deleted;
+
+
+ /** 鍒涘缓鑰� */
+ private String createBy;
+
+ /** 鍒涘缓鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /** 鏇存柊鑰� */
+ @TableField(fill = FieldFill.UPDATE)
+ private String updateBy;
+
+ /** 鏇存柊鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.UPDATE)
+ private Date updateTime;
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java
index 4068006..4e63f3b 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java
@@ -28,5 +28,13 @@
private Date endCreateTime;
+ private String pointId;
+
+ private String peopleId;
+
+ private List<Integer> pointIdList;
+
+ private List<Integer> peopleIdList;
+
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckRuleVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckRuleVO.java
new file mode 100644
index 0000000..b4ca16c
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckRuleVO.java
@@ -0,0 +1,55 @@
+package com.ycl.platform.domain.vo;
+
+import annotation.Excel;
+import com.ycl.platform.base.AbsVo;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+/**
+ * 鑰冩牳瑙勫垯灞曠ず
+ *
+ */
+@Data
+@Accessors(chain = true)
+public class CheckRuleVO extends AbsVo {
+ /**
+ * 妯℃澘id
+ */
+ private Integer templateId;
+
+ /** 妯℃澘鍚� */
+ private String templateName;
+ /**
+ * 瀹℃牳鐘舵��
+ */
+ private Integer auditState;
+ /**
+ * 瑙勫垯鍚嶇О
+ */
+ private String ruleName;
+ /**
+ * 瑙勫垯绫诲瀷
+ */
+ private String ruleCategory;
+
+ /** 瑙勫垯缁嗗垯 */
+ private String ruleIndex;
+
+ /** 鑰冩牳绫诲瀷 */
+ private Long examineCategory;
+
+ /** 瑙勫垯鎻忚堪 */
+ private String ruleDescription;
+
+ /** 瑙勫垯鏉冮噸 */
+ private BigDecimal weight;
+
+ /** 鍚敤鐘舵�� */
+ private Long state;
+
+ /** 閫昏緫鍒犻櫎 */
+ private String deleted;
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java
index 44004e5..b4e0715 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java
@@ -1,5 +1,6 @@
package com.ycl.platform.domain.vo;
+import annotation.Excel;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.Report;
@@ -25,30 +26,38 @@
/** 杩愮淮鍗曚綅ID */
private Integer unitId;
+ @Excel(name = "杩愮淮鍗曚綅")
private String unitName;
/** 杩愮淮浜哄憳ID */
private Integer peopleId;
+ @Excel(name = "鎶ュ浜哄憳")
private String peopleName;
/** 鐐逛綅ID */
private Integer pointId;
+ @Excel(name = "鐐逛綅")
private String pointName;
/** 鎶ュ绫诲瀷 */
+ @Excel(name = "鎶ュ绫诲瀷")
private String reportType;
- /** 瀹℃牳鏃堕棿 */
- private LocalDateTime auditingTime;
-
/** 鎶ュ鍐呭 */
+ @Excel(name = "鎶ュ鍐呭")
private String reportContent;
/** 涓婃姤鏉愭枡 */
+ @Excel(name = "涓婃姤鏉愭枡")
private String reportMaterials;
/** 鏁呴殰绫诲瀷 */
+ @Excel(name = "鏁呴殰绫诲瀷")
private String errorType;
+
+ /** 瀹℃牳鏃堕棿 */
+ @Excel(name = "瀹℃牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date auditingTime;
/**
* 鐢熸晥鏃堕棿
@@ -60,6 +69,11 @@
*/
private Date endCreateTime;
+ /**
+ * 瑁呭～
+ */
+ private Integer status;
+
public static ReportVO getVoByEntity(@NonNull Report entity, ReportVO vo) {
if(vo == null) {
vo = new ReportVO();
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwUnitVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwUnitVO.java
index cb98621..1fb5c07 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwUnitVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwUnitVO.java
@@ -1,5 +1,6 @@
package com.ycl.platform.domain.vo;
+import annotation.Excel;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.YwUnit;
@@ -18,22 +19,22 @@
@Accessors(chain = true)
public class YwUnitVO extends AbsVo {
- /** 鍗曚綅缂栫爜 */
+ @Excel(name = "鍗曚綅缂栫爜")
private String unitCode;
- /** 鍗曚綅鍚嶇О */
+ @Excel(name = "鍗曚綅鍚嶇О")
private String unitName;
- /** 鍗曚綅鑱旂郴浜� */
+ @Excel(name = "鍗曚綅鑱旂郴浜�")
private String unitContact;
- /** 鍗曚綅鑱旂郴浜虹數璇� */
+ @Excel(name = "鍗曚綅鑱旂郴浜虹數璇�")
private String unitContactPhone;
- /** 鍗曚綅绠＄悊鍛樿处鍙� */
+ @Excel(name = "鍗曚綅绠＄悊鍛樿处鍙�")
private String unitAdminAccount;
- /** 澶囨敞 */
+ @Excel(name = "澶囨敞")
private String remark;
public static YwUnitVO getVoByEntity(@NonNull YwUnit entity, YwUnitVO vo) {
diff --git a/ycl-pojo/src/main/java/com/ycl/system/entity/SysDept.java b/ycl-pojo/src/main/java/com/ycl/system/entity/SysDept.java
index 8f75b52..ea523b4 100644
--- a/ycl-pojo/src/main/java/com/ycl/system/entity/SysDept.java
+++ b/ycl-pojo/src/main/java/com/ycl/system/entity/SysDept.java
@@ -31,6 +31,8 @@
/** 閮ㄩ棬鍚嶇О */
private String deptName;
+ /** 鍖哄煙鍚嶇О */
+ private String area;
/** 鏄剧ず椤哄簭 */
private Integer orderNum;
@@ -54,6 +56,14 @@
/** 瀛愰儴闂� */
private List<SysDept> children = new ArrayList<SysDept>();
+
+ public String getArea() {
+ return area;
+ }
+
+ public void setArea(String area) {
+ this.area = area;
+ }
public Long getDeptId()
{
@@ -183,21 +193,20 @@
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("deptId", getDeptId())
- .append("parentId", getParentId())
- .append("ancestors", getAncestors())
- .append("deptName", getDeptName())
- .append("orderNum", getOrderNum())
- .append("leader", getLeader())
- .append("phone", getPhone())
- .append("email", getEmail())
- .append("status", getStatus())
- .append("delFlag", getDelFlag())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .toString();
+ return "SysDept{" +
+ "deptId=" + deptId +
+ ", parentId=" + parentId +
+ ", ancestors='" + ancestors + '\'' +
+ ", deptName='" + deptName + '\'' +
+ ", area='" + area + '\'' +
+ ", orderNum=" + orderNum +
+ ", leader='" + leader + '\'' +
+ ", phone='" + phone + '\'' +
+ ", email='" + email + '\'' +
+ ", status='" + status + '\'' +
+ ", delFlag='" + delFlag + '\'' +
+ ", parentName='" + parentName + '\'' +
+ ", children=" + children +
+ '}';
}
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java
index bac5c34..d90e241 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java
@@ -2,6 +2,8 @@
import annotation.Log;
import com.ycl.platform.domain.entity.CheckRule;
+import com.ycl.platform.domain.query.CheckRuleQuery;
+import com.ycl.platform.domain.vo.CheckRuleVO;
import com.ycl.platform.service.ICheckRuleService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
@@ -33,11 +35,11 @@
* 鏌ヨ鑰冩牳瑙勫垯鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('system:rule:list')")
- @GetMapping("/list")
- public TableDataInfo list(CheckRule checkRule)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody CheckRuleQuery checkRuleQuery)
{
startPage();
- List<CheckRule> list = checkRuleService.selectCheckRuleList(checkRule);
+ List<CheckRuleVO> list = checkRuleService.selectCheckRuleList(checkRuleQuery);
return getDataTable(list);
}
@@ -47,10 +49,10 @@
@PreAuthorize("@ss.hasPermi('system:rule:export')")
@Log(title = "鑰冩牳瑙勫垯", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, CheckRule checkRule)
+ public void export(HttpServletResponse response, CheckRuleQuery checkRuleQuery)
{
- List<CheckRule> list = checkRuleService.selectCheckRuleList(checkRule);
- ExcelUtil<CheckRule> util = new ExcelUtil<CheckRule>(CheckRule.class);
+ List<CheckRuleVO> list = checkRuleService.selectCheckRuleList(checkRuleQuery);
+ ExcelUtil<CheckRuleVO> util = new ExcelUtil<CheckRuleVO>(CheckRuleVO.class);
util.exportExcel(response, list, "鑰冩牳瑙勫垯鏁版嵁");
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java
index 2ec9af4..5fcdb7e 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java
@@ -2,12 +2,15 @@
import annotation.Log;
import com.ycl.platform.domain.entity.CheckTemplate;
+import com.ycl.platform.domain.query.CheckTemplateQuery;
import com.ycl.platform.service.ICheckTemplateService;
import com.ycl.system.AjaxResult;
+import com.ycl.system.Result;
import com.ycl.system.controller.BaseController;
import com.ycl.system.page.TableDataInfo;
import com.ycl.utils.poi.ExcelUtil;
import enumeration.BusinessType;
+import io.swagger.annotations.ApiOperation;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -33,10 +36,10 @@
*/
@PreAuthorize("@ss.hasPermi('system:template:list')")
@GetMapping("/list")
- public TableDataInfo list(CheckTemplate checkTemplate)
+ public TableDataInfo list(CheckTemplateQuery checkTemplateDTO)
{
startPage();
- List<CheckTemplate> list = checkTemplateService.selectCheckTemplateList(checkTemplate);
+ List<CheckTemplate> list = checkTemplateService.selectCheckTemplateList(checkTemplateDTO);
return getDataTable(list);
}
@@ -46,9 +49,9 @@
@PreAuthorize("@ss.hasPermi('system:template:export')")
@Log(title = "鑰冩牳妯℃澘", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, CheckTemplate checkTemplate)
+ public void export(HttpServletResponse response, CheckTemplateQuery checkTemplateDTO)
{
- List<CheckTemplate> list = checkTemplateService.selectCheckTemplateList(checkTemplate);
+ List<CheckTemplate> list = checkTemplateService.selectCheckTemplateList(checkTemplateDTO);
ExcelUtil<CheckTemplate> util = new ExcelUtil<CheckTemplate>(CheckTemplate.class);
util.exportExcel(response, list, "鑰冩牳妯℃澘鏁版嵁");
}
@@ -69,9 +72,9 @@
@PreAuthorize("@ss.hasPermi('system:template:add')")
@Log(title = "鑰冩牳妯℃澘", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody CheckTemplate checkTemplate)
+ public AjaxResult add(@RequestBody CheckTemplateQuery checkTemplateDTO)
{
- return toAjax(checkTemplateService.insertCheckTemplate(checkTemplate));
+ return toAjax(checkTemplateService.insertCheckTemplate(checkTemplateDTO));
}
/**
@@ -95,4 +98,10 @@
{
return toAjax(checkTemplateService.deleteCheckTemplateByIds(ids));
}
+
+ @GetMapping("/pullList")
+ @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
+ public Result pullList() {
+ return checkTemplateService.pullList();
+ }
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java b/ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java
index 092da5c..f7a8489 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java
@@ -1,7 +1,13 @@
package com.ycl.platform.controller;
+import com.ycl.platform.domain.entity.Report;
+import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.vo.ReportVO;
+import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
+import com.ycl.utils.poi.ExcelUtil;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.validation.annotation.Validated;
import lombok.RequiredArgsConstructor;
import java.util.List;
@@ -72,4 +78,12 @@
public Result list() {
return reportService.all();
}
+
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ReportQuery query)
+ {
+ List<ReportVO> list = reportService.export(query);
+ ExcelUtil<ReportVO> util = new ExcelUtil<>(ReportVO.class);
+ util.exportExcel(response, list, "杩愮淮鍗曚綅");
+ }
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java
index 91dc9d6..46900da 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java
@@ -67,6 +67,12 @@
return ywPeopleService.detail(id);
}
+ @GetMapping("/getPeopleByUnitId/{id}")
+ @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
+ public Result getPeopleByUnitId(@PathVariable("id") String id) {
+ return ywPeopleService.getPeopleByUnitId(id);
+ }
+
@GetMapping("/list")
@ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
public Result list() {
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java
index 8ca1397..7bda29c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java
@@ -1,11 +1,16 @@
package com.ycl.platform.controller;
+import com.ycl.platform.domain.query.ReportQuery;
+import com.ycl.platform.domain.vo.ReportVO;
+import com.ycl.platform.domain.vo.YwUnitVO;
import com.ycl.system.Result;
import com.ycl.platform.domain.form.YwUnitForm;
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import com.ycl.platform.domain.query.YwUnitQuery;
import com.ycl.platform.service.YwUnitService;
+import com.ycl.utils.poi.ExcelUtil;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import lombok.RequiredArgsConstructor;
@@ -73,4 +78,12 @@
public Result list() {
return ywUnitService.all();
}
+
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, YwUnitQuery query)
+ {
+ List<YwUnitVO> list = ywUnitService.export(query);
+ ExcelUtil<YwUnitVO> util = new ExcelUtil<>(YwUnitVO.class);
+ util.exportExcel(response, list, "鎶ュ");
+ }
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckRuleMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckRuleMapper.java
index f3b4016..fdf0420 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckRuleMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckRuleMapper.java
@@ -1,6 +1,8 @@
package com.ycl.platform.mapper;
import com.ycl.platform.domain.entity.CheckRule;
+import com.ycl.platform.domain.query.CheckRuleQuery;
+import com.ycl.platform.domain.vo.CheckRuleVO;
import java.util.List;
@@ -18,15 +20,15 @@
* @param id 鑰冩牳瑙勫垯涓婚敭
* @return 鑰冩牳瑙勫垯
*/
- public CheckRule selectCheckRuleById(Long id);
+ public CheckRuleVO selectCheckRuleById(Long id);
/**
* 鏌ヨ鑰冩牳瑙勫垯鍒楄〃
*
- * @param checkRule 鑰冩牳瑙勫垯
+ * @param checkRuleQuery 鑰冩牳瑙勫垯
* @return 鑰冩牳瑙勫垯闆嗗悎
*/
- public List<CheckRule> selectCheckRuleList(CheckRule checkRule);
+ public List<CheckRuleVO> selectCheckRuleList(CheckRuleQuery checkRuleQuery);
/**
* 鏂板鑰冩牳瑙勫垯
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckTemplateMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckTemplateMapper.java
index 8cbfb63..02479a1 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckTemplateMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckTemplateMapper.java
@@ -1,6 +1,7 @@
package com.ycl.platform.mapper;
import com.ycl.platform.domain.entity.CheckTemplate;
+import com.ycl.platform.domain.query.CheckTemplateQuery;
import java.util.List;
@@ -23,10 +24,10 @@
/**
* 鏌ヨ鑰冩牳妯℃澘鍒楄〃
*
- * @param checkTemplate 鑰冩牳妯℃澘
+ * @param checkTemplateDTO 鑰冩牳妯℃澘
* @return 鑰冩牳妯℃澘闆嗗悎
*/
- public List<CheckTemplate> selectCheckTemplateList(CheckTemplate checkTemplate);
+ public List<CheckTemplate> selectCheckTemplateList(CheckTemplateQuery checkTemplateDTO);
/**
* 鏂板鑰冩牳妯℃澘
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ICheckRuleService.java b/ycl-server/src/main/java/com/ycl/platform/service/ICheckRuleService.java
index 1d599fd..6235915 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/ICheckRuleService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/ICheckRuleService.java
@@ -1,6 +1,8 @@
package com.ycl.platform.service;
import com.ycl.platform.domain.entity.CheckRule;
+import com.ycl.platform.domain.query.CheckRuleQuery;
+import com.ycl.platform.domain.vo.CheckRuleVO;
import java.util.List;
@@ -18,15 +20,15 @@
* @param id 鑰冩牳瑙勫垯涓婚敭
* @return 鑰冩牳瑙勫垯
*/
- public CheckRule selectCheckRuleById(Long id);
+ public CheckRuleVO selectCheckRuleById(Long id);
/**
* 鏌ヨ鑰冩牳瑙勫垯鍒楄〃
*
- * @param checkRule 鑰冩牳瑙勫垯
+ * @param checkRuleQuery 鑰冩牳瑙勫垯
* @return 鑰冩牳瑙勫垯闆嗗悎
*/
- public List<CheckRule> selectCheckRuleList(CheckRule checkRule);
+ public List<CheckRuleVO> selectCheckRuleList(CheckRuleQuery checkRuleQuery);
/**
* 鏂板鑰冩牳瑙勫垯
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ICheckTemplateService.java b/ycl-server/src/main/java/com/ycl/platform/service/ICheckTemplateService.java
index 6ce7191..44eb4ea 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/ICheckTemplateService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/ICheckTemplateService.java
@@ -1,6 +1,8 @@
package com.ycl.platform.service;
import com.ycl.platform.domain.entity.CheckTemplate;
+import com.ycl.platform.domain.query.CheckTemplateQuery;
+import com.ycl.system.Result;
import java.util.List;
@@ -18,23 +20,23 @@
* @param id 鑰冩牳妯℃澘涓婚敭
* @return 鑰冩牳妯℃澘
*/
- public CheckTemplate selectCheckTemplateById(Long id);
+ public CheckTemplateQuery selectCheckTemplateById(Long id);
/**
* 鏌ヨ鑰冩牳妯℃澘鍒楄〃
*
- * @param checkTemplate 鑰冩牳妯℃澘
+ * @param checkTemplateDTO 鑰冩牳妯℃澘
* @return 鑰冩牳妯℃澘闆嗗悎
*/
- public List<CheckTemplate> selectCheckTemplateList(CheckTemplate checkTemplate);
+ public List<CheckTemplate> selectCheckTemplateList(CheckTemplateQuery checkTemplateDTO);
/**
* 鏂板鑰冩牳妯℃澘
*
- * @param checkTemplate 鑰冩牳妯℃澘
+ * @param checkTemplateDTO 鑰冩牳妯℃澘
* @return 缁撴灉
*/
- public int insertCheckTemplate(CheckTemplate checkTemplate);
+ public int insertCheckTemplate(CheckTemplateQuery checkTemplateDTO);
/**
* 淇敼鑰冩牳妯℃澘
@@ -59,4 +61,7 @@
* @return 缁撴灉
*/
public int deleteCheckTemplateById(Long id);
+
+ Result pullList();
+
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ReportService.java b/ycl-server/src/main/java/com/ycl/platform/service/ReportService.java
index c8690b1..bf4e0fc 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/ReportService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/ReportService.java
@@ -2,6 +2,7 @@
import com.ycl.platform.domain.entity.Report;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.platform.domain.vo.ReportVO;
import com.ycl.system.Result;
import com.ycl.platform.domain.form.ReportForm;
import com.ycl.platform.domain.query.ReportQuery;
@@ -62,4 +63,10 @@
* @return
*/
Result all();
+
+ /**
+ * 瀵煎嚭
+ * @return
+ */
+ List<ReportVO> export(ReportQuery query);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/YwPeopleService.java b/ycl-server/src/main/java/com/ycl/platform/service/YwPeopleService.java
index 55ed77f..1fa5cc6 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/YwPeopleService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/YwPeopleService.java
@@ -62,4 +62,11 @@
* @return
*/
Result all();
+
+ /**
+ * 鏍规嵁杩愮淮鍗曚綅鏌ヨ杩愮淮浜哄憳璇︾粏
+ * @param id id
+ * @return 杩愮淮浜哄憳
+ */
+ Result getPeopleByUnitId(String id);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/YwUnitService.java b/ycl-server/src/main/java/com/ycl/platform/service/YwUnitService.java
index 7e6d6c5..ebb3a0f 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/YwUnitService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/YwUnitService.java
@@ -2,6 +2,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.platform.domain.query.ReportQuery;
+import com.ycl.platform.domain.vo.ReportVO;
+import com.ycl.platform.domain.vo.YwUnitVO;
import com.ycl.system.Result;
import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.platform.domain.form.YwUnitForm;
@@ -64,4 +67,10 @@
* @return
*/
Result all();
+
+ /**
+ * 瀵煎嚭
+ * @return
+ */
+ List<YwUnitVO> export(YwUnitQuery query);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java
index 518e882..9a2b177 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java
@@ -1,6 +1,8 @@
package com.ycl.platform.service.impl;
import com.ycl.platform.domain.entity.CheckRule;
+import com.ycl.platform.domain.query.CheckRuleQuery;
+import com.ycl.platform.domain.vo.CheckRuleVO;
import com.ycl.platform.mapper.CheckRuleMapper;
import com.ycl.platform.service.ICheckRuleService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +30,7 @@
* @return 鑰冩牳瑙勫垯
*/
@Override
- public CheckRule selectCheckRuleById(Long id)
+ public CheckRuleVO selectCheckRuleById(Long id)
{
return checkRuleMapper.selectCheckRuleById(id);
}
@@ -36,13 +38,13 @@
/**
* 鏌ヨ鑰冩牳瑙勫垯鍒楄〃
*
- * @param checkRule 鑰冩牳瑙勫垯
+ * @param checkRuleQuery 鑰冩牳瑙勫垯
* @return 鑰冩牳瑙勫垯
*/
@Override
- public List<CheckRule> selectCheckRuleList(CheckRule checkRule)
+ public List<CheckRuleVO> selectCheckRuleList(CheckRuleQuery checkRuleQuery)
{
- return checkRuleMapper.selectCheckRuleList(checkRule);
+ return checkRuleMapper.selectCheckRuleList(checkRuleQuery);
}
/**
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
index db6d9a1..e05625e 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
@@ -1,97 +1,143 @@
package com.ycl.platform.service.impl;
+import com.ycl.platform.base.BaseSelect;
import com.ycl.platform.domain.entity.CheckTemplate;
+import com.ycl.platform.domain.query.CheckTemplateQuery;
import com.ycl.platform.mapper.CheckTemplateMapper;
import com.ycl.platform.service.ICheckTemplateService;
+import com.ycl.system.Result;
+import com.ycl.system.entity.SysDept;
+import com.ycl.system.service.ISysDeptService;
+import io.jsonwebtoken.lang.Collections;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
import utils.DateUtils;
+import utils.StringUtils;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 鑰冩牳妯℃澘Service涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
* @date 2024-04-01
*/
@Service
-public class CheckTemplateServiceImpl implements ICheckTemplateService
-{
+public class CheckTemplateServiceImpl implements ICheckTemplateService {
@Autowired
private CheckTemplateMapper checkTemplateMapper;
+ @Autowired
+ private ISysDeptService deptService;
/**
* 鏌ヨ鑰冩牳妯℃澘
- *
+ *
* @param id 鑰冩牳妯℃澘涓婚敭
* @return 鑰冩牳妯℃澘
*/
@Override
- public CheckTemplate selectCheckTemplateById(Long id)
- {
- return checkTemplateMapper.selectCheckTemplateById(id);
+ public CheckTemplateQuery selectCheckTemplateById(Long id) {
+ CheckTemplate checkTemplate = checkTemplateMapper.selectCheckTemplateById(id);
+ CheckTemplateQuery checkTemplateQuery = new CheckTemplateQuery();
+ BeanUtils.copyProperties(checkTemplate,checkTemplateQuery);
+ String deptId = checkTemplate.getDeptId();
+ String deptIdStr = deptId.substring(1, deptId.length() - 1);
+ List<Integer> deptIds = Arrays.stream(deptIdStr.split(","))
+ .mapToInt(Integer::parseInt)
+ .boxed().collect(Collectors.toList());
+ checkTemplateQuery.setDeptId(deptIds);
+ return checkTemplateQuery;
}
/**
* 鏌ヨ鑰冩牳妯℃澘鍒楄〃
- *
- * @param checkTemplate 鑰冩牳妯℃澘
+ *
+ * @param checkTemplateDTO 鑰冩牳妯℃澘
* @return 鑰冩牳妯℃澘
*/
@Override
- public List<CheckTemplate> selectCheckTemplateList(CheckTemplate checkTemplate)
- {
- return checkTemplateMapper.selectCheckTemplateList(checkTemplate);
+ public List<CheckTemplate> selectCheckTemplateList(CheckTemplateQuery checkTemplateDTO) {
+ List<CheckTemplate> checkTemplates = checkTemplateMapper.selectCheckTemplateList(checkTemplateDTO);
+ //閮ㄩ棬鍖哄煙涓嬫媺鍒楄〃
+ Result all = deptService.pullList();
+ List<BaseSelect> data = (List<BaseSelect>) all.get("data");
+ //缈昏瘧閮ㄩ棬id
+ for (CheckTemplate template : checkTemplates) {
+ if(template.getDeptId() == null)continue;
+ String[] deptIds = template.getDeptId().replace("[", "").replace("]", "").split(",");
+ List<String> deptName = new ArrayList<>();
+ for (String deptId : deptIds) {
+ List<String> deptStr = data.stream()
+ .filter(baseSelect -> baseSelect.getId().equals(Integer.parseInt(deptId)))
+ .map(BaseSelect::getValue)
+ .collect(Collectors.toList());
+ deptName.addAll(deptStr);
+ }
+ template.setDeptId(StringUtils.join(deptName,","));
+ }
+
+ return checkTemplates;
}
/**
* 鏂板鑰冩牳妯℃澘
- *
- * @param checkTemplate 鑰冩牳妯℃澘
+ *
+ * @param checkTemplateDTO 鑰冩牳妯℃澘
* @return 缁撴灉
*/
@Override
- public int insertCheckTemplate(CheckTemplate checkTemplate)
- {
- checkTemplate.setCreateTime(DateUtils.getNowDate());
+ public int insertCheckTemplate(CheckTemplateQuery checkTemplateDTO) {
+ checkTemplateDTO.setCreateTime(DateUtils.getNowDate());
+ CheckTemplate checkTemplate = new CheckTemplate();
+ BeanUtils.copyProperties(checkTemplateDTO,checkTemplate);
+ checkTemplate.setDeptId(checkTemplateDTO.getDeptId().toString().replaceAll(" ",""));
return checkTemplateMapper.insertCheckTemplate(checkTemplate);
}
/**
* 淇敼鑰冩牳妯℃澘
- *
+ *
* @param checkTemplate 鑰冩牳妯℃澘
* @return 缁撴灉
*/
@Override
- public int updateCheckTemplate(CheckTemplate checkTemplate)
- {
+ public int updateCheckTemplate(CheckTemplate checkTemplate) {
checkTemplate.setUpdateTime(DateUtils.getNowDate());
return checkTemplateMapper.updateCheckTemplate(checkTemplate);
}
/**
* 鎵归噺鍒犻櫎鑰冩牳妯℃澘
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鑰冩牳妯℃澘涓婚敭
* @return 缁撴灉
*/
@Override
- public int deleteCheckTemplateByIds(Long[] ids)
- {
+ public int deleteCheckTemplateByIds(Long[] ids) {
return checkTemplateMapper.deleteCheckTemplateByIds(ids);
}
/**
* 鍒犻櫎鑰冩牳妯℃澘淇℃伅
- *
+ *
* @param id 鑰冩牳妯℃澘涓婚敭
* @return 缁撴灉
*/
@Override
- public int deleteCheckTemplateById(Long id)
- {
+ public int deleteCheckTemplateById(Long id) {
return checkTemplateMapper.deleteCheckTemplateById(id);
}
+
+ @Override
+ public Result pullList() {
+ List<CheckTemplate> checkTemplates = checkTemplateMapper.selectCheckTemplateList(new CheckTemplateQuery());
+
+ return Result.ok().data(checkTemplates);
+ }
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
index a18f98b..f863d3f 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
@@ -1,34 +1,35 @@
package com.ycl.platform.service.impl;
-import com.ycl.platform.domain.entity.Region;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.entity.Report;
import com.ycl.platform.domain.entity.YwPeople;
+import com.ycl.platform.domain.entity.YwPoint;
import com.ycl.platform.domain.entity.YwUnit;
-import com.ycl.platform.mapper.RegionMapper;
+import com.ycl.platform.domain.form.ReportForm;
+import com.ycl.platform.domain.query.ReportQuery;
+import com.ycl.platform.domain.vo.ReportVO;
import com.ycl.platform.mapper.ReportMapper;
import com.ycl.platform.mapper.YwPeopleMapper;
+import com.ycl.platform.mapper.YwPointMapper;
import com.ycl.platform.mapper.YwUnitMapper;
import com.ycl.platform.service.ReportService;
import com.ycl.system.Result;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.platform.domain.form.ReportForm;
-import com.ycl.platform.domain.vo.ReportVO;
-import com.ycl.platform.domain.query.ReportQuery;
-import java.util.List;
-import org.apache.commons.lang3.StringUtils;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.system.page.PageUtil;
-import org.springframework.stereotype.Service;
-import org.springframework.security.core.context.SecurityContextHolder;
+import com.ycl.utils.SecurityUtils;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
+
import java.util.ArrayList;
+import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
-import lombok.RequiredArgsConstructor;
/**
* 鎶ュ 鏈嶅姟瀹炵幇绫�
@@ -40,10 +41,9 @@
@RequiredArgsConstructor
public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> implements ReportService {
- private final ReportMapper reportMapper;
private final YwUnitMapper unitMapper;
+ private final YwPointMapper ywpointMapper;
private final YwPeopleMapper peopleMapper;
- private final RegionMapper regionMapper;
/**
* 娣诲姞
@@ -52,9 +52,12 @@
*/
@Override
public Result add(ReportForm form) {
- form.setPeopleId(1);
- form.setUnitId(2);
+ Long userId = SecurityUtils.getUserId();
+ YwPeople people = new LambdaQueryChainWrapper<>(peopleMapper).eq(YwPeople::getUserId, userId).one();
+ form.setPeopleId(people.getId());
+ form.setUnitId(people.getBelongUnit());
Report entity = ReportForm.getEntityByForm(form, null);
+ entity.setStatus(0);
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
@@ -114,10 +117,29 @@
@Override
public Result page(ReportQuery query) {
+ if (StringUtils.isNotBlank(query.getPointId())) {
+ LambdaQueryWrapper<YwPoint> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.like(YwPoint::getPointName, query.getPointId());
+ query.setPointIdList(ywpointMapper.selectList(queryWrapper).stream().map(YwPoint::getId).collect(Collectors.toList()));
+ if(CollectionUtils.isEmpty(query.getPointIdList())) {
+ return Result.ok();
+ }
+ }
+ if (StringUtils.isNotBlank(query.getPeopleId())) {
+ LambdaQueryWrapper<YwPeople> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.like(YwPeople::getYwPersonName, query.getPeopleId());
+ query.setPeopleIdList(peopleMapper.selectList(queryWrapper).stream().map(YwPeople::getId).collect(Collectors.toList()));
+ if(CollectionUtils.isEmpty(query.getPeopleIdList())) {
+ return Result.ok();
+ }
+ }
+
IPage<Report> page = new LambdaQueryChainWrapper<>(baseMapper)
.eq(StringUtils.isNotBlank(query.getReportType()), Report::getReportType, query.getReportType())
.le(Objects.nonNull(query.getBeginCreateTime()), Report::getBeginCreateTime, query.getBeginCreateTime())
.ge(Objects.nonNull(query.getEndCreateTime()), Report::getEndCreateTime, query.getEndCreateTime())
+ .in(!CollectionUtils.isEmpty(query.getPointIdList()), Report::getPointId, query.getPointIdList())
+ .in(!CollectionUtils.isEmpty(query.getPeopleIdList()), Report::getPeopleId, query.getPeopleIdList())
.orderByDesc(Report::getCreateTime)
.page(PageUtil.getPage(query, Report.class));
@@ -129,8 +151,8 @@
vo.setUnitName(unit.getUnitName());
YwPeople ywPeople = peopleMapper.selectById(vo.getPeopleId());
vo.setPeopleName(ywPeople.getYwPersonName());
- Region region = regionMapper.selectById(vo.getPointId());
- vo.setPointName(region.getFullName());
+ YwPoint ywPoint = ywpointMapper.selectById(vo.getPointId());
+ vo.setPointName(ywPoint.getPointName());
return vo;
}
)
@@ -166,4 +188,50 @@
.collect(Collectors.toList());
return Result.ok().data(vos);
}
+
+ public List<ReportVO> export(ReportQuery query) {
+
+ if (StringUtils.isNotBlank(query.getPointId())) {
+ LambdaQueryWrapper<YwPoint> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.like(YwPoint::getPointName, query.getPointId());
+ query.setPointIdList(ywpointMapper.selectList(queryWrapper).stream().map(YwPoint::getId).collect(Collectors.toList()));
+ if(CollectionUtils.isEmpty(query.getPointIdList())) {
+ return new ArrayList<>();
+ }
+ }
+ if (StringUtils.isNotBlank(query.getPeopleId())) {
+ LambdaQueryWrapper<YwPeople> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.like(YwPeople::getYwPersonName, query.getPeopleId());
+ query.setPeopleIdList(peopleMapper.selectList(queryWrapper).stream().map(YwPeople::getId).collect(Collectors.toList()));
+ if(CollectionUtils.isEmpty(query.getPeopleIdList())) {
+ return new ArrayList<>();
+ }
+ }
+
+ IPage<Report> page = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(StringUtils.isNotBlank(query.getReportType()), Report::getReportType, query.getReportType())
+ .le(Objects.nonNull(query.getBeginCreateTime()), Report::getBeginCreateTime, query.getBeginCreateTime())
+ .ge(Objects.nonNull(query.getEndCreateTime()), Report::getEndCreateTime, query.getEndCreateTime())
+ .in(!CollectionUtils.isEmpty(query.getPointIdList()), Report::getPointId, query.getPointIdList())
+ .in(!CollectionUtils.isEmpty(query.getPeopleIdList()), Report::getPeopleId, query.getPeopleIdList())
+ .orderByDesc(Report::getCreateTime)
+ .page(PageUtil.getPage(query, Report.class));
+
+ List<ReportVO> vos = page.getRecords().stream()
+ .map(
+ entity -> {
+ ReportVO vo = ReportVO.getVoByEntity(entity, null);
+ YwUnit unit = unitMapper.selectById(vo.getUnitId());
+ vo.setUnitName(unit.getUnitName());
+ YwPeople ywPeople = peopleMapper.selectById(vo.getPeopleId());
+ vo.setPeopleName(ywPeople.getYwPersonName());
+ YwPoint ywPoint = ywpointMapper.selectById(vo.getPointId());
+ vo.setPointName(ywPoint.getPointName());
+ return vo;
+ }
+ )
+ .collect(Collectors.toList());
+ return vos;
+ }
+
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index c64d795..73d58cf 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -56,6 +56,10 @@
@Override
public Result add(WorkOrderForm form) {
WorkOrder entity = WorkOrderForm.getEntityByForm(form, null);
+ entity.setWorkOrderNo(DateUtils.dateTimeNow());
+ entity.setCreateTime(DateUtils.getNowDate());
+ entity.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);
+ entity.setDeleted("0");
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
index 53a6c0a..52a2c6b 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
@@ -198,4 +198,12 @@
.collect(Collectors.toList());
return Result.ok().data(vos);
}
+
+ @Override
+ public Result getPeopleByUnitId(String id) {
+ List<YwPeople> entities = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(YwPeople::getBelongUnit, id)
+ .list();
+ return Result.ok().data(entities);
+ }
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
index 40f9093..b297192 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -212,14 +212,14 @@
unitId = people.getBelongUnit();
}
- List<Region> list = new LambdaQueryChainWrapper<>(regionMapper)
- .eq(Region::getRegionLevel, RegionLevelEnum.STREET)
- .like(Region::getFullName, keyword)
+ List<YwPoint> list = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(YwPoint::getUnitId, unitId)
+ .like(YwPoint::getPointName, keyword)
.list();
List<BaseSelect> data = list.stream().map(item -> {
BaseSelect baseSelect = new BaseSelect();
baseSelect.setId(item.getId());
- baseSelect.setValue(item.getFullName());
+ baseSelect.setValue(item.getPointName());
return baseSelect;
}).collect(Collectors.toList());
return Result.ok().data(data);
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
index 0e50ba3..8f9d143 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
@@ -158,4 +158,25 @@
.collect(Collectors.toList());
return Result.ok().data(vos);
}
+
+ @Override
+ public List<YwUnitVO> export(YwUnitQuery query) {
+ // 鍒嗛〉鏉′欢鏌ヨ浣�
+ IPage<YwUnit> page = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(StringUtils.hasText(query.getUnitCode()), YwUnit::getUnitCode, query.getUnitCode())
+ .like(StringUtils.hasText(query.getUnitName()), YwUnit::getUnitName, query.getUnitName())
+ .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()),
+ YwUnit::getCreateTime,
+ DateUtils.getDayStart(query.getStart()),
+ DateUtils.getDayEnd(query.getEnd()))
+ .orderByDesc(YwUnit::getCreateTime)
+ .page(PageUtil.getPage(query, YwUnit.class));
+
+ List<YwUnitVO> vos = page.getRecords().stream()
+ .map(
+ entity -> YwUnitVO.getVoByEntity(entity, null)
+ )
+ .collect(Collectors.toList());
+ return vos;
+ }
}
diff --git a/ycl-server/src/main/java/com/ycl/system/controller/SysDeptController.java b/ycl-server/src/main/java/com/ycl/system/controller/SysDeptController.java
index cf4ef4b..8771d99 100644
--- a/ycl-server/src/main/java/com/ycl/system/controller/SysDeptController.java
+++ b/ycl-server/src/main/java/com/ycl/system/controller/SysDeptController.java
@@ -128,4 +128,10 @@
public Result all() {
return deptService.all();
}
+
+ @GetMapping("/pullList")
+ @ApiOperation(value = "鍖哄煙涓嬫媺鍒楄〃", notes = "鍖哄煙涓嬫媺鍒楄〃")
+ public Result pullList() {
+ return deptService.pullList();
+ }
}
diff --git a/ycl-server/src/main/java/com/ycl/system/service/ISysDeptService.java b/ycl-server/src/main/java/com/ycl/system/service/ISysDeptService.java
index 93faea3..bc79014 100644
--- a/ycl-server/src/main/java/com/ycl/system/service/ISysDeptService.java
+++ b/ycl-server/src/main/java/com/ycl/system/service/ISysDeptService.java
@@ -128,4 +128,10 @@
* @return
*/
Result all();
+
+ /**
+ * 鍖哄煙鍒楄〃
+ * @return
+ */
+ Result pullList();
}
diff --git a/ycl-server/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java b/ycl-server/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java
index f7a6506..e513424 100644
--- a/ycl-server/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java
@@ -296,6 +296,10 @@
return deptMapper.deleteDeptById(deptId);
}
+ /**
+ * 閮ㄩ棬涓嬫媺鍒楄〃
+ * @return
+ */
@Override
public Result all() {
List<BaseSelect> vos = deptMapper.selectDeptList(new SysDept()).stream().map(sysDept -> {
@@ -307,6 +311,21 @@
).collect(Collectors.toList());
return Result.ok().data(vos);
}
+ /**
+ * 鍖哄煙涓嬫媺鍒楄〃
+ * @return
+ */
+ @Override
+ public Result pullList() {
+ List<BaseSelect> vos = deptMapper.selectDeptList(new SysDept()).stream().filter(sysDept -> sysDept.getArea()!=null).map(sysDept -> {
+ BaseSelect baseSelect = new BaseSelect();
+ baseSelect.setId(Integer.parseInt(sysDept.getDeptId() + ""));
+ baseSelect.setValue(sysDept.getArea());
+ return baseSelect;
+ }
+ ).collect(Collectors.toList());
+ return Result.ok().data(vos);
+ }
/**
* 閫掑綊鍒楄〃
diff --git a/ycl-server/src/main/resources/application-dev.yml b/ycl-server/src/main/resources/application-dev.yml
index bdaf83b..babd523 100644
--- a/ycl-server/src/main/resources/application-dev.yml
+++ b/ycl-server/src/main/resources/application-dev.yml
@@ -38,7 +38,7 @@
datasource:
url: jdbc:mysql://101.35.247.188:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
username: root
- password: 123456
+ password: ycl@202466
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/ycl-server/src/main/resources/application-prod.yml b/ycl-server/src/main/resources/application-prod.yml
index 7675437..b28e93a 100644
--- a/ycl-server/src/main/resources/application-prod.yml
+++ b/ycl-server/src/main/resources/application-prod.yml
@@ -38,7 +38,7 @@
datasource:
url: jdbc:mysql://101.35.247.188:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
username: root
- password: 123456
+ password: ycl@202466
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/ycl-server/src/main/resources/mapper/system/SysDeptMapper.xml b/ycl-server/src/main/resources/mapper/system/SysDeptMapper.xml
index 368609a..5c2f042 100644
--- a/ycl-server/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ycl-server/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -9,6 +9,7 @@
<result property="parentId" column="parent_id" />
<result property="ancestors" column="ancestors" />
<result property="deptName" column="dept_name" />
+ <result property="area" column="area" />
<result property="orderNum" column="order_num" />
<result property="leader" column="leader" />
<result property="phone" column="phone" />
@@ -23,7 +24,7 @@
</resultMap>
<sql id="selectDeptVo">
- select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time
+ select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time,d.area
from sys_dept d
</sql>
@@ -59,7 +60,7 @@
</select>
<select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
- select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
+ select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.area,
(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
from sys_dept d
where d.dept_id = #{deptId}
@@ -120,6 +121,7 @@
<set>
<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
<if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
+ <if test="area != null and area != ''">area = #{area},</if>
<if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
<if test="orderNum != null">order_num = #{orderNum},</if>
<if test="leader != null">leader = #{leader},</if>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CalculateRecordMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CalculateRecordMapper.xml
index 57b1fa4..da7e9ee 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CalculateRecordMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CalculateRecordMapper.xml
@@ -9,13 +9,13 @@
<result property="date" column="date" />
<result property="ruleId" column="rule_id" />
<result property="unitId" column="unit_id" />
- <result property="totalMount" column="totalMount" />
+ <result property="totalAmount" column="total_amount" />
<result property="deductAmount" column="deduct_amount" />
<result property="score" column="score" />
</resultMap>
<sql id="selectCalculateRecordVo">
- select id, date, rule_id, unit_id, totalMount, deduct_amount, score from t_calculate_record
+ select id, date, rule_id, unit_id, total_amount, deduct_amount, score from t_calculate_record
</sql>
<select id="selectCalculateRecordList" resultMap="CalculateRecordResult">
@@ -24,7 +24,7 @@
<if test="date != null "> and date = #{date}</if>
<if test="ruleId != null "> and rule_id = #{ruleId}</if>
<if test="unitId != null "> and unit_id = #{unitId}</if>
- <if test="totalMount != null "> and totalMount = #{totalMount}</if>
+ <if test="totalAmount != null "> and total_amount = #{totalAmount}</if>
<if test="deductAmount != null "> and deduct_amount = #{deductAmount}</if>
<if test="score != null "> and score = #{score}</if>
</where>
@@ -42,7 +42,7 @@
<if test="date != null">date,</if>
<if test="ruleId != null">rule_id,</if>
<if test="unitId != null">unit_id,</if>
- <if test="totalMount != null">totalMount,</if>
+ <if test="totalAmount != null">total_amount,</if>
<if test="deductAmount != null">deduct_amount,</if>
<if test="score != null">score,</if>
</trim>
@@ -51,7 +51,7 @@
<if test="date != null">#{date},</if>
<if test="ruleId != null">#{ruleId},</if>
<if test="unitId != null">#{unitId},</if>
- <if test="totalMount != null">#{totalMount},</if>
+ <if test="totalAmount != null">#{totalAmount},</if>
<if test="deductAmount != null">#{deductAmount},</if>
<if test="score != null">#{score},</if>
</trim>
@@ -63,7 +63,7 @@
<if test="date != null">date = #{date},</if>
<if test="ruleId != null">rule_id = #{ruleId},</if>
<if test="unitId != null">unit_id = #{unitId},</if>
- <if test="totalMount != null">totalMount = #{totalMount},</if>
+ <if test="totalAmount != null">total_amount = #{totalAmount},</if>
<if test="deductAmount != null">deduct_amount = #{deductAmount},</if>
<if test="score != null">score = #{score},</if>
</trim>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml
index b24f9a0..a940b37 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml
@@ -7,11 +7,10 @@
<resultMap type="com.ycl.platform.domain.entity.CheckRule" id="CheckRuleResult">
<result property="id" column="id" />
<result property="ruleName" column="rule_name" />
- <result property="ruleDetail" column="rule_detail" />
+ <result property="ruleIndex" column="rule_index" />
<result property="ruleCategory" column="rule_category" />
<result property="examineCategory" column="examine_category" />
<result property="ruleDescription" column="rule_description" />
- <result property="auditState" column="audit_state" />
<result property="state" column="state" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
@@ -19,24 +18,28 @@
</resultMap>
<sql id="selectCheckRuleVo">
- select id, rule_name, rule_detail, rule_category, examine_category, rule_description, audit_state, state, create_time, update_time, deleted from t_check_rule
+ select id, rule_name, rule_index, rule_category, examine_category, rule_description, state, create_time, update_time, deleted from t_check_rule
</sql>
- <select id="selectCheckRuleList" resultMap="CheckRuleResult">
- <include refid="selectCheckRuleVo"/>
- <where>
- <if test="ruleName != null and ruleName != ''"> and rule_name like concat('%', #{ruleName}, '%')</if>
- <if test="ruleCategory != null "> and rule_category = #{ruleCategory}</if>
- <if test="examineCategory != null "> and examine_category = #{examineCategory}</if>
- <if test="ruleDescription != null and ruleDescription != ''"> and rule_description = #{ruleDescription}</if>
- <if test="auditState != null "> and audit_state = #{auditState}</if>
- <if test="state != null "> and state = #{state}</if>
+ <select id="selectCheckRuleList" resultType="com.ycl.platform.domain.vo.CheckRuleVO">
+ select tcr.id, tcr.rule_name, tcr.rule_index, tcr.rule_category, tcr.examine_category, tcr.rule_description,
+ tctr.weight, tctr.audit_state,tctr.check_template_id as templateId,tct.template_name
+ from t_check_template_rule tctr inner join t_check_rule tcr on tcr.id = tctr.check_rule_id
+ inner join t_check_template tct on tctr.check_template_id = tct.id
+ <where>
+ state = 0
+ <if test="ruleName != null and ruleName != ''"> and tcr.rule_name like concat(#{ruleName}, '%')</if>
+ <if test="ruleCategory != null "> and tcr.rule_category = #{ruleCategory}</if>
+ <if test="examineCategory != null "> and tcr.examine_category = #{examineCategory}</if>
+ <if test="auditState != null "> and tctr.audit_state = #{auditState}</if>
+ <if test="templateId != null "> and tctr.check_template_id = #{templateId}</if>
</where>
</select>
- <select id="selectCheckRuleById" resultMap="CheckRuleResult">
- <include refid="selectCheckRuleVo"/>
- where id = #{id}
+ <select id="selectCheckRuleById" resultType="com.ycl.platform.domain.vo.CheckRuleVO">
+ select tcr.id, tcr.rule_name, tcr.rule_index, tcr.rule_category, tcr.examine_category, tcr.rule_description, tctr.weight, tctr.audit_state,tctr.check_template_id as templateId
+ from t_check_rule tcr inner join t_check_template_rule tctr on tcr.id = tctr.check_rule_id
+ where tcr.id = #{id} and tcr.state = 0
</select>
<insert id="insertCheckRule" useGeneratedKeys="true" keyProperty="id">
@@ -47,7 +50,6 @@
<if test="ruleCategory != null">rule_category,</if>
<if test="examineCategory != null">examine_category,</if>
<if test="ruleDescription != null">rule_description,</if>
- <if test="auditState != null">audit_state,</if>
<if test="state != null">state,</if>
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
@@ -55,11 +57,10 @@
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="ruleName != null and ruleName != ''">#{ruleName},</if>
- <if test="ruleDetail != null">#{ruleDetail},</if>
+ <if test="ruleIndex != null">#{ruleIndex},</if>
<if test="ruleCategory != null">#{ruleCategory},</if>
<if test="examineCategory != null">#{examineCategory},</if>
<if test="ruleDescription != null">#{ruleDescription},</if>
- <if test="auditState != null">#{auditState},</if>
<if test="state != null">#{state},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateTime != null">#{updateTime},</if>
@@ -71,11 +72,10 @@
update t_check_rule
<trim prefix="SET" suffixOverrides=",">
<if test="ruleName != null and ruleName != ''">rule_name = #{ruleName},</if>
- <if test="ruleDetail != null">rule_detail = #{ruleDetail},</if>
+ <if test="ruleIndex != null">rule_index = #{ruleIndex},</if>
<if test="ruleCategory != null">rule_category = #{ruleCategory},</if>
<if test="examineCategory != null">examine_category = #{examineCategory},</if>
<if test="ruleDescription != null">rule_description = #{ruleDescription},</if>
- <if test="auditState != null">audit_state = #{auditState},</if>
<if test="state != null">state = #{state},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckTemplateMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckTemplateMapper.xml
index c02a06e..d7db920 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckTemplateMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckTemplateMapper.xml
@@ -29,11 +29,8 @@
<include refid="selectCheckTemplateVo"/>
<where>
<if test="templateName != null and templateName != ''"> and template_name like concat('%', #{templateName}, '%')</if>
- <if test="adjustCoefficient != null "> and adjust_coefficient = #{adjustCoefficient}</if>
- <if test="adjustWay != null and adjustWay != ''"> and adjust_way = #{adjustWay}</if>
<if test="examineCategory != null "> and examine_category = #{examineCategory}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
- <if test="deptId != null and deptId != ''"> and dept_id = #{deptId}</if>
</where>
</select>
--
Gitblit v1.8.0