From 0552181155581ecd56242d8e4d3f90d420873a3f Mon Sep 17 00:00:00 2001
From: 354798ggg <1074825718@qq.com>
Date: 星期二, 17 十月 2023 16:46:51 +0800
Subject: [PATCH] 20231017优化——项目信息权限，出库权限
---
product-server-web/resources/license001.dat | 0
product-server-project-management/src/main/java/com/product/project/management/controller/ProjectInfoController.java | 28 ++++++++++++++
product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java | 22 +++++++++++
product-server-web/src/main/java/com/product/InitialLoad.java | 2
product-server-project-management/src/main/java/com/product/project/management/config/Cmnconst.java | 6 ++
pom.xml | 1
product-server-web/resources/LicenseKey.dat | 2
product-server-web/src/main/resources/application-dev.properties | 2
8 files changed, 59 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8e4d017..ef0222f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,7 @@
<module>product-server-project-base</module>
<module>product-server-project-management</module>
<module>product-server-project-contract</module>
+<module>product-server-common</module>
<module>product-server-data-export-import</module>
<module>product-server-web</module>
</modules>
diff --git a/product-server-project-management/src/main/java/com/product/project/management/config/Cmnconst.java b/product-server-project-management/src/main/java/com/product/project/management/config/Cmnconst.java
index f563d28..549e44c 100644
--- a/product-server-project-management/src/main/java/com/product/project/management/config/Cmnconst.java
+++ b/product-server-project-management/src/main/java/com/product/project/management/config/Cmnconst.java
@@ -26,6 +26,9 @@
public static final String ITEMIZE_PARENT_CODE="itemize_parent_code";
public static final String ITEMIZE_FULL_NAME="itemize_full_name";
public static final String BUDGET_CODE="budget_code";
+ public static final String CREATED_BY="created_by";
+ public static final String CREATED_UTC_DATETIME = "created_utc_datetime";
+ public static final String CREATED_UTC_DATETIME_DESC = "created_utc_datetime desc";
//鍙傛暟
@@ -33,5 +36,6 @@
public static final String PROJECT_UUID="project_uuid";
public static final String ITEMIZE_UUID="itemize_uuid";
public static final String UUID="uuid";
-
+ public static final String CPAGE = "cpage";
+ public static final String PAGESIZE = "pagesize";
}
diff --git a/product-server-project-management/src/main/java/com/product/project/management/controller/ProjectInfoController.java b/product-server-project-management/src/main/java/com/product/project/management/controller/ProjectInfoController.java
index 44067ac..9ddf56c 100644
--- a/product-server-project-management/src/main/java/com/product/project/management/controller/ProjectInfoController.java
+++ b/product-server-project-management/src/main/java/com/product/project/management/controller/ProjectInfoController.java
@@ -24,6 +24,34 @@
@Autowired
ProjectInfoService projectInfoService;
+
+ /**
+ * 鑾峰彇椤圭洰鍒楄〃锛堟牴鎹垱寤轰汉锛�
+ *
+ * @param request
+ * @return
+ */
+ @RequestMapping(value = "/list-project-by-created/{version}", method = RequestMethod.POST)
+ @ApiVersion(1)
+ public String listProjectByCreated(HttpServletRequest request) {
+ try {
+ // 鑾峰彇鍙傛暟
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+
+ //鍒ゆ柇鍒嗛〉鍙傛暟鏄惁涓虹┖
+ if (BaseUtil.strIsNull(fse.getString(CoreConst.CPAGE)) || BaseUtil.strIsNull(fse.getString(CoreConst.PAGESIZE))) {
+ return this.error(SystemCode.SYSTEM_CPAGES_NOT_NULL.getValue(), SystemCode.SYSTEM_CPAGES_NOT_NULL.getText());
+ }
+ return OK_List(projectInfoService.listProjectByCreated(fse.getInteger(Cmnconst.CPAGE), fse.getInteger(Cmnconst.PAGESIZE)));
+ } catch (BaseException e) {
+ e.printStackTrace();
+ return this.error(e);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return this.error(SystemCode.PROJECT_INFO_OPERATE_ERROR.getValue(),
+ SystemCode.PROJECT_INFO_OPERATE_ERROR.getText() + e.getMessage());
+ }
+ }
/**
* 鑾峰彇妯℃澘椤圭洰鍒嗛」
diff --git a/product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java b/product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java
index e4e30ef..e20c678 100644
--- a/product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java
+++ b/product-server-project-management/src/main/java/com/product/project/management/service/ProjectInfoService.java
@@ -11,7 +11,9 @@
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
import com.product.core.exception.BaseException;
+import com.product.core.permission.PermissionService;
import com.product.core.service.support.AbstractBaseService;
+import com.product.core.spring.context.SpringMVCContextHolder;
import com.product.project.management.config.Cmnconst;
import com.product.project.management.config.SystemCode;
import com.product.util.BaseUtil;
@@ -23,7 +25,27 @@
@Autowired
BaseDao baseDao;
+
+ @Autowired
+ PermissionService permissionService;
+
+ /**
+ * 椤圭洰淇℃伅鍒楄〃
+ * @param cpage
+ * @param pageSize
+ * @return
+ */
+ public DataTableEntity listProjectByCreated(Integer cpage, Integer pageSize) {
+ FieldSetEntity fseCurrentUser = SpringMVCContextHolder.getCurrentUser().getCurrentStaff();
+ String leaderCode = fseCurrentUser.getString("leader_tricode")+"%";
+
+ String filter =" project_leader in (select user_id from product_sys_staffs where leader_tricode like ?) OR materialman in (select user_id from product_sys_staffs where leader_tricode like ?)";
+ DataTableEntity dt = baseDao.listTable(Cmnconst.PRODUCT_PROJECT_QXLW, filter, new Object [] {leaderCode, leaderCode}, null, Cmnconst.CREATED_UTC_DATETIME_DESC, pageSize, cpage);
+ baseDao.loadPromptData(dt);
+ return dt;
+ }
+
/**
* 閫氳繃椤圭洰绫诲瀷鑾峰彇椤圭洰鍒嗛」锛堣幏鍙栨ā鏉垮垎椤癸級
*
diff --git a/product-server-web/resources/LicenseKey.dat b/product-server-web/resources/LicenseKey.dat
index e1ea825..eda5104 100644
--- a/product-server-web/resources/LicenseKey.dat
+++ b/product-server-web/resources/LicenseKey.dat
@@ -1 +1 @@
-0886D8419E36B4B1E123DFA6CD802D8422F48DF760C2A7669CA7B5251BF2FD2399B7B7732987428517509D61E571C7FBE4E2863C9D293E4687EF963B4EB9DAF4CA3ECF673EE824FA2288C196A487FBF1952ECD69AEC354D06DE599F4CF622C6FD660D86DDFA50A196A1E6B5FB8575D3F8F5FC717702F117FAF5E531B01677B035314C1A6E5105BBF154F3A875D6287AE41F34E60CFB398A0B9ADC3AA9980D17820BB011C9E1CA27060BED4400C79B0A77D1C30858815BE6224B3D2D8D320E5FF32A675BA7555015EE99FB9696BAF95C76E53919F7755D79E11E768AAA248227B58106E42CE1452A7A88FB919F818EABE97650A1E7397DE6BE820746F321422E6E31087A233AE09FA173B28A7672150C2246515B0B250C8552F913A1D04A9DC636B7E64775514359949689118E71B3B39ADA7B8522ED1B2F2F8B391388D772BF8D8E94F5BB611C1999435ABB8CF3DEBCAC5E38E9D8055F6EC159C4198CF20F1EE0F8A49BF5D3846AC54C412230F87EB0E715982038781C5E2DB2C066AEF902C93A2296A4D56B68C8A1D3C745AB2E49A604190136C18CCBF01C873D687888D6EB1CFA6244628D477060466AA314A8466894D1BC0B241B72FC059173EB93080BCE2A7F93E4BA48637BECD0C9CCC65EE537F944FE05A222021E2EAAB6171FC1111CB55EB2DA6ED2D889B2D0B2897FC3C61B6274BCD8B635EE9F56A4FD736F0244D14
\ No newline at end of file
+078533E09E529465E1C3A03FC1FBFA1322F3443A66C51BE799DFFBF51815188A91319035259717681EA3F038EFF0C7D1E2015DD796E878BE82B46F204EF6B7D4C8A06E5330E008F42824909AAD3E70729245035CA6C32D2765B862F2C38EF50ADC271250D81FAA906180EC3BB413EE0880ED1E397A644F57A7F8BAA909A3890C5A207EFCE12890081FFD8B335C1F432B4AA89CE8C4EF607BB72BEDC993F882802846C4429B8134DF66A6016A00AB68157AA02B6087B890C72C95AF35DF7176883BCBBD2174D9835CE3C1912E63C525CB6FA92E057F6249121C9D2FCFA8C6C95852E9A1A0C9CF653DAA34495BFD8B634D9AD866497A29094DE7C621B130ED11D0E2D9011131CD26441A23F2D86192EBFB21BF930BB1FFEE592229F078011249A760448ED958E735CD422837E6E6165BA2AB3B476C2C188163FDBE06638A5311C3D14C18ABB05A8B039D21C234C8F92149C7306CE5825875181B1E9C13CE02A8E20FB4958058209DFF5102F5F10129141E7C1810BC8A871E64DDD2C8D9E08C0DA0ABD01EFE5F07B3F41B513C0BB2B2515D4B4DC5471DFA0624CBB5E44884F02072CE8EA7842EA74F140BA6CFA24945B70F4D27F99F44609C045A9562313420759EA72CF9E1AA33B450C46573C66B299F8895155AFD2EA7458AEB274795F101EF7A552C2419E57725F021729EFDF0E82B3F2B8E5859625DBC5063F6CC14F037B91B
\ No newline at end of file
diff --git a/product-server-web/resources/license001.dat b/product-server-web/resources/license001.dat
index 8af9319..22a5457 100644
--- a/product-server-web/resources/license001.dat
+++ b/product-server-web/resources/license001.dat
Binary files differ
diff --git a/product-server-web/src/main/java/com/product/InitialLoad.java b/product-server-web/src/main/java/com/product/InitialLoad.java
index 6d028ad..461fe8c 100644
--- a/product-server-web/src/main/java/com/product/InitialLoad.java
+++ b/product-server-web/src/main/java/com/product/InitialLoad.java
@@ -24,7 +24,7 @@
*/
private static List<String> initMethods = Lists.newArrayList(
"sysJobService.init",
- "userOperService.initUserSignature"
+ "systemUserService.initUserSignature"
);
public static void runInitialization() {
diff --git a/product-server-web/src/main/resources/application-dev.properties b/product-server-web/src/main/resources/application-dev.properties
index 514e653..c7dac42 100644
--- a/product-server-web/src/main/resources/application-dev.properties
+++ b/product-server-web/src/main/resources/application-dev.properties
@@ -76,7 +76,7 @@
#################local###############################
#data.source.url=jdbc:mysql://222.209.31.38:3005/product_db_qxlw?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
-data.source.url=jdbc:mysql://192.168.0.200:3308/product_db_qxlw?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
+data.source.url=jdbc:mysql://192.168.0.200:3308/product_db_qxlw_formal?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
data.source.user=root
data.source.password=root123
#data.source.url=jdbc:mysql://127.0.0.1:3307/product_db_qxlw?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
--
Gitblit v1.9.2