Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
86b9ae90
"vscode:/vscode.git/clone" did not exist on "954b380ad5ee37c2611040971ad5c70667944274"
Commit
86b9ae90
authored
Feb 26, 2019
by
qiankunpingtai
Browse files
仓库添加负责人字段
parent
c6056838
Changes
101
Hide whitespace changes
Inline
Side-by-side
src/main/java/com/jsh/erp/datasource/mappers/LogMapperEx.java
View file @
86b9ae90
...
@@ -20,7 +20,7 @@ public interface LogMapperEx {
...
@@ -20,7 +20,7 @@ public interface LogMapperEx {
@Param
(
"offset"
)
Integer
offset
,
@Param
(
"offset"
)
Integer
offset
,
@Param
(
"rows"
)
Integer
rows
);
@Param
(
"rows"
)
Integer
rows
);
int
countsByLog
(
Long
countsByLog
(
@Param
(
"operation"
)
String
operation
,
@Param
(
"operation"
)
String
operation
,
@Param
(
"usernameID"
)
Integer
usernameID
,
@Param
(
"usernameID"
)
Integer
usernameID
,
@Param
(
"clientIp"
)
String
clientIp
,
@Param
(
"clientIp"
)
String
clientIp
,
...
...
src/main/java/com/jsh/erp/datasource/mappers/MaterialCategoryMapperEx.java
View file @
86b9ae90
...
@@ -20,7 +20,7 @@ public interface MaterialCategoryMapperEx {
...
@@ -20,7 +20,7 @@ public interface MaterialCategoryMapperEx {
@Param
(
"offset"
)
Integer
offset
,
@Param
(
"offset"
)
Integer
offset
,
@Param
(
"rows"
)
Integer
rows
);
@Param
(
"rows"
)
Integer
rows
);
int
countsByMaterialCategory
(
Long
countsByMaterialCategory
(
@Param
(
"name"
)
String
name
,
@Param
(
"name"
)
String
name
,
@Param
(
"parentId"
)
Integer
parentId
);
@Param
(
"parentId"
)
Integer
parentId
);
...
...
src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java
View file @
86b9ae90
...
@@ -23,7 +23,7 @@ public interface MaterialMapperEx {
...
@@ -23,7 +23,7 @@ public interface MaterialMapperEx {
@Param
(
"offset"
)
Integer
offset
,
@Param
(
"offset"
)
Integer
offset
,
@Param
(
"rows"
)
Integer
rows
);
@Param
(
"rows"
)
Integer
rows
);
int
countsByMaterial
(
Long
countsByMaterial
(
@Param
(
"name"
)
String
name
,
@Param
(
"name"
)
String
name
,
@Param
(
"model"
)
String
model
,
@Param
(
"model"
)
String
model
,
@Param
(
"categoryId"
)
Long
categoryId
,
@Param
(
"categoryId"
)
Long
categoryId
,
...
...
src/main/java/com/jsh/erp/datasource/mappers/MaterialPropertyMapperEx.java
View file @
86b9ae90
...
@@ -13,5 +13,5 @@ public interface MaterialPropertyMapperEx {
...
@@ -13,5 +13,5 @@ public interface MaterialPropertyMapperEx {
@Param
(
"offset"
)
Integer
offset
,
@Param
(
"offset"
)
Integer
offset
,
@Param
(
"rows"
)
Integer
rows
);
@Param
(
"rows"
)
Integer
rows
);
int
countsByMaterialProperty
(
@Param
(
"name"
)
String
name
);
Long
countsByMaterialProperty
(
@Param
(
"name"
)
String
name
);
}
}
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/mappers/PersonMapperEx.java
View file @
86b9ae90
...
@@ -14,7 +14,7 @@ public interface PersonMapperEx {
...
@@ -14,7 +14,7 @@ public interface PersonMapperEx {
@Param
(
"offset"
)
Integer
offset
,
@Param
(
"offset"
)
Integer
offset
,
@Param
(
"rows"
)
Integer
rows
);
@Param
(
"rows"
)
Integer
rows
);
int
countsByPerson
(
Long
countsByPerson
(
@Param
(
"name"
)
String
name
,
@Param
(
"name"
)
String
name
,
@Param
(
"type"
)
String
type
);
@Param
(
"type"
)
String
type
);
}
}
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/mappers/RoleMapperEx.java
View file @
86b9ae90
...
@@ -13,6 +13,6 @@ public interface RoleMapperEx {
...
@@ -13,6 +13,6 @@ public interface RoleMapperEx {
@Param
(
"offset"
)
Integer
offset
,
@Param
(
"offset"
)
Integer
offset
,
@Param
(
"rows"
)
Integer
rows
);
@Param
(
"rows"
)
Integer
rows
);
int
countsByRole
(
Long
countsByRole
(
@Param
(
"name"
)
String
name
);
@Param
(
"name"
)
String
name
);
}
}
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java
View file @
86b9ae90
...
@@ -20,7 +20,7 @@ public interface SerialNumberMapperEx {
...
@@ -20,7 +20,7 @@ public interface SerialNumberMapperEx {
/**
/**
* 根据条件查询序列号数量
* 根据条件查询序列号数量
* */
* */
int
countSerialNumber
(
@Param
(
"serialNumber"
)
String
serialNumber
,
@Param
(
"materialName"
)
String
materialName
);
Long
countSerialNumber
(
@Param
(
"serialNumber"
)
String
serialNumber
,
@Param
(
"materialName"
)
String
materialName
);
/**
/**
* 通过id查询序列号复合信息
* 通过id查询序列号复合信息
* */
* */
...
...
src/main/java/com/jsh/erp/datasource/mappers/SupplierMapperEx.java
View file @
86b9ae90
...
@@ -17,7 +17,7 @@ public interface SupplierMapperEx {
...
@@ -17,7 +17,7 @@ public interface SupplierMapperEx {
@Param
(
"offset"
)
Integer
offset
,
@Param
(
"offset"
)
Integer
offset
,
@Param
(
"rows"
)
Integer
rows
);
@Param
(
"rows"
)
Integer
rows
);
int
countsBySupplier
(
Long
countsBySupplier
(
@Param
(
"supplier"
)
String
supplier
,
@Param
(
"supplier"
)
String
supplier
,
@Param
(
"type"
)
String
type
,
@Param
(
"type"
)
String
type
,
@Param
(
"phonenum"
)
String
phonenum
,
@Param
(
"phonenum"
)
String
phonenum
,
...
...
src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapperEx.java
View file @
86b9ae90
...
@@ -12,5 +12,5 @@ public interface SystemConfigMapperEx {
...
@@ -12,5 +12,5 @@ public interface SystemConfigMapperEx {
@Param
(
"offset"
)
Integer
offset
,
@Param
(
"offset"
)
Integer
offset
,
@Param
(
"rows"
)
Integer
rows
);
@Param
(
"rows"
)
Integer
rows
);
int
countsBySystemConfig
();
Long
countsBySystemConfig
();
}
}
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/mappers/UnitMapperEx.java
View file @
86b9ae90
...
@@ -13,6 +13,6 @@ public interface UnitMapperEx {
...
@@ -13,6 +13,6 @@ public interface UnitMapperEx {
@Param
(
"offset"
)
Integer
offset
,
@Param
(
"offset"
)
Integer
offset
,
@Param
(
"rows"
)
Integer
rows
);
@Param
(
"rows"
)
Integer
rows
);
int
countsByUnit
(
Long
countsByUnit
(
@Param
(
"name"
)
String
name
);
@Param
(
"name"
)
String
name
);
}
}
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java
View file @
86b9ae90
...
@@ -14,7 +14,7 @@ public interface UserMapperEx {
...
@@ -14,7 +14,7 @@ public interface UserMapperEx {
@Param
(
"offset"
)
Integer
offset
,
@Param
(
"offset"
)
Integer
offset
,
@Param
(
"rows"
)
Integer
rows
);
@Param
(
"rows"
)
Integer
rows
);
int
countsByUser
(
Long
countsByUser
(
@Param
(
"userName"
)
String
userName
,
@Param
(
"userName"
)
String
userName
,
@Param
(
"loginName"
)
String
loginName
);
@Param
(
"loginName"
)
String
loginName
);
}
}
\ No newline at end of file
src/main/java/com/jsh/erp/service/CommonQueryManager.java
View file @
86b9ae90
package
com.jsh.erp.service
;
package
com.jsh.erp.service
;
import
com.jsh.erp.constants.BusinessConstants
;
import
com.jsh.erp.datasource.entities.Log
;
import
com.jsh.erp.datasource.entities.Log
;
import
com.jsh.erp.datasource.entities.User
;
import
com.jsh.erp.datasource.entities.User
;
import
com.jsh.erp.datasource.mappers.LogMapper
;
import
com.jsh.erp.datasource.mappers.LogMapper
;
...
@@ -60,11 +61,11 @@ public class CommonQueryManager {
...
@@ -60,11 +61,11 @@ public class CommonQueryManager {
* @param parameterMap
* @param parameterMap
* @return
* @return
*/
*/
public
int
counts
(
String
apiName
,
Map
<
String
,
String
>
parameterMap
)
{
public
Long
counts
(
String
apiName
,
Map
<
String
,
String
>
parameterMap
)
{
if
(
StringUtil
.
isNotEmpty
(
apiName
))
{
if
(
StringUtil
.
isNotEmpty
(
apiName
))
{
return
container
.
getCommonQuery
(
apiName
).
counts
(
parameterMap
);
return
container
.
getCommonQuery
(
apiName
).
counts
(
parameterMap
);
}
}
return
0
;
return
BusinessConstants
.
DEFAULT_LIST_NULL_NUMBER
;
}
}
/**
/**
...
...
src/main/java/com/jsh/erp/service/ICommonQuery.java
View file @
86b9ae90
...
@@ -34,7 +34,7 @@ public interface ICommonQuery {
...
@@ -34,7 +34,7 @@ public interface ICommonQuery {
* @param parameterMap 查询参数
* @param parameterMap 查询参数
* @return 查询结果
* @return 查询结果
*/
*/
int
counts
(
Map
<
String
,
String
>
parameterMap
);
Long
counts
(
Map
<
String
,
String
>
parameterMap
);
/**
/**
* 新增数据
* 新增数据
...
...
src/main/java/com/jsh/erp/service/InterfaceContainer.java
View file @
86b9ae90
...
@@ -34,8 +34,9 @@ public class InterfaceContainer {
...
@@ -34,8 +34,9 @@ public class InterfaceContainer {
}
}
public
int
getResourceType
(
String
apiName
)
{
public
int
getResourceType
(
String
apiName
)
{
if
(!
nameTypeMap
.
containsKey
(
apiName
))
if
(!
nameTypeMap
.
containsKey
(
apiName
))
{
throw
new
RuntimeException
(
"资源:"
+
apiName
+
"的组件不存在"
);
throw
new
RuntimeException
(
"资源:"
+
apiName
+
"的组件不存在"
);
}
return
nameTypeMap
.
get
(
apiName
);
return
nameTypeMap
.
get
(
apiName
);
}
}
...
...
src/main/java/com/jsh/erp/service/account/AccountComponent.java
View file @
86b9ae90
...
@@ -40,7 +40,7 @@ public class AccountComponent implements ICommonQuery {
...
@@ -40,7 +40,7 @@ public class AccountComponent implements ICommonQuery {
}
}
@Override
@Override
public
int
counts
(
Map
<
String
,
String
>
map
)
{
public
Long
counts
(
Map
<
String
,
String
>
map
)
{
String
search
=
map
.
get
(
Constants
.
SEARCH
);
String
search
=
map
.
get
(
Constants
.
SEARCH
);
String
name
=
StringUtil
.
getInfo
(
search
,
"name"
);
String
name
=
StringUtil
.
getInfo
(
search
,
"name"
);
String
serialNo
=
StringUtil
.
getInfo
(
search
,
"serialNo"
);
String
serialNo
=
StringUtil
.
getInfo
(
search
,
"serialNo"
);
...
...
src/main/java/com/jsh/erp/service/account/AccountService.java
View file @
86b9ae90
...
@@ -70,7 +70,7 @@ public class AccountService {
...
@@ -70,7 +70,7 @@ public class AccountService {
return
resList
;
return
resList
;
}
}
public
int
countAccount
(
String
name
,
String
serialNo
,
String
remark
)
{
public
Long
countAccount
(
String
name
,
String
serialNo
,
String
remark
)
{
return
accountMapperEx
.
countsByAccount
(
name
,
serialNo
,
remark
);
return
accountMapperEx
.
countsByAccount
(
name
,
serialNo
,
remark
);
}
}
...
...
src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java
View file @
86b9ae90
...
@@ -39,7 +39,7 @@ public class AccountHeadComponent implements ICommonQuery {
...
@@ -39,7 +39,7 @@ public class AccountHeadComponent implements ICommonQuery {
}
}
@Override
@Override
public
int
counts
(
Map
<
String
,
String
>
map
)
{
public
Long
counts
(
Map
<
String
,
String
>
map
)
{
String
search
=
map
.
get
(
Constants
.
SEARCH
);
String
search
=
map
.
get
(
Constants
.
SEARCH
);
String
type
=
StringUtil
.
getInfo
(
search
,
"type"
);
String
type
=
StringUtil
.
getInfo
(
search
,
"type"
);
String
billNo
=
StringUtil
.
getInfo
(
search
,
"billNo"
);
String
billNo
=
StringUtil
.
getInfo
(
search
,
"billNo"
);
...
...
src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java
View file @
86b9ae90
...
@@ -55,7 +55,7 @@ public class AccountHeadService {
...
@@ -55,7 +55,7 @@ public class AccountHeadService {
return
resList
;
return
resList
;
}
}
public
int
countAccountHead
(
String
type
,
String
billNo
,
String
beginTime
,
String
endTime
)
{
public
Long
countAccountHead
(
String
type
,
String
billNo
,
String
beginTime
,
String
endTime
)
{
return
accountHeadMapperEx
.
countsByAccountHead
(
type
,
billNo
,
beginTime
,
endTime
);
return
accountHeadMapperEx
.
countsByAccountHead
(
type
,
billNo
,
beginTime
,
endTime
);
}
}
...
...
src/main/java/com/jsh/erp/service/accountItem/AccountItemComponent.java
View file @
86b9ae90
...
@@ -38,7 +38,7 @@ public class AccountItemComponent implements ICommonQuery {
...
@@ -38,7 +38,7 @@ public class AccountItemComponent implements ICommonQuery {
}
}
@Override
@Override
public
int
counts
(
Map
<
String
,
String
>
map
)
{
public
Long
counts
(
Map
<
String
,
String
>
map
)
{
String
search
=
map
.
get
(
Constants
.
SEARCH
);
String
search
=
map
.
get
(
Constants
.
SEARCH
);
String
name
=
StringUtil
.
getInfo
(
search
,
"name"
);
String
name
=
StringUtil
.
getInfo
(
search
,
"name"
);
Integer
type
=
StringUtil
.
parseInteger
(
StringUtil
.
getInfo
(
search
,
"type"
));
Integer
type
=
StringUtil
.
parseInteger
(
StringUtil
.
getInfo
(
search
,
"type"
));
...
...
src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java
View file @
86b9ae90
...
@@ -45,7 +45,7 @@ public class AccountItemService {
...
@@ -45,7 +45,7 @@ public class AccountItemService {
return
accountItemMapperEx
.
selectByConditionAccountItem
(
name
,
type
,
remark
,
offset
,
rows
);
return
accountItemMapperEx
.
selectByConditionAccountItem
(
name
,
type
,
remark
,
offset
,
rows
);
}
}
public
int
countAccountItem
(
String
name
,
Integer
type
,
String
remark
)
{
public
Long
countAccountItem
(
String
name
,
Integer
type
,
String
remark
)
{
return
accountItemMapperEx
.
countsByAccountItem
(
name
,
type
,
remark
);
return
accountItemMapperEx
.
countsByAccountItem
(
name
,
type
,
remark
);
}
}
...
...
Prev
1
2
3
4
5
6
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment