chujinwang
/
chushangcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

This commit is contained in:
Chujinwang 2024-08-15 16:18:29 +08:00
parent 96b989d7b3
commit e77cd63ae0
10 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/Template.java
View File

@ -15,6 +15,8 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
import java.util.List;
/**
* @auther: zhao
@ -59,4 +61,8 @@ public class Template extends BaseEntity {
@Condition(name = "template_type")
@DictFormat(dictType = "template_type")
private String templateType;
@TableField(exist = false)
@Condition(name = "create_time", type = Condition.ConditionType.between)
private List<String> disposeTime;
}

3
chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProject.java
View File

@ -108,7 +108,7 @@ public class WrkProject extends BaseEntity {
@TableField(exist = false)
@Condition(name = "create_time", type = Condition.ConditionType.between)
@JsonFormat(pattern = DatePattern.NORM_DATETIME_PATTERN)
private List<LocalDateTime> createTimes;
private List<String> createTimes;
/**
* 项目对应的 合同集合
*/
@ -141,4 +141,5 @@ public class WrkProject extends BaseEntity {
private String contractUrl;
}

5
chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkAuditRuleQuery.java
View File

@ -39,4 +39,9 @@ public class WrkAuditRuleQuery extends CommonParam {
private String name;
@Condition(name = "create_time", type = Condition.ConditionType.between)
private List<String> createTime;
}

2
chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListDeptDTO.java
View File

@ -17,6 +17,6 @@ public class ListDeptDTO extends CommonParam {
private String deptName;
private Boolean status;
private Integer status;
}

2
chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListMenuDTO.java
View File

@ -17,7 +17,7 @@ public class ListMenuDTO extends CommonParam {
/**
* 状态
*/
private boolean status;
private Integer status;
/**
* 是否隐藏
*/

2
chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListRoleDTO.java
View File

@ -15,7 +15,7 @@ import java.util.Objects;
public class ListRoleDTO extends CommonParam {
private String roleName;
private String roleKey;
private Boolean status;
private Integer status;
private Params params;
@Data

2
chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java
View File

@ -43,7 +43,7 @@ public class RoleController {
public AjaxResult list(
@RequestParam(required = false) String roleName,
@RequestParam(required = false) String roleKey,
@RequestParam(required = false) Boolean status,
@RequestParam(required = false) Integer status,
@RequestParam(required = false) String beginTime,
@RequestParam(required = false) String endTime
) {

2
chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysDeptMapper.xml
View File

@ -31,7 +31,7 @@
<if test="deptName != null and deptName != ''">
AND d.dept_name like concat('%', #{deptName}, '%')
</if>
<if test="status != null and status != ''">
<if test="status != null ">
AND d.status = #{status}
</if>
<!-- 数据范围过滤 -->

4
chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysMenuMapper.xml
View File

@ -65,7 +65,7 @@
<if test="visible != null and visible != ''">
AND visible = #{visible}
</if>
<if test="status != null and status != ''">
<if test="status != null ">
AND status = #{status}
</if>
order by parent_id, order_num
@ -100,7 +100,7 @@
<if test="visible != null and visible != ''">
AND m.visible = #{visible}
</if>
<if test="status != null and status != ''">
<if test="status != null ">
AND m.status = #{status}
</if>
order by m.parent_id, m.order_num

2
chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysRoleMapper.xml
View File

@ -63,7 +63,7 @@
<if test="listRole.roleName != null and listRole.roleName != ''">
AND r.role_name like concat('%', #{listRole.roleName}, '%')
</if>
<if test="listRole.status != null">
<if test="listRole.status != null ">
AND r.status = #{listRole.status}
</if>
<if test="listRole.roleKey != null and listRole.roleKey != ''">