Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
09979b26
Commit
09979b26
authored
Aug 30, 2023
by
litengwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
省测卡片问题1,2
parent
f5169ca7
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
10 deletions
+29
-10
OrgUsrServiceImpl.java
...oot/module/common/biz/service/impl/OrgUsrServiceImpl.java
+7
-7
PlanTaskServiceImpl.java
...mos/patrol/business/service/impl/PlanTaskServiceImpl.java
+11
-0
dbTemplate_plan_task.xml
...rol/src/main/resources/db/mapper/dbTemplate_plan_task.xml
+11
-3
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
View file @
09979b26
...
...
@@ -571,13 +571,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
req
.
put
(
"company"
,
req
.
get
(
"company"
));
}
if
(
req
!=
null
&&
req
.
containsKey
(
"bizOrgCode"
)
&&
!
ObjectUtils
.
isEmpty
(
req
.
get
(
"bizOrgCode"
)))
{
LambdaQueryWrapper
<
OrgUsr
>
query
=
new
LambdaQueryWrapper
<>();
query
.
eq
(
OrgUsr:
:
getBizOrgCode
,
req
.
get
(
"bizOrgCode"
).
toString
());
OrgUsr
orgUsr
=
this
.
getOne
(
query
);
req
.
remove
(
"bizOrgCode"
);
map
.
put
(
"company"
,
orgUsr
.
getSequenceNbr
().
toString
());
}
//
if (req!=null&&req.containsKey("bizOrgCode") && !ObjectUtils.isEmpty(req.get("bizOrgCode"))) {
//
LambdaQueryWrapper<OrgUsr> query = new LambdaQueryWrapper<>();
//
query.eq(OrgUsr::getBizOrgCode, req.get("bizOrgCode").toString());
//
OrgUsr orgUsr = this.getOne(query);
//
req.remove("bizOrgCode");
//
map.put("company", orgUsr.getSequenceNbr().toString());
//
}
/* BUG2680 查询部门人员错误 传递参数类型不正确 修改为string 2021-09-14 陈召 开始 */
if
(!
req
.
isEmpty
()&&
req
.
containsKey
(
"parentId"
)
&&
req
.
get
(
"parentId"
)
!=
null
&&
req
.
get
(
"parentId"
)
!=
""
)
{
OrgUsr
parent
=
this
.
getById
(
req
.
get
(
"parentId"
).
toString
());
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java
View file @
09979b26
...
...
@@ -76,6 +76,7 @@ import java.io.FileInputStream;
import
java.io.IOException
;
import
java.io.UnsupportedEncodingException
;
import
java.text.DateFormat
;
import
java.text.DecimalFormat
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.time.LocalDateTime
;
...
...
@@ -2033,6 +2034,16 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
if
(
StringUtils
.
isEmpty
(
bizOrgCode
)
&&
StringUtil
.
isNotEmpty
(
companyCode
))
{
bizOrgCode
=
planTaskMapper
.
queryByCompanyCode
(
companyCode
);
}
DecimalFormat
df
=
new
DecimalFormat
(
"#.00"
);
List
<
Map
<
String
,
Object
>>
statics
=
planTaskMapper
.
getStatics
(
bizOrgCode
);
if
(
Integer
.
parseInt
(
statics
.
get
(
0
).
get
(
"xfxcjrljxcdw"
).
toString
())
==
0
)
{
statics
.
get
(
0
).
put
(
"xfxchgzb"
,
"0"
);
statics
.
get
(
0
).
put
(
"xfxclcl"
,
"0"
);
}
else
{
statics
.
get
(
0
).
put
(
"xfxchgzb"
,
df
.
format
(
Integer
.
parseInt
(
statics
.
get
(
0
).
get
(
"xfxcjrljxcdw"
).
toString
())
/
Integer
.
parseInt
(
statics
.
get
(
0
).
get
(
"xfxcjrljxcdw"
).
toString
())
));
statics
.
get
(
0
).
put
(
"xfxclcl"
,
df
.
format
(
Integer
.
parseInt
(
statics
.
get
(
0
).
get
(
"xfxcjrlcdw"
).
toString
())
/
Integer
.
parseInt
(
statics
.
get
(
0
).
get
(
"xfxcjrljxcdw"
).
toString
())
));
}
return
planTaskMapper
.
getStatics
(
bizOrgCode
);
}
...
...
amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_plan_task.xml
View file @
09979b26
...
...
@@ -1374,7 +1374,7 @@
UNION ALL
SELECT
'2' AS `key`,
ifnull( sum( ppk.`point_num` ), 0
) AS `value`,
count(1
) AS `value`,
'' AS unit,
'合格' AS `name`,
'xfxchg' AS code
...
...
@@ -1396,14 +1396,22 @@
UNION ALL
SELECT
'4' AS `key`,
''
AS `value`,
count(1)
AS `value`,
'' AS unit,
'不合格' AS `name`,
'xfxcbhg' AS code
FROM
`p_plan_task` ppk
LEFT JOIN p_plan_task_detail pptd ON pptd.task_no = ppk.id
WHERE
DATE_FORMAT( check_date, '%Y-%m-%d' ) = CURRENT_DATE () AND pptd.STATUS = 2
<if
test=
"bizOrgCode != null and bizOrgCode != ''"
>
AND org_code LIKE CONCAT(#{bizOrgCode}, '%')
</if>
UNION ALL
SELECT
'5' AS `key`,
ifnull( sum( `p_plan_task`.`point_num` ), 0
) AS `value`,
count(1
) AS `value`,
'' AS unit,
'今日漏查点位' AS `name`,
'xfxcjrlcdw' AS code
...
...
Write
Preview
Markdown
is supported
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