diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java index b30a6678..dff4b759 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java @@ -430,4 +430,9 @@ public class BasicBussinessTypeEntity { private int spaceOut; + /** + * 是否启用, 1:仅查看,2:增删改查 + */ + @TableField(value = "editType") + private Integer editType; } diff --git a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java index 8a1949ec..a6629869 100644 --- a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java @@ -294,7 +294,6 @@ public class BussinessTypeSaveRequest { private boolean fillCodeRel; - private Integer checkVailDate; private Integer checkExpire; private Integer checkCertExpire; @@ -304,4 +303,9 @@ public class BussinessTypeSaveRequest { private String checkPreInOrders; private Boolean advancePreIn; + + /** + * 是否启用, 1:仅查看,2:增删改查 + */ + private Integer editType; } diff --git a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java index badabe9b..588efdc4 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java @@ -115,4 +115,8 @@ public class FilterBussinessTypeRequest extends ListPageRequest { private Integer actionType; + /** + * 是否启用, 1:仅查看,2:增删改查 + */ + private Integer editType; } diff --git a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java index cbe4d9d5..1b5a10bb 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java @@ -165,4 +165,10 @@ public class BasicBussinessTypeResponse { * 是否核对单据验收补单 */ private boolean thrCheckReview; + + + /** + * 是否启用, 1:仅查看,2:增删改查 + */ + private Integer editType; } diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java index 0fc11ca7..df617aa0 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java @@ -13,6 +13,7 @@ import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.thrsys.ThrSystemService; +import com.glxp.api.util.IntUtil; import com.glxp.api.util.udi.FilterUdiUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -122,7 +123,7 @@ public class UdiRelevanceServiceImpl extends ServiceImpl diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml index 5a7fceca..b36fb3f5 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml @@ -227,6 +227,9 @@ AND auth_user_bustype.`userId` = #{userId} + + AND basic_bussiness_type.editType = #{editType} + group by basic_bussiness_type.action diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index e1e75cac..9e1f1112 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -360,7 +360,7 @@ AND `action` IN (SELECT `action` FROM basic_bussiness_type WHERE supplementOrderType IS NOT NULL - OR supplementOrderType + and supplementOrderType != '') diff --git a/src/main/resources/schemas/schema_v2.2.sql b/src/main/resources/schemas/schema_v2.2.sql index 1246b092..a635f1bb 100644 --- a/src/main/resources/schemas/schema_v2.2.sql +++ b/src/main/resources/schemas/schema_v2.2.sql @@ -153,3 +153,4 @@ INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2004, '任务管理', 1703, 5, 'taskManage', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', '2023-08-18 14:40:53', NULL, NULL, NULL); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'editType', 'tinyint', 1);