add 标准右侧抽屉
This commit is contained in:
+14
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.jero.common.api.vo.Result;
|
import com.jero.common.api.vo.Result;
|
||||||
import com.jero.common.aspect.annotation.AutoLog;
|
import com.jero.common.aspect.annotation.AutoLog;
|
||||||
|
import com.jero.common.exception.JeroBootException;
|
||||||
|
import com.jero.modules.laws.common.constant.ResultCommon;
|
||||||
import com.jero.modules.laws.common.service.ILawsCommonService;
|
import com.jero.modules.laws.common.service.ILawsCommonService;
|
||||||
import com.jero.modules.laws.common.vo.ManyStandardSelectionBox;
|
import com.jero.modules.laws.common.vo.ManyStandardSelectionBox;
|
||||||
import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO;
|
import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO;
|
||||||
@@ -12,6 +14,7 @@ import com.jero.modules.laws.standard.entity.LawsUpdateRecord;
|
|||||||
import com.jero.modules.laws.standard.service.ILawsUpdateRecordService;
|
import com.jero.modules.laws.standard.service.ILawsUpdateRecordService;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
@@ -44,6 +47,17 @@ public class LawsCommonController {
|
|||||||
return Result.OK(lawsCommonService.getManyStandardSelectionBox(selectionBoxVO, pageNo, pageSize));
|
return Result.OK(lawsCommonService.getManyStandardSelectionBox(selectionBoxVO, pageNo, pageSize));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ApiOperation(value="标准右侧抽屉", notes="标准右侧抽屉")
|
||||||
|
@GetMapping(value = "/getStandardRightBox")
|
||||||
|
public Result<IPage<ManyStandardSelectionBox>> getStandardRightBox(ManyStandardSelectionBoxVO selectionBoxVO,
|
||||||
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||||
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
|
||||||
|
if (StringUtils.isBlank(selectionBoxVO.getNodeCode())) {
|
||||||
|
throw new JeroBootException(ResultCommon.EMPTY_COMMON, "nodeCode");
|
||||||
|
}
|
||||||
|
return Result.OK(lawsCommonService.getManyStandardSelectionBox(selectionBoxVO, pageNo, pageSize));
|
||||||
|
}
|
||||||
|
|
||||||
@AutoLog(value = "法规更新记录列表查询")
|
@AutoLog(value = "法规更新记录列表查询")
|
||||||
@ApiOperation(value="法规更新记录列表查询", notes="法规更新记录列表查询")
|
@ApiOperation(value="法规更新记录列表查询", notes="法规更新记录列表查询")
|
||||||
@GetMapping(value = "/getUpdateRecordList")
|
@GetMapping(value = "/getUpdateRecordList")
|
||||||
|
|||||||
+3
@@ -43,6 +43,9 @@
|
|||||||
AND (standard_number LIKE CONCAT('%', #{vo.standardNumberOrName}, '%') OR
|
AND (standard_number LIKE CONCAT('%', #{vo.standardNumberOrName}, '%') OR
|
||||||
standard_name LIKE CONCAT('%', #{vo.standardNumberOrName}, '%'))
|
standard_name LIKE CONCAT('%', #{vo.standardNumberOrName}, '%'))
|
||||||
</if>
|
</if>
|
||||||
|
<if test="vo.nodeCode != null and vo.nodeCode != ''">
|
||||||
|
AND id not in (select unique_relation_flag from laws_node_relation where node_code = #{vo.nodeCode})
|
||||||
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
+2
@@ -20,4 +20,6 @@ public class ManyStandardSelectionBoxVO {
|
|||||||
private java.lang.String source;
|
private java.lang.String source;
|
||||||
@ApiModelProperty(value = "标准号/标准名称")
|
@ApiModelProperty(value = "标准号/标准名称")
|
||||||
private java.lang.String standardNumberOrName;
|
private java.lang.String standardNumberOrName;
|
||||||
|
@ApiModelProperty(value = "树节点编码")
|
||||||
|
private java.lang.String nodeCode;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user