admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

进度修改

Browse Source
This commit is contained in:
guoshengxiong 2024-07-03 16:54:37 +08:00
parent 8c4e820c73
commit 1b4f5ab9e0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressContentController.java
View File

@ -61,6 +61,7 @@ public class XzTaskProgressContentController {
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "isAudit", value = "1已审核，0待审核", paramType = "query", required = false, dataType = "Integer"),
@ApiImplicitParam(name = "date", value = "日期：yyyy-MM-dd", paramType = "query", required = false, dataType = "Integer"),
@ApiImplicitParam(name = "isApprovalList", value = "1是审批列表", paramType = "query", required = false, dataType = "Integer"),
})
@GetMapping(value = "/page")
public Result<IPage<XzTaskProgressContent>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
@ -76,6 +77,7 @@ public class XzTaskProgressContentController {
@ApiOperation(value = "列表查询进度审批", notes = "列表查询进度审批", httpMethod = "GET")
@ApiImplicitParams({
@ApiImplicitParam(name = "taskProgressId", value = "任务进度甘特图id", paramType = "query", required = true, dataType = "String"),
@ApiImplicitParam(name = "isApprovalList", value = "1是审批列表", paramType = "query", required = false, dataType = "Integer"),
})
@GetMapping(value = "/list")
public Result<List<XzTaskProgressContent>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {

4
src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressContentMapper.xml
View File

@ -7,12 +7,12 @@
join xz_task_progress xtp on c.task_progress_id = xtp.id
join quality_region qr on xtp.quality_region_id = qr.id
left join enterprise_info ei on ei.id=c.enterprise_id
<if test="param.accountType == '6'.toString()">
<if test="param.isApprovalList == '1'.toString() and param.accountType == '6'.toString()">
join quality_region_to_enterprise qrte on qrte.quality_region_id = qr.id
join worker_info wi on wi.enterprise_id= qrte.enterprise_id
join system_user su on su.worker_id = wi.id
join base_role_user bru on bru.user_id = su.user_id
join base_role br on br.role_name = '监理' and su.user_id = #{param.userId}
join base_role br on bru.role_id=br.role_id and br.role_name = '监理' and su.user_id = #{param.userId}
</if>
${ew.customSqlSegment}
</select>