Merge remote-tracking branch 'origin/V0.0.1' into V0.0.1

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppRule.java

@@ -46,7 +46,7 @@ public class AppRule extends BaseEntity {
 
     @ApiModelProperty(value = "0:禁用 1:启用")
     @TableField("status")
-    private Integer status;
+    private String status;
 
     @ApiModelProperty(value = "备注")
     @TableField("remark")

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/appRule/AppRuleEditDto.java

@@ -31,9 +31,9 @@ public class AppRuleEditDto {
     @NotNull(message = "受检机构类型不能为空")
     private String orgType;
 
-    @ApiModelProperty(value = "0:禁用 1:启用")
+    @ApiModelProperty(value = "状态")
     @NotBlank(message = "状态不能为空")
-    private int status;
+    private String status;
 
     @ApiModelProperty(value = "备注")
     private String remark;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/appRule/AppRulePageDto.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.xunmei.common.core.web.domain.PageDto;
 import com.xunmei.core.resumption.vo.appRule.AppRulePageVo;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
+@Data
 public class AppRulePageDto extends PageDto<AppRulePageVo> {
     @ApiModelProperty(value = "履职内容库名称")
     private String name;
@@ -15,7 +17,8 @@ public class AppRulePageDto extends PageDto<AppRulePageVo> {
     @ApiModelProperty(value = "履职机构类型")
     private String orgType;
 
-    @TableField(exist = false)
+    private Long orgId;
+
     @ApiModelProperty(value = "是否下穿查询")
     private Boolean checkSub = false;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -455,12 +455,12 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         QueryWrapper<AppRule> qw = new QueryWrapper<>();
 
         if (info.getOrgType() != null) {
-            qw.lambda().eq(AppRule::getOrgType, info.getOrgType()).eq(AppRule::getStatus, 0);
+            qw.lambda().eq(AppRule::getOrgType, info.getOrgType()).eq(AppRule::getStatus, "0");
         }
 
         if (info.getOrgId() != null) {
             SysOrg org = orgService.selectSysOrgById(info.getOrgId(), SecurityConstants.INNER);
-            qw.lambda().eq(AppRule::getOrgType, org.getType()).eq(AppRule::getStatus, 0);
+            qw.lambda().eq(AppRule::getOrgType, org.getType()).eq(AppRule::getStatus, "0");
         }
 
         List<AppRule> appRules = appRuleMapper.selectList(qw);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppRuleServiceImpl.java

@@ -108,7 +108,7 @@ public class AppRuleServiceImpl extends ServiceImpl<AppRuleMapper, AppRule> impl
         List<AppRule> rules = appRuleMapper.selectList(new LambdaQueryWrapper<AppRule>()
                 .in(AppRule::getOrgId, upOrgIds)
                 .eq(AppRule::getOrgType, dto.getOrgType())
-                .eq(AppRule::getStatus, 0)
+                .eq(AppRule::getStatus, "0")
                 .select(AppRule::getId, AppRule::getName)
         );
         List<IdNameVo> list = rules.stream().map(r -> {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/appRule/AppRuleInfoVo.java

@@ -31,7 +31,7 @@ public class AppRuleInfoVo {
     private String orgType;
 
     @ApiModelProperty("状态")
-    private Integer status;
+    private String status;
 
     @ApiModelProperty("备注")
     private String remark;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/appRule/AppRulePageVo.java

@@ -30,8 +30,8 @@ public class AppRulePageVo {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
-    @ApiModelProperty(value = "0:禁用 1:启用")
-    private Integer status;
+    @ApiModelProperty(value = "状态")
+    private String status;
 
     @ApiModelProperty(value = "备注")
     private String remark;

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/AppRuleMapper.xml

@@ -36,7 +36,7 @@
                r.org_type as orgTypeId
         from core_resumption_rule r
                  inner join sys_dict_data d on r.type = d.id and d.dict_code = 'sys_org_type'
-        where status = 0
+        where status = "0"
     </select>
 
     <!--    <select id="get" resultType="com.xunmei.core.resumption.vo.appRule.AppRuleInfoVo">-->