From 6365ab0a976afdd247742c9b3dca15deb3a7a7a1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 17 八月 2023 17:21:40 +0800
Subject: [PATCH] 初始化1.0.1
---
/dev/null | 26 --------------------------
1 files changed, 0 insertions(+), 26 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/business/dto/AutoWorkReportDTO.java b/server/src/main/java/doumeemes/dao/business/dto/AutoWorkReportDTO.java
deleted file mode 100644
index f77d297..0000000
--- a/server/src/main/java/doumeemes/dao/business/dto/AutoWorkReportDTO.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package doumeemes.dao.business.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import doumeemes.core.annotation.excel.ExcelColumn;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * Created by IntelliJ IDEA.
- *
- * @Author : Rk
- * @create 2023/8/14 18:35
- */
-@Data
-public class AutoWorkReportDTO {
-
-
- @ApiModelProperty(value = "宸ュ簭璁″垝涓婚敭")
- private Integer plansId;
-
- @ApiModelProperty(value = "璁惧涓婚敭", example = "1")
- private Integer proGroupId;
-
- @ApiModelProperty(value = "鐢熶骇浜哄憳缂栫爜闆嗗悎" )
- @TableField(exist = false)
- private List<Integer> proUserList;
-
- @ApiModelProperty(value = "鎶曟枡璁板綍")
- private List<MaterialListDTO> recordList ;
-
- @ApiModelProperty(value = "浜у嚭璁板綍")
- private CreateWorkorderRecordDTO createWorkorderRecordDTO;
-
-}
diff --git a/server/src/main/java/doumeemes/dao/business/dto/CreateWorkorderRecordDTO.java b/server/src/main/java/doumeemes/dao/business/dto/CreateWorkorderRecordDTO.java
deleted file mode 100644
index dfb0a01..0000000
--- a/server/src/main/java/doumeemes/dao/business/dto/CreateWorkorderRecordDTO.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package doumeemes.dao.business.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author 姹熻箘韫�
- * @date 2022/05/12 10:18
- */
-@Data
-public class CreateWorkorderRecordDTO {
-
-
- @ApiModelProperty(value = "宸ュ崟涓婚敭")
- private Integer workorderId;
-
- @ApiModelProperty(value = "鍚堟牸鏁伴噺")
- private BigDecimal qualifiedNum;
-
- @ApiModelProperty(value = "涓嶅悎鏍兼暟閲�")
- private BigDecimal unQualifiedNum;
-
- @ApiModelProperty(value = "鎶ュ伐鏃堕暱锛堢锛�" )
- private Integer duration;
-
-
-}
diff --git a/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java b/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java
deleted file mode 100644
index e3d3525..0000000
--- a/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package doumeemes.dao.business.vo;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import doumeemes.core.annotation.excel.ExcelColumn;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import javax.validation.constraints.NotEmpty;
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@ApiModel("")
-public class SalaryParamVO {
-
- @ApiModelProperty(value = "涓婚敭")
- private Integer id;
-
- @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
- private String createUserName;
-
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
- private Date createTime;
-
- @ApiModelProperty(value = "涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�")
- @ExcelColumn(name="涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�")
- private Integer rootDepartId;
-
- @ApiModelProperty(value = "宸ュ巶缂栫爜锛堝叧鑱攄epartment琛級")
- @ExcelColumn(name="宸ュ巶缂栫爜锛堝叧鑱攄epartment琛級")
- @NotEmpty(message = "宸ュ巶缂栫爜涓嶈兘涓虹┖")
- private Integer departId;
-
- @ApiModelProperty(value = "宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
- @ExcelColumn(name="宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
- @NotEmpty(message = "宸ュ簭缂栫爜涓嶈兘涓虹┖")
- private Integer procedureId;
-
- @ApiModelProperty(value = "宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
- @ExcelColumn(name="宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
- @NotEmpty(message = "宸ュ簭缂栫爜涓嶈兘涓虹┖")
- private Integer procedureCode;
-
- @ApiModelProperty(value = "宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
- @ExcelColumn(name="宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
- private String procedureName;
-
- @ApiModelProperty(value = "浜у搧鍚嶇О" )
- @Excel(name="浜у搧鍚嶇О",orderNum ="3")
- private String materialName;
-
- @ApiModelProperty(value = "浜у搧缂栫爜" )
- @Excel(name="浜у搧缂栫爜",orderNum ="4")
- private String materialCode;
-
- @ApiModelProperty(value = "鐗╂枡缂栫爜锛堝叧鑱攎aterial_distribute琛級", example = "1")
- private Integer materialId;
-
- @ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝厓)")
- @ExcelColumn(name="宸ヨ祫鍗曚环锛堝厓)")
- private BigDecimal salary;
-
- @ApiModelProperty(value = "鏍囧噯鏁伴噺")
- @ExcelColumn(name="鏍囧噯鏁伴噺")
- private Integer num;
-
- @ApiModelProperty(value = "鏍囧噯鏃堕暱锛堢锛�")
- @ExcelColumn(name="鏍囧噯鏃堕暱锛堢锛�")
- private String times;
-
- @ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�")
- @ExcelColumn(name="涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�")
- private Integer unqualified;
-
- @ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂")
- @ExcelColumn(name="璁′环鏂瑰紡 0璁′欢 1璁℃椂")
- private Integer type;
-}
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/QuerySalaryStatisticDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/QuerySalaryStatisticDTO.java
deleted file mode 100644
index 63e0adb..0000000
--- a/server/src/main/java/doumeemes/dao/ext/dto/QuerySalaryStatisticDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package doumeemes.dao.ext.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import doumeemes.dao.business.dto.MaterialListDTO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author 姹熻箘韫�
- * @date 2022/04/20 10:56
- */
-@Data
-@ApiModel("宸ヨ祫鎶ヨ〃缁熻鍒嗛〉鏌ヨ璇锋眰鍙傛暟")
-public class QuerySalaryStatisticDTO {
- @ApiModelProperty(value = "鐢熶骇浜哄憳缂栫爜", example = "1")
- private Integer userId;
- @ApiModelProperty(value = "鏍圭粍缁囩紪鐮�", example = "1",hidden = true)
- private Integer rootDepartId;
- @ApiModelProperty(value = "寮�濮嬫椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date startDate;
- @ApiModelProperty(value = "缁撴潫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date endDate;
-
- @ApiModelProperty(value = "鏁版嵁鏉冮檺閮ㄩ棬缂栫爜闆嗗悎" ,hidden = true)
- private List<Integer> departIds;
-
-}
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/QueryUserSalaryListDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/QueryUserSalaryListDTO.java
deleted file mode 100644
index 049cf7d..0000000
--- a/server/src/main/java/doumeemes/dao/ext/dto/QueryUserSalaryListDTO.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package doumeemes.dao.ext.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import doumeemes.core.annotation.excel.ExcelColumn;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author 姹熻箘韫�
- * @date 2022/04/20 10:56
- */
-@Data
-@ApiModel("鍛樺伐缁╂晥鍒嗛〉鏌ヨ璇锋眰鍙傛暟")
-public class QueryUserSalaryListDTO {
- @ApiModelProperty(value = "鐢熶骇浜哄憳缂栫爜", example = "1")
- private Integer userId;
- @ApiModelProperty(value = "宸ュ簭缂栫爜", example = "1")
- private Integer procedureId;
- @ApiModelProperty(value = "鐗╂枡缂栫爜", example = "1")
- private Integer materialId;
- @ApiModelProperty(value = "鐗╂枡鍚嶇О鎴栫墿鏂檆ode缂栫爜" )
- private String materialName;
- @ApiModelProperty(value = "鏍圭粍缁囩紪鐮�", example = "1",hidden = true)
- private Integer rootDepartId;
- @ApiModelProperty(value = "寮�濮嬫椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date startDate;
- @ApiModelProperty(value = "缁撴潫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date endDate;
- @ApiModelProperty(value = "鏁版嵁鏉冮檺閮ㄩ棬缂栫爜闆嗗悎" ,hidden = true)
- private List<Integer> departIds;
-
-}
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/SalaryParamDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/SalaryParamDTO.java
deleted file mode 100644
index 7d9ba3e..0000000
--- a/server/src/main/java/doumeemes/dao/ext/dto/SalaryParamDTO.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package doumeemes.dao.ext.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author 姹熻箘韫�
- * @date 2022/04/20 10:56
- */
-@Data
-@ApiModel("缁╂晥宸ヨ祫閰嶇疆")
-public class SalaryParamDTO {
-
- @ApiModelProperty(value = "鐗╂枡鍚嶇О鎴栫紪鐮�")
- private String keyWord;
-
- @ApiModelProperty(value = "宸ュ簭鍚嶇О")
- private String procedureName;
-
- @ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂")
- private Integer type;
-
-}
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/SalaryParamImportDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/SalaryParamImportDTO.java
deleted file mode 100644
index 851d29e..0000000
--- a/server/src/main/java/doumeemes/dao/ext/dto/SalaryParamImportDTO.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package doumeemes.dao.ext.dto;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import cn.afterturn.easypoi.excel.annotation.ExcelTarget;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author 姹熻箘韫�
- * @date 2022/04/20 10:56
- */
-@Data
-@ApiModel("缁╂晥宸ヨ祫閰嶇疆瀵煎叆")
-@ExcelTarget("SalaryParamImportDTO")
-public class SalaryParamImportDTO {
-
- @Excel(name="璁′环鏂瑰紡",orderNum ="1")
- private String type;
-
- @Excel(name="宸ュ巶鍚嶇О",orderNum ="2")
- private String departName;
-
- @Excel(name="鐗╂枡鍚嶇О",orderNum ="3")
- private String materialName;
-
- @Excel(name="鐗╂枡缂栫爜",orderNum ="4")
- private String materialCode;
-
- @Excel(name="宸ュ簭鍚嶇О",orderNum ="5")
- private String procedureName;
-
- @Excel(name="宸ヨ祫鍗曚环(鍏�)",orderNum ="6")
- private BigDecimal salary;
-
- @Excel(name="鏍囧噯浜у嚭",orderNum ="7")
- private String num;
-
- @Excel(name="鏍囧噯宸ユ椂",orderNum ="8")
- private String timesName;
-
- @Excel(name="涓嶈壇鏄惁璁″叆",orderNum ="9")
- private String unqualified;
-}
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/WxLoginDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/WxLoginDTO.java
deleted file mode 100644
index 940e2d8..0000000
--- a/server/src/main/java/doumeemes/dao/ext/dto/WxLoginDTO.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package doumeemes.dao.ext.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-
-/**
- * Created by IntelliJ IDEA.
- *
- * @Author : Rk
- * @create 2023/8/11 10:10
- */
-@Data
-public class WxLoginDTO {
-
- @ApiModelProperty(value = "浼佷笟缂栫爜")
- private Integer companyId;
-
- @NotBlank(message = "鐢ㄦ埛鍚嶄笉鑳戒负绌�")
- @ApiModelProperty(value = "鐢ㄦ埛鍚�")
- private String username;
-
- @NotBlank(message = "瀵嗙爜涓嶈兘涓虹┖")
- @ApiModelProperty(value = "瀵嗙爜")
- private String password;
-
- @ApiModelProperty(value = "寰俊 openid")
- private String openid;
-
- @ApiModelProperty(value = "寰俊 unionid")
- private String unionid;
-
-}
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/SalaryStatisticsListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/SalaryStatisticsListVO.java
deleted file mode 100644
index 792ddfb..0000000
--- a/server/src/main/java/doumeemes/dao/ext/vo/SalaryStatisticsListVO.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package doumeemes.dao.ext.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import doumeemes.core.annotation.excel.ExcelColumn;
-import doumeemes.dao.business.model.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author 姹熻箘韫�
- * @date 2022/04/20 10:56
- */
-@Data
-@ApiModel("宸ヨ祫鎶ヨ〃缁熻鍒嗛〉鏁版嵁")
-public class SalaryStatisticsListVO implements Serializable{
- @ApiModelProperty(value = "鐢熶骇浜哄憳缂栫爜", example = "1")
- @ExcelColumn(name="鐢熶骇浜哄憳缂栫爜")
- private Integer userId;
- @ApiModelProperty(value = "鐢熸垚浜哄憳淇℃伅")
- private UserBaseInfoVO userInfo;
-
- @ApiModelProperty(value = "鐢熶骇浜哄憳濮撳悕",hidden = true)
- @ExcelColumn(name="鐢熶骇浜哄憳濮撳悕")
- private String userName;
- @ApiModelProperty(value = "鎵�灞為儴闂ㄧ紪鐮�", example = "1",hidden = true)
- @ExcelColumn(name="鎵�灞為儴闂ㄧ紪鐮�")
- private Integer departId;
-
- @ApiModelProperty(value = "鎵�灞為儴闂ㄥ悕绉�",hidden = true)
- @ExcelColumn(name="鎵�灞為儴闂ㄥ悕绉�")
- private String departName;
- @ApiModelProperty(value = "璁′欢宸ヨ祫锛堝垎锛�", example = "1")
- @ExcelColumn(name="璁′欢宸ヨ祫锛堝垎锛�")
- private BigDecimal jijianSalary;
- @ApiModelProperty(value = "璁℃椂宸ヨ祫锛堝垎锛�", example = "1")
- @ExcelColumn(name="璁℃椂宸ヨ祫锛堝垎锛�")
- private BigDecimal jishiSalary;
- @ApiModelProperty(value = "灏忚宸ヨ祫锛堝垎锛�", example = "1")
- @ExcelColumn(name="灏忚宸ヨ祫锛堝垎锛�")
- private BigDecimal totalSalary;
- @ApiModelProperty(value = "鎶ュ伐鎬诲崟鏁�,涓嶅寘鍚伐璧勪负0鐨�", example = "1")
- @ExcelColumn(name="鎶ュ伐鎬诲崟鏁�")
- private Integer num;
-
-}
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/UserBaseInfoVO.java b/server/src/main/java/doumeemes/dao/ext/vo/UserBaseInfoVO.java
deleted file mode 100644
index c65802b..0000000
--- a/server/src/main/java/doumeemes/dao/ext/vo/UserBaseInfoVO.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package doumeemes.dao.ext.vo;
-
-import doumeemes.core.annotation.excel.ExcelColumn;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * @author 姹熻箘韫�
- * @date 2022/04/20 10:56
- */
-@Data
-@ApiModel("鐢ㄦ埛鍩烘湰淇℃伅鏁版嵁")
-public class UserBaseInfoVO implements Serializable{
-
- @ApiModelProperty(value = "鐢熶骇浜哄憳缂栫爜", example = "1")
- @ExcelColumn(name="鐢熶骇浜哄憳缂栫爜")
- private Integer userId;
- @ApiModelProperty(value = "鐢熶骇浜哄憳濮撳悕鍜岄儴闂ㄥ悕绉扮粍鍚�")
- @ExcelColumn(name="鐢熶骇浜哄憳濮撳悕鍜岄儴闂ㄥ悕绉扮粍鍚�")
- private String nameAndDepart;
- @ApiModelProperty(value = "鐢熶骇浜哄憳濮撳悕")
- @ExcelColumn(name="鐢熶骇浜哄憳濮撳悕")
- private String userName;
- @ApiModelProperty(value = "鎵�灞為儴闂ㄧ紪鐮�", example = "1")
- @ExcelColumn(name="鎵�灞為儴闂ㄧ紪鐮�")
- private Integer departId;
-
- @ApiModelProperty(value = "鎵�灞為儴闂ㄥ悕绉�")
- @ExcelColumn(name="鎵�灞為儴闂ㄥ悕绉�")
- private String departName;
-
-}
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java
deleted file mode 100644
index 5ca376d..0000000
--- a/server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package doumeemes.dao.ext.vo;
-
-import doumeemes.core.annotation.excel.ExcelColumn;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * @author 姹熻箘韫�
- * @date 2022/04/20 10:56
- */
-@Data
-@ApiModel("鍛樺伐缁╂晥鍒嗛〉鏁版嵁")
-public class UserSalaryListVO implements Serializable{
-
- @ApiModelProperty(value = "鐢熶骇浜哄憳缂栫爜", example = "1")
- @ExcelColumn(name="鐢熶骇浜哄憳缂栫爜")
- private Integer userId;
- @ApiModelProperty(value = "鐢熸垚浜哄憳淇℃伅")
- private UserBaseInfoVO userInfo;
-
- @ApiModelProperty(value = "鐢熶骇浜哄憳濮撳悕",hidden = true)
- @ExcelColumn(name="鐢熶骇浜哄憳濮撳悕")
- private String userName;
- @ApiModelProperty(value = "鎵�灞為儴闂ㄧ紪鐮�", example = "1",hidden = true)
- @ExcelColumn(name="鎵�灞為儴闂ㄧ紪鐮�")
- private Integer departId;
-
- @ApiModelProperty(value = "鎵�灞為儴闂ㄥ悕绉�",hidden = true)
- @ExcelColumn(name="鎵�灞為儴闂ㄥ悕绉�")
- private String departName;
- @ApiModelProperty(value = "鐗╂枡缂栫爜", example = "1")
- @ExcelColumn(name="鐗╂枡缂栫爜")
- private String materialCode;
- @ApiModelProperty(value = "鐗╂枡鍚嶇О", example = "1")
- @ExcelColumn(name="鐗╂枡鍚嶇О")
- private String materialName;
- @ApiModelProperty(value = "鐗╂枡涓婚敭", example = "1")
- @ExcelColumn(name="鐗╂枡涓婚敭")
- private Integer materialId;
- @ApiModelProperty(value = "宸ュ崟缂栫爜", example = "1")
- @ExcelColumn(name="宸ュ崟缂栫爜")
- private String workorderCode;
- @ApiModelProperty(value = "宸ュ崟鏂欎富閿�", example = "1")
- @ExcelColumn(name="宸ュ崟涓婚敭")
- private Integer workorderId;
- @ApiModelProperty(value = "宸ュ簭涓婚敭", example = "1")
- @ExcelColumn(name="宸ュ簭涓婚敭")
- private Integer procedureId;
- @ApiModelProperty(value = "宸ュ簭鍚嶇О")
- @ExcelColumn(name="宸ュ簭鍚嶇О")
- private String procedureName;
- @ApiModelProperty(value = "鍗曚綅")
- @ExcelColumn(name="鍗曚綅")
- private String unitName;
- @ApiModelProperty(value = "鎶ュ伐鏁�")
- @ExcelColumn(name="鎶ュ伐鏁�")
- private BigDecimal num;
- @ApiModelProperty(value = "鑹搧鏁�")
- @ExcelColumn(name="鑹搧鏁�")
- private BigDecimal qualifiedNum;
- @ApiModelProperty(value = "涓嶈壇鍝佹暟")
- @ExcelColumn(name="涓嶈壇鍝佹暟")
- private BigDecimal unQualifiedNum;
- @ApiModelProperty(value = "鍚堟牸鐜囷紙%锛�")
- @ExcelColumn(name="鍚堟牸鐜�(%)")
- private BigDecimal rate;
-
-}
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/WxLoginVO.java b/server/src/main/java/doumeemes/dao/ext/vo/WxLoginVO.java
deleted file mode 100644
index 7ca12c9..0000000
--- a/server/src/main/java/doumeemes/dao/ext/vo/WxLoginVO.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package doumeemes.dao.ext.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * Created by IntelliJ IDEA.
- *
- * @Author : Rk
- * @create 2023/8/11 11:22
- */
-@Data
-public class WxLoginVO {
-
-
- @ApiModelProperty(value = "鐧诲綍鐘舵�侊細0=寰俊鐧诲綍鎴愬姛锛�1=寰俊鐧诲綍澶辫触")
- private Integer loginStatus;
-
- @ApiModelProperty(value = "寰俊 openid")
- private String openid ;
-
- @ApiModelProperty(value = "寰俊 unionid")
- private String unionid ;
-
- @ApiModelProperty(value = "session")
- private String session ;
-}
diff --git a/server/src/main/java/doumeemes/service/system/WxLoginService.java b/server/src/main/java/doumeemes/service/system/WxLoginService.java
deleted file mode 100644
index 5e92627..0000000
--- a/server/src/main/java/doumeemes/service/system/WxLoginService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package doumeemes.service.system;
-
-import doumeemes.dao.ext.dto.WxLoginDTO;
-import doumeemes.dao.ext.vo.WxLoginVO;
-import doumeemes.dao.system.dto.LoginDTO;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * Created by IntelliJ IDEA.
- *
- * @Author : Rk
- * @create 2023/8/11 10:13
- */
-public interface WxLoginService {
-
- WxLoginVO wxLogin(String code, HttpServletRequest request);
-
-
- String wxLoginByPassword (WxLoginDTO dto, HttpServletRequest request);
-}
diff --git a/server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java b/server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java
deleted file mode 100644
index c910f17..0000000
--- a/server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java
+++ /dev/null
@@ -1,218 +0,0 @@
-package doumeemes.service.system.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import doumeemes.biz.system.SystemDictDataBiz;
-import doumeemes.config.shiro.ShiroToken;
-import doumeemes.core.constants.ResponseStatus;
-import doumeemes.core.exception.BusinessException;
-import doumeemes.core.model.LoginUserInfo;
-import doumeemes.core.utils.Constants;
-import doumeemes.core.utils.HttpsUtil;
-import doumeemes.core.utils.Utils;
-import doumeemes.dao.business.model.CompanyUser;
-import doumeemes.dao.business.model.Department;
-import doumeemes.dao.ext.CompanyExtMapper;
-import doumeemes.dao.ext.CompanyUserExtMapper;
-import doumeemes.dao.ext.DepartmentExtMapper;
-import doumeemes.dao.ext.dto.QueryCompanyUserExtDTO;
-import doumeemes.dao.ext.dto.WxLoginDTO;
-import doumeemes.dao.ext.vo.CompanyUserExtListVO;
-import doumeemes.dao.ext.vo.WxLoginVO;
-import doumeemes.dao.system.SystemUserMapper;
-import doumeemes.dao.system.dto.LoginDTO;
-import doumeemes.dao.system.model.SystemLoginLog;
-import doumeemes.dao.system.model.SystemUser;
-import doumeemes.service.common.CaptchaService;
-import doumeemes.service.ext.CompanyExtService;
-import doumeemes.service.ext.CompanyUserExtService;
-import doumeemes.service.system.SystemLoginLogService;
-import doumeemes.service.system.WxLoginService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.subject.Subject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-import java.util.Objects;
-
-/**
- * Created by IntelliJ IDEA.
- *
- * @Author : Rk
- * @create 2023/8/11 10:14
- */
-@Slf4j
-@Service
-public class WxLoginServiceImpl implements WxLoginService {
-
- @Autowired
- private SystemDictDataBiz systemDictDataBiz;
-
-
- @Value("${project.version}")
- private String systemVersion;
-
- @Autowired
- private CompanyUserExtMapper companyUserExtMapper;
- @Autowired
- private SystemUserMapper systemUserMapper;
- @Autowired
- private DepartmentExtMapper departmentExtMapper;
-
- @Autowired
- private SystemLoginLogService systemLoginLogService;
-
-
- /**
- * 寰俊鍏紬鍙疯幏鍙朤OKEN鍦板潃
- */
- public static final String GET_ACCESS_TOKEN_URL = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=APPID&secret=SECRET&code=CODE&grant_type=authorization_code";
-
- /**
- * 寰俊鍏紬鍙疯幏鍙朥SERINFO淇℃伅鍦板潃
- */
- public static final String GET_USER_INFO_URL = "https://api.weixin.qq.com/sns/userinfo?access_token=ACCESS_TOKEN&openid=OPENID&lang=zh_CN";
-
-
- @Override
- public WxLoginVO wxLogin(String code, HttpServletRequest request) {
- WxLoginVO wxLoginVO = new WxLoginVO();
- String appId = systemDictDataBiz.queryByCode(Constants.WX_CONFIG,Constants.APPID).getCode();
- String appSecret = systemDictDataBiz.queryByCode(Constants.WX_CONFIG,Constants.APPSECRET).getCode();
- String getTokenUrl = GET_ACCESS_TOKEN_URL.replace("CODE", code).replace("APPID", appId).replace("SECRET", appSecret);
- JSONObject tokenJson = JSONObject.parseObject(HttpsUtil.get(getTokenUrl,true));
- if(Objects.isNull(tokenJson.get("access_token"))){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),tokenJson.getString("errmsg"));
- }
- String accessToken = tokenJson.getString("access_token");
- String openId = tokenJson.getString("openid");
- String getUserInfoUrl = GET_USER_INFO_URL.replace("ACCESS_TOKEN", accessToken).replace("OPENID", openId);
- JSONObject userInfoJson = JSONObject.parseObject(HttpsUtil.get(getUserInfoUrl,true));
- wxLoginVO.setOpenid(openId);
- wxLoginVO.setUnionid(userInfoJson.getString("unionid"));
- CompanyUser companyUser = companyUserExtMapper.selectOne(new QueryWrapper<CompanyUser>().eq("openid",openId).last(" limit 1 "));
- if(Objects.isNull(companyUser)){
- wxLoginVO.setLoginStatus(Constants.ONE);
- return wxLoginVO;
- }
- Department department = departmentExtMapper.selectById(companyUser.getRootDepartId());
- if(Objects.isNull(department)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌缁戝畾閮ㄩ棬淇℃伅");
- }
- SystemUser systemUser = systemUserMapper.selectById(companyUser.getUserId());
- //鏌ヨ鐢ㄦ埛鏁版嵁
- LoginDTO dto = new LoginDTO();
- dto.setCompanyId(department.getCompanyId());
- dto.setUsername(systemUser.getUsername());
- SystemLoginLog loginLog = new SystemLoginLog();
- loginLog.setLoginUsername(dto.getUsername());
- loginLog.setLoginTime(new Date());
- loginLog.setSystemVersion(systemVersion);
- loginLog.setIp(Utils.User_Client.getIP(request));
- loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
- loginLog.setPlatform(Utils.User_Client.getPlatform(request));
- loginLog.setClientInfo(Utils.User_Client.getBrowser(request));
- loginLog.setOsInfo(Utils.User_Client.getOS(request));
- loginLog.setServerIp(Utils.Server.getIP());
- // 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
- Subject subject = SecurityUtils.getSubject();
- ShiroToken token = new ShiroToken(dto.getCompanyId(),dto.getUsername(), null,false,true);
- try {
- subject.login(token);
- LoginUserInfo loginUser = ((LoginUserInfo)subject.getPrincipal());
- loginLog.setUserId(loginUser.getId());
- loginLog.setCompanyId(loginUser.getCompany()!=null?loginUser.getCompany().getId():null);
- loginLog.setCompanyUserId(loginUser.getCompanyUser()!=null?loginUser.getCompanyUser().getId():null);
- loginLog.setSuccess(Boolean.TRUE);
- systemLoginLogService.create(loginLog);
- String session = (String)subject.getSession().getId();
- wxLoginVO.setLoginStatus(Constants.ZERO);
- wxLoginVO.setSession(session);
- return wxLoginVO;
- }catch (BusinessException e) {
- wxLoginVO.setLoginStatus(Constants.ONE);
- return wxLoginVO;
- }catch (AuthenticationException e) {
- BusinessException ee = null;
- loginLog.setSuccess(Boolean.FALSE);
- if(e.getCause()!=null && e.getCause() instanceof BusinessException){
- ee = (BusinessException)e.getCause();
- loginLog.setReason(ee.getMessage().length() > 200 ? (ee.getMessage().substring(0, 190) + "...") : ee.getMessage());
- log.error(ee.getMessage(), e);
- }else{
- log.error(ResponseStatus.ACCOUNT_INCORRECT.getMessage(), e);
- loginLog.setReason(e.getMessage().length() > 200 ? (e.getMessage().substring(0, 190) + "...") : e.getMessage());
- ee = new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
- }
- systemLoginLogService.create(loginLog);
- throw ee;
- }
- }
-
-
-
- @Override
- public String wxLoginByPassword(WxLoginDTO dto, HttpServletRequest request) {
- SystemLoginLog loginLog = new SystemLoginLog();
- loginLog.setLoginUsername(dto.getUsername());
- loginLog.setLoginTime(new Date());
- loginLog.setSystemVersion(systemVersion);
- loginLog.setIp(Utils.User_Client.getIP(request));
- loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
- loginLog.setPlatform(Utils.User_Client.getPlatform(request));
- loginLog.setClientInfo(Utils.User_Client.getBrowser(request));
- loginLog.setOsInfo(Utils.User_Client.getOS(request));
- loginLog.setServerIp(Utils.Server.getIP());
- // 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
- Subject subject = SecurityUtils.getSubject();
- ShiroToken token = new ShiroToken(dto.getCompanyId(),dto.getUsername(), dto.getPassword(),false,false);
- try {
- subject.login(token);
- LoginUserInfo loginUser = ((LoginUserInfo)subject.getPrincipal());
- loginLog.setUserId(loginUser.getId());
- loginLog.setCompanyId(loginUser.getCompany()!=null?loginUser.getCompany().getId():null);
- loginLog.setCompanyUserId(loginUser.getCompanyUser()!=null?loginUser.getCompanyUser().getId():null);
- loginLog.setSuccess(Boolean.TRUE);
- systemLoginLogService.create(loginLog);
- //鐧诲綍鎼哄甫寰俊openid淇℃伅
- if(StringUtils.isNotBlank(dto.getOpenid())){
- CompanyUser companyUser = companyUserExtMapper.selectById(loginLog.getCompanyUserId());
- if(StringUtils.isBlank(companyUser.getOpenid())||!companyUser.getOpenid().equals(dto.getOpenid())){
- //1銆佺粦瀹氬井淇penid鍒癱ompanyUser琛ㄤ俊鎭�
- companyUser.setOpenid(dto.getOpenid());
- companyUser.setUnionid(dto.getUnionid());
- companyUserExtMapper.updateById(companyUser);
- //2銆佹竻绌哄悓鐢ㄦ埛鍏朵綑companyUser琛╫penid涓� unionid
- companyUserExtMapper.update(null,new UpdateWrapper<CompanyUser>()
- .ne("ID",companyUser.getId()).set("UNIONID","").set("OPENID","")
- .eq("USER_ID",companyUser.getUserId())
- );
- }
- }
- return (String)subject.getSession().getId();
- }catch (AuthenticationException e) {
- BusinessException ee = null;
- loginLog.setSuccess(Boolean.FALSE);
- if(e.getCause()!=null && e.getCause() instanceof BusinessException){
- ee = (BusinessException)e.getCause();
- loginLog.setReason(ee.getMessage().length() > 200 ? (ee.getMessage().substring(0, 190) + "...") : ee.getMessage());
- log.error(ee.getMessage(), e);
- }else{
- log.error(ResponseStatus.ACCOUNT_INCORRECT.getMessage(), e);
- loginLog.setReason(e.getMessage().length() > 200 ? (e.getMessage().substring(0, 190) + "...") : e.getMessage());
- ee = new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
- }
- systemLoginLogService.create(loginLog);
- throw ee;
- }
- }
-
-}
diff --git a/server/src/main/resources/mappers/SalaryParamMapper.xml b/server/src/main/resources/mappers/SalaryParamMapper.xml
deleted file mode 100644
index e97d95f..0000000
--- a/server/src/main/resources/mappers/SalaryParamMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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="doumeemes.dao.business.SalaryParamMapper">
-
-
- <select id="selectPage" resultType="doumeemes.dao.business.vo.SalaryParamVO">
- SELECT
- sp.*,
- m.`NAME` as materialName,
- m.`CODE` as materialCode,
- p.`NAME` as procedureName,
- su.REALNAME as createUserName
- from
- salary_param sp
- LEFT JOIN procedures p on p.ID = sp.PROCEDURE_ID
- LEFT JOIN material m on m.ID = sp.MATERIAL_ID
- LEFT JOIN `system_user` su on su.ID = sp.CREATE_USER
- where
- sp.DELETED = 0
- <if test="model.keyWord != null and model.keyWord != ''">
- and ( p`NAME` like concat('%',#{model.keyWord},'%')
- or p.`CODE` = #{model.keyWord})</if>
- <if test="model.procedureName != null and model.procedureName != ''"> and p.`NAME` like concat('%',#{model.procedureName},'%')</if>
- <if test="model.type != null"> and sp.`TYPE` = #{model.type}</if>
- </select>
-</mapper>
--
Gitblit v1.9.3