Commit 310c302f authored by huyuchen's avatar huyuchen

档案完整监控

parent a6d4a43d
...@@ -36,6 +36,9 @@ public class TCompleteMonitor extends BaseEntity { ...@@ -36,6 +36,9 @@ public class TCompleteMonitor extends BaseEntity {
@Schema(description = "项目名称") @Schema(description = "项目名称")
private String deptName; private String deptName;
@Schema(description = "项目id")
private String deptId;
@Schema(description = "项目编码") @Schema(description = "项目编码")
private String deptNo; private String deptNo;
......
...@@ -7,8 +7,11 @@ import com.yifu.cloud.plus.v1.yifu.archives.service.TCompleteMonitorService; ...@@ -7,8 +7,11 @@ import com.yifu.cloud.plus.v1.yifu.archives.service.TCompleteMonitorService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TCompleteMonitorInfoVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TCompleteMonitorInfoVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TCompleteMonitorSearchVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TCompleteMonitorSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog; import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner; import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
...@@ -31,7 +34,9 @@ import javax.servlet.http.HttpServletResponse; ...@@ -31,7 +34,9 @@ import javax.servlet.http.HttpServletResponse;
public class TCompleteMonitorController { public class TCompleteMonitorController {
private final TCompleteMonitorService tCompleteMonitorService; private final TCompleteMonitorService tCompleteMonitorService;
private final MenuUtil menuUtil;
/** /**
* 简单分页查询 * 简单分页查询
* @param page 分页对象 * @param page 分页对象
...@@ -41,6 +46,8 @@ public class TCompleteMonitorController { ...@@ -41,6 +46,8 @@ public class TCompleteMonitorController {
@Operation(description = "简单分页查询") @Operation(description = "简单分页查询")
@GetMapping("/page") @GetMapping("/page")
public R<IPage<TCompleteMonitor>> getTCompleteMonitorPage(Page<TCompleteMonitor> page, TCompleteMonitor tCompleteMonitor) { public R<IPage<TCompleteMonitor>> getTCompleteMonitorPage(Page<TCompleteMonitor> page, TCompleteMonitor tCompleteMonitor) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tCompleteMonitor);
return new R<>(tCompleteMonitorService.getTCompleteMonitorPage(page,tCompleteMonitor)); return new R<>(tCompleteMonitorService.getTCompleteMonitorPage(page,tCompleteMonitor));
} }
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<result property="unitNo" column="UNIT_NO"/> <result property="unitNo" column="UNIT_NO"/>
<result property="deptName" column="DEPT_NAME"/> <result property="deptName" column="DEPT_NAME"/>
<result property="deptNo" column="DEPT_NO"/> <result property="deptNo" column="DEPT_NO"/>
<result property="deptId" column="DEPT_ID"/>
<result property="businessPrimaryType" column="BUSINESS_PRIMARY_TYPE"/> <result property="businessPrimaryType" column="BUSINESS_PRIMARY_TYPE"/>
<result property="businessSecondType" column="BUSINESS_SECOND_TYPE"/> <result property="businessSecondType" column="BUSINESS_SECOND_TYPE"/>
<result property="businessThirdType" column="BUSINESS_THIRD_TYPE"/> <result property="businessThirdType" column="BUSINESS_THIRD_TYPE"/>
...@@ -45,6 +46,7 @@ ...@@ -45,6 +46,7 @@
a.UNIT_NO, a.UNIT_NO,
a.DEPT_NAME, a.DEPT_NAME,
a.DEPT_NO, a.DEPT_NO,
a.DEPT_ID,
a.BUSINESS_PRIMARY_TYPE, a.BUSINESS_PRIMARY_TYPE,
a.BUSINESS_SECOND_TYPE, a.BUSINESS_SECOND_TYPE,
a.BUSINESS_THIRD_TYPE, a.BUSINESS_THIRD_TYPE,
...@@ -83,6 +85,9 @@ ...@@ -83,6 +85,9 @@
<if test="tCompleteMonitor.afterIsComplete != null and tCompleteMonitor.afterIsComplete.trim() != ''"> <if test="tCompleteMonitor.afterIsComplete != null and tCompleteMonitor.afterIsComplete.trim() != ''">
AND a.AFTER_IS_COMPLETE = #{tCompleteMonitor.afterIsComplete} AND a.AFTER_IS_COMPLETE = #{tCompleteMonitor.afterIsComplete}
</if> </if>
<if test="tCompleteMonitor.authSql != null and tCompleteMonitor.authSql.trim() != ''">
${tCompleteMonitor.authSql}
</if>
</if> </if>
</sql> </sql>
<!--tCompleteMonitor简单分页查询--> <!--tCompleteMonitor简单分页查询-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment