ganzi/ganzi-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

履职进度问题调整

Browse Source
This commit is contained in:
mythxb 2023-09-05 16:18:17 +08:00
parent d96077532f
commit e4af23ba15
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inventory-dao/src/main/resources/mapper/user/ListDetailMapper.xml
View File

@ -484,8 +484,10 @@
<!--履职详情-->
<select id="countListDetail" resultType="java.lang.Long">
SELECT COUNT(*) FROM list_relation lr
WHERE lr.`target_id` = #{listFactorId}
SELECT COUNT(lr.`relation_id`)
FROM list_relation lr
left join listdetail ld on lr.`detail_id` = ld.`ListDetailId`
WHERE lr.`target_id` = #{listFactorId} and ld.`del_state` = 1
</select>
<!--履职详情-->

3
inventory-dao/src/main/resources/mapper/user/ListFactorMapper.xml
View File

@ -502,9 +502,10 @@
<!--用户履职档案-->
<select id="userListFactor" resultMap="FactorResultMap">
SELECT lr.`create_time` changeTime,lr.relation_id, lf.*
SELECT ld.`CreatedOn` changeTime,ld.`ListDetailId` relation_id, lf.*
FROM ListFactor lf
LEFT JOIN list_relation lr ON lf.ListFactorId = lr.`target_id` AND lr.`target_type` = 1
LEFT JOIN listdetail ld ON lr.`detail_id` = ld.`ListDetailId` AND ld.`del_state` = 1
WHERE lf.`ListPerformId` = #{listPerformId}
and lf.SysYear = #{time}
and lf.del_state = 1

3
inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java
View File

@ -653,6 +653,9 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
MultiResult<ListDetailWithBLOBs> result = new MultiResult<>();
List<ListDetailWithBLOBs> listDetails = listDetailMapper.factorDetail(listFactorId,"");
if(listDetails.size() > 0){
for(ListDetailWithBLOBs listDetailWithBLOBs :listDetails ){
listDetailWithBLOBs.setWorktitle(listDetailWithBLOBs.getWorkcnt());
}
result.setData(listDetails);
}else{
result.setCode(Code.NO_DATA.getCode());