From fba2c448e9f3e7d24e95c1b4ffac77f9dfb391bd Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 03 三月 2023 16:56:57 +0800
Subject: [PATCH] 销售核价功能
---
src/main/java/com/zy/crm/manager/service/CstmrService.java | 2 +
src/main/java/com/zy/crm/common/web/BaseController.java | 37 ++++++++++++++++++
.gitignore | 1
src/main/java/com/zy/crm/system/entity/User.java | 9 ++++
src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java | 4 ++
src/main/resources/mapper/CstmrMapper.xml | 9 ++++
src/main/java/com/zy/crm/common/CodeBuilder.java | 6 +-
pom.xml | 17 ++++++++
src/main/webapp/static/js/cool.js | 5 ++
src/main/resources/application.yml | 11 ++++-
src/main/java/com/zy/crm/manager/mapper/CstmrMapper.java | 2 +
src/main/webapp/mould/甲方单位导入模板.xls | 0
12 files changed, 97 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index 549e00a..d06747f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@
### VS Code ###
.vscode/
+src/main/resources/application.yml
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 46cb5cf..f2de26d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,6 +112,23 @@
<artifactId>okhttp</artifactId>
<version>3.10.0</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <version>3.12</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>3.12</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml-schemas</artifactId>
+ <version>3.12</version>
+ </dependency>
</dependencies>
<build>
diff --git a/src/main/java/com/zy/crm/common/CodeBuilder.java b/src/main/java/com/zy/crm/common/CodeBuilder.java
index 663d6cd..3547cf4 100644
--- a/src/main/java/com/zy/crm/common/CodeBuilder.java
+++ b/src/main/java/com/zy/crm/common/CodeBuilder.java
@@ -17,13 +17,13 @@
// generator.password="xltys1995";
// generator.table="sys_host";
// sqlserver
- generator.url="47.97.1.152:51433;databasename=zy_crm";
+ generator.url="192.168.4.15:1433;databasename=zy_crm";
generator.username="sa";
- generator.password="Zoneyung@zy56$";
+ generator.password="sa@123";
// generator.url="localhost:1433;databasename=zy_crm";
// generator.username="sa";
// generator.password="sa@123";
- generator.table="man_plan_foll";
+ generator.table="man_pri_quote_budget";
generator.packagePath="com.zy.crm.manager";
generator.js = false;
generator.html = false;
diff --git a/src/main/java/com/zy/crm/common/web/BaseController.java b/src/main/java/com/zy/crm/common/web/BaseController.java
index eab395b..6216688 100644
--- a/src/main/java/com/zy/crm/common/web/BaseController.java
+++ b/src/main/java/com/zy/crm/common/web/BaseController.java
@@ -223,4 +223,41 @@
wrapper.like(columns.get(i), condition);
}
}
+
+ //鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛锛屽搴旀潈闄愪笅鎵�鏈夌敤鎴穒d銆傦紙鏅�氳亴鍛樿幏鍙栬嚜宸憋紝棰嗗鑾峰彇鑷繁鍙婁笅灞烇紝瓒呯骇绠＄悊鍛樺叏閮級
+ protected ArrayList<Long> getUserRoleBelongsToUserId() {
+ User user = getUser();
+ ArrayList<Long> userIds = new ArrayList<>();
+ if (user.getRoleCode().equals("boss")) {
+ //鍏ㄩ儴鏉冮檺
+ userIds = null;
+ } else if (user.getRoleCode().equals("manager")) {
+ //鑷繁鍙婁笅灞炴潈闄�
+ userIds.add(getUserId());
+ EntityWrapper<User> entityWrapper = new EntityWrapper<>();
+ entityWrapper.eq("dept_id", user.getDeptId());
+ List<User> userList = userService.selectList(entityWrapper);
+ for (User item : userList) {
+ userIds.add(item.getId());
+ }
+ }else{
+ //鑷繁鏉冮檺
+ userIds.add(getUserId());
+ }
+
+ return userIds;
+ }
+
+ protected ArrayList<Long> getUserRoleBelongsToUserId(String permission) {
+ User user = getUser();
+ if (user.getDeptName().equals("骞冲簱瑙勫垝缁�") || user.getDeptName().equals("鏍镐环缁�")) {
+ if (permission.equals("allopen")) {
+ //鏉冮檺鍏ㄩ儴寮�鏀�
+ return null;
+ }
+ }
+
+ //杩斿洖榛樿閫夋嫨鏂规
+ return getUserRoleBelongsToUserId();
+ }
}
diff --git a/src/main/java/com/zy/crm/manager/mapper/CstmrMapper.java b/src/main/java/com/zy/crm/manager/mapper/CstmrMapper.java
index dd3a2a1..c4d06c6 100644
--- a/src/main/java/com/zy/crm/manager/mapper/CstmrMapper.java
+++ b/src/main/java/com/zy/crm/manager/mapper/CstmrMapper.java
@@ -21,4 +21,6 @@
int updateDeptIdByUserId(@Param("userId")Long userId, @Param("deptId")Long deptId);
+ Cstmr selectByName(@Param("hostId") Long hostId, @Param("name") String name);
+
}
diff --git a/src/main/java/com/zy/crm/manager/service/CstmrService.java b/src/main/java/com/zy/crm/manager/service/CstmrService.java
index 9b799f5..af5e51d 100644
--- a/src/main/java/com/zy/crm/manager/service/CstmrService.java
+++ b/src/main/java/com/zy/crm/manager/service/CstmrService.java
@@ -14,4 +14,6 @@
int updateDeptIdByUserId(Long userId, Long deptId);
+ Cstmr selectByName(Long hostId, String name);
+
}
diff --git a/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java
index 2655f82..5f3ee66 100644
--- a/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java
+++ b/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java
@@ -63,4 +63,8 @@
}
}
+ @Override
+ public Cstmr selectByName(Long hostId, String name) {
+ return this.baseMapper.selectByName(hostId, name);
+ }
}
diff --git a/src/main/java/com/zy/crm/system/entity/User.java b/src/main/java/com/zy/crm/system/entity/User.java
index 8924465..9ddf617 100644
--- a/src/main/java/com/zy/crm/system/entity/User.java
+++ b/src/main/java/com/zy/crm/system/entity/User.java
@@ -217,6 +217,15 @@
return null;
}
+ public String getRoleCode(){
+ RoleService service = SpringUtils.getBean(RoleService.class);
+ Role role = service.selectById(this.roleId);
+ if (!Cools.isEmpty(role)){
+ return role.getCode();
+ }
+ return null;
+ }
+
public void setRoleId(Long roleId) {
this.roleId = roleId;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 212dcdc..0f1ccc1 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -3,15 +3,22 @@
servlet:
context-path:
# context-path: /@pom.build.finalName@
+ compression:
+ enabled: true
+ min-response-size: 1024
+ mime-types: text/plain
+ tomcat:
+ max-connections: 30000
+ connection-timeout: 100000
spring:
application:
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://47.97.1.152:51433;databasename=zy_crm
+ url: jdbc:sqlserver://192.168.4.15:1433;databasename=zy_crm
username: sa
- password: Zoneyung@zy56$
+ password: sa@123
# url: jdbc:sqlserver://localhost:1433;databasename=zy_crm
# username: sa
# password: sa@123
diff --git a/src/main/resources/mapper/CstmrMapper.xml b/src/main/resources/mapper/CstmrMapper.xml
index 72b1611..a886742 100644
--- a/src/main/resources/mapper/CstmrMapper.xml
+++ b/src/main/resources/mapper/CstmrMapper.xml
@@ -113,4 +113,13 @@
update man_cstmr set dept_id = #{deptId} where user_id = #{userId}
</update>
+ <select id="selectByName" resultMap="BaseResultMap">
+ select * from man_cstmr
+ where 1=1
+ and name = #{name}
+ <if test="hostId != null">
+ and host_id = #{hostId}
+ </if>
+ </select>
+
</mapper>
diff --git "a/src/main/webapp/mould/\347\224\262\346\226\271\345\215\225\344\275\215\345\257\274\345\205\245\346\250\241\346\235\277.xls" "b/src/main/webapp/mould/\347\224\262\346\226\271\345\215\225\344\275\215\345\257\274\345\205\245\346\250\241\346\235\277.xls"
index 59cad66..65011fa 100644
--- "a/src/main/webapp/mould/\347\224\262\346\226\271\345\215\225\344\275\215\345\257\274\345\205\245\346\250\241\346\235\277.xls"
+++ "b/src/main/webapp/mould/\347\224\262\346\226\271\345\215\225\344\275\215\345\257\274\345\205\245\346\250\241\346\235\277.xls"
Binary files differ
diff --git a/src/main/webapp/static/js/cool.js b/src/main/webapp/static/js/cool.js
index 03ebe7a..8ccfcad 100644
--- a/src/main/webapp/static/js/cool.js
+++ b/src/main/webapp/static/js/cool.js
@@ -64,7 +64,7 @@
/**
* 鎼滅储鑷姩琛ュ叏 -- select
*/
-function confirmed(val){
+function confirmed(val,action= null){
var inputDom = $("input[data-key="+val.substring(0,val.length - 6)+"]");
var selectDom = $("select[data-key="+val+"]");
@@ -87,6 +87,9 @@
} else {
cacd.val(selectOptionDom.html());
realDom.val(selectOptionDom.attr("title"));
+ if (action) {
+ action(selectOptionDom.attr("title"));
+ }
}
inputDom.val("");
}
--
Gitblit v1.9.1